More changes that should have gone with the last commit

This commit is contained in:
Gregory Nutt
2013-06-04 15:23:47 -06:00
parent 7ddaf6efc7
commit 5cdcdaf0bd
3 changed files with 428 additions and 430 deletions
File diff suppressed because it is too large Load Diff
+1 -3
View File
@@ -333,8 +333,6 @@ static inline int sam_configoutput(uintptr_t base, uint32_t pin,
static inline int sam_configperiph(uintptr_t base, uint32_t pin,
gpio_pinset_t cfgset)
{
* Peripheral: MM.. FFFE .... IIG. .PPB BBBB
gpio_pinset_t edges;
/* Select the peripheral function.
@@ -414,7 +412,7 @@ static inline int sam_configperiph(uintptr_t base, uint32_t pin,
/* REVISIT: Should event generation be enabled now? I am assuming so */
if (eges = GPIO_PERIPH_EVENTS)
if ((cfgset & GPIO_PERIPH_EVENTS) != 0)
{
/* Rising only.. disable interrrupts on the falling edge */
+3 -3
View File
@@ -80,7 +80,7 @@
* 2Hz, then a fatal error has been detected and the system has halted.
*/
#define GPIO_LED0 (GPIO_OUTPUT | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | \
#define GPIO_LED0 (GPIO_OUTPUT | GPIO_PULL_NONE | GPIO_PORTC | \
GPIO_OUTPUT_SET | GPIO_PIN7)
/* QTouch button: The SAM4L Xplained Pro kit has one QTouch button. The connection
@@ -99,8 +99,8 @@
* PC24 SW0
*/
#define GPIO_SW0 (GPIO_INPUT | GPIO_CFG_PULLUP | GPIO_CFG_DEGLITCH | \
GPIO_PORT_PIOC | GPIO_PIN24)
#define GPIO_SW0 (GPIO_INPUT | GPIO_PULL_UP | GPIO_GLITCH_FILTER | GPIO_PORTC | \
GPIO_PIN24)
#define IRQ_SW0 SAM_IRQ_PC24
/************************************************************************************