6 files changed, 13 insertions, 18 deletions
diff --git a/c/src/lib/libcpu/hppa1.1/clock/Makefile.in b/c/src/lib/libcpu/hppa1.1/clock/Makefile.in
index 185ca8c78e..5670ecbcbd 100644
--- a/c/src/lib/libcpu/hppa1.1/clock/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/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/hppa1.1/clock/clock.c b/c/src/lib/libcpu/hppa1.1/clock/clock.c
index 1dcfa665ec..a0588e57fd 100644
--- a/c/src/lib/libcpu/hppa1.1/clock/clock.c
+++ b/c/src/lib/libcpu/hppa1.1/clock/clock.c
@@ -19,7 +19,6 @@
 
 /* should get this from bsp.h, but it is not installed yet */
 rtems_isr_entry set_vector(rtems_isr_entry, rtems_vector_number, int);
-extern rtems_configuration_table BSP_Configuration;
 
 #include <stdlib.h>                     /* for atexit() */
 
@@ -103,10 +102,9 @@ void Install_clock(rtems_isr_entry clock_isr)
     Clock_clicks_interrupt = 0;
     Clock_clicks = 0;
 
-    Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000;
+    Clock_isrs = rtems_configuration_get_milliseconds_per_tick();
 
-    if (BSP_Configuration.ticks_per_timeslice)
-    {
+    if ( rtems_configuration_get_ticks_per_timeslice() ) {
         /*
          * initialize the interval here
          * First tick is set to right amount of time in the future
@@ -175,7 +173,7 @@ Clock_isr(rtems_vector_number vector)
     if (Clock_isrs == 1)
     {
         rtems_clock_tick();
-        Clock_isrs = BSP_Configuration.microseconds_per_tick / 10000;
+        Clock_isrs = rtems_configuration_get_milliseconds_per_tick();
         if (Clock_isrs == 0)
             Clock_isrs = 1;
     }
@@ -191,8 +189,7 @@ Clock_isr(rtems_vector_number vector)
 void
 Clock_exit(void)
 {
-    if ( BSP_Configuration.ticks_per_timeslice )
-    {
+    if ( rtems_configuration_get_ticks_per_timeslice() ) {
         (void) set_vector(0, HPPA_INTERRUPT_EXTERNAL_INTERVAL_TIMER, 1);
     }
 }
diff --git a/c/src/lib/libcpu/hppa1.1/include/Makefile.in b/c/src/lib/libcpu/hppa1.1/include/Makefile.in
index 9efc79396e..a6bbbdafc0 100644
--- a/c/src/lib/libcpu/hppa1.1/include/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/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/hppa1.1/milli/Makefile.in b/c/src/lib/libcpu/hppa1.1/milli/Makefile.in
index ae63b98a98..8c07e39d1a 100644
--- a/c/src/lib/libcpu/hppa1.1/milli/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/milli/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/hppa1.1/semaphore/semaphore.c b/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c
index 3819736d03..011827dc75 100644
--- a/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c
+++ b/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c
@@ -16,7 +16,7 @@
  *  $Id$
  */
 
-#include <bsp.h>
+#include <rtems.h>
 
 #include "semaphore.h"
 
@@ -123,7 +123,11 @@ hppa_semaphore_pool_initialize(void *pool_base,
      * If we are node0, then init all in the pool
      */
 
+#if 0
     if (cpu_number == 0)
+#else
+    if (_Configuration_Table->User_multiprocessing_table->node == 1)
+#endif
     {
         /*
          * Tell other cpus we are not done, jic
@@ -139,7 +143,11 @@ hppa_semaphore_pool_initialize(void *pool_base,
      * Tell other cpus we are done, or wait for it to be done if on another cpu
      */
 
+#if 0
     if (cpu_number == 0)
+#else
+    if (_Configuration_Table->User_multiprocessing_table->node == 1)
+#endif
         SEM_CONTROL->user = rtems_build_name('D', 'O', 'N', 'E');
     else
         while (SEM_CONTROL->user != rtems_build_name('D', 'O', 'N', 'E'))
diff --git a/c/src/lib/libcpu/hppa1.1/timer/Makefile.in b/c/src/lib/libcpu/hppa1.1/timer/Makefile.in
index 8b4b6281f4..08bbf81e83 100644
--- a/c/src/lib/libcpu/hppa1.1/timer/Makefile.in
+++ b/c/src/lib/libcpu/hppa1.1/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