diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-09 02:32:37 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-09 02:32:37 +0000 |
commit | 9af31a6e92b51e5dbaa3d6212b607828e506ef85 (patch) | |
tree | bca9978af008bfe196e98c68b2e849daa7875bd9 /c/src/lib/libcpu/hppa1.1/semaphore | |
parent | Removed runway directory and moved contents to include. (diff) | |
download | rtems-9af31a6e92b51e5dbaa3d6212b607828e506ef85.tar.bz2 |
Moved include files to hppa1.1 subdirectory and put their sources
in the include directory.
Diffstat (limited to 'c/src/lib/libcpu/hppa1.1/semaphore')
-rw-r--r-- | c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in | 5 | ||||
-rw-r--r-- | c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/hppa1.1/semaphore/semaphore.h | 70 |
3 files changed, 3 insertions, 74 deletions
diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in index dd2c2f22b1..794de08314 100644 --- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in +++ b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.in @@ -20,7 +20,7 @@ C_PIECES = semaphore C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) -H_PIECES = semaphore +H_PIECES = H_FILES = $(H_PIECES:%=$(srcdir)/%.h) # Assembly source names, if any, go here -- minus the .S @@ -37,7 +37,7 @@ include $(RTEMS_ROOT)/make/leaf.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs -INSTALLDIRS = $(PROJECT_INCLUDE) +INSTALLDIRS = $(PROJECT_INCLUDE)/hppa1.1 $(INSTALLDIRS): @$(mkinstalldirs) $(INSTALLDIRS) @@ -63,7 +63,6 @@ ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} $(SRCS) $(PGM) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c b/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c index 011827dc75..d2d577a180 100644 --- a/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c +++ b/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.c @@ -18,7 +18,7 @@ #include <rtems.h> -#include "semaphore.h" +#include <hppa1.1/semaphore.h> /* * Report fatal semaphore error diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.h b/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.h deleted file mode 100644 index 0ff4d13767..0000000000 --- a/c/src/lib/libcpu/hppa1.1/semaphore/semaphore.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Description: - * HPPA fast spinlock semaphores based on LDCWX instruction. - * These semaphores are not known to RTEMS. - * - * TODO: - * - * COPYRIGHT (c) 1994,95 by Division Incorporated - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * - * $Id$ - */ - -#ifndef _INCLUDE_SEMAPHORE_H -#define _INCLUDE_SEMAPHORE_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This structure has hardware requirements. - * LDCWX opcode requires 16byte alignment for the lock - * 'lock' must be first member of structure. - */ - -#define SEM_ALIGN 16 - -typedef volatile struct { - - rtems_unsigned32 lock __attribute__ ((aligned (SEM_ALIGN))); - - rtems_unsigned32 flags; - - void *owner_tcb; /* for debug/commentary only */ - - rtems_unsigned32 user; /* for use by user */ - -} hppa_semaphore_t; - -/* - * Values for flags - */ - -#define HPPA_SEM_IN_USE 0x0001 /* semaphore owned by somebody */ -#define HPPA_SEM_NO_SPIN 0x0002 /* don't spin if unavailable */ -#define HPPA_SEM_INITIALLY_FREE 0x0004 /* init it to be free */ - -/* - * Caller specifiable flags - */ - -#define HPPA_SEM_CALLER_FLAGS (HPPA_SEM_NO_SPIN | HPPA_SEM_INITIALLY_FREE) - -void hppa_semaphore_pool_initialize(void *pool_base, int pool_size); - -rtems_unsigned32 hppa_semaphore_acquire(hppa_semaphore_t *sp, int flag); - -void hppa_semaphore_release(hppa_semaphore_t *sp); - -hppa_semaphore_t *hppa_semaphore_allocate(rtems_unsigned32 which, int flag); - -#ifdef __cplusplus -} -#endif - -#endif /* ! _INCLUDE_SEMAPHORE_H */ |