Changeset 252e30c in mainline for uspace/drv/usbkbd/main.c
- Timestamp:
- 2011-03-24T22:55:29Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 0d92638
- Parents:
- 476b71ff
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/usbkbd/main.c
r476b71ff r252e30c 70 70 * @retval EOK if successful. 71 71 * @retval ENOMEM if there 72 * @return Other error code inherited from one of functions usb hid_kbd_init(),72 * @return Other error code inherited from one of functions usb_kbd_init(), 73 73 * ddf_fun_bind() and ddf_fun_add_to_class(). 74 74 * 75 * @sa usb hid_kbd_fibril(), usbhid_kbd_repeat_fibril()75 * @sa usb_kbd_fibril(), usb_kbd_repeat_fibril() 76 76 */ 77 77 static int usbhid_try_add_device(usb_device_t *dev) … … 90 90 usb_log_debug("Initializing USB/HID KBD device...\n"); 91 91 92 usb hid_kbd_t *kbd_dev = usbhid_kbd_new();92 usb_kbd_t *kbd_dev = usb_kbd_new(); 93 93 if (kbd_dev == NULL) { 94 94 usb_log_error("Error while creating USB/HID KBD device " … … 98 98 } 99 99 100 int rc = usb hid_kbd_init(kbd_dev, dev);100 int rc = usb_kbd_init(kbd_dev, dev); 101 101 102 102 if (rc != EOK) { 103 103 usb_log_error("Failed to initialize USB/HID KBD device.\n"); 104 104 ddf_fun_destroy(kbd_fun); 105 usb hid_kbd_free(&kbd_dev);105 usb_kbd_free(&kbd_dev); 106 106 return rc; 107 107 } … … 122 122 // TODO: Can / should I destroy the DDF function? 123 123 ddf_fun_destroy(kbd_fun); 124 usb hid_kbd_free(&kbd_dev);124 usb_kbd_free(&kbd_dev); 125 125 return rc; 126 126 } … … 133 133 // TODO: Can / should I destroy the DDF function? 134 134 ddf_fun_destroy(kbd_fun); 135 usb hid_kbd_free(&kbd_dev);135 usb_kbd_free(&kbd_dev); 136 136 return rc; 137 137 } … … 140 140 * Create new fibril for handling this keyboard 141 141 */ 142 //fid_t fid = fibril_create(usb hid_kbd_fibril, kbd_dev);142 //fid_t fid = fibril_create(usb_kbd_fibril, kbd_dev); 143 143 144 144 /* Start automated polling function. … … 148 148 rc = usb_device_auto_poll(dev, 149 149 /* Index of the polling pipe. */ 150 USB HID_KBD_POLL_EP_NO,150 USB_KBD_POLL_EP_NO, 151 151 /* Callback when data arrives. */ 152 usb hid_kbd_polling_callback,152 usb_kbd_polling_callback, 153 153 /* How much data to request. */ 154 dev->pipes[USB HID_KBD_POLL_EP_NO].pipe->max_packet_size,154 dev->pipes[USB_KBD_POLL_EP_NO].pipe->max_packet_size, 155 155 /* Callback when the polling ends. */ 156 usb hid_kbd_polling_ended_callback,156 usb_kbd_polling_ended_callback, 157 157 /* Custom argument. */ 158 158 kbd_dev); … … 169 169 * Create new fibril for auto-repeat 170 170 */ 171 fid_t fid = fibril_create(usb hid_kbd_repeat_fibril, kbd_dev);171 fid_t fid = fibril_create(usb_kbd_repeat_fibril, kbd_dev); 172 172 if (fid == 0) { 173 173 usb_log_error("Failed to start fibril for KBD auto-repeat"); … … 233 233 .name = NAME, 234 234 .ops = &usbhid_driver_ops, 235 .endpoints = usb hid_kbd_endpoints235 .endpoints = usb_kbd_endpoints 236 236 }; 237 237
Note:
See TracChangeset
for help on using the changeset viewer.