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

- reading status register C clears the IRQ

Browse Source 
- use BX_CMOS_THIS instead of class_ptr-> (the way other devices do)
This commit is contained in:
Volker Ruppert 2002-01-26 10:00:08 +00:00
parent 81bbbd27b2
commit 7aac4bfb3d
2 changed files with 51 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
bochs/iodev/cmos.cc
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cmos.cc,v 1.14 2001-10-03 13:10:38 bdenney Exp $ // $Id: cmos.cc,v 1.15 2002-01-26 10:00:08 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
// //
// MandrakeSoft S.A. // MandrakeSoft S.A.
// 43, rue d'Aboukir // 43, rue d'Aboukir
@ -62,7 +62,7 @@ bx_cmos_c::~bx_cmos_c(void)
bx_cmos_c::init(bx_devices_c *d) bx_cmos_c::init(bx_devices_c *d)
{ {
unsigned i; unsigned i;
BX_DEBUG(("Init $Id: cmos.cc,v 1.14 2001-10-03 13:10:38 bdenney Exp $")); BX_DEBUG(("Init $Id: cmos.cc,v 1.15 2002-01-26 10:00:08 vruppert Exp $"));
// CMOS RAM & RTC // CMOS RAM & RTC
@ -249,8 +249,10 @@ bx_cmos_c::read(Bit32u address, unsigned io_len)
ret8 = BX_CMOS_THIS s.reg[BX_CMOS_THIS s.cmos_mem_address]; ret8 = BX_CMOS_THIS s.reg[BX_CMOS_THIS s.cmos_mem_address];
// all bits of Register C are cleared after a read occurs. // all bits of Register C are cleared after a read occurs.
if (BX_CMOS_THIS s.cmos_mem_address == 0x0c) if (BX_CMOS_THIS s.cmos_mem_address == 0x0c) {
BX_CMOS_THIS s.reg[0x0c] = 0x00; BX_CMOS_THIS s.reg[0x0c] = 0x00;
BX_CMOS_THIS devices->pic->untrigger_irq(8);
}
return(ret8); return(ret8);
break; break;
@ -499,60 +501,72 @@ bx_cmos_c::checksum_cmos(void)
void void
bx_cmos_c::periodic_timer_handler(void *this_ptr) bx_cmos_c::periodic_timer_handler(void *this_ptr)
{ {
bx_cmos_c *class_ptr = (bx_cmos_c *) this_ptr; bx_cmos_c *class_ptr = (bx_cmos_c *) this_ptr;
// if periodic interrupts are enabled, trip IRQ 8, and class_ptr->periodic_timer();
// update status register C }
if (class_ptr->s.reg[0x0b] & 0x40) {
class_ptr->s.reg[0x0c] |= 0xc0; // Interrupt Request, Periodic Int void
class_ptr->devices->pic->trigger_irq(8); bx_cmos_c::periodic_timer()
{
// if periodic interrupts are enabled, trip IRQ 8, and
// update status register C
if (BX_CMOS_THIS s.reg[0x0b] & 0x40) {
BX_CMOS_THIS s.reg[0x0c] |= 0xc0; // Interrupt Request, Periodic Int
BX_CMOS_THIS devices->pic->trigger_irq(8);
} }
} }
void void
bx_cmos_c::one_second_timer_handler(void *this_ptr) bx_cmos_c::one_second_timer_handler(void *this_ptr)
{ {
bx_cmos_c *class_ptr = (bx_cmos_c *) this_ptr; bx_cmos_c *class_ptr = (bx_cmos_c *) this_ptr;
// update internal time/date buffer class_ptr->one_second_timer();
class_ptr->s.timeval++; }
// Dont update CMOS user copy of time/date if CRB bit7 is 1 void
// Nothing else do to bx_cmos_c::one_second_timer()
if (class_ptr->s.reg[0x0b] & 0x80) {
// update internal time/date buffer
BX_CMOS_THIS s.timeval++;
// Dont update CMOS user copy of time/date if CRB bit7 is 1
// Nothing else do to
if (BX_CMOS_THIS s.reg[0x0b] & 0x80)
return; return;
class_ptr->update_clock(); update_clock();
// if update interrupts are enabled, trip IRQ 8, and // if update interrupts are enabled, trip IRQ 8, and
// update status register C // update status register C
if (class_ptr->s.reg[0x0b] & 0x10) { if (BX_CMOS_THIS s.reg[0x0b] & 0x10) {
class_ptr->s.reg[0x0c] |= 0x90; // Interrupt Request, Update Ended BX_CMOS_THIS s.reg[0x0c] |= 0x90; // Interrupt Request, Update Ended
class_ptr->devices->pic->trigger_irq(8); BX_CMOS_THIS devices->pic->trigger_irq(8);
} }
// compare CMOS user copy of time/date to alarm time/date here // compare CMOS user copy of time/date to alarm time/date here
if (class_ptr->s.reg[0x0b] & 0x20) { if (BX_CMOS_THIS s.reg[0x0b] & 0x20) {
// Alarm interrupts enabled // Alarm interrupts enabled
Boolean alarm_match = 1; Boolean alarm_match = 1;
if ( (class_ptr->s.reg[0x01] & 0xc0) != 0xc0 ) { if ( (BX_CMOS_THIS s.reg[0x01] & 0xc0) != 0xc0 ) {
// seconds alarm not in dont care mode // seconds alarm not in dont care mode
if (class_ptr->s.reg[0x00] != class_ptr->s.reg[0x01]) if (BX_CMOS_THIS s.reg[0x00] != BX_CMOS_THIS s.reg[0x01])
alarm_match = 0; alarm_match = 0;
} }
if ( (class_ptr->s.reg[0x03] & 0xc0) != 0xc0 ) { if ( (BX_CMOS_THIS s.reg[0x03] & 0xc0) != 0xc0 ) {
// minutes alarm not in dont care mode // minutes alarm not in dont care mode
if (class_ptr->s.reg[0x02] != class_ptr->s.reg[0x03]) if (BX_CMOS_THIS s.reg[0x02] != BX_CMOS_THIS s.reg[0x03])
alarm_match = 0; alarm_match = 0;
} }
if ( (class_ptr->s.reg[0x05] & 0xc0) != 0xc0 ) { if ( (BX_CMOS_THIS s.reg[0x05] & 0xc0) != 0xc0 ) {
// hours alarm not in dont care mode // hours alarm not in dont care mode
if (class_ptr->s.reg[0x04] != class_ptr->s.reg[0x05]) if (BX_CMOS_THIS s.reg[0x04] != BX_CMOS_THIS s.reg[0x05])
alarm_match = 0; alarm_match = 0;
} }
if (alarm_match) { if (alarm_match) {
class_ptr->s.reg[0x0c] |= 0xa0; // Interrupt Request, Alarm Int BX_CMOS_THIS s.reg[0x0c] |= 0xa0; // Interrupt Request, Alarm Int
class_ptr->devices->pic->trigger_irq(8); BX_CMOS_THIS devices->pic->trigger_irq(8);
} }
} }
} }

6
bochs/iodev/cmos.h
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: cmos.h,v 1.4 2001-10-03 13:10:38 bdenney Exp $ // $Id: cmos.h,v 1.5 2002-01-26 10:00:08 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2001 MandrakeSoft S.A. // Copyright (C) 2002 MandrakeSoft S.A.
// //
// MandrakeSoft S.A. // MandrakeSoft S.A.
// 43, rue d'Aboukir // 43, rue d'Aboukir
@ -69,6 +69,8 @@ private:
public: public:
static void periodic_timer_handler(void *); static void periodic_timer_handler(void *);
static void one_second_timer_handler(void *); static void one_second_timer_handler(void *);
BX_CMOS_SMF void periodic_timer(void);
BX_CMOS_SMF void one_second_timer(void);
private: private:
BX_CMOS_SMF void update_clock(void); BX_CMOS_SMF void update_clock(void);
BX_CMOS_SMF void CRA_change(void); BX_CMOS_SMF void CRA_change(void);