From a0178ddd46db6af3aa01b0d20613b54a0160a0e7 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Thu, 24 May 2012 12:15:10 +1000 Subject: Allow i8259 to build without i8254 This allows the i8259 emulation to be compiled without the i8254 emulation. Currently the i8259 emulation code references some variables defined in i8254.c for the "time-drift fix". This moves the definitions from i8254.c to i8259.c so that i8259.c becomes independent of i8254.c. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Marcelo Tosatti --- hw/i8254.c | 3 ++- hw/i8259.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/i8254.c b/hw/i8254.c index 019c7b8c4..878a47b46 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -348,7 +348,8 @@ static uint32_t pit_ioport_read(void *opaque, uint32_t addr) } /* global counters for time-drift fix */ -int64_t timer_acks=0, timer_interrupts=0, timer_ints_to_push=0; +extern int64_t timer_acks, timer_ints_to_push; +int64_t timer_interrupts=0; extern int time_drift_fix; diff --git a/hw/i8259.c b/hw/i8259.c index c5841c01e..f33a25dba 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -211,7 +211,7 @@ static void pic_intack(PicState *s, int irq) } extern int time_drift_fix; -extern int64_t timer_acks, timer_ints_to_push; +int64_t timer_acks=0, timer_ints_to_push=0; int pic_read_irq(PicState *s) { -- cgit v1.2.3