Merge branch 'trunk' into feature/e1000-network-card

* Redure DHCP sleep time

* Rename delay variable

src/sys/net/nic/e1000.rs

@@ -186,7 +186,7 @@ impl Device {
         self.init_tx();
         self.link_up();
 
-        // Enable interrupts
+        // TODO: Enable interrupts
         //self.write(REG_IMS, ICR_LSC | ICR_RXDMT0 | ICR_RXT0);
         self.write(REG_IMS, 0);
 

src/usr/dhcp.rs

@@ -64,8 +64,9 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                 Some(dhcpv4::Event::Deconfigured) => {}
             }
 
-            if let Some(d) = iface.poll_delay(time, &sockets) {
-                syscall::sleep((d.total_micros() as f64) / 1000000.0);
+            if let Some(delay) = iface.poll_delay(time, &sockets) {
+                let d = (delay.total_micros() as f64) / 1000000.0;
+                syscall::sleep(d.min(0.1)); // Don't sleep longer than 0.1s
             }
         }
     } else {

src/usr/httpd.rs

@@ -451,10 +451,10 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
                     send_queue.clear();
                 }
             }
-            if let Some(wait_duration) = iface.poll_delay(time, &sockets) {
-                let t = wait_duration.total_micros() / POLL_DELAY_DIV as u64;
-                if t > 0 {
-                    syscall::sleep((t as f64) / 1000000.0);
+            if let Some(delay) = iface.poll_delay(time, &sockets) {
+                let d = delay.total_micros() / POLL_DELAY_DIV as u64;
+                if d > 0 {
+                    syscall::sleep((d as f64) / 1000000.0);
                 }
             }
         }