From a1f89b42a85fdc2f2a782ac41c5943b7d2ef6048 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 26 Jan 2000 14:22:34 +0000
Subject: No longer incorrectly references mips.

---
 c/src/lib/libcpu/a29k/timer/Makefile.am |  5 +----
 c/src/lib/libcpu/a29k/timer/gettime.S   | 13 -------------
 c/src/lib/libcpu/a29k/timer/timer.c     | 12 +++++++-----
 3 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 c/src/lib/libcpu/a29k/timer/gettime.S

(limited to 'c/src')

diff --git a/c/src/lib/libcpu/a29k/timer/Makefile.am b/c/src/lib/libcpu/a29k/timer/Makefile.am
index 457e7fa2a6..61e9235ee9 100644
--- a/c/src/lib/libcpu/a29k/timer/Makefile.am
+++ b/c/src/lib/libcpu/a29k/timer/Makefile.am
@@ -12,10 +12,7 @@ PGM=$(ARCH)/timer.rel
 C_FILES = timer.c timerisr.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-S_FILES = gettime.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
diff --git a/c/src/lib/libcpu/a29k/timer/gettime.S b/c/src/lib/libcpu/a29k/timer/gettime.S
deleted file mode 100644
index cd429a7725..0000000000
--- a/c/src/lib/libcpu/a29k/timer/gettime.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/* @(#)gettime.S       03/26/96     1.1 */
-
-#include "iregdef.h"
-#include "idtcpu.h"
-#include "idtmon.h"
-
-FRAME(mips_read_timer,sp,0,ra)
-	.set noreorder
-        mfc0 v0,C0_COUNT
-        nop
-        j ra
-	.set reorder
-ENDFRAME(mips_read_timer)
diff --git a/c/src/lib/libcpu/a29k/timer/timer.c b/c/src/lib/libcpu/a29k/timer/timer.c
index c5911d1fae..39834fc399 100644
--- a/c/src/lib/libcpu/a29k/timer/timer.c
+++ b/c/src/lib/libcpu/a29k/timer/timer.c
@@ -29,16 +29,18 @@ static char _sccsid[] = "@(#)timer.c 05/07/96     1.4\n";
 #define CLOCKS_PER_MICROSECOND ( CPU_CLOCK_RATE_MHZ )
 #define TIMER_MAX_VALUE 0xffffffff
 
-extern unsigned32 mips_read_timer( void );
+static unsigned32 read_timer( void )
+{
+  return 0; /* do something with real hardware here */
+}
 
 static rtems_boolean Timer_driver_Find_average_overhead;
 static unsigned32 Timer_initial_value = 0;
 
 void Timer_initialize( void )
 {
-/*
-   Timer_initial_value = mips_read_timer();
- */
+   Timer_initial_value = read_timer();
+
   /*
    *  Somehow start the timer
    */
@@ -70,7 +72,7 @@ int Read_timer( void )
    *  Read the timer and see how many clicks it has been since we started.
    */
 
-  clicks = mips_read_timer();   /* XXX: read some HW here */
+  clicks = read_timer();   /* XXX: read some HW here */
   if (clicks < Timer_initial_value)
   {
       clicks += TIMER_MAX_VALUE;
-- 
cgit v1.2.3