--- xinu/sys/clkinit.c	2018/04/24 17:39:04	1.1
+++ xinu/sys/clkinit.c	2018/04/24 17:39:53	1.1.1.2
@@ -1,55 +1,66 @@
-/* clkinit.c - clkinit */
-
 #include <conf.h>
 #include <kernel.h>
 #include <sleep.h>
-#include <procreg.h>
-
-/* real-time clock variables and sleeping process queue pointers	*/
-
-#ifdef	RTCLOCK
-int	clmutex;		/* mutual exclusion for time-of-day	*/
-long	clktime;		/* current time in seconds since 1/1/70	*/
-int	tickctr;		/* counts 10ths of a second 10-0	*/
-int     defclk;			/* non-zero, then deferring clock count */
-int     clkdiff;		/* deferred clock ticks			*/
-int     slnempty;		/* FALSE if the sleep queue is empty	*/
-short   *sltop;			/* address of key part of top entry in	*/
-				/* the sleep queue if slnonempty==TRUE	*/
-int     clockq;			/* head of queue of sleeping processes  */
-int	preempt;		/* preemption counter.	Current process */
-				/* is preempted when it reaches zero;	*/
-				/* set in resched; counts in ticks	*/
-int	clkruns = TRUE;		/* set TRUE iff clock exists 		*/
+#ifdef ATT7300
+#include <intvectors_7300.h>
+#include <mcr7300.h>
 #else
-int	clkruns = FALSE;	/* no clock configured; be sure sleep	*/
-#endif				/*   doesn't wait forever		*/
-#if defined(UVAX)
-int	count10;		/* counts 100ths of a second 10-0	*/
+#include <intvectors_mecb.h>
+#include <clock.h>
 #endif
 
+extern clkint(),spurint();
+extern count6,preempt ;
+#ifdef ATT7300
+/* ATT7300 misc. control reg. is write-only, so keep copy of its normal
+   value in memory--currently only used for clock tick acknowledge */
+unsigned short soft_mcr7300 = 0;
+unsigned short *tstat ; /* global pointer to timer tstat, used in clkint.s */
+#else
+unsigned char *tstat ; /* global pointer to timer tstat, used in clkint.s */
+#endif
 /*
- *------------------------------------------------------------------------
+ *------------------------------------------------------------------
  * clkinit - initialize the clock and sleep queue (called at startup)
- *------------------------------------------------------------------------
+ *------------------------------------------------------------------
  */
 clkinit()
 {
-	*CVECTOR = (int) clkint;	/* call clkint on interrupt	*/
-	clmutex = screate(1);		/* semaphore for tod clock	*/
-	clktime = 0L;			/* initially a low number	*/
-	preempt = QUANTUM;		/* initial time quantum		*/
-	slnempty = FALSE;		/* initially, no process asleep	*/
-	clkdiff = 0;			/* zero deferred ticks		*/
-	defclk = 0;			/* clock is not deferred	*/
-	clockq = newqueue();		/* allocate clock queue in q	*/
-	tickctr = 10;			/* 10ths of a second counter	*/
-#if defined(UVAX)
-	count10 = 10;			/* 100ths of a sec. counter	*/
-	mtpr(STRTUCLK, ICCS);		/* start real-time clock	*/
+  int len;
+  int clockqtail;		/* need place to put it, but never used */
+
+  CLOCKVEC = clkint;		/* set up interrupt vector */
+  setclkr();			/* set  global flag clock on */
+  preempt = QUANTUM;		/* initial time quantum		*/
+  count6 = 6;			/* 60ths of a sec. counter	*/
+  slnempty = FALSE;		/* initially, no process asleep */
+  clkdiff = 0;			/* zero deferred ticks          */
+  defclk = 0;			/* clock is not deferred        */
+  newqueue(&clockq,&clockqtail);/* allocate clock queue in q    */
+
+#ifdef ATT7300
+  tstat = MCR7300;		/* pointer to MCR for clkint.s */
+  soft_mcr7300 |= CLRCLKINT;	/* bit was low from sys reset, make hi */
+  kprintf("starting clock...\n");
+  *MCR7300 = soft_mcr7300;	/* put new val in hardware MCR */
 #else
-	mtpr(-CLKINTVL, NICR);		/* set interval to 0.1 sec	*/
-	mtpr(STRTCLK, ICCS);		/* start interval timer,	*/
-					/* enable clock to interrupt	*/
+  /* Added for MECB: set up timer of 68230 as line clock--      */    
+  /* specify clock int location to clock device, as int vect slot#-- */
+  SPURVEC = spurint;            /* and handle spurious ints too */ 
+  TIMER->tivr = (char)(((int)CLOCKVECADDRESS)>>2); /* i.e div by 4 */
+  /* specify downcount to be loaded at each zero detect--       */
+  /* 3 byte register at odd-addressed bytes, 1 downcount=8usec  */
+  TIMER->cpr_high = 0;
+  TIMER->cpr_med = 8;		/* approx 16 msecs apart (8*256*8=16K usec) */
+  TIMER->cpr_low = 0;		/* --i.e, approx 1/60 sec, like PDP11 clock */
+  kprintf("starting clock...\n");
+  TIMER->tcsr = (CLOCKIE|LOADFROMCPR|PRESCALE32|CLOCKON); /* start timer */
+  tstat = &TIMER->tstat; /* set up the global address of timer tstat */
+  TIMER->tstat = 1;   /* reset counter (otherwise wait to roll over, ~2min) */
 #endif
 }
+
+spurintc()
+{
+	kprintf("Received a spurious interrupt\n");
+}