From 5e77d12951fa5ce199fecebd56650558313c8aad Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 14 Jun 2000 20:32:44 +0000 Subject: Patch from John Cotton to correct cache routine naming to follow RTEMS package/object.method rule. This patch also eliminated calls to the obsolete routine m68k_enable_caching. --- .../mpc8xx/console-generic/console-generic.c | 16 +++++----- c/src/lib/libcpu/powerpc/shared/src/cache.c | 36 +++++++++++----------- c/src/lib/libcpu/powerpc/shared/src/cache_.h | 8 ++--- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'c/src/lib/libcpu/powerpc') diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c index 0f25b297b4..3349c86dd1 100644 --- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c +++ b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c @@ -399,7 +399,7 @@ m8xx_scc2_interrupt_handler (rtems_vector_number v) /* Check that the buffer is ours */ if ((RxBd[SCC2_MINOR]->status & M8xx_BD_EMPTY) == 0) { - rtems_invalidate_multiple_data_cache_lines( + rtems_cache_invalidate_multiple_data_lines( (const void *) RxBd[SCC2_MINOR]->buffer, RxBd[SCC2_MINOR]->length ); nb_overflow = rtems_termios_enqueue_raw_characters( @@ -442,7 +442,7 @@ m8xx_scc3_interrupt_handler (rtems_vector_number v) /* Check that the buffer is ours */ if ((RxBd[SCC3_MINOR]->status & M8xx_BD_EMPTY) == 0) { - rtems_invalidate_multiple_data_cache_lines( + rtems_cache_invalidate_multiple_data_lines( (const void *) RxBd[SCC3_MINOR]->buffer, RxBd[SCC3_MINOR]->length ); nb_overflow = rtems_termios_enqueue_raw_characters( @@ -484,7 +484,7 @@ m8xx_scc4_interrupt_handler (rtems_vector_number v) /* Check that the buffer is ours */ if ((RxBd[SCC4_MINOR]->status & M8xx_BD_EMPTY) == 0) { - rtems_invalidate_multiple_data_cache_lines( + rtems_cache_invalidate_multiple_data_lines( (const void *) RxBd[SCC4_MINOR]->buffer, RxBd[SCC4_MINOR]->length ); nb_overflow = rtems_termios_enqueue_raw_characters( @@ -526,7 +526,7 @@ m8xx_smc1_interrupt_handler (rtems_vector_number v) /* Check that the buffer is ours */ if ((RxBd[SMC1_MINOR]->status & M8xx_BD_EMPTY) == 0) { - rtems_invalidate_multiple_data_cache_lines( + rtems_cache_invalidate_multiple_data_lines( (const void *) RxBd[SMC1_MINOR]->buffer, RxBd[SMC1_MINOR]->length ); nb_overflow = rtems_termios_enqueue_raw_characters( @@ -568,7 +568,7 @@ m8xx_smc2_interrupt_handler (rtems_vector_number v) /* Check that the buffer is ours */ if ((RxBd[SMC2_MINOR]->status & M8xx_BD_EMPTY) == 0) { - rtems_invalidate_multiple_data_cache_lines( + rtems_cache_invalidate_multiple_data_lines( (const void *) RxBd[SMC2_MINOR]->buffer, RxBd[SMC2_MINOR]->length ); nb_overflow = rtems_termios_enqueue_raw_characters( @@ -984,7 +984,7 @@ m8xx_uart_pollRead( if (RxBd[minor]->status & M8xx_BD_EMPTY) { return -1; } - rtems_invalidate_multiple_data_cache_lines( + rtems_cache_invalidate_multiple_data_lines( (const void *) RxBd[minor]->buffer, RxBd[minor]->length ); @@ -1004,7 +1004,7 @@ m8xx_uart_write( int len ) { - rtems_flush_multiple_data_cache_lines( buf, len ); + rtems_cache_flush_multiple_data_lines( buf, len ); TxBd[minor]->buffer = (char *) buf; TxBd[minor]->length = len; TxBd[minor]->status = M8xx_BD_READY | M8xx_BD_WRAP | M8xx_BD_INTERRUPT; @@ -1023,7 +1023,7 @@ m8xx_uart_pollWrite( while (TxBd[minor]->status & M8xx_BD_READY) continue; txBuf[minor] = *buf++; - rtems_flush_multiple_data_cache_lines( + rtems_cache_flush_multiple_data_lines( (const void *) TxBd[minor]->buffer, TxBd[minor]->length ); diff --git a/c/src/lib/libcpu/powerpc/shared/src/cache.c b/c/src/lib/libcpu/powerpc/shared/src/cache.c index 4bc824904e..bbd7000b0a 100644 --- a/c/src/lib/libcpu/powerpc/shared/src/cache.c +++ b/c/src/lib/libcpu/powerpc/shared/src/cache.c @@ -42,7 +42,7 @@ ); \ } while (0) -void _CPU_enable_data_cache ( +void _CPU_cache_enable_data ( void ) { unsigned32 value; @@ -51,7 +51,7 @@ void _CPU_enable_data_cache ( PPC_Set_HID0( value ); } -void _CPU_disable_data_cache ( +void _CPU_cache_disable_data ( void ) { unsigned32 value; @@ -60,7 +60,7 @@ void _CPU_disable_data_cache ( PPC_Set_HID0( value ); } -void _CPU_enable_inst_cache ( +void _CPU_cache_enable_inst ( void ) { unsigned32 value; @@ -69,7 +69,7 @@ void _CPU_enable_inst_cache ( PPC_Set_HID0( value ); } -void _CPU_disable_inst_cache ( +void _CPU_cache_disable_inst ( void ) { unsigned32 value; @@ -85,26 +85,26 @@ void _CPU_disable_inst_cache ( #define isync \ __asm__ volatile ("isync\n"::) -void _CPU_flush_1_data_cache_line( +void _CPU_cache_flush_1_data_line( const void * _address ) { register const void *__address = _address; asm volatile ( "dcbf 0,%0" :: "r" (__address) ); } -void _CPU_invalidate_1_data_cache_line( +void _CPU_cache_invalidate_1_data_line( const void * _address ) { register const void *__address = _address; asm volatile ( "dcbi 0,%0" :: "r" (__address) ); } -void _CPU_flush_entire_data_cache ( void ) {} -void _CPU_invalidate_entire_data_cache ( void ) {} -void _CPU_freeze_data_cache ( void ) {} -void _CPU_unfreeze_data_cache ( void ) {} +void _CPU_cache_flush_entire_data ( void ) {} +void _CPU_cache_invalidate_entire_data ( void ) {} +void _CPU_cache_freeze_data ( void ) {} +void _CPU_cache_unfreeze_data ( void ) {} -void _CPU_enable_data_cache ( void ) +void _CPU_cache_enable_data ( void ) { unsigned32 r1; r1 = (0x2<<24); @@ -112,7 +112,7 @@ void _CPU_enable_data_cache ( void ) isync; } -void _CPU_disable_data_cache ( void ) +void _CPU_cache_disable_data ( void ) { unsigned32 r1; r1 = (0x4<<24); @@ -120,18 +120,18 @@ void _CPU_disable_data_cache ( void ) isync; } -void _CPU_invalidate_1_inst_cache_line( +void _CPU_cache_invalidate_1_inst_line( const void * _address ) { register const void *__address = _address; asm volatile ( "icbi 0,%0" :: "r" (__address) ); } -void _CPU_invalidate_entire_inst_cache ( void ) {} -void _CPU_freeze_inst_cache ( void ) {} -void _CPU_unfreeze_inst_cache ( void ) {} +void _CPU_cache_invalidate_entire_inst ( void ) {} +void _CPU_cache_freeze_inst ( void ) {} +void _CPU_cache_unfreeze_inst ( void ) {} -void _CPU_enable_inst_cache ( void ) +void _CPU_cache_enable_inst ( void ) { unsigned32 r1; r1 = (0x2<<24); @@ -139,7 +139,7 @@ void _CPU_enable_inst_cache ( void ) isync; } -void _CPU_disable_inst_cache ( void ) +void _CPU_cache_disable_inst ( void ) { unsigned32 r1; r1 = (0x4<<24); diff --git a/c/src/lib/libcpu/powerpc/shared/src/cache_.h b/c/src/lib/libcpu/powerpc/shared/src/cache_.h index ab14ca9c40..bff8874587 100644 --- a/c/src/lib/libcpu/powerpc/shared/src/cache_.h +++ b/c/src/lib/libcpu/powerpc/shared/src/cache_.h @@ -15,13 +15,13 @@ */ #if defined(ppc603) /* And possibly others */ -#define _CPU_DATA_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT -#define _CPU_INST_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT +#define CPU_DATA_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT +#define CPU_INSTRUCTION_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT #elif ( defined(mpc860) || defined(mpc821) ) -#define _CPU_DATA_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT -#define _CPU_INST_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT +#define CPU_DATA_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT +#define CPU_INSTRUCTION_CACHE_ALIGNMENT PPC_CACHE_ALIGNMENT #endif -- cgit v1.2.3