android/gatt: Remove System ID from DIS

System ID is not just a string but has a specified format and
should be unique.

DIS specification p. 3.7:
"The System ID characteristic shall represent a structure containing
an Organizationally Unique Identifier (OUI) followed by a manufacturer-defined
identifier and is unique for each individual instance of the product."
This commit is contained in:
Szymon Janc 2014-06-27 18:57:42 +02:00
parent 76d93eab9a
commit dcbf0593c7

View File

@ -5910,15 +5910,13 @@ static void register_gap_service(void)
/* TODO: Get those data from device possible via androig/bluetooth.c */
static struct device_info {
const char *manufacturer_name;
const char *system_id;
const char *model_number;
const char *serial_number;
const char *firmware_rev;
const char *hardware_rev;
const char *software_rev;
} device_info = {
.manufacturer_name = "BlueZ",
.system_id = "BlueZ for Android",
.manufacturer_name = "BlueZ for Android",
.model_number = "model no",
.serial_number = "serial no",
.firmware_rev = "firmware rev",
@ -5971,12 +5969,6 @@ static void register_device_info_service(void)
srvc_handle = gatt_db_add_service(gatt_db, &uuid, true, 15);
/* User data are not const hence (void *) cast is used */
bt_uuid16_create(&uuid, GATT_CHARAC_SYSTEM_ID);
gatt_db_add_characteristic(gatt_db, srvc_handle, &uuid, GATT_PERM_READ,
GATT_CHR_PROP_READ,
device_info_read_cb, NULL,
(void *) device_info.system_id);
bt_uuid16_create(&uuid, GATT_CHARAC_MODEL_NUMBER_STRING);
gatt_db_add_characteristic(gatt_db, srvc_handle, &uuid, GATT_PERM_READ,
GATT_CHR_PROP_READ,