rtc-test: cleanup register_b_set_flag test
Introduce set_datetime_bcd/assert_datetime_bcd, and handle UIP correctly. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
fafeb41cd0
commit
bc706fa903
@ -17,6 +17,8 @@
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/timer/mc146818rtc_regs.h"
|
||||
|
||||
#define UIP_HOLD_LENGTH (8 * NANOSECONDS_PER_SECOND / 32768)
|
||||
|
||||
static uint8_t base = 0x70;
|
||||
|
||||
static int bcd2dec(int value)
|
||||
@ -297,18 +299,32 @@ static void alarm_time(void)
|
||||
g_assert(cmos_read(RTC_REG_C) == 0);
|
||||
}
|
||||
|
||||
static void set_time(int mode, int h, int m, int s)
|
||||
static void set_time_regs(int h, int m, int s)
|
||||
{
|
||||
/* set BCD 12 hour mode */
|
||||
cmos_write(RTC_REG_B, mode);
|
||||
|
||||
cmos_write(RTC_REG_A, 0x76);
|
||||
cmos_write(RTC_HOURS, h);
|
||||
cmos_write(RTC_MINUTES, m);
|
||||
cmos_write(RTC_SECONDS, s);
|
||||
}
|
||||
|
||||
static void set_time(int mode, int h, int m, int s)
|
||||
{
|
||||
cmos_write(RTC_REG_B, mode);
|
||||
cmos_write(RTC_REG_A, 0x76);
|
||||
set_time_regs(h, m, s);
|
||||
cmos_write(RTC_REG_A, 0x26);
|
||||
}
|
||||
|
||||
static void set_datetime_bcd(int h, int min, int s, int d, int m, int y)
|
||||
{
|
||||
cmos_write(RTC_HOURS, h);
|
||||
cmos_write(RTC_MINUTES, min);
|
||||
cmos_write(RTC_SECONDS, s);
|
||||
cmos_write(RTC_YEAR, y & 0xFF);
|
||||
cmos_write(RTC_CENTURY, y >> 8);
|
||||
cmos_write(RTC_MONTH, m);
|
||||
cmos_write(RTC_DAY_OF_MONTH, d);
|
||||
}
|
||||
|
||||
#define assert_time(h, m, s) \
|
||||
do { \
|
||||
g_assert_cmpint(cmos_read(RTC_HOURS), ==, h); \
|
||||
@ -316,6 +332,17 @@ static void set_time(int mode, int h, int m, int s)
|
||||
g_assert_cmpint(cmos_read(RTC_SECONDS), ==, s); \
|
||||
} while(0)
|
||||
|
||||
#define assert_datetime_bcd(h, min, s, d, m, y) \
|
||||
do { \
|
||||
g_assert_cmpint(cmos_read(RTC_HOURS), ==, h); \
|
||||
g_assert_cmpint(cmos_read(RTC_MINUTES), ==, min); \
|
||||
g_assert_cmpint(cmos_read(RTC_SECONDS), ==, s); \
|
||||
g_assert_cmpint(cmos_read(RTC_DAY_OF_MONTH), ==, d); \
|
||||
g_assert_cmpint(cmos_read(RTC_MONTH), ==, m); \
|
||||
g_assert_cmpint(cmos_read(RTC_YEAR), ==, (y & 0xFF)); \
|
||||
g_assert_cmpint(cmos_read(RTC_CENTURY), ==, (y >> 8)); \
|
||||
} while(0)
|
||||
|
||||
static void basic_12h_bcd(void)
|
||||
{
|
||||
/* set BCD 12 hour mode */
|
||||
@ -506,41 +533,30 @@ static void fuzz_registers(void)
|
||||
|
||||
static void register_b_set_flag(void)
|
||||
{
|
||||
if (cmos_read(RTC_REG_A) & REG_A_UIP) {
|
||||
clock_step(UIP_HOLD_LENGTH + NANOSECONDS_PER_SECOND / 5);
|
||||
}
|
||||
g_assert_cmpint(cmos_read(RTC_REG_A) & REG_A_UIP, ==, 0);
|
||||
|
||||
/* Enable binary-coded decimal (BCD) mode and SET flag in Register B*/
|
||||
cmos_write(RTC_REG_B, REG_B_24H | REG_B_SET);
|
||||
|
||||
cmos_write(RTC_REG_A, 0x76);
|
||||
cmos_write(RTC_YEAR, 0x11);
|
||||
cmos_write(RTC_CENTURY, 0x20);
|
||||
cmos_write(RTC_MONTH, 0x02);
|
||||
cmos_write(RTC_DAY_OF_MONTH, 0x02);
|
||||
cmos_write(RTC_HOURS, 0x02);
|
||||
cmos_write(RTC_MINUTES, 0x04);
|
||||
cmos_write(RTC_SECONDS, 0x58);
|
||||
cmos_write(RTC_REG_A, 0x26);
|
||||
set_datetime_bcd(0x02, 0x04, 0x58, 0x02, 0x02, 0x2011);
|
||||
|
||||
/* Since SET flag is still enabled, these are equality checks. */
|
||||
g_assert_cmpint(cmos_read(RTC_HOURS), ==, 0x02);
|
||||
g_assert_cmpint(cmos_read(RTC_MINUTES), ==, 0x04);
|
||||
g_assert_cmpint(cmos_read(RTC_SECONDS), ==, 0x58);
|
||||
g_assert_cmpint(cmos_read(RTC_DAY_OF_MONTH), ==, 0x02);
|
||||
g_assert_cmpint(cmos_read(RTC_MONTH), ==, 0x02);
|
||||
g_assert_cmpint(cmos_read(RTC_YEAR), ==, 0x11);
|
||||
g_assert_cmpint(cmos_read(RTC_CENTURY), ==, 0x20);
|
||||
assert_datetime_bcd(0x02, 0x04, 0x58, 0x02, 0x02, 0x2011);
|
||||
|
||||
/* Since SET flag is still enabled, time does not advance. */
|
||||
clock_step(1000000000LL);
|
||||
assert_datetime_bcd(0x02, 0x04, 0x58, 0x02, 0x02, 0x2011);
|
||||
|
||||
/* Disable SET flag in Register B */
|
||||
cmos_write(RTC_REG_B, cmos_read(RTC_REG_B) & ~REG_B_SET);
|
||||
|
||||
g_assert_cmpint(cmos_read(RTC_HOURS), ==, 0x02);
|
||||
g_assert_cmpint(cmos_read(RTC_MINUTES), ==, 0x04);
|
||||
assert_datetime_bcd(0x02, 0x04, 0x58, 0x02, 0x02, 0x2011);
|
||||
|
||||
/* Since SET flag is disabled, this is an inequality check.
|
||||
* We (reasonably) assume that no (sexagesimal) overflow occurs. */
|
||||
g_assert_cmpint(cmos_read(RTC_SECONDS), >=, 0x58);
|
||||
g_assert_cmpint(cmos_read(RTC_DAY_OF_MONTH), ==, 0x02);
|
||||
g_assert_cmpint(cmos_read(RTC_MONTH), ==, 0x02);
|
||||
g_assert_cmpint(cmos_read(RTC_YEAR), ==, 0x11);
|
||||
g_assert_cmpint(cmos_read(RTC_CENTURY), ==, 0x20);
|
||||
/* Since SET flag is disabled, the clock now advances. */
|
||||
clock_step(1000000000LL);
|
||||
assert_datetime_bcd(0x02, 0x04, 0x59, 0x02, 0x02, 0x2011);
|
||||
}
|
||||
|
||||
#define RTC_PERIOD_CODE1 13 /* 8 Hz */
|
||||
|
Loading…
Reference in New Issue
Block a user