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

File:

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

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

@@ -54 +54 @@
 };
 
-static errno_t usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub);
+static int usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub);
 static void usb_hub_port_reset_completed(usb_hub_port_t *port,
     usb_hub_dev_t *hub, usb_port_status_t status);
-static errno_t get_port_status(usb_hub_port_t *port, usb_port_status_t *status);
-static errno_t add_device_phase1_worker_fibril(void *arg);
-static errno_t create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
+static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status);
+static int add_device_phase1_worker_fibril(void *arg);
+static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
     usb_speed_t speed);
 
-errno_t usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub)
+int usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub)
 {
         assert(port);
@@ -77 +77 @@
  * @return Operation result
  */
-errno_t usb_hub_port_clear_feature(
+int usb_hub_port_clear_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature)
 {
@@ -99 +99 @@
  * @return Operation result
  */
-errno_t usb_hub_port_set_feature(
+int usb_hub_port_set_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature)
 {
@@ -143 +143 @@
 
         usb_port_status_t status = 0;
-        const errno_t opResult = get_port_status(port, &status);
+        const int opResult = get_port_status(port, &status);
         if (opResult != EOK) {
                 usb_log_error("(%p-%u): Failed to get port status: %s.\n", hub,
@@ -158 +158 @@
 
                 /* ACK the change */
-                const errno_t opResult = usb_hub_port_clear_feature(port,
+                const int opResult = usb_hub_port_clear_feature(port,
                     USB_HUB_FEATURE_C_PORT_CONNECTION);
                 if (opResult != EOK) {
@@ -167 +167 @@
 
                 if (connected) {
-                        const errno_t opResult = create_add_device_fibril(port, hub,
+                        const int opResult = create_add_device_fibril(port, hub,
                             usb_port_speed(status));
                         if (opResult != EOK) {
@@ -191 +191 @@
                    port->port_number);
                 usb_hub_port_device_gone(port, hub);
-                const errno_t rc = usb_hub_port_clear_feature(port,
+                const int rc = usb_hub_port_clear_feature(port,
                         USB_HUB_FEATURE_C_PORT_ENABLE);
                 if (rc != EOK) {
@@ -206 +206 @@
                     " NOT happen as we do not support suspend state!", hub,
                     port->port_number);
-                const errno_t rc = usb_hub_port_clear_feature(port,
+                const int rc = usb_hub_port_clear_feature(port,
                         USB_HUB_FEATURE_C_PORT_SUSPEND);
                 if (rc != EOK) {
@@ -224 +224 @@
                  * mode. USB system software is responsible for powering port
                  * back on when the over-current condition is gone */
-                const errno_t rc = usb_hub_port_clear_feature(port,
+                const int rc = usb_hub_port_clear_feature(port,
                     USB_HUB_FEATURE_C_PORT_OVER_CURRENT);
                 if (rc != EOK) {
@@ -232 +232 @@
                 }
                 if (!(status & ~USB_HUB_PORT_STATUS_OC)) {
-                        const errno_t rc = usb_hub_port_set_feature(
+                        const int rc = usb_hub_port_set_feature(
                             port, USB_HUB_FEATURE_PORT_POWER);
                         if (rc != EOK) {
@@ -260 +260 @@
  * @param hub hub representation
  */
-errno_t usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub)
+int usb_hub_port_device_gone(usb_hub_port_t *port, usb_hub_dev_t *hub)
 {
         assert(port);
@@ -267 +267 @@
         if (!exch)
                 return ENOMEM;
-        const errno_t rc = usb_device_remove(exch, port->port_number);
+        const int rc = usb_device_remove(exch, port->port_number);
         usb_device_bus_exchange_end(exch);
         if (rc == EOK)
@@ -304 +304 @@
 
         /* Clear the port reset change. */
-        errno_t rc = usb_hub_port_clear_feature(port, USB_HUB_FEATURE_C_PORT_RESET);
+        int rc = usb_hub_port_clear_feature(port, USB_HUB_FEATURE_C_PORT_RESET);
         if (rc != EOK) {
                 usb_log_error("(%p-%u): Failed to clear port reset change: %s.",
@@ -317 +317 @@
  * @return Error code.
  */
-static errno_t get_port_status(usb_hub_port_t *port, usb_port_status_t *status)
+static int get_port_status(usb_hub_port_t *port, usb_port_status_t *status)
 {
         assert(port);
@@ -333 +333 @@
         usb_port_status_t status_tmp;
 
-        const errno_t rc = usb_pipe_control_read(port->control_pipe,
+        const int rc = usb_pipe_control_read(port->control_pipe,
             &request, sizeof(usb_device_request_setup_packet_t),
             &status_tmp, sizeof(status_tmp), &recv_size);
@@ -351 +351 @@
 }
 
-static errno_t port_enable(usb_hub_port_t *port, usb_hub_dev_t *hub, bool enable)
+static int port_enable(usb_hub_port_t *port, usb_hub_dev_t *hub, bool enable)
 {
         if (enable) {
-                errno_t rc =
+                int rc =
                     usb_hub_port_set_feature(port, USB_HUB_FEATURE_PORT_RESET);
                 if (rc != EOK) {
@@ -383 +383 @@
  * @return 0 Always.
  */
-errno_t add_device_phase1_worker_fibril(void *arg)
+int add_device_phase1_worker_fibril(void *arg)
 {
         struct add_device_phase1 *params = arg;
         assert(params);
 
-        errno_t ret = EOK;
+        int ret = EOK;
         usb_hub_dev_t *hub = params->hub;
         usb_hub_port_t *port = params->port;
@@ -434 +434 @@
                 usb_log_error("(%p-%u): Failed to enumerate device: %s", hub,
                     port->port_number, str_error(ret));
-                const errno_t ret = port_enable(port, hub, false);
+                const int ret = port_enable(port, hub, false);
                 if (ret != EOK) {
                         usb_log_warning("(%p-%u)Failed to disable port (%s), "
@@ -440 +440 @@
                             port->port_number, str_error(ret));
                 } else {
-                        const errno_t ret = usb_release_default_address(exch);
+                        const int ret = usb_release_default_address(exch);
                         if (ret != EOK)
                                 usb_log_warning("(%p-%u): Failed to release "
@@ -475 +475 @@
  * @return Error code.
  */
-static errno_t create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
+static int create_add_device_fibril(usb_hub_port_t *port, usb_hub_dev_t *hub,
     usb_speed_t speed)
 {