bsps: Move MPCI support to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

6 files changed, 4 insertions, 192 deletions

diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index ba26ca315d..c9560601cb 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -48,10 +48,10 @@ librtemsbsp_a_SOURCES += vectors/align_h.S
 
 if HAS_MP
 # shmdr
-librtemsbsp_a_SOURCES += shmsupp/addrconv.c
-librtemsbsp_a_SOURCES += shmsupp/getcfg.c
-librtemsbsp_a_SOURCES += shmsupp/lock.c
-librtemsbsp_a_SOURCES += shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/addrconv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/getcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/lock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/mpci/mpisr.c
 endif
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/README b/c/src/lib/libbsp/powerpc/psim/shmsupp/README
deleted file mode 100644
index ba2d67752f..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This shared memory driver support code works with a modified version
-of the PowerPC Simulator.  The modifications are not yet merged
-into the mainsteam distribution.
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/addrconv.c b/c/src/lib/libbsp/powerpc/psim/shmsupp/addrconv.c
deleted file mode 100644
index 2656bc1ccf..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/addrconv.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Shm_Convert_address
- *
- *  No address range conversion is required.
- *
- *  Input parameters:
- *    address - address to convert
- *
- *  Output parameters:
- *    returns - converted address
- *
- *  COPYRIGHT (c) 1989-1999.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <rtems.h>
-#include <bsp.h>
-#include <shm_driver.h>
-
-void *Shm_Convert_address(
-  void *address
-)
-{
-  return ( address );
-}
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/getcfg.c b/c/src/lib/libbsp/powerpc/psim/shmsupp/getcfg.c
deleted file mode 100644
index 6be42f8b9c..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/getcfg.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  void Shm_Get_configuration( localnode, &shmcfg )
- *
- *  This routine initializes, if necessary, and returns a pointer
- *  to the Shared Memory Configuration Table for the PowerPC PSIM.
- *
- *  INPUT PARAMETERS:
- *    localnode - local node number
- *    shmcfg    - address of pointer to SHM Config Table
- *
- *  OUTPUT PARAMETERS:
- *    *shmcfg   - pointer to SHM Config Table
- *
- *  NOTES:  No interrupt support.
- *
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <rtems.h>
-#include <psim.h>
-#include "shm_driver.h"
-
-#define INTERRUPT 0                   /* PSIM target supports only */
-#define POLLING   1                   /* polling mode. */
-
-shm_config_table BSP_shm_cfgtbl;
-
-void Shm_Get_configuration(
-  uint32_t           localnode,
-  shm_config_table **shmcfg
-)
-{
-   BSP_shm_cfgtbl.base         = (uint32_t*)PSIM.SharedMemory;
-   BSP_shm_cfgtbl.length       = sizeof(PSIM.SharedMemory);
-   BSP_shm_cfgtbl.format       = SHM_BIG;
-
-   BSP_shm_cfgtbl.cause_intr   = Shm_Cause_interrupt;
-
-#ifdef NEUTRAL_BIG
-   BSP_shm_cfgtbl.convert      = NULL_CONVERT;
-#else
-   BSP_shm_cfgtbl.convert      = CPU_swap_u32;
-#endif
-
-#if (POLLING==1)
-   BSP_shm_cfgtbl.poll_intr    = POLLED_MODE;
-   BSP_shm_cfgtbl.Intr.address = NO_INTERRUPT;
-   BSP_shm_cfgtbl.Intr.value   = NO_INTERRUPT;
-   BSP_shm_cfgtbl.Intr.length  = NO_INTERRUPT;
-#else
-   BSP_shm_cfgtbl.poll_intr    = INTR_MODE;
-   BSP_shm_cfgtbl.Intr.address = 0;
-   BSP_shm_cfgtbl.Intr.value   = 0;
-   BSP_shm_cfgtbl.Intr.length  = BYTE;
-#endif
-
-   *shmcfg = &BSP_shm_cfgtbl;
-
-}
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/lock.c b/c/src/lib/libbsp/powerpc/psim/shmsupp/lock.c
deleted file mode 100644
index 6c0907e30f..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/lock.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*  Shared Memory Lock Routines
- *
- *  This shared memory locked queue support routine need to be
- *  able to lock the specified locked queue.  Interrupts are
- *  disabled while the queue is locked to prevent preemption
- *  and deadlock when two tasks poll for the same lock.
- *  previous level.
- *
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <rtems.h>
-#include <bsp.h>
-#include <shm_driver.h>
-#include <psim.h>
-
-/*
- *  Shm_Initialize_lock
- *
- *  Initialize the lock for the specified locked queue.
- */
-
-void Shm_Initialize_lock(
-  Shm_Locked_queue_Control *lq_cb
-)
-{
-  /* nothing required -- done implicitly by device tree */
-}
-
-/*  void _Shm_Lock( &lq_cb )
- *
- *  This shared memory locked queue support routine locks the
- *  specified locked queue.  It disables interrupts to prevent
- *  a deadlock condition.
- */
-
-static rtems_interrupt_level level;
-
-void Shm_Lock(
-  Shm_Locked_queue_Control *lq_cb
-)
-{
-  rtems_interrupt_disable( level );
-    (void) PSIM.Semaphore.lock;
-}
-
-/*
- *  Shm_Unlock
- *
- *  Unlock the lock for the specified locked queue.
- */
-
-void Shm_Unlock(
-  Shm_Locked_queue_Control *lq_cb
-)
-{
-    (void) PSIM.Semaphore.unlock;
-  rtems_interrupt_enable( level );
-}
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c b/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c
deleted file mode 100644
index 8987a5a272..0000000000
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/mpisr.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  NOTE: This routine is not used when in polling mode.  Either
- *        this routine OR Shm_clockisr is used in a particular system.
- *
- *  COPYRIGHT (c) 1989-1997.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may in
- *  the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#include <rtems.h>
-#include <bsp.h>
-#include <shm_driver.h>
-
-/*  void _Shm_setvec( )
- *
- *  This driver routine sets the SHM interrupt vector to point to the
- *  driver's SHM interrupt service routine.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters: NONE
- */
-
-void Shm_setvec()
-{
-  /* not supported */
-}