Changes in uspace/drv/uhci-hcd/uhci.h [fb78ae72:83c439c] in mainline

File:

• uspace/drv/uhci-hcd/uhci.h (modified) (5 diffs)

uspace/drv/uhci-hcd/uhci.h

@@ -66 +66 @@
 
         uint16_t usbintr;
-#define UHCI_INTR_SHORT_PACKET (1 << 3)
-#define UHCI_INTR_COMPLETE (1 << 2)
-#define UHCI_INTR_RESUME (1 << 1)
-#define UHCI_INTR_CRC (1 << 0)
-
         uint16_t frnum;
         uint32_t flbaseadd;
@@ -77 +72 @@
 
 #define UHCI_FRAME_LIST_COUNT 1024
-#define UHCI_CLEANER_TIMEOUT 10000
+#define UHCI_CLEANER_TIMEOUT 1000000
 #define UHCI_DEBUGER_TIMEOUT 5000000
 
@@ -86 +81 @@
         link_pointer_t *frame_list;
 
+        link_t batch_list;
+        fibril_mutex_t batch_list_mutex;
+
         transfer_list_t transfers_bulk_full;
         transfer_list_t transfers_control_full;
@@ -92 +90 @@
 
         transfer_list_t *transfers[2][4];
-
-        irq_code_t interrupt_code;
 
         fid_t cleaner;
@@ -102 +98 @@
 int uhci_init(uhci_t *instance, void *regs, size_t reg_size);
 
-static inline void uhci_fini(uhci_t *instance) {};
+int uhci_fini(uhci_t *device);
+
+int uhci_transfer(
+  uhci_t *instance,
+  device_t *dev,
+  usb_target_t target,
+  usb_transfer_type_t transfer_type,
+        bool toggle,
+  usb_packet_id pid,
+        bool low_speed,
+  void *buffer, size_t size,
+  usbhc_iface_transfer_out_callback_t callback_out,
+  usbhc_iface_transfer_in_callback_t callback_in,
+  void *arg );
 
 int uhci_schedule(uhci_t *instance, batch_t *batch);
 
-void uhci_interrupt(uhci_t *instance, uint16_t status);
-
 static inline uhci_t * dev_to_uhci(device_t *dev)
         { return (uhci_t*)dev->driver_data; }
-
 
 #endif