4 files changed, 9 insertions, 19 deletions
diff --git a/c/src/lib/libbsp/shmdr/init.c b/c/src/lib/libbsp/shmdr/init.c
index 435bc9dbec..14eddca0aa 100644
--- a/c/src/lib/libbsp/shmdr/init.c
+++ b/c/src/lib/libbsp/shmdr/init.c
@@ -3,8 +3,7 @@
  *  This routine is the shared memory communications initerface
  *  driver initialization routine.
  *
- *  Input parameters:
- *    configuration - address of configuration table
+ *  Input parameters:  NONE
  *
  *  Output parameters: NONE
  *
@@ -33,12 +32,8 @@
  
 rtems_extensions_table MPCI_Shm_extensions;
 
-rtems_mpci_entry Shm_Initialization(
-  rtems_configuration_table   *configuration,
-  rtems_cpu_table             *cpu_configuration,
-  rtems_multiprocessing_table *mp_configuration
+rtems_mpci_entry Shm_Initialization( void )
 
-)
 {
   rtems_unsigned32         i, all_initialized;
   rtems_unsigned32         interrupt_cause, interrupt_value;
@@ -46,6 +41,9 @@ rtems_mpci_entry Shm_Initialization(
   Shm_Node_status_control *nscb;
   rtems_unsigned32         extension_id;    /* for installation of MPCI_Fatal */
   rtems_unsigned32         remaining_memory;
+/* XXX these should use "public" methods to set their values.... */
+  rtems_configuration_table   *configuration = _Configuration_Table;
+  rtems_multiprocessing_table *mp_configuration = _Configuration_MP_table;
 
   Shm_RTEMS_Configuration    = configuration;
   Shm_RTEMS_MP_Configuration = mp_configuration;
diff --git a/c/src/lib/libbsp/shmdr/mpci.h b/c/src/lib/libbsp/shmdr/mpci.h
index 11638f8cc7..c5646a61d7 100644
--- a/c/src/lib/libbsp/shmdr/mpci.h
+++ b/c/src/lib/libbsp/shmdr/mpci.h
@@ -15,8 +15,8 @@
  *  $Id$
  */
 
-#ifndef __MPCI_h
-#define __MPCI_h
+#ifndef __SHM_MPCI_h
+#define __SHM_MPCI_h
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/c/src/lib/libbsp/shmdr/shm.h b/c/src/lib/libbsp/shmdr/shm.h
index 2122873912..5ccb0aab6b 100644
--- a/c/src/lib/libbsp/shmdr/shm.h
+++ b/c/src/lib/libbsp/shmdr/shm.h
@@ -493,11 +493,7 @@ rtems_mpci_entry Shm_Get_packet(
   rtems_packet_prefix **
 );
 
-rtems_mpci_entry Shm_Initialization(
-  rtems_configuration_table   *configuration,
-  rtems_cpu_table             *cpu_configuration,
-  rtems_multiprocessing_table *mp_configuration
-);
+rtems_mpci_entry Shm_Initialization( void );
 
 rtems_mpci_entry Shm_Receive_packet(
   rtems_packet_prefix **
diff --git a/c/src/lib/libbsp/shmdr/shm_driver.h b/c/src/lib/libbsp/shmdr/shm_driver.h
index 2122873912..5ccb0aab6b 100644
--- a/c/src/lib/libbsp/shmdr/shm_driver.h
+++ b/c/src/lib/libbsp/shmdr/shm_driver.h
@@ -493,11 +493,7 @@ rtems_mpci_entry Shm_Get_packet(
   rtems_packet_prefix **
 );
 
-rtems_mpci_entry Shm_Initialization(
-  rtems_configuration_table   *configuration,
-  rtems_cpu_table             *cpu_configuration,
-  rtems_multiprocessing_table *mp_configuration
-);
+rtems_mpci_entry Shm_Initialization( void );
 
 rtems_mpci_entry Shm_Receive_packet(
   rtems_packet_prefix **