Index: branches/zenith432/i386/libsaio/ati.c
===================================================================
--- branches/zenith432/i386/libsaio/ati.c (revision 2815)
+++ branches/zenith432/i386/libsaio/ati.c (revision 2816)
@@ -1279,7 +1279,7 @@
{ 0x689D, 0x00000000, CHIP_FAMILY_HEMLOCK, "ATI Radeon HD 5900 Series", kUakari },
// CYPRESS
- { 0x689E, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5800 Series", kUakari },
+ { 0x689E, 0x00000000, CHIP_FAMILY_CYPRESS, "ATI Radeon HD 5830 Series", kUakari },
// JUNIPER
{ 0x68A0, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5770 Series", kHoolock }, // Mobile
Index: branches/zenith432/i386/boot2/boot.c
===================================================================
--- branches/zenith432/i386/boot2/boot.c (revision 2815)
+++ branches/zenith432/i386/boot2/boot.c (revision 2816)
@@ -189,7 +189,7 @@
if ( MacOSVerCurrent >= MacOSVer2Int("10.11") ) // El Capitan and Up!
{
// ErmaC
- int crsValue;
+ int csrValue;
#if 0
/*
@@ -208,15 +208,16 @@
bootArgs->flags |= kBootArgsFlagCSRActiveConfig;
// Set limit to 7bit
- if ( getIntForKey(KCsrActiveConfig, &crsValue, &bootInfo->chameleonConfig) && (crsValue >= 0 && crsValue <= 127) )
+ if ( getIntForKey(KCsrActiveConfig, &csrValue, &bootInfo->chameleonConfig) && (csrValue >= 0 && csrValue <= 127) )
{
- bootArgs->csrActiveConfig = crsValue;
+ bootArgs->csrActiveConfig = csrValue;
}
else
{
// zenith432
bootArgs->csrActiveConfig = 0x67;
}
+ verbose("CsrActiveConfig set to 0x%x\n", bootArgs->csrActiveConfig);
bootArgs->csrCapabilities = CSR_VALID_FLAGS;
bootArgs->boot_SMC_plimit = 0;
}
@@ -498,8 +499,9 @@
// Enable A20 gate before accessing memory above 1Mb.
// Note: malloc_init(), called via initialize_runtime() writes
// memory >= 1Mb, so A20 must be enabled before calling it. - zenith432
+ zeroBSS();
enableA20();
- initialize_runtime();
+ malloc_init(0, 0, 0, malloc_error);
common_boot(biosdev);
}
@@ -861,7 +863,7 @@
// bootFile must start with a / if it not start with a device name
if (!bootFileWithDevice && (bootInfo->bootFile)[0] != '/')
{
- if ( !YOSEMITE || !ELCAPITAN ) //Is not Yosemite 10.10 or El Capitan 10.11
+ if ( !YOSEMITE && !ELCAPITAN ) //Is not Yosemite 10.10 or El Capitan 10.11
{
snprintf(bootFile, sizeof(bootFile), "/%s", bootInfo->bootFile); // append a leading /
}
Index: branches/zenith432/package/Distribution
===================================================================
--- branches/zenith432/package/Distribution (revision 2815)
+++ branches/zenith432/package/Distribution (revision 2816)
@@ -9,9 +9,9 @@