GPIO HAL - gpio_set implementation

Author: 0xc0170

libraries/mbed/targets/hal/TARGET_Freescale/KPSDK/drivers/gpio/src/fsl_gpio_driver.c

@@ -164,7 +164,6 @@ void sdk_gpio_inout_pin_init(const gpio_input_output_pin_t *inoutPin)
  *END**************************************************************************/
 uint32_t sdk_gpio_get_pin_direction(uint32_t pinName)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -173,7 +172,6 @@ uint32_t sdk_gpio_get_pin_direction(uint32_t pinName)
 
 void sdk_gpio_set_pin_direction(uint32_t pinName, gpio_pin_direction_t direction)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -188,7 +186,6 @@ void sdk_gpio_set_pin_direction(uint32_t pinName, gpio_pin_direction_t direction
  *END**************************************************************************/
 void sdk_gpio_write_pin_output(uint32_t pinName, uint32_t output)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -203,7 +200,6 @@ void sdk_gpio_write_pin_output(uint32_t pinName, uint32_t output)
  *END**************************************************************************/
 void sdk_gpio_set_pin_output(uint32_t pinName)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -218,7 +214,6 @@ void sdk_gpio_set_pin_output(uint32_t pinName)
  *END**************************************************************************/
 void sdk_gpio_clear_pin_output(uint32_t pinName)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -233,7 +228,6 @@ void sdk_gpio_clear_pin_output(uint32_t pinName)
  *END**************************************************************************/
 void sdk_gpio_toggle_pin_output(uint32_t pinName)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -248,7 +242,6 @@ void sdk_gpio_toggle_pin_output(uint32_t pinName)
  *END**************************************************************************/
 uint32_t sdk_gpio_read_pin_input(uint32_t pinName)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -264,7 +257,6 @@ uint32_t sdk_gpio_read_pin_input(uint32_t pinName)
  *END**************************************************************************/
 void sdk_gpio_configure_digital_filter(uint32_t pinName, bool isDigitalFilterEnabled)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 
@@ -280,7 +272,6 @@ void sdk_gpio_configure_digital_filter(uint32_t pinName, bool isDigitalFilterEna
  *END**************************************************************************/
 void sdk_gpio_clear_pin_interrupt_flag(uint32_t pinName)
 {
-    // assert(pinName <= gpioPinCount);
     uint32_t gpioInstance = pinName  >> GPIO_PORT_SHIFT;
     uint32_t pin = pinName & 0xFF;
 

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K64F/gpio_api.c

@@ -18,10 +18,17 @@
 #include "fsl_gpio_driver.h"
 
 uint32_t gpio_set(PinName pin) {
-    return 1;
+    uint32_t instance = pin >> GPIO_PORT_SHIFT;
+    uint32_t pin_num = pin & 0xFF;
+
+    port_hal_mux_control(instance, pin_num, kPortMuxAsGpio);
+    return 1 << pin_num;
 }
 
 void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
+    if (pin == NC)
+        return;
+
     if (direction) {
         obj->pinName = pin;
         obj->out_config.outputLogic = 0;
@@ -44,7 +51,6 @@ void gpio_mode(gpio_t *obj, PinMode mode) {
     uint32_t instance = obj->pinName >> GPIO_PORT_SHIFT;
     uint32_t pin = obj->pinName & 0xFF;
 
-    /* TODO: in KPSDK driver should be set pull */
     switch (mode) {
         case PullNone:
             obj->in_config.isPullEnable = false;
@@ -54,13 +60,13 @@ void gpio_mode(gpio_t *obj, PinMode mode) {
             break;
         case PullDown:
             obj->in_config.isPullEnable = true;
-            obj->in_config.pullSelect = kPortPullUp;
+            obj->in_config.pullSelect = kPortPullDown;
             port_hal_configure_pull(instance, pin, 1);
             port_hal_pull_select(instance, pin, kPortPullDown);
             break;
         case PullUp:
             obj->in_config.isPullEnable = true;
-            obj->in_config.pullSelect = kPortPullDown;
+            obj->in_config.pullSelect = kPortPullUp;
             port_hal_configure_pull(instance, pin, 1);
             port_hal_pull_select(instance, pin, kPortPullUp);
             break;