From: Sven Schnelle <svens@stackframe.org>
To: Richard Henderson <rth@twiddle.net>
Cc: Helge Deller <deller@gmx.de>,
Sven Schnelle <svens@stackframe.org>,
qemu-devel@nongnu.org
Subject: [PATCH 3/7] hppa: remove ISA region
Date: Sun, 20 Oct 2019 22:47:20 +0200 [thread overview]
Message-ID: <20191020204724.31537-4-svens@stackframe.org> (raw)
In-Reply-To: <20191020204724.31537-1-svens@stackframe.org>
B160L doesn't have an ISA bus, and we no longer need it to
workaround missing hardware, so remove it.
Signed-off-by: Sven Schnelle <svens@stackframe.org>
---
hw/hppa/hppa_hardware.h | 1 -
hw/hppa/machine.c | 32 --------------------------------
2 files changed, 33 deletions(-)
diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h
index 507f91e05d..ce59cbbf94 100644
--- a/hw/hppa/hppa_hardware.h
+++ b/hw/hppa/hppa_hardware.h
@@ -26,7 +26,6 @@
#define MEMORY_HPA 0xfffbf000
#define PCI_HPA DINO_HPA /* PCI bus */
-#define IDE_HPA 0xf9000000 /* Boot disc controller */
/* offsets to DINO HPA: */
#define DINO_PCI_ADDR 0x064
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 65fc20ebed..542faae9be 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -22,30 +22,6 @@
#include "qapi/error.h"
#include "qemu/log.h"
-#define MAX_IDE_BUS 2
-
-static ISABus *hppa_isa_bus(void)
-{
- ISABus *isa_bus;
- qemu_irq *isa_irqs;
- MemoryRegion *isa_region;
-
- isa_region = g_new(MemoryRegion, 1);
- memory_region_init_io(isa_region, NULL, &hppa_pci_ignore_ops,
- NULL, "isa-io", 0x800);
- memory_region_add_subregion(get_system_memory(), IDE_HPA,
- isa_region);
-
- isa_bus = isa_bus_new(NULL, get_system_memory(), isa_region,
- &error_abort);
- isa_irqs = i8259_init(isa_bus,
- /* qemu_allocate_irq(dino_set_isa_irq, s, 0)); */
- NULL);
- isa_bus_irqs(isa_bus, isa_irqs);
-
- return isa_bus;
-}
-
static uint64_t cpu_hppa_to_phys(void *opaque, uint64_t addr)
{
addr &= (0x10000000 - 1);
@@ -62,7 +38,6 @@ static void machine_hppa_init(MachineState *machine)
const char *initrd_filename = machine->initrd_filename;
DeviceState *dev;
PCIBus *pci_bus;
- ISABus *isa_bus;
qemu_irq rtc_irq, serial_irq;
char *firmware_filename;
uint64_t firmware_low, firmware_high;
@@ -108,13 +83,6 @@ static void machine_hppa_init(MachineState *machine)
pci_bus = dino_init(addr_space, &rtc_irq, &serial_irq);
assert(pci_bus);
- /* Create ISA bus. */
- isa_bus = hppa_isa_bus();
- assert(isa_bus);
-
- /* Realtime clock, used by firmware for PDC_TOD call. */
- mc146818_rtc_init(isa_bus, 2000, rtc_irq);
-
/* Serial code setup. */
if (serial_hd(0)) {
uint32_t addr = DINO_UART_HPA + 0x800;
--
2.23.0
next prev parent reply other threads:[~2019-10-20 20:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 20:47 [PATCH 0/7] HPPA: i82596, PS/2 and graphics emulation Sven Schnelle
2019-10-20 20:47 ` [PATCH 1/7] hw/hppa/dino.c: Improve emulation of Dino PCI chip Sven Schnelle
2019-10-21 18:26 ` Richard Henderson
2019-10-20 20:47 ` [PATCH 2/7] hppa: Add support for LASI chip with i82596 NIC Sven Schnelle
2019-10-20 20:47 ` Sven Schnelle [this message]
2019-10-21 18:17 ` [PATCH 3/7] hppa: remove ISA region Richard Henderson
2019-10-21 20:58 ` Sven Schnelle
2019-10-20 20:47 ` [PATCH 4/7] ps2: accept 'Set Key Make and Break' commands Sven Schnelle
2019-10-20 20:47 ` [PATCH 5/7] hppa: add emulation of LASI PS2 controllers Sven Schnelle
2019-10-20 20:47 ` [PATCH 6/7] hppa: Add emulation of Artist graphics Sven Schnelle
[not found] ` <20191020204724.31537-8-svens@stackframe.org>
2019-10-21 11:24 ` [PATCH 7/7] seabios-hppa: update to latest version Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191020204724.31537-4-svens@stackframe.org \
--to=svens@stackframe.org \
--cc=deller@gmx.de \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).