|
@@ -518,17 +518,17 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
|
|
|
if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) ||
|
|
|
RTC_ALWAYS_BCD) {
|
|
|
if (sec < 60)
|
|
|
- BIN_TO_BCD(sec);
|
|
|
+ sec = bin2bcd(sec);
|
|
|
else
|
|
|
sec = 0xff;
|
|
|
|
|
|
if (min < 60)
|
|
|
- BIN_TO_BCD(min);
|
|
|
+ min = bin2bcd(min);
|
|
|
else
|
|
|
min = 0xff;
|
|
|
|
|
|
if (hrs < 24)
|
|
|
- BIN_TO_BCD(hrs);
|
|
|
+ hrs = bin2bcd(hrs);
|
|
|
else
|
|
|
hrs = 0xff;
|
|
|
}
|
|
@@ -614,12 +614,12 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
|
|
|
|
|
|
if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY)
|
|
|
|| RTC_ALWAYS_BCD) {
|
|
|
- BIN_TO_BCD(sec);
|
|
|
- BIN_TO_BCD(min);
|
|
|
- BIN_TO_BCD(hrs);
|
|
|
- BIN_TO_BCD(day);
|
|
|
- BIN_TO_BCD(mon);
|
|
|
- BIN_TO_BCD(yrs);
|
|
|
+ sec = bin2bcd(sec);
|
|
|
+ min = bin2bcd(min);
|
|
|
+ hrs = bin2bcd(hrs);
|
|
|
+ day = bin2bcd(day);
|
|
|
+ mon = bin2bcd(mon);
|
|
|
+ yrs = bin2bcd(yrs);
|
|
|
}
|
|
|
|
|
|
save_control = CMOS_READ(RTC_CONTROL);
|
|
@@ -1099,7 +1099,7 @@ no_irq:
|
|
|
spin_unlock_irq(&rtc_lock);
|
|
|
|
|
|
if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
|
|
|
- BCD_TO_BIN(year); /* This should never happen... */
|
|
|
+ year = bcd2bin(year); /* This should never happen... */
|
|
|
|
|
|
if (year < 20) {
|
|
|
epoch = 2000;
|
|
@@ -1352,13 +1352,13 @@ static void rtc_get_rtc_time(struct rtc_time *rtc_tm)
|
|
|
spin_unlock_irqrestore(&rtc_lock, flags);
|
|
|
|
|
|
if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
|
|
|
- BCD_TO_BIN(rtc_tm->tm_sec);
|
|
|
- BCD_TO_BIN(rtc_tm->tm_min);
|
|
|
- BCD_TO_BIN(rtc_tm->tm_hour);
|
|
|
- BCD_TO_BIN(rtc_tm->tm_mday);
|
|
|
- BCD_TO_BIN(rtc_tm->tm_mon);
|
|
|
- BCD_TO_BIN(rtc_tm->tm_year);
|
|
|
- BCD_TO_BIN(rtc_tm->tm_wday);
|
|
|
+ rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
|
|
|
+ rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
|
|
|
+ rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
|
|
|
+ rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
|
|
|
+ rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
|
|
|
+ rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
|
|
|
+ rtc_tm->tm_wday = bcd2bin(rtc_tm->tm_wday);
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_MACH_DECSTATION
|
|
@@ -1392,9 +1392,9 @@ static void get_rtc_alm_time(struct rtc_time *alm_tm)
|
|
|
spin_unlock_irq(&rtc_lock);
|
|
|
|
|
|
if (!(ctrl & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
|
|
|
- BCD_TO_BIN(alm_tm->tm_sec);
|
|
|
- BCD_TO_BIN(alm_tm->tm_min);
|
|
|
- BCD_TO_BIN(alm_tm->tm_hour);
|
|
|
+ alm_tm->tm_sec = bcd2bin(alm_tm->tm_sec);
|
|
|
+ alm_tm->tm_min = bcd2bin(alm_tm->tm_min);
|
|
|
+ alm_tm->tm_hour = bcd2bin(alm_tm->tm_hour);
|
|
|
}
|
|
|
}
|
|
|
|