summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenji Aoyama <aoyama@cvs.openbsd.org>2004-05-07 14:11:06 +0000
committerKenji Aoyama <aoyama@cvs.openbsd.org>2004-05-07 14:11:06 +0000
commit03a40edceeae04970b47cd3234f0320fa3ce4d71 (patch)
tree1555c4b1a49057d0428787fffb921936ae61cb0a
parent9a4f2d19b47fbe77d0a24efbd5e0d99f6a1d9c8a (diff)
Some clean up, especially delete unused nvram related part. From miod@
-rw-r--r--sys/arch/luna88k/dev/timekeeper.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/sys/arch/luna88k/dev/timekeeper.c b/sys/arch/luna88k/dev/timekeeper.c
index b154c1fd104..8e49266aabb 100644
--- a/sys/arch/luna88k/dev/timekeeper.c
+++ b/sys/arch/luna88k/dev/timekeeper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timekeeper.c,v 1.1 2004/04/21 15:23:56 aoyama Exp $ */
+/* $OpenBSD: timekeeper.c,v 1.2 2004/05/07 14:11:05 aoyama Exp $ */
/* $NetBSD: timekeeper.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
/*-
@@ -42,22 +42,22 @@
#include <sys/device.h>
#include <sys/kernel.h>
+#include <machine/autoconf.h>
#include <machine/board.h> /* machtype value */
#include <machine/cpu.h>
#include <dev/clock_subr.h>
+
#include <luna88k/luna88k/clockvar.h>
#include <luna88k/dev/timekeeper.h>
-#include <machine/autoconf.h>
-#define MK_YEAR0 1970 /* year offset of MK*/
-#define DS_YEAR0 1990 /* year offset of DS*/
+#define MK_YEAR0 1970 /* year offset of MK */
+#define DS_YEAR0 1990 /* year offset of DS */
struct timekeeper_softc {
struct device sc_dev;
void *sc_clock, *sc_nvram;
int sc_nvramsize;
- u_int8_t sc_image[2040];
};
/*
@@ -131,7 +131,6 @@ clock_attach(parent, self, aux)
break;
}
clockattach(&sc->sc_dev, clockwork);
- memcpy(sc->sc_image, sc->sc_nvram, sc->sc_nvramsize);
}
/*
@@ -160,8 +159,8 @@ mkclock_get(dev, base, dt)
splx(s);
#ifdef TIMEKEEPER_DEBUG
printf("get %d/%d/%d %d:%d:%d\n",
- dt->dt_year, dt->dt_mon, dt->dt_day,
- dt->dt_hour, dt->dt_min, dt->dt_sec);
+ dt->dt_year, dt->dt_mon, dt->dt_day,
+ dt->dt_hour, dt->dt_min, dt->dt_sec);
#endif
}
@@ -191,8 +190,8 @@ mkclock_set(dev, dt)
splx(s);
#ifdef TIMEKEEPER_DEBUG
printf("set %d/%d/%d %d:%d:%d\n",
- dt->dt_year, dt->dt_mon, dt->dt_day,
- dt->dt_hour, dt->dt_min, dt->dt_sec);
+ dt->dt_year, dt->dt_mon, dt->dt_day,
+ dt->dt_hour, dt->dt_min, dt->dt_sec);
#endif
stamp[0] = 'R'; stamp[1] = 'T'; stamp[2] = 'C'; stamp[3] = '\0';
@@ -255,8 +254,8 @@ dsclock_get(dev, base, dt)
#ifdef TIMEKEEPER_DEBUG
printf("get %d/%d/%d %d:%d:%d\n",
- dt->dt_year, dt->dt_mon, dt->dt_day,
- dt->dt_hour, dt->dt_min, dt->dt_sec);
+ dt->dt_year, dt->dt_mon, dt->dt_day,
+ dt->dt_hour, dt->dt_min, dt->dt_sec);
#endif
}
@@ -297,7 +296,7 @@ dsclock_set(dev, dt)
#ifdef TIMEKEEPER_DEBUG
printf("set %d/%d/%d %d:%d:%d\n",
- dt->dt_year, dt->dt_mon, dt->dt_day,
- dt->dt_hour, dt->dt_min, dt->dt_sec);
+ dt->dt_year, dt->dt_mon, dt->dt_day,
+ dt->dt_hour, dt->dt_min, dt->dt_sec);
#endif
}