Changeset 790318e in mainline for uspace/drv/bus/usb/ohci/ohci_batch.c

Timestamp:

2011-09-16T11:50:06Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

82a31261

Parents:

058fd76

Message:

uhci,ohci: Remove direction from initialization table.

File:

• uspace/drv/bus/usb/ohci/ohci_batch.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci_batch.c

@@ -42 +42 @@
 #include "utils/malloc32.h"
 
-static void (*const batch_setup[4][3])(ohci_transfer_batch_t*, usb_direction_t);
+static void (*const batch_setup[])(ohci_transfer_batch_t*, usb_direction_t);
 /*----------------------------------------------------------------------------*/
 /** Safely destructs ohci_transfer_batch_t structure
@@ -137 +137 @@
 
         const usb_direction_t dir = usb_transfer_batch_direction(usb_batch);
-        assert(batch_setup[usb_batch->ep->transfer_type][dir]);
-        batch_setup[usb_batch->ep->transfer_type][dir](ohci_batch, dir);
+        assert(batch_setup[usb_batch->ep->transfer_type]);
+        batch_setup[usb_batch->ep->transfer_type](ohci_batch, dir);
 
         return ohci_batch;
@@ -347 +347 @@
 }
 /*----------------------------------------------------------------------------*/
-static void (*const batch_setup[4][3])(ohci_transfer_batch_t*, usb_direction_t) =
-{
-        { batch_control, batch_control, NULL },
-        { NULL, NULL, NULL },
-        { batch_data, batch_data, NULL },
-        { batch_data, batch_data, NULL },
+static void (*const batch_setup[])(ohci_transfer_batch_t*, usb_direction_t) =
+{
+        [USB_TRANSFER_CONTROL] = batch_control,
+        [USB_TRANSFER_BULK] = batch_data,
+        [USB_TRANSFER_INTERRUPT] = batch_data,
+        [USB_TRANSFER_ISOCHRONOUS] = NULL,
 };
 /**