Changeset 03936831 in mainline for uspace/drv/bus

Timestamp:

2017-10-20T09:16:55Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1252e81

Parents:

fe1c48d (diff), 04efacc (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 to fix build

Location:

uspace/drv/bus

Files:

• isa/isa.c (modified) (3 diffs)
• isa/isa.dev (modified) (1 diff)
• pci/pciintel/pci.c (modified) (1 diff)

uspace/drv/bus/isa/isa.c

@@ -453 +453 @@
 }
 
+static void isa_fun_add_mem_range(isa_fun_t *fun, uintptr_t addr, size_t len)
+{
+        size_t count = fun->hw_resources.count;
+        hw_resource_t *resources = fun->hw_resources.resources;
+
+        isa_bus_t *isa = isa_bus(ddf_fun_get_dev(fun->fnode));
+
+        if (count < ISA_MAX_HW_RES) {
+                resources[count].type = MEM_RANGE;
+                resources[count].res.mem_range.address = addr;
+                resources[count].res.mem_range.address += isa->pio_win.mem.base;
+                resources[count].res.mem_range.size = len;
+                resources[count].res.mem_range.relative = true;
+                resources[count].res.mem_range.endianness = LITTLE_ENDIAN;
+
+                fun->hw_resources.count++;
+
+                ddf_msg(LVL_NOTE, "Added mem range (addr=0x%zx, size=0x%x) to "
+                    "function %s", (uintptr_t) addr, (unsigned int) len,
+                    ddf_fun_get_name(fun->fnode));
+        }
+}
+
 static void fun_parse_irq(isa_fun_t *fun, const char *val)
 {
@@ -496 +519 @@
 }
 
+static void fun_parse_mem_range(isa_fun_t *fun, const char *val)
+{
+        uintptr_t addr;
+        size_t len;
+        char *end = NULL;
+
+        val = skip_spaces(val);
+        addr = strtoul(val, &end, 0x10);
+
+        if (val == end)
+                return;
+
+        val = skip_spaces(end);
+        len = strtol(val, &end, 0x10);
+
+        if (val == end)
+                return;
+
+        isa_fun_add_mem_range(fun, addr, len);
+}
+
 static void get_match_id(char **id, const char *val)
 {
@@ -564 +608 @@
 
         if (!prop_parse(fun, line, "io_range", &fun_parse_io_range) &&
+            !prop_parse(fun, line, "mem_range", &fun_parse_mem_range) &&
             !prop_parse(fun, line, "irq", &fun_parse_irq) &&
             !prop_parse(fun, line, "dma", &fun_parse_dma) &&

uspace/drv/bus/isa/isa.dev

@@ +1 @@
+i8259:
+        match 100 isa/i8259
+        mem_range 0x20 2
+        mem_range 0xa0 2
+
+apic:
+        match 100 isa/apic
+        mem_range 0xfec00000 0x14
 com1:
         match 100 isa/ns8250

uspace/drv/bus/pci/pciintel/pci.c

@@ -293 +293 @@
         const uint32_t conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg);
         pci_bus_t *bus = pci_bus_from_fun(fun);
-        uint32_t val;
+        uint32_t val = 0;
         
         fibril_mutex_lock(&bus->conf_mutex);