Make onboard flash port and cs pin explicit

Author: facchinm

libraries/CurieSerialFlash/examples/CopyFromSerial/CopyFromSerial.ino

@@ -81,14 +81,12 @@
 #define BYTE_ESCAPE      0x7d
 #define BYTE_SEPARATOR    0x7c
 
-#define CSPIN             21
-
 void setup(){
   Serial.begin(9600);  //Teensy serial is always at full USB speed and buffered... the baud rate here is required but ignored
 
   pinMode(13, OUTPUT);
 
-  SerialFlash.begin(SPI1, CSPIN);
+  SerialFlash.begin(ONBOARD_FLASH_SPI_PORT, ONBOARD_FLASH_CS_PIN);
 
   //We start by formatting the flash...
   uint8_t id[5];

libraries/CurieSerialFlash/examples/EraseEverything/EraseEverything.ino

@@ -3,8 +3,6 @@
 #include <CurieSerialFlash.h>
 #include <SPI.h>
 
-const int FlashChipSelect = 21; // digital pin for flash chip CS pin
-
 SerialFlashFile file;
 
 const unsigned long testIncrement = 4096;
@@ -26,7 +24,7 @@ void setup() {
   while (!Serial && (millis() - startMillis < 10000)) ;
   delay(100);
 
-  SerialFlash.begin(SPI1, FlashChipSelect);
+  SerialFlash.begin(ONBOARD_FLASH_SPI_PORT, ONBOARD_FLASH_CS_PIN);
   unsigned char id[5];
   SerialFlash.readID(id);
   unsigned long size = SerialFlash.capacity(id);

libraries/CurieSerialFlash/examples/FileWrite/FileWrite.ino

@@ -8,8 +8,6 @@
 const char *filename = "myfile.txt";
 const char *contents = "0123456789ABCDEF";
 
-const int FlashChipSelect = 21; // digital pin for flash chip CS pin
-
 void setup() {
   Serial.begin(9600);
 
@@ -18,7 +16,7 @@ void setup() {
   delay(100);
 
   // Init. SPI Flash chip
-  if (!SerialFlash.begin(SPI1, FlashChipSelect)) {
+  if (!SerialFlash.begin(ONBOARD_FLASH_SPI_PORT, ONBOARD_FLASH_CS_PIN)) {
     Serial.println("Unable to access SPI Flash chip");
   }
 

libraries/CurieSerialFlash/examples/ListFiles/ListFiles.ino

@@ -3,8 +3,6 @@
 #include <CurieSerialFlash.h>
 #include <SPI.h>
 
-const int FlashChipSelect = 21; // digital pin for flash chip CS pin
-
 void setup() {
   //uncomment these if using Teensy audio shield
   //SPI.setSCK(14);  // Audio shield has SCK on pin 14
@@ -22,7 +20,7 @@ void setup() {
   delay(100);
   Serial.println("All Files on SPI Flash chip:");
 
-  if (!SerialFlash.begin(SPI1, FlashChipSelect)) {
+  if (!SerialFlash.begin(ONBOARD_FLASH_SPI_PORT, ONBOARD_FLASH_CS_PIN)) {
     error("Unable to access SPI Flash chip");
   }
 

libraries/CurieSerialFlash/examples/RawHardwareTest/RawHardwareTest.ino

@@ -25,8 +25,6 @@
 #include <CurieSerialFlash.h>
 #include <SPI.h>
 
-const int FlashChipSelect = 21; // digital pin for flash chip CS pin
-
 SerialFlashFile file;
 
 const unsigned long testIncrement = 4096;
@@ -48,7 +46,7 @@ void setup() {
   delay(100);
 
   Serial.println("Raw SerialFlash Hardware Test");
-  SerialFlash.begin(SPI1, FlashChipSelect);
+  SerialFlash.begin(ONBOARD_FLASH_SPI_PORT, ONBOARD_FLASH_CS_PIN);
 
   if (test()) {
     Serial.println();

variants/arduino_101/variant.h

@@ -113,6 +113,12 @@ extern "C"{
  * ADC
  */
 
+/*
+ * ONBOARD SPI FLASH
+ */
+#define ONBOARD_FLASH_SPI_PORT  SPI1
+#define ONBOARD_FLASH_CS_PIN    21
+
 /* EAI ADC device registers */
 #define ADC_SET                    (0x80015000)
 #define ADC_DIVSEQSTAT             (0x80015001)