kvm tools, rtc: Add RTC register names

Add missing RTC register names to hw/rtc.c and rename the current ones to
follow <linux/mc146818rtc.h> naming. It would be nice to use the header
directly but unfortunately it includes <linux/spinlock.h>.

Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/hw/rtc.c b/tools/kvm/hw/rtc.c
index f351e1a1986843db9af26f25280fa5303e7bb42f..09243437abb967c32c2d62701c076a7b47bad101 100644 (file)
--- a/tools/kvm/hw/rtc.c
+++ b/tools/kvm/hw/rtc.c
@@ -5,12 +5,24 @@
 
 #include <time.h>
 
-#define CMOS_RTC_SECONDS               0x00
-#define CMOS_RTC_MINUTES               0x02
-#define CMOS_RTC_HOURS                 0x04
-#define CMOS_RTC_DATE_OF_MONTH         0x07
-#define CMOS_RTC_MONTH                 0x08
-#define CMOS_RTC_YEAR                  0x09
+/*
+ * MC146818 RTC registers
+ */
+#define RTC_SECONDS                    0x00
+#define RTC_SECONDS_ALARM              0x01
+#define RTC_MINUTES                    0x02
+#define RTC_MINUTES_ALARM              0x03
+#define RTC_HOURS                      0x04
+#define RTC_HOURS_ALARM                        0x05
+#define RTC_DAY_OF_WEEK                        0x06
+#define RTC_DAY_OF_MONTH               0x07
+#define RTC_MONTH                      0x08
+#define RTC_YEAR                       0x09
+
+#define RTC_REG_A                      0x0A
+#define RTC_REG_B                      0x0B
+#define RTC_REG_C                      0x0C
+#define RTC_REG_D                      0x0D
 
 struct rtc_device {
        u8                      cmos_idx;
@@ -33,22 +45,22 @@ static bool cmos_ram_data_in(struct ioport *ioport, struct kvm *kvm, u16 port, v
        tm = gmtime(&ti);
 
        switch (rtc.cmos_idx) {
-       case CMOS_RTC_SECONDS:
+       case RTC_SECONDS:
                ioport__write8(data, bin2bcd(tm->tm_sec));
                break;
-       case CMOS_RTC_MINUTES:
+       case RTC_MINUTES:
                ioport__write8(data, bin2bcd(tm->tm_min));
                break;
-       case CMOS_RTC_HOURS:
+       case RTC_HOURS:
                ioport__write8(data, bin2bcd(tm->tm_hour));
                break;
-       case CMOS_RTC_DATE_OF_MONTH:
+       case RTC_DAY_OF_MONTH:
                ioport__write8(data, bin2bcd(tm->tm_mday));
                break;
-       case CMOS_RTC_MONTH:
+       case RTC_MONTH:
                ioport__write8(data, bin2bcd(tm->tm_mon + 1));
                break;
-       case CMOS_RTC_YEAR:
+       case RTC_YEAR:
                ioport__write8(data, bin2bcd(tm->tm_year));
                break;
        }