This is the mail archive of the
ecos-patches@sourceware.org
mailing list for the eCos project.
expunge CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE
- From: Bart Veer <bartv at ecoscentric dot com>
- To: ecos-patches at sourceware dot org
- Date: Thu, 20 Nov 2008 21:46:55 +0000
- Subject: expunge CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE
As per http://ecos.sourceware.org/ml/ecos-devel/2004-08/msg00001.html
and bugzilla report 1000113, this patch finally expunges
CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE and the corresponding code. The
latter has never worked and has probably never been used. It should
make RedBoot a little bit smaller.
Bart
2008-11-20 Bart Veer <bartv@ecoscentric.com>
* cdl/hal.cdl, include/hal_if.h, src/hal_if.c: expunge
CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE and the corresponding code.
Index: cdl/hal.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/cdl/hal.cdl,v
retrieving revision 1.22
diff -u -p -r1.22 hal.cdl
--- cdl/hal.cdl 11 Nov 2008 04:28:57 -0000 1.22
+++ cdl/hal.cdl 20 Nov 2008 21:42:10 -0000
@@ -248,7 +248,6 @@ cdl_package CYGPKG_HAL {
default_value { CYG_HAL_STARTUP != "RAM" || !CYGSEM_HAL_USE_ROM_MONITOR }
requires CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_RESET
requires CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_DELAY_US
- requires CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE
requires CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_DATA
requires CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_COMMS
description "
@@ -323,15 +322,6 @@ cdl_package CYGPKG_HAL {
virtual vector to be claimed."
}
- cdl_option CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE {
- display "Claim cache virtual vectors"
- default_value { CYGSEM_HAL_VIRTUAL_VECTOR_INIT_WHOLE_TABLE \
- || CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_DEFAULT }
- description "
- This option will cause the cache virtual vectors
- to be claimed."
- }
-
cdl_option CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_DATA {
display "Claim data virtual vectors"
default_value { CYGSEM_HAL_VIRTUAL_VECTOR_INIT_WHOLE_TABLE \
Index: include/hal_if.h
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/include/hal_if.h,v
retrieving revision 1.26
diff -u -p -r1.26 hal_if.h
--- include/hal_if.h 27 Jun 2007 01:51:29 -0000 1.26
+++ include/hal_if.h 20 Nov 2008 21:42:28 -0000
@@ -351,8 +351,8 @@ __call_COMM1(IF_GETC_TIMEOUT, cyg_bool,
#define CYGNUM_CALL_IF_KILL_VECTOR 4
#define CYGNUM_CALL_IF_CONSOLE_PROCS 5
#define CYGNUM_CALL_IF_DEBUG_PROCS 6
-#define CYGNUM_CALL_IF_FLUSH_DCACHE 7
-#define CYGNUM_CALL_IF_FLUSH_ICACHE 8
+#define CYGNUM_CALL_IF_available_7 9
+#define CYGNUM_CALL_IF_available_8 9
#define CYGNUM_CALL_IF_available_9 9
#define CYGNUM_CALL_IF_available_10 10
#define CYGNUM_CALL_IF_available_11 11
@@ -413,8 +413,6 @@ typedef bsp_handler_t *__call_if_dbg_vec
typedef bsp_handler_t __call_if_kill_vector_t;
typedef hal_virtual_comm_table_t *__call_if_console_procs_t;
typedef hal_virtual_comm_table_t *__call_if_debug_procs_t;
-typedef void (__call_if_flush_dcache_t)(void *__p, int __nbytes);
-typedef void (__call_if_flush_icache_t)(void *__p, int __nbytes);
typedef int (__call_if_set_debug_comm_t)(int __comm_id);
typedef int (__call_if_set_console_comm_t)(int __comm_id);
typedef void* __call_if_dbg_data_t;
@@ -591,16 +589,6 @@ __data_VV(CYGNUM_CALL_IF_CONSOLE_PROCS,
#define CYGACC_CALL_IF_CONSOLE_PROCS_SET(_x_) \
hal_virtual_vector_table[CYGNUM_CALL_IF_CONSOLE_PROCS]=(CYG_ADDRWORD)(_x_)
-#define CYGACC_CALL_IF_FLUSH_DCACHE(_p_, _n_) \
- ((__call_if_flush_dcache_t*)hal_virtual_vector_table[CYGNUM_CALL_IF_FLUSH_DCACHE])((_p_), (_n_))
-#define CYGACC_CALL_IF_FLUSH_DCACHE_SET(_x_) \
- hal_virtual_vector_table[CYGNUM_CALL_IF_FLUSH_DCACHE]=(CYG_ADDRWORD)(_x_)
-
-#define CYGACC_CALL_IF_FLUSH_ICACHE(_p_, _n_) \
- ((__call_if_flush_icache_t*)hal_virtual_vector_table[CYGNUM_CALL_IF_FLUSH_ICACHE])((_p_), (_n_))
-#define CYGACC_CALL_IF_FLUSH_ICACHE_SET(_x_) \
- hal_virtual_vector_table[CYGNUM_CALL_IF_FLUSH_ICACHE]=(CYG_ADDRWORD)(_x_)
-
#define CYGACC_CALL_IF_DEBUG_PROCS() \
CYGACC_DATA_VV(__call_if_debug_procs_t, CYGNUM_CALL_IF_DEBUG_PROCS)
__data_VV(CYGNUM_CALL_IF_DEBUG_PROCS, __call_if_debug_procs_t)
Index: src/hal_if.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/src/hal_if.c,v
retrieving revision 1.31
diff -u -p -r1.31 hal_if.c
--- src/hal_if.c 11 Nov 2008 04:28:57 -0000 1.31
+++ src/hal_if.c 20 Nov 2008 21:42:47 -0000
@@ -527,35 +527,6 @@ set_console_comm(int __comm_id)
}
#endif
-//----------------------------------
-// Cache functions
-#ifdef CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE
-
-static void
-flush_icache(void *__p, int __nbytes)
-{
- CYGARC_HAL_SAVE_GP();
-#ifdef HAL_ICACHE_FLUSH
- HAL_ICACHE_FLUSH( __p , __nbytes );
-#elif defined(HAL_ICACHE_INVALIDATE)
- HAL_ICACHE_INVALIDATE();
-#endif
- CYGARC_HAL_RESTORE_GP();
-}
-
-static void
-flush_dcache(void *__p, int __nbytes)
-{
- CYGARC_HAL_SAVE_GP();
-#ifdef HAL_DCACHE_FLUSH
- HAL_DCACHE_FLUSH( __p , __nbytes );
-#elif defined(HAL_DCACHE_INVALIDATE)
- HAL_DCACHE_INVALIDATE();
-#endif
- CYGARC_HAL_RESTORE_GP();
-}
-#endif
-
#if defined(CYGSEM_HAL_VIRTUAL_VECTOR_DIAG)
//-----------------------------------------------------------------------------
// GDB console output mangler (O-packetizer)
@@ -1056,12 +1027,6 @@ hal_if_init(void)
CYGACC_CALL_IF_DELAY_US_SET(delay_us);
#endif
-#ifdef CYGSEM_HAL_VIRTUAL_VECTOR_CLAIM_CACHE
- // Cache functions
- CYGACC_CALL_IF_FLUSH_ICACHE_SET(flush_icache);
- CYGACC_CALL_IF_FLUSH_DCACHE_SET(flush_dcache);
-#endif
-
#ifdef CYGSEM_REDBOOT_FLASH_CONFIG
CYGACC_CALL_IF_FLASH_CFG_OP_SET(flash_config_op);
#endif