From a1572e0ab0f5fab9a1f0185ded593bec811aa175 Mon Sep 17 00:00:00 2001 From: Alexey Zaytsev Date: Sun, 2 Mar 2008 03:41:10 +0300 Subject: Modify gPXE core and drivers to work with the new timer subsystem Signed-off-by: Alexey Zaytsev --- src/arch/i386/Makefile | 1 + src/arch/i386/firmware/pcbios/gateA20.c | 7 +++---- src/arch/i386/include/latch.h | 12 ------------ 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 src/arch/i386/include/latch.h (limited to 'src/arch/i386') 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 -#include "realmode.h" -#include "timer.h" -#include "latch.h" -#include "bios.h" +#include +#include +#include #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 */ -- cgit v1.2.3-55-g7522