Fix ascii to hex conversion in HAL to deamon ipc PDU
cover Fix ascii to hex conversion in HAL to deamon ipc PDU
In case of set report and send data HAL receives the data in ascii format but it should be in hex. This patch set updates the document, provides utility and fix the issue in set report case.
Ravi kumar Veeramally (3):
android/hid: Remove fixed number of hid set report data length in ipc
doc
android/hid: Add a ascii2hex utility
android/hid: Fix set report data format
android/Android.mk | 1 + android/Makefile.am | 2 +- android/hal-ipc-api.txt | 2 +- android/hal-msg.h | 2 +- android/hid.c | 12 +++++++--- android/utils.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ android/utils.h | 3 +++ 7 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 android/utils.c
Signature · 1 line
1.8.3.2
RFC 1/3 android/hid: Remove fixed number of hid set report data length in ipc doc
HAL receives data in ascii format but it should be in hex format. So remove fixed size of report data length and depend on report length parameter.
--- android/hal-ipc-api.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
android/hal-ipc-api.txt +1 -1
@@ -553,7 +553,7 @@ Commands and responses: Command parameters: Remote address (6 octets) Report type (1 octet) Report length (2 octets) - Report data (670 octets) + Report data (Report length) Response parameters: <none>
Signature · 1 line
1.8.3.2
RFC 2/3 android/hid: Add a ascii2hex utility
In reply to Ravi kumar VeeramallyData from few interfaces on HAL is in ascii format but it should be in hex format. This conversion utility does that job.
--- android/Android.mk | 1 + android/Makefile.am | 2 +- android/utils.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ android/utils.h | 3 +++ 4 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 android/utils.c
android/Android.mk +1 -0
@@ -27,6 +27,7 @@ LOCAL_SRC_FILES := \ ipc.c ipc.h \ a2dp.c \ pan.c \ + utils.c \ ../src/log.c \ ../src/shared/mgmt.c \ ../src/shared/util.c \
android/Makefile.am +1 -1
@@ -9,7 +9,7 @@ noinst_PROGRAMS += android/bluetoothd android_bluetoothd_SOURCES = android/main.c \ src/log.c \ android/hal-msg.h \ - android/utils.h \ + android/utils.h android/utils.c \ src/sdpd-database.c src/sdpd-server.c \ src/sdpd-service.c src/sdpd-request.c \ src/glib-helper.h src/glib-helper.c \
android/utils.c new file +60 -0
60 lines not on this page · raw message
android/utils.h +3 -0
@@ -21,6 +21,7 @@* */ +#include "lib/bluetooth.h" static inline void android2bdaddr (const void *buf,bdaddr_t *dst) {
@@ -31,3 +32,5 @@ static inline void bdaddr2android(const bdaddr_t *src, void *buf) {baswap (buf, src); } + +int ascii2hex (const uint8_t *ascii,int ascii_len,uint8_t *hex);
Signature · 1 line
1.8.3.2
RFC 3/3 android/hid: Fix set report data format
In reply to Ravi kumar VeeramallyData is in ascii format from HAL. Convert it to hex and send it to hid device.
--- android/hal-msg.h | 2 +- android/hid.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-)
android/hal-msg.h +1 -1
@@ -293,7 +293,7 @@ struct hal_cmd_hid_set_report {uint8_t bdaddr[6 ];uint8_t type;uint16_t len; -uint8_t data[670 ]; +uint8_t data[0 ]; } __attribute__((packed));#define HAL_OP_HID_SEND_DATA 0x09
android/hid.c +9 -3
@@ -898,18 +898,24 @@ static uint8_t bt_hid_set_report(struct hal_cmd_hid_set_report *cmd,return HAL_STATUS_FAILED ; dev = l->data; - req_size =1 + cmd->len; +/* Report data coming from HAL is in ascii format, so convert +* it to hex and calculate length according to it. */ + req_size =1 + ((cmd->len +1 ) /2 ); 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 ); + +if (!ascii2hex (cmd->data, cmd->len, (req +1 ))) { +g_free (req); +return HAL_STATUS_FAILED ; + } fd =g_io_channel_unix_get_fd (dev->ctrl_io);if (write (fd, req, req_size) <0 ) { -error ("error while querying device protocol" ); +error ("error while sending report" );g_free (req);return HAL_STATUS_FAILED ; }
Signature · 1 line
1.8.3.2