Changeset a73ebf0 in mainline for boot/arch/sparc32/src/ambapp.c

Timestamp:

2013-10-15T16:34:04Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

4d2dba7

Parents:

1f12fab

Message:

Pass AMBA P&P devices and memory size info from loader to kernel
using bootinfo_t structure.

File:

• boot/arch/sparc32/src/ambapp.c (modified) (5 diffs)

boot/arch/sparc32/src/ambapp.c

@@ -54 +54 @@
 void ambapp_scan()
 {
+        amba_fake = false;
+
         /* Scan for AHB masters & slaves */
         ambapp_scan_area(AMBAPP_AHBMASTER_AREA, 64);
@@ -64 +66 @@
 
         /* If we found nothing, fake device entries */
-        ambapp_qemu_fake_scan();
+        if (amba_devices_found == 0)
+                ambapp_qemu_fake_scan();
 }
 
@@ -80 +83 @@
                 amba_device_t *device = &amba_devices[amba_devices_found];
                 device->vendor_id = (amba_vendor_id_t)entry->vendor_id;
-                device->device_id = (amba_device_id_t)entry->device_id;
+        device->device_id = (amba_device_id_t)entry->device_id;
                 device->version = entry->version;
                 device->irq = entry->irq;
@@ -121 +124 @@
         amba_devices[2].bars[0].size = 0x100;
 
+        amba_fake = true;
         amba_devices_found = 3;
+}
+
+bool ambapp_fake()
+{
+        return amba_fake;
 }
 
@@ -130 +139 @@
         for (int i = 0; i < amba_devices_found; i++) {
                 amba_device_t *dev = &amba_devices[i];
-                printf("<%1x:%03x> at 0x%08x, irq %d\n", dev->vendor_id, dev->device_id, dev->bars[0].start, dev->irq);
+                printf("<%1x:%03x> at 0x%08x ", dev->vendor_id, dev->device_id, dev->bars[0].start);
+                if (dev->irq == -1)
+                        printf("\n");
+                else
+                        printf("irq %d\n", dev->irq);
         }
 }