korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-04 01:24:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

gatt: Remove offset parameter from gatt_read_char

Browse Source 
The Core spec allows to implement Read Long Characteristic Value as a
Read Request, followed by zero or more Read Blob Requests, therefore the
offset parameter is unnecessary and is always 0 for normal use.
This commit is contained in:
Jefferson Delfes 2012-09-28 16:34:44 -04:00 committed by Johan Hedberg
parent 5e1174fb01
commit 3d0e48b334
10 changed files with 29 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
attrib/client.c
View File

@ -782,7 +782,7 @@ static void update_char_desc(guint8 status, const guint8 *pdu, guint16 len,
if (bt_io_set(io, NULL,
BT_IO_OPT_SEC_LEVEL, level,
BT_IO_OPT_INVALID)) {
gatt_read_char(gatt->attrib, current->handle, 0,
gatt_read_char(gatt->attrib, current->handle,
update_char_desc, current);
return;
}
@ -833,7 +833,7 @@ static void update_char_value(guint8 status, const guint8 *pdu,
if (bt_io_set(io, NULL,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_HIGH,
BT_IO_OPT_INVALID)) {
gatt_read_char(gatt->attrib, chr->handle, 0,
gatt_read_char(gatt->attrib, chr->handle,
update_char_value, current);
return;
}
@ -894,12 +894,12 @@ static void descriptor_cb(guint8 status, const guint8 *pdu, guint16 plen,
if (uuid_desc16_cmp(&uuid, GATT_CHARAC_USER_DESC_UUID) == 0) {
query_list_append(gatt, qfmt);
gatt_read_char(gatt->attrib, handle, 0, update_char_desc,
gatt_read_char(gatt->attrib, handle, update_char_desc,
qfmt);
} else if (uuid_desc16_cmp(&uuid, GATT_CHARAC_FMT_UUID) == 0) {
query_list_append(gatt, qfmt);
gatt_read_char(gatt->attrib, handle, 0,
update_char_format, qfmt);
gatt_read_char(gatt->attrib, handle, update_char_format,
qfmt);
} else
g_free(qfmt);
}
@ -931,7 +931,7 @@ static void update_all_chars(gpointer data, gpointer user_data)
query_list_append(gatt, qvalue);
gatt_read_char(gatt->attrib, chr->handle, 0, update_char_value, qvalue);
gatt_read_char(gatt->attrib, chr->handle, update_char_value, qvalue);
}
static DBusMessage *create_discover_char_reply(DBusMessage *msg, GSList *chars)

15
attrib/gatt.c
View File

@ -481,8 +481,8 @@ done:
long_read->func(status, rpdu, rlen, long_read->user_data);
}
guint gatt_read_char(GAttrib *attrib, uint16_t handle, uint16_t offset,
GAttribResultFunc func, gpointer user_data)
guint gatt_read_char(GAttrib *attrib, uint16_t handle, GAttribResultFunc func,
gpointer user_data)
{
uint8_t *buf;
size_t buflen;
@ -501,16 +501,9 @@ guint gatt_read_char(GAttrib *attrib, uint16_t handle, uint16_t offset,
long_read->handle = handle;
buf = g_attrib_get_buffer(attrib, &buflen);
if (offset > 0) {
plen = enc_read_blob_req(long_read->handle, offset, buf,
buflen);
id = g_attrib_send(attrib, 0, ATT_OP_READ_BLOB_REQ, buf, plen,
read_blob_helper, long_read, read_long_destroy);
} else {
plen = enc_read_req(handle, buf, buflen);
id = g_attrib_send(attrib, 0, ATT_OP_READ_REQ, buf, plen,
plen = enc_read_req(handle, buf, buflen);
id = g_attrib_send(attrib, 0, ATT_OP_READ_REQ, buf, plen,
read_char_helper, long_read, read_long_destroy);
}
if (id == 0)
g_free(long_read);

4
attrib/gatt.h
View File

@ -75,8 +75,8 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end,
bt_uuid_t *uuid, gatt_cb_t func,
gpointer user_data);
guint gatt_read_char(GAttrib *attrib, uint16_t handle, uint16_t offset,
GAttribResultFunc func, gpointer user_data);
guint gatt_read_char(GAttrib *attrib, uint16_t handle, GAttribResultFunc func,
gpointer user_data);
guint gatt_write_char(GAttrib *attrib, uint16_t handle, uint8_t *value,
size_t vlen, GAttribResultFunc func,

5
attrib/gatttool.c
View File

@ -53,7 +53,6 @@ static int opt_end = 0xffff;
static int opt_handle = -1;
static int opt_mtu = 0;
static int opt_psm = 0;
static int opt_offset = 0;
static gboolean opt_primary = FALSE;
static gboolean opt_characteristics = FALSE;
static gboolean opt_char_read = FALSE;
@ -318,7 +317,7 @@ static gboolean characteristics_read(gpointer user_data)
return FALSE;
}
gatt_read_char(attrib, opt_handle, opt_offset, char_read_cb, attrib);
gatt_read_char(attrib, opt_handle, char_read_cb, attrib);
return FALSE;
}
@ -498,8 +497,6 @@ static GOptionEntry char_rw_options[] = {
{ "value", 'n' , 0, G_OPTION_ARG_STRING, &opt_value,
"Write characteristic value (required for write operation)",
"0x0001" },
{ "offset", 'o', 0, G_OPTION_ARG_INT, &opt_offset,
"Offset to long read characteristic by handle", "N"},
{NULL},
};

16
attrib/interactive.c
View File

@ -503,7 +503,6 @@ static void cmd_char_desc(int argcp, char **argvp)
static void cmd_read_hnd(int argcp, char **argvp)
{
int handle;
int offset = 0;
if (conn_state != STATE_CONNECTED) {
printf("Command failed: disconnected\n");
@ -521,18 +520,7 @@ static void cmd_read_hnd(int argcp, char **argvp)
return;
}
if (argcp > 2) {
char *e;
errno = 0;
offset = strtol(argvp[2], &e, 0);
if (errno != 0 || *e != '\0') {
printf("Invalid offset: %s\n", argvp[2]);
return;
}
}
gatt_read_char(attrib, handle, offset, char_read_cb, attrib);
gatt_read_char(attrib, handle, char_read_cb, attrib);
}
static void cmd_read_uuid(int argcp, char **argvp)
@ -759,7 +747,7 @@ static struct {
"Characteristics Discovery" },
{ "char-desc", cmd_char_desc, "[start hnd] [end hnd]",
"Characteristics Descriptor Discovery" },
{ "char-read-hnd", cmd_read_hnd, "<handle> [offset]",
{ "char-read-hnd", cmd_read_hnd, "<handle>",
"Characteristics Value/Descriptor Read by handle" },
{ "char-read-uuid", cmd_read_uuid, "<UUID> [start hnd] [end hnd]",
"Characteristics Value/Descriptor Read by UUID" },

2
profiles/deviceinfo/deviceinfo.c
View File

@ -113,7 +113,7 @@ static void read_pnpid_cb(guint8 status, const guint8 *pdu, guint16 len,
static void process_deviceinfo_char(struct characteristic *ch)
{
if (g_strcmp0(ch->attr.uuid, PNPID_UUID) == 0)
gatt_read_char(ch->d->attrib, ch->attr.value_handle, 0,
gatt_read_char(ch->d->attrib, ch->attr.value_handle,
read_pnpid_cb, ch);
}

2
profiles/heartrate/heartrate.c
View File

@ -355,7 +355,7 @@ static void discover_char_cb(GSList *chars, guint8 status, gpointer user_data)
} else if (g_strcmp0(c->uuid, BODY_SENSOR_LOCATION_UUID) == 0) {
DBG("Body Sensor Location supported");
gatt_read_char(hr->attrib, c->value_handle, 0,
gatt_read_char(hr->attrib, c->value_handle,
read_sensor_location_cb, hr);
} else if (g_strcmp0(c->uuid,
HEART_RATE_CONTROL_POINT_UUID) == 0) {

12
profiles/input/hog_device.c
View File

@ -233,12 +233,12 @@ static void discover_descriptor_cb(guint8 status, const guint8 *pdu,
break;
case GATT_REPORT_REFERENCE:
report = user_data;
gatt_read_char(report->hogdev->attrib, handle, 0,
gatt_read_char(report->hogdev->attrib, handle,
report_reference_cb, report);
break;
case GATT_EXTERNAL_REPORT_REFERENCE:
hogdev = user_data;
gatt_read_char(hogdev->attrib, handle, 0,
gatt_read_char(hogdev->attrib, handle,
external_report_reference_cb, hogdev);
break;
}
@ -479,7 +479,7 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
report);
discover_descriptor(hogdev->attrib, chr, next, report);
} else if (bt_uuid_cmp(&uuid, &report_map_uuid) == 0) {
gatt_read_char(hogdev->attrib, chr->value_handle, 0,
gatt_read_char(hogdev->attrib, chr->value_handle,
report_map_read_cb, hogdev);
discover_descriptor(hogdev->attrib, chr, next, hogdev);
} else if (bt_uuid_cmp(&uuid, &info_uuid) == 0)
@ -492,13 +492,13 @@ static void char_discovered_cb(GSList *chars, guint8 status, gpointer user_data)
if (proto_mode_handle) {
hogdev->proto_mode_handle = proto_mode_handle;
gatt_read_char(hogdev->attrib, proto_mode_handle, 0,
gatt_read_char(hogdev->attrib, proto_mode_handle,
proto_mode_read_cb, hogdev);
}
if (info_handle)
gatt_read_char(hogdev->attrib, info_handle, 0,
info_read_cb, hogdev);
gatt_read_char(hogdev->attrib, info_handle, info_read_cb,
hogdev);
}
static void output_written_cb(guint8 status, const guint8 *pdu,

4
profiles/proximity/monitor.c
View File

@ -250,7 +250,7 @@ static void tx_power_handle_cb(GSList *characteristics, guint8 status,
DBG("Tx Power handle: 0x%04x", monitor->txpowerhandle);
gatt_read_char(monitor->attrib, monitor->txpowerhandle, 0,
gatt_read_char(monitor->attrib, monitor->txpowerhandle,
tx_power_read_cb, monitor);
}
@ -260,7 +260,7 @@ static void read_tx_power(struct monitor *monitor)
bt_uuid_t uuid;
if (monitor->txpowerhandle != 0) {
gatt_read_char(monitor->attrib, monitor->txpowerhandle, 0,
gatt_read_char(monitor->attrib, monitor->txpowerhandle,
tx_power_read_cb, monitor);
return;
}

8
profiles/thermometer/thermometer.c
View File

@ -393,8 +393,8 @@ static void process_thermometer_desc(struct descriptor *desc)
if (bt_uuid_cmp(&desc->uuid, &btuuid) == 0 && g_strcmp0(ch->attr.uuid,
MEASUREMENT_INTERVAL_UUID) == 0) {
gatt_read_char(ch->t->attrib, desc->handle, 0,
valid_range_desc_cb, desc);
gatt_read_char(ch->t->attrib, desc->handle, valid_range_desc_cb,
desc);
return;
}
@ -508,10 +508,10 @@ static void process_thermometer_char(struct characteristic *ch)
change_property(ch->t, "Intermediate", &intermediate);
return;
} else if (g_strcmp0(ch->attr.uuid, TEMPERATURE_TYPE_UUID) == 0)
gatt_read_char(ch->t->attrib, ch->attr.value_handle, 0,
gatt_read_char(ch->t->attrib, ch->attr.value_handle,
read_temp_type_cb, ch);
else if (g_strcmp0(ch->attr.uuid, MEASUREMENT_INTERVAL_UUID) == 0)
gatt_read_char(ch->t->attrib, ch->attr.value_handle, 0,
gatt_read_char(ch->t->attrib, ch->attr.value_handle,
read_interval_cb, ch);
}