Changes in / [b330cb1f:3742068] in mainline

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/ehci-hcd/Makefile (added)
• uspace/drv/ehci-hcd/ehci-hcd (added)
• uspace/drv/ehci-hcd/ehci-hcd.ma (added)
• uspace/drv/ehci-hcd/main.c (added)
• uspace/drv/ehci-hcd/pci.c (added)
• uspace/drv/ehci-hcd/pci.h (added)
• uspace/drv/pciintel/pci.c (modified) (3 diffs)

boot/arch/amd64/Makefile.inc

@@ -43 +43 @@
         isa \
         ns8250 \
+        ehci-hcd \
         uhci-hcd \
         uhci-rhd \

uspace/Makefile

@@ -117 +117 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
+                drv/ehci-hcd \
                 drv/uhci-hcd \
                 drv/uhci-rhd \
@@ -134 +135 @@
                 srv/hw/irc/apic \
                 srv/hw/irc/i8259 \
+                drv/ehci-hcd \
                 drv/uhci-hcd \
                 drv/uhci-rhd \

uspace/drv/pciintel/pci.c

@@ -127 +127 @@
 }
 
-static int pci_config_space_write_16(ddf_fun_t *fun, uint32_t address, uint16_t data)
+static int pci_config_space_write_32(
+    ddf_fun_t *fun, uint32_t address, uint32_t data)
+{
+        if (address > 252)
+                return EINVAL;
+        pci_conf_write_32(PCI_FUN(fun), address, data);
+        return EOK;
+}
+
+static int pci_config_space_write_16(
+    ddf_fun_t *fun, uint32_t address, uint16_t data)
 {
         if (address > 254)
@@ -135 +145 @@
 }
 
+static int pci_config_space_write_8(
+    ddf_fun_t *fun, uint32_t address, uint8_t data)
+{
+        if (address > 255)
+                return EINVAL;
+        pci_conf_write_8(PCI_FUN(fun), address, data);
+        return EOK;
+}
+
+static int pci_config_space_read_32(
+    ddf_fun_t *fun, uint32_t address, uint32_t *data)
+{
+        if (address > 252)
+                return EINVAL;
+        *data = pci_conf_read_32(PCI_FUN(fun), address);
+        return EOK;
+}
+
+static int pci_config_space_read_16(
+    ddf_fun_t *fun, uint32_t address, uint16_t *data)
+{
+        if (address > 254)
+                return EINVAL;
+        *data = pci_conf_read_16(PCI_FUN(fun), address);
+        return EOK;
+}
+
+static int pci_config_space_read_8(
+    ddf_fun_t *fun, uint32_t address, uint8_t *data)
+{
+        if (address > 255)
+                return EINVAL;
+        *data = pci_conf_read_8(PCI_FUN(fun), address);
+        return EOK;
+}
 
 static hw_res_ops_t pciintel_hw_res_ops = {
@@ -142 +187 @@
 
 static pci_dev_iface_t pci_dev_ops = {
-        .config_space_read_8 = NULL,
-        .config_space_read_16 = NULL,
-        .config_space_read_32 = NULL,
-        .config_space_write_8 = NULL,
+        .config_space_read_8 = &pci_config_space_read_8,
+        .config_space_read_16 = &pci_config_space_read_16,
+        .config_space_read_32 = &pci_config_space_read_32,
+        .config_space_write_8 = &pci_config_space_write_8,
         .config_space_write_16 = &pci_config_space_write_16,
-        .config_space_write_32 = NULL
+        .config_space_write_32 = &pci_config_space_write_32
 };