Changeset d93ff502 in mainline for uspace/drv/uhci/uhci.h

Timestamp:

2011-01-28T14:59:50Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

10f479ae

Parents:

de0e6b3

Message:

Added toggle bit parameter.

Removed uhci_* specific functions, use uhci_transfer directly

File:

• uspace/drv/uhci/uhci.h (modified) (2 diffs)

uspace/drv/uhci/uhci.h

@@ -46 +46 @@
 typedef struct uhci_regs {
         uint16_t usbcmd;
+#define USB_CMD_
         uint16_t usbsts;
         uint16_t usbintr;
@@ -72 +73 @@
 int uhci_destroy( device_t *device );
 
-int uhci_in(
-  device_t *dev,
-        usb_target_t target,
-        usb_transfer_type_t transfer_type,
-        void *buffer, size_t size,
-        usbhc_iface_transfer_in_callback_t callback, void *arg
-        );
-
-int uhci_out(
-  device_t *dev,
-        usb_target_t target,
-  usb_transfer_type_t transfer_type,
-  void *buffer, size_t size,
-        usbhc_iface_transfer_out_callback_t callback, void *arg
-  );
-
-int uhci_setup(
+int uhci_transfer(
   device_t *dev,
   usb_target_t target,
   usb_transfer_type_t transfer_type,
+        bool toggle,
+  usb_packet_id pid,
   void *buffer, size_t size,
-  usbhc_iface_transfer_out_callback_t callback, void *arg
-  );
+  usbhc_iface_transfer_out_callback_t callback_out,
+  usbhc_iface_transfer_in_callback_t callback_in,
+  void *arg );
 
 #endif