Index: branches/ErmaC/Enoch/i386/libsaio/smbios.c =================================================================== --- branches/ErmaC/Enoch/i386/libsaio/smbios.c (revision 2713) +++ branches/ErmaC/Enoch/i386/libsaio/smbios.c (revision 2714) @@ -368,9 +368,10 @@ {kSMBTypeMemoryDevice, kSMBString, getFieldOffset(SMBMemoryDevice, partNumber), kSMBMemoryDevicePartNumberKey, getSMBMemoryDevicePartNumber, NULL}, - //------------------------------------------------------------------------------------------------------------------------- - // Apple Specific - //------------------------------------------------------------------------------------------------------------------------- + /* ============ + Apple Specific + ============== */ + // OEM Processor Type (Apple Specific - Type 131) {kSMBTypeOemProcessorType, kSMBWord, getFieldOffset(SMBOemProcessorType, ProcessorType), kSMBOemProcessorTypeKey, getSMBOemProcessorType, NULL}, Index: branches/ErmaC/Enoch/i386/libsaio/stringTable.c =================================================================== --- branches/ErmaC/Enoch/i386/libsaio/stringTable.c (revision 2713) +++ branches/ErmaC/Enoch/i386/libsaio/stringTable.c (revision 2714) @@ -809,7 +809,7 @@ if(sfd >= 0) { // Use sfd - fixedsize = MIN(file_size(sfd),IO_CONFIG_DATA_SIZE); + fixedsize = MIN(file_size(sfd), IO_CONFIG_DATA_SIZE); count = read(sfd, config->plist, fixedsize); close(sfd); close(pfd); @@ -824,7 +824,7 @@ else { // used pfd - fixedsize = MIN(file_size(pfd),IO_CONFIG_DATA_SIZE); + fixedsize = MIN(file_size(pfd), IO_CONFIG_DATA_SIZE); count = read(pfd, config->plist, fixedsize); close(pfd); if (count != fixedsize) return -1; @@ -845,7 +845,7 @@ if(pfd >= 0) { // use sfd - fixedsize = MIN(file_size(pfd),IO_CONFIG_DATA_SIZE); + fixedsize = MIN(file_size(pfd), IO_CONFIG_DATA_SIZE); count = read(pfd, config->plist, fixedsize); close(pfd); close(rfd); @@ -860,7 +860,7 @@ else { // use rfd - fixedsize = MIN(file_size(rfd),IO_CONFIG_DATA_SIZE); + fixedsize = MIN(file_size(rfd), IO_CONFIG_DATA_SIZE); count = read(rfd, config->plist, fixedsize); close(rfd); if (count != fixedsize) return -1; @@ -879,7 +879,7 @@ if(sfd >= 0) { // use sfd - fixedsize = MIN(file_size(sfd),IO_CONFIG_DATA_SIZE); + fixedsize = MIN(file_size(sfd), IO_CONFIG_DATA_SIZE); count = read(sfd, config->plist, fixedsize); close(sfd); if (count != fixedsize) return -1; Index: branches/ErmaC/Enoch/i386/libsaio/smbios_getters.c =================================================================== --- branches/ErmaC/Enoch/i386/libsaio/smbios_getters.c (revision 2713) +++ branches/ErmaC/Enoch/i386/libsaio/smbios_getters.c (revision 2714) @@ -561,7 +561,7 @@ idx++; - //DBG("getSMBMemoryDeviceSerialNumber index: %d, MAX_RAM_SLOTS: %d\n",idx,MAX_RAM_SLOTS); + //DBG("getSMBMemoryDeviceSerialNumber index: %d, MAX_RAM_SLOTS: %d\n", idx, MAX_RAM_SLOTS); if (idx < MAX_RAM_SLOTS) { Index: branches/ErmaC/Enoch/i386/libsaio/saio_internal.h =================================================================== --- branches/ErmaC/Enoch/i386/libsaio/saio_internal.h (revision 2713) +++ branches/ErmaC/Enoch/i386/libsaio/saio_internal.h (revision 2714) @@ -48,7 +48,7 @@ extern int ebioswrite(int dev, long sec, int count); extern int get_drive_info(int drive, struct driveInfo *dp); extern int ebiosEjectMedia(int biosdev); -extern void bios_putchar(int ch); +extern void bios_putchar(int ch); extern void putca(int ch, int attr, int repeat); extern int readKeyboardStatus(void); extern int readKeyboardShiftFlags(void); @@ -166,8 +166,8 @@ extern int loadChameleonConfig(config_file_t *configBuff, BVRef chain); extern int loadChameleonConfigForDevice(config_file_t *configBuff, const char *device, const char *path); extern char * newString(const char *oldString); -extern char * getNextArg(char ** ptr, char * val); -extern int ParseXMLFile( char * buffer, TagPtr * dict ); +extern char * getNextArg(char **ptr, char *val); +extern int ParseXMLFile( char *buffer, TagPtr * dict ); /* sys.c */ extern BVRef getBootVolumeRef( const char * path, const char ** outPath ); Index: branches/ErmaC/Enoch/i386/boot2/boot.h =================================================================== --- branches/ErmaC/Enoch/i386/boot2/boot.h (revision 2713) +++ branches/ErmaC/Enoch/i386/boot2/boot.h (revision 2714) @@ -30,7 +30,7 @@ #include "libsaio.h" // OS X Versions -#define ELCAPITAN checkOSVersion("10.11") // El Capitan +#define ELCAPITAN checkOSVersion("10.11") // El Capitan #define YOSEMITE checkOSVersion("10.10") // Yosemite #define MAVERICKS checkOSVersion("10.9") // Mavericks #define MOUNTAIN_LION checkOSVersion("10.8") // Mountain Lion @@ -192,7 +192,7 @@ #define kSkipAtiGfx "SkipAtiGfx" /* pci_setup.c */ #define kIntelCapriFB "IntelCapriFB" /* gma.c was HD4K-ig */ #define kIntelAzulFB "IntelAzulFB" /* gma.c was HD5K-ig */ -#define kIntelBdwFB "IntelBDWFB" /* gma.c */ +#define kIntelBdwFB "IntelBdwFB" /* gma.c */ #define kAAPLCustomIG "InjectIntel-ig" /* gma.c */ #define kHDAEnabler "HDAEnabler" /* pci_setup.c */ #define kHDEFLayoutID "HDEFLayoutID" /* hda.c */ Index: branches/ErmaC/Enoch/i386/libsa/string.c =================================================================== --- branches/ErmaC/Enoch/i386/libsa/string.c (revision 2713) +++ branches/ErmaC/Enoch/i386/libsa/string.c (revision 2714) @@ -394,9 +394,9 @@ /* COPYRIGHT NOTICE: checksum8 from AppleSMBIOS */ uint8_t checksum8( void *start, unsigned int length ) { - uint8_t csum = 0; - uint8_t * cp = (uint8_t *) start; - unsigned int i; + uint8_t csum = 0; + uint8_t *cp = (uint8_t *) start; + unsigned int i; for ( i = 0; i < length; i++) {