diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-18 08:03:05 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-05-20 07:50:34 +0200 |
commit | 4b04cb61552dbaa1a42a64e2f7b823708127e488 (patch) | |
tree | 700d7664a80736281f4d266413c4a020ff2a996c /c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h | |
parent | score: _Thread_Dispatch_increment_disable_level() (diff) | |
download | rtems-4b04cb61552dbaa1a42a64e2f7b823708127e488.tar.bz2 |
score: Rename _ISR_Disable_without_giant()
Rename _ISR_Disable_without_giant() into _ISR_Local_disable(). Rename
_ISR_Enable_without_giant() into _ISR_Local_enable().
This is a preparation to remove the Giant lock.
Update #2555.
Diffstat (limited to 'c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h')
-rw-r--r-- | c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h b/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h index b8dc5f40ce..ce4068fdd3 100644 --- a/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h +++ b/c/src/lib/libcpu/powerpc/shared/include/powerpc-utility.h @@ -588,11 +588,11 @@ static inline void ppc_set_decrementer_register(uint32_t dec) ISR_Level level; \ uint32_t val; \ uint32_t mybits = bits; \ - _ISR_Disable_without_giant(level); \ + _ISR_Local_disable(level); \ val = PPC_SPECIAL_PURPOSE_REGISTER(spr); \ val |= mybits; \ PPC_SET_SPECIAL_PURPOSE_REGISTER(spr, val); \ - _ISR_Enable_without_giant(level); \ + _ISR_Local_enable(level); \ } while (0) /** @@ -608,12 +608,12 @@ static inline void ppc_set_decrementer_register(uint32_t dec) uint32_t val; \ uint32_t mybits = bits; \ uint32_t mymask = mask; \ - _ISR_Disable_without_giant(level); \ + _ISR_Local_disable(level); \ val = PPC_SPECIAL_PURPOSE_REGISTER(spr); \ val &= ~mymask; \ val |= mybits; \ PPC_SET_SPECIAL_PURPOSE_REGISTER(spr, val); \ - _ISR_Enable_without_giant(level); \ + _ISR_Local_enable(level); \ } while (0) /** @@ -627,11 +627,11 @@ static inline void ppc_set_decrementer_register(uint32_t dec) ISR_Level level; \ uint32_t val; \ uint32_t mybits = bits; \ - _ISR_Disable_without_giant(level); \ + _ISR_Local_disable(level); \ val = PPC_SPECIAL_PURPOSE_REGISTER(spr); \ val &= ~mybits; \ PPC_SET_SPECIAL_PURPOSE_REGISTER(spr, val); \ - _ISR_Enable_without_giant(level); \ + _ISR_Local_enable(level); \ } while (0) /** @@ -705,11 +705,11 @@ static inline void ppc_set_decrementer_register(uint32_t dec) ISR_Level level; \ uint32_t val; \ uint32_t mybits = bits; \ - _ISR_Disable_without_giant(level); \ + _ISR_Local_disable(level); \ val = PPC_DEVICE_CONTROL_REGISTER(dcr); \ val |= mybits; \ PPC_SET_DEVICE_CONTROL_REGISTER(dcr, val); \ - _ISR_Enable_without_giant(level); \ + _ISR_Local_enable(level); \ } while (0) /** @@ -725,12 +725,12 @@ static inline void ppc_set_decrementer_register(uint32_t dec) uint32_t val; \ uint32_t mybits = bits; \ uint32_t mymask = mask; \ - _ISR_Disable_without_giant(level); \ + _ISR_Local_disable(level); \ val = PPC_DEVICE_CONTROL_REGISTER(dcr); \ val &= ~mymask; \ val |= mybits; \ PPC_SET_DEVICE_CONTROL_REGISTER(dcr, val); \ - _ISR_Enable_without_giant(level); \ + _ISR_Local_enable(level); \ } while (0) /** @@ -744,11 +744,11 @@ static inline void ppc_set_decrementer_register(uint32_t dec) ISR_Level level; \ uint32_t val; \ uint32_t mybits = bits; \ - _ISR_Disable_without_giant(level); \ + _ISR_Local_disable(level); \ val = PPC_DEVICE_CONTROL_REGISTER(dcr); \ val &= ~mybits; \ PPC_SET_DEVICE_CONTROL_REGISTER(dcr, val); \ - _ISR_Enable_without_giant(level); \ + _ISR_Local_enable(level); \ } while (0) static inline uint32_t ppc_time_base(void) |