SD: fix SD library for ZPUino

Author: alvieboy

hardware/zpuino/zpu/libraries/SD/utility/Sd2Card.cpp

@@ -17,7 +17,7 @@
  * along with the Arduino Sd2Card Library.  If not, see
  * <http://www.gnu.org/licenses/>.
  */
-#define USE_SPI_LIB
+
 #include <Arduino.h>
 #include "Sd2Card.h"
 //------------------------------------------------------------------------------
@@ -267,26 +267,23 @@ int Sd2Card::init(uint8_t sckRateID, uint8_t chipSelectPin) {
   // set pin modes
   pinMode(chipSelectPin_, OUTPUT);
   chipSelectHigh();
-<<<<<<< HEAD
-
-#ifdef AVR
-=======
 #ifndef USE_SPI_LIB
->>>>>>> 1.5.1
   pinMode(SPI_MISO_PIN, INPUT);
   pinMode(SPI_MOSI_PIN, OUTPUT);
   pinMode(SPI_SCK_PIN, OUTPUT);
 #endif
 
 #ifndef SOFTWARE_SPI
 #ifndef USE_SPI_LIB
+#ifndef ZPU
   // SS must be in output mode even it is not chip select
   pinMode(SS_PIN, OUTPUT);
   digitalWrite(SS_PIN, HIGH); // disable any SPI device using hardware SS pin
   // Enable SPI, Master, clock rate f_osc/128
   SPCR = (1 << SPE) | (1 << MSTR) | (1 << SPR1) | (1 << SPR0);
   // clear double speed
   SPSR &= ~(1 << SPI2X);
+#endif // defined ZPU
 #else // USE_SPI_LIB
   SPI.begin();
 #ifdef SPI_CLOCK_DIV128
@@ -553,7 +550,7 @@ int Sd2Card::readRegister(unsigned cmd, void* buf) {
  * false, is returned for an invalid value of \a sckRateID.
  */
 uint8_t Sd2Card::setSckRate(uint8_t sckRateID) {
-#ifdef AVR
+#ifndef ZPU
   if (sckRateID > 6) {
     error(SD_CARD_ERROR_SCK_RATE);
     return false;
@@ -585,6 +582,7 @@ uint8_t Sd2Card::setSckRate(uint8_t sckRateID) {
 #endif // SPI_CLOCK_DIV128
   SPI.setClockDivider(v);
 #endif // USE_SPI_LIB
+#endif // defined ZPU
   return true;
 }
 //------------------------------------------------------------------------------

hardware/zpuino/zpu/libraries/SD/utility/Sd2Card.h

@@ -35,7 +35,9 @@ uint8_t const SPI_QUARTER_SPEED = 2;
  * USE_SPI_LIB: if set, use the SPI library bundled with Arduino IDE, otherwise
  * run with a standalone driver for AVR.
  */
+#ifndef ZPU
 #define USE_SPI_LIB
+#endif // ZPU
 /**
  * Define MEGA_SOFT_SPI non-zero to use software SPI on Mega Arduinos.
  * Pins used are SS 10, MOSI 11, MISO 12, and SCK 13.
@@ -52,7 +54,7 @@ uint8_t const SPI_QUARTER_SPEED = 2;
 
 #if defined(ZPU)
 #undef SOFTWARE_SPI
-#endif
+#endif // ZPU
 
 //------------------------------------------------------------------------------
 // SPI pin definitions
@@ -93,6 +95,7 @@ uint8_t const SPI_MISO_PIN = 12;
 /** SPI Clock pin */
 uint8_t const SPI_SCK_PIN = 13;
 #endif  // SOFTWARE_SPI
+#endif // AVR
 //------------------------------------------------------------------------------
 /** Protect block zero from write if nonzero */
 #define SD_PROTECT_BLOCK_ZERO 1

hardware/zpuino/zpu/libraries/SD/utility/Sd2PinMap.h

@@ -371,6 +371,6 @@ static inline __attribute__((always_inline))
 
 #endif  // Sd2PinMap_h
 
-#else
-#error Architecture or board not supported.
+//#else
+//#error Architecture or board not supported.
 #endif