Merge branch 'master' of https://github.com/arduino-org/brackets-arduino

Author: sebba

libraries/Ethernet/src/Ethernet.cpp

@@ -16,22 +16,30 @@ int EthernetClass::begin(uint8_t *mac_address)
 
   // Initialise the basic info
   W5100.init();
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
+  #endif
   W5100.setMACAddress(mac_address);
   W5100.setIPAddress(IPAddress(0,0,0,0).raw_address());
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.endTransaction();
+  #endif
 
   // Now try to get our config info from a DHCP server
   int ret = _dhcp->beginWithDHCP(mac_address);
   if(ret == 1)
   {
     // We've successfully found a DHCP server and got our configuration info, so set things
     // accordingly
+	#ifndef ARDUINO_ARCH_SAMD
     SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
+	#endif
     W5100.setIPAddress(_dhcp->getLocalIp().raw_address());
     W5100.setGatewayIp(_dhcp->getGatewayIp().raw_address());
     W5100.setSubnetMask(_dhcp->getSubnetMask().raw_address());
+	#ifndef ARDUINO_ARCH_SAMD
     SPI.endTransaction();
+	#endif
     _dnsServerAddress = _dhcp->getDnsServerIp();
   }
 
@@ -65,12 +73,16 @@ void EthernetClass::begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dn
 void EthernetClass::begin(uint8_t *mac, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet)
 {
   W5100.init();
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
+  #endif
   W5100.setMACAddress(mac);
   W5100.setIPAddress(local_ip.raw_address());
   W5100.setGatewayIp(gateway.raw_address());
   W5100.setSubnetMask(subnet.raw_address());
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.endTransaction();
+  #endif
   _dnsServerAddress = dns_server;
 }
 
@@ -86,11 +98,15 @@ int EthernetClass::maintain(){
       case DHCP_CHECK_RENEW_OK:
       case DHCP_CHECK_REBIND_OK:
         //we might have got a new IP.
+		#ifndef ARDUINO_ARCH_SAMD
         SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
+		#endif
         W5100.setIPAddress(_dhcp->getLocalIp().raw_address());
         W5100.setGatewayIp(_dhcp->getGatewayIp().raw_address());
         W5100.setSubnetMask(_dhcp->getSubnetMask().raw_address());
+		#ifndef ARDUINO_ARCH_SAMD
         SPI.endTransaction();
+		#endif
         _dnsServerAddress = _dhcp->getDnsServerIp();
         break;
       default:
@@ -104,27 +120,39 @@ int EthernetClass::maintain(){
 IPAddress EthernetClass::localIP()
 {
   IPAddress ret;
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
+  #endif
   W5100.getIPAddress(ret.raw_address());
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.endTransaction();
+  #endif
   return ret;
 }
 
 IPAddress EthernetClass::subnetMask()
 {
   IPAddress ret;
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
+  #endif
   W5100.getSubnetMask(ret.raw_address());
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.endTransaction();
+  #endif
   return ret;
 }
 
 IPAddress EthernetClass::gatewayIP()
 {
   IPAddress ret;
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
+  #endif
   W5100.getGatewayIp(ret.raw_address());
+  #ifndef ARDUINO_ARCH_SAMD
   SPI.endTransaction();
+  #endif
   return ret;
 }