===================================================================
RCS file: /cvs/funnyos/arch/testarm/dev/tartc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- funnyos/arch/testarm/dev/tartc.c	2007/11/04 22:55:58	1.4
+++ funnyos/arch/testarm/dev/tartc.c	2007/11/06 22:57:45	1.5
@@ -1,10 +1,11 @@
 /*
- * $Id: tartc.c,v 1.4 2007/11/04 22:55:58 init Exp $
+ * $Id: tartc.c,v 1.5 2007/11/06 22:57:45 init Exp $
  */
 #include <sys/types.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 
+#include <sys/kern_time.h>
 #include <arch/testarm/dev/tartcvar.h>
 #include <arch/testarm/dev/tartcreg.h>
 #include <libkern/printf.h>
@@ -14,8 +15,15 @@
  */
 int 	tartc_attach(struct device *, uint32_t loc, uint8_t flags);
 void 	tartc_interrupt(struct device *);
+void 	tartc_sethz(uint8_t hz);
+uint32_t tartc_getsec(void);
+uint32_t tartc_getusec(void);
 
 
+/* default tartc device to use; will bind to first tartc instance */
+struct tartc_dd *tartcdd = NULL;
+extern struct rtcops sysrtcops;
+
 struct driver tartc_dr = {
 	sizeof(struct tartc_dd),
 	tartc_attach,
@@ -47,30 +55,73 @@
 
 	printf("testarm Real Time Clock (%d seconds past Epoch)\n", seconds);
 
-	/* XXX set timer */
-	bus_write_1(ddp->td_bushandlep, ddp->td_ioaddr + TARTC_OFF_TMRINTRFREQ, 1);
+	/* set default tartc */
+	tartcdd = ddp;
 
+	/* fill-in rtcops to be used by kern_time */
+	sysrtcops.ro_sethz = tartc_sethz;
+	sysrtcops.ro_getsec = tartc_getsec;
+	sysrtcops.ro_getusec = tartc_getusec;
+
 	return(0);
 
 }
 
 
 void
-tartc_interrupt(struct device *self)
+tartc_sethz(uint8_t hz)
 {
-	/* TODO */
-	struct tartc_dd *ddp = self->dv_devdata;
+	/*
+	 * Set timer frequency.
+	 */
+	if (tartcdd == NULL)
+		panic("can't calibrate not configured timer\n");
 
-	/* acknowledge one timer intr */
-	bus_write_1(ddp->td_bushandlep, ddp->td_ioaddr + TARTC_OFF_TMRINTRACK, 0xff);
+	bus_write_1(tartcdd->td_bushandlep, tartcdd->td_ioaddr + TARTC_OFF_TMRINTRFREQ, hz);
+}
 
+
+uint32_t
+tartc_getsec(void)
+{
 	/*
-	 * Update seconds and print it.
+	 * Get seconds.
 	 */
-	bus_write_1(ddp->td_bushandlep, ddp->td_ioaddr + TARTC_OFF_CLOCKUPDATE, 0xff);
-	printf("tartc intr: %d seconds past Epoch\n",
-		bus_read_4(ddp->td_bushandlep, ddp->td_ioaddr + TARTC_OFF_READSECONDS));
+	if (tartcdd == NULL)
+		panic("tartc_getsec: can't get seconds from rtc: default device not configured\n");
 
-	printf("tartc intr\n");
+	/* trigger clock update on host */
+	bus_write_1(tartcdd->td_bushandlep, tartcdd->td_ioaddr + TARTC_OFF_CLOCKUPDATE, 1);
+
+	return( bus_read_4(tartcdd->td_bushandlep, tartcdd->td_ioaddr + TARTC_OFF_READSECONDS) );
+}
+
+
+uint32_t
+tartc_getusec(void)
+{
+	/*
+	 * Get microseconds.
+	 */
+	if (tartcdd == NULL)
+		panic("tartc_getusec: can't get microseconds from rtc: default device not configured\n");
+
+	/* trigger clock update on host */
+	bus_write_1(tartcdd->td_bushandlep, tartcdd->td_ioaddr + TARTC_OFF_CLOCKUPDATE, 1);
+
+	return( bus_read_4(tartcdd->td_bushandlep, tartcdd->td_ioaddr + TARTC_OFF_READUSECONDS) );
+}
+
+
+void
+tartc_interrupt(struct device *self)
+{
+	struct tartc_dd *ddp = self->dv_devdata;
+
+	/* process system tick */
+	sysclock();
+
+	/* acknowledge one timer intr */
+	bus_write_1(ddp->td_bushandlep, ddp->td_ioaddr + TARTC_OFF_TMRINTRACK, 0xff);
 }