Merge pull request #9 from spectaclelabs/fix-gpio-mode

emilmont · emilmont · commit f4f34a025d4a · 2013-07-02T02:44:29.000-07:00
Fix setting STM32 GPIO input/output mode.
diff --git a/libraries/mbed/targets/hal/STM/TARGET_STM32F4XX/gpio_api.c b/libraries/mbed/targets/hal/STM/TARGET_STM32F4XX/gpio_api.c
@@ -22,7 +22,7 @@ uint32_t gpio_set(PinName pin) {
     // Enable GPIO peripheral clock
     RCC->AHB1ENR |= 1 << port_index;
 
-    pin_function(pin, 0);
+    pin_function(pin, STM_PIN_DATA(0, 0));
     return 1 << ((uint32_t) pin & 0xF);
 }
 
@@ -55,7 +55,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) {
 
 void gpio_dir(gpio_t *obj, PinDirection direction) {
     switch (direction) {
-        case PIN_INPUT : pin_function(obj->pin, 0); break;
-        case PIN_OUTPUT: pin_function(obj->pin, 1); break;
+        case PIN_INPUT : pin_function(obj->pin, STM_PIN_DATA(0, 0)); break;
+        case PIN_OUTPUT: pin_function(obj->pin, STM_PIN_DATA(1, 0)); break;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ uint32_t gpio_set(PinName pin) {`
`22`	`22`	`// Enable GPIO peripheral clock`
`23`	`23`	`RCC->AHB1ENR \|= 1 << port_index;`
`24`	`24`
`25`		`- pin_function(pin, 0);`
	`25`	`+ pin_function(pin, STM_PIN_DATA(0, 0));`
`26`	`26`	`return 1 << ((uint32_t) pin & 0xF);`
`27`	`27`	`}`
`28`	`28`
`@@ -55,7 +55,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) {`
`55`	`55`
`56`	`56`	`void gpio_dir(gpio_t *obj, PinDirection direction) {`
`57`	`57`	`switch (direction) {`
`58`		`- case PIN_INPUT : pin_function(obj->pin, 0); break;`
`59`		`- case PIN_OUTPUT: pin_function(obj->pin, 1); break;`
	`58`	`+ case PIN_INPUT : pin_function(obj->pin, STM_PIN_DATA(0, 0)); break;`
	`59`	`+ case PIN_OUTPUT: pin_function(obj->pin, STM_PIN_DATA(1, 0)); break;`
`60`	`60`	`}`
`61`	`61`	`}`