Revision 28c5af54 hw/ppc_oldworld.c

b/hw/ppc_oldworld.c
113 113
    int vga_bios_size, bios_size;
114 114
    qemu_irq *dummy_irq;
115 115
    int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index;
116
    int ppc_boot_device = boot_device[0];
116
    int ppc_boot_device;
117 117

  
118 118
    linux_boot = (kernel_filename != NULL);
119 119

  
......
212 212
        kernel_size = 0;
213 213
        initrd_base = 0;
214 214
        initrd_size = 0;
215
        ppc_boot_device = '\0';
216
        for (i = 0; i < boot_device[i] != '\0'; i++) {
217
            ppc_boot_device = boot_device[i];
218
            /* TOFIX: for now, the second IDE channel is not properly
219
             *        emulated. The Mac floppy disk are not emulated.
220
             *        For now, OHW cannot boot from the network.
221
             */
222
#if 0
223
            if (ppc_boot_device >= 'a' && ppc_boot_device <= 'f')
224
                break;
225
#else
226
            if (ppc_boot_device >= 'c' && ppc_boot_device <= 'd')
227
                break;
228
#endif
229
        }
230
        if (ppc_boot_device == '\0') {
231
            fprintf(stderr, "No valid boot device for Mac99 machine\n");
232
            exit(1);
233
        }
215 234
    }
216 235

  
217 236
    isa_mem_base = 0x80000000;
......
272 291
    pmac_format_nvram_partition(nvr, 0x2000);
273 292

  
274 293
    dbdma_init(&dbdma_mem_index);
275
    
294

  
276 295
    macio_init(pci_bus, 0x0017, 1, pic_mem_index, dbdma_mem_index,
277 296
               cuda_mem_index, nvr, 0, NULL);
278 297

  

Also available in: Unified diff