aboutsummaryrefslogtreecommitdiffstats
path: root/hw/ppc_prep.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-23 21:11:49 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-23 21:11:49 +0000
commite5d13e2f64904a3181c7656f9d0eb884bb994bb1 (patch)
tree18330dd632de20b86719e39d92379a6e4e68c3a1 /hw/ppc_prep.c
parent2023a2c836ed0a5af990ddbc927e0ea7fdc317d0 (diff)
more generic serial port (initial patch by Jocelyn Mayer)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1654 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_prep.c')
-rw-r--r--hw/ppc_prep.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 2e401e2a6..d4f302143 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -525,6 +525,7 @@ static void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device,
{
CPUState *env;
char buf[1024];
+ SetIRQFunc *set_irq;
m48t59_t *nvram;
int PPC_io_memory;
int linux_boot, i, nb_nics1, bios_size;
@@ -618,7 +619,7 @@ static void ppc_prep_init(int ram_size, int vga_ram_size, int boot_device,
isa_pic = pic_init(pic_irq_request, first_cpu);
// pit = pit_init(0x40, 0);
- serial_init(0x3f8, 4, serial_hds[0]);
+ serial_init(&pic_set_irq_new, isa_pic, 0x3f8, 4, serial_hds[0]);
nb_nics1 = nb_nics;
if (nb_nics1 > NE2000_NB_MAX)
nb_nics1 = NE2000_NB_MAX;