Changes in / [41455a22:f3378ba] in mainline

Location:

uspace/drv/bus/usb

Files:

• ehci/Makefile (modified) (1 diff)
• ehci/main.c (modified) (3 diffs)
• ehci/pci.c (deleted)
• ehci/pci.h (deleted)
• ehci/res.c (added)
• ehci/res.h (added)
• ohci/Makefile (modified) (1 diff)
• ohci/hw_struct/hcca.h (modified) (1 diff)
• ohci/ohci.c (modified) (3 diffs)
• ohci/pci.c (deleted)
• ohci/pci.h (deleted)
• ohci/res.c (added)
• ohci/res.h (added)
• uhci/Makefile (modified) (1 diff)
• uhci/pci.c (deleted)
• uhci/pci.h (deleted)
• uhci/res.c (added)
• uhci/res.h (added)
• uhci/uhci.c (modified) (5 diffs)

uspace/drv/bus/usb/ehci/Makefile

@@ -43 +43 @@
 SOURCES = \
         main.c \
-        pci.c
+        res.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/bus/usb/ehci/main.c

@@ -44 +44 @@
 #include <usb/host/hcd.h>
 
-#include "pci.h"
+#include "res.h"
 
 #define NAME "ehci"
@@ -81 +81 @@
         int irq = 0;
 
-        int ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        int ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_RETURN(ret,
             "Failed to get memory addresses for %" PRIun ": %s.\n",
@@ -88 +88 @@
             reg_base, reg_size, irq);
 
-        ret = pci_disable_legacy(device, reg_base, reg_size, irq);
+        ret = disable_legacy(device, reg_base, reg_size);
         CHECK_RET_RETURN(ret,
             "Failed to disable legacy USB: %s.\n", str_error(ret));

uspace/drv/bus/usb/ohci/Makefile

@@ -50 +50 @@
         ohci_batch.c \
         ohci_endpoint.c \
-        pci.c \
+        res.c \
         root_hub.c \
         hw_struct/endpoint_descriptor.c \

uspace/drv/bus/usb/ohci/hw_struct/hcca.h

@@ -46 +46 @@
         uint16_t pad1;
         uint32_t done_head;
-        uint32_t reserved[29];
-} __attribute__((packed, aligned)) hcca_t;
+        uint32_t reserved[30];
+} hcca_t;
 
 static inline void * hcca_get(void)

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

@@ -42 +42 @@
 
 #include "ohci.h"
-#include "pci.h"
+#include "res.h"
 #include "hc.h"
 
@@ -180 +180 @@
         int irq = 0;
 
-        ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get register memory addresses for %" PRIun ": %s.\n",
@@ -211 +211 @@
         /* Try to enable interrupts */
         bool interrupts = false;
-        ret = pci_enable_interrupts(device);
+        ret = enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."

uspace/drv/bus/usb/uhci/Makefile

@@ -44 +44 @@
         hc.c \
         main.c \
-        pci.c \
+        res.c \
         root_hub.c \
         transfer_list.c \

uspace/drv/bus/usb/uhci/uhci.c

@@ -41 +41 @@
 
 #include "uhci.h"
-#include "pci.h"
-
+
+#include "res.h"
 #include "hc.h"
 #include "root_hub.h"
@@ -49 +49 @@
  * and USB root hub */
 typedef struct uhci {
-        /** Pointer to DDF represenation of UHCI host controller */
+        /** Pointer to DDF representation of UHCI host controller */
         ddf_fun_t *hc_fun;
-        /** Pointer to DDF represenation of UHCI root hub */
+        /** Pointer to DDF representation of UHCI root hub */
         ddf_fun_t *rh_fun;
 
-        /** Internal driver's represenation of UHCI host controller */
+        /** Internal driver's representation of UHCI host controller */
         hc_t hc;
-        /** Internal driver's represenation of UHCI root hub */
+        /** Internal driver's representation of UHCI root hub */
         rh_t rh;
 } uhci_t;
@@ -187 +187 @@
         int irq = 0;
 
-        ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get I/O addresses for %" PRIun ": %s.\n",
@@ -194 +194 @@
             (void *) reg_base, reg_size, irq);
 
-        ret = pci_disable_legacy(device);
+        ret = disable_legacy(device);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to disable legacy USB: %s.\n", str_error(ret));
@@ -220 +220 @@
 
         bool interrupts = false;
-        ret = pci_enable_interrupts(device);
+        ret = enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."