Chameleon

Chameleon Commit Details

Date:2010-08-05 15:18:29 (13 years 8 months ago)
Author:Azimutz
Commit:310
Parents: 309
Message:Updating... This folder will eventually disappear so, proper comments will be on the CleanCut folder as i commit them.
Changes:
M/branches/azimutz/Chazileon/Makefile
M/branches/azimutz/Chazileon/i386/libsaio/smbios_patcher.c
M/branches/azimutz/Chazileon
M/branches/azimutz/Chazileon/i386/libsaio/msdos.c
M/branches/azimutz/Chazileon/i386/boot2/gui.c
M/branches/azimutz/Chazileon/i386/libsaio/fake_efi.c
M/branches/azimutz/Chazileon/i386/boot2/options.c
M/branches/azimutz/Chazileon/i386/libsaio/stringTable.c

File differences

branches/azimutz/Chazileon/i386/libsaio/smbios_patcher.c
216216
217217
218218
219
219
220220
221221
222222
␉␊
␉return 0x0301; // Core 2 Duo␊
}␊
//Azi: defined but not used.␊
//Azi: warning: ‘sm_get_bus_speed’ defined but not used␊
/*static int sm_get_bus_speed(const char *name, int table_num)␊
{␊
␉if (Platform.CPU.Vendor == 0x756E6547) // Intel␊
branches/azimutz/Chazileon/i386/libsaio/stringTable.c
614614
615615
616616
617
617618
618
619619
620620
621621
␉//Azi: Called from boot.c, commonBoot (firstrun).␊
␉// DEFAULT Boot.plist paths. These are checked before getting to boot prompt.␊
␉char *dirspec[] = {␊
␉␉//"/Extra/com.apple.Boot.plist", removed in favor of bt(0,0) - review? only needed to load it from selected volume.␊
␉␉"bt(0,0)/Extra/com.apple.Boot.plist",␊
␉␉//"/Extra/com.apple.Boot.plist", removed in favor of bt(0,0)␊
␉␉"/Library/Preferences/SystemConfiguration/com.apple.Boot.plist",␊
␉␉"/com.apple.boot.P/Library/Preferences/SystemConfiguration/com.apple.Boot.plist",␊
␉␉"/com.apple.boot.R/Library/Preferences/SystemConfiguration/com.apple.Boot.plist",␊
branches/azimutz/Chazileon/i386/libsaio/msdos.c
7575
7676
7777
78
7978
8079
8180
......
153152
154153
155154
156
155
157156
158157
159158
......
224223
225224
226225
227
228
226
229227
230228
231229
......
233231
234232
235233
236
237
234
235
238236
239237
240
241
238
239
242240
243241
244242
static CICell msdoscurrent = 0;␊
static int msdosrootcluster = 0;␊
static int msdosfatbits = 0;␊
static int msdosCacheBlockSize = 0;␊
␊
#if UNUSED␊
/*␊
␉␊
␉if (msdoscurrent == ih)␊
␉{␊
␉␉CacheInit(ih, msdosCacheBlockSize);␊
␉␉CacheInit(ih, msdosclustersize);␊
␉␉return 0;␊
␉}␊
␉␊
␉msdosclustersize = msdosbps * spc;␊
␉msdoscurrent = ih;␊
␉␊
␉msdosCacheBlockSize = (msdosclustersize > MAX_CACHE_BLOCKSIZE) ? msdosclustersize : MAX_CACHE_BLOCKSIZE;␊
␉CacheInit(ih, msdosCacheBlockSize);␊
␉CacheInit(ih, msdosclustersize);␊
␉free (buf);␊
␉return 0;␊
}␊
static int␊
readSectorAligned(CICell ih, off_t readOffset, char *buf, int size)␊
{␊
long long sectorOffset = (uint64_t)readOffset / msdosCacheBlockSize * msdosCacheBlockSize;␊
long relOffset = readOffset % msdosCacheBlockSize;␊
long long sectorOffset = (uint64_t)readOffset / msdosclustersize * msdosclustersize;␊
long relOffset = readOffset % msdosclustersize;␊
char *cacheBuffer;␊
␊
cacheBuffer = malloc(msdosCacheBlockSize);␊
CacheRead(ih, cacheBuffer, sectorOffset, msdosCacheBlockSize, true);␊
cacheBuffer = malloc(msdosclustersize);␊
CacheRead(ih, cacheBuffer, sectorOffset, msdosclustersize, true);␊
bcopy(cacheBuffer + relOffset, buf, size);␊
free(cacheBuffer);␊
␊
branches/azimutz/Chazileon/i386/libsaio/fake_efi.c
8080
8181
8282
83
83
8484
8585
8686
......
8888
8989
9090
91
92
9391
9492
9593
......
141139
142140
143141
144
142
145143
146144
147145
static EFI_UINT32 const FIRMWARE_REVISION = 132; /* FIXME: Find a constant for this. */␊
␊
// Default platform system_id (fix by IntVar)␊
static EFI_CHAR8 const SYSTEM_ID[] = "0123456789ABCDEF";//random value gen by uuidgen␊
static EFI_CHAR8 const SYSTEM_ID[] = "0123456789ABCDEF"; //random value gen by uuidgen␊
␊
// Just a ret instruction␊
static uint8_t const VOIDRET_INSTRUCTIONS[] = {0xc3};␊
// movl $0x80000003,%eax; ret␊
static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = {0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3};␊
␊
// struct fake_efi_pages Azi:efi32/64 - moved to setupEfiTables32/64␊
␊
EFI_SYSTEM_TABLE_32 *gST32 = NULL; //Azi:efi32/64␊
EFI_SYSTEM_TABLE_64 *gST64 = NULL; //␉␉||␊
Node *gEfiConfigurationTableNode = NULL;␊
␉return EFI_UNSUPPORTED;␊
}␊
␊
//Azi:efi32/64 - crc32 done in place.␊
//Azi: crc32 done in place, on the cases were it wasn't.␊
/*static inline void fixupEfiSystemTableCRC32(EFI_SYSTEM_TABLE_64 *efiSystemTable)␊
{␊
␉efiSystemTable->Hdr.CRC32 = 0;␊
branches/azimutz/Chazileon/i386/boot2/gui.c
167167
168168
169169
170
170
171
171172
172173
173174
......
793794
794795
795796
796
797
798
797
798
799
800
801
802
803
799804
800
805
801806
802807
803808
......
866871
867872
868873
869
870
871874
872875
873876
874877
875
878
876879
877880
878881
......
18351838
18361839
18371840
1841
18381842
18391843
18401844
......
18721876
18731877
18741878
1879
1880
1881
1882
18751883
18761884
18771885
18781886
18791887
18801888
1881
1889
1890
1891
1892
18821893
18831894
18841895
␊
static bool infoMenuNativeBoot = false;␊
␊
static unsigned long screen_params[4] = {DEFAULT_SCREEN_WIDTH, DEFAULT_SCREEN_HEIGHT, 32, 0}; // here we store the used screen resolution␊
// here we store the used screen resolution␊
static unsigned long screen_params[4] = {DEFAULT_SCREEN_WIDTH, DEFAULT_SCREEN_HEIGHT, 32, 0};␊
␊
static int getImageIndexByName(const char *name)␊
{␊
␉␉}␊
␉}␊
␉␊
␉// Use the next (device_*_o) image for the selected item.␊
if (isSelected) devicetype++;␊
␊
␉// Draw the selection image and use the next (device_*_o) image for the selected item.␊
␉if (isSelected)␊
␉{␊
␉␉blend(images[iSelection].image, buffer, centeredAt(images[iSelection].image, p));␊
␉␉devicetype++;␊
␉}␊
␉␊
␉// draw icon␊
␉blend( images[devicetype].image, buffer, centeredAt( images[devicetype].image, p ));␊
␉blend(images[devicetype].image, buffer, centeredAt( images[devicetype].image, p ));␊
␉␊
␉p.y += (images[iSelection].image->height / 2) + font_console.chars[0]->height;␊
␉␊
␊
␉␉␉if (gui.menu.draw)␊
␉␉␉␉drawInfoMenuItems();␊
␊
␉␉␉blend( images[iSelection].image, gui.devicelist.pixmap, centeredAt( images[iSelection].image, p ) );␊
␉␉␊
␉␉␉//Azi: making this info more accessible. TODO: remove the stuff on graphics.c!␊
␉␉␉getBoolForKey(kDisplayInfoKey, &displayInfo, &bootInfo->bootConfig);␊
␉␉␉␊
#ifdef AUTORES_DEBUG //Azi, LeBidou␊
#ifdef AUTORES_DEBUG //Azi:autoresolution␊
␉␉␉displayInfo = true;␊
#endif␊
␊
␉int pos;␊
␉int length, count;␊
␉const char *dummyVal;␊
␉int oldScreenWidth, oldScreenHeight;␊
␉bool legacy_logo;␊
␉uint16_t x, y; ␊
␉␊
␉␉}␊
␉}␊
␊
␉// Save current screen resolution.␊
␉oldScreenWidth = gui.screen.width;␊
␉oldScreenHeight = gui.screen.height;␊
␊
␉gui.screen.width = screen_params[0];␊
␉gui.screen.height = screen_params[1];␊
␊
␉// find best matching vesa mode for our requested width & height␊
␉getGraphicModeParams(screen_params);␊
␉␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE) {␊
// Set graphics mode if the booter was in text mode or the screen resolution has changed.␊
␉if (bootArgs->Video.v_display == VGA_TEXT_MODE␊
␉␉|| (screen_params[0] != oldScreenWidth && screen_params[1] != oldScreenHeight) )␊
␉{␊
␉␉setVideoMode(GRAPHICS_MODE, 0);␊
␉}␊
␉␊
branches/azimutz/Chazileon/i386/boot2/options.c
119119
120120
121121
122
122
123123
124124
125125
␉␊
␉␉char dummy[80];␊
␉␉getBootVolumeDescription( gBootVolume, dummy, 80, true );␊
␉␉drawDeviceIcon( gBootVolume, gui.screen.pixmap, p, false );␊
␉␉drawDeviceIcon( gBootVolume, gui.screen.pixmap, p, true );␊
␉␉drawStrCenteredAt( (char *) msg, &font_small, gui.screen.pixmap, gui.countdown.pos );␊
␉␉␊
␉␉// make this screen the new background␊
branches/azimutz/Chazileon/Makefile
115115
116116
117117
118
119118
120119
121120
␉@tar -czf $(SYMROOT)/$(PRODUCT)-src.tar.gz ${EXCLUDE} .␊
␉@tar -cjf $(SYMROOT)/$(PRODUCT)-src.tar.bz2 ${EXCLUDE} .␊
␊
#Azi: is "dst" still needed?␊
clean:␊
␉rm -rf sym obj dst revision␊
␊␊

Archive Download the corresponding diff file

Revision: 310