Changeset cddcc4a3 in mainline for uspace/drv/infrastructure/rootmac/rootmac.c

Timestamp:

2012-08-14T18:16:39Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (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 mainline changes

File:

• uspace/drv/infrastructure/rootmac/rootmac.c (modified) (3 diffs)

uspace/drv/infrastructure/rootmac/rootmac.c

@@ -52 +52 @@
 } rootmac_fun_t;
 
-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 = 0xfec00000,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+        {
+                .type = IO_RANGE,
+                .res.io_range = {
+                        .address = 0xfee00000,
+                        .size = 4,
+                        .endianness = LITTLE_ENDIAN
+                }
         }
 };
@@ -63 +73 @@
 static rootmac_fun_t pci_data = {
         .hw_resources = {
-                1,
-                &pci_conf_regs
+                2,
+                pci_conf_regs
         }
 };
@@ -127 +137 @@
 static int rootmac_dev_add(ddf_dev_t *dev)
 {
+#if 0
         /* Register functions */
-        if (!rootmac_add_fun(dev, "pci0", "pangea_pci", &pci_data))
+        if (!rootmac_add_fun(dev, "pci0", "intel_pci", &pci_data))
                 ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform.");
+#else
+        (void)pci_data;
+        (void)rootmac_add_fun;
+#endif
         
         return EOK;