Changes in uspace/drv/uhci/uhci.h [67a1b78:ea991e84] in mainline

File:

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

uspace/drv/uhci/uhci.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jan Vesely
+ * Copyright (c) 2010 Vojtech Horky
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup usb
+
+/** @addtogroup drvusbuhci
  * @{
  */
@@ -35 +36 @@
 #define DRV_UHCI_UHCI_H
 
-#include <fibril.h>
-
-#include <usb/addrkeep.h>
 #include <usbhc_iface.h>
 
-#include "root_hub/root_hub.h"
-#include "transfer_list.h"
+#define NAME "uhci"
 
-typedef struct uhci_regs {
-        uint16_t usbcmd;
-#define UHCI_CMD_MAX_PACKET (1 << 7)
-#define UHCI_CMD_CONFIGURE  (1 << 6)
-#define UHCI_CMD_DEBUG  (1 << 5)
-#define UHCI_CMD_FORCE_GLOBAL_RESUME  (1 << 4)
-#define UHCI_CMD_FORCE_GLOBAL_SUSPEND  (1 << 3)
-#define UHCI_CMD_GLOBAL_RESET  (1 << 2)
-#define UHCI_CMD_HCRESET  (1 << 1)
-#define UHCI_CMD_RUN_STOP  (1 << 0)
+usbhc_iface_t uhci_iface;
 
-        uint16_t usbsts;
-#define UHCI_STATUS_HALTED (1 << 5)
-#define UHCI_STATUS_PROCESS_ERROR (1 << 4)
-#define UHCI_STATUS_SYSTEM_ERROR (1 << 3)
-#define UHCI_STATUS_RESUME (1 << 2)
-#define UHCI_STATUS_ERROR_INTERRUPT (1 << 1)
-#define UHCI_STATUS_INTERRUPT (1 << 0)
-
-        uint16_t usbintr;
-        uint16_t frnum;
-        uint32_t flbaseadd;
-        uint8_t sofmod;
-} regs_t;
-
-#define TRANSFER_QUEUES 4
-#define UHCI_FRAME_LIST_COUNT 1024
-#define UHCI_CLEANER_TIMEOUT 1000000
-#define UHCI_DEBUGER_TIMEOUT 500000
-
-typedef struct uhci {
-        usb_address_keeping_t address_manager;
-        uhci_root_hub_t root_hub;
-        volatile regs_t *registers;
-
-        link_pointer_t *frame_list;
-
-        transfer_list_t transfers[TRANSFER_QUEUES];
-        fid_t cleaner;
-        fid_t debug_checker;
-} uhci_t;
-
-/* init uhci specifics in device.driver_data */
-int uhci_init( device_t *device, void *regs );
-
-int uhci_destroy( device_t *device );
-
-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_out,
-  usbhc_iface_transfer_in_callback_t callback_in,
-  void *arg );
+int pci_get_my_registers(device_t *, uintptr_t *, size_t *, int *);
 
 #endif