Index: uspace/drv/bus/usb/usbhid/generic/hiddev.c =================================================================== --- uspace/drv/bus/usb/usbhid/generic/hiddev.c (revision ebc9c2cfd20bdd5c2f62803f849f0b88de5212c0) +++ uspace/drv/bus/usb/usbhid/generic/hiddev.c (revision 54a1ca73a9e9c3abb6bdcc1ae84ff0213fe6f721) @@ -35,7 +35,4 @@ */ -/* XXX Fix this */ -#define _DDF_DATA_IMPLANT - #include #include Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/bus/usb/usbhid/kbd/kbddev.c (revision ebc9c2cfd20bdd5c2f62803f849f0b88de5212c0) +++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c (revision 54a1ca73a9e9c3abb6bdcc1ae84ff0213fe6f721) @@ -34,7 +34,4 @@ * USB HID keyboard device structure and API. */ - -/* XXX Fix this */ -#define _DDF_DATA_IMPLANT #include @@ -479,19 +476,52 @@ } -/* HID/KBD structure manipulation */ - -static int usb_kbd_create_function(usb_kbd_t *kbd_dev) -{ - assert(kbd_dev != NULL); - assert(kbd_dev->hid_dev != NULL); - assert(kbd_dev->hid_dev->usb_dev != NULL); +/* API functions */ + +/** + * Initialization of the USB/HID keyboard structure. + * + * This functions initializes required structures from the device's descriptors. + * + * During initialization, the keyboard is switched into boot protocol, the idle + * rate is set to 0 (infinity), resulting in the keyboard only reporting event + * when a key is pressed or released. Finally, the LED lights are turned on + * according to the default setup of lock keys. + * + * @note By default, the keyboards is initialized with Num Lock turned on and + * other locks turned off. + * + * @param kbd_dev Keyboard device structure to be initialized. + * @param dev DDF device structure of the keyboard. + * + * @retval EOK if successful. + * @retval EINVAL if some parameter is not given. + * @return Other value inherited from function usbhid_dev_init(). + */ +int usb_kbd_init(usb_hid_dev_t *hid_dev, void **data) +{ + ddf_fun_t *fun = NULL; + usb_kbd_t *kbd_dev = NULL; + usb_hid_report_path_t *path = NULL; + bool bound = false; + fid_t fid = 0; + int rc; + + usb_log_debug("Initializing HID/KBD structure...\n"); + + if (hid_dev == NULL) { + usb_log_error( + "Failed to init keyboard structure: no structure given.\n"); + rc = EINVAL; + goto error; + } /* Create the exposed function. */ usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME); - ddf_fun_t *fun = ddf_fun_create(kbd_dev->hid_dev->usb_dev->ddf_dev, - fun_exposed, HID_KBD_FUN_NAME); + fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, + HID_KBD_FUN_NAME); if (fun == NULL) { usb_log_error("Could not create DDF function node.\n"); - return ENOMEM; + rc = ENOMEM; + goto error; } @@ -499,13 +529,131 @@ * to the DDF function. */ ddf_fun_set_ops(fun, &kbdops); - ddf_fun_data_implant(fun, kbd_dev); - - int rc = ddf_fun_bind(fun); + + kbd_dev = ddf_fun_data_alloc(fun, sizeof(usb_kbd_t)); + if (kbd_dev == NULL) { + usb_log_error("Failed to allocate KBD device structure.\n"); + rc = ENOMEM; + goto error; + } + + kbd_dev->fun = fun; + + /* Default values */ + fibril_mutex_initialize(&kbd_dev->repeat_mtx); + kbd_dev->initialized = USB_KBD_STATUS_UNINITIALIZED; + + /* Store link to HID device */ + kbd_dev->hid_dev = hid_dev; + + /* Modifiers and locks */ + kbd_dev->mods = DEFAULT_ACTIVE_MODS; + + /* Autorepeat */ + kbd_dev->repeat.delay_before = DEFAULT_DELAY_BEFORE_FIRST_REPEAT; + kbd_dev->repeat.delay_between = DEFAULT_REPEAT_DELAY; + + // TODO: make more general + path = usb_hid_report_path(); + if (path == NULL) { + usb_log_error("Failed to create kbd report path.\n"); + rc = ENOMEM; + goto error; + } + + rc = usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); + if (rc != EOK) { + usb_log_error("Failed to append item to kbd report path.\n"); + goto error; + } + + usb_hid_report_path_set_report_id(path, 0); + + kbd_dev->key_count = + usb_hid_report_size(&hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); + + usb_hid_report_path_free(path); + path = NULL; + + usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count); + + kbd_dev->keys = calloc(kbd_dev->key_count, sizeof(int32_t)); + if (kbd_dev->keys == NULL) { + usb_log_error("Failed to allocate key buffer.\n"); + rc = ENOMEM; + goto error; + } + + kbd_dev->keys_old = calloc(kbd_dev->key_count, sizeof(int32_t)); + if (kbd_dev->keys_old == NULL) { + usb_log_error("Failed to allocate old_key buffer.\n"); + rc = ENOMEM; + goto error; + } + + /* Output report */ + kbd_dev->output_size = 0; + kbd_dev->output_buffer = usb_hid_report_output(&hid_dev->report, + &kbd_dev->output_size, 0); + if (kbd_dev->output_buffer == NULL) { + usb_log_error("Error creating output report buffer.\n"); + rc = ENOMEM; + goto error; + } + + usb_log_debug("Output buffer size: %zu\n", kbd_dev->output_size); + + kbd_dev->led_path = usb_hid_report_path(); + if (kbd_dev->led_path == NULL) { + usb_log_error("Failed to create kbd led report path.\n"); + rc = ENOMEM; + goto error; + } + + rc = usb_hid_report_path_append_item( + kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0); + if (rc != EOK) { + usb_log_error("Failed to append to kbd/led report path.\n"); + goto error; + } + + kbd_dev->led_output_size = usb_hid_report_size( + &hid_dev->report, 0, USB_HID_REPORT_TYPE_OUTPUT); + + usb_log_debug("Output report size (in items): %zu\n", + kbd_dev->led_output_size); + + kbd_dev->led_data = calloc(kbd_dev->led_output_size, sizeof(int32_t)); + if (kbd_dev->led_data == NULL) { + usb_log_error("Error creating buffer for LED output report.\n"); + rc = ENOMEM; + goto error; + } + + /* Set LEDs according to initial setup. + * Set Idle rate */ + usb_kbd_set_led(hid_dev, kbd_dev); + + usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, + hid_dev->usb_dev->interface_no, IDLE_RATE); + + /* Create new fibril for auto-repeat. */ + fid = fibril_create(usb_kbd_repeat_fibril, kbd_dev); + if (fid == 0) { + usb_log_error("Failed to start fibril for KBD auto-repeat"); + rc = ENOMEM; + goto error; + } + + kbd_dev->initialized = USB_KBD_STATUS_INITIALIZED; + usb_log_debug("HID/KBD device structure initialized.\n"); + + rc = ddf_fun_bind(fun); if (rc != EOK) { usb_log_error("Could not bind DDF function: %s.\n", str_error(rc)); - ddf_fun_destroy(fun); - return rc; - } + goto error; + } + + bound = true; usb_log_debug("%s function created. Handle: %" PRIun "\n", @@ -519,180 +667,32 @@ "Could not add DDF function to category %s: %s.\n", HID_KBD_CATEGORY, str_error(rc)); - if (ddf_fun_unbind(fun) == EOK) { - ddf_fun_destroy(fun); - } else { - usb_log_error( - "Failed to unbind `%s', will not destroy.\n", - ddf_fun_get_name(fun)); - } - return rc; - } - kbd_dev->fun = fun; - - return EOK; -} - -/* API functions */ - -/** - * Initialization of the USB/HID keyboard structure. - * - * This functions initializes required structures from the device's descriptors. - * - * During initialization, the keyboard is switched into boot protocol, the idle - * rate is set to 0 (infinity), resulting in the keyboard only reporting event - * when a key is pressed or released. Finally, the LED lights are turned on - * according to the default setup of lock keys. - * - * @note By default, the keyboards is initialized with Num Lock turned on and - * other locks turned off. - * - * @param kbd_dev Keyboard device structure to be initialized. - * @param dev DDF device structure of the keyboard. - * - * @retval EOK if successful. - * @retval EINVAL if some parameter is not given. - * @return Other value inherited from function usbhid_dev_init(). - */ -int usb_kbd_init(usb_hid_dev_t *hid_dev, void **data) -{ - usb_log_debug("Initializing HID/KBD structure...\n"); - - if (hid_dev == NULL) { - usb_log_error( - "Failed to init keyboard structure: no structure given.\n"); - return EINVAL; - } - - usb_kbd_t *kbd_dev = calloc(1, sizeof(usb_kbd_t)); - if (kbd_dev == NULL) { - usb_log_error("Failed to allocate KBD device structure.\n"); - return ENOMEM; - } - /* Default values */ - fibril_mutex_initialize(&kbd_dev->repeat_mtx); - kbd_dev->initialized = USB_KBD_STATUS_UNINITIALIZED; - - /* Store link to HID device */ - kbd_dev->hid_dev = hid_dev; - - /* Modifiers and locks */ - kbd_dev->mods = DEFAULT_ACTIVE_MODS; - - /* Autorepeat */ - kbd_dev->repeat.delay_before = DEFAULT_DELAY_BEFORE_FIRST_REPEAT; - kbd_dev->repeat.delay_between = DEFAULT_REPEAT_DELAY; - - - // TODO: make more general - usb_hid_report_path_t *path = usb_hid_report_path(); - if (path == NULL) { - usb_log_error("Failed to create kbd report path.\n"); - usb_kbd_destroy(kbd_dev); - return ENOMEM; - } - - int ret = - usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_KEYBOARD, 0); - if (ret != EOK) { - usb_log_error("Failed to append item to kbd report path.\n"); - usb_hid_report_path_free(path); - usb_kbd_destroy(kbd_dev); - return ret; - } - - usb_hid_report_path_set_report_id(path, 0); - - kbd_dev->key_count = - usb_hid_report_size(&hid_dev->report, 0, USB_HID_REPORT_TYPE_INPUT); - - usb_hid_report_path_free(path); - - usb_log_debug("Size of the input report: %zu\n", kbd_dev->key_count); - - kbd_dev->keys = calloc(kbd_dev->key_count, sizeof(int32_t)); - if (kbd_dev->keys == NULL) { - usb_log_error("Failed to allocate key buffer.\n"); - usb_kbd_destroy(kbd_dev); - return ENOMEM; - } - - kbd_dev->keys_old = calloc(kbd_dev->key_count, sizeof(int32_t)); - if (kbd_dev->keys_old == NULL) { - usb_log_error("Failed to allocate old_key buffer.\n"); - usb_kbd_destroy(kbd_dev); - return ENOMEM; - } - - /* Output report */ - kbd_dev->output_size = 0; - kbd_dev->output_buffer = usb_hid_report_output(&hid_dev->report, - &kbd_dev->output_size, 0); - if (kbd_dev->output_buffer == NULL) { - usb_log_error("Error creating output report buffer.\n"); - usb_kbd_destroy(kbd_dev); - return ENOMEM; - } - - usb_log_debug("Output buffer size: %zu\n", kbd_dev->output_size); - - kbd_dev->led_path = usb_hid_report_path(); - if (kbd_dev->led_path == NULL) { - usb_log_error("Failed to create kbd led report path.\n"); - usb_kbd_destroy(kbd_dev); - return ENOMEM; - } - - ret = usb_hid_report_path_append_item( - kbd_dev->led_path, USB_HIDUT_PAGE_LED, 0); - if (ret != EOK) { - usb_log_error("Failed to append to kbd/led report path.\n"); - usb_kbd_destroy(kbd_dev); - return ret; - } - - kbd_dev->led_output_size = usb_hid_report_size( - &hid_dev->report, 0, USB_HID_REPORT_TYPE_OUTPUT); - - usb_log_debug("Output report size (in items): %zu\n", - kbd_dev->led_output_size); - - kbd_dev->led_data = calloc(kbd_dev->led_output_size, sizeof(int32_t)); - if (kbd_dev->led_data == NULL) { - usb_log_error("Error creating buffer for LED output report.\n"); - usb_kbd_destroy(kbd_dev); - return ENOMEM; - } - - /* Set LEDs according to initial setup. - * Set Idle rate */ - usb_kbd_set_led(hid_dev, kbd_dev); - - usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, - hid_dev->usb_dev->interface_no, IDLE_RATE); + goto error; + } + + fibril_add_ready(fid); /* Save the KBD device structure into the HID device structure. */ *data = kbd_dev; - kbd_dev->initialized = USB_KBD_STATUS_INITIALIZED; - usb_log_debug("HID/KBD device structure initialized.\n"); - - usb_log_debug("Creating KBD function...\n"); - ret = usb_kbd_create_function(kbd_dev); - if (ret != EOK) { - usb_kbd_destroy(kbd_dev); - return ret; - } - - /* Create new fibril for auto-repeat. */ - fid_t fid = fibril_create(usb_kbd_repeat_fibril, kbd_dev); - if (fid == 0) { - usb_log_error("Failed to start fibril for KBD auto-repeat"); - usb_kbd_destroy(kbd_dev); - return ENOMEM; - } - fibril_add_ready(fid); - return EOK; +error: + if (bound) + ddf_fun_unbind(fun); + if (fid != 0) + fibril_destroy(fid); + if (kbd_dev != NULL) { + free(kbd_dev->led_data); + if (kbd_dev->led_path != NULL) + usb_hid_report_path_free(kbd_dev->led_path); + if (kbd_dev->output_buffer != NULL) + usb_hid_report_output_free(kbd_dev->output_buffer); + free(kbd_dev->keys_old); + free(kbd_dev->keys); + } + if (path != NULL) + usb_hid_report_path_free(path); + if (fun != NULL) + ddf_fun_destroy(fun); + return rc; } @@ -749,14 +749,6 @@ usb_hid_report_output_free(kbd_dev->output_buffer); - if (kbd_dev->fun) { - if (ddf_fun_unbind(kbd_dev->fun) != EOK) { - usb_log_warning("Failed to unbind %s.\n", - ddf_fun_get_name(kbd_dev->fun)); - } else { - usb_log_debug2("%s unbound.\n", - ddf_fun_get_name(kbd_dev->fun)); - ddf_fun_destroy(kbd_dev->fun); - } - } + ddf_fun_unbind(kbd_dev->fun); + ddf_fun_destroy(kbd_dev->fun); } Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision ebc9c2cfd20bdd5c2f62803f849f0b88de5212c0) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision 54a1ca73a9e9c3abb6bdcc1ae84ff0213fe6f721) @@ -34,7 +34,4 @@ * USB Mouse driver API. */ - -/* XXX Fix this */ -#define _DDF_DATA_IMPLANT #include @@ -249,54 +246,4 @@ } -#define FUN_UNBIND_DESTROY(fun) \ -if (fun) { \ - if (ddf_fun_unbind((fun)) == EOK) { \ - ddf_fun_destroy((fun)); \ - } else { \ - usb_log_error("Could not unbind function `%s', it " \ - "will not be destroyed.\n", ddf_fun_get_name(fun)); \ - } \ -} else (void)0 - -static int usb_mouse_create_function(usb_hid_dev_t *hid_dev, usb_mouse_t *mouse) -{ - assert(hid_dev != NULL); - assert(mouse != NULL); - - /* Create the exposed function. */ - usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME); - ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, - HID_MOUSE_FUN_NAME); - if (fun == NULL) { - usb_log_error("Could not create DDF function node `%s'.\n", - HID_MOUSE_FUN_NAME); - return ENOMEM; - } - - ddf_fun_set_ops(fun, &ops); - ddf_fun_data_implant(fun, mouse); - - int rc = ddf_fun_bind(fun); - if (rc != EOK) { - usb_log_error("Could not bind DDF function `%s': %s.\n", - ddf_fun_get_name(fun), str_error(rc)); - ddf_fun_destroy(fun); - return rc; - } - - usb_log_debug("Adding DDF function `%s' to category %s...\n", - ddf_fun_get_name(fun), HID_MOUSE_CATEGORY); - rc = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY); - if (rc != EOK) { - usb_log_error( - "Could not add DDF function to category %s: %s.\n", - HID_MOUSE_CATEGORY, str_error(rc)); - FUN_UNBIND_DESTROY(fun); - return rc; - } - mouse->mouse_fun = fun; - return EOK; -} - /** Get highest index of a button mentioned in given report. * @@ -341,4 +288,9 @@ int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data) { + ddf_fun_t *fun = NULL; + usb_mouse_t *mouse_dev = NULL; + bool bound = false; + int rc; + usb_log_debug("Initializing HID/Mouse structure...\n"); @@ -346,12 +298,27 @@ usb_log_error("Failed to init mouse structure: no structure" " given.\n"); - return EINVAL; - } - - usb_mouse_t *mouse_dev = calloc(1, sizeof(usb_mouse_t)); + rc = EINVAL; + goto error; + } + + /* Create the exposed function. */ + usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME); + fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, + HID_MOUSE_FUN_NAME); + if (fun == NULL) { + usb_log_error("Could not create DDF function node `%s'.\n", + HID_MOUSE_FUN_NAME); + rc = ENOMEM; + goto error; + } + + ddf_fun_set_ops(fun, &ops); + + mouse_dev = ddf_fun_data_alloc(fun, sizeof(usb_mouse_t)); if (mouse_dev == NULL) { usb_log_error("Error while creating USB/HID Mouse device " "structure.\n"); - return ENOMEM; + rc = ENOMEM; + goto error; } @@ -368,6 +335,6 @@ if (mouse_dev->buttons == NULL) { usb_log_error(NAME ": out of memory, giving up on device!\n"); - free(mouse_dev); - return ENOMEM; + rc = ENOMEM; + goto error; } @@ -376,15 +343,35 @@ hid_dev->usb_dev->interface_no, IDLE_RATE); - int rc = usb_mouse_create_function(hid_dev, mouse_dev); + rc = ddf_fun_bind(fun); if (rc != EOK) { - free(mouse_dev->buttons); - free(mouse_dev); - return rc; - } + usb_log_error("Could not bind DDF function `%s': %s.\n", + ddf_fun_get_name(fun), str_error(rc)); + goto error; + } + + bound = true; + + usb_log_debug("Adding DDF function `%s' to category %s...\n", + ddf_fun_get_name(fun), HID_MOUSE_CATEGORY); + rc = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY); + if (rc != EOK) { + usb_log_error("Could not add DDF function to category %s: " + "%s.\n", HID_MOUSE_CATEGORY, str_error(rc)); + goto error; + } + + mouse_dev->mouse_fun = fun; /* Save the Mouse device structure into the HID device structure. */ *data = mouse_dev; - return EOK; +error: + if (bound) + ddf_fun_unbind(fun); + if (mouse_dev != NULL) + free(mouse_dev->buttons); + if (fun != NULL) + ddf_fun_destroy(fun); + return rc; } @@ -417,7 +404,7 @@ } - FUN_UNBIND_DESTROY(mouse_dev->mouse_fun); - + ddf_fun_unbind(mouse_dev->mouse_fun); free(mouse_dev->buttons); + ddf_fun_destroy(mouse_dev->mouse_fun); }