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

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/usbmid

Files:

• explore.c (modified) (4 diffs)
• main.c (modified) (7 diffs)
• usbmid.c (modified) (5 diffs)
• usbmid.h (modified) (1 diff)

uspace/drv/bus/usb/usbmid/explore.c

@@ -66 +66 @@
  * @param list List where to add the interfaces.
  */
-static int create_interfaces(const uint8_t *config_descriptor,
+static errno_t create_interfaces(const uint8_t *config_descriptor,
     size_t config_descriptor_size, list_t *list, usb_device_t *usb_dev)
 {
@@ -111 +111 @@
 
                 usbmid_interface_t *iface = NULL;
-                const int rc = usbmid_spawn_interface_child(usb_dev, &iface,
+                const errno_t rc = usbmid_spawn_interface_child(usb_dev, &iface,
                         &usb_device_descriptors(usb_dev)->device, interface);
                 if (rc != EOK) {
@@ -134 +134 @@
  * @return Whether to accept this device.
  */
-int usbmid_explore_device(usb_device_t *dev)
+errno_t usbmid_explore_device(usb_device_t *dev)
 {
         assert(dev);
@@ -157 +157 @@
 
         /* Select the first configuration */
-        int rc = usb_request_set_configuration(usb_device_get_default_pipe(dev),
+        errno_t rc = usb_request_set_configuration(usb_device_get_default_pipe(dev),
             config_descriptor->configuration_number);
         if (rc != EOK) {

uspace/drv/bus/usb/usbmid/main.c

@@ -49 +49 @@
  * @return Error code.
  */
-static int usbmid_device_add(usb_device_t *dev)
+static errno_t usbmid_device_add(usb_device_t *dev)
 {
         usb_log_info("Taking care of new MID `%s'.", usb_device_get_name(dev));
@@ -82 +82 @@
  * @return Error code.
  */
-static int usbmid_device_remove(usb_device_t *dev)
+static errno_t usbmid_device_remove(usb_device_t *dev)
 {
         assert(dev);
@@ -89 +89 @@
 
         /* Remove ctl function */
-        int ret = ddf_fun_unbind(usb_mid->ctl_fun);
+        errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
                 usb_log_error("Failed to unbind USB MID ctl function: %s.",
@@ -103 +103 @@
 
                 /* Tell the child to go offline. */
-                int pret = ddf_fun_offline(iface->fun);
+                errno_t pret = ddf_fun_offline(iface->fun);
                 if (pret != EOK) {
                         usb_log_warning("Failed to turn off child `%s': %s",
@@ -118 +118 @@
  * @return Error code.
  */
-static int usbmid_device_gone(usb_device_t *dev)
+static errno_t usbmid_device_gone(usb_device_t *dev)
 {
         assert(dev);
@@ -127 +127 @@
 
         /* Remove ctl function */
-        int ret = ddf_fun_unbind(usb_mid->ctl_fun);
+        errno_t ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
                 usb_log_error("Failed to unbind USB MID ctl function: %s.",
@@ -149 +149 @@
 }
 
-static int usbmid_function_offline(ddf_fun_t *fun)
+static errno_t usbmid_function_offline(ddf_fun_t *fun)
 {
         usb_device_t *usb_dev = ddf_dev_data_get(ddf_fun_get_dev(fun));

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -52 +52 @@
  * @return Error code.
  */
-static int usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc)
+static errno_t usb_iface_description(ddf_fun_t *fun, usb_device_desc_t *desc)
 {
         usbmid_interface_t *iface = ddf_fun_data_get(fun);
@@ -64 +64 @@
 
         usb_device_desc_t tmp_desc;
-        const int ret = usb_get_my_description(exch, &tmp_desc);
+        const errno_t ret = usb_get_my_description(exch, &tmp_desc);
 
         if (ret == EOK && desc) {
@@ -86 +86 @@
 };
 
-int usbmid_interface_destroy(usbmid_interface_t *mid_iface)
+errno_t usbmid_interface_destroy(usbmid_interface_t *mid_iface)
 {
         assert(mid_iface);
         assert_link_not_used(&mid_iface->link);
-        const int ret = ddf_fun_unbind(mid_iface->fun);
+        const errno_t ret = ddf_fun_unbind(mid_iface->fun);
         if (ret != EOK) {
                 return ret;
@@ -106 +106 @@
  * @return Error code.
  */
-int usbmid_spawn_interface_child(usb_device_t *parent,
+errno_t usbmid_spawn_interface_child(usb_device_t *parent,
     usbmid_interface_t **iface_ret,
     const usb_standard_device_descriptor_t *device_descriptor,
@@ -113 +113 @@
         ddf_fun_t *child = NULL;
         char *child_name = NULL;
-        int rc;
+        errno_t rc;
 
         /*

uspace/drv/bus/usb/usbmid/usbmid.h

@@ -62 +62 @@
 } usb_mid_t;
 
-extern int usbmid_explore_device(usb_device_t *);
-extern int usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
+extern errno_t usbmid_explore_device(usb_device_t *);
+extern errno_t usbmid_spawn_interface_child(usb_device_t *, usbmid_interface_t **,
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *);
 extern void usbmid_dump_descriptors(uint8_t *, size_t);
-extern int usbmid_interface_destroy(usbmid_interface_t *mid_iface);
+extern errno_t usbmid_interface_destroy(usbmid_interface_t *mid_iface);
 
 static inline usbmid_interface_t * usbmid_interface_from_link(link_t *item)