diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-04-11 10:32:14 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2012-04-11 11:24:41 +0200 |
| commit | 2d0ca00003d5093f8811fbe9be7ef331d23b6aa2 (patch) | |
| tree | ae789ff046405b351f66c5e89a67d7a379f59273 /cpukit | |
| parent | rbheap: New files (diff) | |
| download | rtems-2d0ca00003d5093f8811fbe9be7ef331d23b6aa2.tar.bz2 | |
nios2: API change
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/score/cpu/nios2/nios2-mpu-add-region.c | 2 | ||||
| -rw-r--r-- | cpukit/score/cpu/nios2/nios2-mpu-descriptor.c | 2 | ||||
| -rw-r--r-- | cpukit/score/cpu/nios2/rtems/score/nios2-utility.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cpukit/score/cpu/nios2/nios2-mpu-add-region.c b/cpukit/score/cpu/nios2/nios2-mpu-add-region.c index d23769c48b..1d7799c48a 100644 --- a/cpukit/score/cpu/nios2/nios2-mpu-add-region.c +++ b/cpukit/score/cpu/nios2/nios2-mpu-add-region.c @@ -80,7 +80,7 @@ bool _Nios2_MPU_Add_region( uint32_t mpubase = 0; uint32_t mpuacc = 0; - if ( _Nios2_MPU_Is_valid_index( config, data, index ) ) { + if ( _Nios2_MPU_Is_valid_index( config, index, data ) ) { if ( !force ) { _Nios2_MPU_Get_region_registers( index, data, &mpubase, &mpuacc ); ok = _Nios2_MPU_Is_region_disabled( config, mpubase, mpuacc ); diff --git a/cpukit/score/cpu/nios2/nios2-mpu-descriptor.c b/cpukit/score/cpu/nios2/nios2-mpu-descriptor.c index 1aee1c40ea..2c5231340f 100644 --- a/cpukit/score/cpu/nios2/nios2-mpu-descriptor.c +++ b/cpukit/score/cpu/nios2/nios2-mpu-descriptor.c @@ -88,7 +88,7 @@ bool _Nios2_MPU_Setup_region_registers( &mask_or_limit ); bool ok = is_valid_base_and_end - && _Nios2_MPU_Is_valid_index( config, desc->data, desc->index ) + && _Nios2_MPU_Is_valid_index( config, desc->index, desc->data ) && _Nios2_Is_valid_permission( desc->data, desc->perm ) && !(!desc->data && desc->cacheable) && !(desc->read && desc->write); diff --git a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h b/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h index 7327e8c7e8..9702feb060 100644 --- a/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h +++ b/cpukit/score/cpu/nios2/rtems/score/nios2-utility.h @@ -386,8 +386,8 @@ static inline int _Nios2_MPU_Get_region_count( static inline bool _Nios2_MPU_Is_valid_index( const Nios2_MPU_Configuration *config, - bool data, - int index + int index, + bool data ) { return 0 <= index |