Changeset f834dd81 in mainline for uspace/drv/platform/sun4u/sun4u.c

Timestamp:

2017-10-31T19:24:58Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3654684

Parents:

eca820c (diff), 2b11c3c (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 OBIO DDF conversion.

File:

• uspace/drv/platform/sun4u/sun4u.c (modified) (3 diffs)

uspace/drv/platform/sun4u/sun4u.c

@@ -68 +68 @@
 #define PBM_PCI_MEM_SIZE        UINT64_C(0x00100000000)
 
+#define PBM_OBIO_BASE           UINT64_C(0)
+#define PBM_OBIO_SIZE           UINT64_C(0x1898)
+
+
 typedef struct sun4u_fun {
         hw_resource_list_t hw_resources;
@@ -85 +89 @@
         .name = NAME,
         .driver_ops = &sun4u_ops
+};
+
+static hw_resource_t obio_res[] = {
+        {
+                .type = MEM_RANGE,
+                .res.mem_range = {
+                        .address = PBM_BASE + PBM_OBIO_BASE,
+                        .size = PBM_OBIO_SIZE,
+                        .relative = false,
+                        .endianness = LITTLE_ENDIAN
+                }
+        }
+};
+
+static sun4u_fun_t obio_data = {
+        .hw_resources = {
+                .count = sizeof(obio_res) / sizeof(obio_res[0]),
+                .resources = obio_res
+        },
+        .pio_window = {
+                .mem = {
+                        .base = PBM_BASE + PBM_OBIO_BASE,
+                        .size = PBM_OBIO_SIZE
+                }
+        }
 };
 
@@ -201 +230 @@
 static bool sun4u_add_functions(ddf_dev_t *dev)
 {
+        if (!sun4u_add_fun(dev, "obio", "ebus/obio", &obio_data))
+                return false;
+
         return sun4u_add_fun(dev, "pci0", "intel_pci", &pci_data);
 }