From patchwork Fri Jan 13 17:35:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 135943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D0AB4B6F62 for ; Sat, 14 Jan 2012 04:38:13 +1100 (EST) Received: from localhost ([::1]:44903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rll4t-0005x3-RF for incoming@patchwork.ozlabs.org; Fri, 13 Jan 2012 12:38:11 -0500 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 Received: from mout.web.de ([212.227.15.4]:49229) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rll4R-0007y8-Sp; Fri, 13 Jan 2012 12:37:44 -0500 Received: from localhost.localdomain ([195.135.221.2]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0MJTHn-1RolsE2dIZ-003E65; Fri, 13 Jan 2012 18:37:25 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2012 18:35:35 +0100 Message-Id: <1326476135-7503-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.7 MIME-Version: 1.0 X-Provags-ID: V02:K0:reBsKSO1syVsxph1XtwYwNUGz2s0RJ9kPtVZayoVzUy LUqvrnw1I+ojKP+Sn6RHVQO/T8GN2D8iPPb/8kydvNEVwtldsI AUDAc4r/xN+r6O60s9s0OdsQNv732MWPP3WIApDwIHrv2+jWjg WGLUfI2ppq3Fu/+3S0CeIxAQKEkDkgVzMQkC/qJcXJLVxYxxRV xDbUuza5emsxxO5fEZAaQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.4 Cc: Blue Swirl , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc@nongnu.org, Jan Kiszka Subject: [Qemu-devel] [PATCH] prep: Use ISA m48t59 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;