Chameleon

Chameleon Commit Details

Date:2010-09-01 01:55:43 (13 years 7 months ago)
Author:Azimutz
Commit:460
Parents: 459
Message:Added a key to display some debug info, that can only be accessed via code edit. Details on /doc-azi/CHANGES.txt.
Changes:
M/branches/azimutz/CleanCut/i386/boot2/options.c
M/branches/azimutz/CleanCut/doc-azi/CHANGES.txt
M/branches/azimutz/CleanCut/i386/boot2/graphics.c
M/branches/azimutz/CleanCut/i386/boot2/gui.c
M/branches/azimutz/CleanCut/i386/boot2/boot.h
M/branches/azimutz/CleanCut/i386/boot2/gui.h

File differences

branches/azimutz/CleanCut/doc-azi/CHANGES.txt
258258
259259
260260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
261276
262277
263278
␉␉---------------//---------------//---------------␊
␉␉␊
- (rev )␊
Change: added a key to display some debug info, that can only be accessed via code edit.␊
␉␉Check http://forge.voodooprojects.org/p/chameleon/issues/12/ for history.␊
␉␉mm & attr, resolution specific info, are borrowed from AutoResolution branch.␊
␉␉␊
␉␉DebugInfo=y enables display of debug info.␊
␊
Note: Boot Banner(*)=n will override DebugInfo=y , disabling the display of this info.␊
␉␉Key is disabled by default.␊
␊
Motif: just making this info easily accessible.␊
␊
␉␉---------------//---------------//---------------␊
␉␉---------------//---------------//---------------␊
␉␉␊
- (rev )␊
Change:␉␉␉␉template␊
␊
Motif:␊
branches/azimutz/CleanCut/i386/boot2/graphics.c
369369
370370
371371
372
373
372374
373375
374376
......
462464
463465
464466
467
468
469
470
471
472
473
474
465475
466476
467477
unsigned char bitsPerPixel,␊
unsigned short refreshRate )␊
{␊
␉bool␉␉␉ debugInfo = false; //Azi:debuginfo␊
␉extern bool␉␉ showBootBanner; //␉␉||␊
VBEModeInfoBlock minfo;␊
unsigned short mode;␊
unsigned short vesaVersion;␊
bootArgs->Video.v_rowBytes = minfo.BytesPerScanline;␊
bootArgs->Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr);␊
␊
␉␉//Azi: mm & attr info on DebugInfo - from AutoResolution branch.␊
␉␉getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig);␊
␊
␉␉if (debugInfo && showBootBanner)␊
␉␉{␊
␉␉␉gui.screen.mm␉␉ = minfo.MemoryModel;␊
␉␉␉gui.screen.attr␉␉ = minfo.ModeAttributes;␊
␉␉}␊
}␊
while ( 0 );␊
␊
branches/azimutz/CleanCut/i386/boot2/boot.h
5959
6060
6161
62
6263
6364
6465
#define kInstantMenuKey␉␉"Instant Menu"␉␉// boot.c␊
#define kGUIKey␉␉␉␉"GUI"␉␉␉␉// boot.c␊
#define kBootBannerKey␉␉"Boot Banner"␉␉// options.c␊
#define kDebugInfoKey␉␉"DebugInfo"␉␉␉// gui.c, graphics.c␊
#define kWaitForKeypressKey␉"Wait"␉␉␉␉// boot.c␊
#define kExtensionsKey␉␉"kext"␉␉␉␉// drivers.c␊
#define kUseAtiROM␉␉␉"UseAtiROM"␉␉␉// ati.c␊
branches/azimutz/CleanCut/i386/boot2/gui.c
806806
807807
808808
809
810
809
810
811
812
811813
812814
813815
......
863865
864866
865867
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
883892
884893
885894
␊
void drawDeviceList (int start, int end, int selection)␊
{␊
␉int i;␊
␉position_t p, p_prev, p_next;␊
␉int␉␉␉i;␊
␉bool␉␉debugInfo = false; //Azi:debuginfo␊
␉extern bool showBootBanner; //␉␉␉||␊
␉position_t␉p, p_prev, p_next;␊
␊
␉//uint8_t␉maxDevices = MIN( gui.maxdevices, menucount );␊
␉␉␊
␉␉␉ ␊
␉␉␉if(gui.menu.draw)␊
␉␉␉␉drawInfoMenuItems();␊
␉␉␉ ␊
#if DEBUG␊
gui.debug.cursor = pos( 10, 100);␊
dprintf( &gui.screen, "label %s\n", param->label );␊
dprintf( &gui.screen, "biosdev 0x%x\n", param->biosdev );␊
dprintf(&gui.screen, "width %d\n", gui.screen.width);␊
dprintf(&gui.screen, "height %d\n", gui.screen.height);␊
dprintf( &gui.screen, "type 0x%x\n", param->type );␊
dprintf( &gui.screen, "flags 0x%x\n", param->flags );␊
dprintf( &gui.screen, "part_no %d\n", param->part_no );␊
dprintf( &gui.screen, "part_boff 0x%x\n", param->part_boff );␊
dprintf( &gui.screen, "part_type 0x%x\n", param->part_type );␊
dprintf( &gui.screen, "bps 0x%x\n", param->bps );␊
dprintf( &gui.screen, "name %s\n", param->name );␊
dprintf( &gui.screen, "type_name %s\n", param->type_name );␊
dprintf( &gui.screen, "modtime %d\n", param->modTime );␊
#endif␊
␉␉␉␊
␉␉␉//Azi: make this info more accessible.␊
␉␉␉getBoolForKey(kDebugInfoKey, &debugInfo, &bootInfo->bootConfig);␊
␉␉␉␊
␉␉␉if (debugInfo && showBootBanner)␊
␉␉␉{␊
␉␉␉␉gui.debug.cursor = pos( 10, 100);␊
␉␉␉␉dprintf( &gui.screen, "label: %s\n", param->label );␊
␉␉␉␉dprintf( &gui.screen, "biosdev: 0x%x\n", param->biosdev );␊
␉␉␉␉dprintf( &gui.screen, "type: 0x%x\n", param->type );␊
␉␉␉␉dprintf( &gui.screen, "flags: 0x%x\n", param->flags );␊
␉␉␉␉dprintf( &gui.screen, "part_no: %d\n", param->part_no );␊
␉␉␉␉dprintf( &gui.screen, "part_boff: 0x%x\n", param->part_boff );␊
␉␉␉␉dprintf( &gui.screen, "part_type: 0x%x\n", param->part_type );␊
␉␉␉␉dprintf( &gui.screen, "bps: 0x%x\n", param->bps );␊
␉␉␉␉dprintf( &gui.screen, "name: %s\n", param->name );␊
␉␉␉␉dprintf( &gui.screen, "type_name: %s\n", param->type_name );␊
␉␉␉␉dprintf( &gui.screen, "modtime: %d\n", param->modTime );␊
␉␉␉␉dprintf( &gui.screen, "width: %d\n", gui.screen.width );␊
␉␉␉␉dprintf( &gui.screen, "height: %d\n", gui.screen.height );␊
␉␉␉␉dprintf( &gui.screen, "attr: 0x%x\n", gui.screen.attr );␊
␉␉␉␉dprintf( &gui.screen, "mm: %d\n", gui.screen.mm );␊
␉␉␉}␊
␊
␉␉}␊
␉␉␊
␉␉drawDeviceIcon( param, gui.devicelist.pixmap, p, isSelected);␊
branches/azimutz/CleanCut/i386/boot2/gui.h
9696
9797
9898
99
100
101
99102
100103
101104
␉uint32_t␉font_small_color;␉// Color for small font AARRGGBB␊
␉uint32_t␉font_console_color;␉// Color for consle font AARRGGBB␊
␉bool␉␉draw;␉␉␉// Draw flag␊
␉//resolution specifics␊
␉uint8_t␉␉mm;␉␉␉␉// Azi: debuginfo␊
␉uint16_t␉attr;␊
} window_t;␊
␉␊
/*␊
branches/azimutz/CleanCut/i386/boot2/options.c
3030
3131
3232
33
3334
3435
3536
......
873874
874875
875876
876
877
877878
878879
879880
#include "embedded.h"␊
#include "pci.h"␊
␊
bool showBootBanner = true; //Azi:debuginfo␊
static bool shouldboot = false;␊
␊
extern int multiboot_timeout;␊
␉␉gui.devicelist.draw = true;␊
␉␉gui.redraw = true;␊
␉␉if (!(gBootMode & kBootModeQuiet)) {␊
␉␉␉bool showBootBanner = true;␊
␉␉␉//bool showBootBanner = true; Azi:debuginfo␊
␊
␉␉␉// Check if "Boot Banner"=N switch is present in config file.␊
␉␉␉getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig); ␊

Archive Download the corresponding diff file

Revision: 460