Changes in uspace/lib/drv/generic/remote_usbhc.c [b36e5de2:357a302] in mainline

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -43 +43 @@
 #define HACK_MAX_PACKET_SIZE_INTERRUPT_IN 4
 
-static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_bulk_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
+static void remote_usbhc_bulk_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_write(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_control_read(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -57 +58 @@
 /** Remote USB host controller interface operations. */
 static remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
-        remote_usbhc_get_address,
-
         remote_usbhc_reserve_default_address,
         remote_usbhc_release_default_address,
@@ -68 +67 @@
         remote_usbhc_interrupt_out,
         remote_usbhc_interrupt_in,
+
+        remote_usbhc_bulk_out,
+        remote_usbhc_bulk_in,
 
         remote_usbhc_control_write,
@@ -121 +123 @@
 }
 
-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) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-
-        devman_handle_t handle = DEV_IPC_GET_ARG1(*call);
-
-        usb_address_t address;
-        int rc = usb_iface->tell_address(device, handle, &address);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-        } else {
-                async_answer_1(callid, EOK, address);
-        }
-}
-
 void remote_usbhc_reserve_default_address(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -389 +370 @@
         return remote_usbhc_in_transfer(device, callid, call,
             usb_iface->interrupt_in);
+}
+
+void remote_usbhc_bulk_out(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+        assert(usb_iface != NULL);
+
+        return remote_usbhc_out_transfer(device, callid, call,
+            usb_iface->bulk_out);
+}
+
+void remote_usbhc_bulk_in(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+        assert(usb_iface != NULL);
+
+        return remote_usbhc_in_transfer(device, callid, call,
+            usb_iface->bulk_in);
 }