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

- added stub function update_timeval(). This function should convert the RTC

Browse Source 
register values to a new timeval after date/time change. There is only a
  BX_ERROR for now.
- added separate cases for the alarm time registers and a BX_DEBUG message that
  reports the new alarm time.
This commit is contained in:
Volker Ruppert 2002-12-07 15:53:02 +00:00
parent e8eba0c3ab
commit cf44b0bd83
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bochs/iodev/cmos.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cmos.cc,v 1.32 2002-12-06 22:37:37 bdenney Exp $
// $Id: cmos.cc,v 1.33 2002-12-07 15:53:02 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -108,7 +108,7 @@ bx_cmos_c::~bx_cmos_c(void)
void
bx_cmos_c::init(void)
{
BX_DEBUG(("Init $Id: cmos.cc,v 1.32 2002-12-06 22:37:37 bdenney Exp $"));
BX_DEBUG(("Init $Id: cmos.cc,v 1.33 2002-12-07 15:53:02 vruppert Exp $"));
// CMOS RAM & RTC
DEV_register_ioread_handler(this, read_handler, 0x0070, "CMOS RAM", 7);
@ -150,6 +150,7 @@ bx_cmos_c::init(void)
BX_INFO(("Setting initial clock to: %s (time0=%u)", tmptime, (Bit32u)BX_CMOS_THIS s.timeval));
update_clock();
BX_CMOS_THIS s.timeval_change = 0;
// load CMOS from image file if requested.
if (bx_options.cmos.OcmosImage->get ()) {
@ -348,12 +349,18 @@ bx_cmos_c::write(Bit32u address, Bit32u value, unsigned io_len)
return;
}
switch (BX_CMOS_THIS s.cmos_mem_address) {
case REG_SEC: // seconds
case REG_SEC_ALARM: // seconds alarm
case REG_MIN: // minutes
case REG_MIN_ALARM: // minutes alarm
case REG_HOUR: // hours
case REG_HOUR_ALARM: // hours alarm
BX_CMOS_THIS s.reg[BX_CMOS_THIS s.cmos_mem_address] = value;
BX_DEBUG(("alarm time changed to %02x:%02x:%02x", BX_CMOS_THIS s.reg[REG_HOUR_ALARM],
BX_CMOS_THIS s.reg[REG_MIN_ALARM], BX_CMOS_THIS s.reg[REG_SEC_ALARM]));
return;
break;
case REG_SEC: // seconds
case REG_MIN: // minutes
case REG_HOUR: // hours
case REG_WEEK_DAY: // day of the week
case REG_MONTH_DAY: // day of the month
case REG_MONTH: // month
@ -363,7 +370,11 @@ bx_cmos_c::write(Bit32u address, Bit32u value, unsigned io_len)
//BX_INFO(("write reg 0x%02x: value = 0x%02x",
// (unsigned) BX_CMOS_THIS s.cmos_mem_address, (unsigned) value);
BX_CMOS_THIS s.reg[BX_CMOS_THIS s.cmos_mem_address] = value;
BX_ERROR(("changing time and date not supported yet"));
if (BX_CMOS_THIS s.reg[REG_STAT_B] & 0x80) {
BX_CMOS_THIS s.timeval_change = 1;
} else {
update_timeval();
}
return;
break;
@ -466,6 +477,10 @@ bx_cmos_c::write(Bit32u address, Bit32u value, unsigned io_len)
}
}
}
if ( (prev_CRB >= 0x80) && (value < 0x80) && BX_CMOS_THIS s.timeval_change) {
update_timeval();
BX_CMOS_THIS s.timeval_change = 0;
}
return;
break;
@ -691,3 +706,9 @@ bx_cmos_c::update_clock()
BX_CMOS_THIS s.reg[REG_IBM_PS2_CENTURY_BYTE] =
BX_CMOS_THIS s.reg[REG_IBM_CENTURY_BYTE];
}
void
bx_cmos_c::update_timeval()
{
BX_ERROR(("changing time and date not supported yet"));
}

4
bochs/iodev/cmos.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cmos.h,v 1.7 2002-10-24 21:07:17 bdenney Exp $
// $Id: cmos.h,v 1.8 2002-12-07 15:53:02 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -62,6 +62,7 @@ public:
int one_second_timer_index;
time_t timeval;
Bit8u cmos_mem_address;
bx_bool timeval_change;
Bit8u reg[BX_NUM_CMOS_REGS];
} s; // state information
@ -81,5 +82,6 @@ public:
BX_CMOS_SMF void one_second_timer(void);
private:
BX_CMOS_SMF void update_clock(void);
BX_CMOS_SMF void update_timeval(void);
BX_CMOS_SMF void CRA_change(void);
};