diff options
| author | Jakub Tyszkowski <jakub.tyszkowski@tieto.com> | 2014-11-20 12:18:50 +0100 |
|---|---|---|
| committer | Szymon Janc <szymon.janc@tieto.com> | 2014-11-20 16:10:39 +0100 |
| commit | 7dd84bf957e5db7211daa096eac1312bb1607d89 (patch) | |
| tree | d5461beebc3c760745a57dcdf4718d0e2a9ab5e3 /android/hidhost.c | |
| parent | dc0108525a6d2e0387f869dc8304e8877adec344 (diff) | |
| download | bluez-7dd84bf957e5db7211daa096eac1312bb1607d89.tar.gz | |
android/hidhost: Support handshake message
Diffstat (limited to 'android/hidhost.c')
| -rw-r--r-- | android/hidhost.c | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/android/hidhost.c b/android/hidhost.c index 657fa8f0b..75e895b57 100644 --- a/android/hidhost.c +++ b/android/hidhost.c @@ -58,6 +58,7 @@ #define L2CAP_PSM_HIDP_INTR 0x13 /* HID message types */ +#define HID_MSG_HANDSHAKE 0x00 #define HID_MSG_CONTROL 0x10 #define HID_MSG_GET_REPORT 0x40 #define HID_MSG_SET_REPORT 0x50 @@ -65,6 +66,8 @@ #define HID_MSG_SET_PROTOCOL 0x70 #define HID_MSG_DATA 0xa0 +#define HID_MSG_TYPE_MASK 0xf0 + /* HID data types */ #define HID_DATA_TYPE_INPUT 0x01 #define HID_DATA_TYPE_OUTPUT 0x02 @@ -391,6 +394,22 @@ send: g_free(ev); } +static void bt_hid_notify_handshake(struct hid_device *dev, uint8_t *buf, + int len) +{ + struct hal_ev_hidhost_handshake ev; + + bdaddr2android(&dev->dst, ev.bdaddr); + + /* crop result code to handshake status range from HAL */ + ev.status = buf[0]; + if (ev.status > HAL_HIDHOST_HS_ERROR) + ev.status = HAL_HIDHOST_HS_ERROR; + + ipc_send_notif(hal_ipc, HAL_SERVICE_ID_HIDHOST, + HAL_EV_HIDHOST_HANDSHAKE, sizeof(ev), &ev); +} + static void bt_hid_notify_virtual_unplug(struct hid_device *dev, uint8_t *buf, int len) { @@ -441,8 +460,17 @@ static gboolean ctrl_io_watch_cb(GIOChannel *chan, gpointer data) break; } - if (buf[0] == (HID_MSG_CONTROL | HID_VIRTUAL_CABLE_UNPLUG)) - bt_hid_notify_virtual_unplug(dev, buf, bread); + switch (buf[0] & HID_MSG_TYPE_MASK) { + case HID_MSG_HANDSHAKE: + bt_hid_notify_handshake(dev, buf, bread); + break; + case HID_MSG_CONTROL: + if ((buf[0] & !HID_MSG_TYPE_MASK) == HID_VIRTUAL_CABLE_UNPLUG) + bt_hid_notify_virtual_unplug(dev, buf, bread); + break; + default: + break; + } /* reset msg type request */ dev->last_hid_msg = 0; |