From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rll4k-0005wa-W8 for qemu-devel@nongnu.org; Fri, 13 Jan 2012 12:38:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rll4g-00080H-Ta for qemu-devel@nongnu.org; Fri, 13 Jan 2012 12:38:02 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 13 Jan 2012 18:35:35 +0100 Message-Id: <1326476135-7503-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] prep: Use ISA m48t59 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Jan Kiszka This simplifies the code later when the i8259 moves to the i82378 PCI->ISA bridge and happens to fix a SysBus m48t59 io_base issue introduced by commit 0fb56ffc5edd66f12ccfc0d71af5f9c79c0a2612 (m48t59: drop obsolete address base arithmetic). Suggested by Hervé and Jan. Signed-off-by: Andreas Färber Cc: Hervé Poussineau Cc: Jan Kiszka Cc: Blue Swirl --- hw/ppc_prep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index dec059a..1cc0ae0 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -707,7 +707,7 @@ static void ppc_prep_init (ram_addr_t ram_size, usb_ohci_init_pci(pci_bus, -1); } - m48t59 = m48t59_init(i8259[8], 0, 0x0074, NVRAM_SIZE, 59); + m48t59 = m48t59_init_isa(isa_bus, 0x0074, NVRAM_SIZE, 59); if (m48t59 == NULL) return; sysctrl->nvram = m48t59; -- 1.7.7