Changeset aae339e9 in mainline

Timestamp:

2010-11-26T12:47:34Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

172c1682

Parents:

0b749a3

Message:

Add method for getting device address to USBHC interface

Location:

uspace/lib

Files:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -42 +42 @@
 #define USB_MAX_PAYLOAD_SIZE 1020
 
+static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_get_buffer(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -49 +50 @@
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
-        &remote_usbhc_get_buffer,
-        &remote_usbhc_interrupt_out,
-        &remote_usbhc_interrupt_in
+        remote_usbhc_get_address,
+        remote_usbhc_get_buffer,
+        remote_usbhc_interrupt_out,
+        remote_usbhc_interrupt_in
 };
 
@@ -68 +70 @@
 } async_transaction_t;
 
+void remote_usbhc_get_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->tell_address) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        devman_handle_t handle = IPC_GET_ARG1(*call);
+
+        usb_address_t address;
+        int rc = usb_iface->tell_address(device, handle, &address);
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+        } else {
+                ipc_answer_1(callid, EOK, address);
+        }
+}
 
 void remote_usbhc_get_buffer(device_t *device, void *iface,

uspace/lib/drv/include/usbhc_iface.h

@@ -92 +92 @@
  */
 typedef enum {
+        /** Tell USB address assigned to device.
+         * Parameters:
+         * - devman handle id
+         * Answer:
+         * - EINVAL - unknown handle or handle not managed by this driver
+         * - ENOTSUP - operation not supported by HC (shall not happen)
+         * - arbitrary error code if returned by remote implementation
+         * - EOK - handle found, first parameter contains the USB address
+         */
+        IPC_M_USBHC_GET_ADDRESS,
+
         /** Asks for data buffer.
          * See explanation at usb_iface_funcs_t.
@@ -157 +168 @@
 /** USB devices communication interface. */
 typedef struct {
+        int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
         int (*interrupt_out)(device_t *, usb_target_t,
             void *, size_t,

uspace/lib/usb/src/usbdrv.c

@@ -75 +75 @@
 usb_address_t usb_drv_get_my_address(int phone, device_t *dev)
 {
-        return ENOTSUP;
+        ipcarg_t address;
+        int rc = async_req_1_1(phone, IPC_M_USBHC_GET_ADDRESS,
+            dev->handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        return (usb_address_t) address;
 }