motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pc: make pc_init1() not refer ferr_irq directly.

Browse source 
By introducing a registering function, make pc_init1() not refer to
ferr_irq directly in order to make ferr_irq piix independent.
Later pc_init1() will be split out into another file keeping ferr_irq
static.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Isaku Yamahata 2010-05-14 16:29:09 +09:00 • committed by Blue Swirl
parent 6f09e686f8
commit 8e78eb28c6
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/pc.c
View file

@ -102,6 +102,12 @@ static void ioport80_write(void *opaque, uint32_t addr, uint32_t data)
/* MSDOS compatibility mode FPU exception support */ /* MSDOS compatibility mode FPU exception support */
static qemu_irq ferr_irq; static qemu_irq ferr_irq;
void pc_register_ferr_irq(qemu_irq irq)
{
ferr_irq = irq;
}
/* XXX: add IGNNE support */ /* XXX: add IGNNE support */
void cpu_set_ferr(CPUX86State *s) void cpu_set_ferr(CPUX86State *s)
{ {
@ -950,7 +956,7 @@ static void pc_init1(ram_addr_t ram_size,
} }
isa_bus_irqs(isa_irq); isa_bus_irqs(isa_irq);
ferr_irq = isa_reserve_irq(13); pc_register_ferr_irq(isa_reserve_irq(13));
/* init basic PC hardware */ /* init basic PC hardware */
register_ioport_write(0x80, 1, 1, ioport80_write, NULL); register_ioport_write(0x80, 1, 1, ioport80_write, NULL);

2
hw/pc.h
View file

@ -77,6 +77,8 @@ void rtc_set_date(RTCState *s, const struct tm *tm);
/* pc.c */ /* pc.c */
extern int fd_bootchk; extern int fd_bootchk;
void pc_register_ferr_irq(qemu_irq irq);
void ioport_set_a20(int enable); void ioport_set_a20(int enable);
int ioport_get_a20(void); int ioport_get_a20(void);