Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2025-04-05 15:37:07 +00:00
Code Issues Projects Releases Wiki Activity

move gmt_bias from bootinfo.c to arch.c

Browse Source
This commit is contained in:
Laurent Vivier 2005-09-19 22:01:53 +00:00
parent 1e3f09576a
commit be8b8ee163
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
second/arch.c
View File

@ -20,6 +20,7 @@ unsigned long fpu_type;
unsigned long machine_id;
unsigned long arch_type;
unsigned long ram_size;
unsigned long gmt_bias;
#ifdef ARCH_PPC
unsigned long bus_type;
#endif
@ -47,6 +48,7 @@ struct older_macintosh_info older_macintosh[] = {
void arch_init()
{
MachineLocation where;
int i = 0;
/* Some systems don't support Gestalt() */
@ -112,6 +114,14 @@ void arch_init()
Gestalt(gestaltMachineType, &machine_id);
/* GMT bias */
ReadLocation(&where);
gmt_bias = where.u.gmtDelta & 0x00FFFFFF;
if (gmt_bias & 0x00800000)
gmt_bias |= 0xFF000000; /* sign-extend to 32 bits */
gmt_bias = (long)gmt_bias / 60; /* convert to whole minutes, remember sign */
#ifdef ARCH_PPC
/* check bus type */

1
second/arch.h
View File

@ -181,5 +181,6 @@ extern unsigned long fpu_type;
extern unsigned long machine_id;
extern unsigned long arch_type;
extern unsigned long ram_size;
extern unsigned long gmt_bias;
extern void arch_init();

9
second/bootinfo.c
View File

@ -115,9 +115,6 @@ static void extractBanks(struct bootinfo *bi, memory_map_t *map)
void bootinfo_init(char* command_line,
char* ramdisk_start, unsigned long ramdisk_size)
{
unsigned long gmt_bias;
MachineLocation where;
/* I'm a macintosh, I know, I'm sure */
boot_info.machtype = MACH_MAC;
@ -213,12 +210,6 @@ void bootinfo_init(char* command_line,
boot_info.bi_mac.args = 0;
boot_info.bi_mac.boottime = Time - 2082844800;
ReadLocation(&where);
gmt_bias = where.u.gmtDelta & 0x00FFFFFF;
if (gmt_bias & 0x00800000)
gmt_bias |= 0xFF000000; /* sign-extend to 32 bits */
gmt_bias = (long)gmt_bias / 60; /* convert to whole minutes, remember sign */
boot_info.bi_mac.gmtbias = gmt_bias;
logical2physical(SCCRd, &boot_info.bi_mac.scc_read);