Move the vxt-specific clock functions frow clock.c to the cpu-specific support

file, fewer #ifdef this way.

diff --git a/sys/arch/vax/include/clock.h b/sys/arch/vax/include/clock.h
index 6070eec..ff228c7 100644 (file)
--- a/sys/arch/vax/include/clock.h
+++ b/sys/arch/vax/include/clock.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: clock.h,v 1.6 2006/08/27 16:55:41 miod Exp $ */
+/*     $OpenBSD: clock.h,v 1.7 2008/08/15 22:41:46 miod Exp $ */
 /*     $NetBSD: clock.h,v 1.4 1999/09/06 19:52:53 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -74,5 +74,3 @@ int   generic_clkread(time_t);
 void   generic_clkwrite(void);
 int    chip_clkread(time_t);
 void   chip_clkwrite(void);
-int    missing_clkread(time_t);
-void   missing_clkwrite(void);

diff --git a/sys/arch/vax/vax/clock.c b/sys/arch/vax/vax/clock.c
index 47b5e0b..1990ebe 100644 (file)
--- a/sys/arch/vax/vax/clock.c
+++ b/sys/arch/vax/vax/clock.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: clock.c,v 1.19 2006/08/27 16:55:41 miod Exp $  */
+/*     $OpenBSD: clock.c,v 1.20 2008/08/15 22:41:48 miod Exp $  */
 /*     $NetBSD: clock.c,v 1.35 2000/06/04 06:16:58 matt Exp $   */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -330,18 +330,3 @@ chip_clkwrite()
        REGPOKE(CSRB_OFF, CSRB_DM|CSRB_24);
 };
 #endif
-
-#if VXT
-int
-missing_clkread(base)
-       time_t base;
-{
-       printf("WARNING: no TOY clock");
-       return CLKREAD_BAD;
-}
-
-void
-missing_clkwrite()
-{
-}
-#endif

diff --git a/sys/arch/vax/vax/vxt.c b/sys/arch/vax/vax/vxt.c
index 7b0df8b..fe73341 100644 (file)
--- a/sys/arch/vax/vax/vxt.c
+++ b/sys/arch/vax/vax/vxt.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vxt.c,v 1.2 2008/08/15 22:38:23 miod Exp $    */
+/*     $OpenBSD: vxt.c,v 1.3 2008/08/15 22:41:48 miod Exp $    */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -32,8 +32,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*** needs to be completed MK-990306 ***/
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/device.h>
@@ -54,6 +52,8 @@ static        int     vxt_mchk(caddr_t);
 static void    vxt_halt(void);
 static void    vxt_reboot(int);
 static void    vxt_cache_enable(void);
+static int     missing_clkread(time_t);
+static void    missing_clkwrite(void);
 
 struct vs_cpu *vxt_cpu;
 
@@ -135,3 +135,16 @@ vxt_reboot(arg)
 {
        asm("halt");
 }
+
+int
+missing_clkread(base)
+       time_t base;
+{
+       printf("WARNING: no TOY clock");
+       return CLKREAD_BAD;
+}
+
+void
+missing_clkwrite()
+{
+}