summaryrefslogtreecommitdiffstats
path: root/src/arch/i386
diff options
context:
space:
mode:
authorAlexey Zaytsev2008-03-02 01:41:10 +0100
committerAlexey Zaytsev2008-03-02 01:41:10 +0100
commita1572e0ab0f5fab9a1f0185ded593bec811aa175 (patch)
treee407d6d0f2b8e93950216268ec0198fff865c6a0 /src/arch/i386
parentIntroduce the new timer subsystem. (diff)
downloadipxe-a1572e0ab0f5fab9a1f0185ded593bec811aa175.tar.gz
ipxe-a1572e0ab0f5fab9a1f0185ded593bec811aa175.tar.xz
ipxe-a1572e0ab0f5fab9a1f0185ded593bec811aa175.zip
Modify gPXE core and drivers to work with the new timer subsystem
Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Diffstat (limited to 'src/arch/i386')
-rw-r--r--src/arch/i386/Makefile1
-rw-r--r--src/arch/i386/firmware/pcbios/gateA20.c7
-rw-r--r--src/arch/i386/include/latch.h12
3 files changed, 4 insertions, 16 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 */