summaryrefslogtreecommitdiffstats
path: root/sys/pc98/cbus/clock.c
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1996-10-09 21:47:16 +0000
committerasami <asami@FreeBSD.org>1996-10-09 21:47:16 +0000
commit8c4b57c465eeb8efd16bd3b8416454f8ab6c5185 (patch)
tree89e1d8c7c7558e413954ce87041b0b6005ce6673 /sys/pc98/cbus/clock.c
parent130a49f9b81084ee94f9cf5c2122e5b4a7d1bde9 (diff)
downloadFreeBSD-src-8c4b57c465eeb8efd16bd3b8416454f8ab6c5185.zip
FreeBSD-src-8c4b57c465eeb8efd16bd3b8416454f8ab6c5185.tar.gz
Another round of updates. Highlights:
(1) Merged i386/i386/sb.h, deleted pc98/pc98/sb.h. (2) pc98/conf/GENERIC8 looks more like i386/conf/GENERIC now. (3) Fixed display bug in pc98/boot/biosboot/io.c. (4) Prepare to merge memory allocation routines: pc98/i386/locore.s pc98/i386/machdep.c pc98/pc98/pc98_machdep.c pc98/pc98/pc98_machdep.h (5) Support new board "C-NET(98)": pc98/pc98/if_ed98.h pc98/pc98/if_ed.c (6) Make sure FPU is recognized for non-Intel CPUs: pc98/pc98/npx.c (7) Do not expect bss to be zero-allocated: pc98/pc98/pc98.c Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/pc98/cbus/clock.c')
-rw-r--r--sys/pc98/cbus/clock.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 6ca472a..d9b34d1 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $
+ * $Id: clock.c,v 1.6 1996/10/09 19:47:43 bde Exp $
*/
/*
@@ -46,13 +46,13 @@
/*
* modified for PC98
- * $Id: clock.c,v 1.5 1996/09/07 02:13:39 asami Exp $
+ * $Id: clock.c,v 1.6 1996/10/09 19:47:43 bde Exp $
*/
/*
* Primitive clock interrupt routines.
*/
-#include "opt_ddb.h"
+
#include "opt_clock.h"
#include "opt_cpu.h"
@@ -414,16 +414,18 @@ rtcintr(struct clockframe frame)
}
}
+#include "opt_ddb.h"
#ifdef DDB
-static void
-DDB_printrtc(void)
+#include <ddb/ddb.h>
+
+DB_SHOW_COMMAND(rtc, rtc)
{
printf("%02x/%02x/%02x %02x:%02x:%02x, A = %02x, B = %02x, C = %02x\n",
rtcin(RTC_YEAR), rtcin(RTC_MONTH), rtcin(RTC_DAY),
rtcin(RTC_HRS), rtcin(RTC_MIN), rtcin(RTC_SEC),
rtcin(RTC_STATUSA), rtcin(RTC_STATUSB), rtcin(RTC_INTR));
}
-#endif
+#endif /* DDB */
#endif /* for PC98 */
static int
@@ -768,7 +770,7 @@ startrtclock()
if (bootverbose) {
printf(
"Press a key on the console to abort clock calibration\n");
- while (!cncheckc())
+ while (cncheckc() == -1)
calibrate_clocks();
}
#endif
OpenPOWER on IntegriCloud