Move RTC date/time initialisation to hw/mc146818rtc.c
PATCH 1/1 Move RTC date/time initialisation to hw/mc146818rtc.c
Hello all,
This patch moves the initialisation of the RTC date/time from hw/pc.c into hw/mc146818rtc.c, to avoid duplication of code. I guess all platforms using this RTC chip will want to setup at least the date and time.
Aurelien
Index: hw/mc146818rtc.c
===================================================================
RCS file: /sources/qemu/qemu/hw/mc146818rtc.c,v
retrieving revision 1.6
mc146818rtc.c +25 -0
@@ -380,6 +380,29 @@ void rtc_set_date(RTCState *s, const strrtc_copy_date (s); } +/* PC cmos mappings */ +#define REG_IBM_CENTURY_BYTE 0x32 +#define REG_IBM_PS2_CENTURY_BYTE 0x37 + +void rtc_set_date_from_host (RTCState *s) +{ +time_t ti; +struct tm *tm; +int val; + +/* set the CMOS date */ +time (&ti); +if (rtc_utc) + tm =gmtime (&ti); +else + tm =localtime (&ti); +rtc_set_date (s, tm); + + val =to_bcd (s, (tm->tm_year /100 ) +19 ); +rtc_set_memory (s,REG_IBM_CENTURY_BYTE , val); +rtc_set_memory (s,REG_IBM_PS2_CENTURY_BYTE , val); +} +static void rtc_save (QEMUFile *f,void *opaque) {RTCState *s = opaque;
@@ -444,6 +467,8 @@ RTCState *rtc_init(int base, int irq) s->cmos_data[RTC_REG_C ] =0x00 ; s->cmos_data[RTC_REG_D ] =0x80 ; +rtc_set_date_from_host (s); + s->periodic_timer =qemu_new_timer (vm_clock, rtc_periodic_timer, s); s->second_timer = qemu_new_timer(vm_clock,
Index: hw/pc.c
===================================================================
RCS file: /sources/qemu/qemu/hw/pc.c,v
retrieving revision 1.62
pc.c +0 -20
@@ -111,14 +111,6 @@ static void pic_irq_request(void *opaque/* PC cmos mappings */ #define REG_EQUIPMENT_BYTE 0x14 -#define REG_IBM_CENTURY_BYTE 0x32 -#define REG_IBM_PS2_CENTURY_BYTE 0x37 - - -static inline int to_bcd (RTCState *s,int a) -{ -return ((a /10 ) <<4 ) | (a %10 ); -}static int cmos_get_fd_drive_type (int fd0) {
@@ -171,18 +163,6 @@ static void cmos_init(int ram_size, intstruct tm *tm;int i; -/* set the CMOS date */ -time (&ti); -if (rtc_utc) - tm =gmtime (&ti); -else - tm =localtime (&ti); -rtc_set_date (s, tm); - - val =to_bcd (s, (tm->tm_year /100 ) +19 ); -rtc_set_memory (s,REG_IBM_CENTURY_BYTE , val); -rtc_set_memory (s,REG_IBM_PS2_CENTURY_BYTE , val); -/* various important CMOS locations needed by PC/Bochs bios */ /* memory size */
Signature · 4 lines
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' [email protected] | [email protected] `- people.debian.org/~aurel32 | www.aurel32.net