Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge bluetooth branch into master #13

Merged
merged 15 commits into from
Apr 29, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions drivers/bluetooth/hci/h4.c
Original file line number Diff line number Diff line change
@@ -42,15 +42,15 @@ static struct {
struct net_buf *buf;
struct k_fifo fifo;

u16_t remaining;
u16_t discard;
u16_t remaining;
u16_t discard;

bool have_hdr;
bool discardable;

u8_t hdr_len;
u8_t hdr_len;

u8_t type;
u8_t type;
union {
struct bt_hci_evt_hdr evt;
struct bt_hci_acl_hdr acl;
10 changes: 5 additions & 5 deletions drivers/bluetooth/nble/gatt.c
Original file line number Diff line number Diff line change
@@ -814,8 +814,8 @@ static u16_t parse_service(struct bt_conn *conn,
}

static u16_t parse_characteristic(struct bt_conn *conn,
struct bt_gatt_discover_params *params,
const u8_t *data, u8_t len)
struct bt_gatt_discover_params *params,
const u8_t *data, u8_t len)
{
u16_t end_handle = 0;
int i;
@@ -847,8 +847,8 @@ static u16_t parse_characteristic(struct bt_conn *conn,
}

static u16_t parse_descriptor(struct bt_conn *conn,
struct bt_gatt_discover_params *params,
const u8_t *data, u8_t len)
struct bt_gatt_discover_params *params,
const u8_t *data, u8_t len)
{
u16_t end_handle = 0;
int i;
@@ -1404,7 +1404,7 @@ void bt_gatt_cancel(struct bt_conn *conn, void *params)
}

static s32_t prep_write_evt(const struct nble_gatts_write_evt *ev,
const u8_t *data, u8_t len)
const u8_t *data, u8_t len)
{
#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0
const struct bt_gatt_attr *attr = ev->attr;
22 changes: 11 additions & 11 deletions include/bluetooth/gatt.h
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@ struct bt_gatt_attr {
/** Attribute user data */
void *user_data;
/** Attribute handle */
u16_t handle;
u16_t handle;
/** Attribute permissions */
u8_t perm;
#if defined(CONFIG_BLUETOOTH_GATT_DYNAMIC_DB)
@@ -147,17 +147,17 @@ struct bt_gatt_service {
/** Service UUID. */
const struct bt_uuid *uuid;
/** Service end handle. */
u16_t end_handle;
u16_t end_handle;
};

/** @brief Include Attribute Value. */
struct bt_gatt_include {
/** Service UUID. */
const struct bt_uuid *uuid;
/** Service start handle. */
u16_t start_handle;
u16_t start_handle;
/** Service end handle. */
u16_t end_handle;
u16_t end_handle;
};

/* Characteristic Properties Bit field values */
@@ -783,8 +783,8 @@ struct bt_gatt_discover_params;
* or BT_GATT_ITER_STOP to stop discovery procedure.
*/
typedef u8_t (*bt_gatt_discover_func_t)(struct bt_conn *conn,
const struct bt_gatt_attr *attr,
struct bt_gatt_discover_params *params);
const struct bt_gatt_attr *attr,
struct bt_gatt_discover_params *params);

enum {
BT_GATT_DISCOVER_PRIMARY,
@@ -859,8 +859,8 @@ struct bt_gatt_read_params;
* @param length Attribute value length.
*/
typedef u8_t (*bt_gatt_read_func_t)(struct bt_conn *conn, u8_t err,
struct bt_gatt_read_params *params,
const void *data, u16_t length);
struct bt_gatt_read_params *params,
const void *data, u16_t length);

/** @brief GATT Read parameters
* @param func Read attribute callback
@@ -908,7 +908,7 @@ struct bt_gatt_write_params;
* @param params Write parameters used.
*/
typedef void (*bt_gatt_write_func_t)(struct bt_conn *conn, u8_t err,
struct bt_gatt_write_params *params);
struct bt_gatt_write_params *params);

/** @brief GATT Write parameters */
struct bt_gatt_write_params {
@@ -968,8 +968,8 @@ struct bt_gatt_subscribe_params;
* @param length Attribute value length.
*/
typedef u8_t (*bt_gatt_notify_func_t)(struct bt_conn *conn,
struct bt_gatt_subscribe_params *params,
const void *data, u16_t length);
struct bt_gatt_subscribe_params *params,
const void *data, u16_t length);

/* Subscription flags */
enum {
Loading