Changeset 6de2d766 in mainline for uspace/drv/infrastructure/rootpc/rootpc.c

Timestamp:

2012-07-20T18:14:55Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b828907, be67118

Parents:

7030bc9 (diff), 32260a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge USB branch.

USB should be endian agnostic now.
OHCI and pci work on qemu powerpc, but pci locks up on real hw.
Hopefully no regressions on amd64/ia32.
Tested on qemu and Virtualbox.

File:

• uspace/drv/infrastructure/rootpc/rootpc.c (modified) (2 diffs)

uspace/drv/infrastructure/rootpc/rootpc.c

@@ -75 +75 @@
 };
 
-static hw_resource_t pci_conf_regs = {
-        .type = IO_RANGE,
-        .res.io_range = {
-                .address = 0xCF8,
-                .size = 8,
-                .endianness = LITTLE_ENDIAN
+static hw_resource_t pci_conf_regs[] = {
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xCF8,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xCFC,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
         }
 };
@@ -86 +96 @@
 static rootpc_fun_t pci_data = {
         .hw_resources = {
-                1,
-                &pci_conf_regs
+                sizeof(pci_conf_regs)/sizeof(pci_conf_regs[0]),
+                pci_conf_regs
         }
 };