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

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

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (4 diffs)
• usbhub.c (modified) (14 diffs)
• usbhub.h (modified) (1 diff)

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);

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

@@ -99 +99 @@
 };
 
-static int usb_set_first_configuration(usb_device_t *);
-static int usb_hub_process_hub_specific_info(usb_hub_dev_t *);
+static errno_t usb_set_first_configuration(usb_device_t *);
+static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *);
 static void usb_hub_over_current(const usb_hub_dev_t *, usb_hub_status_t);
-static int usb_hub_polling_init(usb_hub_dev_t *, usb_endpoint_mapping_t *);
+static errno_t usb_hub_polling_init(usb_hub_dev_t *, usb_endpoint_mapping_t *);
 static void usb_hub_global_interrupt(const usb_hub_dev_t *);
 
 static bool usb_hub_polling_error_callback(usb_device_t *dev,
-        int err_code, void *arg)
+        errno_t err_code, void *arg)
 {
         assert(dev);
@@ -125 +125 @@
  * @return error code
  */
-int usb_hub_device_add(usb_device_t *usb_dev)
+errno_t usb_hub_device_add(usb_device_t *usb_dev)
 {
         int err;
@@ -198 +198 @@
 }
 
-static int usb_hub_cleanup(usb_hub_dev_t *hub)
+static errno_t usb_hub_cleanup(usb_hub_dev_t *hub)
 {
         free(hub->polling.buffer);
@@ -228 +228 @@
  * @return error code
  */
-int usb_hub_device_remove(usb_device_t *usb_dev)
+errno_t usb_hub_device_remove(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -249 +249 @@
  * @return error code
  */
-int usb_hub_device_gone(usb_device_t *usb_dev)
+errno_t usb_hub_device_gone(usb_device_t *usb_dev)
 {
         assert(usb_dev);
@@ -270 +270 @@
  * @param mapping The mapping of Status Change Endpoint
  */
-static int usb_hub_polling_init(usb_hub_dev_t *hub_dev,
+static errno_t usb_hub_polling_init(usb_hub_dev_t *hub_dev,
         usb_endpoint_mapping_t *mapping)
 {
-        int err;
+        errno_t err;
         usb_polling_t *polling = &hub_dev->polling;
 
@@ -369 +369 @@
  * @return error code
  */
-static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev)
+static errno_t usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev)
 {
         assert(hub_dev);
@@ -382 +382 @@
         usb_hub_descriptor_header_t descriptor;
         size_t received_size;
-        int opResult = usb_request_get_descriptor(control_pipe,
+        errno_t opResult = usb_request_get_descriptor(control_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
             desc_type, 0, 0, &descriptor,
@@ -436 +436 @@
  * @return error code
  */
-static int usb_set_first_configuration(usb_device_t *usb_device)
+static errno_t usb_set_first_configuration(usb_device_t *usb_device)
 {
         assert(usb_device);
@@ -462 +462 @@
         /* Set configuration. Use the configuration that was in
          * usb_device->descriptors.configuration i.e. The first one. */
-        int opResult = usb_request_set_configuration(
+        errno_t opResult = usb_request_set_configuration(
             usb_device_get_default_pipe(usb_device),
             config_descriptor->configuration_number);
@@ -500 +500 @@
         /* 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 int ret = usb_hub_set_port_feature(hub_dev, port,
+                const errno_t ret = usb_hub_set_port_feature(hub_dev, port,
                     USB_HUB_FEATURE_PORT_POWER);
                 if (ret != EOK) {
@@ -637 +637 @@
         /* NOTE: We can't use standard USB GET_STATUS request, because
          * hubs reply is 4byte instead of 2 */
-        const int opResult = usb_pipe_control_read(control_pipe,
+        const errno_t opResult = usb_pipe_control_read(control_pipe,
             &get_hub_status_request, sizeof(get_hub_status_request),
             &status, sizeof(usb_hub_status_t), &rcvd_size);
@@ -655 +655 @@
                 usb_hub_over_current(hub_dev, status);
                 /* Ack change in hub OC flag */
-                const int ret = usb_request_clear_feature(
+                const errno_t ret = usb_request_clear_feature(
                     control_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,
@@ -679 +679 @@
                  * Just ACK the change.
                  */
-                const int ret = usb_request_clear_feature(
+                const errno_t ret = usb_request_clear_feature(
                     control_pipe, USB_REQUEST_TYPE_CLASS,
                     USB_REQUEST_RECIPIENT_DEVICE,

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -78 +78 @@
 extern const usb_endpoint_description_t *usb_hub_endpoints [];
 
-int usb_hub_device_add(usb_device_t *);
-int usb_hub_device_remove(usb_device_t *);
-int usb_hub_device_gone(usb_device_t *);
+errno_t usb_hub_device_add(usb_device_t *);
+errno_t usb_hub_device_remove(usb_device_t *);
+errno_t usb_hub_device_gone(usb_device_t *);
 
-int usb_hub_set_depth(const usb_hub_dev_t *);
-int usb_hub_get_port_status(const usb_hub_dev_t *, size_t, usb_port_status_t *);
-int usb_hub_set_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
-int usb_hub_clear_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
+errno_t usb_hub_set_depth(const usb_hub_dev_t *);
+errno_t usb_hub_get_port_status(const usb_hub_dev_t *, size_t, usb_port_status_t *);
+errno_t usb_hub_set_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
+errno_t usb_hub_clear_port_feature(const usb_hub_dev_t *, size_t, usb_hub_class_feature_t);
 
 bool hub_port_changes_callback(usb_device_t *, uint8_t *, size_t, void *);
 
-int usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *, usb_port_t *);
-int usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *);
+errno_t usb_hub_reserve_default_address(usb_hub_dev_t *, async_exch_t *, usb_port_t *);
+errno_t usb_hub_release_default_address(usb_hub_dev_t *, async_exch_t *);
 
 #endif