Changeset be7950e8 in mainline

Timestamp:

2011-03-21T13:07:56Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2bf8f8c

Parents:

ff582d47

Message:

Implement interface, add stub batch functions

Location:

uspace/drv/ohci

Files:

• batch.c (modified) (1 diff)
• iface.c (modified) (7 diffs)

uspace/drv/ohci/batch.c

@@ -41 +41 @@
 
 #define DEFAULT_ERROR_COUNT 3
-
+batch_t * batch_get(
+    ddf_fun_t *fun,
+                usb_target_t target,
+    usb_transfer_type_t transfer_type,
+                size_t max_packet_size,
+    usb_speed_t speed,
+                char *buffer,
+                size_t size,
+                char *setup_buffer,
+                size_t setup_size,
+    usbhc_iface_transfer_in_callback_t func_in,
+    usbhc_iface_transfer_out_callback_t func_out,
+                void *arg,
+                device_keeper_t *manager
+                )
+{
+        return NULL;
+}
+/*----------------------------------------------------------------------------*/
+void batch_dispose(batch_t *instance)
+{
+}
+/*----------------------------------------------------------------------------*/
+void batch_control_write(batch_t *instance)
+{
+}
+/*----------------------------------------------------------------------------*/
+void batch_control_read(batch_t *instance)
+{
+}
+/*----------------------------------------------------------------------------*/
+void batch_interrupt_in(batch_t *instance)
+{
+}
+/*----------------------------------------------------------------------------*/
+void batch_interrupt_out(batch_t *instance)
+{
+}
+/*----------------------------------------------------------------------------*/
+void batch_bulk_in(batch_t *instance)
+{
+}
+/*----------------------------------------------------------------------------*/
+void batch_bulk_out(batch_t *instance)
+{
+}
 /**
  * @}

uspace/drv/ohci/iface.c

@@ -176 +176 @@
         return ENOTSUP;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Schedule interrupt out transfer.
  *
@@ -198 +198 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        UNSUPPORTED("interrupt_out");
-
-        return ENOTSUP;
-}
-
+  hc_t *hc = fun_to_hc(fun);
+  assert(hc);
+  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+
+  usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
+      target.address, target.endpoint, size, max_packet_size);
+
+  batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+      max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
+      &hc->manager);
+  if (!batch)
+    return ENOMEM;
+  batch_interrupt_out(batch);
+  const int ret = hc_schedule(hc, batch);
+  if (ret != EOK) {
+    batch_dispose(batch);
+    return ret;
+  }
+  return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Schedule interrupt in transfer.
  *
@@ -224 +240 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        UNSUPPORTED("interrupt_in");
-
-        return ENOTSUP;
-}
-
+  assert(fun);
+  hc_t *hc = fun_to_hc(fun);
+  assert(hc);
+  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n", 
+      target.address, target.endpoint, size, max_packet_size);
+
+  batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
+      max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
+      &hc->manager);
+  if (!batch)
+    return ENOMEM;
+  batch_interrupt_in(batch);
+  const int ret = hc_schedule(hc, batch);
+  if (ret != EOK) {
+    batch_dispose(batch);
+    return ret;
+  }
+  return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Schedule bulk out transfer.
  *
@@ -250 +282 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        UNSUPPORTED("bulk_out");
-
-        return ENOTSUP;
-}
-
+  assert(fun);
+  hc_t *hc = fun_to_hc(fun);
+  assert(hc);
+  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+
+  usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
+      target.address, target.endpoint, size, max_packet_size);
+
+  batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+      max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
+      &hc->manager);
+  if (!batch)
+    return ENOMEM;
+  batch_bulk_out(batch);
+  const int ret = hc_schedule(hc, batch);
+  if (ret != EOK) {
+    batch_dispose(batch);
+    return ret;
+  }
+  return EOK;
+
+}
+/*----------------------------------------------------------------------------*/
 /** Schedule bulk in transfer.
  *
@@ -276 +326 @@
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        UNSUPPORTED("bulk_in");
-
-        return ENOTSUP;
-}
-
+  assert(fun);
+  hc_t *hc = fun_to_hc(fun);
+  assert(hc);
+  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
+      target.address, target.endpoint, size, max_packet_size);
+
+  batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
+      max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
+      &hc->manager);
+  if (!batch)
+    return ENOMEM;
+  batch_bulk_in(batch);
+  const int ret = hc_schedule(hc, batch);
+  if (ret != EOK) {
+    batch_dispose(batch);
+    return ret;
+  }
+  return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Schedule control write transfer.
  *
@@ -303 +369 @@
 static int control_write(ddf_fun_t *fun, usb_target_t target,
     size_t max_packet_size,
-    void *setup_packet, size_t setup_packet_size,
-    void *data_buffer, size_t data_buffer_size,
+    void *setup_data, size_t setup_size,
+    void *data, size_t size,
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        UNSUPPORTED("control_write");
-
-        return ENOTSUP;
-}
-
+  assert(fun);
+  hc_t *hc = fun_to_hc(fun);
+  assert(hc);
+  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+  usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
+      speed, target.address, target.endpoint, size, max_packet_size);
+
+  if (setup_size != 8)
+    return EINVAL;
+
+  batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+      max_packet_size, speed, data, size, setup_data, setup_size,
+      NULL, callback, arg, &hc->manager);
+  if (!batch)
+    return ENOMEM;
+  device_keeper_reset_if_need(&hc->manager, target, setup_data);
+  batch_control_write(batch);
+  const int ret = hc_schedule(hc, batch);
+  if (ret != EOK) {
+    batch_dispose(batch);
+    return ret;
+  }
+  return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Schedule control read transfer.
  *
@@ -334 +420 @@
 static int control_read(ddf_fun_t *fun, usb_target_t target,
     size_t max_packet_size,
-    void *setup_packet, size_t setup_packet_size,
-    void *data_buffer, size_t data_buffer_size,
+    void *setup_data, size_t setup_size,
+    void *data, size_t size,
     usbhc_iface_transfer_in_callback_t callback, void *arg)
 {
-        UNSUPPORTED("control_read");
-
-        return ENOTSUP;
-}
-
+  assert(fun);
+  hc_t *hc = fun_to_hc(fun);
+  assert(hc);
+  usb_speed_t speed = device_keeper_speed(&hc->manager, target.address);
+
+  usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
+      speed, target.address, target.endpoint, size, max_packet_size);
+  batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
+      max_packet_size, speed, data, size, setup_data, setup_size, callback,
+      NULL, arg, &hc->manager);
+  if (!batch)
+    return ENOMEM;
+  batch_control_read(batch);
+  const int ret = hc_schedule(hc, batch);
+  if (ret != EOK) {
+    batch_dispose(batch);
+    return ret;
+  }
+  return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Host controller interface implementation for OHCI. */
 usbhc_iface_t hc_iface = {