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

* grub-core/kern/emu/misc.c (grub_get_rtc): Remove (it's a leftover).

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-08 19:53:57 +02:00
parent 620b52bf47
commit c2e6f70589
3 changed files with 4 additions and 21 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>
* grub-core/kern/emu/misc.c (grub_get_rtc): Remove (it's a leftover).
2013-10-08 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/drivers/emu/emunet.c: Move to .. * grub-core/net/drivers/emu/emunet.c: Move to ..

15
grub-core/kern/emu/misc.c
View file

@ -29,9 +29,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/err.h> #include <grub/err.h>
@ -156,18 +153,6 @@ grub_get_time_ms (void)
return (tv.tv_sec * 1000 + tv.tv_usec / 1000); return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
} }
grub_uint32_t
grub_get_rtc (void)
{
struct timeval tv;
gettimeofday (&tv, 0);
return (tv.tv_sec * GRUB_TICKS_PER_SECOND
+ (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec)
* GRUB_TICKS_PER_SECOND / 1000000));
}
#ifdef __MINGW32__ #ifdef __MINGW32__
int fsync (int fno __attribute__ ((unused))) int fsync (int fno __attribute__ ((unused)))

6
include/grub/time.h
View file

@ -23,12 +23,6 @@
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/cpu/time.h> #include <grub/cpu/time.h>
#if defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
#define GRUB_TICKS_PER_SECOND 100000
/* Return the real time in ticks. */
grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
#endif
void EXPORT_FUNC(grub_millisleep) (grub_uint32_t ms); void EXPORT_FUNC(grub_millisleep) (grub_uint32_t ms);
grub_uint64_t EXPORT_FUNC(grub_get_time_ms) (void); grub_uint64_t EXPORT_FUNC(grub_get_time_ms) (void);