Changeset 48adf0f in mainline

Timestamp:

2017-10-30T18:02:36Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2b11c3c

Parents:

be1b1e68

Message:

OBIO should take base address from platform driver.

Location:

uspace/drv

Files:

• intctl/obio/obio.c (modified) (1 diff)
• platform/sun4u/sun4u.c (modified) (3 diffs)

uspace/drv/intctl/obio/obio.c

@@ -119 +119 @@
         int rc;
 
-        base_phys = (uintptr_t) 0x1fe00000000ULL;
-
         int flags = AS_AREA_READ | AS_AREA_WRITE;
-        int retval = physmem_map(base_phys,
+        int retval = physmem_map(res->base,
             ALIGN_UP(OBIO_SIZE, PAGE_SIZE) >> PAGE_WIDTH, flags,
             (void *) &base_virt);

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;
@@ -91 +95 @@
                 .type = MEM_RANGE,
                 .res.mem_range = {
-                        .address = PBM_BASE + PBM_PCI_CONFIG_BASE,
-                        .size = PBM_PCI_CONFIG_SIZE,
+                        .address = PBM_BASE + PBM_OBIO_BASE,
+                        .size = PBM_OBIO_SIZE,
                         .relative = false,
                         .endianness = LITTLE_ENDIAN
@@ -106 +110 @@
         .pio_window = {
                 .mem = {
-                        .base = PBM_BASE + PBM_PCI_MEM_BASE,
-                        .size = PBM_PCI_MEM_SIZE
+                        .base = PBM_BASE + PBM_OBIO_BASE,
+                        .size = PBM_OBIO_SIZE
                 }
         }