Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/console.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/console.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/console.c (revision 1009) @@ -67,14 +67,14 @@ char *msgbuf = 0; char *cursor = 0; -struct putc_info +struct putc_info //Azi: exists on gui.c & printf.c { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) +sputc(int c, struct putc_info * pi) //Azi: same as above { if (pi->last_str) if (pi->str == pi->last_str) @@ -263,5 +263,6 @@ void pause() { printf("Press a key to continue...\n"); - getc(); + getchar(); //getc(); //Azi: getc works here because the function is up above; changed for now. + // replace getchar() by pause() ?? } Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/bootstruct.h =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/bootstruct.h (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/bootstruct.h (revision 1009) @@ -137,6 +137,8 @@ config_file_t smbiosConfig; // smbios.plist config_file_t helperConfig; // boot helper partition's boot.plist config_file_t ramdiskConfig; // RAMDisk.plist + + bool memDetect; } PrivateBootInfo_t; extern PrivateBootInfo_t *bootInfo; Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/acpi_patcher.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/acpi_patcher.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/acpi_patcher.c (revision 1009) @@ -14,7 +14,7 @@ #include "aml_generator.h" #ifndef DEBUG_ACPI -#define DEBUG_ACPI 1 +#define DEBUG_ACPI 0 #endif #if DEBUG_ACPI==2 @@ -1058,8 +1058,7 @@ } #if DEBUG_ACPI printf("Press a key to continue... (DEBUG_ACPI)\n"); -// getc(); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif return 1; } Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/spd.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/spd.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/spd.c (revision 1009) @@ -344,9 +344,9 @@ slot->SerialNo); #if DEBUG_SPD - // prevously located on mem.c; temporarily on platform.c now - dumpPhysAddr("spd content: ", slot->spd, spd_size); //Azi: reminder - can be removed/replaced?? - getchar(); //getc(); Azi: getc stuff + //Azi: this was gone with mem.c... remove?? + dumpPhysAddr("spd content: ", slot->spd, spd_size); + getchar(); #endif } Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/dram_controllers.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/dram_controllers.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/dram_controllers.c (revision 1009) @@ -557,7 +557,6 @@ ,Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS ,Platform.RAM.CAS, Platform.RAM.TRC, Platform.RAM.TRP, Platform.RAM.RAS ); - /* getc(); Azi: getc stuff - */ +// getchar(); } } Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/load.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/load.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/load.c (revision 1009) @@ -26,8 +26,6 @@ * */ -//#define DEBUG 1 - #include #include #include @@ -137,7 +135,7 @@ printf("ncmds: %x\n", (unsigned)mH->ncmds); printf("sizeofcmds: %x\n", (unsigned)mH->sizeofcmds); printf("flags: %x\n", (unsigned)mH->flags); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif ncmds = mH->ncmds; @@ -221,7 +219,7 @@ printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, (unsigned) segCmd->nsects, (unsigned)segCmd->flags); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif } else @@ -241,7 +239,7 @@ printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, (unsigned) segCmd->nsects, (unsigned)segCmd->flags); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif } @@ -251,13 +249,6 @@ return 0; } -/*#if DEBUG - printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", - segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, - (unsigned) segCmd->nsects, (unsigned)segCmd->flags); - getc(); -#endif*/ - if (! ((vmaddr >= KERNEL_ADDR && (vmaddr + vmsize) <= (KERNEL_ADDR + KERNEL_LEN)) || (vmaddr >= HIB_ADDR && @@ -326,7 +317,7 @@ #if DEBUG printf("symoff: %x, nsyms: %x, stroff: %x, strsize: %x\n", symTab->symoff, symTab->nsyms, symTab->stroff, symTab->strsize); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif symsSize = symTab->stroff - symTab->symoff; Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/platform.c (revision 1009) @@ -26,50 +26,6 @@ PlatformInfo_t Platform; pci_dt_t * dram_controller_dev = NULL; -//Azi: temporarily placing this here; from removed mem.c, needed by DEBUG_PLATFORM -// check if replaceable by other or completely remove?? whatever... -#define DC(c) (c >= 0x20 && c < 0x7f ? (char) c : '.') -#define STEP 16 -void dumpPhysAddr(const char * title, void * a, int len) -{ - int i,j; - u_int8_t* ad = (u_int8_t*) a; - char buffer[80]; - char str[16]; - - if(ad==NULL) return; - - printf("%s addr=0x%08x len=%04d\n",title ? title : "Dump of ", a, len); - printf("Ofs-00-01-02-03-04-05-06-07-08-09-0A-0B-0C-0D-0E-0F ASCII\n"); - i = (len/STEP)*STEP; - for (j=0; j < i; j+=STEP) - { - printf("%02x: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", - j, - ad[j], ad[j+1], ad[j+2], ad[j+3] , ad[j+4], ad[j+5], ad[j+6], ad[j+7], - ad[j+8], ad[j+9], ad[j+10], ad[j+11] , ad[j+12], ad[j+13], ad[j+14], ad[j+15], - DC(ad[j]), DC(ad[j+1]), DC(ad[j+2]), DC(ad[j+3]) , DC(ad[j+4]), DC(ad[j+5]), DC(ad[j+6]), DC(ad[j+7]), - DC(ad[j+8]), DC(ad[j+9]), DC(ad[j+10]), DC(ad[j+11]) , DC(ad[j+12]), DC(ad[j+13]), DC(ad[j+14]), DC(ad[j+15]) - ); - } - - if (len%STEP==0) return; - sprintf(buffer,"%02x:", i); - for (j=0; j < STEP; j++) { - if (j<(len%STEP)) - sprintf(str, " %02x", ad[i+j]); - else - strcpy(str, " " ); - strncat(buffer, str, sizeof(buffer)); - } - strncat(buffer," ", sizeof(buffer)); - for (j=0; j < (len%STEP); j++) { - sprintf(str, "%c", DC(ad[i+j])); - strncat(buffer, str, sizeof(buffer)); - } - printf("%s\n",buffer); -} - /** Return if a CPU feature specified by feature is activated (true) or not (false) */ bool platformCPUFeature(uint32_t feature) { @@ -85,11 +41,16 @@ static bool done = false; if (done) return; - bool useAutodetection = true; - getBoolForKey(kUseMemDetect, &useAutodetection, &bootInfo->bootConfig); + /* our code only works on Intel chipsets so make sure here */ + if (pci_config_read16(PCIADDR(0, 0x00, 0), 0x00) != 0x8086) + bootInfo->memDetect = false; + else + bootInfo->memDetect = true; + /* manually */ + getBoolForKey(kUseMemDetect, &bootInfo->memDetect, &bootInfo->bootConfig); - if (useAutodetection) { - if (dram_controller_dev!=NULL) { + if (bootInfo->memDetect) { + if (dram_controller_dev != NULL) { scan_dram_controller(dram_controller_dev); // Rek: pci dev ram controller direct and fully informative scan ... } scan_spd(&Platform); Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/disk.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/disk.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/disk.c (revision 1009) @@ -55,8 +55,6 @@ #define UFS_SUPPORT 0 #endif -//#define DEBUG 1 - #include "libsaio.h" #include "boot.h" #include "bootstruct.h" @@ -1638,7 +1636,7 @@ printf(" bvr: %d, dev: %d, part: %d, flags: %d, vis: %d\n", bvr, bvr->biosdev, bvr->part_no, bvr->flags, bvr->visible); } printf("count: %d\n", bvCount); - getchar(); //getc(); Azi: getc stuff + getchar(); #endif *count = bvCount; Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios.c (revision 1009) @@ -448,6 +448,8 @@ { const char *string = 0; int len; + bool parsed; + int val; if (numOfSetters <= idx) return false; @@ -481,13 +483,29 @@ //case kSMBQWord: if (SMBSetters[idx].keyString) { - if (getIntForKey(SMBSetters[idx].keyString, (int *)&(value->dword), SMBPlist)) + parsed = getIntForKey(SMBSetters[idx].keyString, &val, SMBPlist); + if (!parsed) + if (structPtr->orig->type == kSMBTypeMemoryDevice) // MemoryDevice only + parsed = getSMBValueForKey(structPtr->orig, SMBSetters[idx].keyString, NULL, (returnType *)&val); + if (parsed) + { + switch (SMBSetters[idx].valueType) + { + case kSMBByte: + value->byte = (uint8_t)val; + break; + case kSMBWord: + value->word = (uint16_t)val; + break; + case kSMBDWord: + default: + value->dword = (uint32_t)val; + break; + } return true; - else - if (structPtr->orig->type == kSMBTypeMemoryDevice) // MemoryDevice only - if (getSMBValueForKey(structPtr->orig, SMBSetters[idx].keyString, NULL, value)) - return true; + } } + if (SMBSetters[idx].getSMBValue) if (SMBSetters[idx].getSMBValue(value)) return true; Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/hpet.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/hpet.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/hpet.c (revision 1009) @@ -7,7 +7,7 @@ #include "hpet.h" #ifndef DEBUG_HPET -#define DEBUG_HPET 1 +#define DEBUG_HPET 0 #endif #if DEBUG_HPET @@ -97,7 +97,7 @@ } #if DEBUG_HPET - printf("Press [Enter] to continue...\n"); // replace by pause() function, console.c - getchar(); //getc(); Azi: getc stuff + printf("Press [Enter] to continue...\n"); + getchar(); #endif } Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/biosfn.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/biosfn.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/biosfn.c (revision 1009) @@ -40,8 +40,6 @@ - Added ebiosEjectMedia */ -//#define DEBUG 1 - #include "bootstruct.h" #include "libsaio.h" @@ -187,7 +185,7 @@ // Some BIOSes will simply ignore the value of ECX on entry. // Probably best to keep its value at 20 to avoid surprises. - //printf("Get memory map 0x%x, %d\n", rangeArray); getchar(); //getc(); Azi: getc stuff + //printf("Get memory map 0x%x, %d\n", rangeArray); getchar(); if (maxRangeCount > (BIOS_LEN / sizeof(MemoryRange))) { maxRangeCount = (BIOS_LEN / sizeof(MemoryRange)); } @@ -254,10 +252,10 @@ #if DEBUG { int i; - printf("%d total ranges\n", count); getchar(); //getc(); Azi: getc stuff + printf("%d total ranges\n", count); getchar(); for (i=0, range = rangeArray; itype, (unsigned int)range->base, (unsigned int)range->length); getchar(); //getc(); Azi: getc stuff + range->type, (unsigned int)range->base, (unsigned int)range->length); getchar(); } } #endif @@ -511,7 +509,7 @@ printf("media_type: %x\n", pkt.media_type); printf("drive_num: %x\n", pkt.drive_num); printf("device_spec: %x\n", pkt.device_spec); - printf("press a key->\n"); getchar(); //getc(); Azi: getc stuff + printf("press a key->\n"); getchar(); #endif /* Some BIOSes erroneously return cf = 1 */ @@ -677,7 +675,7 @@ print_drive_info(di); printf("uses_ebios = 0x%x\n", dp->uses_ebios); printf("result %d\n", ret); - printf("press a key->\n"); getchar(); //getc(); Azi: getc stuff + printf("press a key->\n"); getchar(); #endif if (ret == 0) { Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsaio/smbios_getters.c (revision 1009) @@ -6,6 +6,7 @@ */ #include "smbios_getters.h" +#include "bootstruct.h" #ifndef DEBUG_SMBIOS #define DEBUG_SMBIOS 0 @@ -245,9 +246,10 @@ } } - return false; -// value->string = NOT_AVAILABLE; -// return true; + if (!bootInfo->memDetect) + return false; + value->string = NOT_AVAILABLE; + return true; } bool getSMBMemoryDeviceSerialNumber(returnType *value) @@ -267,9 +269,10 @@ } } - return false; -// value->string = NOT_AVAILABLE; -// return true; + if (!bootInfo->memDetect) + return false; + value->string = NOT_AVAILABLE; + return true; } bool getSMBMemoryDevicePartNumber(returnType *value) @@ -289,9 +292,10 @@ } } - return false; -// value->string = NOT_AVAILABLE; -// return true; + if (!bootInfo->memDetect) + return false; + value->string = NOT_AVAILABLE; + return true; } Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/drivers.c (revision 1009) @@ -183,7 +183,7 @@ } else if ( gBootFileType == kBlockDeviceType ) { - if(!gHaveKernelCache) + if (!gHaveKernelCache) { // Non-prelinked kernel, load system mkext. // NOTE: In it's default state, XNU cannot be both prelinked, and load additional drivers @@ -222,33 +222,33 @@ } } - + //Azi: dependencies still need to be added to E/E.mkext!! // First try to load Extra extensions from the ramdisk if isn't aliased as bt(0,0). if (gRAMDiskVolume && !gRAMDiskBTAliased) { - strcpy(dirSpecExtra, "rd(0,0)/Extra/"); - FileLoadDrivers(dirSpecExtra, 0); + strcpy(dirSpecExtra, "rd(0,0)/Extra/"); + FileLoadDrivers(dirSpecExtra, 0); } - + // Next try to load Extra extensions from the selected root partition. strcpy(dirSpecExtra, "/Extra/"); if (FileLoadDrivers(dirSpecExtra, 0) != 0) { - // If failed, then try to load Extra extensions from the boot partition - // in case we have a separate booter partition or a bt(0,0) aliased ramdisk. - if ( !(gBIOSBootVolume->biosdev == gBootVolume->biosdev && gBIOSBootVolume->part_no == gBootVolume->part_no) - || (gRAMDiskVolume && gRAMDiskBTAliased) ) - { - // Next try a specfic OS version folder ie 10.5 - sprintf(dirSpecExtra, "bt(0,0)/Extra/%s/", &gMacOSVersion); - if (FileLoadDrivers(dirSpecExtra, 0) != 0) - { - // Next we'll try the base - strcpy(dirSpecExtra, "bt(0,0)/Extra/"); - FileLoadDrivers(dirSpecExtra, 0); + // If failed, then try to load Extra extensions from the boot partition + // in case we have a separate booter partition or a bt(0,0) aliased ramdisk. + if ( !(gBIOSBootVolume->biosdev == gBootVolume->biosdev && gBIOSBootVolume->part_no == gBootVolume->part_no) + || (gRAMDiskVolume && gRAMDiskBTAliased) ) + { + // Next try a specfic OS version folder ie 10.5 + sprintf(dirSpecExtra, "bt(0,0)/Extra/%s/", &gMacOSVersion); + if (FileLoadDrivers(dirSpecExtra, 0) != 0) + { + // Next we'll try the base + strcpy(dirSpecExtra, "bt(0,0)/Extra/"); + FileLoadDrivers(dirSpecExtra, 0); + } } - } } } else Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/Makefile =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/Makefile (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/Makefile (revision 1009) @@ -23,7 +23,7 @@ -fno-builtin -DSAIO_INTERNAL_USER -static $(OMIT_FRAME_POINTER_CFLAG) \ -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \ -march=pentium4 -msse2 -mfpmath=sse -msoft-float -nostdinc -include $(SRCROOT)/autoconf.h - + CPPFLAGS := $(CPPFLAGS) -nostdinc++ -include $(SRCROOT)/autoconf.h DEFINES= @@ -122,13 +122,18 @@ -final_output Symbols \ -macosx_version_min 10.6 \ -o $(OBJROOT)/Symbols_LINKER_ONLY.dylib + + + endif @make embed_symbols # this is done in a sub process after boot.sys exists so the strings are populated correctly @${RM} $(SYMROOT)/boot2.sys + + @( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \ if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\ then \ @@ -140,7 +145,7 @@ echo "\t******* boot is $$size bytes *******"; \ fi) - + embed_symbols: ifeq (${CONFIG_MODULES}, y) @echo ================= Embedding Symbols.dylib ================= @@ -153,7 +158,7 @@ @echo "\t[MACHOCONV] boot" @$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot - + $(SYMROOT)/art.h: @if [ "$(PNGCRUSH)" ]; then \ echo "optimizing art files ...\n$(PNGCRUSH) $(PNGOPTIONS) artwork/$(THEME)"; \ Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.h =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.h (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.h (revision 1009) @@ -38,9 +38,12 @@ #define kTextModeKey "Text Mode" #define kQuietBootKey "Quiet Boot" #define kKernelFlagsKey "Kernel Flags" +#define karch "arch" /* boot.c */ +#define kProductVersion "ProductVersion" /* boot.c */ #define kMKextCacheKey "MKext Cache" #define kKernelNameKey "Kernel" #define kKernelCacheKey "Kernel Cache" +#define kUseKernelCache "UseKernelCache" /* boot.c */ #define kBootDeviceKey "Boot Device" #define kTimeoutKey "Timeout" #define kRootDeviceKey "rd" @@ -71,9 +74,6 @@ #define kWake "Wake" /* boot.c */ #define kForceWake "ForceWake" /* boot.c */ #define kWakeImage "WakeImage" /* boot.c */ -#define kProductVersion "ProductVersion" /* boot.c */ -#define karch "arch" /* boot.c */ -#define kUseKernelCache "UseKernelCache" /* boot.c */ #define kbusratio "busratio" /* cpu.c */ @@ -81,11 +81,17 @@ #define kHidePartition "Hide Partition" /* disk.c */ #define kRenamePartition "Rename Partition" /* disk.c */ +#define kDefaultPartition "Default Partition" /* sys.c */ #define kSMBIOSKey "SMBIOS" /* fake_efi.c */ +#define kSMBIOSdefaults "SMBIOSdefaults" /* smbios_patcher.c */ #define kSystemID "SystemId" /* fake_efi.c */ #define kSystemType "SystemType" /* fake_efi.c */ +#define kUseMemDetect "UseMemDetect" /* platform.c */ + +#define kPCIRootUID "PCIRootUID" /* pci_root.c */ + //#define kUseAtiROM "UseAtiROM" /* ati.c */ //#define kAtiConfig "AtiConfig" /* ati.c */ //#define kATYbinimage "ATYbinimage" /* ati.c */ @@ -95,21 +101,12 @@ //#define kdcfg0 "display_0" /* nvidia.c */ //#define kdcfg1 "display_1" /* nvidia.c */ - -#define kPCIRootUID "PCIRootUID" /* pci_root.c */ - #define kEthernetBuiltIn "EthernetBuiltIn" /* pci_setup.c */ #define kGraphicsEnabler "GraphicsEnabler" /* pci_setup.c */ #define kForceHPET "ForceHPET" /* pci_setup.c */ -#define kUseMemDetect "UseMemDetect" /* platform.c */ - #define kMD0Image "md0" /* ramdisk.h */ -#define kSMBIOSdefaults "SMBIOSdefaults" /* smbios_patcher.c */ - -#define kDefaultPartition "Default Partition" /* sys.c */ - #define kUSBBusFix "USBBusFix" /* usb.c */ #define kEHCIacquire "EHCIacquire" /* usb.c */ #define kUHCIreset "UHCIreset" /* usb.c */ Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/bmdecompress.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/bmdecompress.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/bmdecompress.c (revision 1009) @@ -19,8 +19,10 @@ * * @APPLE_LICENSE_HEADER_END@ */ + #include "boot.h" + static void PreviewDecompress16(uint32_t * compressBuffer, uint32_t width, uint32_t height, uint32_t row, Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/gui.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/gui.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/gui.c (revision 1009) @@ -1018,14 +1018,14 @@ } } -struct putc_info //Azi: same as below +struct putc_info //Azi: exists on console.c & printf.c { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) //Azi: exists on console.c & printf.c +sputc(int c, struct putc_info * pi) //Azi: same as above { if (pi->last_str) if (pi->str == pi->last_str) { Index: branches/azimutz/trunkGraphicsEnablerModules/i386/modules/GraphicsEnabler/AMDGraphicsEnabler/ati.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/modules/GraphicsEnabler/AMDGraphicsEnabler/ati.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/modules/GraphicsEnabler/AMDGraphicsEnabler/ati.c (revision 1009) @@ -508,6 +508,8 @@ { 0x68B9, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5600 Series", kVervet }, { 0x68B8, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet }, { 0x68BE, 0x00000000, CHIP_FAMILY_JUNIPER, "ATI Radeon HD 5700 Series", kVervet }, + //Azi: from Slice { 0x100268C0, "ATI Radeon 5670 Series", "Galago"} + // http://www.insanelymac.com/forum/index.php?s=&showtopic=255866&view=findpost&p=1695482 { 0x68D8, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5600 Series", kBaboon }, { 0x68D9, 0x00000000, CHIP_FAMILY_REDWOOD, "ATI Radeon HD 5500 Series", kBaboon }, Index: branches/azimutz/trunkGraphicsEnablerModules/i386/libsa/printf.c =================================================================== --- branches/azimutz/trunkGraphicsEnablerModules/i386/libsa/printf.c (revision 1008) +++ branches/azimutz/trunkGraphicsEnablerModules/i386/libsa/printf.c (revision 1009) @@ -28,14 +28,14 @@ #include "libsa.h" -struct putc_info //Azi: same as below +struct putc_info //Azi: exists on console.c & gui.c { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) //Azi: exists on console.c & gui.c +sputc(int c, struct putc_info * pi) //Azi: same as above { if (pi->last_str) if (pi->str == pi->last_str) {