Chameleon

Chameleon Commit Details

Date:2010-08-06 01:08:54 (9 years 16 days ago)
Author:Azimutz
Commit:312
Parents: 311
Message:Matching trunk rev 309.
Changes:
M/branches/azimutz/CleanCut/i386/boot2/options.c
M/branches/azimutz/CleanCut/i386/boot2/graphics.c
M/branches/azimutz/CleanCut/i386/libsaio/msdos.c
M/branches/azimutz/CleanCut/i386/boot2/gui.c

File differences

branches/azimutz/CleanCut/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/CleanCut/i386/boot2/graphics.c
11271127
11281128
11291129
1130
1130
11311131
11321132
11331133
params[1] = 25;
}
setVESATextMode( params[0], params[1], 4 );
setVESATextMode( params[0], params[1], 4 );
bootArgs->Video.v_display = VGA_TEXT_MODE;
}
branches/azimutz/CleanCut/i386/boot2/gui.c
754754
755755
756756
757
758
757
758
759
760
761
762
759763
760764
761765
......
827831
828832
829833
830
831
832834
833835
834836
......
17841786
17851787
17861788
1789
17871790
17881791
17891792
......
18051808
18061809
18071810
1811
1812
1813
1814
18081815
18091816
18101817
18111818
18121819
18131820
1814
1821
1822
1823
1824
18151825
18161826
1817
1827
18181828
18191829
18201830
}
}
// 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 ));
if(gui.menu.draw)
drawInfoMenuItems();
blend( images[iSelection].image, gui.devicelist.pixmap, centeredAt( images[iSelection].image, p ) );
#if DEBUG
gui.debug.cursor = pos( 10, 100);
dprintf( &gui.screen, "label %s\n", param->label );
int pos;
int length;
const char *dummyVal;
int oldScreenWidth, oldScreenHeight;
bool legacy_logo;
uint16_t x, y;
screen_params[1] = DEFAULT_SCREEN_HEIGHT;
}
// 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);
}
if (getValueForKey("-checkers", &dummyVal, &length, &bootInfo->bootConfig)) {
drawCheckerBoard();
} else {
branches/azimutz/CleanCut/i386/boot2/options.c
112112
113113
114114
115
115
116116
117117
118118
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

Archive Download the corresponding diff file

Revision: 312