Changeset 5759975a in mainline for uspace/drv/infrastructure

Timestamp:

2013-09-11T17:55:18Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f18d01b6

Parents:

4c9b28a (diff), 26bc0fd1 (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 PIO_WINDOW_DEV_IFACE support.

Location:

uspace/drv/infrastructure

Files:

• rootmalta/rootmalta.c (modified) (6 diffs)
• rootpc/rootpc.c (modified) (6 diffs)

uspace/drv/infrastructure/rootmalta/rootmalta.c

@@ -53 +53 @@
 #include <ops/hw_res.h>
 #include <device/hw_res.h>
+#include <ops/pio_window.h>
+#include <device/pio_window.h>
 #include <byteorder.h>
 
@@ -66 +68 @@
 #define GT_PCI_CMD_MBYTESWAP    0x1
 
+#define GT_PCI_MEMBASE  UINT32_C(0x10000000)
+#define GT_PCI_MEMSIZE  UINT32_C(0x08000000)
+
+#define GT_PCI_IOBASE   UINT32_C(0x18000000)
+#define GT_PCI_IOSIZE   UINT32_C(0x00200000)
+
 typedef struct rootmalta_fun {
         hw_resource_list_t hw_resources;
+        pio_window_t pio_window;
 } rootmalta_fun_t;
 
@@ -107 +116 @@
                 sizeof(pci_conf_regs) / sizeof(pci_conf_regs[0]),
                 pci_conf_regs
+        },
+        .pio_window = {
+                .mem = {
+                        .base = GT_PCI_MEMBASE,
+                        .size = GT_PCI_MEMSIZE
+                },
+                .io = {
+                        .base = GT_PCI_IOBASE,
+                        .size = GT_PCI_IOSIZE
+                }
         }
 };
@@ -129 +148 @@
         
         return false;
+}
+
+static pio_window_t *rootmalta_get_pio_window(ddf_fun_t *fnode)
+{
+        rootmalta_fun_t *fun = rootmalta_fun(fnode);
+
+        assert(fun != NULL);
+        return &fun->pio_window;
 }
 
@@ -134 +161 @@
         .get_resource_list = &rootmalta_get_resources,
         .enable_interrupt = &rootmalta_enable_interrupt,
+};
+
+static pio_window_ops_t fun_pio_window_ops = {
+        .get_pio_window = &rootmalta_get_pio_window
 };
 
@@ -228 +259 @@
         ddf_log_init(NAME);
         rootmalta_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
+        rootmalta_fun_ops.interfaces[PIO_WINDOW_DEV_IFACE] = &fun_pio_window_ops;
 }
 

uspace/drv/infrastructure/rootpc/rootpc.c

@@ -51 +51 @@
 #include <ops/hw_res.h>
 #include <device/hw_res.h>
+#include <ops/pio_window.h>
+#include <device/pio_window.h>
 
 #define NAME "rootpc"
@@ -56 +58 @@
 typedef struct rootpc_fun {
         hw_resource_list_t hw_resources;
+        pio_window_t pio_window;
 } rootpc_fun_t;
 
@@ -93 +96 @@
 static rootpc_fun_t pci_data = {
         .hw_resources = {
-                sizeof(pci_conf_regs)/sizeof(pci_conf_regs[0]),
+                sizeof(pci_conf_regs) / sizeof(pci_conf_regs[0]),
                 pci_conf_regs
+        },
+        .pio_window = {
+                .mem = {
+                        .base = UINT32_C(0),
+                        .size = UINT32_C(0xffffffff) /* practical maximum */
+                },
+                .io = {
+                        .base = UINT32_C(0),
+                        .size = UINT32_C(0x10000)
+                }
         }
 };
@@ -117 +130 @@
         
         return false;
+}
+
+static pio_window_t *rootpc_get_pio_window(ddf_fun_t *fnode)
+{
+        rootpc_fun_t *fun = rootpc_fun(fnode);
+        
+        assert(fun != NULL);
+        return &fun->pio_window;
 }
 
@@ -122 +143 @@
         .get_resource_list = &rootpc_get_resources,
         .enable_interrupt = &rootpc_enable_interrupt,
+};
+
+static pio_window_ops_t fun_pio_window_ops = {
+        .get_pio_window = &rootpc_get_pio_window
 };
 
@@ -197 +222 @@
         ddf_log_init(NAME);
         rootpc_fun_ops.interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops;
+        rootpc_fun_ops.interfaces[PIO_WINDOW_DEV_IFACE] = &fun_pio_window_ops;
 }