From 620b52bf47c9e6561ddc5c6a525528d763f9f79f Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Tue, 8 Oct 2013 19:17:46 +0200 Subject: [PATCH] Couple missed files from previous commits. --- grub-core/Makefile.core.def | 7 ++++--- grub-core/kern/emu/main.c | 22 ---------------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 483d8a89e..218d2e48e 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -241,9 +241,9 @@ kernel = { emu = kern/emu/error.c; emu = kern/emu/cache_s.S; emu = kern/emu/hostdisk.c; - emu = kern/emu/hostdisk_unix.c; - emu = kern/emu/hostdisk_devmapper.c; - emu = kern/emu/hostdisk_os.c; + emu = osdep/unix/hostdisk.c; + emu = osdep/devmapper/hostdisk.c; + emu = osdep/hostdisk.c; emu = kern/emu/hostfs.c; emu = kern/emu/main.c; emu = kern/emu/argp_common.c; @@ -252,6 +252,7 @@ kernel = { emu = kern/emu/time.c; emu = kern/emu/cache.c; emu = term/emu/console.c; + emu = osdep/sleep.c; videoinkernel = term/gfxterm.c; videoinkernel = font/font.c; diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c index eea57f9ef..b8857fd6b 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -233,25 +233,3 @@ main (int argc, char *argv[]) return 0; } - -#if defined (__MINGW32__) || defined (__CYGWIN__) - -void -grub_millisleep (grub_uint32_t ms) -{ - Sleep (ms); -} - -#else - -void -grub_millisleep (grub_uint32_t ms) -{ - struct timespec ts; - - ts.tv_sec = ms / 1000; - ts.tv_nsec = (ms % 1000) * 1000000; - nanosleep (&ts, NULL); -} - -#endif