Removed old hack of using Configuration Table entry ticks_per_timeslice

being set to 0 to indicate that there should be no Clock Tick.  This
was used by the Timing Tests to avoid clock tick overhead perturbing
execution times.  Now the Timing Tests simply leave the Clock Tick
Driver out of the Device Driver Table.

12 files changed, 212 insertions, 270 deletions

diff --git a/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c b/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c
index 0fdd8c5352..3d83c739f5 100644
--- a/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/dmv152/clock/ckinit.c
@@ -69,44 +69,38 @@ void Install_clock(
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
-
-    Z8x36_WRITE( TIMER, MASTER_CFG, 0xd4 );
-    Z8x36_READ ( TIMER, MASTER_INTR, data );
-    Z8x36_WRITE( TIMER, MASTER_INTR, (data & 0x7E) );
-    Z8x36_WRITE( TIMER, CT1_TIME_CONST_MSB, 0x04 );
-    Z8x36_WRITE( TIMER, CT1_TIME_CONST_LSB, 0xCE );
-    Z8x36_WRITE( TIMER, CT1_MODE_SPEC, 0x83 );
-    Z8x36_WRITE( TIMER, CNT_TMR_VECTOR, CLOCK_VECTOR );
-    Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0x20 );
-    Z8x36_READ ( TIMER, MASTER_INTR, data );
-    Z8x36_WRITE( TIMER, MASTER_INTR, (data & 0xDA) | 0x80 );
+  Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
+
+  Z8x36_WRITE( TIMER, MASTER_CFG, 0xd4 );
+  Z8x36_READ ( TIMER, MASTER_INTR, data );
+  Z8x36_WRITE( TIMER, MASTER_INTR, (data & 0x7E) );
+  Z8x36_WRITE( TIMER, CT1_TIME_CONST_MSB, 0x04 );
+  Z8x36_WRITE( TIMER, CT1_TIME_CONST_LSB, 0xCE );
+  Z8x36_WRITE( TIMER, CT1_MODE_SPEC, 0x83 );
+  Z8x36_WRITE( TIMER, CNT_TMR_VECTOR, CLOCK_VECTOR );
+  Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0x20 );
+  Z8x36_READ ( TIMER, MASTER_INTR, data );
+  Z8x36_WRITE( TIMER, MASTER_INTR, (data & 0xDA) | 0x80 );
 
-    /*
-     * ACC_IC54 - interrupt 5 will be vectored and mapped to level 6
-     */
+  /*
+   * ACC_IC54 - interrupt 5 will be vectored and mapped to level 6
+   */
 
-    data = (*(rtems_unsigned8 *)0x0D00000B);
-    (*(rtems_unsigned8 *)0x0D00000B) = (data & 0x7F) | 0x60;
+  data = (*(rtems_unsigned8 *)0x0D00000B);
+  (*(rtems_unsigned8 *)0x0D00000B) = (data & 0x7F) | 0x60;
 
-    Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0xC6 );
+  Z8x36_WRITE( TIMER, CT1_CMD_STATUS, 0xC6 );
 
-    atexit( Clock_exit );
-  }
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
 {
   rtems_unsigned8 data;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-
-    Z8x36_READ ( TIMER, MASTER_INTR, data );
-    Z8x36_WRITE( TIMER, MASTER_INTR, (data & 0x01) );
-    /* do not restore old vector */
-
-  }
+  Z8x36_READ ( TIMER, MASTER_INTR, data );
+  Z8x36_WRITE( TIMER, MASTER_INTR, (data & 0x01) );
+  /* do not restore old vector */
 }
 
 rtems_device_driver Clock_initialize(
diff --git a/c/src/lib/libbsp/m68k/efi332/clock/ckinit.c b/c/src/lib/libbsp/m68k/efi332/clock/ckinit.c
index fbef7982f1..6aa051895b 100644
--- a/c/src/lib/libbsp/m68k/efi332/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/efi332/clock/ckinit.c
@@ -57,31 +57,24 @@ void Install_clock(
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
+  Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
 
-    /* enable 1mS interrupts */
-    *PITR = (unsigned short int)( SAM(0x09,0,PITM) );/* load counter */
-    *PICR = (unsigned short int)                     /* enable interrupt */
-      ( SAM(ISRL_PIT,8,PIRQL) | SAM(CLOCK_VECTOR,0,PIV) );
-    
-    atexit( Clock_exit );
-  }
+  /* enable 1mS interrupts */
+  *PITR = (unsigned short int)( SAM(0x09,0,PITM) );/* load counter */
+  *PICR = (unsigned short int)                     /* enable interrupt */
+    ( SAM(ISRL_PIT,8,PIRQL) | SAM(CLOCK_VECTOR,0,PIV) );
+  
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
 {
+  /* shutdown the periodic interrupt */
+  *PICR = (unsigned short int)
+    ( SAM(0,8,PIRQL) | SAM(CLOCK_VECTOR,0,PIV) );
+  /*     ^^ zero disables interrupt */
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-
-    /* shutdown the periodic interrupt */
-    *PICR = (unsigned short int)
-      ( SAM(0,8,PIRQL) | SAM(CLOCK_VECTOR,0,PIV) );
-    /*     ^^ zero disables interrupt */
-
-    /* do not restore old vector */
-
-  }
+  /* do not restore old vector */
 }
 
 rtems_device_driver Clock_initialize(
diff --git a/c/src/lib/libbsp/m68k/efi68k/clock/ckinit.c b/c/src/lib/libbsp/m68k/efi68k/clock/ckinit.c
index 2426f57d0d..28a4976376 100644
--- a/c/src/lib/libbsp/m68k/efi68k/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/efi68k/clock/ckinit.c
@@ -82,27 +82,20 @@ void Install_clock(
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
+  Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
 
-    *MSR = RS;			/* enable 1mS interrupts */
-    *ICR0 |= OME;
+  *MSR = RS;			/* enable 1mS interrupts */
+  *ICR0 |= OME;
 
-    atexit( Clock_exit );
-  }
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
 {
-
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-
-    /* shutdown periodic interrupt */
-    *MSR = RS;
-    *ICR0 &= 0xc0;
-    /* do not restore old vector */
-
-  }
+  /* shutdown periodic interrupt */
+  *MSR = RS;
+  *ICR0 &= 0xc0;
+  /* do not restore old vector */
 }
 
 rtems_device_driver Clock_initialize(
diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c
index 9d6dc19390..3df157d1f3 100644
--- a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c
@@ -83,30 +83,25 @@ void Install_clock(
   rtems_isr_entry clock_isr
 )
 {
-
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-   set_vector( clock_isr, CLOCK_VECTOR, 1 );
+  set_vector( clock_isr, CLOCK_VECTOR, 1 );
 
-    m302.reg.trr1 = TRR1_VAL;		/* set timer reference register */
-    m302.reg.tmr1 = TMR1_VAL;		/* set timer mode register & enable */
-    /*
-     * Enable TIMER1 interrupts only.
-     */
-    m302.reg.imr  = RBIT_IMR_TIMER1;	/* set 68302 int-mask to allow ints */
+  m302.reg.trr1 = TRR1_VAL;		/* set timer reference register */
+  m302.reg.tmr1 = TMR1_VAL;		/* set timer mode register & enable */
+  /*
+   * Enable TIMER1 interrupts only.
+   */
+  m302.reg.imr  = RBIT_IMR_TIMER1;	/* set 68302 int-mask to allow ints */
 
-    atexit( Clock_exit );
-  }
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
 {
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    /* TODO: figure out what to do here */
-    /* do not restore old vector */
-  }
+  /* TODO: figure out what to do here */
+  /* do not restore old vector */
 }
 
 rtems_device_driver Clock_initialize(
diff --git a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
index 85acdd3ea6..b4373d48b7 100644
--- a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c
@@ -77,12 +77,10 @@ Clock_isr (rtems_vector_number vector)
 void
 Clock_exit (void)
 {
-	if (BSP_Configuration.ticks_per_timeslice ) {
-		/*
-		 * Turn off periodic interval timer
-		 */		
-		SIMPITR = 0;
-	}
+	/*
+	 * Turn off periodic interval timer
+	 */		
+	SIMPITR = 0;
 }
 
 /******************************************************
@@ -96,34 +94,33 @@ static void
 Install_clock (rtems_isr_entry clock_isr)
 {
 	unsigned32 pitr_tmp;
+	unsigned32 usecs_per_tick;
 
 	Clock_driver_ticks = 0;
-	if ( BSP_Configuration.ticks_per_timeslice ) {
 
-		set_vector (clock_isr, CLOCK_VECTOR, 1);
+	set_vector (clock_isr, CLOCK_VECTOR, 1);
 		
-		/* sets the Periodic Interrupt Control Register PICR */
-		/* voir a quoi correspond exactement le Clock Vector */
+	/* sets the Periodic Interrupt Control Register PICR */
+	/* voir a quoi correspond exactement le Clock Vector */
 
-		SIMPICR = ( CLOCK_IRQ_LEVEL << 8 ) | ( CLOCK_VECTOR );		
-				  
-		/* sets the PITR count value */
-		/* this assumes a 32.765 kHz crystal */
+	SIMPICR = ( CLOCK_IRQ_LEVEL << 8 ) | ( CLOCK_VECTOR );		
+			  
+	/* sets the PITR count value */
+	/* this assumes a 32.765 kHz crystal */
 		
-		/* find out whether prescaler should be enabled or not */
-		if ( BSP_Configuration.microseconds_per_tick <= 31128 ) {
-		   pitr_tmp = ( BSP_Configuration.microseconds_per_tick * 8192 ) / 1000000 ;
-		}
-		else {
-		   pitr_tmp = ( BSP_Configuration.microseconds_per_tick / 1000000 ) * 16;
-		   /* enable it */		   
-		   pitr_tmp |= 0x100; 		   
-		}
+        usecs_per_tick = BSP_Configuration.microseconds_per_tick;
+	/* find out whether prescaler should be enabled or not */
+	if ( usecs_per_tick <= 31128 ) {
+	   pitr_tmp = ( usecs_per_tick * 8192 ) / 1000000 ;
+	} else {
+	   pitr_tmp = ( usecs_per_tick / 1000000 ) * 16;
+	   /* enable it */		   
+	   pitr_tmp |= 0x100; 		   
+	}
 
-		SIMPITR = (unsigned char) pitr_tmp;
+	SIMPITR = (unsigned char) pitr_tmp;
 
-		atexit (Clock_exit);
-	}
+	atexit (Clock_exit);
 }
 
 /******************************************************
diff --git a/c/src/lib/libbsp/m68k/gen68360/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68360/clock/ckinit.c
index a2a50d5715..b7d2b296ae 100644
--- a/c/src/lib/libbsp/m68k/gen68360/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/gen68360/clock/ckinit.c
@@ -101,54 +101,50 @@ Clock_isr (rtems_vector_number vector)
 void
 Clock_exit (void)
 {
-	if (BSP_Configuration.ticks_per_timeslice ) {
-		/*
-		 * Turn off periodic interval timer
-		 */
-		m360.pitr &= ~0xFF;
-	}
+	/*
+	 * Turn off periodic interval timer
+	 */
+	m360.pitr &= ~0xFF;
 }
 
 static void
 Install_clock (rtems_isr_entry clock_isr)
 {
+	int divisor;
+	extern int m360_clock_rate; /* This should be somewhere in a config file */
+	unsigned long nsec_per_chip_tick = 1000000000 / m360_clock_rate;
+	unsigned long nsec_per_pit_tick = 512 * nsec_per_chip_tick;
+
 	Clock_driver_ticks = 0;
-	if ( BSP_Configuration.ticks_per_timeslice ) {
-		/*
-		 * Choose periodic interval timer register value
-		 * The rate at which the periodic interval timer
-		 * can generate interrupts is almost certainly not
-		 * the same as desired by the BSP configuration.
-		 * Handle the difference by choosing the largest PIT
-		 * interval which is less than or equal to the RTEMS
-		 * interval and skipping some hardware interrupts.
-		 * To reduce the jitter in the calls to RTEMS the
-		 * hardware interrupt interval is never less than
-		 * the maximum non-prescaled value from the PIT.
-		 * 
-		 * For a 25 MHz external clock the basic clock rate is
-		 *	40 nsec * 128 * 4 = 20.48 usec/tick
-		 */
-		int divisor;
-		extern int m360_clock_rate; /* This should be somewhere in a config file */
-		unsigned long nsec_per_chip_tick = 1000000000 / m360_clock_rate;
-		unsigned long nsec_per_pit_tick = 512 * nsec_per_chip_tick;
-
-		rtems_nsec_per_tick = BSP_Configuration.microseconds_per_tick * 1000;
-		divisor = rtems_nsec_per_tick / nsec_per_pit_tick;
-		if (divisor >= 256) {
-			divisor = 255;
-		}
-		else if (divisor == 0) {
-			divisor = 1;
-		}
-		pit_nsec_per_tick = nsec_per_pit_tick * divisor;
-		m360.pitr &= ~0x1FF;
-		m360.picr = (CLOCK_IRQ_LEVEL << 8) | CLOCK_VECTOR;
-		set_vector (clock_isr, CLOCK_VECTOR, 1);
-		m360.pitr |= divisor;
-		atexit (Clock_exit);
+	/*
+	 * Choose periodic interval timer register value
+	 * The rate at which the periodic interval timer
+	 * can generate interrupts is almost certainly not
+	 * the same as desired by the BSP configuration.
+	 * Handle the difference by choosing the largest PIT
+	 * interval which is less than or equal to the RTEMS
+	 * interval and skipping some hardware interrupts.
+	 * To reduce the jitter in the calls to RTEMS the
+	 * hardware interrupt interval is never less than
+	 * the maximum non-prescaled value from the PIT.
+	 * 
+	 * For a 25 MHz external clock the basic clock rate is
+	 *	40 nsec * 128 * 4 = 20.48 usec/tick
+	 */
+
+	rtems_nsec_per_tick = BSP_Configuration.microseconds_per_tick * 1000;
+	divisor = rtems_nsec_per_tick / nsec_per_pit_tick;
+	if (divisor >= 256) {
+		divisor = 255;
+	} else if (divisor == 0) {
+		divisor = 1;
 	}
+	pit_nsec_per_tick = nsec_per_pit_tick * divisor;
+	m360.pitr &= ~0x1FF;
+	m360.picr = (CLOCK_IRQ_LEVEL << 8) | CLOCK_VECTOR;
+	set_vector (clock_isr, CLOCK_VECTOR, 1);
+	m360.pitr |= divisor;
+	atexit (Clock_exit);
 }
 
 rtems_device_driver
diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
index f8a517ed48..ab56f8a981 100644
--- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c
@@ -96,37 +96,35 @@ rtems_isr_entry clock_isr;
   Clock_driver_ticks = 0;
   Clock_isrs = (int)(Configuration.microseconds_per_tick / 1000);
 
-  if ( Configuration.ticks_per_timeslice ) {
 /*    led_putnum('c'); * for debugging purposes */
     Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
 
-	/* Disable timer for initialization */
-	MC68230_WRITE (TCR, 0x00);
-
-	/* some PI/T initialization stuff here -- see comment in the ckisr.c
-	   file in this directory to understand why I use the values that I do */
-	/* Set up the interrupt vector on the MC68230 chip:
-		TIVR = CLOCK_VECTOR; */
-	MC68230_WRITE (TIVR, CLOCK_VECTOR);
-
-	/* Set CPRH through CPRL to 193 (not 203) decimal for countdown--see ckisr.c
-		CPRH = 0x00;
-		CPRM = 0x00;
-		CPRL = 0xC1; */
-	MC68230_WRITE (CPRH, 0x00);
-	MC68230_WRITE (CPRM, 0x00);
-	MC68230_WRITE (CPRL, 0xC1);
-
-	/* Enable timer and use it as an external periodic interrupt generator
-		TCR = 0xA1; */
+  /* Disable timer for initialization */
+  MC68230_WRITE (TCR, 0x00);
+
+  /* some PI/T initialization stuff here -- see comment in the ckisr.c
+     file in this directory to understand why I use the values that I do */
+  /* Set up the interrupt vector on the MC68230 chip:
+  TIVR = CLOCK_VECTOR; */
+  MC68230_WRITE (TIVR, CLOCK_VECTOR);
+
+  /* Set CPRH through CPRL to 193 (not 203) decimal for countdown--see ckisr.c
+  	CPRH = 0x00;
+  	CPRM = 0x00;
+  	CPRL = 0xC1; */
+  MC68230_WRITE (CPRH, 0x00);
+  MC68230_WRITE (CPRM, 0x00);
+  MC68230_WRITE (CPRL, 0xC1);
+
+  /* Enable timer and use it as an external periodic interrupt generator
+  	TCR = 0xA1; */
 /*    led_putnum('a'); * for debugging purposes */
-	MC68230_WRITE (TCR, 0xA1);
+  MC68230_WRITE (TCR, 0xA1);
 
-	/*
-	 *  Schedule the clock cleanup routine to execute if the application exits.
-	 */
-    atexit( Clock_exit );
-  } 
+  /*
+   *  Schedule the clock cleanup routine to execute if the application exits.
+   */
+  atexit( Clock_exit );
 }
 
 /* The following was added for debugging purposes */
@@ -134,16 +132,13 @@ void Clock_exit( void )
 {
   rtems_unsigned8 data;
 
-  if ( Configuration.ticks_per_timeslice ) {
-
-	/* disable timer
-		data = TCR;
-		TCR = (data & 0xFE); */
-	MC68230_READ (TCR, data);
-	MC68230_WRITE (TCR, (data & 0xFE));
+  /* disable timer
+  	data = TCR;
+  	TCR = (data & 0xFE); */
+  MC68230_READ (TCR, data);
+  MC68230_WRITE (TCR, (data & 0xFE));
 
-    /* do not restore old vector */
-  }
+  /* do not restore old vector */
 }
 
 rtems_device_driver Clock_initialize(
diff --git a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
index 4c40716473..c315185f86 100644
--- a/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme136/clock/ckinit.c
@@ -81,44 +81,39 @@ void Install_clock(
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
-    timer = (struct z8036_map *) 0xfffb0000;
-    timer->MASTER_INTR        = MICRVAL;
-    timer->CT1_MODE_SPEC      = T1MSRVAL;
+  Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
+  timer = (struct z8036_map *) 0xfffb0000;
+  timer->MASTER_INTR        = MICRVAL;
+  timer->CT1_MODE_SPEC      = T1MSRVAL;
 
-    *((rtems_unsigned16 *)0xfffb0016) = MS_COUNT;  /* write countdown value */
+  *((rtems_unsigned16 *)0xfffb0016) = MS_COUNT;  /* write countdown value */
 
-    /*
-     *  timer->CT1_TIME_CONST_MSB = (MS_COUNT >> 8);
-     *  timer->CT1_TIME_CONST_LSB = (MS_COUNT &  0xff);
-     */
+  /*
+   *  timer->CT1_TIME_CONST_MSB = (MS_COUNT >> 8);
+   *  timer->CT1_TIME_CONST_LSB = (MS_COUNT &  0xff);
+   */
 
-    timer->MASTER_CFG         = MCCRVAL;
-    timer->CT1_CMD_STATUS     = T1CSRVAL;
+  timer->MASTER_CFG         = MCCRVAL;
+  timer->CT1_CMD_STATUS     = T1CSRVAL;
 
-    /*
-     * Enable interrupt via VME interrupt mask register
-     */
-    (*(rtems_unsigned8 *)0xfffb0038) &= 0xfd;
-
-    atexit( Clock_exit );
-  }
+  /*
+   * Enable interrupt via VME interrupt mask register
+   */
+  (*(rtems_unsigned8 *)0xfffb0038) &= 0xfd;
 
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
 {
   volatile struct z8036_map *timer;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    timer = (struct z8036_map *) 0xfffb0000;
-    timer->MASTER_INTR        = 0x62;
-    timer->CT1_MODE_SPEC      = 0x00;
-    timer->MASTER_CFG         = 0xf4;
-    timer->CT1_CMD_STATUS     = 0x00;
-    /* do not restore old vector */
-  }
+  timer = (struct z8036_map *) 0xfffb0000;
+  timer->MASTER_INTR        = 0x62;
+  timer->CT1_MODE_SPEC      = 0x00;
+  timer->MASTER_CFG         = 0xf4;
+  timer->CT1_CMD_STATUS     = 0x00;
+  /* do not restore old vector */
 }
 
 rtems_device_driver Clock_initialize(
diff --git a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
index d5104d1377..a679897b41 100644
--- a/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme147/clock/ckinit.c
@@ -67,26 +67,21 @@ void Install_clock(rtems_isr_entry clock_isr )
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = 
-      (rtems_isr_entry) set_vector( clock_isr, TIMER_2_VECTOR, 1 );
+  Old_ticker = (rtems_isr_entry) set_vector( clock_isr, TIMER_2_VECTOR, 1 );
 
-    pcc->timer2_int_control = 0x00; /* Disable T2 Interr. */
-    pcc->timer2_preload = MS_COUNT;
-    /* write preload value */
-    pcc->timer2_control = 0x07; /* clear T2 overflow counter, enable counter */
-    pcc->timer2_int_control = CLOCK_INT_LEVEL|0x08;
-    /* Enable Timer 2 and set its int. level */
+  pcc->timer2_int_control = 0x00; /* Disable T2 Interr. */
+  pcc->timer2_preload = MS_COUNT;
+  /* write preload value */
+  pcc->timer2_control = 0x07; /* clear T2 overflow counter, enable counter */
+  pcc->timer2_int_control = CLOCK_INT_LEVEL|0x08;
+  /* Enable Timer 2 and set its int. level */
     
-    atexit( Clock_exit );
-  } 
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
 {
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    pcc->timer2_int_control = 0x00; /* Disable T2 Interr. */
-  }
+  pcc->timer2_int_control = 0x00; /* Disable T2 Interr. */
 }
 
 rtems_device_driver Clock_initialize(
diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
index dc91350612..7cde85513f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme162/clock/ckinit.c
@@ -71,21 +71,18 @@ void Install_clock(rtems_isr_entry clock_isr )
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    Old_ticker = 
-      (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
-    lcsr->vector_base |= MASK_INT;   /* unmask VMEchip2 interrupts */
-    lcsr->to_ctl = 0xE7;             /* prescaler to 1 MHz (see Appendix A1) */
-    lcsr->timer_cmp_2 = MS_COUNT;
-    lcsr->timer_cnt_2 = 0;           /* clear counter */
-    lcsr->board_ctl |= 0x700;        /* increment, reset-on-compare, and */
-                                     /*   clear-overflow-cnt */
-
-    lcsr->intr_level[0] |= CLOCK_INT_LEVEL * 0x10;      /* set int level */
-    lcsr->intr_ena |= 0x02000000;       /* enable tick timer 2 interrupt */
-
-    atexit( Clock_exit );
-  } 
+  Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 );
+  lcsr->vector_base |= MASK_INT;   /* unmask VMEchip2 interrupts */
+  lcsr->to_ctl = 0xE7;             /* prescaler to 1 MHz (see Appendix A1) */
+  lcsr->timer_cmp_2 = MS_COUNT;
+  lcsr->timer_cnt_2 = 0;           /* clear counter */
+  lcsr->board_ctl |= 0x700;        /* increment, reset-on-compare, and */
+                                   /*   clear-overflow-cnt */
+
+  lcsr->intr_level[0] |= CLOCK_INT_LEVEL * 0x10;      /* set int level */
+  lcsr->intr_ena |= 0x02000000;       /* enable tick timer 2 interrupt */
+
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
diff --git a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
index 961376f3d6..021725d992 100644
--- a/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/mvme167/clock/ckinit.c
@@ -156,21 +156,19 @@ void VMEchip2_T2_initialize( void )
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    lcsr->intr_ena &= 0xFDFFFFFF;   /* Disable tick timer 2 interrupt */
-    lcsr->intr_clear = 0x02000000;  /* Clear tick timer 2 interrupt */
-    lcsr->intr_level[0] =           /* Set tick timer 2 interrupt level */
-        (lcsr->intr_level[0] & 0xFFFFFF0F ) | (CLOCK_INT_LEVEL << 4);
-    lcsr->timer_cmp_2 = MS_COUNT;   /* Period in compare register */
-    lcsr->timer_cnt_2 = 0;          /* Clear tick timer 2 counter */
-    Old_ticker =                    /* Install C ISR */
-        (rtems_isr_entry) set_vector( VMEchip2_T2_isr, CLOCK_VECTOR, 1 );
-    lcsr->board_ctl |= 0x700;       /* Start tick timer 2, reset-on-compare, */
-                                    /*  and clear tick timer 2 overflow counter */
-    lcsr->intr_ena |= 0x02000000;   /* Enable tick timer 2 interrupt */
-    lcsr->vector_base |= 0x00800000;/* Unmask VMEchip2 interrupts */
-    atexit( clock_exit );           /* Turn off T2 interrupts when we exit */
-  } 
+  lcsr->intr_ena &= 0xFDFFFFFF;   /* Disable tick timer 2 interrupt */
+  lcsr->intr_clear = 0x02000000;  /* Clear tick timer 2 interrupt */
+  lcsr->intr_level[0] =           /* Set tick timer 2 interrupt level */
+      (lcsr->intr_level[0] & 0xFFFFFF0F ) | (CLOCK_INT_LEVEL << 4);
+  lcsr->timer_cmp_2 = MS_COUNT;   /* Period in compare register */
+  lcsr->timer_cnt_2 = 0;          /* Clear tick timer 2 counter */
+  Old_ticker =                    /* Install C ISR */
+      (rtems_isr_entry) set_vector( VMEchip2_T2_isr, CLOCK_VECTOR, 1 );
+  lcsr->board_ctl |= 0x700;       /* Start tick timer 2, reset-on-compare, */
+                                  /*  and clear tick timer 2 overflow counter */
+  lcsr->intr_ena |= 0x02000000;   /* Enable tick timer 2 interrupt */
+  lcsr->vector_base |= 0x00800000;/* Unmask VMEchip2 interrupts */
+  atexit( clock_exit );           /* Turn off T2 interrupts when we exit */
 }
 
 
@@ -189,13 +187,11 @@ void VMEchip2_T2_initialize( void )
  */
 void clock_exit( void )
 {
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    lcsr->board_ctl &= 0xFFFFFEFF;  /* Stop tick timer 2 */
-    lcsr->intr_ena &= 0xFDFFFFFF;   /* Disable tick timer 2 interrupt */
-    lcsr->intr_clear = 0x02000000;  /* Clear tick timer 2 interrupt */
+  lcsr->board_ctl &= 0xFFFFFEFF;  /* Stop tick timer 2 */
+  lcsr->intr_ena &= 0xFDFFFFFF;   /* Disable tick timer 2 interrupt */
+  lcsr->intr_clear = 0x02000000;  /* Clear tick timer 2 interrupt */
 
-    set_vector( Old_ticker, CLOCK_VECTOR, 1 );
-  }
+  set_vector( Old_ticker, CLOCK_VECTOR, 1 );
 }
 
 
diff --git a/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c
index 9d6dc19390..2a80c41d58 100644
--- a/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c
+++ b/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c
@@ -87,26 +87,22 @@ void Install_clock(
   Clock_driver_ticks = 0;
   Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
 
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-   set_vector( clock_isr, CLOCK_VECTOR, 1 );
+  set_vector( clock_isr, CLOCK_VECTOR, 1 );
 
-    m302.reg.trr1 = TRR1_VAL;		/* set timer reference register */
-    m302.reg.tmr1 = TMR1_VAL;		/* set timer mode register & enable */
-    /*
-     * Enable TIMER1 interrupts only.
-     */
-    m302.reg.imr  = RBIT_IMR_TIMER1;	/* set 68302 int-mask to allow ints */
+  m302.reg.trr1 = TRR1_VAL;		/* set timer reference register */
+  m302.reg.tmr1 = TMR1_VAL;		/* set timer mode register & enable */
+  /*
+   * Enable TIMER1 interrupts only.
+   */
+  m302.reg.imr  = RBIT_IMR_TIMER1;	/* set 68302 int-mask to allow ints */
 
-    atexit( Clock_exit );
-  }
+  atexit( Clock_exit );
 }
 
 void Clock_exit( void )
 {
-  if ( BSP_Configuration.ticks_per_timeslice ) {
-    /* TODO: figure out what to do here */
-    /* do not restore old vector */
-  }
+  /* TODO: figure out what to do here */
+  /* do not restore old vector */
 }
 
 rtems_device_driver Clock_initialize(