Changeset 56bdd9a4 in mainline for uspace/lib/usb

Timestamp:

2011-11-25T15:20:04Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

02fc5c4

Parents:

317a463

Message:

usb: Provide IPC wrappers instead of IPC call numbers.

Put IPC protocol in one file.
This is does not make much difference for usb_iface, but will be useful
for more complicated interfaces.

Location:

uspace/lib/usb/src

Files:

• ddfiface.c (modified) (2 diffs)
• hc.c (modified) (2 diffs)

uspace/lib/usb/src/ddfiface.c

@@ -36 +36 @@
 #include <devman.h>
 #include <async.h>
+#include <usb_iface.h>
 #include <usb/ddfiface.h>
 #include <usb/hc.h>
@@ -104 +105 @@
 
         async_exch_t *exch = async_exchange_begin(parent_sess);
+        if (!exch) {
+                async_hangup(parent_sess);
+                return ENOMEM;
+        }
 
-        sysarg_t addr;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_MY_ADDRESS, &addr);
+        const int ret = usb_get_my_address(exch, address);
 
         async_exchange_end(exch);
         async_hangup(parent_sess);
 
-        if (rc != EOK)
-                return rc;
-
-        if (address != NULL)
-                *address = (usb_address_t) addr;
-
-        return EOK;
+        return ret;
 }
 

uspace/lib/usb/src/hc.c

@@ -181 +181 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
-        sysarg_t address;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_MY_ADDRESS, &address);
-        
+        if (!exch) {
+                async_hangup(parent_sess);
+                return ENOMEM;
+        }
+        usb_address_t address;
+        const int ret = usb_get_my_address(exch, &address);
+
         async_exchange_end(exch);
         async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
-        return (usb_address_t) address;
+
+        if (ret != EOK)
+                return ret;
+
+        return address;
 }
 
@@ -231 +233 @@
         if (!parent_sess)
                 return ENOMEM;
-        
+
         async_exch_t *exch = async_exchange_begin(parent_sess);
-        
-        devman_handle_t h;
-        int rc = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE),
-            IPC_M_USB_GET_HOST_CONTROLLER_HANDLE, &h);
-        
+        if (!exch) {
+                async_hangup(parent_sess);
+                return ENOMEM;
+        }
+        const int ret = usb_get_hc_handle(exch, hc_handle);
+
         async_exchange_end(exch);
         async_hangup(parent_sess);
-        
-        if (rc != EOK)
-                return rc;
-        
-        if (hc_handle != NULL)
-                *hc_handle = h;
-        
-        return EOK;
+
+        return ret;
 }