From 8b15163fd346888e34b6241e590f617ccb26e944 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 9 Jan 2001 17:28:15 +0000 Subject: 2001-01-09 Joel Sherrill * Removing non-function shmsupp directory. * shmsupp/.cvsignore, shmsupp/Makefile.am, shmsupp/addrconv.c, shmsupp/getcfg.c, shmsupp/lock.c, shmsupp/mpisr.c: Removed. * configure.in, Makefile.am, wrapup/Makefile.am --- c/src/lib/libbsp/i960/rxgen960/ChangeLog | 7 ++ c/src/lib/libbsp/i960/rxgen960/Makefile.am | 2 +- c/src/lib/libbsp/i960/rxgen960/configure.in | 4 - c/src/lib/libbsp/i960/rxgen960/shmsupp/.cvsignore | 2 - c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am | 34 -------- c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c | 37 -------- c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c | 98 ---------------------- c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c | 76 ----------------- c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c | 69 --------------- c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am | 13 +-- 10 files changed, 10 insertions(+), 332 deletions(-) delete mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/.cvsignore delete mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am delete mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c delete mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c delete mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c delete mode 100644 c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog index 24e90539d7..38164079cc 100644 --- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog +++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog @@ -1,3 +1,10 @@ +2001-01-09 Joel Sherrill + + * Removing non-function shmsupp directory. + * shmsupp/.cvsignore, shmsupp/Makefile.am, shmsupp/addrconv.c, + shmsupp/getcfg.c, shmsupp/lock.c, shmsupp/mpisr.c: Removed. + * configure.in, Makefile.am, wrapup/Makefile.am + 2000-12-06 Joel Sherrill * include/bsp.h: Removed incorrect error case. diff --git a/c/src/lib/libbsp/i960/rxgen960/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/Makefile.am index c5bd693f45..efc855cefe 100644 --- a/c/src/lib/libbsp/i960/rxgen960/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../../../aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = include start startup clock console shmsupp timer wrapup +SUBDIRS = include start startup clock console timer wrapup include $(top_srcdir)/../../bsp.am diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in index 9fd93aa359..ab632cce91 100644 --- a/c/src/lib/libbsp/i960/rxgen960/configure.in +++ b/c/src/lib/libbsp/i960/rxgen960/configure.in @@ -17,11 +17,8 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) RTEMS_CANONICAL_HOST -AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") - RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here @@ -30,7 +27,6 @@ Makefile clock/Makefile console/Makefile include/Makefile -shmsupp/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/.cvsignore b/c/src/lib/libbsp/i960/rxgen960/shmsupp/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am deleted file mode 100644 index ad92f76f87..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -PGM = $(ARCH)/shmsupp.rel - -C_FILES = addrconv.c getcfg.c lock.c mpisr.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) - -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../../../../../../automake/compile.am -include $(top_srcdir)/../../../../../../automake/lib.am - -# -# (OPTIONAL) Add local stuff here using += -# - -$(PGM): $(OBJS) - $(make-rel) - -# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile -if HAS_MP -all-local: $(ARCH) $(OBJS) $(PGM) -endif - -.PRECIOUS: $(PGM) - -EXTRA_DIST = addrconv.c getcfg.c lock.c mpisr.c - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c deleted file mode 100644 index 6b68ddc60e..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/addrconv.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Shm_Convert_address - * - * This routine takes into account the peculiar short VME address - * of the CVME961 board. The CVME961 maps short address space - * 0xffffxxxx to 0xb400xxxx. - * - * Input parameters: - * address - address to convert - * - * Output parameters: - * returns - converted address - * - * COPYRIGHT (c) 1989-1997. - * On-Line Applications Research Corporation (OAR). - * Copyright assigned to U.S. Government, 1994. - * - * The license and distribution terms for this file may in - * the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include -#include "shm_driver.h" - -void *Shm_Convert_address( - void *address -) -{ - rtems_unsigned32 workaddr = (rtems_unsigned32) address; - - if ( workaddr >= 0xffff0000 ) - workaddr = (workaddr & 0xffff) | 0xb4000000; - return ( (rtems_unsigned32 *)workaddr ); -} diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c deleted file mode 100644 index 3a009aee02..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/getcfg.c +++ /dev/null @@ -1,98 +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 Cyclone CVME961. - * - * INPUT PARAMETERS: - * localnode - local node number - * shmcfg - address of pointer to SHM Config Table - * - * OUTPUT PARAMETERS: - * *shmcfg - pointer to SHM Config Table - * - * NOTES: CVME961 target system has onboard dual-ported memory. This - * file uses the USE_ONBOARD_RAM macro to determine if this - * RAM is to be used as the SHM. If so (i.e. USE_ONBOARD_RAM - * is set to 1), it is assumed that the master node's dual - * ported memory will be used and that it is configured - * correctly. The node owning the memory CANNOT access it - * using a local address. The "if" insures that the MASTER - * node uses a local address to access the dual-ported memory. - * - * The interprocessor interrupt used on the CVME961 is generated - * by the VIC068. The ICMS capablities of the VIC068 are used - * to generate interprocessor interrupts for up to eight nodes. - * - * The following table illustrates the configuration limitations: - * - * BUS MAX - * MODE ENDIAN NODES - * ========= ====== ======= - * POLLED LITTLE 2+ - * INTERRUPT LITTLE 2-8 - * - * COPYRIGHT (c) 1989-1997. - * On-Line Applications Research Corporation (OAR). - * Copyright assigned to U.S. Government, 1994. - * - * The license and distribution terms for this file may in - * the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include "shm_driver.h" - -#define USE_ONBOARD_RAM 0 /* use onboard (1) or VME RAM */ - /* for SHM communications */ - -#define INTERRUPT 1 /* CVME961 target supports both */ -#define POLLING 0 /* polling and interrupt modes */ - - -shm_config_table BSP_shm_cfgtbl; - -void Shm_Get_configuration( - rtems_unsigned32 localnode, - shm_config_table **shmcfg -) -{ -#if ( USE_ONBOARD_RAM == 1 ) - if ( Shm_RTEMS_MP_Configuration->node == MASTER ) - BSP_shm_cfgtbl.base = (rtems_unsigned32 *)0x00300000; - else - BSP_shm_cfgtbl.base = (rtems_unsigned32 *)0x10300000; -#else - BSP_shm_cfgtbl.base = (rtems_unsigned32 *)0x20000000; -#endif - - BSP_shm_cfgtbl.length = 1 * MEGABYTE; - BSP_shm_cfgtbl.format = SHM_LITTLE; - - BSP_shm_cfgtbl.cause_intr = Shm_Cause_interrupt; - -#ifdef NEUTRAL_BIG - BSP_shm_cfgtbl.convert = (void *)CPU_swap_u32; -#else - BSP_shm_cfgtbl.convert = NULL_CONVERT; -#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 = - (rtems_unsigned32 *) (0xffff0021|((localnode-1) << 12)); - /* use ICMS0 */ - BSP_shm_cfgtbl.Intr.value = 1; - BSP_shm_cfgtbl.Intr.length = BYTE; -#endif - - *shmcfg = &BSP_shm_cfgtbl; - -} diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c deleted file mode 100644 index 0a546effe7..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/lock.c +++ /dev/null @@ -1,76 +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-1997. - * On-Line Applications Research Corporation (OAR). - * Copyright assigned to U.S. Government, 1994. - * - * The license and distribution terms for this file may in - * the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $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 -) -{ - rtems_unsigned32 isr_level, oldlock; - - rtems_interrupt_disable( isr_level ); - Shm_isrstat = isr_level; - while ( 1 ) { - atomic_modify( SHM_LOCK_VALUE, &lq_cb->lock, oldlock ); - if ( !(oldlock & SHM_LOCK_VALUE) ) - return; - delay( 28 ); /* delay 28 microseconds */ - } -} - -/* - * Shm_Unlock - * - * Unlock the lock for the specified locked queue. - */ - -void Shm_Unlock( - Shm_Locked_queue_Control *lq_cb -) -{ - rtems_unsigned32 isr_level; - - lq_cb->lock = SHM_UNLOCK_VALUE; - isr_level = Shm_isrstat; - rtems_interrupt_enable( isr_level ); -} - diff --git a/c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c b/c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c deleted file mode 100644 index 308fb57231..0000000000 --- a/c/src/lib/libbsp/i960/rxgen960/shmsupp/mpisr.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * NOTE: This routine is not used when in polling mode. Either - * this routine OR Shm_clockisr is used in a particular system. - * - * There must be sufficient time after the IACK (read at - * 0xb600000x) for the VIC068 to clear the interrupt request - * before the interrupt request is cleared from IPND (sf0). - * - * COPYRIGHT (c) 1989-1997. - * On-Line Applications Research Corporation (OAR). - * Copyright assigned to U.S. Government, 1994. - * - * The license and distribution terms for this file may in - * the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#include -#include -#include "shm_driver.h" - -rtems_isr Shm_isr_rxgen960( - rtems_vector_number vector -) -{ - rtems_unsigned32 vic_vector; - - /* enable_tracing(); */ - vic_vector = (*(volatile rtems_unsigned8 *)0xb6000007); - /* reset intr by reading */ - /* vector at IPL=3 */ - Shm_Interrupt_count += 1; - rtems_multiprocessing_announce(); - (*(volatile rtems_unsigned8 *)0xa000005f) = 0; /* clear ICMS0 */ - i960_clear_intr( 6 ); - -} - -/* void _Shm_setvec( ) - * - * This driver routine sets the SHM interrupt vector to point to the - * driver's SHM interrupt service routine. - * - * NOTE: See pp. 21-22, 36-39 of the CVME961 Manual for more info. - * - * Input parameters: NONE - * - * Output parameters: NONE - */ - -void Shm_setvec() -{ - rtems_unsigned32 isrlevel; - - rtems_interrupt_disable( isrlevel ); - /* set SQSIO4 CTL REG for */ - /* VME slave address */ - (*(rtems_unsigned8 *)0xc00000b0) = - (Shm_RTEMS_MP_Configuration->node - 1) | 0x10; - set_vector( Shm_isr_rxgen960, 6, 1 ); - /* set ICMS Bector Base Register */ - (*(rtems_unsigned8 *)0xa0000053) = 0x60; /* XINT6 vector is 0x62 */ - /* set ICMS Intr Control Reg */ - (*(rtems_unsigned8 *)0xa0000047) = 0xeb; /* ICMS0 enabled, IPL=0 */ - (*(rtems_unsigned8 *)0xa000005f) = 0; /* clear ICMS0 */ - rtems_interrupt_enable( isrlevel ); -} diff --git a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am index 72693524d5..19e6003286 100644 --- a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am +++ b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am @@ -8,20 +8,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am -if HAS_MP -GENERIC_MP_REL_PIECES = shmdr -endif -GENERIC_PIECES += $(GENERIC_MP_REL_PIECES) - -if HAS_MP -BSP_MP_O_PIECES = shmsupp -endif -BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) +BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a # -- cgit v1.2.3