diff options
| author | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2013-07-29 11:42:49 -0700 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-07-30 12:59:12 +0300 |
| commit | 1208266dccd2f5061a3e669c04585727a9b0fb43 (patch) | |
| tree | 67332e247a461cad5eef4d9cac71bb8fd58a2351 /profiles/alert | |
| parent | f3e175bd7884c7c84b68b7167d5e4dc805d374c5 (diff) | |
| download | bluez-1208266dccd2f5061a3e669c04585727a9b0fb43.tar.gz | |
attrib: Rename GATT_OPT_CHR_UUID into GATT_OPT_CHR_UUID16
Rename the option for all in-tree users. This frees up GATT_OPT_CHR_UUID to be used
for UUIDs of type bt_uuid_t* (in a next patch).
Diffstat (limited to 'profiles/alert')
| -rw-r--r-- | profiles/alert/server.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/profiles/alert/server.c b/profiles/alert/server.c index 8da192835..4565470ac 100644 --- a/profiles/alert/server.c +++ b/profiles/alert/server.c @@ -789,7 +789,7 @@ static void register_phone_alert_service(struct alert_adapter *al_adapter) /* Phone Alert Status Service */ gatt_service_add(al_adapter->adapter, GATT_PRIM_SVC_UUID, &uuid, /* Alert Status characteristic */ - GATT_OPT_CHR_UUID, ALERT_STATUS_CHR_UUID, + GATT_OPT_CHR_UUID16, ALERT_STATUS_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_READ | ATT_CHAR_PROPER_NOTIFY, GATT_OPT_CHR_VALUE_CB, ATTRIB_READ, @@ -799,12 +799,12 @@ static void register_phone_alert_service(struct alert_adapter *al_adapter) GATT_OPT_CHR_VALUE_GET_HANDLE, &al_adapter->hnd_value[NOTIFY_ALERT_STATUS], /* Ringer Control Point characteristic */ - GATT_OPT_CHR_UUID, RINGER_CP_CHR_UUID, + GATT_OPT_CHR_UUID16, RINGER_CP_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_WRITE_WITHOUT_RESP, GATT_OPT_CHR_VALUE_CB, ATTRIB_WRITE, ringer_cp_write, NULL, /* Ringer Setting characteristic */ - GATT_OPT_CHR_UUID, RINGER_SETTING_CHR_UUID, + GATT_OPT_CHR_UUID16, RINGER_SETTING_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_READ | ATT_CHAR_PROPER_NOTIFY, GATT_OPT_CHR_VALUE_CB, ATTRIB_READ, @@ -892,35 +892,35 @@ static void register_alert_notif_service(struct alert_adapter *al_adapter) /* Alert Notification Service */ gatt_service_add(al_adapter->adapter, GATT_PRIM_SVC_UUID, &uuid, /* Supported New Alert Category */ - GATT_OPT_CHR_UUID, SUPP_NEW_ALERT_CAT_CHR_UUID, + GATT_OPT_CHR_UUID16, SUPP_NEW_ALERT_CAT_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_READ, GATT_OPT_CHR_VALUE_CB, ATTRIB_READ, supp_new_alert_cat_read, al_adapter->adapter, GATT_OPT_CHR_VALUE_GET_HANDLE, &al_adapter->supp_new_alert_cat_handle, /* New Alert */ - GATT_OPT_CHR_UUID, NEW_ALERT_CHR_UUID, + GATT_OPT_CHR_UUID16, NEW_ALERT_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_NOTIFY, GATT_OPT_CCC_GET_HANDLE, &al_adapter->hnd_ccc[NOTIFY_NEW_ALERT], GATT_OPT_CHR_VALUE_GET_HANDLE, &al_adapter->hnd_value[NOTIFY_NEW_ALERT], /* Supported Unread Alert Category */ - GATT_OPT_CHR_UUID, SUPP_UNREAD_ALERT_CAT_CHR_UUID, + GATT_OPT_CHR_UUID16, SUPP_UNREAD_ALERT_CAT_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_READ, GATT_OPT_CHR_VALUE_CB, ATTRIB_READ, supp_unread_alert_cat_read, al_adapter->adapter, GATT_OPT_CHR_VALUE_GET_HANDLE, &al_adapter->supp_unread_alert_cat_handle, /* Unread Alert Status */ - GATT_OPT_CHR_UUID, UNREAD_ALERT_CHR_UUID, + GATT_OPT_CHR_UUID16, UNREAD_ALERT_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_NOTIFY, GATT_OPT_CCC_GET_HANDLE, &al_adapter->hnd_ccc[NOTIFY_UNREAD_ALERT], GATT_OPT_CHR_VALUE_GET_HANDLE, &al_adapter->hnd_value[NOTIFY_UNREAD_ALERT], /* Alert Notification Control Point */ - GATT_OPT_CHR_UUID, ALERT_NOTIF_CP_CHR_UUID, + GATT_OPT_CHR_UUID16, ALERT_NOTIF_CP_CHR_UUID, GATT_OPT_CHR_PROPS, ATT_CHAR_PROPER_WRITE, GATT_OPT_CHR_VALUE_CB, ATTRIB_WRITE, alert_notif_cp_write, NULL, |