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

Dimplify tags and enable USB on more platforms

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-08-30 15:13:38 +02:00
parent 23e2a517ad
commit eefe8abd52
10 changed files with 121 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/loader/i386/pc/linux.c
View file

@ -34,7 +34,7 @@
#include <grub/mm.h>
#include <grub/cpu/relocator.h>
#include <grub/video.h>
#include <grub/floppy.h>
#include <grub/i386/floppy.h>
#define GRUB_LINUX_CL_OFFSET 0x9000
#define GRUB_LINUX_CL_END_OFFSET 0x90FF

4
grub-core/loader/i386/xnu.c
View file

@ -123,7 +123,6 @@ static grub_uint64_t
guessfsb (void)
{
const grub_uint64_t sane_value = 100000000;
#ifndef GRUB_MACHINE_IEEE1275
grub_uint32_t manufacturer[3], max_cpuid, capabilities, msrlow;
grub_uint64_t start_tsc;
grub_uint64_t end_tsc;
@ -209,9 +208,6 @@ guessfsb (void)
return grub_divmod64 (2000 * tsc_ticks_per_ms,
((msrlow >> 7) & 0x3e) + ((msrlow >> 14) & 1), 0);
#else
return sane_value;
#endif
}
struct property_descriptor