Changeset 76ef94e in mainline for uspace/lib

Timestamp:

2011-05-07T15:51:20Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3ae5ca8

Parents:

d2bff2f (diff), b23e9cc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development branch changes

Location:

uspace/lib

Files:

• c/generic/devman.c (modified) (1 diff)
• c/include/devman.h (modified) (1 diff)
• c/include/ipc/devman.h (modified) (1 diff)
• drv/generic/remote_usbhc.c (modified) (5 diffs)
• usb/Makefile (modified) (1 diff)
• usb/include/usb/host.h (added)
• usb/include/usb/usb.h (modified) (1 diff)
• usb/src/host.c (added)

uspace/lib/c/generic/devman.c

@@ -374 +374 @@
 }
 
+int devman_get_device_path(devman_handle_t handle, char *path, size_t path_size)
+{
+        int phone = devman_get_phone(DEVMAN_CLIENT, 0);
+
+        if (phone < 0)
+                return phone;
+
+        async_serialize_start();
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_DEVICE_PATH,
+            handle, &answer);
+
+        ipc_call_t data_request_call;
+        aid_t data_request = async_data_read(phone, path, path_size,
+            &data_request_call);
+        if (data_request == 0) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return ENOMEM;
+        }
+
+        sysarg_t data_request_rc;
+        sysarg_t opening_request_rc;
+        async_wait_for(data_request, &data_request_rc);
+        async_wait_for(req, &opening_request_rc);
+
+        async_serialize_end();
+
+        if (data_request_rc != EOK) {
+                /* Prefer the return code of the opening request. */
+                if (opening_request_rc != EOK) {
+                        return (int) opening_request_rc;
+                } else {
+                        return (int) data_request_rc;
+                }
+        }
+        if (opening_request_rc != EOK) {
+                return (int) opening_request_rc;
+        }
+
+        path[path_size - 1] = 0;
+
+        if (IPC_GET_ARG2(data_request_call) >= path_size) {
+                return ELIMIT;
+        }
+
+        return EOK;
+}
+
 
 /** @}

uspace/lib/c/include/devman.h

@@ -55 +55 @@
 extern int devman_device_get_handle_by_class(const char *, const char *,
     devman_handle_t *, unsigned int);
+extern int devman_get_device_path(devman_handle_t, char *, size_t);
 
 extern int devman_add_device_to_class(devman_handle_t, const char *);

uspace/lib/c/include/ipc/devman.h

@@ -149 +149 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS
+        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
+        DEVMAN_DEVICE_GET_DEVICE_PATH
 } client_to_devman_t;
 

uspace/lib/drv/generic/remote_usbhc.c

@@ -302 +302 @@
         async_transaction_t *trans = async_transaction_create(callid);
         if (trans == NULL) {
+                async_answer_0(data_callid, ENOMEM);
                 async_answer_0(callid, ENOMEM);
                 return;
@@ -314 +315 @@
 
         if (rc != EOK) {
+                async_answer_0(data_callid, rc);
                 async_answer_0(callid, rc);
                 async_transaction_destroy(trans);
@@ -460 +462 @@
         async_transaction_t *trans = async_transaction_create(callid);
         if (trans == NULL) {
+                async_answer_0(data_callid, ENOMEM);
                 async_answer_0(callid, ENOMEM);
                 free(setup_packet);
@@ -469 +472 @@
         trans->buffer = malloc(data_len);
         if (trans->buffer == NULL) {
+                async_answer_0(data_callid, ENOMEM);
                 async_answer_0(callid, ENOMEM);
                 async_transaction_destroy(trans);
@@ -480 +484 @@
 
         if (rc != EOK) {
+                async_answer_0(data_callid, rc);
                 async_answer_0(callid, rc);
                 async_transaction_destroy(trans);

uspace/lib/usb/Makefile

@@ -46 +46 @@
         src/hidparser.c \
         src/hiddescriptor.c \
+        src/host.c \
         src/hub.c \
         src/pipepriv.c \

uspace/lib/usb/include/usb/usb.h

@@ -172 +172 @@
 } usb_packet_id;
 
+/** Class name for USB host controllers. */
+#define USB_HC_DDF_CLASS_NAME "usbhc"
+
 #endif
 /**