Index: uspace/drv/bus/usb/usbmid/explore.c =================================================================== --- uspace/drv/bus/usb/usbmid/explore.c (revision feeac0d8cd6e0ce736779bc5f1dc701c5cf42ba6) +++ uspace/drv/bus/usb/usbmid/explore.c (revision 57c8fc93f54611667e4ee84440ca8cd4272cff4e) @@ -40,11 +40,5 @@ #include #include -#include #include "usbmid.h" - -/** Operations of the device itself. */ -static ddf_dev_ops_t mid_device_ops = { - .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl -}; /** Tell whether given interface is already in the list. @@ -56,5 +50,5 @@ static bool interface_in_list(const list_t *list, int interface_no) { - list_foreach(*list, link, usbmid_interface_t, iface) { + list_foreach(*list, link, const usbmid_interface_t, iface) { if (iface->interface_no == interface_no) { return true; @@ -71,7 +65,10 @@ * @param list List where to add the interfaces. */ -static void create_interfaces(const uint8_t *config_descriptor, - size_t config_descriptor_size, list_t *list) +static int create_interfaces(const uint8_t *config_descriptor, + size_t config_descriptor_size, list_t *list, usb_device_t *usb_dev) { + assert(config_descriptor); + assert(usb_dev); + const usb_dp_parser_data_t data = { .data = config_descriptor, @@ -89,5 +86,5 @@ /* Walk all descriptors nested in the current configuration decriptor; * i.e. all interface descriptors. */ - for (;interface_ptr != NULL; + for (; interface_ptr != NULL; interface_ptr = usb_dp_get_sibling_descriptor( &parser, &data, config_descriptor, interface_ptr)) @@ -106,17 +103,24 @@ continue; } - usbmid_interface_t *iface = malloc(sizeof(usbmid_interface_t)); - if (iface == NULL) { + + + usb_log_info("Creating child for interface %d (%s).\n", + interface->interface_number, + usb_str_class(interface->interface_class)); + + usbmid_interface_t *iface = NULL; + const int rc = usbmid_spawn_interface_child(usb_dev, &iface, + &usb_device_descriptors(usb_dev)->device, interface); + if (rc != EOK) { //TODO: Do something about that failure. - break; + usb_log_error("Failed to create interface child for " + "%d (%s): %s.\n", interface->interface_number, + usb_str_class(interface->interface_class), + str_error(rc)); + } else { + list_append(&iface->link, list); } - - link_initialize(&iface->link); - iface->fun = NULL; - iface->interface_no = interface->interface_number; - iface->interface = interface; - - list_append(&iface->link, list); } + return EOK; } @@ -129,9 +133,9 @@ * @return Whether to accept this device from devman. */ -bool usbmid_explore_device(usb_device_t *dev) +int usbmid_explore_device(usb_device_t *dev) { - int rc; - - unsigned dev_class = dev->descriptors.device.device_class; + assert(dev); + const unsigned dev_class = + usb_device_descriptors(dev)->device.device_class; if (dev_class != USB_CLASS_USE_INTERFACE) { usb_log_warning( @@ -139,37 +143,38 @@ dev_class, usb_str_class(dev_class), USB_CLASS_USE_INTERFACE); - usb_log_error("Not multi interface device, refusing.\n"); - return false; + usb_log_error("Not a multi-interface device, refusing.\n"); + return ENOTSUP; } - /* Shortcuts to save on typing ;-). */ - const void *config_descriptor_raw = dev->descriptors.configuration; - size_t config_descriptor_size = dev->descriptors.configuration_size; + /* Get coonfiguration descriptor. */ + const size_t config_descriptor_size = + usb_device_descriptors(dev)->full_config_size; + const void *config_descriptor_raw = + usb_device_descriptors(dev)->full_config; const usb_standard_configuration_descriptor_t *config_descriptor = config_descriptor_raw; /* Select the first configuration */ - rc = usb_request_set_configuration(&dev->ctrl_pipe, + int rc = usb_request_set_configuration(usb_device_get_default_pipe(dev), config_descriptor->configuration_number); if (rc != EOK) { usb_log_error("Failed to set device configuration: %s.\n", str_error(rc)); - return false; + return rc; } - + /* Create driver soft-state. */ usb_mid_t *usb_mid = usb_device_data_alloc(dev, sizeof(usb_mid_t)); if (!usb_mid) { usb_log_error("Failed to create USB MID structure.\n"); - return false; + return ENOMEM; } /* Create control function. */ - usb_mid->ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, "ctl"); + usb_mid->ctl_fun = usb_device_ddf_fun_create(dev, fun_exposed, "ctl"); if (usb_mid->ctl_fun == NULL) { usb_log_error("Failed to create control function.\n"); - return false; + return ENOMEM; } - ddf_fun_set_ops(usb_mid->ctl_fun, &mid_device_ops); /* Bind control function. */ @@ -179,28 +184,13 @@ str_error(rc)); ddf_fun_destroy(usb_mid->ctl_fun); - return false; + return rc; } - /* Create interface children. */ list_initialize(&usb_mid->interface_list); create_interfaces(config_descriptor_raw, config_descriptor_size, - &usb_mid->interface_list); + &usb_mid->interface_list, dev); - /* Start child function for every interface. */ - list_foreach(usb_mid->interface_list, link, usbmid_interface_t, iface) { - usb_log_info("Creating child for interface %d (%s).\n", - iface->interface_no, - usb_str_class(iface->interface->interface_class)); - - rc = usbmid_spawn_interface_child(dev, iface, - &dev->descriptors.device, iface->interface); - if (rc != EOK) { - usb_log_error("Failed to create interface child: %s.\n", - str_error(rc)); - } - } - - return true; + return EOK; } Index: uspace/drv/bus/usb/usbmid/main.c =================================================================== --- uspace/drv/bus/usb/usbmid/main.c (revision feeac0d8cd6e0ce736779bc5f1dc701c5cf42ba6) +++ uspace/drv/bus/usb/usbmid/main.c (revision 57c8fc93f54611667e4ee84440ca8cd4272cff4e) @@ -51,13 +51,7 @@ static int usbmid_device_add(usb_device_t *dev) { - usb_log_info("Taking care of new MID `%s'.\n", ddf_dev_get_name(dev->ddf_dev)); + usb_log_info("Taking care of new MID `%s'.\n", usb_device_get_name(dev)); - const bool accept = usbmid_explore_device(dev); - - if (!accept) { - return ENOTSUP; - } - - return EOK; + return usbmid_explore_device(dev); } @@ -70,5 +64,5 @@ { assert(dev); - usb_mid_t *usb_mid = dev->driver_data; + usb_mid_t *usb_mid = usb_device_data_get(dev); assert(usb_mid); @@ -89,15 +83,12 @@ usbmid_interface_t *iface = usbmid_interface_from_link(item); - usb_log_info("Removing child for interface %d (%s).\n", - iface->interface_no, - usb_str_class(iface->interface->interface_class)); + usb_log_info("Removing child `%s'.\n", + ddf_fun_get_name(iface->fun)); /* Tell the child to go off-line. */ int pret = ddf_fun_offline(iface->fun); if (pret != EOK) { - usb_log_warning("Failed to turn off child for interface" - " %d (%s): %s\n", iface->interface_no, - usb_str_class(iface->interface->interface_class), - str_error(pret)); + usb_log_warning("Failed to turn off child `%s': %s\n", + ddf_fun_get_name(iface->fun), str_error(pret)); ret = pret; } @@ -106,8 +97,6 @@ pret = usbmid_interface_destroy(iface); if (pret != EOK) { - usb_log_error("Failed to destroy child for interface " - "%d (%s): %s\n", iface->interface_no, - usb_str_class(iface->interface->interface_class), - str_error(pret)); + usb_log_error("Failed to destroy child `%s': %s\n", + ddf_fun_get_name(iface->fun), str_error(pret)); ret = pret; } @@ -124,8 +113,8 @@ { assert(dev); - usb_mid_t *usb_mid = dev->driver_data; + usb_mid_t *usb_mid = usb_device_data_get(dev); assert(usb_mid); - usb_log_info("USB MID gone: `%s'.\n", ddf_dev_get_name(dev->ddf_dev)); + usb_log_info("USB MID gone: `%s'.\n", usb_device_get_name(dev)); /* Remove ctl function */ @@ -145,15 +134,11 @@ usbmid_interface_t *iface = usbmid_interface_from_link(item); - usb_log_info("Child for interface %d (%s) gone.\n", - iface->interface_no, - usb_str_class(iface->interface->interface_class)); + usb_log_info("Child `%s' is gone.\n", + ddf_fun_get_name(iface->fun)); const int pret = usbmid_interface_destroy(iface); if (pret != EOK) { - usb_log_error("Failed to remove child for interface " - "%d (%s): %s\n", - iface->interface_no, - usb_str_class(iface->interface->interface_class), - str_error(pret)); + usb_log_error("Failed to remove child `%s': %s\n", + ddf_fun_get_name(iface->fun), str_error(pret)); ret = pret; } Index: uspace/drv/bus/usb/usbmid/usbmid.c =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.c (revision feeac0d8cd6e0ce736779bc5f1dc701c5cf42ba6) +++ uspace/drv/bus/usb/usbmid/usbmid.c (revision 57c8fc93f54611667e4ee84440ca8cd4272cff4e) @@ -31,7 +31,4 @@ */ -/* XXX Fix this */ -#define _DDF_DATA_IMPLANT - /** * @file @@ -42,5 +39,4 @@ #include #include -#include #include #include @@ -48,22 +44,35 @@ #include "usbmid.h" -/** Callback for DDF USB interface. */ -static int usb_iface_get_interface_impl(ddf_fun_t *fun, int *iface_no) +/** Get USB device handle by calling the parent usb_device_t. + * + * @param[in] fun Device function the operation is running on. + * @param[out] handle Device handle. + * @return Error code. + */ +static int usb_iface_device_handle(ddf_fun_t *fun, devman_handle_t *handle) +{ + assert(fun); + assert(handle); + usb_device_t *usb_dev = usb_device_get(ddf_fun_get_dev(fun)); + *handle = usb_device_get_devman_handle(usb_dev); + return EOK; +} + +/** Callback for DDF USB get interface. */ +static int usb_iface_iface_no(ddf_fun_t *fun, int *iface_no) { usbmid_interface_t *iface = ddf_fun_data_get(fun); assert(iface); - if (iface_no != NULL) { + if (iface_no) *iface_no = iface->interface_no; - } return EOK; } -/** DDF interface of the child - interface function. */ +/** DDF interface of the child - USB functions. */ static usb_iface_t child_usb_iface = { - .get_hc_handle = usb_iface_get_hc_handle_device_impl, - .get_my_address = usb_iface_get_my_address_forward_impl, - .get_my_interface = usb_iface_get_interface_impl, + .get_my_device_handle = usb_iface_device_handle, + .get_my_interface = usb_iface_iface_no, }; @@ -81,9 +90,5 @@ return ret; } - /* NOTE: usbmid->interface points somewhere, but we did not - * allocate that space, so don't touch */ ddf_fun_destroy(mid_iface->fun); - /* NOTE: mid_iface is invalid at this point, it was assigned to - * mid_iface->fun->driver_data and freed in ddf_fun_destroy */ return EOK; } @@ -98,5 +103,5 @@ */ int usbmid_spawn_interface_child(usb_device_t *parent, - usbmid_interface_t *iface, + usbmid_interface_t **iface_ret, const usb_standard_device_descriptor_t *device_descriptor, const usb_standard_interface_descriptor_t *interface_descriptor) @@ -119,5 +124,5 @@ /* Create the device. */ - child = ddf_fun_create(parent->ddf_dev, fun_inner, child_name); + child = usb_device_ddf_fun_create(parent, fun_inner, child_name); free(child_name); if (child == NULL) { @@ -144,4 +149,11 @@ } clean_match_ids(&match_ids); + ddf_fun_set_ops(child, &child_device_ops); + + usbmid_interface_t *iface = ddf_fun_data_alloc(child, sizeof(*iface)); + + iface->fun = child; + iface->interface_no = interface_descriptor->interface_number; + link_initialize(&iface->link); rc = ddf_fun_bind(child); @@ -151,8 +163,5 @@ return rc; } - - iface->fun = child; - ddf_fun_data_implant(child, iface); - ddf_fun_set_ops(child, &child_device_ops); + *iface_ret = iface; return EOK; Index: uspace/drv/bus/usb/usbmid/usbmid.h =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.h (revision feeac0d8cd6e0ce736779bc5f1dc701c5cf42ba6) +++ uspace/drv/bus/usb/usbmid/usbmid.h (revision 57c8fc93f54611667e4ee84440ca8cd4272cff4e) @@ -50,6 +50,4 @@ /** Function container. */ ddf_fun_t *fun; - /** Interface descriptor. */ - const usb_standard_interface_descriptor_t *interface; /** Interface number. */ int interface_no; @@ -64,6 +62,6 @@ } usb_mid_t; -bool usbmid_explore_device(usb_device_t *); -int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t *, +int usbmid_explore_device(usb_device_t *); +int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **, const usb_standard_device_descriptor_t *, const usb_standard_interface_descriptor_t *); Index: uspace/drv/bus/usb/usbmid/usbmid.ma =================================================================== --- uspace/drv/bus/usb/usbmid/usbmid.ma (revision feeac0d8cd6e0ce736779bc5f1dc701c5cf42ba6) +++ uspace/drv/bus/usb/usbmid/usbmid.ma (revision 57c8fc93f54611667e4ee84440ca8cd4272cff4e) @@ -1,1 +1,2 @@ +100 usb&class=use-interface 100 usb&mid