Changes in uspace/drv/uhci-hcd/iface.c [b36e5de2:ec59693] in mainline

File:

• uspace/drv/uhci-hcd/iface.c (modified) (4 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -54 +54 @@
 }
 /*----------------------------------------------------------------------------*/
-static int reserve_default_address(device_t *dev, usb_speed_t speed)
+static int reserve_default_address(device_t *dev)
 {
         assert(dev);
@@ -72 +72 @@
 }
 /*----------------------------------------------------------------------------*/
-static int request_address(device_t *dev, usb_speed_t speed,
-    usb_address_t *address)
+static int request_address(device_t *dev, usb_address_t *address)
 {
         assert(dev);
@@ -164 +163 @@
         return EOK;
 }
-
-
+/*----------------------------------------------------------------------------*/
+static int control_write_setup(device_t *dev, usb_target_t target,
+    size_t max_packet_size,
+    void *data, size_t size,
+    usbhc_iface_transfer_out_callback_t callback, void *arg)
+{
+        dev_speed_t speed = FULL_SPEED;
+
+        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
+        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
+            max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_control_setup_old(batch);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int control_write_data(device_t *dev, usb_target_t target,
+    size_t max_packet_size,
+    void *data, size_t size,
+    usbhc_iface_transfer_out_callback_t callback, void *arg)
+{
+        dev_speed_t speed = FULL_SPEED;
+
+        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
+        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
+            max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_control_write_data_old(batch);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int control_write_status(device_t *dev, usb_target_t target,
+    usbhc_iface_transfer_in_callback_t callback, void *arg)
+{
+        size_t max_packet_size = 8;
+        dev_speed_t speed = FULL_SPEED;
+
+        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
+        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
+            max_packet_size, speed, NULL, 0, NULL, 0, callback, NULL, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_control_write_status_old(batch);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int control_read_setup(device_t *dev, usb_target_t target,
+    size_t max_packet_size,
+    void *data, size_t size,
+    usbhc_iface_transfer_out_callback_t callback, void *arg)
+{
+        dev_speed_t speed = FULL_SPEED;
+
+        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
+        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
+            max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_control_setup_old(batch);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int control_read_data(device_t *dev, usb_target_t target,
+    size_t max_packet_size,
+    void *data, size_t size,
+    usbhc_iface_transfer_in_callback_t callback, void *arg)
+{
+        dev_speed_t speed = FULL_SPEED;
+
+        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
+        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
+            max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_control_read_data_old(batch);
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
+static int control_read_status(device_t *dev, usb_target_t target,
+    usbhc_iface_transfer_out_callback_t callback, void *arg)
+{
+        size_t max_packet_size = 8;
+        dev_speed_t speed = FULL_SPEED;
+
+        usb_log_warning("Using deprecated API %s.\n", __FUNCTION__);
+        batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL,
+            max_packet_size, speed, NULL, 0, NULL, 0, NULL, callback, arg);
+        if (!batch)
+                return ENOMEM;
+        batch_control_read_status_old(batch);
+        return EOK;
+}
 /*----------------------------------------------------------------------------*/
 usbhc_iface_t uhci_iface = {
@@ -181 +272 @@
         .control_read = control_read,
         .control_write = control_write,
+
+        .control_write_setup = control_write_setup,
+        .control_write_data = control_write_data,
+        .control_write_status = control_write_status,
+
+        .control_read_setup = control_read_setup,
+        .control_read_data = control_read_data,
+        .control_read_status = control_read_status
 };
 /**