mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180308223946.26784-25-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-03-08 23:39:45 +01:00 committed by Paolo Bonzini
parent f4564fc0e8
commit a4cb773928
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default-configs/alpha-softmmu.mak
View File

@ -7,6 +7,9 @@ CONFIG_SERIAL_ISA=y
CONFIG_I82374=y CONFIG_I82374=y
CONFIG_I8254=y CONFIG_I8254=y
CONFIG_I8257=y CONFIG_I8257=y
CONFIG_PARALLEL=y
CONFIG_PARALLEL_ISA=y
CONFIG_FDC=y
CONFIG_PCKBD=y CONFIG_PCKBD=y
CONFIG_VGA_CIRRUS=y CONFIG_VGA_CIRRUS=y
CONFIG_IDE_CORE=y CONFIG_IDE_CORE=y

10
hw/alpha/dp264.c
View File

@ -19,8 +19,7 @@
#include "hw/timer/mc146818rtc.h" #include "hw/timer/mc146818rtc.h"
#include "hw/ide.h" #include "hw/ide.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"
#include "hw/input/i8042.h" #include "hw/isa/superio.h"
#include "hw/char/serial.h"
#include "hw/dma/i8257.h" #include "hw/dma/i8257.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
@ -83,14 +82,10 @@ static void clipper_init(MachineState *machine)
mc146818_rtc_init(isa_bus, 1900, rtc_irq); mc146818_rtc_init(isa_bus, 1900, rtc_irq);
i8254_pit_init(isa_bus, 0x40, 0, NULL); i8254_pit_init(isa_bus, 0x40, 0, NULL);
isa_create_simple(isa_bus, TYPE_I8042);
/* VGA setup. Don't bother loading the bios. */ /* VGA setup. Don't bother loading the bios. */
pci_vga_init(pci_bus); pci_vga_init(pci_bus);
/* Serial code setup. */
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
/* Network setup. e1000 is good enough, failing Tulip support. */ /* Network setup. e1000 is good enough, failing Tulip support. */
for (i = 0; i < nb_nics; i++) { for (i = 0; i < nb_nics; i++) {
pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL); pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL);
@ -99,6 +94,9 @@ static void clipper_init(MachineState *machine)
/* 2 82C37 (dma) */ /* 2 82C37 (dma) */
isa_create_simple(isa_bus, "i82374"); isa_create_simple(isa_bus, "i82374");
/* Super I/O */
isa_create_simple(isa_bus, TYPE_SMC37C669_SUPERIO);
/* IDE disk setup. */ /* IDE disk setup. */
{ {
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];