diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1996-10-14 19:17:37 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1996-10-14 19:17:37 +0000 |
| commit | 2d0383b60e59c5ce66673de552be15ccc064d5fb (patch) | |
| tree | 454776b0f6f8486d86001ed1028f3fba42614342 /c/src/lib/libcpu/sparc | |
| parent | i386_nofp cpu model entry incorrectly had floating point enabled. (diff) | |
| download | rtems-2d0383b60e59c5ce66673de552be15ccc064d5fb.tar.bz2 | |
patches to erc32.h to correct handling of timer mirror from Jiri Gaisler.
Diffstat (limited to 'c/src/lib/libcpu/sparc')
| -rw-r--r-- | c/src/lib/libcpu/sparc/include/erc32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/c/src/lib/libcpu/sparc/include/erc32.h b/c/src/lib/libcpu/sparc/include/erc32.h index 12ec1d4230..16d5e3d476 100644 --- a/c/src/lib/libcpu/sparc/include/erc32.h +++ b/c/src/lib/libcpu/sparc/include/erc32.h @@ -427,7 +427,7 @@ extern ERC32_Register_Map ERC32_MEC; * 1 = enable counting * 0 = hold scaler and counter * - * D2 - Scaler Load + * D3 - Scaler Load * 1 = load scalar with preset value and restart * 0 = no function * @@ -469,7 +469,7 @@ extern unsigned32 _ERC32_MEC_Timer_Control_Mirror; sparc_disable_interrupts( _level ); \ _control = _ERC32_MEC_Timer_Control_Mirror; \ _control &= ERC32_MEC_TIMER_COUNTER_DEFINED_MASK << 8; \ - _ERC32_MEC_Timer_Control_Mirror = _control | _value; \ + _ERC32_MEC_Timer_Control_Mirror = _control | __value; \ _control &= (ERC32_MEC_TIMER_COUNTER_CURRENT_MODE_MASK << 8); \ _control |= __value; \ /* printf( "GPT 0x%x 0x%x 0x%x\n", _value, __value, _control ); */ \ @@ -479,7 +479,7 @@ extern unsigned32 _ERC32_MEC_Timer_Control_Mirror; #define ERC32_MEC_Get_General_Purpose_Timer_Control( _value ) \ do { \ - (_value) = _ERC32_MEC_Timer_Control_Mirror & 0xf; \ + (_value) = (_ERC32_MEC_Timer_Control_Mirror >> 8) & 0xf; \ } while ( 0 ) /* |