Merge pull request RIOT-OS#5574 from PeterKietzmann/msp430_gpio_fix

kYc0o · web-flow · commit 51a4fee9486d · 2016-07-22T15:55:43.000+02:00
cpu/msp430: initialize gpio as input OR output
diff --git a/cpu/msp430fxyz/periph/gpio.c b/cpu/msp430fxyz/periph/gpio.c
@@ -88,11 +88,13 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
     }
 
     /* reset pin and output value */
-    port->DIR &= ~(_pin(pin));
-    port->OD &= ~(_pin(pin));
     if (mode == GPIO_OUT) {
         port->DIR |= _pin(pin);
     }
+    else {
+        port->DIR &= ~(_pin(pin));
+    }
+    port->OD &= ~(_pin(pin));
 
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,13 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/* reset pin and output value */`
`91`		`- port->DIR &= ~(_pin(pin));`
`92`		`- port->OD &= ~(_pin(pin));`
`93`	`91`	`if (mode == GPIO_OUT) {`
`94`	`92`	`port->DIR \|= _pin(pin);`
`95`	`93`	`}`
	`94`	`+ else {`
	`95`	`+ port->DIR &= ~(_pin(pin));`
	`96`	`+ }`
	`97`	`+ port->OD &= ~(_pin(pin));`
`96`	`98`
`97`	`99`	`return 0;`
`98`	`100`	`}`