From c6965bd471b8bca3d4084459008f1ef463a2b243 Mon Sep 17 00:00:00 2001
From: caternuson <caternuson@gmail.com>
Date: Tue, 28 Sep 2021 14:31:23 -0700
Subject: [PATCH] selectively remove spi

---
 Adafruit_BusIO_Register.cpp | 13 ++++++++-----
 Adafruit_BusIO_Register.h   |  7 ++++++-
 Adafruit_SPIDevice.cpp      |  5 +++--
 Adafruit_SPIDevice.h        |  2 ++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Adafruit_BusIO_Register.cpp b/Adafruit_BusIO_Register.cpp
index f802525..bd42a54 100644
--- a/Adafruit_BusIO_Register.cpp
+++ b/Adafruit_BusIO_Register.cpp
@@ -1,8 +1,5 @@
 #include <Adafruit_BusIO_Register.h>
 
-#if !defined(SPI_INTERFACES_COUNT) ||                                          \
-    (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
-
 /*!
  *    @brief  Create a register we access over an I2C Device (which defines the
  * bus and address)
@@ -21,7 +18,9 @@ Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice,
                                                  uint8_t byteorder,
                                                  uint8_t address_width) {
   _i2cdevice = i2cdevice;
+#ifdef HAS_SPI
   _spidevice = NULL;
+#endif
   _addrwidth = address_width;
   _address = reg_addr;
   _byteorder = byteorder;
@@ -42,6 +41,7 @@ Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice,
  *    @param  address_width The width of the register address itself, defaults
  * to 1 byte
  */
+#ifdef HAS_SPI
 Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice,
                                                  uint16_t reg_addr,
                                                  Adafruit_BusIO_SPIRegType type,
@@ -87,6 +87,7 @@ Adafruit_BusIO_Register::Adafruit_BusIO_Register(
   _byteorder = byteorder;
   _width = width;
 }
+#endif
 
 /*!
  *    @brief  Write a buffer of data to the register location
@@ -103,6 +104,7 @@ bool Adafruit_BusIO_Register::write(uint8_t *buffer, uint8_t len) {
   if (_i2cdevice) {
     return _i2cdevice->write(buffer, len, true, addrbuffer, _addrwidth);
   }
+#ifdef HAS_SPI
   if (_spidevice) {
     if (_spiregtype == ADDRESSED_OPCODE_BIT0_LOW_TO_WRITE) {
       // very special case!
@@ -129,6 +131,7 @@ bool Adafruit_BusIO_Register::write(uint8_t *buffer, uint8_t len) {
     }
     return _spidevice->write(buffer, len, addrbuffer, _addrwidth);
   }
+#endif
   return false;
 }
 
@@ -205,6 +208,7 @@ bool Adafruit_BusIO_Register::read(uint8_t *buffer, uint8_t len) {
   if (_i2cdevice) {
     return _i2cdevice->write_then_read(addrbuffer, _addrwidth, buffer, len);
   }
+#ifdef HAS_SPI
   if (_spidevice) {
     if (_spiregtype == ADDRESSED_OPCODE_BIT0_LOW_TO_WRITE) {
       // very special case!
@@ -230,6 +234,7 @@ bool Adafruit_BusIO_Register::read(uint8_t *buffer, uint8_t len) {
     }
     return _spidevice->write_then_read(addrbuffer, _addrwidth, buffer, len);
   }
+#endif
   return false;
 }
 
@@ -361,5 +366,3 @@ void Adafruit_BusIO_Register::setAddress(uint16_t address) {
 void Adafruit_BusIO_Register::setAddressWidth(uint16_t address_width) {
   _addrwidth = address_width;
 }
-
-#endif // SPI exists
diff --git a/Adafruit_BusIO_Register.h b/Adafruit_BusIO_Register.h
index 8454b21..4227824 100644
--- a/Adafruit_BusIO_Register.h
+++ b/Adafruit_BusIO_Register.h
@@ -4,6 +4,8 @@
 
 #if !defined(SPI_INTERFACES_COUNT) ||                                          \
     (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
+#define HAS_SPI
+#endif // SPI exists
 
 #ifndef Adafruit_BusIO_Register_h
 #define Adafruit_BusIO_Register_h
@@ -45,6 +47,7 @@ public:
                           uint8_t width = 1, uint8_t byteorder = LSBFIRST,
                           uint8_t address_width = 1);
 
+#ifdef HAS_SPI
   Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice, uint16_t reg_addr,
                           Adafruit_BusIO_SPIRegType type, uint8_t width = 1,
                           uint8_t byteorder = LSBFIRST,
@@ -55,6 +58,7 @@ public:
                           Adafruit_BusIO_SPIRegType type, uint16_t reg_addr,
                           uint8_t width = 1, uint8_t byteorder = LSBFIRST,
                           uint8_t address_width = 1);
+#endif
 
   bool read(uint8_t *buffer, uint8_t len);
   bool read(uint8_t *value);
@@ -75,7 +79,9 @@ public:
 
 private:
   Adafruit_I2CDevice *_i2cdevice;
+#ifdef HAS_SPI
   Adafruit_SPIDevice *_spidevice;
+#endif
   Adafruit_BusIO_SPIRegType _spiregtype;
   uint16_t _address;
   uint8_t _width, _addrwidth, _byteorder;
@@ -102,4 +108,3 @@ private:
 
 #endif // BusIO_Register_h
 
-#endif // SPI exists
diff --git a/Adafruit_SPIDevice.cpp b/Adafruit_SPIDevice.cpp
index f560756..f39627a 100644
--- a/Adafruit_SPIDevice.cpp
+++ b/Adafruit_SPIDevice.cpp
@@ -1,8 +1,9 @@
-#if (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
-
 #include <Adafruit_SPIDevice.h>
 #include <Arduino.h>
 
+#if !defined(SPI_INTERFACES_COUNT) ||                                          \
+    (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))
+
 //#define DEBUG_SERIAL Serial
 
 /*!
diff --git a/Adafruit_SPIDevice.h b/Adafruit_SPIDevice.h
index 1170e21..921030a 100644
--- a/Adafruit_SPIDevice.h
+++ b/Adafruit_SPIDevice.h
@@ -1,3 +1,5 @@
+#include <Arduino.h>
+
 #if !defined(SPI_INTERFACES_COUNT) ||                                          \
     (defined(SPI_INTERFACES_COUNT) && (SPI_INTERFACES_COUNT > 0))