Changeset 5e77d129 in rtems for c/src/lib/libcpu/powerpc/shared/src

Timestamp:

Jun 14, 2000, 8:32:44 PM (21 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

b91b1cf

Parents:

9b05600

Message:

Patch from John Cotton <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.

Location:

c/src/lib/libcpu/powerpc/shared/src

Files:

• cache.c (modified) (11 diffs)
• cache_.h (modified) (1 diff)

c/src/lib/libcpu/powerpc/shared/src/cache.c

@@ -43 +43 @@
   } while (0)
 
-void _CPU_enable_data_cache (
+void _CPU_cache_enable_data (
         void )
 {
@@ -52 +52 @@
 }
 
-void _CPU_disable_data_cache (
+void _CPU_cache_disable_data (
         void )
 {
@@ -61 +61 @@
 }
 
-void _CPU_enable_inst_cache (
+void _CPU_cache_enable_inst (
         void )
 {
@@ -70 +70 @@
 }
 
-void _CPU_disable_inst_cache (
+void _CPU_cache_disable_inst (
         void )
 {
@@ -86 +86 @@
   __asm__ volatile ("isync\n"::)
 
-void _CPU_flush_1_data_cache_line(
+void _CPU_cache_flush_1_data_line(
         const void * _address )
 {
@@ -93 +93 @@
 }
 
-void _CPU_invalidate_1_data_cache_line(
+void _CPU_cache_invalidate_1_data_line(
         const void * _address )
 {
@@ -100 +100 @@
 }
 
-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;
@@ -113 +113 @@
 }
 
-void _CPU_disable_data_cache ( void )
+void _CPU_cache_disable_data ( void )
 {
   unsigned32 r1;
@@ -121 +121 @@
 }
 
-void _CPU_invalidate_1_inst_cache_line(
+void _CPU_cache_invalidate_1_inst_line(
         const void * _address )
 {
@@ -128 +128 @@
 }
 
-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;
@@ -140 +140 @@
 }
 
-void _CPU_disable_inst_cache ( void )
+void _CPU_cache_disable_inst ( void )
 {
   unsigned32 r1;

c/src/lib/libcpu/powerpc/shared/src/cache_.h

@@ -16 +16 @@
 
 #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