aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-08-21 09:41:56 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-08-21 09:41:56 +0000
commit697584ab24c8aa4f9b8162a12993523bb2450af0 (patch)
treee8b60117ac3fac5664ade8daad550ff3ecc6f374
parentc96a29cdef7659ae7c4a816206915896a8f69e39 (diff)
Add i8259 PIT to MIPS (Ralf Baechle
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1551 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--Makefile.target4
-rw-r--r--hw/mips_r4k.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target
index 9a6b4d724c..ea0f5c8fd9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -295,8 +295,8 @@ VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o
VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o mixeng.o
endif
ifeq ($(TARGET_ARCH), mips)
-VL_OBJS+= mips_r4k.o dma.o vga.o serial.o ne2000.o i8259.o
-#VL_OBJS+= #ide.o pckbd.o i8254.o fdc.o m48t59.o
+VL_OBJS+= mips_r4k.o dma.o vga.o serial.o ne2000.o i8254.o i8259.o
+#VL_OBJS+= #ide.o pckbd.o fdc.o m48t59.o
endif
ifeq ($(TARGET_BASE_ARCH), sparc)
ifeq ($(TARGET_ARCH), sparc64)
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index bb7742f8dd..bf3376d4f6 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -7,6 +7,8 @@
extern FILE *logfile;
+static PITState *pit;
+
static void pic_irq_request(void *opaque, int level)
{
if (level) {
@@ -242,6 +244,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
isa_mem_base = 0x10000000;
isa_pic = pic_init(pic_irq_request, cpu_single_env);
+ pit = pit_init(0x40, 0);
serial_init(0x3f8, 4, serial_hds[0]);
vga_initialize(NULL, ds, phys_ram_base + ram_size, ram_size,
vga_ram_size, 0, 0);