Changes in uspace/drv/bus/usb/usbhub/usbhub.c [b7fd2a0:58563585] in mainline

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (16 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -81 +81 @@
 };
 
-static errno_t usb_set_first_configuration(usb_device_t *usb_device);
-static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev);
+static int usb_set_first_configuration(usb_device_t *usb_device);
+static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev);
 static void usb_hub_over_current(const usb_hub_dev_t *hub_dev,
     usb_hub_status_t status);
@@ -97 +97 @@
  * @return error code
  */
-errno_t usb_hub_device_add(usb_device_t *usb_dev)
+int usb_hub_device_add(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -114 +114 @@
 
         /* Set hub's first configuration. (There should be only one) */
-        errno_t opResult = usb_set_first_configuration(usb_dev);
+        int opResult = usb_set_first_configuration(usb_dev);
         if (opResult != EOK) {
                 usb_log_error("Could not set hub configuration: %s\n",
@@ -174 +174 @@
  * @return error code
  */
-errno_t usb_hub_device_remove(usb_device_t *usb_dev)
+int usb_hub_device_remove(usb_device_t *usb_dev)
 {
         return ENOTSUP;
@@ -184 +184 @@
  * @return error code
  */
-errno_t usb_hub_device_gone(usb_device_t *usb_dev)
+int usb_hub_device_gone(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -202 +202 @@
 
         for (size_t port = 0; port < hub->port_count; ++port) {
-                const errno_t ret = usb_hub_port_fini(&hub->ports[port], hub);
+                const int ret = usb_hub_port_fini(&hub->ports[port], hub);
                 if (ret != EOK)
                         return ret;
@@ -208 +208 @@
         free(hub->ports);
 
-        const errno_t ret = ddf_fun_unbind(hub->hub_fun);
+        const int ret = ddf_fun_unbind(hub->hub_fun);
         if (ret != EOK) {
                 usb_log_error("(%p) Failed to unbind '%s' function: %s.",
@@ -266 +266 @@
  * @return error code
  */
-static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev)
+static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev)
 {
         assert(hub_dev);
@@ -277 +277 @@
         usb_hub_descriptor_header_t descriptor;
         size_t received_size;
-        errno_t opResult = usb_request_get_descriptor(control_pipe,
+        int opResult = usb_request_get_descriptor(control_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
             USB_DESCTYPE_HUB, 0, 0, &descriptor,
@@ -317 +317 @@
         for (unsigned int port = 0; port < hub_dev->port_count; ++port) {
                 usb_log_debug("(%p): Powering port %u.", hub_dev, port);
-                const errno_t ret = usb_hub_port_set_feature(
+                const int ret = usb_hub_port_set_feature(
                     &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
 
@@ -343 +343 @@
  * @return error code
  */
-static errno_t usb_set_first_configuration(usb_device_t *usb_device)
+static int usb_set_first_configuration(usb_device_t *usb_device)
 {
         assert(usb_device);
@@ -369 +369 @@
         /* Set configuration. Use the configuration that was in
          * usb_device->descriptors.configuration i.e. The first one. */
-        const errno_t opResult = usb_request_set_configuration(
+        const int opResult = usb_request_set_configuration(
             usb_device_get_default_pipe(usb_device),
             config_descriptor->configuration_number);
@@ -406 +406 @@
         /* Over-current condition is gone, it is safe to turn the ports on. */
         for (size_t port = 0; port < hub_dev->port_count; ++port) {
-                const errno_t ret = usb_hub_port_set_feature(
+                const int ret = usb_hub_port_set_feature(
                     &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
                 if (ret != EOK) {
@@ -438 +438 @@
         /* NOTE: We can't use standard USB GET_STATUS request, because
          * hubs reply is 4byte instead of 2 */
-        const errno_t opResult = usb_pipe_control_read(control_pipe,
+        const int opResult = usb_pipe_control_read(control_pipe,
             &get_hub_status_request, sizeof(get_hub_status_request),
             &status, sizeof(usb_hub_status_t), &rcvd_size);
@@ -456 +456 @@
                 usb_hub_over_current(hub_dev, status);
                 /* Ack change in hub OC flag */
-                const errno_t ret = usb_request_clear_feature(
+                const int ret = usb_request_clear_feature(
                     control_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,
@@ -480 +480 @@
                  * Just ACK the change.
                  */
-                const errno_t ret = usb_request_clear_feature(
+                const int ret = usb_request_clear_feature(
                     control_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,