Made multiple SPI instances fully configurable from variant

Author: cmaglie

libraries/SPI/SPI.cpp

@@ -219,22 +219,35 @@ void SPIClass::detachInterrupt() {
 }
 
 #if SPI_INTERFACES_COUNT > 0
+  /* In case new variant doesn't define these macros,
+   * we put here the ones for Arduino Zero.
+   *
+   * These values should be different on some variants!
+   *
+   * The SPI PAD values can be found in cores/arduino/SERCOM.h:
+   *   - SercomSpiTXPad
+   *   - SercomRXPad
+   */
+  #ifndef PERIPH_SPI
+    #define PERIPH_SPI           sercom4
+    #define PAD_SPI_TX           SPI_PAD_2_SCK_3
+    #define PAD_SPI_RX           SERCOM_RX_PAD_0
+  #endif // PERIPH_SPI
+  SPIClass SPI (&PERIPH_SPI,  PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI,  PAD_SPI_TX,  PAD_SPI_RX);
+#endif
+#if SPI_INTERFACES_COUNT > 1
+  SPIClass SPI1(&PERIPH_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI, PAD_SPI1_TX, PAD_SPI1_RX);
+#endif
+#if SPI_INTERFACES_COUNT > 2
+  SPIClass SPI2(&PERIPH_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI, PAD_SPI2_TX, PAD_SPI2_RX);
+#endif
+#if SPI_INTERFACES_COUNT > 3
+  SPIClass SPI3(&PERIPH_SPI3, PIN_SPI3_MISO, PIN_SPI3_SCK, PIN_SPI3_MOSI, PAD_SPI3_TX, PAD_SPI3_RX);
+#endif
+#if SPI_INTERFACES_COUNT > 4
+  SPIClass SPI4(&PERIPH_SPI4, PIN_SPI4_MISO, PIN_SPI4_SCK, PIN_SPI4_MOSI, PAD_SPI4_TX, PAD_SPI4_RX);
+#endif
+#if SPI_INTERFACES_COUNT > 5
+  SPIClass SPI5(&PERIPH_SPI5, PIN_SPI5_MISO, PIN_SPI5_SCK, PIN_SPI5_MOSI, PAD_SPI5_TX, PAD_SPI5_RX);
+#endif
 
-/* In case new variant doesn't define these macros,
- * we put here the ones for Arduino Zero.
- *
- * These values should be different on some variants!
- *
- * The SPI PAD values can be found in cores/arduino/SERCOM.h:
- *   - SercomSpiTXPad
- *   - SercomRXPad
- */
-#ifndef PERIPH_SPI
-#define PERIPH_SPI           sercom4
-#define PAD_SPI_TX           SPI_PAD_2_SCK_3
-#define PAD_SPI_RX           SERCOM_RX_PAD_0
-#endif // PERIPH_SPI
-
-SPIClass SPI( &PERIPH_SPI, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI, PAD_SPI_TX, PAD_SPI_RX );
-
-#endif // SPI_INTERFACES_COUNT > 0

libraries/SPI/SPI.h

@@ -143,6 +143,21 @@ void SPIClass::transfer(void *buf, size_t count)
 #if SPI_INTERFACES_COUNT > 0
   extern SPIClass SPI;
 #endif
+#if SPI_INTERFACES_COUNT > 1
+  extern SPIClass SPI1;
+#endif
+#if SPI_INTERFACES_COUNT > 2
+  extern SPIClass SPI2;
+#endif
+#if SPI_INTERFACES_COUNT > 3
+  extern SPIClass SPI3;
+#endif
+#if SPI_INTERFACES_COUNT > 4
+  extern SPIClass SPI4;
+#endif
+#if SPI_INTERFACES_COUNT > 5
+  extern SPIClass SPI5;
+#endif
 
 // For compatibility with sketches designed for AVR @ 16 MHz
 // New programs should use SPI.beginTransaction to set the SPI clock