Skip to contentSkip to conversation

android/hid: Implement hid get protocol in daemon

PATCH In review Ravi kumar Veeramally 2 participants 12 messages Nov 5, 2013 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 android/hid: Implement hid get protocol in daemon

This patch requests hid device protocol mode and reads reply message and sends notification to hal.
---
v3: Changed hid_msg to last_hid_msg and variable type uint8_t type

---
 android/hid.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 104 insertions(+), 4 deletions(-)
android/hid.c +104 -4
index c0c9aeb..97835d9 100644
@@ -54,6 +54,14 @@
 #define L2CAP_PSM_HIDP_INTR	0x13
 #define UHID_DEVICE_FILE	"/dev/uhid"
 
+/* HID message types */
+#define HID_MSG_GET_PROTOCOL	0x60
+#define HID_MSG_DATA		0xa0
+
+/* HID protocol header parameters */
+#define HID_PROTO_BOOT		0x00
+#define HID_PROTO_REPORT	0x01
+
 static GIOChannel *notification_io = NULL;
 static GIOChannel *ctrl_io = NULL;
 static GIOChannel *intr_io = NULL;
@@ -76,6 +84,7 @@ struct hid_device {
 	guint		intr_watch;
 	int		uhid_fd;
 	guint		uhid_watch_id;
+	uint8_t		last_hid_msg;
 };
 
 static int device_cmp(gconstpointer s, gconstpointer user_data)
@@ -243,12 +252,74 @@ static gboolean intr_watch_cb(GIOChannel *chan, GIOCondition cond,
 	return FALSE;
 }
 
+static void bt_hid_notify_proto_mode(struct hid_device *dev, uint8_t *buf,
+									int len)
+{
+	struct hal_ev_hid_proto_mode ev;
+	char address[18];
+
+	ba2str(&dev->dst, address);
+	DBG("device %s", address);
+
+	memset(&ev, 0, sizeof(ev));
+	bdaddr2android(&dev->dst, ev.bdaddr);
+
+	if (buf[0] == HID_MSG_DATA) {
+		ev.status = HAL_HID_STATUS_OK;
+		if (buf[1] == HID_PROTO_REPORT)
+			ev.mode = HAL_HID_REPORT_PROTOCOL;
+		else if (buf[1] == HID_PROTO_BOOT)
+			ev.mode = HAL_HID_BOOT_PROTOCOL;
+		else
+			ev.mode = HAL_HID_UNSUPPORTED_PROTOCOL;
+
+	} else {
+		ev.status = buf[0];
+		ev.mode = HAL_HID_UNSUPPORTED_PROTOCOL;
+	}
+
+	ipc_send(notification_io, HAL_SERVICE_ID_HIDHOST,
+				HAL_EV_HID_PROTO_MODE, sizeof(ev), &ev, -1);
+}
+
+static gboolean ctrl_io_watch_cb(GIOChannel *chan, gpointer data)
+{
+	struct hid_device *dev = data;
+	int fd, bread;
+	uint8_t buf[UHID_DATA_MAX];
+
+	DBG("");
+
+	fd = g_io_channel_unix_get_fd(chan);
+	bread = read(fd, buf, sizeof(buf));
+	if (bread < 0) {
+		error("read: %s(%d)", strerror(errno), -errno);
+		return TRUE;
+	}
+
+	switch (dev->last_hid_msg) {
+	case HID_MSG_GET_PROTOCOL:
+		bt_hid_notify_proto_mode(dev, buf, bread);
+		break;
+	default:
+		DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
+	}
+
+	/* reset msg type request */
+	dev->last_hid_msg = 0;
+
+	return TRUE;
+}
+
 static gboolean ctrl_watch_cb(GIOChannel *chan, GIOCondition cond,
 								gpointer data)
 {
 	struct hid_device *dev = data;
 	char address[18];
 
+	if (cond & G_IO_IN)
+		return ctrl_io_watch_cb(chan, data);
+
 	ba2str(&dev->dst, address);
 	bt_hid_notify_state(dev, HAL_HID_STATE_DISCONNECTED);
 
@@ -395,8 +466,8 @@ static void control_connect_cb(GIOChannel *chan, GError *conn_err,
 	}
 
 	dev->ctrl_watch = g_io_add_watch(dev->ctrl_io,
-					G_IO_HUP | G_IO_ERR | G_IO_NVAL,
-					ctrl_watch_cb, dev);
+				G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+				ctrl_watch_cb, dev);
 
 	return;
 
@@ -591,9 +662,38 @@ static uint8_t bt_hid_info(struct hal_cmd_hid_set_info *cmd, uint16_t len)
 static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd,
 								uint16_t len)
 {
-	DBG("Not Implemented");
+	struct hid_device *dev;
+	GSList *l;
+	bdaddr_t dst;
+	int fd;
+	uint8_t hdr[1];
 
-	return HAL_STATUS_FAILED;
+	DBG("");
+
+	if (len < sizeof(*cmd))
+		return HAL_STATUS_INVALID;
+
+	android2bdaddr(&cmd->bdaddr, &dst);
+
+	l = g_slist_find_custom(devices, &dst, device_cmp);
+	if (!l)
+		return HAL_STATUS_FAILED;
+
+	dev = l->data;
+
+	if (dev->boot_dev)
+		return HAL_STATUS_UNSUPPORTED;
+
+	hdr[0] = HID_MSG_GET_PROTOCOL | cmd->mode;
+	fd = g_io_channel_unix_get_fd(dev->ctrl_io);
+
+	if (write(fd, hdr, sizeof(hdr)) < 0) {
+		error("error while querying device protocol");
+		return HAL_STATUS_FAILED;
+	}
+
+	dev->last_hid_msg = HID_MSG_GET_PROTOCOL;
+	return HAL_STATUS_SUCCESS;
 }
 
 static uint8_t bt_hid_set_protocol(struct hal_cmd_hid_set_protocol *cmd,
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 2/4 android/hid: Implement hid set protocol in daemon

This patch requests hid device to set protocol mode and reads reply message and sends notification to hal.

---
 android/hid.c | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)
android/hid.c +33 -2
index 97835d9..d387d6d 100644
@@ -56,6 +56,7 @@
 
 /* HID message types */
 #define HID_MSG_GET_PROTOCOL	0x60
+#define HID_MSG_SET_PROTOCOL	0x70
 #define HID_MSG_DATA		0xa0
 
 /* HID protocol header parameters */
@@ -299,6 +300,7 @@ static gboolean ctrl_io_watch_cb(GIOChannel *chan, gpointer data)
 
 	switch (dev->last_hid_msg) {
 	case HID_MSG_GET_PROTOCOL:
+	case HID_MSG_SET_PROTOCOL:
 		bt_hid_notify_proto_mode(dev, buf, bread);
 		break;
 	default:
@@ -699,9 +701,38 @@ static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd,
 static uint8_t bt_hid_set_protocol(struct hal_cmd_hid_set_protocol *cmd,
 								uint16_t len)
 {
-	DBG("Not Implemented");
+	struct hid_device *dev;
+	GSList *l;
+	bdaddr_t dst;
+	int fd;
+	uint8_t hdr[1];
 
-	return HAL_STATUS_FAILED;
+	DBG("");
+
+	if (len < sizeof(*cmd))
+		return HAL_STATUS_INVALID;
+
+	android2bdaddr(&cmd->bdaddr, &dst);
+
+	l = g_slist_find_custom(devices, &dst, device_cmp);
+	if (!l)
+		return HAL_STATUS_FAILED;
+
+	dev = l->data;
+
+	if (dev->boot_dev)
+		return HAL_STATUS_UNSUPPORTED;
+
+	hdr[0] = HID_MSG_SET_PROTOCOL | cmd->mode;
+	fd = g_io_channel_unix_get_fd(dev->ctrl_io);
+
+	if (write(fd, hdr, sizeof(hdr)) < 0) {
+		error("error while setting device protocol");
+		return HAL_STATUS_FAILED;
+	}
+
+	dev->last_hid_msg = HID_MSG_SET_PROTOCOL;
+	return HAL_STATUS_SUCCESS;
 }
 
 static uint8_t bt_hid_get_report(struct hal_cmd_hid_get_report *cmd,
Signature · 1 line
1.8.1.2
#2 lore raw

Re: [PATCH_v3 02/04] android/hid: Implement hid set protocol in daemon

Hi Ravi,

android/hid.c static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd, · line 708

Quoted 9 lines · Ravi kumar Veeramally

static uint8_t bt_hid_set_protocol(struct hal_cmd_hid_set_protocol *cmd,

android/hid.c +5 -1
 								uint16_t len)
 {
-	DBG("Not Implemented");
+	struct hid_device *dev;
+	GSList *l;
+	bdaddr_t dst;
+	int fd;
+	uint8_t hdr[1];

If it's just one element there's no need for an array. Just use "uint8_t hdr;" instead.

android/hid.c static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd, · line 726

Quoted 1 line
android/hid.c +1 -0
+	hdr[0] = HID_MSG_SET_PROTOCOL | cmd->mode;

And then here hdr = ...;

android/hid.c static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd, · line 729

Quoted 3 lines
android/hid.c +3 -0
+	fd = g_io_channel_unix_get_fd(dev->ctrl_io);
+
+	if (write(fd, hdr, sizeof(hdr)) < 0) {

And here &hdr, sizeof(hdr)

Johan

#3 lore raw

Re: [PATCH_v3 02/04] android/hid: Implement hid set protocol in daemon

Hi Johan,

Quoted 15 lines · Johan Hedberg

Hi Ravi,

android/hid.c static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd, · line 708

Quoted 9 lines · Ravi kumar Veeramally

static uint8_t bt_hid_set_protocol(struct hal_cmd_hid_set_protocol *cmd,
uint16_t len)
{

android/hid.c +5 -1
-	DBG("Not Implemented");
+	struct hid_device *dev;
+	GSList *l;
+	bdaddr_t dst;
+	int fd;
+	uint8_t hdr[1];

If it's just one element there's no need for an array. Just use "uint8_t hdr;" instead.

Quoted 7 lines

android/hid.c static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd, · line 726

Quoted 1 line
android/hid.c +1 -0
+	hdr[0] = HID_MSG_SET_PROTOCOL | cmd->mode;

And then here hdr = ...;

android/hid.c static uint8_t bt_hid_get_protocol(struct hal_cmd_hid_get_protocol *cmd, · line 729

Quoted 3 lines
android/hid.c +3 -0
+	fd = g_io_channel_unix_get_fd(dev->ctrl_io);
+
+	if (write(fd, hdr, sizeof(hdr)) < 0) {

And here &hdr, sizeof(hdr)

Ok.

Thanks,
Ravi.

#4 lore raw

PATCH 3/4 android/hid: Implement hid get report in daemon

In reply to Ravi kumar Veeramally

This patch requests hid device report and reads reply message and sends notification to hal.

---
 android/hal-hidhost.c |   1 +
 android/hid.c         | 105 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 104 insertions(+), 2 deletions(-)
android/hal-hidhost.c +1 -0
index 13928e6..f554cb2 100644
@@ -251,6 +251,7 @@ static bt_status_t hh_get_report(bt_bdaddr_t *bd_addr,
 
 	memcpy(cmd.bdaddr, bd_addr, sizeof(cmd.bdaddr));
 	cmd.id = reportId;
+	cmd.buf = bufferSize;
 
 	switch (reportType) {
 	case BTHH_INPUT_REPORT:
android/hid.c +102 -2

137 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#5 lore raw

Re: [PATCH_v3 03/04] android/hid: Implement hid get report in daemon

Hi Ravi,

android/hid.c static void bt_hid_notify_proto_mode(struct hid_device *dev, uint8_t *buf, · line 311

Quoted 5 lines · Ravi kumar Veeramally
android/hid.c +5 -0
+	if (!((buf[0] == (HID_MSG_DATA | HID_DATA_TYPE_INPUT)) ||
+			(buf[0] == (HID_MSG_DATA | HID_DATA_TYPE_OUTPUT)) ||
+			(buf[0]	== (HID_MSG_DATA | HID_DATA_TYPE_FEATURE)))) {
+		ev = g_malloc(len);
+		memset(ev, 0, ev_len);

Is it intentional that you allocate a different length than what you memset to 0 here? If they should be the same just use g_malloc0, and if not a code comment might be in order (to explain what the actual intention is).

android/hid.c static void bt_hid_notify_proto_mode(struct hid_device *dev, uint8_t *buf, · line 321

Quoted 2 lines
android/hid.c +2 -0
+	ev = g_malloc(ev_len);
+	memset(ev, 0, ev_len);

Here g_malloc0 makes more sense.

Quoted 6 lines
android/hid.c +6 -0
+	ev->status = HAL_HID_STATUS_OK;
+	bdaddr2android(&dev->dst, ev->bdaddr);
+
+	/* Report porotocol mode reply contains id after hdr, in boot
+	 * protocol mode id doesn't exist */
+	if (dev->boot_dev) {

android/hid.c static void bt_hid_notify_proto_mode(struct hid_device *dev, uint8_t *buf, · line 337

Quoted 10 lines
android/hid.c +10 -0
+		ev->len = len - 1;
+		memcpy(ev->data, buf + 1, ev->len);
+	} else {
+		ev->len = len - 2;
+		memcpy(ev->data, buf + 2, ev->len);
+	}
+
+send:
+	ipc_send(notification_io, HAL_SERVICE_ID_HIDHOST, HAL_EV_HID_GET_REPORT,
+						ev_len, ev, -1);

This doesn't look right for your first allocation (you claim that the length of ev is ev_len, but in fact you allocated len amount of bytes.

Johan

#6 lore raw

Re: [PATCH_v3 03/04] android/hid: Implement hid get report in daemon

Quoted 12 lines · Johan Hedberg

Hi Ravi,

android/hid.c static void bt_hid_notify_proto_mode(struct hid_device *dev, uint8_t *buf, · line 311

Quoted 5 lines · Ravi kumar Veeramally
android/hid.c +5 -0
+	if (!((buf[0] == (HID_MSG_DATA | HID_DATA_TYPE_INPUT)) ||
+			(buf[0] == (HID_MSG_DATA | HID_DATA_TYPE_OUTPUT)) ||
+			(buf[0]	== (HID_MSG_DATA | HID_DATA_TYPE_FEATURE)))) {
+		ev = g_malloc(len);
+		memset(ev, 0, ev_len);

Is it intentional that you allocate a different length than what you memset to 0 here? If they should be the same just use g_malloc0, and if not a code comment might be in order (to explain what the actual intention is).

Ok, type, it should be ev_len.

Quoted 14 lines

android/hid.c static void bt_hid_notify_proto_mode(struct hid_device *dev, uint8_t *buf, · line 321

Quoted 2 lines
android/hid.c +2 -0
+	ev = g_malloc(ev_len);
+	memset(ev, 0, ev_len);

Here g_malloc0 makes more sense.

Quoted 10 lines
android/hid.c +10 -0
+	ev->status = HAL_HID_STATUS_OK;
+	bdaddr2android(&dev->dst, ev->bdaddr);
+
+	/* Report porotocol mode reply contains id after hdr, in boot
+	 * protocol mode id doesn't exist */
+	if (dev->boot_dev) {
+		ev->len = len - 1;
+		memcpy(ev->data, buf + 1, ev->len);
+	} else {
+		ev->len = len - 2;
Quoted 8 lines

android/hid.c static void bt_hid_notify_proto_mode(struct hid_device *dev, uint8_t *buf, · line 337

Quoted 6 lines
android/hid.c +6 -0
+		memcpy(ev->data, buf + 2, ev->len);
+	}
+
+send:
+	ipc_send(notification_io, HAL_SERVICE_ID_HIDHOST, HAL_EV_HID_GET_REPORT,
+						ev_len, ev, -1);

This doesn't look right for your first allocation (you claim that the length of ev is ev_len, but in fact you allocated len amount of bytes.

Ok. I will fix it.

Thanks,
Ravi.

#7 lore raw

PATCH 4/4 android/hid: Implement hid set report in daemon

In reply to Ravi kumar Veeramally

This patch requests hid device to set report.

---
 android/hal-hidhost.c |  2 ++
 android/hal-msg.h     |  6 ++++--
 android/hid.c         | 40 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 44 insertions(+), 4 deletions(-)
android/hal-hidhost.c +2 -0
index f554cb2..29e3ee0 100644
@@ -284,6 +284,8 @@ static bt_status_t hh_set_report(bt_bdaddr_t *bd_addr,
 		return BT_STATUS_PARM_INVALID;
 
 	memcpy(cmd.bdaddr, bd_addr, sizeof(cmd.bdaddr));
+	cmd.len = strlen(report);
+	memcpy(cmd.data, report, cmd.len);
 
 	switch (reportType) {
 	case BTHH_INPUT_REPORT:
android/hal-msg.h +4 -2
index bc7df6b..2c3067f 100644
@@ -290,8 +290,10 @@ struct hal_cmd_hid_get_report {
 
 #define HAL_OP_HID_SET_REPORT		0x08
 struct hal_cmd_hid_set_report {
-	uint8_t bdaddr[6];
-	uint8_t type;
+	uint8_t  bdaddr[6];
+	uint8_t  type;
+	uint16_t len;
+	uint8_t  data[670];
 } __attribute__((packed));
 
 #define HAL_OP_HID_SEND_DATA		0x09
android/hid.c +38 -2
index f1bf9e8..25e33fa 100644
@@ -56,6 +56,7 @@
 
 /* HID message types */
 #define HID_MSG_GET_REPORT	0x40
+#define HID_MSG_SET_REPORT	0x50
 #define HID_MSG_GET_PROTOCOL	0x60
 #define HID_MSG_SET_PROTOCOL	0x70
 #define HID_MSG_DATA		0xa0
@@ -846,9 +847,44 @@ static uint8_t bt_hid_get_report(struct hal_cmd_hid_get_report *cmd,
 static uint8_t bt_hid_set_report(struct hal_cmd_hid_set_report *cmd,
 								uint16_t len)
 {
-	DBG("Not Implemented");
+	struct hid_device *dev;
+	GSList *l;
+	bdaddr_t dst;
+	int fd;
+	uint8_t *req;
+	uint8_t req_size;
 
-	return HAL_STATUS_FAILED;
+	DBG("");
+
+	if (len < sizeof(*cmd))
+		return HAL_STATUS_INVALID;
+
+	android2bdaddr(&cmd->bdaddr, &dst);
+
+	l = g_slist_find_custom(devices, &dst, device_cmp);
+	if (!l)
+		return HAL_STATUS_FAILED;
+
+	dev = l->data;
+	req_size = 1 + cmd->len;
+	req = g_try_malloc0(req_size);
+	if (!req)
+		return HAL_STATUS_NOMEM;
+
+	req[0] = HID_MSG_SET_REPORT | cmd->type;
+	memcpy(req + 1, cmd->data, req_size - 1);
+
+	fd = g_io_channel_unix_get_fd(dev->ctrl_io);
+
+	if (write(fd, req, req_size) < 0) {
+		error("error while querying device protocol");
+		g_free(req);
+		return HAL_STATUS_FAILED;
+	}
+
+	dev->last_hid_msg = HID_MSG_SET_REPORT;
+	g_free(req);
+	return HAL_STATUS_SUCCESS;
 }
 
 static uint8_t bt_hid_send_data(struct hal_cmd_hid_send_data *cmd,
Signature · 1 line
1.8.1.2
#8 lore raw
In reply to Ravi kumar Veeramally

Hi Ravi,

Quoted 12 lines · Ravi kumar Veeramally
android/hid.c +12 -0
+static gboolean ctrl_io_watch_cb(GIOChannel *chan, gpointer data)
+{
+	struct hid_device *dev = data;
+	int fd, bread;
+	uint8_t buf[UHID_DATA_MAX];
+
+	DBG("");
+
+	fd = g_io_channel_unix_get_fd(chan);
+	bread = read(fd, buf, sizeof(buf));
+	if (bread < 0) {
+		error("read: %s(%d)", strerror(errno), -errno);

android/hid.c static gboolean intr_watch_cb(GIOChannel *chan, GIOCondition cond, · line 306

Quoted 10 lines
android/hid.c +10 -0
+		return TRUE;
+	}
+
+	switch (dev->last_hid_msg) {
+	case HID_MSG_GET_PROTOCOL:
+		bt_hid_notify_proto_mode(dev, buf, bread);
+		break;
+	default:
+		DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
+	}

This doesn't really make sense to me. If you only set last_hid_msg when you send a code that you do support, then why would the value of last_hid_msg ever contain a type that you do not support? (assuming you always add an entry to this switch statement in the same patch that you add a corresponding write for the type).

Also, since you don't seem to be using last_hid_msg for anything else than printing this debug message, I'm wondering is there really any value for it? Previously (based on our IRC) discussion I understood that it had some actual functional value that helped determine what to send to the HAL, but now I'm not seeing it anywhere in the patch. I might have missed it though (in which case please enlighten me :)

Johan

#9 lore raw

Hi Johan,

Quoted 31 lines · Johan Hedberg

Hi Ravi,

Quoted 12 lines · Ravi kumar Veeramally
android/hid.c +12 -0
+static gboolean ctrl_io_watch_cb(GIOChannel *chan, gpointer data)
+{
+	struct hid_device *dev = data;
+	int fd, bread;
+	uint8_t buf[UHID_DATA_MAX];
+
+	DBG("");
+
+	fd = g_io_channel_unix_get_fd(chan);
+	bread = read(fd, buf, sizeof(buf));
+	if (bread < 0) {
+		error("read: %s(%d)", strerror(errno), -errno);

android/hid.c static gboolean intr_watch_cb(GIOChannel *chan, GIOCondition cond, · line 306

Quoted 10 lines
android/hid.c +10 -0
+		return TRUE;
+	}
+
+	switch (dev->last_hid_msg) {
+	case HID_MSG_GET_PROTOCOL:
+		bt_hid_notify_proto_mode(dev, buf, bread);
+		break;
+	default:
+		DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
+	}

This doesn't really make sense to me. If you only set last_hid_msg when you send a code that you do support, then why would the value of last_hid_msg ever contain a type that you do not support? (assuming you always add an entry to this switch statement in the same patch that you add a corresponding write for the type).

Quoted 6 lines

Also, since you don't seem to be using last_hid_msg for anything else than printing this debug message, I'm wondering is there really any value for it? Previously (based on our IRC) discussion I understood that it had some actual functional value that helped determine what to send to the HAL, but now I'm not seeing it anywhere in the patch. I might have missed it though (in which case please enlighten me :)

I don't know if I understand you correctly, but at the end of all patches it looks like this.

         switch (dev->last_hid_msg) {
        case HID_MSG_GET_PROTOCOL:
        case HID_MSG_SET_PROTOCOL:
                bt_hid_notify_proto_mode(dev, buf, bread);
                break;
        case HID_MSG_GET_REPORT:
                bt_hid_notify_get_report(dev, buf, bread);
                break;
        default:
                DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
        }

based on last_hid_msg switch case, it will call respective function, default statement is for debug purpose if we miss something from hid device.

Thanks,
Ravi.

#10 lore raw

Hi Ravi,

Quoted 49 lines · Ravi Kumar Veeramally
Quoted 29 lines · Ravi kumar Veeramally
Quoted 12 lines
android/hid.c +12 -0
+static gboolean ctrl_io_watch_cb(GIOChannel *chan, gpointer data)
+{
+	struct hid_device *dev = data;
+	int fd, bread;
+	uint8_t buf[UHID_DATA_MAX];
+
+	DBG("");
+
+	fd = g_io_channel_unix_get_fd(chan);
+	bread = read(fd, buf, sizeof(buf));
+	if (bread < 0) {
+		error("read: %s(%d)", strerror(errno), -errno);

android/hid.c static gboolean intr_watch_cb(GIOChannel *chan, GIOCondition cond, · line 306

Quoted 10 lines
android/hid.c +10 -0
+		return TRUE;
+	}
+
+	switch (dev->last_hid_msg) {
+	case HID_MSG_GET_PROTOCOL:
+		bt_hid_notify_proto_mode(dev, buf, bread);
+		break;
+	default:
+		DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
+	}

This doesn't really make sense to me. If you only set last_hid_msg when you send a code that you do support, then why would the value of last_hid_msg ever contain a type that you do not support? (assuming you always add an entry to this switch statement in the same patch that you add a corresponding write for the type).

Quoted 6 lines

Also, since you don't seem to be using last_hid_msg for anything else than printing this debug message, I'm wondering is there really any value for it? Previously (based on our IRC) discussion I understood that it had some actual functional value that helped determine what to send to the HAL, but now I'm not seeing it anywhere in the patch. I might have missed it though (in which case please enlighten me :)

I don't know if I understand you correctly, but at the end of all patches it looks like this.

         switch (dev->last_hid_msg) {
        case HID_MSG_GET_PROTOCOL:
        case HID_MSG_SET_PROTOCOL:
                bt_hid_notify_proto_mode(dev, buf, bread);
                break;
        case HID_MSG_GET_REPORT:
                bt_hid_notify_get_report(dev, buf, bread);
                break;
        default:
                DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
        }
Quoted 2 lines

based on last_hid_msg switch case, it will call respective function, default statement is for debug purpose if we miss something from hid device.

I only saw the first two case statements and didn't look deeper into the patch set, sorry. In this case I do see the point of the variable and you may keep it as is.

My earlier comment about the debug statement still holds though, i.e. if the default entry gets triggered last_hid_msg will not contain the unknown msg type. In this case this will simply be an unexpected message whose type we do not know (and if there's a debug log that's what it should say).

Johan

#11 lore raw

Hi Johan,

Quoted 54 lines

Hi Ravi,

Quoted 51 lines · Ravi Kumar Veeramally
Quoted 29 lines · Ravi kumar Veeramally
Quoted 12 lines
android/hid.c +12 -0
+static gboolean ctrl_io_watch_cb(GIOChannel *chan, gpointer data)
+{
+	struct hid_device *dev = data;
+	int fd, bread;
+	uint8_t buf[UHID_DATA_MAX];
+
+	DBG("");
+
+	fd = g_io_channel_unix_get_fd(chan);
+	bread = read(fd, buf, sizeof(buf));
+	if (bread < 0) {
+		error("read: %s(%d)", strerror(errno), -errno);

android/hid.c static gboolean intr_watch_cb(GIOChannel *chan, GIOCondition cond, · line 306

Quoted 10 lines
android/hid.c +10 -0
+		return TRUE;
+	}
+
+	switch (dev->last_hid_msg) {
+	case HID_MSG_GET_PROTOCOL:
+		bt_hid_notify_proto_mode(dev, buf, bread);
+		break;
+	default:
+		DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
+	}

This doesn't really make sense to me. If you only set last_hid_msg when you send a code that you do support, then why would the value of last_hid_msg ever contain a type that you do not support? (assuming you always add an entry to this switch statement in the same patch that you add a corresponding write for the type).

Quoted 3 lines

Also, since you don't seem to be using last_hid_msg for anything else than printing this debug message, I'm wondering is there really any value for it? Previously (based on our IRC) discussion I understood

that

Quoted 3 lines

it had some actual functional value that helped determine what to send to the HAL, but now I'm not seeing it anywhere in the patch. I might have missed it though (in which case please enlighten me :)

I don't know if I understand you correctly, but at the end of all
patches
it looks like this.

         switch (dev->last_hid_msg) {
        case HID_MSG_GET_PROTOCOL:
        case HID_MSG_SET_PROTOCOL:
                bt_hid_notify_proto_mode(dev, buf, bread);
                break;
        case HID_MSG_GET_REPORT:
                bt_hid_notify_get_report(dev, buf, bread);
                break;
        default:
                DBG("unhandled hid msg type 0x%02x", dev->last_hid_msg);
        }
Quoted 7 lines
Quoted 3 lines

based on last_hid_msg switch case, it will call respective function, default statement is for debug purpose if we miss something from hid device.

I only saw the first two case statements and didn't look deeper into the patch set, sorry. In this case I do see the point of the variable and you may keep it as is.

Ok, np.

Quoted 6 lines

My earlier comment about the debug statement still holds though, i.e. if the default entry gets triggered last_hid_msg will not contain the unknown msg type. In this case this will simply be an unexpected message whose type we do not know (and if there's a debug log that's what it should say).

I will remove the debug statement which doesn't help much.

Thanks,
Ravi.