From patchwork Thu Jan 19 23:35:23 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: 136917 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 9B0D91007D4 for ; Fri, 20 Jan 2012 10:38:09 +1100 (EST) Received: from localhost ([::1]:51166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ro1YU-0007Iy-R0 for incoming@patchwork.ozlabs.org; Thu, 19 Jan 2012 18:38:06 -0500 Received: from eggs.gnu.org ([140.186.70.92]:44536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ro1YC-000765-G0 for qemu-devel@nongnu.org; Thu, 19 Jan 2012 18:37:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ro1Y8-0004l4-5C for qemu-devel@nongnu.org; Thu, 19 Jan 2012 18:37:47 -0500 Received: from mout.web.de ([212.227.15.4]:59855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ro1Y1-0004gu-FQ; Thu, 19 Jan 2012 18:37:37 -0500 Received: from localhost.localdomain ([84.148.33.51]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0M8iaa-1RvgVX0rUK-00Cpsm; Fri, 20 Jan 2012 00:37:35 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 20 Jan 2012 00:35:23 +0100 Message-Id: <1327016131-5344-3-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1327016131-5344-1-git-send-email-andreas.faerber@web.de> References: <1327016131-5344-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:ahcGGAYaa42nYNnSgeOxrq2DZspxBCh/rcGqp+xWmtd 8MH2XOFiHHCrcWSCOcZhxLXGNhDuvp9KIi4sgSzqDv8osuRILO 9uty25uXfExD4Qu6JtjUWZ2moILwtN462WeUlT1E4ni9R8+GKC F+TI2sGp4LLOtQQyNDvt9GEJ7eqM9jjAQQgZ7blciQ/fne2EAA 9YsutPln54Etniju1M3AQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.4 Cc: Anthony Liguori , Jan Kiszka , Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Avi Kivity , qemu-ppc@nongnu.org, Richard Henderson Subject: [Qemu-devel] [PATCH 02/10] 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;