gwj / at91sam9263 · Commits

Commit 570724dc40254f057a26f6b5ea6b2d854b4bbd83

Authored by aurel32
1 parent 4ee7b2f8

ppc_oldworld: remove i8259 

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6348 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 1 additions and 5 deletions
hw/ppc_oldworld.c
  View file @570724d
@@ -125,7 +125,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, @@ -125,7 +125,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
125 PCIBus *pci_bus; 125 PCIBus *pci_bus;
126 MacIONVRAMState *nvr; 126 MacIONVRAMState *nvr;
127 int vga_bios_size, bios_size; 127 int vga_bios_size, bios_size;
128 - qemu_irq *dummy_irq;  
129 int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index; 128 int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index;
130 int escc_mem_index, ide_mem_index[2]; 129 int escc_mem_index, ide_mem_index[2];
131 int ppc_boot_device; 130 int ppc_boot_device;
@@ -301,9 +300,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, @@ -301,9 +300,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
301 vga_ram_offset, vga_ram_size, 300 vga_ram_offset, vga_ram_size,
302 vga_bios_offset, vga_bios_size); 301 vga_bios_offset, vga_bios_size);
303 302
304 - /* XXX: suppress that */  
305 - dummy_irq = i8259_init(NULL);  
306 -  
307 escc_mem_index = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0], 303 escc_mem_index = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0],
308 serial_hds[1], ESCC_CLOCK, 4); 304 serial_hds[1], ESCC_CLOCK, 4);
309 305
@@ -364,7 +360,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, @@ -364,7 +360,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
364 if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8) 360 if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
365 graphic_depth = 15; 361 graphic_depth = 15;
366 362
367 - m48t59 = m48t59_init(dummy_irq[8], 0xFFF04000, 0x0074, NVRAM_SIZE, 59); 363 + m48t59 = m48t59_init(0, 0xFFF04000, 0x0074, NVRAM_SIZE, 59);
368 nvram.opaque = m48t59; 364 nvram.opaque = m48t59;
369 nvram.read_fn = &m48t59_read; 365 nvram.read_fn = &m48t59_read;
370 nvram.write_fn = &m48t59_write; 366 nvram.write_fn = &m48t59_write;