diff options
Diffstat (limited to 'c')
4 files changed, 13 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.h b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.h index 7a444a58b0..9097e68478 100644 --- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.h +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/cpu.h @@ -850,7 +850,7 @@ void _CPU_ISR_install_raw_handler( #define CPU_Get_timebase_low( _value ) \ asm volatile( "mftb %0" : "=r" (_value) ) -#define delay( _microseconds ) \ +#define rtems_bsp_delay( _microseconds ) \ do { \ unsigned32 start, ticks, now; \ CPU_Get_timebase_low( start ) ; \ @@ -860,7 +860,7 @@ void _CPU_ISR_install_raw_handler( while (now - start < ticks); \ } while (0) -#define delay_in_bus_cycles( _cycles ) \ +#define rtems_bsp_delay_in_bus_cycles( _cycles ) \ do { \ unsigned32 start, now; \ CPU_Get_timebase_low( start ); \ diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 3222b1f304..d04e329f5f 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,10 @@ +2001-09-27 Joel Sherrill <joel@OARcorp.com> + + * old_exception_processing/cpu.h: Renamed delay() to rtems_bsp_delay(). + Renamed delay_in_bus_cycles() to rtems_bsp_delay_in_bus_cycles(). + * shared/include/cpu.h: Renamed delay() to rtems_bsp_delay(). + Renamed delay_in_bus_cycles() to rtems_bsp_delay_in_bus_cycles(). + 2001-09-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * new_exception_processing/Makefile.am: Use 'PREINSTALL_FILES ='. diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/cpu.h b/c/src/lib/libcpu/powerpc/old_exception_processing/cpu.h index 7a444a58b0..9097e68478 100644 --- a/c/src/lib/libcpu/powerpc/old_exception_processing/cpu.h +++ b/c/src/lib/libcpu/powerpc/old_exception_processing/cpu.h @@ -850,7 +850,7 @@ void _CPU_ISR_install_raw_handler( #define CPU_Get_timebase_low( _value ) \ asm volatile( "mftb %0" : "=r" (_value) ) -#define delay( _microseconds ) \ +#define rtems_bsp_delay( _microseconds ) \ do { \ unsigned32 start, ticks, now; \ CPU_Get_timebase_low( start ) ; \ @@ -860,7 +860,7 @@ void _CPU_ISR_install_raw_handler( while (now - start < ticks); \ } while (0) -#define delay_in_bus_cycles( _cycles ) \ +#define rtems_bsp_delay_in_bus_cycles( _cycles ) \ do { \ unsigned32 start, now; \ CPU_Get_timebase_low( start ); \ diff --git a/c/src/lib/libcpu/powerpc/shared/include/cpu.h b/c/src/lib/libcpu/powerpc/shared/include/cpu.h index 374ea6c54c..342d947f05 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/cpu.h +++ b/c/src/lib/libcpu/powerpc/shared/include/cpu.h @@ -293,7 +293,7 @@ static inline void PPC_Set_timebase_register (unsigned long long tbr) #define CPU_Get_timebase_low( _value ) \ asm volatile( "mftb %0" : "=r" (_value) ) -#define delay( _microseconds ) \ +#define rtems_bsp_delay( _microseconds ) \ do { \ unsigned32 start, ticks, now; \ CPU_Get_timebase_low( start ) ; \ @@ -303,7 +303,7 @@ static inline void PPC_Set_timebase_register (unsigned long long tbr) while (now - start < ticks); \ } while (0) -#define delay_in_bus_cycles( _cycles ) \ +#define rtems_bsp_delay_in_bus_cycles( _cycles ) \ do { \ unsigned32 start, now; \ CPU_Get_timebase_low( start ); \ |