Changeset 34289ea in mainline

Timestamp:

2012-12-30T19:04:34Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

68e1023

Parents:

db8b7ca

Message:

usmid: return error code instead of weird bool rc conversions.

Location:

uspace/drv/bus/usb/usbmid

Files:

• explore.c (modified) (8 diffs)
• main.c (modified) (1 diff)
• usbmid.h (modified) (1 diff)

uspace/drv/bus/usb/usbmid/explore.c

@@ -57 +57 @@
 {
         list_foreach(*list, l) {
-                usbmid_interface_t *iface = usbmid_interface_from_link(l);
+                const usbmid_interface_t *iface = usbmid_interface_from_link(l);
                 if (iface->interface_no == interface_no) {
                         return true;
@@ -130 +130 @@
  * @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;
+        const unsigned dev_class = dev->descriptors.device.device_class;
         if (dev_class != USB_CLASS_USE_INTERFACE) {
                 usb_log_warning(
@@ -140 +138 @@
                     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;
         }
 
@@ -151 +149 @@
 
         /* Select the first configuration */
-        rc = usb_request_set_configuration(&dev->ctrl_pipe,
+        int rc = usb_request_set_configuration(&dev->ctrl_pipe,
             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. */
@@ -163 +163 @@
         if (!usb_mid) {
                 usb_log_error("Failed to create USB MID structure.\n");
-                return false;
+                return ENOMEM;
         }
 
@@ -170 +170 @@
         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);
@@ -180 +180 @@
                     str_error(rc));
                 ddf_fun_destroy(usb_mid->ctl_fun);
-                return false;
+                return rc;
         }
 
@@ -205 +205 @@
         }
 
-        return true;
+        return EOK;
 }
 

uspace/drv/bus/usb/usbmid/main.c

@@ -53 +53 @@
         usb_log_info("Taking care of new MID `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
 
-        const bool accept = usbmid_explore_device(dev);
-
-        if (!accept) {
-                return ENOTSUP;
-        }
-
-        return EOK;
+        return usbmid_explore_device(dev);
 }
 

uspace/drv/bus/usb/usbmid/usbmid.h

@@ -64 +64 @@
 } usb_mid_t;
 
-bool usbmid_explore_device(usb_device_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 *,