Diff: Dhcp.cpp

Revision:

4:d774541a34da

Parent:

2:049ce85163c5

Child:

6:10e42359e217

--- a/Dhcp.cpp	Sat Dec 20 11:10:40 2014 +0000
+++ b/Dhcp.cpp	Sun Mar 08 20:26:56 2015 +0000
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "Dhcp.h"
-#include  "utility/util.h"
-#include  "utility/uip_clock.h"
+#include "utility/util.h"
+#include "utility/millis.h"
 
 /**
  * @brief
@@ -62,19 +62,19 @@
 
     int             result = 0;
 
-    unsigned long   startTime = clock_time();
+    unsigned long   startTime = millis();
 
     while(_dhcp_state != STATE_DHCP_LEASED) {
         if(_dhcp_state == STATE_DHCP_START) {
             _dhcpTransactionId++;
 
-            send_DHCP_MESSAGE(DHCP_DISCOVER, ((clock_time() - startTime) / 1000));
+            send_DHCP_MESSAGE(DHCP_DISCOVER, ((millis() - startTime) / 1000));
             _dhcp_state = STATE_DHCP_DISCOVER;
         }
         else
         if(_dhcp_state == STATE_DHCP_REREQUEST) {
             _dhcpTransactionId++;
-            send_DHCP_MESSAGE(DHCP_REQUEST, ((clock_time() - startTime) / 1000));
+            send_DHCP_MESSAGE(DHCP_REQUEST, ((millis() - startTime) / 1000));
             _dhcp_state = STATE_DHCP_REQUEST;
         }
         else
@@ -86,7 +86,7 @@
                 // We'll use the transaction ID that the offer came with,
                 // rather than the one we were up to
                 _dhcpTransactionId = respId;
-                send_DHCP_MESSAGE(DHCP_REQUEST, ((clock_time() - startTime) / 1000));
+                send_DHCP_MESSAGE(DHCP_REQUEST, ((millis() - startTime) / 1000));
                 _dhcp_state = STATE_DHCP_REQUEST;
             }
         }
@@ -129,7 +129,7 @@
             _dhcp_state = STATE_DHCP_START;
         }
 
-        if(result != 1 && ((clock_time() - startTime) > _timeout))
+        if(result != 1 && ((millis() - startTime) > _timeout))
             break;
     }
 
@@ -279,14 +279,14 @@
     uint8_t         type = 0;
     uint8_t         opt_len = 0;
 
-    unsigned long   startTime = clock_time();
+    unsigned long   startTime = millis();
 
     while(_dhcpUdpSocket.parsePacket() <= 0) {
-        if((clock_time() - startTime) > responseTimeout) {
+        if((millis() - startTime) > responseTimeout) {
             return 255;
         }
 
-        wait(0.050);
+        wait_ms(50);
     }
 
     // start reading in the packet
@@ -412,7 +412,7 @@
 int DhcpClass::checkLease(void) {
 
     //this uses a signed / unsigned trick to deal with millis overflow
-    unsigned long   now = clock_time();
+    unsigned long   now = millis();
     signed long     snow = (long)now;
     int             rc = DHCP_CHECK_NONE;
     if(_lastCheck != 0) {