summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amiga/dev/ser.c18
-rw-r--r--sys/arch/i386/conf/DISKLESS3
-rw-r--r--sys/arch/i386/i386/microtime.s32
-rw-r--r--sys/arch/i386/isa/clock.c8
4 files changed, 6 insertions, 55 deletions
diff --git a/sys/arch/amiga/dev/ser.c b/sys/arch/amiga/dev/ser.c
index 2d03e60def5..4c3dfe7bfd5 100644
--- a/sys/arch/amiga/dev/ser.c
+++ b/sys/arch/amiga/dev/ser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ser.c,v 1.13 2002/06/11 03:25:43 miod Exp $ */
+/* $OpenBSD: ser.c,v 1.14 2002/07/06 19:14:20 nordin Exp $ */
/* $NetBSD: ser.c,v 1.43 1998/01/12 10:40:11 thorpej Exp $ */
/*
@@ -607,10 +607,6 @@ sermint(unit)
struct ser_softc *sc = (struct ser_softc *)ser_cd.cd_devs[unit];
struct tty *tp = sc->ser_tty;
u_char stat, last, istat;
-#ifdef PPS_SYNC
- struct timeval tv;
- long usec;
-#endif /* PPS_SYNC */
if (!tp)
return;
@@ -634,18 +630,6 @@ sermint(unit)
istat = stat ^ last;
if (ISSET(istat, CIAB_PRA_CD)) {
-#ifdef PPS_SYNC
- if (ISSET(sc->ser_swflags, TIOCFLAG_PPS)) {
- if (ISDCD(stat)) {
- usec = time.tv_usec;
- microtime(&tv);
- usec = tv.tv_usec - usec;
- if (usec < 0)
- usec += 1000000;
- hardpps(&tv, usec);
- }
- }
-#endif /* PPS_SYNC */
if (!ISSET(sc->ser_swflags, TIOCFLAG_SOFTCAR) &&
(*linesw[tp->t_line].l_modem)(tp, ISDCD(stat)) ==
0) {
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index 56e49ee07a4..38e1415e2e9 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $OpenBSD: DISKLESS,v 1.44 2002/06/18 01:00:04 nate Exp $
+# $OpenBSD: DISKLESS,v 1.45 2002/07/06 19:14:20 nordin Exp $
# $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
@@ -36,7 +36,6 @@ option CRYPTO # Cryptographic framework
maxusers 32 # estimated number of users
option TIMEZONE=0 # time zone to adjust RTC time by
option DST=0 # daylight saving time used by RTC
-option NTP # hooks supporting the Network Time Protocol
option DDB # in-kernel debugger
#option DDB_SAFE_CONSOLE # allow break into ddb during boot
diff --git a/sys/arch/i386/i386/microtime.s b/sys/arch/i386/i386/microtime.s
index eb0667d9d6b..22ad3b82224 100644
--- a/sys/arch/i386/i386/microtime.s
+++ b/sys/arch/i386/i386/microtime.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: microtime.s,v 1.14 2001/09/20 17:02:30 mpech Exp $ */
+/* $OpenBSD: microtime.s,v 1.15 2002/07/06 19:14:20 nordin Exp $ */
/* $NetBSD: microtime.s,v 1.16 1995/04/17 12:06:47 cgd Exp $ */
/*-
@@ -48,13 +48,7 @@
#ifndef HZ
ENTRY(microtime)
-#if (defined(I586_CPU) || defined(I686_CPU)) && defined(NTP)
- movl _pentium_mhz, %ecx
- testl %ecx, %ecx
- jne pentium_microtime
-#else
xorl %ecx,%ecx
-#endif
movb $(TIMER_SEL0|TIMER_LATCH),%al
pushfl
@@ -140,32 +134,12 @@ common_microtime:
ret
#if defined(I586_CPU) || defined(I686_CPU)
+ # XXX: Move to machdep.c?
+
.data
.globl _pentium_base_tsc
.comm _pentium_base_tsc,8
.text
-
-#if defined (NTP)
- .align 2, 0x90
-pentium_microtime:
- pushfl
- cli
- .byte 0x0f, 0x31 # RDTSC
- subl _pentium_base_tsc,%eax
- sbbl _pentium_base_tsc+4,%edx
- /*
- * correct the high word first so we won't
- * receive a result overflow aka div/0 fault
- */
- pushl %eax
- movl %edx, %eax
- shll $16, %edx
- divw %cx
- movzwl %dx, %edx
- popl %eax
- divl %ecx
- jmp common_microtime
-#endif
#endif
#endif
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 13606cbb005..7fdb55e9435 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.27 2002/05/17 18:55:41 mickey Exp $ */
+/* $OpenBSD: clock.c,v 1.28 2002/07/06 19:14:20 nordin Exp $ */
/* $NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $ */
/*-
@@ -450,17 +450,11 @@ void
calibrate_cyclecounter()
{
unsigned long long count, last_count;
-#ifdef NTP
- extern long time_precision;
-#endif
__asm __volatile(".byte 0xf, 0x31" : "=A" (last_count));
delay(1000000);
__asm __volatile(".byte 0xf, 0x31" : "=A" (count));
pentium_mhz = ((count - last_count) + 500000) / 1000000;
-#ifdef NTP
- time_precision = 1; /* XXX */
-#endif
}
#endif