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

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

4 files changed, 1 insertions, 30 deletions

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
-