Patchwork prep: Use ISA m48t59

login
register
mail settings
Submitter Andreas Färber
Date Jan. 13, 2012, 5:35 p.m.
Message ID <1326476135-7503-1-git-send-email-andreas.faerber@web.de>
Download mbox | patch
Permalink /patch/135943/
State New
Headers show

Comments

Andreas Färber - Jan. 13, 2012, 5:35 p.m.
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 <andreas.faerber@web.de>
Cc: Hervé Poussineau <hpoussin@reactos.org>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
---
 hw/ppc_prep.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Andreas Färber - Jan. 16, 2012, 2:37 p.m.
Am 13.01.2012 18:35, schrieb Andreas Färber:
> 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 <andreas.faerber@web.de>
> Cc: Hervé Poussineau <hpoussin@reactos.org>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> Cc: Blue Swirl <blauwirbel@gmail.com>
> ---

Applied to prep-up branch:
http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/prep-up

/-F

Patch

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;