riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4023 from ks156/typo

Browse Source 
cpu/lpc11u34: Fixed typo
This commit is contained in:
Thomas Eichinger 2015-10-02 16:54:20 +02:00
commit fcdcfa10e8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cpu/lpc11u34/periph/gpio.c
View File

@ -28,7 +28,7 @@ typedef struct {
} gpio_state_t; } gpio_state_t;
/* Static IOCON registers definition */ /* Static IOCON registers definition */
volatile uint32_t * const lpc_pin_registersS[] = { volatile uint32_t * const lpc_pin_registers[] = {
/* PORT 0 (PIO0_0 -> PIO0_23) */ /* PORT 0 (PIO0_0 -> PIO0_23) */
&LPC_IOCON->RESET_PIO0_0, &LPC_IOCON->PIO0_1, &LPC_IOCON->RESET_PIO0_0, &LPC_IOCON->PIO0_1,
&LPC_IOCON->PIO0_2, &LPC_IOCON->PIO0_3, &LPC_IOCON->PIO0_2, &LPC_IOCON->PIO0_3,
@ -280,16 +280,16 @@ int gpio_init(gpio_t dev, gpio_dir_t dir, gpio_pp_t pullup)
pin = gpio_pin_map[dev]; pin = gpio_pin_map[dev];
/* Put pin in the primary function */ /* Put pin in the primary function */
*lpc_pin_registersS[pin + (port * 24)] = *lpc_pin_registersS[pin + (port * 24)] & ~(0x07); *lpc_pin_registers[pin + (port * 24)] = *lpc_pin_registers[pin + (port * 24)] & ~(0x07);
/* Disable resistors */ /* Disable resistors */
*lpc_pin_registersS[pin + (port * 24)] &= ~(3 << 3); *lpc_pin_registers[pin + (port * 24)] &= ~(3 << 3);
/* Set resistors */ /* Set resistors */
if (pullup == GPIO_PULLUP) { if (pullup == GPIO_PULLUP) {
*lpc_pin_registersS[pin + (port * 24)] |= (2 << 3); *lpc_pin_registers[pin + (port * 24)] |= (2 << 3);
} }
else if (pullup == GPIO_PULLDOWN) { else if (pullup == GPIO_PULLDOWN) {
*lpc_pin_registersS[pin + (port * 24)] |= (1 << 3); *lpc_pin_registers[pin + (port * 24)] |= (1 << 3);
} }
/* Set direction */ /* Set direction */