From 8af605422da6ce45f8b8d1290f57e33a5970ea3f Mon Sep 17 00:00:00 2001
From: maxxir <mr.maxim.ibragimov@gmail.com>
Date: Mon, 25 Mar 2019 00:22:08 +0400
Subject: [PATCH] Added in globals.h selector SPI Speed 4/8Mhz

---
 16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h |  4 ++++
 16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/mmc_avr.c | 19 +++++++++++++------
 16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/spi.c     |  9 ++++++++-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h
index 7a57451..cebe8c5 100644
--- a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h
+++ b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/globals.h
@@ -50,6 +50,10 @@ FATFS Fatfs;		//File system object for each logical drive. >= 2
 
 //#define IP_WORK
 
+//SPI CLOCK 4 or 8Mhz
+#define SPI_4_MHZ
+//#define SPI_8_MHZ
+
 extern unsigned long millis(void);
 extern int freeRam (void);
 extern char uart0_receive(void);
diff --git a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/mmc_avr.c b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/mmc_avr.c
index 22ffcb8..2d59360 100644
--- a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/mmc_avr.c
+++ b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/mmc_avr.c
@@ -19,7 +19,7 @@
 
 #include <avr/io.h>
 #include "diskio.h"
-
+#include "globals.h"
 
 /* Port controls  (Platform dependent) */
 
@@ -113,17 +113,24 @@ void power_on (void)
 	DDRB  |= _BV(MOSI) | _BV(SCK) | _BV(CSN);
 	PORTB |= _BV(MOSI) | _BV(SCK);
 
+
+#if defined(SPI_8_MHZ)
 	/* Enables SPI, selects "master", clock rate FCK / 2, and SPI mode 0 */
 	// SPI 8Mhz
 	SPCR = _BV(SPE) | _BV(MSTR);
-	SPSR = _BV(SPI2X);
-
+	SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#elif defined (SPI_4_MHZ)
+	/* Enables SPI, selects "master", clock rate FCK / 4, and SPI mode 0 */
+	// SPI 4Mhz
+	SPCR = _BV(SPE) | _BV(MSTR);
+	SPSR = 0x0; //FCK / 4 - 4Mhz
+#else
 	/* Enables SPI, selects "master", clock rate FCK / 4, and SPI mode 0 */
 	// SPI 4Mhz
-	/*
 	SPCR = _BV(SPE) | _BV(MSTR);
-	SPSR = 0x0;
-	*/
+	SPSR = 0x0; //FCK / 4 - 4Mhz
+#endif
+
 }
 
 static
diff --git a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/spi.c b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/spi.c
index 30986d5..40fa017 100644
--- a/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/spi.c
+++ b/16_m1284p_WIZNET_HTTPD_FTPD_FATFS_SDCARD/spi.c
@@ -30,6 +30,8 @@
 
 #include <avr/io.h>
 #include "spi.h"
+#include "globals.h"
+
 //#include "contiki-conf.h"
 
 /*
@@ -77,8 +79,13 @@ spi_init(void)
  
   /* Enables SPI, selects "master", clock rate FCK / 4 - 4Mhz, and SPI mode 0 */
   SPCR = _BV(SPE) | _BV(MSTR);
-  //SPSR = 0x0; //FCK / 4 - 4Mhz
+#if defined(SPI_8_MHZ)
   SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#elif defined (SPI_4_MHZ)
+  SPSR = 0x0; //FCK / 4 - 4Mhz
+#else
+  SPSR = 0x0; //FCK / 4 - 4Mhz
+#endif
 
 
 }