Skip to content

Commit 946cf74

Browse files
committed
Merge pull request #60 from jorisa/master
Fix MASKED_ACCESS bug in gpio_init
2 parents e03e337 + 743e178 commit 946cf74

File tree

1 file changed

+3
-3
lines changed
  • libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11CXX

1 file changed

+3
-3
lines changed

libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11CXX/gpio_api.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ uint32_t gpio_set(PinName pin) {
2828
(1) : (0);
2929

3030
pin_function(pin, f);
31-
return ((pin & 0x0F00) >> 8);
31+
return ((pin & 0x0F00) >> PIN_SHIFT);
3232
}
3333

3434
void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
3535
if(pin == NC) return;
3636

3737
obj->pin = pin;
3838
LPC_GPIO_TypeDef *port_reg = ((LPC_GPIO_TypeDef *) (LPC_GPIO0_BASE + (((pin & 0xF000) >> PORT_SHIFT) * 0x10000)));
39-
40-
obj->reg_mask_read = &port_reg->MASKED_ACCESS[gpio_set(pin) + 1];
39+
40+
obj->reg_mask_read = &port_reg->MASKED_ACCESS[1 << gpio_set(pin)];
4141
obj->reg_dir = &port_reg->DIR;
4242
obj->reg_write = &port_reg->DATA;
4343

0 commit comments

Comments
 (0)