Page MenuHomeFreeBSD
Files F148953486

D6067.id15509.diff
No OneTemporary
Actions

D6067.id15509.diff
View Options

Index: sys/isa/rtc.h
===================================================================
--- sys/isa/rtc.h
+++ sys/isa/rtc.h
@@ -117,6 +117,7 @@
int rtcin(int reg);
void atrtc_restore(void);
void writertc(int reg, u_char val);
+void atrtc_set(struct timespec *ts);
#endif
#endif /* _I386_ISA_RTC_H_ */
Index: sys/x86/isa/atrtc.c
===================================================================
--- sys/x86/isa/atrtc.c
+++ sys/x86/isa/atrtc.c
@@ -151,6 +151,33 @@
rtcin(RTC_INTR);
}
+void
+atrtc_set(struct timespec *ts)
+{
+ struct clocktime ct;
+
+ clock_ts_to_ct(ts, &ct);
+
+ /* Disable RTC updates and interrupts. */
+ writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR);
+
+ writertc(RTC_SEC, bin2bcd(ct.sec)); /* Write back Seconds */
+ writertc(RTC_MIN, bin2bcd(ct.min)); /* Write back Minutes */
+ writertc(RTC_HRS, bin2bcd(ct.hour)); /* Write back Hours */
+
+ writertc(RTC_WDAY, ct.dow + 1); /* Write back Weekday */
+ writertc(RTC_DAY, bin2bcd(ct.day)); /* Write back Day */
+ writertc(RTC_MONTH, bin2bcd(ct.mon)); /* Write back Month */
+ writertc(RTC_YEAR, bin2bcd(ct.year % 100)); /* Write back Year */
+#ifdef USE_RTC_CENTURY
+ writertc(RTC_CENTURY, bin2bcd(ct.year / 100)); /* ... and Century */
+#endif
+
+ /* Reenable RTC updates and interrupts. */
+ writertc(RTC_STATUSB, rtc_statusb);
+ rtcin(RTC_INTR);
+}
+
/**********************************************************************
* RTC driver for subr_rtc
*/
@@ -297,28 +324,8 @@
static int
atrtc_settime(device_t dev __unused, struct timespec *ts)
{
- struct clocktime ct;
-
- clock_ts_to_ct(ts, &ct);
-
- /* Disable RTC updates and interrupts. */
- writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR);
-
- writertc(RTC_SEC, bin2bcd(ct.sec)); /* Write back Seconds */
- writertc(RTC_MIN, bin2bcd(ct.min)); /* Write back Minutes */
- writertc(RTC_HRS, bin2bcd(ct.hour)); /* Write back Hours */
- writertc(RTC_WDAY, ct.dow + 1); /* Write back Weekday */
- writertc(RTC_DAY, bin2bcd(ct.day)); /* Write back Day */
- writertc(RTC_MONTH, bin2bcd(ct.mon)); /* Write back Month */
- writertc(RTC_YEAR, bin2bcd(ct.year % 100)); /* Write back Year */
-#ifdef USE_RTC_CENTURY
- writertc(RTC_CENTURY, bin2bcd(ct.year / 100)); /* ... and Century */
-#endif
-
- /* Reenable RTC updates and interrupts. */
- writertc(RTC_STATUSB, rtc_statusb);
- rtcin(RTC_INTR);
+ atrtc_set(ts);
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 22, 7:07 AM (9 h, 24 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30112622
Default Alt Text
D6067.id15509.diff (2 KB)

Event Timeline