Changeset 54b141a in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2010-12-04T17:01:24Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e28d228

Parents:

2cb6571 (diff), ad104e0 (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:

Merge with vojtechhorky/

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -52 +52 @@
 static void remote_usbhc_control_read_data(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_read_status(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_reserve_default_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
+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_release_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 //static void remote_usbhc(device_t *, void *, ipc_callid_t, ipc_call_t *);
 
@@ -57 +61 @@
 static remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
         remote_usbhc_get_address,
+
         remote_usbhc_get_buffer,
+
+        remote_usbhc_reserve_default_address,
+        remote_usbhc_release_default_address,
+
+        remote_usbhc_request_address,
+        remote_usbhc_release_address,
+
         remote_usbhc_interrupt_out,
         remote_usbhc_interrupt_in,
+
         remote_usbhc_control_write_setup,
         remote_usbhc_control_write_data,
         remote_usbhc_control_write_status,
+
         remote_usbhc_control_read_setup,
         remote_usbhc_control_read_data,
@@ -134 +148 @@
         free(trans->buffer);
         free(trans);
+}
+
+void remote_usbhc_reserve_default_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->reserve_default_address) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int rc = usb_iface->reserve_default_address(device);
+
+        ipc_answer_0(callid, rc);
+}
+
+void remote_usbhc_release_default_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->release_default_address) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        int rc = usb_iface->release_default_address(device);
+
+        ipc_answer_0(callid, rc);
+}
+
+void remote_usbhc_request_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->request_address) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        usb_address_t address;
+        int rc = usb_iface->request_address(device, &address);
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+        } else {
+                ipc_answer_1(callid, EOK, (ipcarg_t) address);
+        }
+}
+
+void remote_usbhc_release_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->release_address) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        usb_address_t address = (usb_address_t) IPC_GET_ARG1(*call);
+
+        int rc = usb_iface->release_address(device, address);
+
+        ipc_answer_0(callid, rc);
 }