From 93f5abb274b50dcc4227ee9c535839f0dee9203b Mon Sep 17 00:00:00 2001
From: Gustavo Jose de Sousa <gustavo.sousa@intel.com>
Date: Wed, 19 Aug 2015 12:39:16 -0300
Subject: [PATCH] AP_HAL_AVR: SPI: adapt to the new signature of transaction()

A default behaviour was added here.
---
 libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp | 3 ++-
 libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp | 3 ++-
 libraries/AP_HAL_AVR/SPIDevice_SPI3.cpp | 3 ++-
 libraries/AP_HAL_AVR/SPIDevices.h       | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp b/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp
index 304e5333bf..6fb5052afb 100644
--- a/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp
+++ b/libraries/AP_HAL_AVR/SPIDevice_SPI0.cpp
@@ -109,7 +109,7 @@ void AVRSPI0DeviceDriver::transfer(const uint8_t *tx, uint16_t len) {
     }
 }
 
-void AVRSPI0DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
+bool AVRSPI0DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
         uint16_t len) {
     _cs_assert();
     if (rx == NULL) {
@@ -128,6 +128,7 @@ void AVRSPI0DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
         }
     }
     _cs_release();
+    return true;
 }
 
 void AVRSPI0DeviceDriver::cs_assert() {
diff --git a/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp b/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp
index 6344fb2624..6f8b1263e5 100644
--- a/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp
+++ b/libraries/AP_HAL_AVR/SPIDevice_SPI2.cpp
@@ -97,7 +97,7 @@ void AVRSPI2DeviceDriver::_transfer17(const uint8_t *tx, uint8_t *rx)
     TRANSFER1(16);
 }
 
-void AVRSPI2DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
+bool AVRSPI2DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
         uint16_t len) {
     _cs_assert();
     if (rx == NULL) {
@@ -116,6 +116,7 @@ void AVRSPI2DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
         }
     }
     _cs_release();
+    return true;
 }
 
 void AVRSPI2DeviceDriver::cs_assert() {
diff --git a/libraries/AP_HAL_AVR/SPIDevice_SPI3.cpp b/libraries/AP_HAL_AVR/SPIDevice_SPI3.cpp
index ef63199d1a..e5f89ec8db 100644
--- a/libraries/AP_HAL_AVR/SPIDevice_SPI3.cpp
+++ b/libraries/AP_HAL_AVR/SPIDevice_SPI3.cpp
@@ -91,7 +91,7 @@ void AVRSPI3DeviceDriver::_transfer(const uint8_t *data, uint16_t len) {
     }
 }
 
-void AVRSPI3DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
+bool AVRSPI3DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
         uint16_t len) {
     _cs_assert();
     if (rx == NULL) {
@@ -102,6 +102,7 @@ void AVRSPI3DeviceDriver::transaction(const uint8_t *tx, uint8_t *rx,
         }
     }
     _cs_release();
+    return true;
 }
 
 void AVRSPI3DeviceDriver::cs_assert() {
diff --git a/libraries/AP_HAL_AVR/SPIDevices.h b/libraries/AP_HAL_AVR/SPIDevices.h
index 46adcb4074..545c04f67f 100644
--- a/libraries/AP_HAL_AVR/SPIDevices.h
+++ b/libraries/AP_HAL_AVR/SPIDevices.h
@@ -23,7 +23,7 @@ public:
     void init();
     AP_HAL::Semaphore* get_semaphore();
 
-    void transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
+    bool transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
 
     void cs_assert();
     void cs_release();
@@ -64,7 +64,7 @@ public:
     void init();
     AP_HAL::Semaphore* get_semaphore();
 
-    void transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
+    bool transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
 
     void cs_assert();
     void cs_release();
@@ -100,7 +100,7 @@ public:
     void init();
     AP_HAL::Semaphore* get_semaphore();
 
-    void transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
+    bool transaction(const uint8_t *tx, uint8_t *rx, uint16_t len);
 
     void cs_assert();
     void cs_release();