change log for rtems (2011-06-07)
rtems-vc at rtems.org
rtems-vc at rtems.org
Tue Jun 7 08:10:44 UTC 2011
*sh*:
2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
* shared/include/cache.h, shared/src/cache_manager.c: Removed include
files to reduce implementation constraints.
M 1.32 c/src/lib/libcpu/ChangeLog
M 1.6 c/src/lib/libcpu/shared/include/cache.h
M 1.8 c/src/lib/libcpu/shared/src/cache_manager.c
diff -u rtems/c/src/lib/libcpu/ChangeLog:1.31 rtems/c/src/lib/libcpu/ChangeLog:1.32
--- rtems/c/src/lib/libcpu/ChangeLog:1.31 Sun May 30 10:46:17 2010
+++ rtems/c/src/lib/libcpu/ChangeLog Tue Jun 7 02:51:21 2011
@@ -1,3 +1,8 @@
+2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * shared/include/cache.h, shared/src/cache_manager.c: Removed include
+ files to reduce implementation constraints.
+
2010-05-30 Joel Sherrill <joel.sherrill at oarcorp.com>
* shared/src/no_cache.c: New file.
diff -u rtems/c/src/lib/libcpu/shared/include/cache.h:1.5 rtems/c/src/lib/libcpu/shared/include/cache.h:1.6
--- rtems/c/src/lib/libcpu/shared/include/cache.h:1.5 Sun Nov 29 23:06:18 2009
+++ rtems/c/src/lib/libcpu/shared/include/cache.h Tue Jun 7 02:51:21 2011
@@ -23,8 +23,6 @@
#ifndef __LIBCPU_CACHE_h
#define __LIBCPU_CACHE_h
-#include <sys/types.h>
-
void _CPU_cache_flush_1_data_line(const void *d_addr);
void _CPU_cache_invalidate_1_data_line(const void *d_addr);
void _CPU_cache_freeze_data(void);
diff -u rtems/c/src/lib/libcpu/shared/src/cache_manager.c:1.7 rtems/c/src/lib/libcpu/shared/src/cache_manager.c:1.8
--- rtems/c/src/lib/libcpu/shared/src/cache_manager.c:1.7 Sun Nov 29 23:06:18 2009
+++ rtems/c/src/lib/libcpu/shared/src/cache_manager.c Tue Jun 7 02:51:21 2011
@@ -31,11 +31,8 @@
*/
#include <rtems.h>
-#include <sys/types.h>
-#include <libcpu/cache.h>
#include "cache_.h"
-
/*
* THESE FUNCTIONS ONLY HAVE BODIES IF WE HAVE A DATA CACHE
*/
*sh*:
2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
* shared/src/cache_.h: Include required header file.
M 1.384 c/src/lib/libcpu/powerpc/ChangeLog
M 1.7 c/src/lib/libcpu/powerpc/shared/src/cache_.h
diff -u rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.383 rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.384
--- rtems/c/src/lib/libcpu/powerpc/ChangeLog:1.383 Thu May 19 07:03:09 2011
+++ rtems/c/src/lib/libcpu/powerpc/ChangeLog Tue Jun 7 02:52:59 2011
@@ -1,3 +1,7 @@
+2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * shared/src/cache_.h: Include required header file.
+
2011-05-19 Sebastian Huber <sebastian.huber at embedded-brains.de>
* shared/include/powerpc-utility.h: API changes for ppc_*_cache_*()
diff -u rtems/c/src/lib/libcpu/powerpc/shared/src/cache_.h:1.6 rtems/c/src/lib/libcpu/powerpc/shared/src/cache_.h:1.7
--- rtems/c/src/lib/libcpu/powerpc/shared/src/cache_.h:1.6 Thu Jul 17 09:39:17 2008
+++ rtems/c/src/lib/libcpu/powerpc/shared/src/cache_.h Tue Jun 7 02:52:59 2011
@@ -10,6 +10,7 @@
#define LIBCPU_POWERPC_CACHE_H
#include <rtems/powerpc/powerpc.h>
+#include <libcpu/cache.h>
/* Provide the CPU defines only if we have a cache */
#if PPC_CACHE_ALIGNMENT != PPC_NO_CACHE_ALIGNMENT
@@ -17,9 +18,4 @@
#define CPU_INSTRUCTION_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT
#endif
-#ifdef _OLD_EXCEPTIONS
-# warning OLD EXCEPTIONS
-# include <libcpu/cache.h>
-#endif
-
#endif /* LIBCPU_POWERPC_CACHE_H */
*sh*:
2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
* cache/cache_.h: Include required header file.
* cache/cache.c: Removed superfuous header file.
M 1.19 c/src/lib/libcpu/bfin/ChangeLog
M 1.3 c/src/lib/libcpu/bfin/cache/cache.c
M 1.2 c/src/lib/libcpu/bfin/cache/cache_.h
diff -u rtems/c/src/lib/libcpu/bfin/ChangeLog:1.18 rtems/c/src/lib/libcpu/bfin/ChangeLog:1.19
--- rtems/c/src/lib/libcpu/bfin/ChangeLog:1.18 Wed May 25 06:19:22 2011
+++ rtems/c/src/lib/libcpu/bfin/ChangeLog Tue Jun 7 02:54:25 2011
@@ -1,3 +1,8 @@
+2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * cache/cache_.h: Include required header file.
+ * cache/cache.c: Removed superfuous header file.
+
2011-05-25 Ralf Corsépius <ralf.corsepius at rtems.org>
* serial/uart.c, serial/uart.h: Remove CVS-Author tag.
diff -u rtems/c/src/lib/libcpu/bfin/cache/cache.c:1.2 rtems/c/src/lib/libcpu/bfin/cache/cache.c:1.3
--- rtems/c/src/lib/libcpu/bfin/cache/cache.c:1.2 Sun Nov 29 23:03:49 2009
+++ rtems/c/src/lib/libcpu/bfin/cache/cache.c Tue Jun 7 02:54:26 2011
@@ -13,7 +13,6 @@
#include <rtems.h>
#include <bsp.h>
-#include <libcpu/cache.h>
#include <libcpu/memoryRegs.h>
#include "cache_.h"
diff -u rtems/c/src/lib/libcpu/bfin/cache/cache_.h:1.1 rtems/c/src/lib/libcpu/bfin/cache/cache_.h:1.2
--- rtems/c/src/lib/libcpu/bfin/cache/cache_.h:1.1 Fri Aug 15 15:18:40 2008
+++ rtems/c/src/lib/libcpu/bfin/cache/cache_.h Tue Jun 7 02:54:26 2011
@@ -7,6 +7,8 @@
#ifndef _cache__h_
#define _cache__h_
+#include <libcpu/cache.h>
+
#define CPU_DATA_CACHE_ALIGNMENT 32
#define CPU_INSTRUCTION_CACHE_ALIGNMENT 32
*sh*:
2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
* shared/include/cache_.h: Moved content of "cache.h" to "cache_.h".
* shared/include/cache.h: Removed file.
M 1.79 c/src/lib/libcpu/arm/ChangeLog
R 1.2 c/src/lib/libcpu/arm/shared/include/cache.h
M 1.2 c/src/lib/libcpu/arm/shared/include/cache_.h
diff -u rtems/c/src/lib/libcpu/arm/ChangeLog:1.78 rtems/c/src/lib/libcpu/arm/ChangeLog:1.79
--- rtems/c/src/lib/libcpu/arm/ChangeLog:1.78 Fri Feb 11 03:32:25 2011
+++ rtems/c/src/lib/libcpu/arm/ChangeLog Tue Jun 7 02:58:16 2011
@@ -1,3 +1,8 @@
+2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * shared/include/cache_.h: Moved content of "cache.h" to "cache_.h".
+ * shared/include/cache.h: Removed file.
+
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* pxa255/pmc/pmc.c, shared/include/arm-cp15.h:
diff -u rtems/c/src/lib/libcpu/arm/shared/include/cache_.h:1.1 rtems/c/src/lib/libcpu/arm/shared/include/cache_.h:1.2
--- rtems/c/src/lib/libcpu/arm/shared/include/cache_.h:1.1 Tue Jan 12 09:03:22 2010
+++ rtems/c/src/lib/libcpu/arm/shared/include/cache_.h Tue Jun 7 02:58:16 2011
@@ -3,25 +3,132 @@
*
* @ingroup arm
*
- * @brief Empty file.
+ * @brief ARM cache defines and implementation.
*/
/*
- * Copyright (c) 2009
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems at embedded-brains.de>
+ * Copyright (c) 2009-2011 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems at embedded-brains.de>
*
* 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$
*/
#ifndef LIBCPU_ARM_CACHE__H
#define LIBCPU_ARM_CACHE__H
-/* Empty */
+#ifdef __ARM_ARCH_5TEJ__
+ #include <libcpu/arm-cp15.h>
+
+ #define CPU_DATA_CACHE_ALIGNMENT 32
+ #define CPU_INSTRUCTION_CACHE_ALIGNMENT 32
+
+ static inline void _CPU_cache_flush_1_data_line(const void *d_addr)
+ {
+ arm_cp15_data_cache_clean_line(d_addr);
+ }
+
+ static inline void _CPU_cache_invalidate_1_data_line(const void *d_addr)
+ {
+ arm_cp15_data_cache_invalidate_line(d_addr);
+ }
+
+ static inline void _CPU_cache_freeze_data(void)
+ {
+ /* TODO */
+ }
+
+ static inline void _CPU_cache_unfreeze_data(void)
+ {
+ /* TODO */
+ }
+
+ static inline void _CPU_cache_invalidate_1_instruction_line(const void *d_addr)
+ {
+ arm_cp15_instruction_cache_invalidate_line(d_addr);
+ }
+
+ static inline void _CPU_cache_freeze_instruction(void)
+ {
+ /* TODO */
+ }
+
+ static inline void _CPU_cache_unfreeze_instruction(void)
+ {
+ /* TODO */
+ }
+
+ static inline void _CPU_cache_flush_entire_data(void)
+ {
+ arm_cp15_data_cache_test_and_clean();
+ }
+
+ static inline void _CPU_cache_invalidate_entire_data(void)
+ {
+ arm_cp15_data_cache_invalidate();
+ }
+
+ static inline void _CPU_cache_enable_data(void)
+ {
+ rtems_interrupt_level level;
+ uint32_t ctrl;
+
+ rtems_interrupt_disable(level);
+ ctrl = arm_cp15_get_control();
+ ctrl |= ARM_CP15_CTRL_C;
+ arm_cp15_set_control(ctrl);
+ rtems_interrupt_enable(level);
+ }
+
+ static inline void _CPU_cache_disable_data(void)
+ {
+ rtems_interrupt_level level;
+ uint32_t ctrl;
+
+ rtems_interrupt_disable(level);
+ arm_cp15_data_cache_test_and_clean_and_invalidate();
+ ctrl = arm_cp15_get_control();
+ ctrl &= ~ARM_CP15_CTRL_C;
+ arm_cp15_set_control(ctrl);
+ rtems_interrupt_enable(level);
+ }
+
+ static inline void _CPU_cache_invalidate_entire_instruction(void)
+ {
+ arm_cp15_instruction_cache_invalidate();
+ }
+
+ static inline void _CPU_cache_enable_instruction(void)
+ {
+ rtems_interrupt_level level;
+ uint32_t ctrl;
+
+ rtems_interrupt_disable(level);
+ ctrl = arm_cp15_get_control();
+ ctrl |= ARM_CP15_CTRL_I;
+ arm_cp15_set_control(ctrl);
+ rtems_interrupt_enable(level);
+ }
+
+ static inline void _CPU_cache_disable_instruction(void)
+ {
+ rtems_interrupt_level level;
+ uint32_t ctrl;
+
+ rtems_interrupt_disable(level);
+ ctrl = arm_cp15_get_control();
+ ctrl &= ~ARM_CP15_CTRL_I;
+ arm_cp15_set_control(ctrl);
+ rtems_interrupt_enable(level);
+ }
+#endif
#endif /* LIBCPU_ARM_CACHE__H */
*sh*:
2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
* Makefile.am, preinstall.am: Cache manager changes.
M 1.68 c/src/lib/libbsp/arm/lpc24xx/ChangeLog
M 1.33 c/src/lib/libbsp/arm/lpc24xx/Makefile.am
M 1.22 c/src/lib/libbsp/arm/lpc24xx/preinstall.am
M 1.31 c/src/lib/libbsp/arm/lpc32xx/ChangeLog
M 1.11 c/src/lib/libbsp/arm/lpc32xx/Makefile.am
M 1.10 c/src/lib/libbsp/arm/lpc32xx/preinstall.am
diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.67 rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.68
--- rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog:1.67 Thu May 19 07:30:00 2011
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/ChangeLog Tue Jun 7 03:00:14 2011
@@ -1,3 +1,7 @@
+2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * Makefile.am, preinstall.am: Cache manager changes.
+
2011-05-19 Sebastian Huber <sebastian.huber at embedded-brains.de>
* i2c/i2c-config.c: New file.
diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/Makefile.am:1.32 rtems/c/src/lib/libbsp/arm/lpc24xx/Makefile.am:1.33
--- rtems/c/src/lib/libbsp/arm/lpc24xx/Makefile.am:1.32 Thu May 19 07:30:00 2011
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/Makefile.am Tue Jun 7 03:00:14 2011
@@ -12,7 +12,6 @@
include $(top_srcdir)/../../../../automake/compile.am
include_bspdir = $(includedir)/bsp
-include_libcpudir = $(includedir)/libcpu
dist_project_lib_DATA = bsp_specs
@@ -53,8 +52,6 @@
include_HEADERS += ../../shared/include/tm27.h
-include_libcpu_HEADERS = ../../../libcpu/arm/shared/include/cache.h
-
###############################################################################
# Data #
###############################################################################
diff -u rtems/c/src/lib/libbsp/arm/lpc24xx/preinstall.am:1.21 rtems/c/src/lib/libbsp/arm/lpc24xx/preinstall.am:1.22
--- rtems/c/src/lib/libbsp/arm/lpc24xx/preinstall.am:1.21 Thu May 19 07:30:00 2011
+++ rtems/c/src/lib/libbsp/arm/lpc24xx/preinstall.am Tue Jun 7 03:00:14 2011
@@ -33,11 +33,6 @@
@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/libcpu
- @: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
-
$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
@@ -150,10 +145,6 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-$(PROJECT_INCLUDE)/libcpu/cache.h: ../../../libcpu/arm/shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
-
$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.30 rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.31
--- rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog:1.30 Thu May 19 07:11:35 2011
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/ChangeLog Tue Jun 7 03:00:29 2011
@@ -1,3 +1,7 @@
+2011-06-07 Sebastian Huber <sebastian.huber at embedded-brains.de>
+
+ * Makefile.am, preinstall.am: Cache manager changes.
+
2011-05-19 Sebastian Huber <sebastian.huber at embedded-brains.de>
* Makefile.am, preinstall.am: Install new header files.
diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/Makefile.am:1.10 rtems/c/src/lib/libbsp/arm/lpc32xx/Makefile.am:1.11
--- rtems/c/src/lib/libbsp/arm/lpc32xx/Makefile.am:1.10 Thu May 19 07:11:35 2011
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/Makefile.am Tue Jun 7 03:00:29 2011
@@ -51,8 +51,7 @@
include_bsp_HEADERS += include/i2c.h
include_bsp_HEADERS += include/emc.h
-include_libcpu_HEADERS = ../../../libcpu/arm/shared/include/cache.h \
- ../../../libcpu/arm/shared/include/arm-cp15.h
+include_libcpu_HEADERS = ../../../libcpu/arm/shared/include/arm-cp15.h
###############################################################################
# Data #
diff -u rtems/c/src/lib/libbsp/arm/lpc32xx/preinstall.am:1.9 rtems/c/src/lib/libbsp/arm/lpc32xx/preinstall.am:1.10
--- rtems/c/src/lib/libbsp/arm/lpc32xx/preinstall.am:1.9 Thu May 19 07:11:35 2011
+++ rtems/c/src/lib/libbsp/arm/lpc32xx/preinstall.am Tue Jun 7 03:00:30 2011
@@ -146,10 +146,6 @@
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/emc.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/emc.h
-$(PROJECT_INCLUDE)/libcpu/cache.h: ../../../libcpu/arm/shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
-
$(PROJECT_INCLUDE)/libcpu/arm-cp15.h: ../../../libcpu/arm/shared/include/arm-cp15.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110607/dfcc429f/attachment.html>
More information about the vc
mailing list