Mips IDE support. (Aurelien Jarno)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2206 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
569f5d668c
commit
58126404f5
|
@ -357,8 +357,8 @@ VL_OBJS+= grackle_pci.o prep_pci.o unin_pci.o
|
||||||
DEFINES += -DHAS_AUDIO
|
DEFINES += -DHAS_AUDIO
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_ARCH), mips)
|
ifeq ($(TARGET_ARCH), mips)
|
||||||
VL_OBJS+= mips_r4k.o dma.o vga.o serial.o i8254.o i8259.o
|
VL_OBJS+= mips_r4k.o dma.o vga.o serial.o i8254.o i8259.o ide.o
|
||||||
#VL_OBJS+= #ide.o pckbd.o fdc.o m48t59.o
|
#VL_OBJS+= #pckbd.o fdc.o m48t59.o
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_BASE_ARCH), sparc)
|
ifeq ($(TARGET_BASE_ARCH), sparc)
|
||||||
ifeq ($(TARGET_ARCH), sparc64)
|
ifeq ($(TARGET_ARCH), sparc64)
|
||||||
|
|
|
@ -7,6 +7,10 @@
|
||||||
|
|
||||||
#define VIRT_TO_PHYS_ADDEND (-0x80000000LL)
|
#define VIRT_TO_PHYS_ADDEND (-0x80000000LL)
|
||||||
|
|
||||||
|
static const int ide_iobase[2] = { 0x1f0, 0x170 };
|
||||||
|
static const int ide_iobase2[2] = { 0x3f6, 0x376 };
|
||||||
|
static const int ide_irq[2] = { 14, 15 };
|
||||||
|
|
||||||
extern FILE *logfile;
|
extern FILE *logfile;
|
||||||
|
|
||||||
static PITState *pit;
|
static PITState *pit;
|
||||||
|
@ -118,6 +122,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
|
||||||
int ret;
|
int ret;
|
||||||
CPUState *env;
|
CPUState *env;
|
||||||
long kernel_size;
|
long kernel_size;
|
||||||
|
int i;
|
||||||
|
|
||||||
env = cpu_init();
|
env = cpu_init();
|
||||||
register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
|
register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
|
||||||
|
@ -198,6 +203,10 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
|
||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for(i = 0; i < 2; i++)
|
||||||
|
isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i],
|
||||||
|
bs_table[2 * i], bs_table[2 * i + 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
QEMUMachine mips_machine = {
|
QEMUMachine mips_machine = {
|
||||||
|
|
Loading…
Reference in a new issue