From 2feb3f0091514daace0436f02c5a2c56f24075da Mon Sep 17 00:00:00 2001
From: maxxir_w <maxx_ir@rambler.ru>
Date: Mon, 25 Mar 2019 08:05:31 +0400
Subject: [PATCH] Added selector SPI Speed 4/8Mhz

---
 04_m1284p_WIZNET_loopback_DHCP/spi.c    | 10 +++++++++-
 05_m1284p_WIZNET_DNS_client/spi.c       | 10 +++++++++-
 06_m1284p_WIZNET_DNS_SNTP_client/spi.c  | 10 +++++++++-
 07_m1284p_WIZNET_telnets_basic/spi.c    | 10 +++++++++-
 08_m1284p_WIZNET_ICMP_aka_ping/spi.c    | 10 +++++++++-
 09_m1284p_WIZNET_simple_webserver/spi.c | 10 +++++++++-
 6 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/04_m1284p_WIZNET_loopback_DHCP/spi.c b/04_m1284p_WIZNET_loopback_DHCP/spi.c
index 3dfca25..40fa017 100644
--- a/04_m1284p_WIZNET_loopback_DHCP/spi.c
+++ b/04_m1284p_WIZNET_loopback_DHCP/spi.c
@@ -30,6 +30,8 @@
 
 #include <avr/io.h>
 #include "spi.h"
+#include "globals.h"
+
 //#include "contiki-conf.h"
 
 /*
@@ -77,7 +79,13 @@ spi_init(void)
  
   /* Enables SPI, selects "master", clock rate FCK / 4 - 4Mhz, and SPI mode 0 */
   SPCR = _BV(SPE) | _BV(MSTR);
-  //SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#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
 
 
 }
diff --git a/05_m1284p_WIZNET_DNS_client/spi.c b/05_m1284p_WIZNET_DNS_client/spi.c
index 3dfca25..40fa017 100644
--- a/05_m1284p_WIZNET_DNS_client/spi.c
+++ b/05_m1284p_WIZNET_DNS_client/spi.c
@@ -30,6 +30,8 @@
 
 #include <avr/io.h>
 #include "spi.h"
+#include "globals.h"
+
 //#include "contiki-conf.h"
 
 /*
@@ -77,7 +79,13 @@ spi_init(void)
  
   /* Enables SPI, selects "master", clock rate FCK / 4 - 4Mhz, and SPI mode 0 */
   SPCR = _BV(SPE) | _BV(MSTR);
-  //SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#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
 
 
 }
diff --git a/06_m1284p_WIZNET_DNS_SNTP_client/spi.c b/06_m1284p_WIZNET_DNS_SNTP_client/spi.c
index 3dfca25..40fa017 100644
--- a/06_m1284p_WIZNET_DNS_SNTP_client/spi.c
+++ b/06_m1284p_WIZNET_DNS_SNTP_client/spi.c
@@ -30,6 +30,8 @@
 
 #include <avr/io.h>
 #include "spi.h"
+#include "globals.h"
+
 //#include "contiki-conf.h"
 
 /*
@@ -77,7 +79,13 @@ spi_init(void)
  
   /* Enables SPI, selects "master", clock rate FCK / 4 - 4Mhz, and SPI mode 0 */
   SPCR = _BV(SPE) | _BV(MSTR);
-  //SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#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
 
 
 }
diff --git a/07_m1284p_WIZNET_telnets_basic/spi.c b/07_m1284p_WIZNET_telnets_basic/spi.c
index 3dfca25..40fa017 100644
--- a/07_m1284p_WIZNET_telnets_basic/spi.c
+++ b/07_m1284p_WIZNET_telnets_basic/spi.c
@@ -30,6 +30,8 @@
 
 #include <avr/io.h>
 #include "spi.h"
+#include "globals.h"
+
 //#include "contiki-conf.h"
 
 /*
@@ -77,7 +79,13 @@ spi_init(void)
  
   /* Enables SPI, selects "master", clock rate FCK / 4 - 4Mhz, and SPI mode 0 */
   SPCR = _BV(SPE) | _BV(MSTR);
-  //SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#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
 
 
 }
diff --git a/08_m1284p_WIZNET_ICMP_aka_ping/spi.c b/08_m1284p_WIZNET_ICMP_aka_ping/spi.c
index 3dfca25..40fa017 100644
--- a/08_m1284p_WIZNET_ICMP_aka_ping/spi.c
+++ b/08_m1284p_WIZNET_ICMP_aka_ping/spi.c
@@ -30,6 +30,8 @@
 
 #include <avr/io.h>
 #include "spi.h"
+#include "globals.h"
+
 //#include "contiki-conf.h"
 
 /*
@@ -77,7 +79,13 @@ spi_init(void)
  
   /* Enables SPI, selects "master", clock rate FCK / 4 - 4Mhz, and SPI mode 0 */
   SPCR = _BV(SPE) | _BV(MSTR);
-  //SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#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
 
 
 }
diff --git a/09_m1284p_WIZNET_simple_webserver/spi.c b/09_m1284p_WIZNET_simple_webserver/spi.c
index 3dfca25..40fa017 100644
--- a/09_m1284p_WIZNET_simple_webserver/spi.c
+++ b/09_m1284p_WIZNET_simple_webserver/spi.c
@@ -30,6 +30,8 @@
 
 #include <avr/io.h>
 #include "spi.h"
+#include "globals.h"
+
 //#include "contiki-conf.h"
 
 /*
@@ -77,7 +79,13 @@ spi_init(void)
  
   /* Enables SPI, selects "master", clock rate FCK / 4 - 4Mhz, and SPI mode 0 */
   SPCR = _BV(SPE) | _BV(MSTR);
-  //SPSR = _BV(SPI2X); //FCK / 2 - 8Mhz
+#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
 
 
 }