Changes in / [6c6a95d2:075c1eb] in mainline

Location:

uspace/drv

Files:

• ehci-hcd/ehci-hcd.ma (modified) (1 diff)
• ohci/hc.c (modified) (2 diffs)
• ohci/ohci.ma (modified) (1 diff)
• ohci/pci.c (modified) (1 diff)

uspace/drv/ehci-hcd/ehci-hcd.ma

@@ -2 +2 @@
 10 pci/ven=1002&dev=4386
 10 pci/ven=1002&dev=4396
-10 pci/ven=1002&dev=4373
 10 pci/ven=1022&dev=7463
 10 pci/ven=1022&dev=7808

uspace/drv/ohci/hc.c

@@ -334 +334 @@
 {
         assert(instance);
-        usb_log_debug("Requesting OHCI control.\n");
         /* Turn off legacy emulation */
         volatile uint32_t *ohci_emulation_reg =
@@ -340 +339 @@
         usb_log_debug("OHCI legacy register %p: %x.\n",
                 ohci_emulation_reg, *ohci_emulation_reg);
-        *ohci_emulation_reg &= ~0x1;
+        *ohci_emulation_reg = 0;
 
         /* Interrupt routing enabled => smm driver is active */

uspace/drv/ohci/ohci.ma

@@ -1 +1 @@
 10 pci/ven=106b&dev=003f
 10 pci/ven=10de&dev=0aa5
-
-10 pci/ven=1002&dev=4374
-10 pci/ven=1002&dev=4375
-
-10 pci/ven=1002&dev=4387
-10 pci/ven=1002&dev=4388
-10 pci/ven=1002&dev=4389
-10 pci/ven=1002&dev=438a
-10 pci/ven=1002&dev=438b
+10 pci/ven=10de&dev=0aa5

uspace/drv/ohci/pci.c

@@ -46 +46 @@
 
 #include "pci.h"
+
+#define PAGE_SIZE_MASK 0xfffff000
+
+#define HCC_PARAMS_OFFSET 0x8
+#define HCC_PARAMS_EECP_MASK 0xff
+#define HCC_PARAMS_EECP_OFFSET 8
+
+#define CMD_OFFSET 0x0
+#define CONFIGFLAG_OFFSET 0x40
+
+#define USBCMD_RUN 1
+
+#define USBLEGSUP_OFFSET 0
+#define USBLEGSUP_BIOS_CONTROL (1 << 16)
+#define USBLEGSUP_OS_CONTROL (1 << 24)
+#define USBLEGCTLSTS_OFFSET 4
+
+#define DEFAULT_WAIT 10000
+#define WAIT_STEP 10
 
 /** Get address of registers and IRQ for given device.