ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #60 from jorisa/master 

Fix MASKED_ACCESS bug in gpio_init
pull/57/merge
Bogdan Marinescu 2013-09-09 01:07:04 -07:00
parent e03e337af6 743e178455
commit 946cf742b4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC11CXX/gpio_api.c
View File

@ -28,7 +28,7 @@ uint32_t gpio_set(PinName pin) {
(1) : (0);
pin_function(pin, f);
return ((pin & 0x0F00) >> 8);
return ((pin & 0x0F00) >> PIN_SHIFT);
}
void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
@ -36,8 +36,8 @@ void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
obj->pin = pin;
LPC_GPIO_TypeDef *port_reg = ((LPC_GPIO_TypeDef *) (LPC_GPIO0_BASE + (((pin & 0xF000) >> PORT_SHIFT) * 0x10000)));
obj->reg_mask_read = &port_reg->MASKED_ACCESS[gpio_set(pin) + 1];
obj->reg_mask_read = &port_reg->MASKED_ACCESS[1 << gpio_set(pin)];
obj->reg_dir = &port_reg->DIR;
obj->reg_write = &port_reg->DATA;