Changes in uspace/drv/bus/usb/usbhid/main.c [bb70637:920d0fc] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbhid/main.c
rbb70637 r920d0fc 65 65 } 66 66 67 if ( usb_device_get_iface_number(dev)< 0) {67 if (dev->interface_no < 0) { 68 68 usb_log_error("Failed to add HID device: endpoints not found." 69 69 "\n"); … … 89 89 * This will create a separate fibril that will query the device 90 90 * for the data continuously. */ 91 rc = usb_device_auto_poll_desc(dev,91 rc = usb_device_auto_poll(dev, 92 92 /* Index of the polling pipe. */ 93 hid_dev->poll_pipe_ mapping->description,93 hid_dev->poll_pipe_index, 94 94 /* Callback when data arrives. */ 95 95 usb_hid_polling_callback, 96 96 /* How much data to request. */ 97 hid_dev->poll_pipe_mapping->pipe.max_packet_size, 98 /* Delay */ 99 -1, 97 dev->pipes[hid_dev->poll_pipe_index].pipe.max_packet_size, 100 98 /* Callback when the polling ends. */ 101 99 usb_hid_polling_ended_callback, … … 105 103 if (rc != EOK) { 106 104 usb_log_error("Failed to start polling fibril for `%s'.\n", 107 usb_device_get_name(dev));105 ddf_dev_get_name(dev->ddf_dev)); 108 106 usb_hid_deinit(hid_dev); 109 107 return rc; … … 111 109 hid_dev->running = true; 112 110 113 usb_log_info("HID device `%s' ready.\n", usb_device_get_name(dev)); 111 usb_log_info("HID device `%s' ready to use.\n", 112 ddf_dev_get_name(dev->ddf_dev)); 114 113 115 114 return EOK; … … 138 137 { 139 138 assert(dev); 140 usb_hid_dev_t *hid_dev = usb_device_data_get(dev);141 assert(hid_dev);139 assert(dev->driver_data); 140 usb_hid_dev_t *hid_dev = dev->driver_data; 142 141 unsigned tries = 100; 143 142 /* Wait for fail. */ … … 151 150 152 151 usb_hid_deinit(hid_dev); 153 usb_log_debug2("%s destruction complete.\n", usb_device_get_name(dev));152 usb_log_debug2("%s destruction complete.\n", ddf_dev_get_name(dev->ddf_dev)); 154 153 return EOK; 155 154 }
Note:
See TracChangeset
for help on using the changeset viewer.