Changeset 4689d40 in mainline

Timestamp:

2010-12-04T17:51:07Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ce687bbe

Parents:

ad104e0

Message:

Add binding of USB address and devman handle to usbhc iface

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (3 diffs)
• drv/include/usbhc_iface.h (modified) (2 diffs)
• usb/include/usb/usbdrv.h (modified) (1 diff)
• usb/src/usbdrv.c (modified) (1 diff)

uspace/lib/drv/generic/remote_usbhc.c

@@ -55 +55 @@
 static void remote_usbhc_release_default_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_request_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_bind_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_release_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 //static void remote_usbhc(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -68 +69 @@
 
         remote_usbhc_request_address,
+        remote_usbhc_bind_address,
         remote_usbhc_release_address,
 
@@ -197 +199 @@
                 ipc_answer_1(callid, EOK, (ipcarg_t) address);
         }
+}
+
+void remote_usbhc_bind_address(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+
+        if (!usb_iface->bind_address) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        usb_address_t address = (usb_address_t) IPC_GET_ARG1(*call);
+        devman_handle_t handle = (devman_handle_t) IPC_GET_ARG2(*call);
+
+        int rc = usb_iface->bind_address(device, address, handle);
+
+        ipc_answer_0(callid, rc);
 }
 

uspace/lib/drv/include/usbhc_iface.h

@@ -137 +137 @@
         IPC_M_USBHC_REQUEST_ADDRESS,
 
+        /** Bind USB address with devman handle.
+         * Parameters:
+         * - USB address
+         * - devman handle
+         * Answer:
+         * - EOK - address binded
+         * - ENOENT - address is not in use
+         */
+        IPC_M_USBHC_BIND_ADDRESS,
+
         /** Release address in use.
          * Arguments:
@@ -223 +233 @@
         int (*release_default_address)(device_t *);
         int (*request_address)(device_t *, usb_address_t *);
+        int (*bind_address)(device_t *, usb_address_t, devman_handle_t);
         int (*release_address)(device_t *, usb_address_t);
 

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

@@ -44 +44 @@
 int usb_drv_release_default_address(int);
 usb_address_t usb_drv_request_address(int);
+int usb_drv_bind_address(int, usb_address_t, devman_handle_t);
 int usb_drv_release_address(int, usb_address_t);
 

uspace/lib/usb/src/usbdrv.c

@@ -136 +136 @@
 }
 
+/** Inform HC about binding address with devman handle.
+ *
+ * @param phone Open phone to host controller driver.
+ * @param address Address to be binded.
+ * @param handle Devman handle of the device.
+ * @return Error code.
+ */
+int usb_drv_bind_address(int phone, usb_address_t address,
+    devman_handle_t handle)
+{
+        int rc = async_req_2_0(phone, IPC_M_USBHC_BIND_ADDRESS,
+            address, handle);
+
+        return rc;
+}
+
 /** Inform HC about address release.
  *