Archipelago » qemu

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/bios.h OpenHackWare-release-0.4/src/bios.h

--- OpenHackWare-release-0.4.org/src/bios.h        2005-04-06 23:20:22.000000000 +0200

+++ OpenHackWare-release-0.4/src/bios.h        2005-07-03 16:17:41.000000000 +0200

@@ -64,6 +64,7 @@

     ARCH_CHRP,

     ARCH_MAC99,

     ARCH_POP,

+    ARCH_HEATHROW,

 };

 /* Hardware definition(s) */

@@ -183,12 +184,12 @@

 part_t *bd_probe (int boot_device);

 bloc_device_t *bd_get (int device);

 void bd_put (bloc_device_t *bd);

-void bd_set_boot_part (bloc_device_t *bd, part_t *partition);

+void bd_set_boot_part (bloc_device_t *bd, part_t *partition, int partnum);

 part_t **_bd_parts (bloc_device_t *bd);

 void ide_pci_pc_register (uint32_t io_base0, uint32_t io_base1,

                           uint32_t io_base2, uint32_t io_base3,

-                          void *OF_private);

+                          void *OF_private0, void *OF_private1);

 void ide_pci_pmac_register (uint32_t io_base0, uint32_t io_base1,

                             void *OF_private);

@@ -399,17 +400,23 @@

                               uint16_t min_grant, uint16_t max_latency);

 void OF_finalize_pci_host (void *dev, int first_bus, int nb_busses);

 void OF_finalize_pci_device (void *dev, uint8_t bus, uint8_t devfn,

-                             uint32_t *regions, uint32_t *sizes);

+                             uint32_t *regions, uint32_t *sizes,

+                             int irq_line);

 void OF_finalize_pci_macio (void *dev, uint32_t base_address, uint32_t size,

                             void *private_data);

+void OF_finalize_pci_ide (void *dev, 

+                          uint32_t io_base0, uint32_t io_base1,

+                          uint32_t io_base2, uint32_t io_base3);

 int OF_register_bus (const unsigned char *name, uint32_t address,

                      const unsigned char *type);

 int OF_register_serial (const unsigned char *bus, const unsigned char *name,

                         uint32_t io_base, int irq);

 int OF_register_stdio (const unsigned char *dev_in,

                        const unsigned char *dev_out);

-void OF_vga_register (const unsigned char *name, uint32_t address,

-                      int width, int height, int depth);

+void OF_vga_register (const unsigned char *name, unused uint32_t address,

+                      int width, int height, int depth,

+                      unsigned long vga_bios_addr, 

+                      unsigned long vga_bios_size);

 void *OF_blockdev_register (void *parent, void *private,

                             const unsigned char *type,

                             const unsigned char *name, int devnum,

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/bloc.c OpenHackWare-release-0.4/src/bloc.c

--- OpenHackWare-release-0.4.org/src/bloc.c        2005-04-06 23:21:00.000000000 +0200

+++ OpenHackWare-release-0.4/src/bloc.c        2005-07-03 16:17:41.000000000 +0200

@@ -55,6 +55,7 @@

     /* Partitions */

     part_t *parts, *bparts;

     part_t *boot_part;

+    int bpartnum;

     /* Chain */

     bloc_device_t *next;

 };

@@ -223,10 +224,12 @@

 }

 /* XXX: to be suppressed */

-void bd_set_boot_part (bloc_device_t *bd, part_t *partition)

+void bd_set_boot_part (bloc_device_t *bd, part_t *partition, int partnum)

 {

+    dprintf("%s: part %p (%p) %d\n", __func__, partition, bd->boot_part, partnum);

     if (bd->boot_part == NULL) {

         bd->boot_part = partition;

+        bd->bpartnum = partnum;

     }

 }

@@ -240,6 +243,13 @@

     return &bd->bparts;

 }

+void bd_set_boot_device (bloc_device_t *bd)

+{

+#if defined (USE_OPENFIRMWARE)

+    OF_blockdev_set_boot_device(bd->OF_private, bd->bpartnum, "\\\\ofwboot");

+#endif

+}

+

 part_t *bd_probe (int boot_device)

 {

     char devices[] = { /*'a', 'b',*/ 'c', 'd', 'e', 'f', 'm', '\0', };

@@ -272,9 +282,7 @@

         tmp = part_probe(bd, force_raw);

         if (boot_device == bd->device) {

             boot_part = tmp;

-#if defined (USE_OPENFIRMWARE)

-            OF_blockdev_set_boot_device(bd->OF_private, 2, "\\\\ofwboot");

-#endif

+            bd_set_boot_device(bd);

         }

     }

@@ -717,34 +725,29 @@

 /* IDE PCI access for pc */

 static uint8_t ide_pci_port_read (bloc_device_t *bd, int port)

 {

-    eieio();

-

-    return *(uint8_t *)(bd->io_base + port);

+    uint8_t value;

+    value = inb(bd->io_base + port);

+    return value;

 }

 static void ide_pci_port_write (bloc_device_t *bd, int port, uint8_t value)

 {

-    *(uint8_t *)(bd->io_base + port) = value;

-    eieio();

+    outb(bd->io_base + port, value);

 }

 static uint32_t ide_pci_data_readl (bloc_device_t *bd)

 {

-    eieio();

-

-    return *((uint32_t *)bd->io_base);

+    return inl(bd->io_base);

 }

 static void ide_pci_data_writel (bloc_device_t *bd, uint32_t val)

 {

-    *(uint32_t *)(bd->io_base) = val;

-    eieio();

+    outl(bd->io_base, val);

 }

 static void ide_pci_control_write (bloc_device_t *bd, uint32_t val)

 {

-    *((uint8_t *)bd->tmp) = val;

-    eieio();

+    outb(bd->tmp + 2, val);

 }

 static ide_ops_t ide_pci_pc_ops = {

@@ -761,7 +764,7 @@

 void ide_pci_pc_register (uint32_t io_base0, uint32_t io_base1,

                           uint32_t io_base2, uint32_t io_base3,

-                          unused void *OF_private)

+                          void *OF_private0, void *OF_private1)

 {

     if (ide_pci_ops == NULL) {

         ide_pci_ops = malloc(sizeof(ide_ops_t));

@@ -770,19 +773,19 @@

         memcpy(ide_pci_ops, &ide_pci_pc_ops, sizeof(ide_ops_t));

     }

     if ((io_base0 != 0 || io_base1 != 0) &&

-        ide_pci_ops->base[0] == 0 && ide_pci_ops->base[1] == 0) {

+        ide_pci_ops->base[0] == 0 && ide_pci_ops->base[2] == 0) {

         ide_pci_ops->base[0] = io_base0;

-        ide_pci_ops->base[1] = io_base1;

+        ide_pci_ops->base[2] = io_base1;

 #ifdef USE_OPENFIRMWARE

-        ide_pci_ops->OF_private[0] = OF_private;

+        ide_pci_ops->OF_private[0] = OF_private0;

 #endif

     }

     if ((io_base2 != 0 || io_base3 != 0) &&

-        ide_pci_ops->base[2] == 0 && ide_pci_ops->base[3] == 0) {

-        ide_pci_ops->base[2] = io_base2;

+        ide_pci_ops->base[1] == 0 && ide_pci_ops->base[3] == 0) {

+        ide_pci_ops->base[1] = io_base2;

         ide_pci_ops->base[3] = io_base3;

 #ifdef USE_OPENFIRMWARE

-        ide_pci_ops->OF_private[1] = OF_private;

+        ide_pci_ops->OF_private[1] = OF_private1;

 #endif

     }

 }

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/libpart/apple.c OpenHackWare-release-0.4/src/libpart/apple.c

--- OpenHackWare-release-0.4.org/src/libpart/apple.c        2005-03-31 09:23:33.000000000 +0200

+++ OpenHackWare-release-0.4/src/libpart/apple.c        2005-07-03 16:17:41.000000000 +0200

@@ -199,14 +199,18 @@

         if (len == 0) {

             /* Place holder. Skip it */

             DPRINTF("%s placeholder part\t%d\n", __func__, i);

+            part->flags = PART_TYPE_APPLE | PART_FLAG_DUMMY;

+            part_register(bd, part, name, i);

         } else if (strncmp("Apple_Void", type, 32) == 0) {

             /* Void partition. Skip it */

             DPRINTF("%s Void part\t%d [%s]\n", __func__, i, type);

+            part->flags = PART_TYPE_APPLE | PART_FLAG_DUMMY;

+            part_register(bd, part, name, i);

         } else if (strncmp("Apple_Free", type, 32) == 0) {

             /* Free space. Skip it */

             DPRINTF("%s Free part (%d)\n", __func__, i);

             part->flags = PART_TYPE_APPLE | PART_FLAG_DUMMY;

-            part_register(bd, part, name);

+            part_register(bd, part, name, i);

         } else if (strncmp("Apple_partition_map", type, 32) == 0 ||

                    strncmp("Apple_Partition_Map", type, 32) == 0

 #if 0 // Is this really used or is it just a mistake ?

@@ -226,7 +230,7 @@

                  */

             }

             part->flags = PART_TYPE_APPLE | PART_FLAG_DUMMY;

-            part_register(bd, part, name);

+            part_register(bd, part, name, i);

         } else if (strncmp("Apple_Driver", type, 32) == 0 ||

                    strncmp("Apple_Driver43", type, 32) == 0 ||

                    strncmp("Apple_Driver43_CD", type, 32) == 0 ||

@@ -236,8 +240,12 @@

                    strncmp("Apple_Driver_IOKit", type, 32) == 0) {

             /* Drivers. don't care for now */

             DPRINTF("%s Drivers part\t%d [%s]\n", __func__, i, type);

+            part->flags = PART_TYPE_APPLE | PART_FLAG_DRIVER;

+            part_register(bd, part, name, i);

         } else if (strncmp("Apple_Patches", type, 32) == 0) {

             /* Patches: don't care for now */

+            part->flags = PART_TYPE_APPLE | PART_FLAG_PATCH;

+            part_register(bd, part, name, i);

             DPRINTF("%s Patches part\t%d [%s]\n", __func__, i, type);

         } else if (strncmp("Apple_HFS", type, 32) == 0 ||

                    strncmp("Apple_MFS", type, 32) == 0 ||

@@ -256,9 +264,8 @@

             count = partmap->bloc_cnt * HFS_BLOCSIZE;

             if (partmap->boot_size == 0 || partmap->boot_load == 0) {

                 printf("Not a bootable partition %d %d (%p %p)\n",

-                       partmap->boot_size, partmap->boot_load,boot_part, part);

-                if (boot_part == NULL)

-                    boot_part = part;

+                       partmap->boot_size, partmap->boot_load,

+                       boot_part, part);

                 part->flags = PART_TYPE_APPLE | PART_FLAG_FS;

             } else {

                 part->boot_start.bloc = partmap->boot_start;

@@ -278,8 +285,8 @@

                 boot_part = part;

                 part->flags = PART_TYPE_APPLE | PART_FLAG_FS | PART_FLAG_BOOT;

             }

-            printf("Partition: %d %s st %0x size %0x",

-                    i, name, partmap->start_bloc, partmap->bloc_cnt);

+            printf("Partition: %d '%s' '%s' st %0x size %0x",

+                    i, name, type, partmap->start_bloc, partmap->bloc_cnt);

 #ifndef DEBUG

             printf("\n");

 #endif

@@ -290,11 +297,13 @@

                     part->boot_load, part->boot_entry);

             DPRINTF("                           load %0x entry %0x %0x\n",

                     partmap->boot_load2, partmap->boot_entry2, HFS_BLOCSIZE);

-            part_register(bd, part, name);

+            part_register(bd, part, name, i);

         } else {

             memcpy(tmp, type, 32);

             tmp[32] = '\0';

             ERROR("Unknown partition type [%s]\n", tmp);

+            part->flags = PART_TYPE_APPLE | PART_FLAG_DUMMY;

+            part_register(bd, part, name, i);

         }

     }

  error:

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/libpart/core.c OpenHackWare-release-0.4/src/libpart/core.c

--- OpenHackWare-release-0.4.org/src/libpart/core.c        2005-03-31 09:23:33.000000000 +0200

+++ OpenHackWare-release-0.4/src/libpart/core.c        2005-07-03 16:17:41.000000000 +0200

@@ -126,7 +126,7 @@

 }

 int part_register (bloc_device_t *bd, part_t *partition,

-                   const unsigned char *name)

+                   const unsigned char *name, int partnum)

 {

     part_t **cur;

@@ -134,6 +134,7 @@

     partition->bd = bd;

     partition->next = NULL;

     partition->name = strdup(name);

+    partition->partnum = partnum;

     for (cur = _bd_parts(bd); *cur != NULL; cur = &(*cur)->next)

         continue;

     *cur = partition;

@@ -141,29 +142,15 @@

     return 0;

 }

-static inline int set_boot_part (bloc_device_t *bd, int partnum)

-{

-    part_t *cur;

-

-    cur = part_get(bd, partnum);

-    if (cur == NULL)

-        return -1;

-    bd_set_boot_part(bd, cur);

-

-    return 0;

-}

-

 part_t *part_get (bloc_device_t *bd, int partnum)

 {

     part_t **listp, *cur;

-    int i;

     listp = _bd_parts(bd);

-    cur = *listp;

-    for (i = 0; i != partnum; i++) {

-        if (cur == NULL)

+    

+    for (cur = *listp; cur != NULL; cur = cur->next) {

+        if (cur->partnum == partnum)

             break;

-        cur = cur->next;

     }

     return cur;

@@ -192,17 +179,20 @@

     part_set_blocsize(bd, part, 512);

     part->bd = bd;

     part->flags = PART_TYPE_RAW | PART_FLAG_BOOT;

-    part_register(bd, part, "Raw");

+    part_register(bd, part, "Raw", 0);

     return part;

 }

+bloc_device_t *part_get_bd (part_t *part)

+{

+    return part->bd;

+}

+

 part_t *part_probe (bloc_device_t *bd, int set_raw)

 {

-    part_t *part0, *boot_part, **cur;

+    part_t *part0 = NULL, *boot_part, **cur;

-    /* Register the 0 partition: raw partition containing the whole disk */

-    part0 = part_get_raw(bd);

     /* Try to find a valid boot partition */

     boot_part = Apple_probe_partitions(bd);

     if (boot_part == NULL) {

@@ -210,10 +200,13 @@

         if (boot_part == NULL && arch == ARCH_PREP)

             boot_part = PREP_find_partition(bd);

         if (boot_part == NULL && set_raw != 0) {

-            boot_part = part0;

-            set_boot_part(bd, 0);

+            dprintf("Use bloc device as raw partition\n");

         }

     }

+    if (_bd_parts(bd) == NULL) {

+        /* Register the 0 partition: raw partition containing the whole disk */

+        part0 = part_get_raw(bd);

+    }

     /* Probe filesystem on each found partition */

     for (cur = _bd_parts(bd); *cur != NULL; cur = &(*cur)->next) {

         const unsigned char *map, *type;

@@ -248,23 +241,28 @@

             type = "unknown";

             break;

         }

-        DPRINTF("Probe filesystem on %s %s partition '%s' %s\n",

+        dprintf("Probe filesystem on %s %s partition '%s' %s %p\n",

                 type, map, (*cur)->name,

-                ((*cur)->flags) & PART_FLAG_BOOT ? "(bootable)" : "");

+                ((*cur)->flags) & PART_FLAG_BOOT ? "(bootable)" : "", *cur);

         if (((*cur)->flags) & PART_FLAG_FS) {

             if (((*cur)->flags) & PART_FLAG_BOOT)

                 (*cur)->fs = fs_probe(*cur, 1);

             else

                 (*cur)->fs = fs_probe(*cur, 0);

+        } else if (((*cur)->flags) & PART_TYPE_RAW) {

+            (*cur)->fs = fs_probe(*cur, 2);

         } else {

             (*cur)->fs = fs_probe(*cur, 2);

         }

-        if (((*cur)->flags) & PART_FLAG_BOOT) {

-            bd_set_boot_part(bd, *cur);

             fs_get_bootfile((*cur)->fs);

+        if (((*cur)->flags) & PART_FLAG_BOOT) {

+            dprintf("Partition is bootable (%d)\n", (*cur)->partnum);

+            bd_set_boot_part(bd, *cur, (*cur)->partnum);

+            if (boot_part == NULL)

+                boot_part = *cur;

         }

     }

-    DPRINTF("Boot partition: %p %p %p %p\n", boot_part, boot_part->fs,

+    dprintf("Boot partition: %p %p %p %p\n", boot_part, boot_part->fs,

             part_fs(boot_part), part0);

     return boot_part;

@@ -279,6 +277,7 @@

     part->boot_size.offset = 0;

     part->boot_load = 0;

     part->boot_entry = 0;

+    part->flags |= PART_FLAG_BOOT;

     return 0;

 }

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/libpart/isofs.c OpenHackWare-release-0.4/src/libpart/isofs.c

--- OpenHackWare-release-0.4.org/src/libpart/isofs.c        2005-03-31 09:23:33.000000000 +0200

+++ OpenHackWare-release-0.4/src/libpart/isofs.c        2005-07-03 16:17:41.000000000 +0200

@@ -242,7 +242,7 @@

                    part->boot_start.bloc, part->boot_size.bloc,

                    part->boot_load, part->boot_entry);

             part->flags = PART_TYPE_ISO9660 | PART_FLAG_BOOT;

-            part_register(bd, part, name);

+            part_register(bd, part, name, i + 1);

             fs_raw_set_bootfile(part, part->boot_start.bloc,

                                 part->boot_start.offset,

                                 part->boot_size.bloc,

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/libpart/libpart.h OpenHackWare-release-0.4/src/libpart/libpart.h

--- OpenHackWare-release-0.4.org/src/libpart/libpart.h        2005-03-31 09:23:33.000000000 +0200

+++ OpenHackWare-release-0.4/src/libpart/libpart.h        2005-07-03 16:17:41.000000000 +0200

@@ -30,6 +30,7 @@

 struct part_t {

     bloc_device_t *bd;

+    int partnum;

     uint32_t start;      /* Partition first bloc             */

     uint32_t size;       /* Partition size, in blocs         */

     uint32_t spb;

@@ -54,7 +55,7 @@

 };

 int part_register (bloc_device_t *bd, part_t *partition,

-                   const unsigned char *name);

+                   const unsigned char *name, int partnum);

 void part_set_blocsize (bloc_device_t *bd, part_t *part, uint32_t blocsize);

 void part_private_set (part_t *part, void *private);

 void *part_private_get (part_t *part);

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/libpart/prep.c OpenHackWare-release-0.4/src/libpart/prep.c

--- OpenHackWare-release-0.4.org/src/libpart/prep.c        2005-03-31 09:23:33.000000000 +0200

+++ OpenHackWare-release-0.4/src/libpart/prep.c        2005-07-03 16:17:41.000000000 +0200

@@ -164,7 +164,7 @@

             part->boot_load = 0;

             part->boot_entry = boot_offset - part->bloc_size;

             part->flags = PART_TYPE_PREP | PART_FLAG_BOOT;

-            part_register(bd, part, "PREP boot");

+            part_register(bd, part, "PREP boot", i);

             fs_raw_set_bootfile(part, part->boot_start.bloc,

                                 part->boot_start.offset,

                                 part->boot_size.bloc,

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/main.c OpenHackWare-release-0.4/src/main.c

--- OpenHackWare-release-0.4.org/src/main.c        2005-03-31 09:23:33.000000000 +0200

+++ OpenHackWare-release-0.4/src/main.c        2005-06-07 23:48:39.000000000 +0200

@@ -364,20 +364,24 @@

     void *load_base, *load_entry, *last_alloc, *load_end;

     uint32_t memsize, boot_image_size, cmdline_size, ramdisk_size;

     uint32_t boot_base, boot_nb;

-    int boot_device;

+    int boot_device, i;

+    static const uint32_t isa_base_tab[3] = {

+        0x80000000, /* PREP */

+        0xFE000000, /* Grackle (Heathrow) */

+        0xF2000000, /* UniNorth (Mac99)  */

+    };

     /* Retrieve NVRAM configuration */

- nvram_retry:

+    for(i = 0; i < 3; i++) {

+        isa_io_base = isa_base_tab[i];

     nvram = NVRAM_get_config(&memsize, &boot_device,

                              &boot_image, &boot_image_size,

                              &cmdline, &cmdline_size,

                              &ramdisk, &ramdisk_size);

-    if (nvram == NULL) {

-        /* Retry with another isa_io_base */

-        if (isa_io_base == 0x80000000) {

-            isa_io_base = 0xF2000000;

-            goto nvram_retry;

+        if (nvram)

+            break;

         }

+    if (i == 3) {

         ERROR("Unable to load configuration from NVRAM. Aborting...\n");

         return -1;

     }

@@ -402,7 +406,7 @@

         cpu_name = CPU_get_name(pvr);

         OF_register_cpu(cpu_name, 0, pvr,

                         200 * 1000 * 1000, 200 * 1000 * 1000,

-                        100 * 1000 * 1000, 10 * 1000 * 1000,

+                        100 * 1000 * 1000, 100 * 1000 * 1000,

                         0x0092);

     }

     OF_register_memory(memsize, 512 * 1024 /* TOFIX */);

@@ -433,9 +437,12 @@

     vga_puts(copyright);

     vga_puts("\n");

+#if 0

     /* QEMU is quite incoherent: d is cdrom, not second drive */

+    /* XXX: should probe CD-ROM position */

     if (boot_device == 'd')

         boot_device = 'e';

+#endif

     /* Open boot device */

     boot_part = bd_probe(boot_device);

     if (boot_device == 'm') {

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/nvram.c OpenHackWare-release-0.4/src/nvram.c

--- OpenHackWare-release-0.4.org/src/nvram.c        2005-03-31 09:23:33.000000000 +0200

+++ OpenHackWare-release-0.4/src/nvram.c        2005-06-04 23:44:03.000000000 +0200

@@ -334,6 +334,7 @@

         ret = NVRAM_chrp_format(nvram);

         break;

     case ARCH_MAC99:

+    case ARCH_HEATHROW: /* XXX: may be incorrect */

         ret = NVRAM_mac99_format(nvram);

         break;

     case ARCH_POP:

@@ -409,13 +410,12 @@

         arch = ARCH_MAC99;

     } else if (strcmp(sign, "POP") == 0) {

         arch = ARCH_POP;

+    } else if (strcmp(sign, "HEATHROW") == 0) {

+        arch = ARCH_HEATHROW;

     } else {

         ERROR("Unknown PPC architecture: '%s'\n", sign);

         return NULL;

     }

-    /* HACK */

-    if (arch == ARCH_CHRP)

-        arch = ARCH_MAC99;

     lword = NVRAM_get_lword(nvram, 0x30);

     *RAM_size = lword;

     byte = NVRAM_get_byte(nvram, 0x34);

diff -wruN --exclude '*~' --exclude '*.o' --exclude '*.bin' --exclude '*.out' --exclude mkdiff OpenHackWare-release-0.4.org/src/of.c OpenHackWare-release-0.4/src/of.c

--- OpenHackWare-release-0.4.org/src/of.c        2005-04-06 23:17:26.000000000 +0200

+++ OpenHackWare-release-0.4/src/of.c        2005-07-03 17:46:25.000000000 +0200

@@ -489,7 +489,7 @@

         ERROR("%s can't alloc new node '%s' name\n", __func__, name);

         return NULL;

     }

-    new->prop_address = OF_prop_int_new(env, new, "address", address);

+    new->prop_address = OF_prop_int_new(env, new, "unit-address", address);

     if (new->prop_address == NULL) {

         free(new->prop_name->value);

         free(new->prop_name);

@@ -1421,15 +1421,12 @@

 __attribute__ (( section (".OpenFirmware") ))

 int OF_init (void)

 {

-    const unsigned char compat_str[] =

 #if 0

         "PowerMac3,1\0MacRISC\0Power Macintosh\0";

         "PowerMac1,2\0MacRISC\0Power Macintosh\0";

         "AAPL,PowerMac G3\0PowerMac G3\0MacRISC\0Power Macintosh\0";

         "AAPL,PowerMac3,0\0MacRISC\0Power Macintosh\0";

         "AAPL,Gossamer\0MacRISC\0Power Macintosh\0";

-#else

-        "AAPL,PowerMac G3\0PowerMac G3\0MacRISC\0Power Macintosh\0";

 #endif

     OF_env_t *OF_env;

     OF_node_t *als, *opt, *chs, *pks;

@@ -1455,15 +1452,21 @@

         return -1;

     }

     OF_prop_string_new(OF_env, OF_node_root, "device_type", "bootrom");

-#if 0

-    OF_prop_string_new(OF_env, OF_node_root,

-                       "model", "PPC Open Hack'Ware " BIOS_VERSION);

-#else

+    if (arch == ARCH_HEATHROW) {

+        const unsigned char compat_str[] =

+            "PowerMac1,1\0MacRISC\0Power Macintosh";

+        OF_property_new(OF_env, OF_node_root, "compatible",

+                        compat_str, sizeof(compat_str));

     OF_prop_string_new(OF_env, OF_node_root,

-                       "model", compat_str);

-#endif

+                           "model", "Power Macintosh");

+    } else {

+        const unsigned char compat_str[] =

+            "PowerMac3,1\0MacRISC\0Power Macintosh";

     OF_property_new(OF_env, OF_node_root, "compatible",

                     compat_str, sizeof(compat_str));

+        OF_prop_string_new(OF_env, OF_node_root,

+                           "model", "PowerMac3,1");

+    }

 #if 0

     OF_prop_string_new(OF_env, OF_node_root, "copyright", copyright);

 #else

@@ -1561,14 +1564,15 @@

         range.size = 0x00800000;

         OF_property_new(OF_env, rom, "ranges", &range, sizeof(OF_range_t));

         OF_prop_int_new(OF_env, rom, "#address-cells", 1);

+

         /* "/rom/boot-rom@fff00000" node */

-        brom = OF_node_new(OF_env, OF_node_root, "boot-rom", 0xfff00000);

+        brom = OF_node_new(OF_env, rom, "boot-rom", 0xfff00000);

         if (brom == NULL) {

             ERROR("Cannot create 'boot-rom'\n");

             return -1;

         }

         regs.address = 0xFFF00000;

-        regs.size = 0x00010000;

+        regs.size = 0x00100000;

         OF_property_new(OF_env, brom, "reg", &regs, sizeof(OF_regprop_t));

         OF_prop_string_new(OF_env, brom, "write-characteristic", "flash");

         OF_prop_string_new(OF_env, brom, "BootROM-build-date",

@@ -1577,7 +1581,7 @@

         OF_prop_string_new(OF_env, brom, "copyright", copyright);

         OF_prop_string_new(OF_env, brom, "model", BIOS_str);

         OF_prop_int_new(OF_env, brom, "result", 0);

-#if 0

+#if 1

         {

             /* Hack taken 'as-is' from PearPC */

             unsigned char info[] = {

@@ -1596,7 +1600,9 @@

         OF_node_put(OF_env, brom);

         OF_node_put(OF_env, rom);

     }

+#if 0

     /* From here, hardcoded hacks to get a Mac-like machine */

+    /* XXX: Core99 does not seem to like this NVRAM tree */

     /* "/nvram@fff04000" node */

     {

         OF_regprop_t regs;

@@ -1617,6 +1623,7 @@

         OF_prop_int_new(OF_env, chs, "nvram", OF_pack_handle(OF_env, nvr));

         OF_node_put(OF_env, nvr);

     }

+#endif

     /* "/pseudo-hid" : hid emulation as Apple does */

     {

         OF_node_t *hid;

@@ -1663,7 +1670,27 @@

         }

         OF_node_put(OF_env, hid);

     }

+    if (arch == ARCH_MAC99) {

+        OF_node_t *unin;

+        OF_regprop_t regs;

+        unin = OF_node_new(OF_env, OF_node_root,

+                           "uni-n", 0xf8000000);

+        if (unin == NULL) {

+            ERROR("Cannot create 'uni-n'\n");

+            return -1;

+        }

+        OF_prop_string_new(OF_env, unin, "device-type", "memory-controller");

+        OF_prop_string_new(OF_env, unin, "model", "AAPL,UniNorth");

+        OF_prop_string_new(OF_env, unin, "compatible", "uni-north");

+        regs.address = 0xf8000000;

+        regs.size = 0x01000000;

+        OF_property_new(OF_env, unin, "reg", &regs, sizeof(regs));

+        OF_prop_int_new(OF_env, unin, "#address-cells", 1);

+        OF_prop_int_new(OF_env, unin, "#size-cells", 1);

+        OF_prop_int_new(OF_env, unin, "device-rev", 3);

+        OF_node_put(OF_env, unin);

+    }

 #if 1 /* This is mandatory for claim to work

        * but I don't know where it should really be (in cpu ?)

@@ -1693,7 +1720,9 @@

     /* "/options/boot-args" node */

     {

-        const unsigned char *args = "-v rootdev cdrom";

+        //        const unsigned char *args = "-v rootdev cdrom";

+        //const unsigned char *args = "-v io=0xffffffff";

+        const unsigned char *args = "-v";

         /* Ask MacOS X to print debug messages */

         //        OF_prop_string_new(OF_env, chs, "machargs", args);

         //        OF_prop_string_new(OF_env, opt, "boot-command", args);

@@ -2021,9 +2050,9 @@

     if (dev->acells != 0)

         OF_prop_int_new(OF_env, node, "#address-cells", dev->acells);

     if (dev->scells != 0)

-        OF_prop_int_new(OF_env, node, "#interrupt-cells", dev->acells);

+        OF_prop_int_new(OF_env, node, "#size-cells", dev->scells);

     if (dev->icells != 0)

-        OF_prop_int_new(OF_env, node, "#size-cells", dev->acells);

+        OF_prop_int_new(OF_env, node, "#interrupt-cells", dev->icells);

     dprintf("Done %p %p\n", parent, node);

     return node;

@@ -2040,8 +2069,9 @@

     OF_env_t *OF_env;

     pci_range_t ranges[3];

     OF_regprop_t regs[1];

-    OF_node_t *pci_host;

+    OF_node_t *pci_host, *als;

     int nranges;

+    unsigned char buffer[OF_NAMELEN_MAX];

     OF_env = OF_env_main;

     dprintf("register PCI host '%s' '%s' '%s' '%s'\n",

@@ -2052,6 +2082,17 @@

         ERROR("Cannot create pci host\n");

         return NULL;

     }

+    

+    als = OF_node_get(OF_env, "aliases");

+    if (als == NULL) {

+        ERROR("Cannot get 'aliases'\n");

+        return NULL;

+    }

+    sprintf(buffer, "/%s", dev->name);

+    OF_prop_string_set(OF_env, als, "pci", buffer);

+    OF_node_put(OF_env, als);

+    

+

     regs[0].address = cfg_base;

     regs[0].size = cfg_len;

     OF_property_new(OF_env, pci_host, "reg", regs, sizeof(OF_regprop_t));

@@ -2136,6 +2177,11 @@

     return pci_dev;

 }

+/* XXX: suppress that, used for interrupt map init */

+OF_node_t *pci_host_node;

+uint32_t pci_host_interrupt_map[7 * 32];

+int pci_host_interrupt_map_len = 0;

+

 void OF_finalize_pci_host (void *dev, int first_bus, int nb_busses)

 {

     OF_env_t *OF_env;

@@ -2145,10 +2191,12 @@

     regs[0].address = first_bus;

     regs[0].size = nb_busses;

     OF_property_new(OF_env, dev, "bus-range", regs, sizeof(OF_regprop_t));

+    pci_host_node = dev;

 }

 void OF_finalize_pci_device (void *dev, uint8_t bus, uint8_t devfn,

-                             uint32_t *regions, uint32_t *sizes)

+                             uint32_t *regions, uint32_t *sizes,

+                             int irq_line)

 {

     OF_env_t *OF_env;

     pci_reg_prop_t pregs[6], rregs[6];

@@ -2156,6 +2204,7 @@

     int i, j, k;

     OF_env = OF_env_main;

+    /* XXX: only useful for VGA card in fact */

     if (regions[0] != 0x00000000)

         OF_prop_int_set(OF_env, dev, "address", regions[0] & ~0x0000000F);

     for (i = 0, j = 0, k = 0; i < 6; i++) {

@@ -2222,7 +2271,22 @@

     } else {

         OF_property_new(OF_env, dev, "assigned-addresses", NULL, 0);

     }

-#if 0

+    if (irq_line >= 0) {

+        int i;

+        OF_prop_int_new(OF_env, dev, "interrupts", 1);

+        i = pci_host_interrupt_map_len;

+        pci_host_interrupt_map[i++] = (devfn << 8) & 0xf800;

+        pci_host_interrupt_map[i++] = 0;

+        pci_host_interrupt_map[i++] = 0;

+        pci_host_interrupt_map[i++] = 0;

+        pci_host_interrupt_map[i++] = 0; /* pic handle will be patched later */

+        pci_host_interrupt_map[i++] = irq_line;

+        if (arch != ARCH_HEATHROW) {

+            pci_host_interrupt_map[i++] = 1;

+        }

+        pci_host_interrupt_map_len = i;

+    }

+#if 1

     {

         OF_prop_t *prop_name = ((OF_node_t *)dev)->prop_name;

@@ -2390,6 +2454,54 @@

     return 0;

 }

+static void keylargo_ata(OF_node_t *mio, uint32_t base_address,

+                         uint32_t base, int irq1, int irq2, 

+                         uint16_t pic_phandle)

+{

+    OF_env_t *OF_env = OF_env_main;

+    OF_node_t *ata;

+    OF_regprop_t regs[2];

+

+    ata = OF_node_new(OF_env, mio, "ata-4", base);

+    if (ata == NULL) {

+        ERROR("Cannot create 'ata-4'\n");

+        return;

+    }

+    OF_prop_string_new(OF_env, ata, "device_type", "ata");

+#if 1

+    OF_prop_string_new(OF_env, ata, "compatible", "key2largo-ata");

+    OF_prop_string_new(OF_env, ata, "model", "ata-4");

+    OF_prop_string_new(OF_env, ata, "cable-type", "80-conductor");

+#else

+    OF_prop_string_new(OF_env, ata, "compatible", "cmd646-ata");

+    OF_prop_string_new(OF_env, ata, "model", "ata-4");

+#endif

+    OF_prop_int_new(OF_env, ata, "#address-cells", 1);

+    OF_prop_int_new(OF_env, ata, "#size-cells", 0);

+    regs[0].address = base;

+    regs[0].size = 0x00001000;

+#if 0 // HACK: Don't set up DMA registers

+    regs[1].address = 0x00008A00;

+    regs[1].size = 0x00001000;

+    OF_property_new(OF_env, ata, "reg",

+                    regs, 2 * sizeof(OF_regprop_t));

+#else

+    OF_property_new(OF_env, ata, "reg",

+                    regs, sizeof(OF_regprop_t));

+#endif

+    OF_prop_int_new(OF_env, ata, "interrupt-parent", pic_phandle);

+    regs[0].address = irq1;

+    regs[0].size = 0x00000001;

+    regs[1].address = irq2;

+    regs[1].size = 0x00000000;

+    OF_property_new(OF_env, ata, "interrupts",

+                    regs, 2 * sizeof(OF_regprop_t));

+    if (base == 0x1f000)

+        ide_pci_pmac_register(base_address + base, 0x00000000, ata);

+    else

+        ide_pci_pmac_register(0x00000000, base_address + base, ata);

+}

+

 void OF_finalize_pci_macio (void *dev, uint32_t base_address, uint32_t size,

                             void *private_data)

 {

@@ -2398,6 +2510,8 @@

     pci_reg_prop_t pregs[2];

     OF_node_t *mio, *chs, *als;

     uint16_t pic_phandle;

+    int rec_len;

+    OF_prop_t *mio_reg;

     OF_DPRINTF("mac-io: %p\n", dev);

     OF_env = OF_env_main;

@@ -2416,10 +2530,14 @@

     mio = dev;

     mio->private_data = private_data;

     pregs[0].addr.hi = 0x00000000;

-    pregs[0].addr.mid = 0x82013810;

+    pregs[0].addr.mid = 0x00000000;

     pregs[0].addr.lo = 0x00000000;

     pregs[0].size_hi = base_address;

     pregs[0].size_lo = size;

+    mio_reg = OF_property_get(OF_env, mio, "reg");

+    if (mio_reg && mio_reg->vlen >= 5 * 4) {

+        pregs[0].addr.mid = ((pci_reg_prop_t *)mio_reg->value)->addr.hi;

+    }

     OF_property_new(OF_env, mio, "ranges",

                     &pregs, sizeof(pci_reg_prop_t));

 #if 0

@@ -2431,8 +2549,49 @@

     OF_property_new(OF_env, mio, "assigned-addresses",

                     &pregs, sizeof(pci_reg_prop_t));

 #endif

-    /* OpenPIC */

+

+    switch(arch) {

+    default:

+    case ARCH_MAC99:

+        OF_prop_int_new(OF_env, mio, "#interrupt-cells", 2);

+        OF_prop_string_new(OF_env, mio, "model", "AAPL,Keylargo");

+        OF_prop_string_new(OF_env, mio, "compatible", "Keylargo");

+        break;

+    case ARCH_HEATHROW:

+        OF_prop_int_new(OF_env, mio, "#interrupt-cells", 1);

+        OF_prop_string_new(OF_env, mio, "model", "AAPL,343S1211");

     {

+            const char str[] = "paddington\0heathrow";

+            OF_property_new(OF_env, mio, "compatible", str, sizeof(str));

+        }

+        break;

+    }

+

+    if (arch == ARCH_HEATHROW) {

+        /* Heathrow PIC */

+        OF_regprop_t regs;

+        OF_node_t *mpic;

+        const char compat_str[] = "heathrow\0mac-risc";

+

+        mpic = OF_node_new(OF_env, mio, "interrupt-controller", 0x10);

+        if (mpic == NULL) {

+            ERROR("Cannot create 'mpic'\n");

+            goto out;

+        }

+        OF_prop_string_new(OF_env, mpic, "device_type", "interrupt-controller");

+        OF_property_new(OF_env, mpic, "compatible", compat_str, sizeof(compat_str));

+        OF_prop_int_new(OF_env, mpic, "#interrupt-cells", 1);

+        regs.address = 0x10;

+        regs.size = 0x20;

+        OF_property_new(OF_env, mpic, "reg",

+                        &regs, sizeof(regs));

+        OF_property_new(OF_env, mpic, "interrupt-controller", NULL, 0);

+        pic_phandle = OF_pack_handle(OF_env, mpic);

+        OF_prop_int_new(OF_env, chs, "interrupt-controller", pic_phandle);

+        OF_node_put(OF_env, mpic);

+        rec_len = 6;

+    } else {

+        /* OpenPIC */

         OF_regprop_t regs[4];

         OF_node_t *mpic;

         mpic = OF_node_new(OF_env, mio, "interrupt-controller", 0x40000);

@@ -2455,8 +2614,37 @@

         pic_phandle = OF_pack_handle(OF_env, mpic);

         OF_prop_int_new(OF_env, chs, "interrupt-controller", pic_phandle);

         OF_node_put(OF_env, mpic);

+        rec_len = 7;

     }

-#if 1

+

+    /* patch pci host table */

+    /* XXX: do it after the PCI init */

+    {

+        int i;

+        uint32_t tab[4];

+

+        for(i = 0; i < pci_host_interrupt_map_len; i += rec_len)

+            pci_host_interrupt_map[i + 4] = pic_phandle;

+#if 0

+        dprintf("interrupt-map:\n");

+        for(i = 0; i < pci_host_interrupt_map_len; i++) {

+            dprintf(" %08x", pci_host_interrupt_map[i]);

+            if ((i % rec_len) == (rec_len - 1))

+                dprintf("\n");

+        }

+        dprintf("\n");

+#endif

+        OF_property_new(OF_env, pci_host_node, "interrupt-map", 

+                        pci_host_interrupt_map, 

+                        pci_host_interrupt_map_len * sizeof(uint32_t));

+        tab[0] = 0xf800;

+        tab[1] = 0;

+        tab[2] = 0;

+        tab[3] = 0;

+        OF_property_new(OF_env, pci_host_node, "interrupt-map-mask", 

+                        tab, 4 * sizeof(uint32_t));

+    }

+#if 0

     /* escc is usefull to get MacOS X debug messages */

     {

         OF_regprop_t regs[8];

@@ -2645,85 +2833,12 @@

         OF_node_put(OF_env, scc);

     }

 #endif

-    /* IDE controller */

-    {

-        OF_node_t *ata;

-        OF_regprop_t regs[2];

-        ata = OF_node_new(OF_env, mio, "ata-4", 0x1f000);

-        if (ata == NULL) {

-            ERROR("Cannot create 'ata-4'\n");

-            goto out;

-        }

-        OF_prop_string_new(OF_env, ata, "device_type", "ata");

-#if 1

-        OF_prop_string_new(OF_env, ata, "compatible", "keylargo-ata");

-        OF_prop_string_new(OF_env, ata, "model", "ata-4");

-#else

-        OF_prop_string_new(OF_env, ata, "compatible", "cmd646-ata");

-        OF_prop_string_new(OF_env, ata, "model", "ata-4");

-#endif

-        OF_prop_int_new(OF_env, ata, "#address-cells", 1);

-        OF_prop_int_new(OF_env, ata, "#size-cells", 0);

-        regs[0].address = 0x0001F000;

-        regs[0].size = 0x00001000;

-#if 0 // HACK: Don't set up DMA registers

-        regs[1].address = 0x00008A00;

-        regs[1].size = 0x00001000;

-        OF_property_new(OF_env, ata, "reg",

-                        regs, 2 * sizeof(OF_regprop_t));

-#else

-        OF_property_new(OF_env, ata, "reg",

-                        regs, sizeof(OF_regprop_t));

-#endif

-        OF_prop_int_new(OF_env, ata, "interrupt-parent", pic_phandle);

-        regs[0].address = 0x00000013;

-        regs[0].size = 0x00000001;

-        regs[1].address = 0x0000000B;

-        regs[1].size = 0x00000000;

-        OF_property_new(OF_env, ata, "interrupts",

-                        regs, 2 * sizeof(OF_regprop_t));

-        ide_pci_pmac_register(base_address + 0x1f000, 0x00000000, ata);

-

-    }

-    {

-        OF_node_t *ata;

-        OF_regprop_t regs[2];

-        ata = OF_node_new(OF_env, mio, "ata-4", 0x20000);

-        if (ata == NULL) {

-            ERROR("Cannot create 'ata-4'\n");

-            goto out;

-        }

-        OF_prop_string_new(OF_env, ata, "device_type", "ata");

-#if 1

-        OF_prop_string_new(OF_env, ata, "compatible", "keylargo-ata");

-        OF_prop_string_new(OF_env, ata, "model", "ata-4");

-#else

-        OF_prop_string_new(OF_env, ata, "compatible", "cmd646-ata");

-        OF_prop_string_new(OF_env, ata, "model", "ata-4");

-#endif

-        OF_prop_int_new(OF_env, ata, "#address-cells", 1);

-        OF_prop_int_new(OF_env, ata, "#size-cells", 0);

-        regs[0].address = 0x00020000;

-        regs[0].size = 0x00001000;

-#if 0 // HACK: Don't set up DMA registers

-        regs[1].address = 0x00008A00;

-        regs[1].size = 0x00001000;

-        OF_property_new(OF_env, ata, "reg",

-                        regs, 2 * sizeof(OF_regprop_t));

-#else

-        OF_property_new(OF_env, ata, "reg",

-                        regs, sizeof(OF_regprop_t));