Ethernet: initialized flag

Author: JAndrassy

src/Ethernet.cpp

@@ -30,6 +30,7 @@ extern "C"
 
 #define ETH_HDR ((struct uip_eth_hdr *)&uip_buf[0])
 
+bool UIPEthernetClass::initialized = false;
 memhandle UIPEthernetClass::in_packet(NOBLOCK);
 memhandle UIPEthernetClass::uip_packet(NOBLOCK);
 uint8_t UIPEthernetClass::uip_hdrlen(0);
@@ -131,13 +132,14 @@ int UIPEthernetClass::maintain(){
 
 EthernetLinkStatus UIPEthernetClass::linkStatus()
 {
-  if (!Enc28J60Network::getrev())
+  if (!(initialized && Enc28J60Network::getrev()))
     return Unknown;
   return Enc28J60Network::linkStatus() ? LinkON : LinkOFF;
 }
 
-EthernetHardwareStatus UIPEthernetClass::hardwareStatus() {
-  if (!Enc28J60Network::getrev())
+EthernetHardwareStatus UIPEthernetClass::hardwareStatus()
+{
+  if (!(initialized && Enc28J60Network::getrev()))
     return EthernetNoHardware;
   return EthernetENC28J60;
 }
@@ -174,6 +176,8 @@ IPAddress UIPEthernetClass::dnsServerIP()
 void
 UIPEthernetClass::tick()
 {
+  if (!initialized)
+    return;
   if (in_packet == NOBLOCK)
     {
       in_packet = Enc28J60Network::receivePacket();
@@ -331,7 +335,7 @@ boolean UIPEthernetClass::network_send()
 void UIPEthernetClass::init(const uint8_t* mac) {
   periodic_timer = millis() + UIP_PERIODIC_TIMER;
 
-  Enc28J60Network::init((uint8_t*)mac);
+  initialized = Enc28J60Network::init((uint8_t*)mac);
   uip_seteth_addr(mac);
 
   uip_init();
@@ -353,9 +357,6 @@ void UIPEthernetClass::configure(IPAddress ip, IPAddress dns, IPAddress gateway,
   _dnsServerAddress = dns;
 }
 
-UIPEthernetClass Ethernet;
-#define UIPEthernet Ethernet
-
 /*---------------------------------------------------------------------------*/
 uint16_t
 UIPEthernetClass::chksum(uint16_t sum, const uint8_t *data, uint16_t len)
@@ -480,21 +481,23 @@ uip_tcpchksum(void)
 uint16_t
 uip_ipchksum(void)
 {
-  return UIPEthernet.ipchksum();
+  return UIPEthernetClass::ipchksum();
 }
 
 #if UIP_UDP
 uint16_t
 uip_tcpchksum(void)
 {
-  uint16_t sum = UIPEthernet.upper_layer_chksum(UIP_PROTO_TCP);
+  uint16_t sum = UIPEthernetClass::upper_layer_chksum(UIP_PROTO_TCP);
   return sum;
 }
 
 uint16_t
 uip_udpchksum(void)
 {
-  uint16_t sum = UIPEthernet.upper_layer_chksum(UIP_PROTO_UDP);
+  uint16_t sum = UIPEthernetClass::upper_layer_chksum(UIP_PROTO_UDP);
   return sum;
 }
 #endif
+
+UIPEthernetClass Ethernet;

src/Ethernet.h

@@ -99,6 +99,7 @@ class UIPEthernetClass
   IPAddress dnsServerIP();
 
 private:
+  static bool initialized;
   static memhandle in_packet;
   static memhandle uip_packet;
   static uint8_t uip_hdrlen;

src/utility/Enc28J60Network.cpp

@@ -44,7 +44,7 @@ uint8_t Enc28J60Network::bank=0xff;
 
 struct memblock Enc28J60Network::receivePkt;
 
-void Enc28J60Network::init(uint8_t* macaddr)
+bool Enc28J60Network::init(uint8_t* macaddr)
 {
 
   MemoryPool::init(); // 1 byte in between RX_STOP_INIT and pool to allow prepending of controlbyte
@@ -126,6 +126,8 @@ void Enc28J60Network::init(uint8_t* macaddr)
   phyWrite(PHLCON,0x476);
 
   SPI.endTransaction();
+
+  return getrev();
 }
 
 memhandle

src/utility/Enc28J60Network.h

@@ -78,7 +78,7 @@ class Enc28J60Network : public MemoryPool
   static bool linkStatus();
 
   static void setCsPin(uint8_t _csPin) {csPin = _csPin;}
-  static void init(uint8_t* macaddr);
+  static bool init(uint8_t* macaddr);
   static memhandle receivePacket();
   static void freePacket();
   static memaddress blockSize(memhandle handle);