From 1bfd5ef6d8eeb51660d7c43bcaa3d68a8cdbbe22 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Tue, 10 Jul 2012 18:54:09 -0300 Subject: [PATCH] hog: Use real values for vendor and product IDs This patch replaces the hard-code values for vendor and product IDs by the values obtained from the device core functions. Vendor and product IDs are read from the remote's Device Information Service. --- profiles/input/hog_device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/profiles/input/hog_device.c b/profiles/input/hog_device.c index 85c39e126..b197098d1 100644 --- a/profiles/input/hog_device.c +++ b/profiles/input/hog_device.c @@ -177,6 +177,7 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen, struct hog_device *hogdev = user_data; uint8_t value[HOG_REPORT_MAP_MAX_SIZE]; struct uhid_event ev; + uint16_t vendor_src, vendor, product, version; ssize_t vlen; int i; @@ -199,15 +200,21 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen, DBG("\t %02x %02x", value[i], value[i + 1]); } + vendor_src = btd_device_get_vendor_src(hogdev->device); + vendor = btd_device_get_vendor(hogdev->device); + product = btd_device_get_product(hogdev->device); + version = btd_device_get_version(hogdev->device); + DBG("DIS information: vendor_src=0x%X, vendor=0x%X, product=0x%X, " + "version=0x%X", vendor_src, vendor, product, version); + /* create uHID device */ memset(&ev, 0, sizeof(ev)); ev.type = UHID_CREATE; - /* TODO: get info from DIS */ strcpy((char *) ev.u.create.name, "bluez-hog-device"); - ev.u.create.vendor = 0xBEBA; - ev.u.create.product = 0xCAFE; - ev.u.create.version = 0; - ev.u.create.country = 0; + ev.u.create.vendor = vendor; + ev.u.create.product = product; + ev.u.create.version = version; + ev.u.create.country = 0; /* get this info from the right place */ ev.u.create.bus = BUS_BLUETOOTH; ev.u.create.rd_data = value; ev.u.create.rd_size = vlen; -- 2.47.3