Merge branch 'master' into Arduino_1.5.5

ntruchsess · Mar 3, 2014 · 9601aaf · 9601aaf
2 parents 97b9044 + 0389c02
commit 9601aaf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/UIPEthernet/src/utility/Enc28J60Network.cpp b/UIPEthernet/src/utility/Enc28J60Network.cpp
@@ -586,6 +586,19 @@ Enc28J60Network::phyWrite(uint8_t address, uint16_t data)
   }
 }
 
+uint16_t
+Enc28J60Network::phyRead(uint8_t address)
+{
+  writeReg(MIREGADR,address);
+  writeReg(MICMD, MICMD_MIIRD);
+  // wait until the PHY read completes
+  while(readReg(MISTAT) & MISTAT_BUSY){
+    delayMicroseconds(15);
+  }  //and MIRDH
+  writeReg(MICMD, 0);
+  return (readReg(MIRDL) | readReg(MIRDH) << 8);
+}
+
 void
 Enc28J60Network::clkout(uint8_t clk)
 {
@@ -671,4 +684,10 @@ Enc28J60Network::powerOn()
   delay(50);
 }
 
+bool
+Enc28J60Network::linkStatus()
+{
+  return (phyRead(PHSTAT2) & 0x0400) > 0;
+}
+
 Enc28J60Network Enc28J60;
diff --git a/UIPEthernet/src/utility/Enc28J60Network.h b/UIPEthernet/src/utility/Enc28J60Network.h
@@ -71,6 +71,7 @@ class Enc28J60Network : public MemoryPool
   static void writeReg(uint8_t address, uint8_t data);
   static void writeRegPair(uint8_t address, uint16_t data);
   static void phyWrite(uint8_t address, uint16_t data);
+  static uint16_t phyRead(uint8_t address);
   static void clkout(uint8_t clk);
 
   friend void enc28J60_mempool_block_move_callback(memaddress,memaddress,memaddress);
@@ -80,6 +81,7 @@ class Enc28J60Network : public MemoryPool
   uint8_t getrev(void);
   void powerOn();
   void powerOff();
+  bool linkStatus();
 
   static void init(uint8_t* macaddr);
   static memhandle receivePacket();