diff options
| author | Premysl Houdek <kom541000@gmail.com> | 2015-11-18 18:45:32 +0100 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2015-11-18 13:12:44 -0500 |
| commit | 3e1196d9e1e65f3a77bc4537934438f105b35d98 (patch) | |
| tree | 80d1f3a2920c61b629e29323065169e08106d1eb /c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c | |
| parent | bsp/tms570: use common tms570ls3137.inc file for all board ling variants. (diff) | |
| download | rtems-3e1196d9e1e65f3a77bc4537934438f105b35d98.tar.bz2 | |
bsp/tms570: unite code duplication in pinmux and clean SCI close per review remarks.
Signed-off-by: Premysl Houdek <kom541000@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c b/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c index 79d6b1e504..fed23fa9ec 100644 --- a/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c +++ b/c/src/lib/libbsp/arm/tms570/pinmux/pinmux.c @@ -31,7 +31,7 @@ * entries array. Predefined values for pins are in a format * TMS570_BALL_<column><row> (for example TMS570_BALL_N19). * The multiplexer allows to interconnect one pin to multiple - * signal sources/sings in the theory but it is usually bad choice. + * signal sources/sinks in the theory but it is usually bad choice. * The function sets only specified function and clears all other * connections. * @@ -45,16 +45,12 @@ void tms570_bsp_pin_set_function(int pin_num, int pin_fnc) { unsigned int pin_shift; - typeof(TMS570_IOMM.PINMUX.PINMMR0) *pinmmrx; + volatile uint32_t *pinmmrx; if ( pin_fnc == TMS570_PIN_FNC_AUTO ) { pin_fnc = (pin_num & TMS570_PIN_FNC_MASK) >> TMS570_PIN_FNC_SHIFT; } - pin_num = (pin_num & TMS570_PIN_NUM_MASK) >> TMS570_PIN_NUM_SHIFT; - - pinmmrx = &TMS570_IOMM.PINMUX.PINMMR0; - pinmmrx += (pin_num >> 2); - pin_shift = (pin_num & 0x3)*8; + tms570_bsp_pin_to_pinmmrx(&pinmmrx, &pin_shift, pin_num); *pinmmrx = (*pinmmrx & ~(0xff << pin_shift)) | (1 << (pin_fnc + pin_shift)); } @@ -74,15 +70,11 @@ void tms570_bsp_pin_clear_function(int pin_num, int pin_fnc) { unsigned int pin_shift; - typeof(TMS570_IOMM.PINMUX.PINMMR0) *pinmmrx; + volatile uint32_t *pinmmrx; if ( pin_fnc == TMS570_PIN_FNC_AUTO ) { pin_fnc = (pin_num & TMS570_PIN_FNC_MASK) >> TMS570_PIN_FNC_SHIFT; } - pin_num = (pin_num & TMS570_PIN_NUM_MASK) >> TMS570_PIN_NUM_SHIFT; - - pinmmrx = &TMS570_IOMM.PINMUX.PINMMR0; - pinmmrx += (pin_num >> 2); - pin_shift = (pin_num & 0x3)*8; + tms570_bsp_pin_to_pinmmrx(&pinmmrx, &pin_shift, pin_num); *pinmmrx = *pinmmrx & ~(1 << (pin_fnc+pin_shift)); } |