Changeset 5a6cc679 in mainline for uspace/drv/bus/usb/vhc/hub

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/vhc/hub

Files:

• hub.c (modified) (3 diffs)
• hub.h (modified) (1 diff)
• virthub.c (modified) (2 diffs)
• virthub.h (modified) (1 diff)
• virthubops.c (modified) (9 diffs)

uspace/drv/bus/usb/vhc/hub/hub.c

@@ -63 +63 @@
 static void set_port_status_change(hub_port_t *, hub_status_change_t);
 static void clear_port_status_change(hub_port_t *, uint16_t);
-static int set_port_state_delayed_fibril(void *);
+static errno_t set_port_state_delayed_fibril(void *);
 static void set_port_state_delayed(hub_t *, size_t, suseconds_t,
     hub_port_state_t, hub_port_state_t);
@@ -163 +163 @@
  * @return Error code.
  */
-int hub_disconnect_device(hub_t *hub, void *device)
+errno_t hub_disconnect_device(hub_t *hub, void *device)
 {
         size_t index = hub_find_device(hub, device);
@@ -461 +461 @@
  * @return Always EOK.
  */
-static int set_port_state_delayed_fibril(void *arg)
+static errno_t set_port_state_delayed_fibril(void *arg)
 {
         struct delay_port_state_change *change

uspace/drv/bus/usb/vhc/hub/hub.h

@@ -102 +102 @@
 void hub_init(hub_t *);
 size_t hub_connect_device(hub_t *, void *);
-int hub_disconnect_device(hub_t *, void *);
+errno_t hub_disconnect_device(hub_t *, void *);
 size_t hub_find_device(hub_t *, void *);
 void hub_acquire(hub_t *);

uspace/drv/bus/usb/vhc/hub/virthub.c

@@ -147 +147 @@
  * @return Error code.
  */
-int virthub_init(usbvirt_device_t *dev, const char* name)
+errno_t virthub_init(usbvirt_device_t *dev, const char* name)
 {
         if (dev == NULL) {
@@ -197 +197 @@
  * @return Error code.
  */
-int virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
+errno_t virthub_disconnect_device(usbvirt_device_t *dev, vhc_virtdev_t *conn)
 {
         assert(dev != NULL);

uspace/drv/bus/usb/vhc/hub/virthub.h

@@ -80 +80 @@
 extern hub_descriptor_t hub_descriptor;
 
-int virthub_init(usbvirt_device_t *, const char *name);
+errno_t virthub_init(usbvirt_device_t *, const char *name);
 int virthub_connect_device(usbvirt_device_t *, vhc_virtdev_t *);
-int virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *);
+errno_t virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *);
 bool virthub_is_device_enabled(usbvirt_device_t *, vhc_virtdev_t *);
 void virthub_get_status(usbvirt_device_t *, char *, size_t);

uspace/drv/bus/usb/vhc/hub/virthubops.c

@@ -63 +63 @@
 
 /** Callback for data request. */
-static int req_on_status_change_pipe(usbvirt_device_t *dev,
+static errno_t req_on_status_change_pipe(usbvirt_device_t *dev,
     usb_endpoint_t endpoint, usb_transfer_type_t tr_type,
     void *buffer, size_t buffer_size, size_t *actual_size)
@@ -109 +109 @@
  * @return Error code.
  */
-static int req_clear_hub_feature(usbvirt_device_t *dev,
+static errno_t req_clear_hub_feature(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -123 +123 @@
  * @return Error code.
  */
-static int req_clear_port_feature(usbvirt_device_t *dev,
-    const usb_device_request_setup_packet_t *request, uint8_t *data,
-    size_t *act_size)
-{
-        int rc;
+static errno_t req_clear_port_feature(usbvirt_device_t *dev,
+    const usb_device_request_setup_packet_t *request, uint8_t *data,
+    size_t *act_size)
+{
+        errno_t rc;
         size_t port = request->index - 1;
         usb_hub_class_feature_t feature = request->value;
@@ -203 +203 @@
  * @return Error code.
  */
-static int req_get_bus_state(usbvirt_device_t *dev,
+static errno_t req_get_bus_state(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -217 +217 @@
  * @return Error code.
  */
-static int req_get_descriptor(usbvirt_device_t *dev,
+static errno_t req_get_descriptor(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -238 +238 @@
  * @return Error code.
  */
-static int req_get_hub_status(usbvirt_device_t *dev,
+static errno_t req_get_hub_status(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -257 +257 @@
  * @return Error code.
  */
-static int req_get_port_status(usbvirt_device_t *dev,
+static errno_t req_get_port_status(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -282 +282 @@
  * @return Error code.
  */
-static int req_set_hub_feature(usbvirt_device_t *dev,
+static errno_t req_set_hub_feature(usbvirt_device_t *dev,
     const usb_device_request_setup_packet_t *request, uint8_t *data,
     size_t *act_size)
@@ -296 +296 @@
  * @return Error code.
  */
-static int req_set_port_feature(usbvirt_device_t *dev,
-    const usb_device_request_setup_packet_t *request, uint8_t *data,
-    size_t *act_size)
-{
-        int rc = ENOTSUP;
+static errno_t req_set_port_feature(usbvirt_device_t *dev,
+    const usb_device_request_setup_packet_t *request, uint8_t *data,
+    size_t *act_size)
+{
+        errno_t rc = ENOTSUP;
         size_t port = request->index - 1;
         usb_hub_class_feature_t feature = request->value;