From 13f91bdce445c9a70ccf02ac550d4cc6a06d93fa Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Mon, 2 Jan 2006 18:10:08 +0000
Subject: Merge enablertclock() in cpu_initclocks(), kill unused
 disablertclock(), and remove a wrong comment aboute startrtclock() being
 invoked twice.

---
 sys/arch/mac68k/include/autoconf.h |  4 +---
 sys/arch/mac68k/mac68k/clock.c     | 21 ++-------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h
index ebeb4d8cd15..b9ee1bcd266 100644
--- a/sys/arch/mac68k/include/autoconf.h
+++ b/sys/arch/mac68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.9 2005/07/23 23:30:55 martin Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.10 2006/01/02 18:10:05 miod Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $	*/
 
 /*
@@ -54,10 +54,8 @@ int	badladdr(register caddr_t addr);
 
 /* clock.h */
 
-void	enablertclock(void);
 void	cpu_initclocks(void);
 void	setstatclockrate(int);
-void	disablertclock(void);
 u_long	clkread(void);
 void	inittodr(time_t);
 void	resettodr(void);
diff --git a/sys/arch/mac68k/mac68k/clock.c b/sys/arch/mac68k/mac68k/clock.c
index 9971328f047..4787410aaa4 100644
--- a/sys/arch/mac68k/mac68k/clock.c
+++ b/sys/arch/mac68k/mac68k/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.18 2004/11/30 01:44:22 martin Exp $	*/
+/*	$OpenBSD: clock.c,v 1.19 2006/01/02 18:10:07 miod Exp $	*/
 /*	$NetBSD: clock.c,v 1.39 1999/11/05 19:14:56 scottr Exp $	*/
 
 /*
@@ -114,10 +114,6 @@ int	rtclock_intr(void *);
 void
 startrtclock()
 {
-/*
- * BARF MF startrt clock is called twice in init_main, configure,
- * the reason why is doced in configure
- */
 	/* be certain clock interrupts are off */
 	via_reg(VIA1, vIER) = V1IF_T1;
 
@@ -134,32 +130,19 @@ startrtclock()
 }
 
 void
-enablertclock()
+cpu_initclocks()
 {
 	/* clear then enable clock interrupt. */
 	via_reg(VIA1, vIFR) |= V1IF_T1;
 	via_reg(VIA1, vIER) = 0x80 | V1IF_T1;
 }
 
-void
-cpu_initclocks()
-{
-	enablertclock();
-}
-
 void
 setstatclockrate(rateinhz)
 	int rateinhz;
 {
 }
 
-void
-disablertclock()
-{
-	/* disable clock interrupt */
-	via_reg(VIA1, vIER) = V1IF_T1;
-}
-
 /*
  * Returns number of usec since last clock tick/interrupt.
  *
-- 
cgit v1.2.3