From 805d79debeeefe2be3cb0998276c5c13da65f3b0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 2 Jun 2014 09:29:46 +1000
Subject: [PATCH] HAL_FLYMAPLE: fix for HAL_GPIO_*

---
 libraries/AP_HAL_FLYMAPLE/AnalogSource.cpp                | 4 ++--
 libraries/AP_HAL_FLYMAPLE/GPIO.cpp                        | 4 ++--
 libraries/AP_HAL_FLYMAPLE/examples/Blink/Blink.pde        | 8 ++++----
 libraries/AP_HAL_FLYMAPLE/examples/RCInput/RCInput.pde    | 2 +-
 .../examples/RCPassthroughTest/RCPassthroughTest.pde      | 2 +-
 .../AP_HAL_FLYMAPLE/examples/Scheduler/Scheduler.pde      | 2 +-
 .../AP_HAL_FLYMAPLE/examples/Semaphore/Semaphore.pde      | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libraries/AP_HAL_FLYMAPLE/AnalogSource.cpp b/libraries/AP_HAL_FLYMAPLE/AnalogSource.cpp
index 493489d086..436856d40a 100644
--- a/libraries/AP_HAL_FLYMAPLE/AnalogSource.cpp
+++ b/libraries/AP_HAL_FLYMAPLE/AnalogSource.cpp
@@ -130,7 +130,7 @@ float FLYMAPLEAnalogSource::_read_average()
 void FLYMAPLEAnalogSource::setup_read() {
     if (_stop_pin != ANALOG_INPUT_NONE) {
         uint8_t digital_pin = hal.gpio->analogPinToDigitalPin(_stop_pin);
-        hal.gpio->pinMode(digital_pin, GPIO_OUTPUT);
+        hal.gpio->pinMode(digital_pin, HAL_GPIO_OUTPUT);
         hal.gpio->write(digital_pin, 1);
     }
     if (_settle_time_ms != 0) {
@@ -151,7 +151,7 @@ void FLYMAPLEAnalogSource::setup_read() {
 void FLYMAPLEAnalogSource::stop_read() {
     if (_stop_pin != ANALOG_INPUT_NONE) {
         uint8_t digital_pin = hal.gpio->analogPinToDigitalPin(_stop_pin);
-        hal.gpio->pinMode(digital_pin, GPIO_OUTPUT);
+        hal.gpio->pinMode(digital_pin, HAL_GPIO_OUTPUT);
         hal.gpio->write(digital_pin, 0);
     }
 }
diff --git a/libraries/AP_HAL_FLYMAPLE/GPIO.cpp b/libraries/AP_HAL_FLYMAPLE/GPIO.cpp
index a3c21f1637..72df4744ce 100644
--- a/libraries/AP_HAL_FLYMAPLE/GPIO.cpp
+++ b/libraries/AP_HAL_FLYMAPLE/GPIO.cpp
@@ -82,9 +82,9 @@ bool FLYMAPLEGPIO::attach_interrupt(uint8_t interrupt_num, AP_HAL::Proc p, uint8
 {
     // Flymaple can only handle RISING, FALLING and CHANGE
     ExtIntTriggerMode flymaple_interrupt_mode;
-    if (mode == GPIO_INTERRUPT_FALLING)
+    if (mode == HAL_GPIO_INTERRUPT_FALLING)
 	flymaple_interrupt_mode = FALLING;
-    else if (mode == GPIO_INTERRUPT_RISING)
+    else if (mode == HAL_GPIO_INTERRUPT_RISING)
 	flymaple_interrupt_mode = RISING;
     else 
 	return false;
diff --git a/libraries/AP_HAL_FLYMAPLE/examples/Blink/Blink.pde b/libraries/AP_HAL_FLYMAPLE/examples/Blink/Blink.pde
index 1f8e760b41..5a9b4d67a6 100644
--- a/libraries/AP_HAL_FLYMAPLE/examples/Blink/Blink.pde
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Blink/Blink.pde
@@ -30,16 +30,16 @@ void loop (void) {
 }
 
 void setup (void) {
-    hal.gpio->pinMode(13, GPIO_OUTPUT);
+    hal.gpio->pinMode(13, HAL_GPIO_OUTPUT);
     hal.gpio->write(13, 0);
 
     a_led = hal.gpio->channel(27);
     b_led = hal.gpio->channel(26);
     c_led = hal.gpio->channel(25);
 
-    a_led->mode(GPIO_OUTPUT);
-    b_led->mode(GPIO_OUTPUT);
-    c_led->mode(GPIO_OUTPUT);
+    a_led->mode(HAL_GPIO_OUTPUT);
+    b_led->mode(HAL_GPIO_OUTPUT);
+    c_led->mode(HAL_GPIO_OUTPUT);
 
     a_led->write(0);
     b_led->write(0);
diff --git a/libraries/AP_HAL_FLYMAPLE/examples/RCInput/RCInput.pde b/libraries/AP_HAL_FLYMAPLE/examples/RCInput/RCInput.pde
index 20a18a2aee..f9c0f001e8 100644
--- a/libraries/AP_HAL_FLYMAPLE/examples/RCInput/RCInput.pde
+++ b/libraries/AP_HAL_FLYMAPLE/examples/RCInput/RCInput.pde
@@ -56,7 +56,7 @@ void loop (void) {
 }
 
 void setup (void) {
-    hal.gpio->pinMode(13, GPIO_OUTPUT);
+    hal.gpio->pinMode(13, HAL_GPIO_OUTPUT);
     hal.gpio->write(13, 0);
 }
 
diff --git a/libraries/AP_HAL_FLYMAPLE/examples/RCPassthroughTest/RCPassthroughTest.pde b/libraries/AP_HAL_FLYMAPLE/examples/RCPassthroughTest/RCPassthroughTest.pde
index 4c126ca3e3..9cecd6035c 100644
--- a/libraries/AP_HAL_FLYMAPLE/examples/RCPassthroughTest/RCPassthroughTest.pde
+++ b/libraries/AP_HAL_FLYMAPLE/examples/RCPassthroughTest/RCPassthroughTest.pde
@@ -78,7 +78,7 @@ void loop (void) {
 
 void setup (void) {
 //    hal.scheduler->delay(5000);
-    hal.gpio->pinMode(13, GPIO_OUTPUT);
+    hal.gpio->pinMode(13, HAL_GPIO_OUTPUT);
     hal.gpio->write(13, 0);
     for (uint8_t i=0; i<16; i++) {
         hal.rcout->enable_ch(i);
diff --git a/libraries/AP_HAL_FLYMAPLE/examples/Scheduler/Scheduler.pde b/libraries/AP_HAL_FLYMAPLE/examples/Scheduler/Scheduler.pde
index 071f4b84a7..4e6af0eda9 100644
--- a/libraries/AP_HAL_FLYMAPLE/examples/Scheduler/Scheduler.pde
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Scheduler/Scheduler.pde
@@ -54,7 +54,7 @@ void schedule_toggle_hang(void) {
 
 void setup_pin(int pin_num) {
     hal.console->printf_P(PSTR("Setup pin %d\r\n"), pin_num);
-    hal.gpio->pinMode(pin_num,GPIO_OUTPUT);
+    hal.gpio->pinMode(pin_num,HAL_GPIO_OUTPUT);
     /* Blink so we can see setup on the logic analyzer.*/
     hal.gpio->write(pin_num,1);
     hal.gpio->write(pin_num,0);
diff --git a/libraries/AP_HAL_FLYMAPLE/examples/Semaphore/Semaphore.pde b/libraries/AP_HAL_FLYMAPLE/examples/Semaphore/Semaphore.pde
index 426acb2fda..4768cf7436 100644
--- a/libraries/AP_HAL_FLYMAPLE/examples/Semaphore/Semaphore.pde
+++ b/libraries/AP_HAL_FLYMAPLE/examples/Semaphore/Semaphore.pde
@@ -54,7 +54,7 @@ void blink_a3() {
 
 void setup_pin(int pin_num) {
     hal.console->printf_P(PSTR("Setup pin %d\r\n"), pin_num);
-    hal.gpio->pinMode(pin_num,GPIO_OUTPUT);
+    hal.gpio->pinMode(pin_num,HAL_GPIO_OUTPUT);
     /* Blink so we can see setup on the logic analyzer.*/
     hal.gpio->write(pin_num,1);
     hal.gpio->write(pin_num,0);