vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Couple missed files from previous commits.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-08 19:17:46 +02:00
parent aabe433afe
commit 620b52bf47
2 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
grub-core/Makefile.core.def
View file

@ -241,9 +241,9 @@ kernel = {
emu = kern/emu/error.c; emu = kern/emu/error.c;
emu = kern/emu/cache_s.S; emu = kern/emu/cache_s.S;
emu = kern/emu/hostdisk.c; emu = kern/emu/hostdisk.c;
emu = kern/emu/hostdisk_unix.c; emu = osdep/unix/hostdisk.c;
emu = kern/emu/hostdisk_devmapper.c; emu = osdep/devmapper/hostdisk.c;
emu = kern/emu/hostdisk_os.c; emu = osdep/hostdisk.c;
emu = kern/emu/hostfs.c; emu = kern/emu/hostfs.c;
emu = kern/emu/main.c; emu = kern/emu/main.c;
emu = kern/emu/argp_common.c; emu = kern/emu/argp_common.c;
@ -252,6 +252,7 @@ kernel = {
emu = kern/emu/time.c; emu = kern/emu/time.c;
emu = kern/emu/cache.c; emu = kern/emu/cache.c;
emu = term/emu/console.c; emu = term/emu/console.c;
emu = osdep/sleep.c;
videoinkernel = term/gfxterm.c; videoinkernel = term/gfxterm.c;
videoinkernel = font/font.c; videoinkernel = font/font.c;

22
grub-core/kern/emu/main.c
View file

@ -233,25 +233,3 @@ main (int argc, char *argv[])
return 0; 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