From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LNud7-0008Ce-I9
	for qemu-devel@nongnu.org; Fri, 16 Jan 2009 14:45:21 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LNud6-0008CQ-RN
	for qemu-devel@nongnu.org; Fri, 16 Jan 2009 14:45:21 -0500
Received: from [199.232.76.173] (port=39546 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LNud6-0008CN-Mu
	for qemu-devel@nongnu.org; Fri, 16 Jan 2009 14:45:20 -0500
Received: from savannah.gnu.org ([199.232.41.3]:53482 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LNud6-0004WH-Cx
	for qemu-devel@nongnu.org; Fri, 16 Jan 2009 14:45:20 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LNud5-0004s7-Tl
	for qemu-devel@nongnu.org; Fri, 16 Jan 2009 19:45:19 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LNud5-0004rz-M3
	for qemu-devel@nongnu.org; Fri, 16 Jan 2009 19:45:19 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LNud5-0004rz-M3@cvs.savannah.gnu.org>
Date: Fri, 16 Jan 2009 19:45:19 +0000
Subject: [Qemu-devel] [6348] ppc_oldworld: remove i8259
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6348
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6348
Author:   aurel32
Date:     2009-01-16 19:45:19 +0000 (Fri, 16 Jan 2009)

Log Message:
-----------
ppc_oldworld: remove i8259

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

Modified Paths:
--------------
    trunk/hw/ppc_oldworld.c

Modified: trunk/hw/ppc_oldworld.c
===================================================================
--- trunk/hw/ppc_oldworld.c	2009-01-16 19:43:46 UTC (rev 6347)
+++ trunk/hw/ppc_oldworld.c	2009-01-16 19:45:19 UTC (rev 6348)
@@ -125,7 +125,6 @@
     PCIBus *pci_bus;
     MacIONVRAMState *nvr;
     int vga_bios_size, bios_size;
-    qemu_irq *dummy_irq;
     int pic_mem_index, nvram_mem_index, dbdma_mem_index, cuda_mem_index;
     int escc_mem_index, ide_mem_index[2];
     int ppc_boot_device;
@@ -301,9 +300,6 @@
                  vga_ram_offset, vga_ram_size,
                  vga_bios_offset, vga_bios_size);
 
-    /* XXX: suppress that */
-    dummy_irq = i8259_init(NULL);
-
     escc_mem_index = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0],
                                serial_hds[1], ESCC_CLOCK, 4);
 
@@ -364,7 +360,7 @@
     if (graphic_depth != 15 && graphic_depth != 32 && graphic_depth != 8)
         graphic_depth = 15;
 
-    m48t59 = m48t59_init(dummy_irq[8], 0xFFF04000, 0x0074, NVRAM_SIZE, 59);
+    m48t59 = m48t59_init(0, 0xFFF04000, 0x0074, NVRAM_SIZE, 59);
     nvram.opaque = m48t59;
     nvram.read_fn = &m48t59_read;
     nvram.write_fn = &m48t59_write;