|
@@ -19,26 +19,13 @@
|
|
|
#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
|
|
|
#endif
|
|
|
|
|
|
-/* arc/i386/kernel/time.c */
|
|
|
unsigned long get_cmos_time(void)
|
|
|
{
|
|
|
unsigned int year, mon, day, hour, min, sec;
|
|
|
- int i;
|
|
|
|
|
|
spin_lock(&rtc_lock);
|
|
|
- /* The Linux interpretation of the CMOS clock register contents:
|
|
|
- * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
|
|
|
- * RTC registers show the second which has precisely just started.
|
|
|
- * Let's hope other operating systems interpret the RTC the same way.
|
|
|
- */
|
|
|
- /* read RTC exactly on falling edge of update flag */
|
|
|
- for (i = 0 ; i < 1000000 ; i++) /* may take up to 1 second... */
|
|
|
- if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)
|
|
|
- break;
|
|
|
- for (i = 0 ; i < 1000000 ; i++) /* must try at least 2.228 ms */
|
|
|
- if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP))
|
|
|
- break;
|
|
|
- do { /* Isn't this overkill ? UIP above should guarantee consistency */
|
|
|
+
|
|
|
+ do {
|
|
|
sec = CMOS_READ(RTC_SECONDS);
|
|
|
min = CMOS_READ(RTC_MINUTES);
|
|
|
hour = CMOS_READ(RTC_HOURS);
|
|
@@ -46,6 +33,7 @@ unsigned long get_cmos_time(void)
|
|
|
mon = CMOS_READ(RTC_MONTH);
|
|
|
year = CMOS_READ(RTC_YEAR);
|
|
|
} while (sec != CMOS_READ(RTC_SECONDS));
|
|
|
+
|
|
|
if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
|
|
|
{
|
|
|
BCD_TO_BIN(sec);
|