summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/powerpc/mpc860
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-04 18:05:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-04 18:05:09 +0000
commitf817b0283cce904d0bcb48cf9e641c2b40ba8f38 (patch)
treef8d686387ff9cf0639e38887ad23aef46e57db94 /c/src/lib/libcpu/powerpc/mpc860
parentAdded first stab at mkgnatnewlib. (diff)
downloadrtems-f817b0283cce904d0bcb48cf9e641c2b40ba8f38.tar.bz2
The files in libcpu should not be directly dependent on any BSP. In
particular, using bsp.h, or getting information from the BSP which should properly be obtained from RTEMS is forbidden. This is necessary to strengthen the division between the BSP independent parts of RTEMS and the BSPs themselves. This started after comments and analysis by Ralf Corsepius <corsepiu@faw.uni-ulm.de>. The changes primarily eliminated the need to include bsp.h and peeking at BSP_Configuration. The use of Cpu_table in each BSP needs to be eliminated.
Diffstat (limited to 'c/src/lib/libcpu/powerpc/mpc860')
-rw-r--r--c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in2
-rw-r--r--c/src/lib/libcpu/powerpc/mpc860/clock/clock.c8
-rw-r--r--c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c2
-rw-r--r--c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in4
-rw-r--r--c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in2
-rw-r--r--c/src/lib/libcpu/powerpc/mpc860/timer/timer.c1
-rw-r--r--c/src/lib/libcpu/powerpc/mpc860/vectors/align_h.S1
7 files changed, 5 insertions, 15 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in
index aa3be76e89..5ac2b435a0 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.in
@@ -62,8 +62,6 @@ ${PGM}: ${SRCS} ${OBJS}
all: ${ARCH} $(SRCS) $(PGM)
-# the .rel file built here will be put into libbsp.a by
-# libbsp/hppa/BSP/wrapup/Makefile
install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libcpu/powerpc/mpc860/clock/clock.c b/c/src/lib/libcpu/powerpc/mpc860/clock/clock.c
index d63cd5a5cf..452b939a6d 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/clock/clock.c
+++ b/c/src/lib/libcpu/powerpc/mpc860/clock/clock.c
@@ -36,7 +36,7 @@
* $Id$
*/
-#include <bsp.h>
+#include <rtems.h>
#include <clockdrv.h>
#include <rtems/libio.h>
@@ -74,7 +74,7 @@ void Install_clock(rtems_isr_entry clock_isr)
Clock_driver_ticks = 0;
- pit_value = BSP_Configuration.microseconds_per_tick /
+ pit_value = rtems_configuration_get_microseconds_per_tick() /
Cpu_table.clicks_per_usec;
if (pit_value == 0) {
pit_value = 0xffff;
@@ -85,7 +85,7 @@ void Install_clock(rtems_isr_entry clock_isr)
if (pit_value > 0xffff) { /* pit is only 16 bits long */
rtems_fatal_error_occurred(-1);
}
- if (BSP_Configuration.ticks_per_timeslice) {
+ if ( rtems_configuration_get_ticks_per_timeslice() ) {
/*
* initialize the interval here
@@ -131,7 +131,7 @@ ReInstall_clock(rtems_isr_entry new_clock_isr)
void
Clock_exit(void)
{
- if ( BSP_Configuration.ticks_per_timeslice ) {
+ if ( rtems_configuration_get_ticks_per_timeslice() ) {
/* disable PIT and PIT interrupts */
m860.piscr &= ~(M860_PISCR_PTE | M860_PISCR_PIE);
diff --git a/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c
index 10a858b07e..604bb8734a 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c
+++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/console-generic.c
@@ -44,7 +44,7 @@
* $Id$
*/
-#include <bsp.h>
+#include <rtems.h>
#include <rtems/libio.h>
#include <mpc860.h>
#include <mpc860/console.h>
diff --git a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in
index 9bb0657a74..3d3263f522 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.in
@@ -1,10 +1,6 @@
#
# $Id$
#
-# Install any include files needed by libcpu.
-# Mainly this just means bsp.h which would normally be installed
-# after libcpu is built.
-# This is a bit of a hack.
@SET_MAKE@
srcdir = @srcdir@
diff --git a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in
index 6b7d7361bb..2a52daf5d7 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in
+++ b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.in
@@ -62,8 +62,6 @@ ${PGM}: ${SRCS} ${OBJS}
all: ${ARCH} $(SRCS) $(PGM)
-# the .rel file built here will be put into libbsp.a by
-# libbsp/hppa/BSP/wrapup/Makefile
install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff --git a/c/src/lib/libcpu/powerpc/mpc860/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc860/timer/timer.c
index c97439f2d6..732ab565a7 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc860/timer/timer.c
@@ -43,7 +43,6 @@
* $Id$
*/
-#include <bsp.h>
#include <rtems.h>
#include <mpc860.h>
diff --git a/c/src/lib/libcpu/powerpc/mpc860/vectors/align_h.S b/c/src/lib/libcpu/powerpc/mpc860/vectors/align_h.S
index 9a785e347d..98b5ea891a 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/vectors/align_h.S
+++ b/c/src/lib/libcpu/powerpc/mpc860/vectors/align_h.S
@@ -44,7 +44,6 @@
*/
#include "asm.h"
-/*#include "bsp.h"*/
#define ALIGN_REGS 0x0140
.set CACHE_SIZE,16 # cache line size of 32 bytes