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

Move sleep routines to grub-core/osdep.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-08 17:38:46 +02:00
parent 672fa55e81
commit c1ca424476
6 changed files with 68 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-10-08 Vladimir Serbinenko <phcoder@gmail.com>
Move sleep routines to grub-core/osdep.
2013-10-08 Vladimir Serbinenko <phcoder@gmail.com>
Move OS-dependent files to grub-core/osdep and document it.

1
Makefile.util.def
View File

@ -17,6 +17,7 @@ library = {
common = grub-core/osdep/devmapper/hostdisk.c;
common = grub-core/osdep/hostdisk.c;
common = grub-core/osdep/unix/hostdisk.c;
common = grub-core/osdep/sleep.c;
common = grub-core/kern/emu/misc.c;
common = grub-core/kern/emu/mm.c;
common = grub-core/kern/env.c;

5
grub-core/osdep/sleep.c Normal file
View File

@ -0,0 +1,5 @@
#if defined (__MINGW32__) || defined (__CYGWIN__)
#include "windows/sleep.c"
#else
#include "unix/sleep.c"
#endif

30
grub-core/osdep/unix/sleep.c Normal file
View File

@ -0,0 +1,30 @@
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <time.h>
#include <grub/time.h>
void
grub_millisleep (grub_uint32_t ms)
{
struct timespec ts;
ts.tv_sec = ms / 1000;
ts.tv_nsec = (ms % 1000) * 1000000;
nanosleep (&ts, NULL);
}

28
grub-core/osdep/windows/sleep.c Normal file
View File

@ -0,0 +1,28 @@
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010,2011,2012,2013 Free Software Foundation, Inc.
*
* GRUB is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* GRUB is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
#include <windows.h>
#include <winioctl.h>
#include <grub/time.h>
void
grub_millisleep (grub_uint32_t ms)
{
Sleep (ms);
}

28
util/misc.c
View File

@ -50,12 +50,6 @@ const char *program_name = GRUB_BUILD_PROGRAM_NAME;
#include "progname.h"
#endif
#ifdef __MINGW32__
#include <windows.h>
#include <winioctl.h>
#include "dirname.h"
#endif
#ifdef GRUB_UTIL
int
grub_err_printf (const char *fmt, ...)
@ -257,28 +251,6 @@ grub_register_exported_symbols (void)
{
}
#ifdef __MINGW32__
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
#ifdef GRUB_UTIL
void
grub_util_init_nls (void)