Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/usbhub/port.c

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

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

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

@@ -101 +101 @@
  * Routine for adding a new device in USB2.
  */
-static int enumerate_device_usb2(usb_hub_port_t *port, async_exch_t *exch)
-{
-        int err;
+static errno_t enumerate_device_usb2(usb_hub_port_t *port, async_exch_t *exch)
+{
+        errno_t err;
 
         port_log(debug, port, "Requesting default address.");
@@ -145 +145 @@
  * Routine for adding a new device in USB 3.
  */
-static int enumerate_device_usb3(usb_hub_port_t *port, async_exch_t *exch)
-{
-        int err;
+static errno_t enumerate_device_usb3(usb_hub_port_t *port, async_exch_t *exch)
+{
+        errno_t err;
 
         port_log(debug, port, "Issuing a warm reset.");
@@ -170 +170 @@
 }
 
-static int enumerate_device(usb_port_t *port_base)
+static errno_t enumerate_device(usb_port_t *port_base)
 {
         usb_hub_port_t *port = get_hub_port(port_base);
@@ -181 +181 @@
         }
 
-        const int err = port->hub->speed == USB_SPEED_SUPER
+        const errno_t err = port->hub->speed == USB_SPEED_SUPER
                 ? enumerate_device_usb3(port, exch)
                 : enumerate_device_usb2(port, exch);