Modify gPXE core and drivers to work with the new timer subsystem

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>

58 files changed, 62 insertions, 121 deletions

diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 5e7416cb..da7976df 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -7,6 +7,7 @@ ISOLINUX_BIN	= /usr/lib/syslinux/isolinux.bin
 SRCDIRS		+= arch/i386/core arch/i386/transitions arch/i386/prefix
 SRCDIRS		+= arch/i386/firmware/pcbios
 SRCDIRS		+= arch/i386/image
+SRCDIRS		+= arch/i386/drivers
 SRCDIRS		+= arch/i386/drivers/bus
 SRCDIRS		+= arch/i386/drivers/net
 SRCDIRS		+= arch/i386/drivers/disk
diff --git a/src/arch/i386/firmware/pcbios/gateA20.c b/src/arch/i386/firmware/pcbios/gateA20.c
index 66b4da18..2caac894 100644
--- a/src/arch/i386/firmware/pcbios/gateA20.c
+++ b/src/arch/i386/firmware/pcbios/gateA20.c
@@ -1,8 +1,7 @@
 #include <stdio.h>
-#include "realmode.h"
-#include "timer.h"
-#include "latch.h"
-#include "bios.h"
+#include <realmode.h>
+#include <bios.h>
+#include <gpxe/timer.h>
 
 #define K_RDWR		0x60		/* keyboard data & cmds (read/write) */
 #define K_STATUS	0x64		/* keyboard status */
diff --git a/src/arch/i386/include/latch.h b/src/arch/i386/include/latch.h
deleted file mode 100644
index 5000d582..00000000
--- a/src/arch/i386/include/latch.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef LATCH_H
-#define LATCH_H
-
-#define	TICKS_PER_SEC		18
-
-/* For different calibrators of the TSC move the declaration of
- * sleep_latch and the definitions of it's length here...
- */
-
-extern unsigned long currticks ( void );
-
-#endif /* LATCH_H */
diff --git a/src/core/getkey.c b/src/core/getkey.c
index 71ec6cc1..1551cf37 100644
--- a/src/core/getkey.c
+++ b/src/core/getkey.c
@@ -17,9 +17,9 @@
  */
 
 #include <console.h>
-#include <latch.h>
 #include <gpxe/process.h>
 #include <gpxe/keys.h>
+#include <gpxe/timer.h>
 
 /** @file
  *
diff --git a/src/core/misc.c b/src/core/misc.c
index fcf0aeab..a54f5a10 100644
--- a/src/core/misc.c
+++ b/src/core/misc.c
@@ -4,8 +4,8 @@ MISC Support Routines
 
 #include <stdlib.h>
 #include <byteswap.h>
-#include <latch.h>
 #include <gpxe/in.h>
+#include <gpxe/timer.h>
 
 /**************************************************************************
 INET_ATON - Convert an ascii x.x.x.x to binary form
diff --git a/src/core/random.c b/src/core/random.c
index e4a70d43..d34e763a 100644
--- a/src/core/random.c
+++ b/src/core/random.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <latch.h>
+#include <gpxe/timer.h>
 
 static int32_t rnd_seed = 0;
 
diff --git a/src/core/serial.c b/src/core/serial.c
index f325bc45..f6d0ecbb 100644
--- a/src/core/serial.c
+++ b/src/core/serial.c
@@ -15,7 +15,7 @@
 #include "console.h"
 #include <gpxe/init.h>
 #include "io.h"
-#include "timer.h"
+#include <unistd.h>
 #include "config/serial.h"
 
 /* Set default values if none specified */
diff --git a/src/drivers/bitbash/bitbash.c b/src/drivers/bitbash/bitbash.c
index ec94feee..c6f93520 100644
--- a/src/drivers/bitbash/bitbash.c
+++ b/src/drivers/bitbash/bitbash.c
@@ -16,7 +16,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <timer.h>
 #include <gpxe/bitbash.h>
 
 /** @file
diff --git a/src/drivers/bitbash/i2c_bit.c b/src/drivers/bitbash/i2c_bit.c
index d8fbacc0..a3af610b 100644
--- a/src/drivers/bitbash/i2c_bit.c
+++ b/src/drivers/bitbash/i2c_bit.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <assert.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/bitbash.h>
 #include <gpxe/i2c.h>
 
diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c
index a4e7136f..ef87b5a2 100644
--- a/src/drivers/bitbash/spi_bit.c
+++ b/src/drivers/bitbash/spi_bit.c
@@ -22,7 +22,7 @@
 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/bitbash.h>
 #include <gpxe/spi_bit.h>
 
diff --git a/src/drivers/bus/eisa.c b/src/drivers/bus/eisa.c
index d9d02d72..ee03df3a 100644
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <io.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/eisa.h>
 
 static struct eisa_driver eisa_drivers[0]
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c
index 7903208d..f4968eb1 100644
--- a/src/drivers/bus/isapnp.c
+++ b/src/drivers/bus/isapnp.c
@@ -61,7 +61,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <io.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/isapnp.h>
 
 /**
diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index 375a6834..eb7b7e39 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <io.h>
-#include <timer.h>
 #include <gpxe/mca.h>
 
 static struct mca_driver mca_drivers[0]
diff --git a/src/drivers/infiniband/arbel.c b/src/drivers/infiniband/arbel.c
index 147cf8b9..462638ea 100644
--- a/src/drivers/infiniband/arbel.c
+++ b/src/drivers/infiniband/arbel.c
@@ -26,7 +26,6 @@
 #include <strings.h>
 #include <unistd.h>
 #include <errno.h>
-#include <timer.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/malloc.h>
diff --git a/src/drivers/infiniband/hermon.c b/src/drivers/infiniband/hermon.c
index fecf3988..c10559f9 100644
--- a/src/drivers/infiniband/hermon.c
+++ b/src/drivers/infiniband/hermon.c
@@ -24,7 +24,6 @@
 #include <strings.h>
 #include <unistd.h>
 #include <errno.h>
-#include <timer.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/malloc.h>
diff --git a/src/drivers/net/3c509.c b/src/drivers/net/3c509.c
index e704cfca..8a15aff2 100644
--- a/src/drivers/net/3c509.c
+++ b/src/drivers/net/3c509.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <errno.h>
 #include <io.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/device.h>
 #include <gpxe/isa.h>
 #include "3c509.h"
diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c
index d0bf3189..02f03dc7 100644
--- a/src/drivers/net/3c515.c
+++ b/src/drivers/net/3c515.c
@@ -50,7 +50,6 @@
 #include "nic.h"
 #include <gpxe/isapnp.h>
 #include <gpxe/isa.h> /* for ISA_ROM */
-#include "timer.h"
 #include <gpxe/ethernet.h>
 
 static void t3c515_wait(unsigned int nticks)
diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c
index 572a99e0..7138f936 100644
--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -30,7 +30,6 @@
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
 #include "3c595.h"
-#include "timer.h"
 
 static struct nic_operations t595_operations;
 
diff --git a/src/drivers/net/3c5x9.c b/src/drivers/net/3c5x9.c
index 1ade6f47..565044a1 100644
--- a/src/drivers/net/3c5x9.c
+++ b/src/drivers/net/3c5x9.c
@@ -28,7 +28,6 @@ $Id$
 #include "etherboot.h"
 #include "nic.h"
 #include <gpxe/isa.h>
-#include "timer.h"
 #include "3c509.h"
 
 static enum { none, bnc, utp } connector = none;	/* for 3C509 */
diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index 8e1f160e..8158239d 100644
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -43,7 +43,6 @@
 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 
 static struct nic_operations a3c90x_operations;
 
@@ -498,6 +497,7 @@ a3c90x_transmit(struct nic *nic __unused, const char *d, unsigned int t,
 
     unsigned char status;
     unsigned i, retries;
+    tick_t ct;
 
     for (retries=0; retries < XMIT_RETRIES ; retries++)
 	{
@@ -540,9 +540,10 @@ a3c90x_transmit(struct nic *nic __unused, const char *d, unsigned int t,
 	    ;
 
 	/** Wait for NIC Transmit to Complete **/
-	load_timer2(10*TICKS_PER_MS);	/* Give it 10 ms */
+	ct = currticks();
+
 	while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004) &&
-		timer2_running())
+		ct + 10*USECS_IN_MSEC < currticks());
 		;
 
 	if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004))
diff --git a/src/drivers/net/amd8111e.c b/src/drivers/net/amd8111e.c
index c26c07cf..1c41add1 100644
--- a/src/drivers/net/amd8111e.c
+++ b/src/drivers/net/amd8111e.c
@@ -33,7 +33,6 @@
 #include "mii.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "string.h"
 #include "stdint.h"
 #include "amd8111e.h"
diff --git a/src/drivers/net/bnx2.c b/src/drivers/net/bnx2.c
index fdd6655b..9c989c4c 100644
--- a/src/drivers/net/bnx2.c
+++ b/src/drivers/net/bnx2.c
@@ -18,7 +18,6 @@
 #include <errno.h>
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "string.h"
 #include "bnx2.h"
 #include "bnx2_fw.h"
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c
index 34e211d4..9cf50418 100644
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -43,7 +43,6 @@
 /* to get the PCI support functions, if this is a PCI NIC */
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 
 /* #define EDEBUG 1 */
 #ifdef EDEBUG
diff --git a/src/drivers/net/e1000/e1000.h b/src/drivers/net/e1000/e1000.h
index b4bc1d87..4ae41451 100644
--- a/src/drivers/net/e1000/e1000.h
+++ b/src/drivers/net/e1000/e1000.h
@@ -36,7 +36,6 @@
 #include <stdio.h>
 #include <io.h>
 #include <errno.h>
-#include <timer.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/malloc.h>
diff --git a/src/drivers/net/e1000/e1000_osdep.h b/src/drivers/net/e1000/e1000_osdep.h
index 04e14892..7df9b5e9 100644
--- a/src/drivers/net/e1000/e1000_osdep.h
+++ b/src/drivers/net/e1000/e1000_osdep.h
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <io.h>
 #include <errno.h>
-#include <timer.h>
+#include <unistd.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/if_ether.h>
diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c
index 0a9c95e6..2a163d1b 100644
--- a/src/drivers/net/eepro.c
+++ b/src/drivers/net/eepro.c
@@ -35,7 +35,6 @@ has 34 pins, the top row of 2 are not used.
 #include <errno.h>
 #include "nic.h"
 #include <gpxe/isa.h>
-#include "timer.h"
 #include <gpxe/ethernet.h>
 
 /* Different 82595 chips */
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index bb46d163..f746976a 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -107,7 +107,6 @@
 #include "nic.h"
 #include <gpxe/ethernet.h>
 #include <gpxe/pci.h>
-#include "timer.h"
 
 static int ioaddr;
 
@@ -408,6 +407,7 @@ static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, un
 	} hdr;
 	unsigned short status;
 	int s1, s2;
+	tick_t ct;
 
 	status = inw(ioaddr + SCBStatus);
 	/* Acknowledge all of the current interrupt sources ASAP. */
@@ -445,8 +445,10 @@ static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, un
 	wait_for_cmd_done(ioaddr + SCBCmd);
 
 	s1 = inw (ioaddr + SCBStatus);
-	load_timer2(10*TICKS_PER_MS);		/* timeout 10 ms for transmit */
-	while (!txfd.status && timer2_running())
+
+	ct = currticks();
+	/* timeout 10 ms for transmit */
+	while (!txfd.status && ct + 10*USECS_IN_MSEC)
 		/* Wait */;
 	s2 = inw (ioaddr + SCBStatus);
 
@@ -606,6 +608,7 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) {
 	int read_cmd, ee_size;
 	int options;
 	int rx_mode;
+	tick_t ct;
 
 	/* we cache only the first few words of the EEPROM data
 	   be careful not to access beyond this array */
@@ -749,8 +752,8 @@ static int eepro100_probe ( struct nic *nic, struct pci_device *pci ) {
 
 	whereami ("started TX thingy (config, iasetup).");
 
-	load_timer2(10*TICKS_PER_MS);
-	while (!txfd.status && timer2_running())
+	ct = currticks();
+	while (!txfd.status && ct + 10*USECS_IN_MSEC < currticks())
 		/* Wait */;
 
 	/* Read the status register once to disgard stale data */
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index e79da2b9..67b4f0fb 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -8,7 +8,6 @@
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
 #include "nic.h"
-#include "timer.h"
 #include "console.h"
 #include "epic100.h"
 
@@ -310,6 +309,7 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type,
     unsigned short nstype;
     unsigned char *txp;
     int entry;
+    tick_t ct;
 
     /* Calculate the next Tx descriptor entry. */
     entry = cur_tx % TX_RING_SIZE;
@@ -339,18 +339,20 @@ epic100_transmit(struct nic *nic, const char *destaddr, unsigned int type,
      * set the base address with the "ownership"
      * bits last.
      */
-    
+   
     tx_ring[entry].buflength |= cpu_to_le32(len);
-    tx_ring[entry].status = cpu_to_le32(len << 16) | 
+    tx_ring[entry].status = cpu_to_le32(len << 16) |
 	    cpu_to_le32(TRING_OWN);	/* Pass ownership to the chip. */
 
     cur_tx++;
 
     /* Trigger an immediate transmit demand. */
-    outl(CR_QUEUE_TX, command); 
-    
-    load_timer2(10*TICKS_PER_MS);         /* timeout 10 ms for transmit */
-    while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) && timer2_running())
+    outl(CR_QUEUE_TX, command);
+
+    ct = currticks();
+    /* timeout 10 ms for transmit */
+    while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) &&
+		ct + 10*USECS_IN_MSEC < currticks())
 	/* Wait */;
 
     if ((le32_to_cpu(tx_ring[entry].status) & TRING_OWN) != 0)
diff --git a/src/drivers/net/etherfabric.c b/src/drivers/net/etherfabric.c
index 6b763451..90cc73f4 100644
--- a/src/drivers/net/etherfabric.c
+++ b/src/drivers/net/etherfabric.c
@@ -24,7 +24,6 @@
 #include <gpxe/i2c.h>
 #include <gpxe/spi.h>
 #include <gpxe/nvo.h>
-#include "timer.h"
 #define dma_addr_t unsigned long
 #include "etherfabric.h"
 
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c
index 9ef1dd79..f6195885 100644
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -51,7 +51,6 @@
 #include <gpxe/pci.h>
 /* Include timer support functions */
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "mii.h"
 
 #define drv_version "v1.2"
diff --git a/src/drivers/net/ipoib.c b/src/drivers/net/ipoib.c
index 905051bf..d457b258 100644
--- a/src/drivers/net/ipoib.c
+++ b/src/drivers/net/ipoib.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <byteswap.h>
 #include <errno.h>
-#include "timer.h"
 #include <gpxe/if_arp.h>
 #include <gpxe/iobuf.h>
 #include <gpxe/netdevice.h>
diff --git a/src/drivers/net/mlx_ipoib/mt23108_imp.c b/src/drivers/net/mlx_ipoib/mt23108_imp.c
index 4e601668..bb2383c5 100644
--- a/src/drivers/net/mlx_ipoib/mt23108_imp.c
+++ b/src/drivers/net/mlx_ipoib/mt23108_imp.c
@@ -37,7 +37,6 @@ static void be_to_cpu_buf(void *buf, int size)
 	}
 }
 
-#include "timer.h"
 #include "cmdif_mt23108.c"
 #include "cmdif_comm.c"
 #include "ib_mt23108.c"
diff --git a/src/drivers/net/mlx_ipoib/mt25218_imp.c b/src/drivers/net/mlx_ipoib/mt25218_imp.c
index fe407041..007ee653 100644
--- a/src/drivers/net/mlx_ipoib/mt25218_imp.c
+++ b/src/drivers/net/mlx_ipoib/mt25218_imp.c
@@ -37,7 +37,6 @@ static void be_to_cpu_buf(void *buf, int size)
 	}
 }
 
-#include "timer.h"
 #include "cmdif_mt25218.c"
 #include "cmdif_comm.c"
 #include "ib_mt25218.c"
diff --git a/src/drivers/net/mtnic.c b/src/drivers/net/mtnic.c
index a568b2f7..536fcb8d 100755
--- a/src/drivers/net/mtnic.c
+++ b/src/drivers/net/mtnic.c
@@ -37,7 +37,7 @@
 #include <gpxe/umalloc.h>
 #include <bits/byteswap.h>
 #include <little_bswap.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
 #include <gpxe/netdevice.h>
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index 72047610..98a5ff84 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -63,8 +63,8 @@
 #include <stdio.h>
 #include <io.h>
 #include <errno.h>
-#include <timer.h>
 #include <byteswap.h>
+#include <unistd.h>
 #include <gpxe/pci.h>
 #include <gpxe/if_ether.h>
 #include <gpxe/ethernet.h>
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index e4318429..d8529da1 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -43,7 +43,6 @@
 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "mii.h"
 
 /* void hex_dump(const char *data, const unsigned int len); */
diff --git a/src/drivers/net/prism2.c b/src/drivers/net/prism2.c
index 3c512519..aaf4c968 100644
--- a/src/drivers/net/prism2.c
+++ b/src/drivers/net/prism2.c
@@ -62,7 +62,6 @@ static const char hardcoded_ssid[] = "";
  * quicker to convert code from the Linux Prism2 driver.
  */
 #include <errno.h>
-#include "timer.h"
 #define __le16_to_cpu(x) (x)
 #define __le32_to_cpu(x) (x)
 #define __cpu_to_le16(x) (x)
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index 52cb0d0e..ab9a30f8 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -49,7 +49,6 @@
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
 #include <gpxe/malloc.h>
-#include "timer.h"
 
 #define drv_version "v1.6"
 #define drv_date "03-27-2004"
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index b4c99fcb..83fac554 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -71,7 +71,7 @@
 #include <stdio.h>
 #include <io.h>
 #include <errno.h>
-#include <timer.h>
+#include <unistd.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/if_ether.h>
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index cf9b2ce6..58526506 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -46,7 +46,6 @@
 #include "etherboot.h"
 #include <gpxe/pci.h>
 #include "nic.h"
-#include "timer.h"
 
 #include "sis900.h"
 
diff --git a/src/drivers/net/smc9000.c b/src/drivers/net/smc9000.c
index c6219ee7..31a1e1b1 100644
--- a/src/drivers/net/smc9000.c
+++ b/src/drivers/net/smc9000.c
@@ -40,7 +40,6 @@
 #include "etherboot.h"
 #include "nic.h"
 #include <gpxe/isa.h>
-#include "timer.h"
 #include "smc9000.h"
 
 # define _outb outb
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index 3bbfbfbb..3b6f5a88 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -46,7 +46,6 @@
 #include "nic.h"
 /* to get the PCI support functions, if this is a PCI NIC */
 #include <gpxe/pci.h>
-#include "timer.h"
 #include "mii.h"
 
 #define drv_version "v1.12"
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index 2188def4..57b9df1e 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -17,7 +17,6 @@
 #include <errno.h>
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "string.h"
 #include "tg3.h"
 
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index 60ca182e..4fae0170 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -42,7 +42,6 @@
 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "tlan.h"
 
 #define drv_version "v1.4"
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index 0c955fab..81350091 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -50,7 +50,6 @@ static const char *version = "rhine.c v1.0.2 2004-10-29\n";
 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 
 /* define all ioaddr */
 
@@ -785,6 +784,7 @@ ReadMII (int byMIIIndex, int ioaddr)
     char byMIIAdrbak;
     char byMIICRbak;
     char byMIItemp;
+    tick_t ct;
 
     byMIIAdrbak = inb (byMIIAD);
     byMIICRbak = inb (byMIICR);
@@ -799,8 +799,8 @@ ReadMII (int byMIIIndex, int ioaddr)
     byMIItemp = inb (byMIICR);
     byMIItemp = byMIItemp & 0x40;
 
-    load_timer2(2*TICKS_PER_MS);
-    while (byMIItemp != 0 && timer2_running())
+    ct = currticks();
+    while (byMIItemp != 0 && ct + 2*USECS_IN_MSEC < currticks())
     {
 	byMIItemp = inb (byMIICR);
 	byMIItemp = byMIItemp & 0x40;
@@ -825,6 +825,7 @@ WriteMII (char byMIISetByte, char byMIISetBit, char byMIIOP, int ioaddr)
     char byMIIAdrbak;
     char byMIICRbak;
     char byMIItemp;
+    tick_t ct;
 
 
     byMIIAdrbak = inb (byMIIAD);
@@ -840,8 +841,8 @@ WriteMII (char byMIISetByte, char byMIISetBit, char byMIIOP, int ioaddr)
     byMIItemp = inb (byMIICR);
     byMIItemp = byMIItemp & 0x40;
 
-    load_timer2(2*TICKS_PER_MS);
-    while (byMIItemp != 0 && timer2_running())
+    ct = currticks();
+    while (byMIItemp != 0 && ct + 2*USECS_IN_MSEC < currticks())
     {
 	byMIItemp = inb (byMIICR);
 	byMIItemp = byMIItemp & 0x40;
@@ -870,8 +871,8 @@ WriteMII (char byMIISetByte, char byMIISetBit, char byMIIOP, int ioaddr)
     byMIItemp = inb (byMIICR);
     byMIItemp = byMIItemp & 0x20;
 
-    load_timer2(2*TICKS_PER_MS);
-    while (byMIItemp != 0 && timer2_running())
+    ct = currticks();
+    while (byMIItemp != 0 && ct + 2*USECS_IN_MSEC < currticks())
     {
 	byMIItemp = inb (byMIICR);
 	byMIItemp = byMIItemp & 0x20;
@@ -1345,6 +1346,7 @@ rhine_transmit (struct nic *nic,
     unsigned char CR1bak;
     unsigned char CR0bak;
     unsigned int nstype;
+    tick_t ct;
 
 
     /*printf ("rhine_transmit\n"); */
@@ -1385,9 +1387,10 @@ rhine_transmit (struct nic *nic,
     outb (CR1bak, byCR1);
     do
     {
-        load_timer2(10*TICKS_PER_MS);
+	ct = currticks();
         /* Wait until transmit is finished or timeout*/
-        while((tp->tx_ring[entry].tx_status.bits.own_bit !=0) && timer2_running())
+        while((tp->tx_ring[entry].tx_status.bits.own_bit !=0) &&
+		ct + 10*USECS_IN_MSEC < currticks())
         ;
 
         if(tp->tx_ring[entry].tx_status.bits.terr == 0)
diff --git a/src/drivers/net/via-velocity.h b/src/drivers/net/via-velocity.h
index c296d289..a43028bd 100644
--- a/src/drivers/net/via-velocity.h
+++ b/src/drivers/net/via-velocity.h
@@ -24,8 +24,6 @@
  *       Copyright (c) 2006 by Timothy Legge <tlegge@rogers.com>
  */
 
-#include "timer.h"
-
 #ifndef VELOCITY_H
 #define VELOCITY_H
 
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index 2f141aa9..14497640 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -81,7 +81,6 @@
 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 
 static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
 
@@ -113,7 +112,7 @@ static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
 
 /* Operational parameters that usually are not changed. */
 /* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT  (10*TICKS_PER_MS)
+#define TX_TIMEOUT  (10*USECS_IN_MSEC)
 
 #define PKT_BUF_SZ  1536  /* Size of each temporary Rx buffer.*/
 
@@ -487,6 +486,7 @@ static void w89c840_transmit(
     /* send the packet to destination */
     unsigned entry;
     int transmit_status;
+    tick_t ct;
 
     /* Caution: the write order is important here, set the field
        with the "ownership" bits last. */
@@ -535,8 +535,7 @@ static void w89c840_transmit(
     /* Now wait for TX to complete. */
     transmit_status = w840private.tx_ring[entry].status;
 
-    load_timer2(TX_TIMEOUT);
-
+    ct = currticks();
     {
 #if defined W89C840_DEBUG
         u32 intr_stat = 0;
@@ -547,7 +546,7 @@ static void w89c840_transmit(
 	      decode_interrupt(intr_stat);
 #endif
 
-                while ( (transmit_status & DescOwn) && timer2_running()) {
+                while ( (transmit_status & DescOwn) && ct + TX_TIMEOUT < currticks()) {
 
                     transmit_status = w840private.tx_ring[entry].status;
                 }
diff --git a/src/drivers/nvs/spi.c b/src/drivers/nvs/spi.c
index be6b5904..dbdc32f6 100644
--- a/src/drivers/nvs/spi.c
+++ b/src/drivers/nvs/spi.c
@@ -18,7 +18,7 @@
 
 #include <stddef.h>
 #include <errno.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/spi.h>
 
 /** @file
diff --git a/src/drivers/nvs/threewire.c b/src/drivers/nvs/threewire.c
index 622e8585..dbecf909 100644
--- a/src/drivers/nvs/threewire.c
+++ b/src/drivers/nvs/threewire.c
@@ -18,7 +18,7 @@
 
 #include <stddef.h>
 #include <assert.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/threewire.h>
 
 /** @file
diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c
index 291ee6ac..cada7291 100644
--- a/src/hci/mucurses/kb.c
+++ b/src/hci/mucurses/kb.c
@@ -1,6 +1,6 @@
 #include <curses.h>
 #include <stddef.h>
-#include <timer.h>
+#include <unistd.h>
 #include "mucurses.h"
 
 /** @file
diff --git a/src/hci/shell_banner.c b/src/hci/shell_banner.c
index d313d4dd..62da487c 100644
--- a/src/hci/shell_banner.c
+++ b/src/hci/shell_banner.c
@@ -18,8 +18,8 @@
 
 #include <stdio.h>
 #include <console.h>
-#include <latch.h>
 #include <gpxe/features.h>
+#include <gpxe/timer.h>
 #include <gpxe/shell_banner.h>
 
 /** @file
diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index 8d658194..2a465954 100644
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -12,8 +12,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <strings.h>
-#include <latch.h>
 #include <console.h>
+#include <gpxe/timer.h>
 #include <gpxe/if_arp.h>
 #include <gpxe/if_ether.h>
 
diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h
index 9a9ba748..6db0e026 100644
--- a/src/include/gpxe/dhcp.h
+++ b/src/include/gpxe/dhcp.h
@@ -12,7 +12,6 @@
 #include <gpxe/in.h>
 #include <gpxe/refcnt.h>
 #include <gpxe/tables.h>
-#include <latch.h>
 
 struct net_device;
 struct job_interface;
diff --git a/src/include/gpxe/tcp.h b/src/include/gpxe/tcp.h
index e2753120..264ec29b 100644
--- a/src/include/gpxe/tcp.h
+++ b/src/include/gpxe/tcp.h
@@ -9,7 +9,6 @@
  *
  */
 
-#include "latch.h"
 #include <gpxe/tcpip.h>
 
 /**
diff --git a/src/include/timer.h b/src/include/timer.h
deleted file mode 100644
index cd1b2821..00000000
--- a/src/include/timer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef TIMER_H
-#define TIMER_H
-
-/*
- * This file should be removed as soon as there are no
- * currticks() abusers.
- */
-
-#include <stddef.h>
-/*
-#warning Please fix me. I'm abusing the deprecated include/timer.h
-*/
-#include <unistd.h>
-
-/* Duplicates include/gpxe/timer.h */
-typedef uint32_t tick_t;
-
-#define MSECS_IN_SEC (1000)
-#define USECS_IN_SEC (1000*1000)
-#define USECS_IN_MSEC (1000)
-
-#define	TICKS_PER_SEC USECS_IN_SEC
-
-tick_t currticks(void);
-
-#endif
-
diff --git a/src/net/retry.c b/src/net/retry.c
index 0f711e6d..90b89711 100644
--- a/src/net/retry.c
+++ b/src/net/retry.c
@@ -17,7 +17,7 @@
  */
 
 #include <stddef.h>
-#include <latch.h>
+#include <gpxe/timer.h>
 #include <gpxe/list.h>
 #include <gpxe/process.h>
 #include <gpxe/init.h>
diff --git a/src/net/tcp.c b/src/net/tcp.c
index d6b44b02..da8e87b4 100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <timer.h>
+#include <gpxe/timer.h>
 #include <gpxe/iobuf.h>
 #include <gpxe/malloc.h>
 #include <gpxe/retry.h>
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 081fa841..2cb258e4 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -33,6 +33,7 @@
 #include <gpxe/ip.h>
 #include <gpxe/uuid.h>
 #include <gpxe/dhcp.h>
+#include <gpxe/timer.h>
 
 /** @file
  *