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

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

src/arch/i386/Makefile

 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

src/arch/i386/firmware/pcbios/gateA20.c

 #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 */

src/arch/i386/include/latch.h

-#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 */

src/core/getkey.c

  */
 
 #include <console.h>
-#include <latch.h>
 #include <gpxe/process.h>
 #include <gpxe/keys.h>
+#include <gpxe/timer.h>
 
 /** @file
  *

src/core/misc.c

 
 #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

src/core/random.c

  */
 
 #include <stdlib.h>
-#include <latch.h>
+#include <gpxe/timer.h>
 
 static int32_t rnd_seed = 0;
 

src/core/serial.c

 #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 */

src/drivers/bitbash/bitbash.c

  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <timer.h>
 #include <gpxe/bitbash.h>
 
 /** @file

src/drivers/bitbash/i2c_bit.c

 #include <stdint.h>
 #include <errno.h>
 #include <assert.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/bitbash.h>
 #include <gpxe/i2c.h>
 

src/drivers/bitbash/spi_bit.c

 #include <byteswap.h>
 #include <errno.h>
 #include <assert.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/bitbash.h>
 #include <gpxe/spi_bit.h>
 

src/drivers/bus/eisa.c

 #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]

src/drivers/bus/isapnp.c

 #include <stdio.h>
 #include <errno.h>
 #include <io.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/isapnp.h>
 
 /**

src/drivers/bus/mca.c

 #include <stdio.h>
 #include <errno.h>
 #include <io.h>
-#include <timer.h>
 #include <gpxe/mca.h>
 
 static struct mca_driver mca_drivers[0]

src/drivers/infiniband/arbel.c

 #include <strings.h>
 #include <unistd.h>
 #include <errno.h>
-#include <timer.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/malloc.h>

src/drivers/infiniband/hermon.c

 #include <strings.h>
 #include <unistd.h>
 #include <errno.h>
-#include <timer.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/malloc.h>

src/drivers/net/3c509.c

 #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"

src/drivers/net/3c515.c

 #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)

src/drivers/net/3c595.c

 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
 #include "3c595.h"
-#include "timer.h"
 
 static struct nic_operations t595_operations;
 

src/drivers/net/3c5x9.c

 #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 */

src/drivers/net/3c90x.c

 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 
 static struct nic_operations a3c90x_operations;
 
 
     unsigned char status;
     unsigned i, retries;
+    tick_t ct;
 
     for (retries=0; retries < XMIT_RETRIES ; retries++)
 	{
 	    ;
 
 	/** 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))

src/drivers/net/amd8111e.c

 #include "mii.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "string.h"
 #include "stdint.h"
 #include "amd8111e.h"

src/drivers/net/bnx2.c

 #include <errno.h>
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "string.h"
 #include "bnx2.h"
 #include "bnx2_fw.h"

src/drivers/net/dmfe.c

 /* 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

src/drivers/net/e1000/e1000.h

 #include <stdio.h>
 #include <io.h>
 #include <errno.h>
-#include <timer.h>
 #include <byteswap.h>
 #include <gpxe/pci.h>
 #include <gpxe/malloc.h>

src/drivers/net/e1000/e1000_osdep.h

 #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>

src/drivers/net/eepro.c

 #include <errno.h>
 #include "nic.h"
 #include <gpxe/isa.h>
-#include "timer.h"
 #include <gpxe/ethernet.h>
 
 /* Different 82595 chips */

src/drivers/net/eepro100.c

 #include "nic.h"
 #include <gpxe/ethernet.h>
 #include <gpxe/pci.h>
-#include "timer.h"
 
 static int ioaddr;
 
 	} hdr;
 	unsigned short status;
 	int s1, s2;
+	tick_t ct;
 
 	status = inw(ioaddr + SCBStatus);
 	/* Acknowledge all of the current interrupt sources ASAP. */
 	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);
 
 	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 */
 
 	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 */

src/drivers/net/epic100.c

 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
 #include "nic.h"
-#include "timer.h"
 #include "console.h"
 #include "epic100.h"
 
     unsigned short nstype;
     unsigned char *txp;
     int entry;
+    tick_t ct;
 
     /* Calculate the next Tx descriptor entry. */
     entry = cur_tx % TX_RING_SIZE;
      * 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)

src/drivers/net/etherfabric.c

 #include <gpxe/i2c.h>
 #include <gpxe/spi.h>
 #include <gpxe/nvo.h>
-#include "timer.h"
 #define dma_addr_t unsigned long
 #include "etherfabric.h"
 

src/drivers/net/forcedeth.c

 #include <gpxe/pci.h>
 /* Include timer support functions */
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "mii.h"
 
 #define drv_version "v1.2"

src/drivers/net/ipoib.c

 #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>

src/drivers/net/mlx_ipoib/mt23108_imp.c

 	}
 }
 
-#include "timer.h"
 #include "cmdif_mt23108.c"
 #include "cmdif_comm.c"
 #include "ib_mt23108.c"

src/drivers/net/mlx_ipoib/mt25218_imp.c

 	}
 }
 
-#include "timer.h"
 #include "cmdif_mt25218.c"
 #include "cmdif_comm.c"
 #include "ib_mt25218.c"

src/drivers/net/mtnic.c

 #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>

src/drivers/net/natsemi.c

 #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>

src/drivers/net/pcnet32.c

 #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); */

src/drivers/net/prism2.c

  * 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)

src/drivers/net/r8169.c

 #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"

src/drivers/net/rtl8139.c

 #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>

src/drivers/net/sis900.c

 #include "etherboot.h"
 #include <gpxe/pci.h>
 #include "nic.h"
-#include "timer.h"
 
 #include "sis900.h"
 

src/drivers/net/smc9000.c

 #include "etherboot.h"
 #include "nic.h"
 #include <gpxe/isa.h>
-#include "timer.h"
 #include "smc9000.h"
 
 # define _outb outb

src/drivers/net/sundance.c

 #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"

src/drivers/net/tg3.c

 #include <errno.h>
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "string.h"
 #include "tg3.h"
 

src/drivers/net/tlan.c

 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 #include "tlan.h"
 
 #define drv_version "v1.4"

src/drivers/net/via-rhine.c

 #include "nic.h"
 #include <gpxe/pci.h>
 #include <gpxe/ethernet.h>
-#include "timer.h"
 
 /* define all ioaddr */
 
     char byMIIAdrbak;
     char byMIICRbak;
     char byMIItemp;
+    tick_t ct;
 
     byMIIAdrbak = inb (byMIIAD);
     byMIICRbak = inb (byMIICR);
     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;
     char byMIIAdrbak;
     char byMIICRbak;
     char byMIItemp;
+    tick_t ct;
 
 
     byMIIAdrbak = inb (byMIIAD);
     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;
     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;
     unsigned char CR1bak;
     unsigned char CR0bak;
     unsigned int nstype;
+    tick_t ct;
 
 
     /*printf ("rhine_transmit\n"); */
     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)

src/drivers/net/via-velocity.h

  *       Copyright (c) 2006 by Timothy Legge <tlegge@rogers.com>
  */
 
-#include "timer.h"
-
 #ifndef VELOCITY_H
 #define VELOCITY_H
 

src/drivers/net/w89c840.c

 #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";
 
 
 /* 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.*/
 
     /* 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. */
     /* 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;
 	      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;
                 }

src/drivers/nvs/spi.c

 
 #include <stddef.h>
 #include <errno.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/spi.h>
 
 /** @file

src/drivers/nvs/threewire.c

 
 #include <stddef.h>
 #include <assert.h>
-#include <timer.h>
+#include <unistd.h>
 #include <gpxe/threewire.h>
 
 /** @file

src/hci/mucurses/kb.c

 #include <curses.h>
 #include <stddef.h>
-#include <timer.h>
+#include <unistd.h>
 #include "mucurses.h"
 
 /** @file

src/hci/shell_banner.c

 
 #include <stdio.h>
 #include <console.h>
-#include <latch.h>
 #include <gpxe/features.h>
+#include <gpxe/timer.h>
 #include <gpxe/shell_banner.h>
 
 /** @file

src/include/etherboot.h

 #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>
 

src/include/gpxe/dhcp.h

 #include <gpxe/in.h>
 #include <gpxe/refcnt.h>
 #include <gpxe/tables.h>
-#include <latch.h>
 
 struct net_device;
 struct job_interface;

src/include/gpxe/tcp.h

  *
  */
 
-#include "latch.h"
 #include <gpxe/tcpip.h>
 
 /**

src/include/timer.h

-#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
-

src/net/retry.c

  */
 
 #include <stddef.h>
-#include <latch.h>
+#include <gpxe/timer.h>
 #include <gpxe/list.h>
 #include <gpxe/process.h>
 #include <gpxe/init.h>

src/net/tcp.c

 #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>

src/net/udp/dhcp.c

 #include <gpxe/ip.h>
 #include <gpxe/uuid.h>
 #include <gpxe/dhcp.h>
+#include <gpxe/timer.h>
 
 /** @file
  *