Chameleon

Chameleon Commit Details

Date:2015-06-11 19:06:53 (5 years 5 months ago)
Author:ErmaC
Commit:2715
Parents: 2714
Message:Typo
Changes:
M/trunk/i386/libsaio/smbios_getters.c
M/trunk/i386/boot2/boot.h
M/trunk/i386/libsaio/saio_internal.h
M/trunk/i386/libsaio/stringTable.c

File differences

trunk/i386/libsaio/stringTable.c
809809
810810
811811
812
812
813813
814814
815815
......
824824
825825
826826
827
827
828828
829829
830830
......
845845
846846
847847
848
848
849849
850850
851851
......
860860
861861
862862
863
863
864864
865865
866866
......
879879
880880
881881
882
882
883883
884884
885885
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);
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;
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);
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;
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;
trunk/i386/libsaio/smbios_getters.c
561561
562562
563563
564
564
565565
566566
567567
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)
{
trunk/i386/libsaio/saio_internal.h
4848
4949
5050
51
51
5252
5353
5454
......
166166
167167
168168
169
170
169
170
171171
172172
173173
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);
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 intParseXMLFile( char *buffer, TagPtr * dict );
/* sys.c */
extern BVRef getBootVolumeRef( const char * path, const char ** outPath );
trunk/i386/boot2/boot.h
3030
3131
3232
33
33
3434
3535
3636
......
177177
178178
179179
180
180
181181
182182
183183
#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
#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 */

Archive Download the corresponding diff file

Revision: 2715