sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes LEDs on the Freedom KL25Z board

Browse Source
This commit is contained in:
Gregory Nutt 2013-05-06 11:07:53 -06:00
parent aa72f58914
commit c6009fa2a4
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/src/kl/kl_gpio.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/kl/kl_pin.c * arch/arm/src/kl/kl_pin.c
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -103,7 +103,7 @@ int kl_configgpio(uint32_t cfgset)
* options are applicable. * options are applicable.
*/ */
if (mode == _PIN_MODE_ANALOG) if (mode == PIN_MODE_ANALOG)
{ {
/* Set the analog mode with all digital options zeroed */ /* Set the analog mode with all digital options zeroed */
@ -184,7 +184,7 @@ int kl_configgpio(uint32_t cfgset)
/* Additional configuration for the case of Alternative 1 (GPIO) modes */ /* Additional configuration for the case of Alternative 1 (GPIO) modes */
if (mode == _PIN_MODE_GPIO) if (mode == PIN_MODE_GPIO)
{ {
/* Set the GPIO port direction */ /* Set the GPIO port direction */
@ -213,6 +213,7 @@ int kl_configgpio(uint32_t cfgset)
return OK; return OK;
} }
return -EINVAL; return -EINVAL;
} }

18
arch/arm/src/kl/kl_gpio.h
View File

@ -62,18 +62,26 @@
/* Bits 25-31: 7 bits are used to encode the basic pin configuration: /* Bits 25-31: 7 bits are used to encode the basic pin configuration:
* *
* oooo mmm- ---- ---- ---- ---- ---- ---- * oooo mmm- ---- ---- ---- ---- ---- ----
* oooommm: * | `--- mmm: mode
* | `--- mmm: mode
* `------- oooo: options (may be combined) * `------- oooo: options (may be combined)
*/ */
#define _PIN_MODE_SHIFT (25) /* Bits 25-27: Pin mode */ #define _PIN_MODE_SHIFT (25) /* Bits 25-27: Pin mode */
#define _PIN_MODE_MASK (7 << _PIN_MODE_SHIFT) #define _PIN_MODE_MASK (7 << _PIN_MODE_SHIFT)
#define _PIN_OPTIONS_SHIFT (28) /* Bits 28-31: Pin mode options */ #define _PIN_OPTIONS_SHIFT (28) /* Bits 28-31: Pin mode options */
#define _PIN_OPTIONS_MASK (15 << _PIN_OPTIONS_SHIFT) #define _PIN_OPTIONS_MASK (15 << _PIN_OPTIONS_SHIFT)
/* Port Modes */ /* Port Modes */
#define PIN_MODE_ANALOG (0) /* 000 Pin Disabled (Analog) */
#define PIN_MODE_GPIO (1) /* 001 Alternative 1 (GPIO) */
#define PIN_MODE_ALT2 (2) /* 010 Alternative 2 */
#define PIN_MODE_ALT3 (3) /* 011 Alternative 3 */
#define PIN_MODE_ALT4 (4) /* 100 Alternative 4 */
#define PIN_MODE_ALT5 (5) /* 101 Alternative 5 */
#define PIN_MODE_ALT6 (6) /* 110 Alternative 6 */
#define PIN_MODE_ALT7 (7) /* 111 Alternative 7 */
#define _PIN_MODE_ANALOG (0 << _PIN_MODE_SHIFT) /* 000 Pin Disabled (Analog) */ #define _PIN_MODE_ANALOG (0 << _PIN_MODE_SHIFT) /* 000 Pin Disabled (Analog) */
#define _PIN_MODE_GPIO (1 << _PIN_MODE_SHIFT) /* 001 Alternative 1 (GPIO) */ #define _PIN_MODE_GPIO (1 << _PIN_MODE_SHIFT) /* 001 Alternative 1 (GPIO) */
#define _PIN_MODE_ALT2 (2 << _PIN_MODE_SHIFT) /* 010 Alternative 2 */ #define _PIN_MODE_ALT2 (2 << _PIN_MODE_SHIFT) /* 010 Alternative 2 */
@ -294,7 +302,7 @@
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
typedef uint16_t gpio_cfgset_t; typedef uint32_t gpio_cfgset_t;
/**************************************************************************** /****************************************************************************
* Public Data * Public Data