From b3d2ed680cdcd0ebd43f3884b76fc73ddc73af8c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 21 Mar 2011 20:24:07 +0000 Subject: 2011-03-21 Joel Sherrill * Makefile.am: Remove stub version. * shmsupp/addrconv.c, shmsupp/getcfg.c, shmsupp/lock.c, shmsupp/mpisr.c: Removed. --- c/src/lib/libbsp/nios2/nios2_iss/ChangeLog | 6 ++ c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 5 -- .../lib/libbsp/nios2/nios2_iss/shmsupp/addrconv.c | 30 -------- c/src/lib/libbsp/nios2/nios2_iss/shmsupp/getcfg.c | 75 ------------------- c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c | 84 ---------------------- c/src/lib/libbsp/nios2/nios2_iss/shmsupp/mpisr.c | 46 ------------ 6 files changed, 6 insertions(+), 240 deletions(-) delete mode 100644 c/src/lib/libbsp/nios2/nios2_iss/shmsupp/addrconv.c delete mode 100644 c/src/lib/libbsp/nios2/nios2_iss/shmsupp/getcfg.c delete mode 100644 c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c delete mode 100644 c/src/lib/libbsp/nios2/nios2_iss/shmsupp/mpisr.c (limited to 'c') diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index b0c54cad1d..dd66e85613 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog @@ -1,3 +1,9 @@ +2011-03-21 Joel Sherrill + + * Makefile.am: Remove stub version. + * shmsupp/addrconv.c, shmsupp/getcfg.c, shmsupp/lock.c, + shmsupp/mpisr.c: Removed. + 2011-02-11 Ralf Corsépius * shmsupp/lock.c: diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 762fb2847a..8fa60851e8 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -42,11 +42,6 @@ libbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h libbsp_a_SOURCES += console/console.c ../../shared/console-polled.c # timer libbsp_a_SOURCES += timer/timer.c -if HAS_MP -# shmsupp -libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ - shmsupp/mpisr.c -endif include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/addrconv.c b/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/addrconv.c deleted file mode 100644 index 444c1e4d87..0000000000 --- a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/addrconv.c +++ /dev/null @@ -1,30 +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.com/license/LICENSE. - * - * $Id$ - */ - -#include -#include -#include - -void *Shm_Convert_address( - void *address -) -{ - return ( address ); -} diff --git a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/getcfg.c b/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/getcfg.c deleted file mode 100644 index fc3b3ba062..0000000000 --- a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/getcfg.c +++ /dev/null @@ -1,75 +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 XXX target. - * - * INPUT PARAMETERS: - * localnode - local node number - * shmcfg - address of pointer to SHM Config Table - * - * OUTPUT PARAMETERS: - * *shmcfg - pointer to SHM Config Table - * -XXX: FIX THE COMMENTS BELOW WHEN THE CPU IS KNOWN - * NOTES: The XYZ does not have an interprocessor interrupt. - * - * The following table illustrates the configuration limitations: - * - * BUS MAX - * MODE ENDIAN NODES - * ========= ====== ======= - * POLLED BIG 2+ - * INTERRUPT **** NOT SUPPORTED **** - * - * 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.com/license/LICENSE. - * - * $Id$ - */ - -#include -#include -#include - -/* - * configured if currently polling of interrupt driven - */ - -#define INTERRUPT 0 /* XXX: */ -#define POLLING 1 /* XXX: fix me -- is polling ONLY!!! */ - -shm_config_table BSP_shm_cfgtbl; - -void Shm_Get_configuration( - uint32_t localnode, - shm_config_table **shmcfg -) -{ - BSP_shm_cfgtbl.base = 0x0; - BSP_shm_cfgtbl.length = 1 * MEGABYTE; - BSP_shm_cfgtbl.format = SHM_BIG; - - /* - * Override cause_intr or shm_isr if your target has - * special requirements. - */ - - 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 - - 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; - - *shmcfg = &BSP_shm_cfgtbl; -} diff --git a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c b/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c deleted file mode 100644 index c002acc389..0000000000 --- a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c +++ /dev/null @@ -1,84 +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-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.com/license/LICENSE. - * - * $Id$ - */ - -#include -#include -#include - -/* - * Shm_Initialize_lock - * - * Initialize the lock for the specified locked queue. - */ - -void Shm_Initialize_lock( - Shm_Locked_queue_Control *lq_cb -) -{ - lq_cb->lock = LQ_UNLOCKED; -} - -/* 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. - */ - -void Shm_Lock( - Shm_Locked_queue_Control *lq_cb -) -{ - uint32_t isr_level; - uint32_t *lockptr = (uint32_t*) &lq_cb->lock; - uint32_t lock_value; - - lock_value = 0x80000000; - rtems_interrupt_disable( isr_level ); - - Shm_isrstat = isr_level; - while ( lock_value ) { - __asm__ volatile( "" - : "=r" (lockptr), "=r" (lock_value) - : "0" (lockptr), "1" (lock_value) - ); - /* - * If not available, then may want to delay to reduce load on lock. - */ - - if ( lock_value ) - rtems_bsp_delay( 10 ); /* approximately 10 microseconds */ - } -} - -/* - * Shm_Unlock - * - * Unlock the lock for the specified locked queue. - */ - -void Shm_Unlock( - Shm_Locked_queue_Control *lq_cb -) -{ - uint32_t isr_level; - - lq_cb->lock = SHM_UNLOCK_VALUE; - isr_level = Shm_isrstat; - rtems_interrupt_enable( isr_level ); -} diff --git a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/mpisr.c b/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/mpisr.c deleted file mode 100644 index c5f47933a4..0000000000 --- a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/mpisr.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Shm_isr_nobsp() - * - * 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.com/license/LICENSE. - * - * $Id$ - */ - -#include -#include -#include - -rtems_isr Shm_isr_nobsp( void ) -{ - /* - * If this routine has to do anything other than the mpisr.c - * found in the generic driver, then copy the contents of the generic - * mpisr.c and augment it to satisfy this particular board. Typically, - * you need to have a board specific mpisr.c when the interrupt - * must be cleared. - * - * If the generic mpisr.c satisifies your requirements, then - * remove this routine from your target's shmsupp/mpisb.c file. - * Then simply install the generic Shm_isr in the Shm_setvec - * routine below. - */ -} - -/* 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( void ) -{ - /* XXX: FIX ME!!! */ -} -- cgit v1.2.3