Chameleon Commit Details - 946 - Chameleon open source boot loader project.

Date:

2011-06-03 11:34:08 (12 years 10 months ago)

Author:

Azimutz

Commit:

946

Parents:

945

Message:

Committing patch. This is a rework of the patch present on AutoResolution branch. It's functional but not finished.

Changes:

D	/branches/azimutz/trunkAutoResolution/i386/modules/Resolution
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/gma_resolution.h
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/autoresolution.c
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/nvidia_resolution.c
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/ati_resolution.c
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/autoresolution.h
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/nvidia_resolution.h
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/gma.c
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/edid.c
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/ati_resolution.h
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/gma.h
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/edid.h
A	/branches/azimutz/trunkAutoResolution/i386/libsaio/gma_resolution.c
M	/branches/azimutz/trunkAutoResolution/i386/boot2/gui.h
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/Makefile
M	/branches/azimutz/trunkAutoResolution/i386/boot2/options.c
M	/branches/azimutz/trunkAutoResolution/i386/boot2/graphics.c
M	/branches/azimutz/trunkAutoResolution/i386/boot2/boot.c
M	/branches/azimutz/trunkAutoResolution/i386/boot2/graphics.h
M	/branches/azimutz/trunkAutoResolution/i386/boot2/boot.h
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/vbe.c
M	/branches/azimutz/trunkAutoResolution/i386/modules/Cconfig
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/vbe.h
M	/branches/azimutz/trunkAutoResolution/i386/modules/Makefile
M	/branches/azimutz/trunkAutoResolution/Chameleon.xcodeproj/project.pbxproj
M	/branches/azimutz/trunkAutoResolution/i386/boot2/gui.c
M	/branches/azimutz/trunkAutoResolution/i386/libsaio/pci_setup.c

File differences

-28
29 29
30 30
31
31 32
32 33
33 34
... ...
106 107
107 108
108 109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
109 125
110 126
111 127
+␊
#include "libsaio.h"␊
#include "vbe.h"␊
#include "edid.h" //Azi:autoresolution␊
␊
/* ␊
 * Various inline routines for video I/O␊

}␊
␊
/*␊
 *EDID/DDC Readings - AutoResolution␊
 */␊
int getEDID( void *ddcblock, uint8_t blocksleft )␊
{␊
␉bb.intno    = 0x10;␊
␉bb.eax.rr   = FUNC_GET_EDID;␊
␉bb.ebx.r.l  = SERVICE_READ_EDID;␊
␉bb.es       = SEG( ddcblock );␊
␉bb.edi.rr   = OFF( ddcblock );␊
␉bb.edx.rr   = blocksleft;␊
␉bios( &bb );␊
␉return( bb.eax.r.h );␊
}␊
␊
/*␊
 * Default GTF parameter values.␊
 */␊
#define kCellGranularity  8.0    // character cell granularity␊
 ...
 ␊
 #include "libsaio.h"␊
 #include "vbe.h"␊
+#include "edid.h" //Azi:autoresolution␊
 ␊
 /* ␊
  * Various inline routines for video I/O␊
 }␊
 ␊
 /*␊
+ *EDID/DDC Readings - AutoResolution␊
+ */␊
+int getEDID( void *ddcblock, uint8_t blocksleft )␊
+{␊
+␉bb.intno    = 0x10;␊
+␉bb.eax.rr   = FUNC_GET_EDID;␊
+␉bb.ebx.r.l  = SERVICE_READ_EDID;␊
+␉bb.es       = SEG( ddcblock );␊
+␉bb.edi.rr   = OFF( ddcblock );␊
+␉bb.edx.rr   = blocksleft;␊
+␉bios( &bb );␊
+␉return( bb.eax.r.h );␊
+}␊
+␊
+/*␊
  * Default GTF parameter values.␊
  */␊
 #define kCellGranularity  8.0    // character cell granularity␊

-268
269 269
270 270
271
272
273
274
275
271 276
272 277
273 278
+ */␊
typedef unsigned long VBEPalette[256];␊
␊
/*␊
 * DDC - AutoResolution␊
 */␊
extern int getEDID(void *ddcblock, uint8_t blocksleft);␊
␊
extern int getVBEInfo(void *vinfo_p);␊
extern int getVBEModeInfo(int mode, void *minfo_p);␊
extern int getVBEDACFormat(unsigned char *format);␊
  */␊
 typedef unsigned long VBEPalette[256];␊
 ␊
+/*␊
+ * DDC - AutoResolution␊
+ */␊
+extern int getEDID(void *ddcblock, uint8_t blocksleft);␊
+␊
 extern int getVBEInfo(void *vinfo_p);␊
 extern int getVBEModeInfo(int mode, void *minfo_p);␊
 extern int getVBEDACFormat(unsigned char *format);␊

-38
39 39
40 40
41 
42 
41
42
43
44
43 45
44 46
45 47
+␉smbios.o smbios_getters.o smbios_decode.o \␊
␉fake_efi.o ext2fs.o \␊
␉hpet.o dram_controllers.o spd.o usb.o pci_setup.o \␊
␉device_inject.o nvidia.o ati.o pci_root.o \␊
␉convert.o aml_generator.o console.o␊
␉device_inject.o convert.o aml_generator.o console.o \␊
␉pci_root.o nvidia.o ati.o gma.o \␊
␉nvidia_resolution.o ati_resolution.o gma_resolution.o \␊
␉autoresolution.o edid.o␊
␊
LIBS  = libsaio.a␊
LIBS := $(addprefix $(SYMROOT)/, $(LIBS))␊
 ␉smbios.o smbios_getters.o smbios_decode.o \␊
 ␉fake_efi.o ext2fs.o \␊
 ␉hpet.o dram_controllers.o spd.o usb.o pci_setup.o \␊
-␉device_inject.o nvidia.o ati.o pci_root.o \␊
-␉convert.o aml_generator.o console.o␊
+␉device_inject.o convert.o aml_generator.o console.o \␊
+␉pci_root.o nvidia.o ati.o gma.o \␊
+␉nvidia_resolution.o ati_resolution.o gma_resolution.o \␊
+␉autoresolution.o edid.o␊
 ␊
 LIBS  = libsaio.a␊
 LIBS := $(addprefix $(SYMROOT)/, $(LIBS))␊

-
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
+#ifndef __LIBSAIO_GMA_H␊
#define __LIBSAIO_GMA_H␊
␊
bool setup_gma_devprop(pci_dt_t *gma_dev);␊
␊
struct gma_gpu_t {␊
␉unsigned device;␊
␉char *name;␊
};␊
␊
#define REG8(reg)  ((volatile uint8_t *)regs)[(reg)]␊
#define REG16(reg)  ((volatile uint16_t *)regs)[(reg) >> 1]␊
#define REG32(reg)  ((volatile uint32_t *)regs)[(reg) >> 2]␊
␊
␊
#endif /* !__LIBSAIO_GMA_H */␊
+#ifndef __LIBSAIO_GMA_H␊
+#define __LIBSAIO_GMA_H␊
+␊
+bool setup_gma_devprop(pci_dt_t *gma_dev);␊
+␊
+struct gma_gpu_t {␊
+␉unsigned device;␊
+␉char *name;␊
+};␊
+␊
+#define REG8(reg)  ((volatile uint8_t *)regs)[(reg)]␊
+#define REG16(reg)  ((volatile uint16_t *)regs)[(reg) >> 1]␊
+#define REG32(reg)  ((volatile uint32_t *)regs)[(reg) >> 2]␊
+␊
+␊
+#endif /* !__LIBSAIO_GMA_H */␊

-31
32 32
33 33
34
34 35
36
35 37
36 38
37 39
... ...
180 182
181 183
182 184
183 
185
186
184 187
185 188
186 189
... ...
387 390
388 391
389 392
393
394
390 395
391 396
392 397
... ...
424 429
425 430
426 431
432
433
434
435
436
437
438
427 439
428 
429 440
430 441
431 442
432 443
444
445
446
447
448
433 449
434 450
435 451
... ...
438 454
439 455
440 456
441 
457
442 458
443 459
444 460
... ...
461 477
462 478
463 479
464 
480
481
482
483
484
465 485
466 486
467 487
... ...
1030 1050
1031 1051
1032 1052
1033 
1034 
1053
1054
1035 1055
1036 1056
1037 1057
+#include "appleClut8.h"␊
#include "gui.h"␊
#include "IOHibernatePrivate.h"␊
#include "autoresolution.h"␊
␊
␊
/*␊
 * for spinning disk␊
 */␊

// Return the VESA mode that matches the properties specified.␊
// If a mode is not found, then return the "best" available mode.␊
␊
static unsigned short␊
//static Azi:autoresolution␊
unsigned short␊
getVESAModeWithProperties( unsigned short     width,␊
                           unsigned short     height,␊
                           unsigned char      bitsPerPixel,␊

            break;␊
        }␊
␊
␉␉if (refreshRate != 60) refreshRate = 60; //Azi:autoresolution␊
␊
//␊
// FIXME : generateCRTCTiming() causes crash.␊
//␊

//             err = setVBEMode( mode | kLinearFrameBufferBit, NULL );␊
//         }␊
␊
//Azi:autoresolution␊
#ifdef AUTORES_DEBUG␊
␉␉//Azi: who? who is about to set?? :P␊
␉␉PRINT("Is about to set mode #%d with resolution %dx%d\n", mode, minfo.XResolution, minfo.YResolution);␊
␉␉//getc(); //Azi: boot hangs, on the second call (like "old" Wait=y issue and usb fixes).␊
␉␉sleep(2);␊
#endif␊
        // Set the mode with default refresh rate.␊
␊
        err = setVBEMode( mode | kLinearFrameBufferBit, NULL );␊
␊
        if ( err != errSuccess )␊
        {␊
#ifdef AUTORES_DEBUG␊
␉␉␉PRINT("setVBEMode failed to set mode %d (%dx%d) with error #%d\n",␊
␉␉␉␉   mode, minfo.XResolution, minfo.YResolution, err);␊
␉␉␉sleep(2); //Azi: i suppose the same as above.␊
#endif␊
            break;␊
        }␊
␊

        if ( minfo.BitsPerPixel == 8 )␊
        {␊
            VBEPalette palette;␊
            setupPalette( &palette, appleClut8 );␊
            setupPalette( &palette, appleClut8 ); //Azi:autoresolution - check this stuff, appleClut8␊
            if ((err = setVBEPalette(palette)) != errSuccess)␊
            {␊
                break;␊

        bootArgs->Video.v_depth    = minfo.BitsPerPixel;␊
        bootArgs->Video.v_rowBytes = minfo.BytesPerScanline;␊
        bootArgs->Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr);␊
␊
//Azi:autoresolution␊
#ifdef AUTORES_DEBUG //Azi: changed from if to ifdef␊
␉␉gui.screen.mm␉␉␉␉= minfo.MemoryModel;␊
␉␉gui.screen.attr␉␉␉␉= minfo.ModeAttributes;␊
#endif␊
    }␊
    while ( 0 );␊
␊

//==========================================================================␊
// getNumberArrayFromProperty␊
␊
static int␊
getNumberArrayFromProperty( const char *  propKey,␊
//static Azi:autoresolution␊
int getNumberArrayFromProperty( const char *  propKey,␊
                            unsigned long numbers[],␊
                            unsigned long maxArrayCount )␊
{␊
 ...
 ...
 ...
 ...
 ...
 ...
 #include "appleClut8.h"␊
 #include "gui.h"␊
 #include "IOHibernatePrivate.h"␊
+#include "autoresolution.h"␊
 ␊
+␊
 /*␊
  * for spinning disk␊
  */␊
 // Return the VESA mode that matches the properties specified.␊
 // If a mode is not found, then return the "best" available mode.␊
 ␊
-static unsigned short␊
+//static Azi:autoresolution␊
+unsigned short␊
 getVESAModeWithProperties( unsigned short     width,␊
                            unsigned short     height,␊
                            unsigned char      bitsPerPixel,␊
             break;␊
         }␊
 ␊
+␉␉if (refreshRate != 60) refreshRate = 60; //Azi:autoresolution␊
+␊
 //␊
 // FIXME : generateCRTCTiming() causes crash.␊
 //␊
 //             err = setVBEMode( mode | kLinearFrameBufferBit, NULL );␊
 //         }␊
 ␊
+//Azi:autoresolution␊
+#ifdef AUTORES_DEBUG␊
+␉␉//Azi: who? who is about to set?? :P␊
+␉␉PRINT("Is about to set mode #%d with resolution %dx%d\n", mode, minfo.XResolution, minfo.YResolution);␊
+␉␉//getc(); //Azi: boot hangs, on the second call (like "old" Wait=y issue and usb fixes).␊
+␉␉sleep(2);␊
+#endif␊
         // Set the mode with default refresh rate.␊
-␊
         err = setVBEMode( mode | kLinearFrameBufferBit, NULL );␊
 ␊
         if ( err != errSuccess )␊
         {␊
+#ifdef AUTORES_DEBUG␊
+␉␉␉PRINT("setVBEMode failed to set mode %d (%dx%d) with error #%d\n",␊
+␉␉␉␉   mode, minfo.XResolution, minfo.YResolution, err);␊
+␉␉␉sleep(2); //Azi: i suppose the same as above.␊
+#endif␊
             break;␊
         }␊
 ␊
         if ( minfo.BitsPerPixel == 8 )␊
         {␊
             VBEPalette palette;␊
-            setupPalette( &palette, appleClut8 );␊
+            setupPalette( &palette, appleClut8 ); //Azi:autoresolution - check this stuff, appleClut8␊
             if ((err = setVBEPalette(palette)) != errSuccess)␊
             {␊
                 break;␊
         bootArgs->Video.v_depth    = minfo.BitsPerPixel;␊
         bootArgs->Video.v_rowBytes = minfo.BytesPerScanline;␊
         bootArgs->Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr);␊
-␊
+//Azi:autoresolution␊
+#ifdef AUTORES_DEBUG //Azi: changed from if to ifdef␊
+␉␉gui.screen.mm␉␉␉␉= minfo.MemoryModel;␊
+␉␉gui.screen.attr␉␉␉␉= minfo.ModeAttributes;␊
+#endif␊
     }␊
     while ( 0 );␊
 ␊
 //==========================================================================␊
 // getNumberArrayFromProperty␊
 ␊
-static int␊
-getNumberArrayFromProperty( const char *  propKey,␊
+//static Azi:autoresolution␊
+int getNumberArrayFromProperty( const char *  propKey,␊
                             unsigned long numbers[],␊
                             unsigned long maxArrayCount )␊
 {␊

-58
59 59
60 60
61
62
61 63
62 64
63 65
... ...
190 192
191 193
192 194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
193 224
194 225
195 226
... ...
356 387
357 388
358 389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
359 448
360 449
361 450
... ...
424 513
425 514
426 515
516
517
518
427 519
428 520
429 521
+#include "ramdisk.h"␊
#include "gui.h"␊
#include "platform.h"␊
#include "autoresolution.h" //autoresolution␊
#include "edid.h"␉␉␉//␉␉||␊
#include "modules.h"␊
␊
long gBootMode; /* defaults to 0 == kBootModeNormal */␊

␉␊
␉usb_loop();␊
␉␊
//autoresolution - Check if user disabled AutoResolution at the boot prompt.␊
␉getBoolForKey(kAutoResolutionKey, &gAutoResolution, &bootInfo->bootConfig); //Azi: bootConfig ??␊
␉␊
␉// User disabled AutoResolution at boot prompt...␊
␉if ((gAutoResolution == false) && map)␊
␉{␊
␉␉// restore and close Vbios for patch cancelation.␊
␉␉restoreVbios(map);␊
␉␉closeVbios(map);␊
␉}␊
␉␊
␉//Azi: while testing, i didn't got any problems when booting without␊
␉// closing Vbios... closing it just in case. (check again later!)␊
␉if ((gAutoResolution == true) && map)␊
␉{␊
␉␉closeVbios(map);␊
␊
␉␉// gAutoResolution was just set to false on closeVbios();␊
␉␉// we need it to be "true" for drawBootGraphics().␊
␉␉gAutoResolution = true;␊
␉}␊
␉␊
␉//Azi: closing Vbios after "if (gVerboseMode)" stuff eliminates the need for setting␊
␉// AutoResolution = true above; but creates another bug when booting in TextMode with -v arg.␊
␉// Simptoms include: staring some seconds at a nicely drawn white screen, after boot prompt.␊
␉// Think i'm just going to end up removing setting gAutoResolution = false␊
␉// on closeVbios().. the more i think, the less sense it makes doing it there!!␊
//autoresolution - end␊
␉␊
    if (checkOSVersion("10.7"))␊
    {␊
        execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL);␉// Notify modules that the kernel is about to be started␊

␉useGUI = true;␊
␉// Override useGUI default␊
␉getBoolForKey(kGUIKey, &useGUI, &bootInfo->bootConfig);␊
␉␊
//autoresolution -  default to false␊
␉// http://forum.voodooprojects.org/index.php/topic,1227.0.html␊
␉gAutoResolution = false;␊
␊
␉// Check if user enabled AutoResolution on Boot.plist...␊
␉getBoolForKey(kAutoResolutionKey, &gAutoResolution, &bootInfo->bootConfig);␊
␊
␉// Patch the Video Bios with the extracted resolution, before initGui.␊
␉if (gAutoResolution == true)␊
␉{␊
␉␉paramsAR[3] = 0;␊
␊
␉␉// Open the Vbios and store Vbios or Tables␊
␉␉//Azi: doing this only if gAutoResolution = true␊
␉␉map = openVbios(CT_UNKWN);␊
␊
␉␉//Get resolution from Graphics Mode key...␊
␉␉int count = getNumberArrayFromProperty(kGraphicsModeKey, paramsAR, 4);␊
␉␉// ...  or EDID.␊
␉␉if (count < 3)␊
␉␉{␊
␉␉␉getResolution(paramsAR); //Azi: hum...␊
␉␉␉// check the DEBUG/PRINT stuff... also on TEXT MODE (this is not printing to screen). ???␊
␉␉␉// don't forget we now have boot-log and it prints fine there.␊
//Azi:autoresolution - these PRINT replace a previous existing #ifdef AUTORES_DEBUG␊
// and were moved from gui.c, initGUI().␊
␉␉␉PRINT("Resolution: %dx%d (EDID)\n",paramsAR[0], paramsAR[1]);␊
␉␉}␊
␉␉else //Azi: check theme.plist ??␊
␉␉{␊
␉␉␉PRINT("Resolution: %dx%d (Graphics Mode key)\n",paramsAR[0], paramsAR[1]);␊
␊
␉␉␉//Azi: hum...␊
␉␉␉if ( paramsAR[2] == 256 ) paramsAR[2] = 8;␊
␉␉␉if ( paramsAR[2] == 555 ) paramsAR[2] = 16;␊
␉␉␉if ( paramsAR[2] == 888 ) paramsAR[2] = 32;␊
␉␉}␊
␊
␉␉// perfom the actual Vbios patching␊
␉␉if (paramsAR[0] != 0 && paramsAR[1] != 0)␊
␉␉{␊
␉␉␉patchVbios(map, paramsAR[0], paramsAR[1], paramsAR[2], 0, 0);␊
␉␉}␊
␊
␉␉//Azi: passing resolution for TEXT MODE "verbose" boot. (check again later!)***␊
␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
␉␉{␊
␉␉␉gui.screen.width = paramsAR[0];␊
␉␉␉gui.screen.height = paramsAR[1];␊
␉␉}␊
␊
␉␉// If the patch is working properly, we're almost done (we need? to close Vbios).␊
␉␉// If not and it's just a matter of wrong resolution, we can try re-apply the patch;␊
␉␉// see "case kF2Key:", options.c.␊
␉}␊
//autoresolution - end␊
␉␊
␉if (useGUI && initGUI())␊
␉{␊
␉␉// initGUI() returned with an error, disabling GUI.␊

␉␉␉updateVRAM();␊
␉␉}␊
␉␉␊
␉␉//Azi: autoresolution stuff moved to ExecKernel();␊
␉␉// Closing Vbios here without restoring it, causes an allocation error.␊
␉␉␊
␉␉// Find out which version mac os we're booting.␊
␉␉getOSVersion();␊
␊
 ...
 ...
 ...
 #include "ramdisk.h"␊
 #include "gui.h"␊
 #include "platform.h"␊
+#include "autoresolution.h" //autoresolution␊
+#include "edid.h"␉␉␉//␉␉||␊
 #include "modules.h"␊
 ␊
 long gBootMode; /* defaults to 0 == kBootModeNormal */␊
 ␉␊
 ␉usb_loop();␊
 ␉␊
+//autoresolution - Check if user disabled AutoResolution at the boot prompt.␊
+␉getBoolForKey(kAutoResolutionKey, &gAutoResolution, &bootInfo->bootConfig); //Azi: bootConfig ??␊
+␉␊
+␉// User disabled AutoResolution at boot prompt...␊
+␉if ((gAutoResolution == false) && map)␊
+␉{␊
+␉␉// restore and close Vbios for patch cancelation.␊
+␉␉restoreVbios(map);␊
+␉␉closeVbios(map);␊
+␉}␊
+␉␊
+␉//Azi: while testing, i didn't got any problems when booting without␊
+␉// closing Vbios... closing it just in case. (check again later!)␊
+␉if ((gAutoResolution == true) && map)␊
+␉{␊
+␉␉closeVbios(map);␊
+␊
+␉␉// gAutoResolution was just set to false on closeVbios();␊
+␉␉// we need it to be "true" for drawBootGraphics().␊
+␉␉gAutoResolution = true;␊
+␉}␊
+␉␊
+␉//Azi: closing Vbios after "if (gVerboseMode)" stuff eliminates the need for setting␊
+␉// AutoResolution = true above; but creates another bug when booting in TextMode with -v arg.␊
+␉// Simptoms include: staring some seconds at a nicely drawn white screen, after boot prompt.␊
+␉// Think i'm just going to end up removing setting gAutoResolution = false␊
+␉// on closeVbios().. the more i think, the less sense it makes doing it there!!␊
+//autoresolution - end␊
+␉␊
     if (checkOSVersion("10.7"))␊
     {␊
         execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL);␉// Notify modules that the kernel is about to be started␊
 ␉useGUI = true;␊
 ␉// Override useGUI default␊
 ␉getBoolForKey(kGUIKey, &useGUI, &bootInfo->bootConfig);␊
+␉␊
+//autoresolution -  default to false␊
+␉// http://forum.voodooprojects.org/index.php/topic,1227.0.html␊
+␉gAutoResolution = false;␊
+␊
+␉// Check if user enabled AutoResolution on Boot.plist...␊
+␉getBoolForKey(kAutoResolutionKey, &gAutoResolution, &bootInfo->bootConfig);␊
+␊
+␉// Patch the Video Bios with the extracted resolution, before initGui.␊
+␉if (gAutoResolution == true)␊
+␉{␊
+␉␉paramsAR[3] = 0;␊
+␊
+␉␉// Open the Vbios and store Vbios or Tables␊
+␉␉//Azi: doing this only if gAutoResolution = true␊
+␉␉map = openVbios(CT_UNKWN);␊
+␊
+␉␉//Get resolution from Graphics Mode key...␊
+␉␉int count = getNumberArrayFromProperty(kGraphicsModeKey, paramsAR, 4);␊
+␉␉// ...  or EDID.␊
+␉␉if (count < 3)␊
+␉␉{␊
+␉␉␉getResolution(paramsAR); //Azi: hum...␊
+␉␉␉// check the DEBUG/PRINT stuff... also on TEXT MODE (this is not printing to screen). ???␊
+␉␉␉// don't forget we now have boot-log and it prints fine there.␊
+//Azi:autoresolution - these PRINT replace a previous existing #ifdef AUTORES_DEBUG␊
+// and were moved from gui.c, initGUI().␊
+␉␉␉PRINT("Resolution: %dx%d (EDID)\n",paramsAR[0], paramsAR[1]);␊
+␉␉}␊
+␉␉else //Azi: check theme.plist ??␊
+␉␉{␊
+␉␉␉PRINT("Resolution: %dx%d (Graphics Mode key)\n",paramsAR[0], paramsAR[1]);␊
+␊
+␉␉␉//Azi: hum...␊
+␉␉␉if ( paramsAR[2] == 256 ) paramsAR[2] = 8;␊
+␉␉␉if ( paramsAR[2] == 555 ) paramsAR[2] = 16;␊
+␉␉␉if ( paramsAR[2] == 888 ) paramsAR[2] = 32;␊
+␉␉}␊
+␊
+␉␉// perfom the actual Vbios patching␊
+␉␉if (paramsAR[0] != 0 && paramsAR[1] != 0)␊
+␉␉{␊
+␉␉␉patchVbios(map, paramsAR[0], paramsAR[1], paramsAR[2], 0, 0);␊
+␉␉}␊
+␊
+␉␉//Azi: passing resolution for TEXT MODE "verbose" boot. (check again later!)***␊
+␉␉if (bootArgs->Video.v_display == VGA_TEXT_MODE)␊
+␉␉{␊
+␉␉␉gui.screen.width = paramsAR[0];␊
+␉␉␉gui.screen.height = paramsAR[1];␊
+␉␉}␊
+␊
+␉␉// If the patch is working properly, we're almost done (we need? to close Vbios).␊
+␉␉// If not and it's just a matter of wrong resolution, we can try re-apply the patch;␊
+␉␉// see "case kF2Key:", options.c.␊
+␉}␊
+//autoresolution - end␊
+␉␊
 ␉if (useGUI && initGUI())␊
 ␉{␊
 ␉␉// initGUI() returned with an error, disabling GUI.␊
 ␉␉␉updateVRAM();␊
 ␉␉}␊
 ␉␉␊
+␉␉//Azi: autoresolution stuff moved to ExecKernel();␊
+␉␉// Closing Vbios here without restoring it, causes an allocation error.␊
+␉␉␊
 ␉␉// Find out which version mac os we're booting.␊
 ␉␉getOSVersion();␊
 ␊

-59
60 60
61 61
62
63
62 64
63 65
64 66
+#define kBootBannerKey␉␉"Boot Banner"␊
#define kWaitForKeypressKey␉"Wait"␊
␊
#define kAutoResolutionKey␉"AutoResolution"␉/* boot.c */␊
␊
#define kUseAtiROM␉␉␉"UseAtiROM"␉␉␉/* ati.c */␊
#define kAtiConfig␉␉␉"AtiConfig"␉␉␉/* ati.c */␊
#define kATYbinimage␉␉"ATYbinimage"␉␉/* ati.c */␊
 #define kBootBannerKey␉␉"Boot Banner"␊
 #define kWaitForKeypressKey␉"Wait"␊
 ␊
+#define kAutoResolutionKey␉"AutoResolution"␉/* boot.c */␊
+␊
 #define kUseAtiROM␉␉␉"UseAtiROM"␉␉␉/* ati.c */␊
 #define kAtiConfig␉␉␉"AtiConfig"␉␉␉/* ati.c */␊
 #define kATYbinimage␉␉"ATYbinimage"␉␉/* ati.c */␊

-11
12 12
13 13
14
14 15
15 16
16 17
... ...
700 701
701 702
702 703
703 
704 
705 
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
706 723
707 
708 
709 
710 724
711 725
712 726
... ...
717 731
718 732
719 733
720 
734
735
736
721 737
722 738
723 739
... ...
731 747
732 748
733 749
750
751
752
734 753
735 754
736 755
... ...
738 757
739 758
740 759
741 
742 
743 
744 
745 
746 
747 
760
761
762
763
764
765
766
767
768
748 769
749 770
750 771
... ...
860 881
861 882
862 883
863 
884
864 885
886
887
888
865 889
866 
890
867 891
868 
869 
870 
871 
872 
873 
874 
875 
876 
877 
878 
879 
880 
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
881 907
908
909
910
911
882 912
883 913
884 914
... ...
1821 1851
1822 1852
1823 1853
1824 
1825 
1826 
1827 
1828 
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1829 1865
1830 
1831 
1832 
1833 
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1834 1886
1835 1887
1836 
1837 
1838 
1839 
1840 1888
1841 1889
1890
1842 1891
1843 1892
1844 1893
+#include "gui.h"␊
#include "appleboot.h"␊
#include "vers.h"␊
#include "autoresolution.h" //Azi:autoresolution␊
␊
#define IMG_REQUIRED -1␊
#define THEME_NAME_DEFAULT␉"Default"␊

␉␉return 1;␊
#endif␊
␉}␊
␉// parse display size parameters␊
␉if (getIntForKey("screen_width", &val, &bootInfo->themeConfig) && val > 0) {␊
␉␉screen_params[0] = val;␊
␉␊
␉//Azi:autoresolution␊
␉if (gAutoResolution == true)␊
␉{␊
␉␉screen_params[0] = paramsAR[0];␊
␉␉screen_params[1] = paramsAR[1];␊
 ␉}␊
␉else␊
␉{␊
␉␉// parse screen size parameters␊
 ␉␉if (getIntForKey("screen_width", &val, &bootInfo->themeConfig) && val > 0)␊
␉␉{␊
␉␉␉screen_params[0] = val;␊
␉␉}␊
␊
 ␉␉if (getIntForKey("screen_height", &val, &bootInfo->themeConfig) && val > 0)␊
␉␉{␊
␉␉␉screen_params[1] = val;␊
␉␉}␊
␉}␊
␉if (getIntForKey("screen_height", &val, &bootInfo->themeConfig) && val > 0) {␊
␉␉screen_params[1] = val;␊
␉}␊
␊
␉// Initalizing GUI strucutre.␊
␉bzero(&gui, sizeof(gui_t));␊

␉// set our screen structure with the mode width & height␊
␉gui.screen.width = screen_params[0];␉␊
␉gui.screen.height = screen_params[1];␊
␊
␉␊
␉PRINT("Found mode %dx%d in VESA Table\n", gui.screen.width, gui.screen.height); //Azi:autoresolution␊
␉␊
␉// load graphics otherwise fail and return␊
␉if (loadGraphics() == 0) {␊
␉␉loadThemeValues(&bootInfo->themeConfig);␊

␉␉␉␉␉if (createWindowBuffer(&gui.bootprompt) == 0) {␊
␉␉␉␉␉␉if (createWindowBuffer(&gui.infobox) == 0) {␊
␉␉␉␉␉␉␉if (createWindowBuffer(&gui.menu) == 0) {␊
#ifdef AUTORES_DEBUG␊
␉␉␉␉␉␉␉␉pause();␊
#endif␊
␉␉␉␉␉␉␉    gui.logo.draw = true;␊
␉␉␉␉␉␉␉␉drawBackground();␊
␉␉␉␉␉␉␉␉// lets copy the screen into the back buffer␊

␉␉␉␉␉␉␉␉setVideoMode( GRAPHICS_MODE, 0 );␊
␉␉␉␉␉␉␉␉gui.initialised = true;␊
␉␉␉␉␉␉␉␉return 0;␊
␉␉␉␉␉␉␉}␊
␉␉␉␉␉␉}␊
␉␉␉␉␉}␊
␉␉␉␉}␊
␉␉␉}␊
␉␉}␊
␉}␊
␉␉␉␉␉␉␉} else printf("createWindowBuffer(&gui.menu) Failed\n");␊
␉␉␉␉␉␉} else printf("createWindowBuffer(&gui.infobox) Failed\n");␊
␉␉␉␉␉} else printf("createWindowBuffer(&gui.bootprompt) Failed\n");␊
␉␉␉␉} else printf("createWindowBuffer(&gui.devicelist) Failed\n");␊
␉␉␉} else printf("createWindowBuffer(&gui.screen) Failed\n");␊
␉␉} else printf("createBackBuffer(&gui.screen) Failed\n");␊
␉} else printf("loadGraphics() Failed\n");␊
//Azi: removed a #ifdef AUTORES_DEBUG from here, long time ago; was just a pause()␊
// and if i'm not mistaken caused some problem ?!␊
␉return 1;␊
}␊
␊

                infoMenuSelection = 0;␊
            }␊
␉␉␉ ␊
␉␉␉if(gui.menu.draw)␊
␉␉␉if (gui.menu.draw)␊
␉␉␉␉drawInfoMenuItems();␊
#ifdef AUTORES_DEBUG //Azi: update diff␊
#define DEBUG␊
#endif␊
␉␉␉ ␊
#if DEBUG␊
#ifdef DEBUG //Azi: changed from if to ifdef␊
            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 );␊
␉␉␉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 );␊
#endif␊
␊
#ifdef AUTORES_DEBUG␊
#undef DEBUG␊
#endif␊
␉␉}␊
␉␉␊
␉␉drawDeviceIcon( param, gui.devicelist.pixmap, p, isSelected);␊

␉␉loadBootGraphics();␊
␉}␊
␊
␉// parse screen size parameters␊
␉if (getIntForKey("boot_width", &pos, &bootInfo->themeConfig) && pos > 0) {␊
␉␉screen_params[0] = pos;␊
␉} else {␊
␉␉screen_params[0] = DEFAULT_SCREEN_WIDTH;␊
␉// Save current screen resolution.␊
␉oldScreenWidth = gui.screen.width;␊
␉oldScreenHeight = gui.screen.height;␊
//␉printf("Res: %dx%d (drawbg: current/old)\n", oldScreenWidth, oldScreenHeight);␊
␊
␉//Azi:autoresolution␊
␉if (gAutoResolution == true)␊
␉{␊
␉␉screen_params[0] = paramsAR[0];␊
␉␉screen_params[1] = paramsAR[1];␊
//␉␉printf("Res: %dx%d (drawbg: AR)\n", screen_params[0], screen_params[1]);␊
␉}␊
␉if (getIntForKey("boot_height", &pos, &bootInfo->themeConfig) && pos > 0) {␊
␉␉screen_params[1] = pos;␊
␉} else {␊
␉␉screen_params[1] = DEFAULT_SCREEN_HEIGHT;␊
␉else␊
␉{␊
␉␉// parse boot screen size parameters␊
␉␉if (getIntForKey("boot_width", &pos, &bootInfo->themeConfig) && pos > 0)␊
␉␉{␊
␉␉␉screen_params[0] = pos;␊
␉␉}␊
␉␉else␊
␉␉{␊
␉␉␉screen_params[0] = DEFAULT_SCREEN_WIDTH;␊
␉␉}␊
␊
␉␉if (getIntForKey("boot_height", &pos, &bootInfo->themeConfig) && pos > 0)␊
␉␉{␊
␉␉␉screen_params[1] = pos;␊
␉␉}␊
␉␉else␊
␉␉{␊
␉␉␉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];␊
//␉printf("Res: %dx%d (drawbg: gsw/h new)\n", gui.screen.width, gui.screen.height);␊
␊
␉// find best matching vesa mode for our requested width & height␊
␉getGraphicModeParams(screen_params);␊
 ...
 ...
 ...
 ...
 ...
 ...
 #include "gui.h"␊
 #include "appleboot.h"␊
 #include "vers.h"␊
+#include "autoresolution.h" //Azi:autoresolution␊
 ␊
 #define IMG_REQUIRED -1␊
 #define THEME_NAME_DEFAULT␉"Default"␊
 ␉␉return 1;␊
 #endif␊
 ␉}␊
-␉// parse display size parameters␊
-␉if (getIntForKey("screen_width", &val, &bootInfo->themeConfig) && val > 0) {␊
-␉␉screen_params[0] = val;␊
+␉␊
+␉//Azi:autoresolution␊
+␉if (gAutoResolution == true)␊
+␉{␊
+␉␉screen_params[0] = paramsAR[0];␊
+␉␉screen_params[1] = paramsAR[1];␊
+ ␉}␊
+␉else␊
+␉{␊
+␉␉// parse screen size parameters␊
+ ␉␉if (getIntForKey("screen_width", &val, &bootInfo->themeConfig) && val > 0)␊
+␉␉{␊
+␉␉␉screen_params[0] = val;␊
+␉␉}␊
+␊
+ ␉␉if (getIntForKey("screen_height", &val, &bootInfo->themeConfig) && val > 0)␊
+␉␉{␊
+␉␉␉screen_params[1] = val;␊
+␉␉}␊
 ␉}␊
-␉if (getIntForKey("screen_height", &val, &bootInfo->themeConfig) && val > 0) {␊
-␉␉screen_params[1] = val;␊
-␉}␊
 ␊
 ␉// Initalizing GUI strucutre.␊
 ␉bzero(&gui, sizeof(gui_t));␊
 ␉// set our screen structure with the mode width & height␊
 ␉gui.screen.width = screen_params[0];␉␊
 ␉gui.screen.height = screen_params[1];␊
-␊
+␉␊
+␉PRINT("Found mode %dx%d in VESA Table\n", gui.screen.width, gui.screen.height); //Azi:autoresolution␊
+␉␊
 ␉// load graphics otherwise fail and return␊
 ␉if (loadGraphics() == 0) {␊
 ␉␉loadThemeValues(&bootInfo->themeConfig);␊
 ␉␉␉␉␉if (createWindowBuffer(&gui.bootprompt) == 0) {␊
 ␉␉␉␉␉␉if (createWindowBuffer(&gui.infobox) == 0) {␊
 ␉␉␉␉␉␉␉if (createWindowBuffer(&gui.menu) == 0) {␊
+#ifdef AUTORES_DEBUG␊
+␉␉␉␉␉␉␉␉pause();␊
+#endif␊
 ␉␉␉␉␉␉␉    gui.logo.draw = true;␊
 ␉␉␉␉␉␉␉␉drawBackground();␊
 ␉␉␉␉␉␉␉␉// lets copy the screen into the back buffer␊
 ␉␉␉␉␉␉␉␉setVideoMode( GRAPHICS_MODE, 0 );␊
 ␉␉␉␉␉␉␉␉gui.initialised = true;␊
 ␉␉␉␉␉␉␉␉return 0;␊
-␉␉␉␉␉␉␉}␊
-␉␉␉␉␉␉}␊
-␉␉␉␉␉}␊
-␉␉␉␉}␊
-␉␉␉}␊
-␉␉}␊
-␉}␊
+␉␉␉␉␉␉␉} else printf("createWindowBuffer(&gui.menu) Failed\n");␊
+␉␉␉␉␉␉} else printf("createWindowBuffer(&gui.infobox) Failed\n");␊
+␉␉␉␉␉} else printf("createWindowBuffer(&gui.bootprompt) Failed\n");␊
+␉␉␉␉} else printf("createWindowBuffer(&gui.devicelist) Failed\n");␊
+␉␉␉} else printf("createWindowBuffer(&gui.screen) Failed\n");␊
+␉␉} else printf("createBackBuffer(&gui.screen) Failed\n");␊
+␉} else printf("loadGraphics() Failed\n");␊
+//Azi: removed a #ifdef AUTORES_DEBUG from here, long time ago; was just a pause()␊
+// and if i'm not mistaken caused some problem ?!␊
 ␉return 1;␊
 }␊
 ␊
                 infoMenuSelection = 0;␊
             }␊
 ␉␉␉ ␊
-␉␉␉if(gui.menu.draw)␊
+␉␉␉if (gui.menu.draw)␊
 ␉␉␉␉drawInfoMenuItems();␊
+#ifdef AUTORES_DEBUG //Azi: update diff␊
+#define DEBUG␊
+#endif␊
 ␉␉␉ ␊
-#if DEBUG␊
+#ifdef DEBUG //Azi: changed from if to ifdef␊
             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 );␊
+␉␉␉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 );␊
 #endif␊
+␊
+#ifdef AUTORES_DEBUG␊
+#undef DEBUG␊
+#endif␊
 ␉␉}␊
 ␉␉␊
 ␉␉drawDeviceIcon( param, gui.devicelist.pixmap, p, isSelected);␊
 ␉␉loadBootGraphics();␊
 ␉}␊
 ␊
-␉// parse screen size parameters␊
-␉if (getIntForKey("boot_width", &pos, &bootInfo->themeConfig) && pos > 0) {␊
-␉␉screen_params[0] = pos;␊
-␉} else {␊
-␉␉screen_params[0] = DEFAULT_SCREEN_WIDTH;␊
+␉// Save current screen resolution.␊
+␉oldScreenWidth = gui.screen.width;␊
+␉oldScreenHeight = gui.screen.height;␊
+//␉printf("Res: %dx%d (drawbg: current/old)\n", oldScreenWidth, oldScreenHeight);␊
+␊
+␉//Azi:autoresolution␊
+␉if (gAutoResolution == true)␊
+␉{␊
+␉␉screen_params[0] = paramsAR[0];␊
+␉␉screen_params[1] = paramsAR[1];␊
+//␉␉printf("Res: %dx%d (drawbg: AR)\n", screen_params[0], screen_params[1]);␊
 ␉}␊
-␉if (getIntForKey("boot_height", &pos, &bootInfo->themeConfig) && pos > 0) {␊
-␉␉screen_params[1] = pos;␊
-␉} else {␊
-␉␉screen_params[1] = DEFAULT_SCREEN_HEIGHT;␊
+␉else␊
+␉{␊
+␉␉// parse boot screen size parameters␊
+␉␉if (getIntForKey("boot_width", &pos, &bootInfo->themeConfig) && pos > 0)␊
+␉␉{␊
+␉␉␉screen_params[0] = pos;␊
+␉␉}␊
+␉␉else␊
+␉␉{␊
+␉␉␉screen_params[0] = DEFAULT_SCREEN_WIDTH;␊
+␉␉}␊
+␊
+␉␉if (getIntForKey("boot_height", &pos, &bootInfo->themeConfig) && pos > 0)␊
+␉␉{␊
+␉␉␉screen_params[1] = pos;␊
+␉␉}␊
+␉␉else␊
+␉␉{␊
+␉␉␉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];␊
+//␉printf("Res: %dx%d (drawbg: gsw/h new)\n", gui.screen.width, gui.screen.height);␊
 ␊
 ␉// find best matching vesa mode for our requested width & height␊
 ␉getGraphicModeParams(screen_params);␊

-46
47 47
48 48
49
49 50
50 51
51 52
... ...
96 97
97 98
98 99
100
101
102
103
104
105
106
107
108
109
99 110
100 111
101 112
+␉kUpArrowkey␉␉= 0x4800, ␊
␉kDownArrowkey␉␉= 0x5000,␊
␉kASCIIKeyMask␉␉= 0x7f,␊
␉kF2Key␉␉␉= 0x3c00, //Azi:autoresolution␊
␉kF5Key␉␉␉= 0x3f00,␊
␉kF10Key␉␉␉= 0x4400␊
};␊

␉uint32_t␉font_small_color;␉// Color for small  font AARRGGBB␊
␉uint32_t␉font_console_color;␉// Color for consle font AARRGGBB␊
␉bool␉␉draw;␉␉␉// Draw flag␊
␉// Azi:autoresolution␊
␉//resolution specifics␊
␉uint16_t␉htotal;␉␉␉␉␊
␉uint16_t␉vtotal;␉␉␉␉␊
␉uint16_t␉hsyncstart;␉␉␉␊
␉uint16_t␉hsyncend;␊
␉uint16_t␉vsyncstart;␉␉␉␊
␉uint16_t␉vsyncend;␊
␉uint8_t␉␉mm;␊
␉uint16_t␉attr;␊
} window_t;␊
␉␊
/*␊
 ...
 ␉kUpArrowkey␉␉= 0x4800, ␊
 ␉kDownArrowkey␉␉= 0x5000,␊
 ␉kASCIIKeyMask␉␉= 0x7f,␊
+␉kF2Key␉␉␉= 0x3c00, //Azi:autoresolution␊
 ␉kF5Key␉␉␉= 0x3f00,␊
 ␉kF10Key␉␉␉= 0x4400␊
 };␊
 ␉uint32_t␉font_small_color;␉// Color for small  font AARRGGBB␊
 ␉uint32_t␉font_console_color;␉// Color for consle font AARRGGBB␊
 ␉bool␉␉draw;␉␉␉// Draw flag␊
+␉// Azi:autoresolution␊
+␉//resolution specifics␊
+␉uint16_t␉htotal;␉␉␉␉␊
+␉uint16_t␉vtotal;␉␉␉␉␊
+␉uint16_t␉hsyncstart;␉␉␉␊
+␉uint16_t␉hsyncend;␊
+␉uint16_t␉vsyncstart;␉␉␉␊
+␉uint16_t␉vsyncend;␊
+␉uint8_t␉␉mm;␊
+␉uint16_t␉attr;␊
 } window_t;␊
 ␉␊
 /*␊

-29
30 30
31 31
32
32 33
34
33 35
34 36
35 37
... ...
875 877
876 878
877 879
878 
880
879 881
880 882
881 883
... ...
984 986
985 987
986 988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
987 1075
988 1076
989 1077
... ...
1032 1120
1033 1121
1034 1122
1123
1124
1125
1126
1127
1128
1129
1035 1130
1036 1131
1037 1132
1133
1134
1135
1136
1137
1138
1139
1038 1140
1039 1141
1040 1142
+#include "gui.h"␊
#include "embedded.h"␊
#include "pci.h"␊
#include "autoresolution.h" //Azi:autoresolution␊
␊
bool showBootBanner = true; //Azi:autoresolution␊
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:autoresolution␊
 ␊
␉␉␉// Check if "Boot Banner"=N switch is present in config file.␊
␉␉␉getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig); ␊

␉␉␉clearBootArgs();␊
␉␉␉break;␊
␊
␉␉//Azi:autoresolution - Reapply the patch if Graphics Mode was incorrect␊
␉␉// or EDID Info was insane.␊
␉␉case kF2Key:␊
␉␉␊
␉␉␉if ((gAutoResolution == true) && useGUI && map )␊
␉␉␉{␊
␉␉␉␉// get the new Graphics Mode key␊
␉␉␉␉processBootOptions(); //Azi: use processBootArgument instead?␊
␊
//␉␉␉␉UInt32 paramsAR[4];␊
␉␉␉␉paramsAR[3] = 0;␊
␊
␉␉␉␉getNumberArrayFromProperty(kGraphicsModeKey, paramsAR, 4);␊
␊
␉␉␉␉// user changed resolution...␊
␉␉␉␉if ((paramsAR[0] != 0) && (paramsAR[1] != 0) &&␊
␉␉␉␉␉(paramsAR[0] != map->currentX) && (paramsAR[1] != map->currentY))␊
␉␉␉␉{␊
␉␉␉␉␉//Azi: identical to "case kTabKey:"␉␉␉(check later)␊
␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
␉␉␉␉␉{␊
␉␉␉␉␉␉CursorState cursorState;␊
␊
␉␉␉␉␉␉// Go back to TEXT MODE while we change the mode␊
␉␉␉␉␉␉setVideoMode(VGA_TEXT_MODE, 0);␊
␊
␉␉␉␉␉␉setCursorPosition(0, 0, 0);␊
␉␉␉␉␉␉clearScreenRows(0, kScreenLastRow);␊
␉␉␉␉␉␉changeCursor( 0, 0, kCursorTypeHidden, &cursorState );␊
␊
␉␉␉␉␉␉// Reapply patch␊
␉␉␉␉␉␉patchVbios(map, paramsAR[0], paramsAR[1], paramsAR[2], 0, 0);␊
␊
␉␉␉␉␉␉if (useGUI && (gui.initialised == true))␊
␉␉␉␉␉␉␉initGUI();␊
␉␉␉␉␉␉// Make sure all values are set␊
␉␉␉␉␉␉if (bootArgs->Video.v_display != GRAPHICS_MODE)␊
␉␉␉␉␉␉␉bootArgs->Video.v_display = GRAPHICS_MODE;␊
␊
␉␉␉␉␉␉if (!useGUI)␊
␉␉␉␉␉␉␉useGUI = true;␊
␊
␉␉␉␉␉␉// redraw the background buffer␊
␉␉␉␉␉␉drawBackground();␊
␉␉␉␉␉␉gui.devicelist.draw = true;␊
␉␉␉␉␉␉gui.redraw = true;␊
␊
␉␉␉␉␉␉if (showBootBanner)␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉// Display banner and show hardware info.␊
␉␉␉␉␉␉␉gprintf(&gui.screen, bootBanner + 1, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
␉␉␉␉␉␉}␊
␊
␉␉␉␉␉␉// redraw background␊
␉␉␉␉␉␉memcpy(gui.backbuffer->pixels, gui.screen.pixmap->pixels,␊
␉␉␉␉␉␉␉   gui.backbuffer->width * gui.backbuffer->height * 4);␊
␊
␉␉␉␉␉␉nextRow = kMenuTopRow;␊
␉␉␉␉␉␉showPrompt = true;␊
␊
␉␉␉␉␉␉if (gDeviceCount)␊
␉␉␉␉␉␉{␊
␉␉␉␉␉␉␉showMenu( menuItems, gDeviceCount, selectIndex, kMenuTopRow + 2, kMenuMaxItems );␊
␉␉␉␉␉␉␉nextRow += min( gDeviceCount, kMenuMaxItems ) + 3;␊
␉␉␉␉␉␉}␊
␊
␉␉␉␉␉␉// Show the boot prompt.␊
␉␉␉␉␉␉showPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot);␊
␉␉␉␉␉␉showBootPrompt( nextRow, showPrompt );␊
␊
␉␉␉␉␉␉// this is used to avoid resetting the incorrect mode while quiting the boot menu␊
//␉␉␉␉␉␉map->hasSwitched = true; (check again later!)␊
␉␉␉␉␉}␊
␉␉␉␉}␊
␊
␉␉␉␉clearBootArgs();␊
␉␉␉␉key = 0;␊
␉␉␉}␉␊
␉␉␉else // if gAutoResolution == false...␊
␉␉␉{␊
␉␉␉␉// ... do "nothing".␉␉␉(Reviewing...)␊
␉␉␉␉clearBootArgs();␊
␉␉␉␉key = 0;␊
␉␉␉}␊
␉␉␉break;␊
␊
␉␉case kF5Key:␊
␉␉␉// New behavior:␊
␉␉␉// Clear gBootVolume to restart the loop␊

␉␉␉␉␉showPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot);␊
␉␉␉␉␉showBootPrompt(nextRow, showPrompt);␊
␉␉␉␉␉//changeCursor( 0, kMenuTopRow, kCursorTypeUnderline, 0 );␊
␉␉␉␉␉␊
␉␉␉␉␉/*␊
␉␉␉␉␉ * AutoResolution - make sure all values are set - Azi: think! it makes some sense!!␊
␉␉␉␉␉ */␊
//␉␉␉␉␉bootArgs->Video.v_display = VGA_TEXT_MODE;␊
//␉␉␉␉␉useGUI = false;␊
␉␉␉␉␉␊
␉␉␉␉} else {␊
␉␉␉␉␉gui.redraw = true;␊
␉␉␉␉␉setVideoMode(GRAPHICS_MODE, 0);␊
␉␉␉␉␉␊
␉␉␉␉␉/*␊
␉␉␉␉␉ * AutoResolution - make sure all values are set - Azi: same as above...!?␊
␉␉␉␉␉ */␊
//␉␉␉␉␉bootArgs->Video.v_display = GRAPHICS_MODE;␊
//␉␉␉␉␉useGUI = true;␊
␉␉␉␉␉␊
␉␉␉␉␉updateVRAM();␊
␉␉␉␉}␊
␉␉␉}␊
 ...
 ...
 ...
 #include "gui.h"␊
 #include "embedded.h"␊
 #include "pci.h"␊
+#include "autoresolution.h" //Azi:autoresolution␊
 ␊
+bool showBootBanner = true; //Azi:autoresolution␊
 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:autoresolution␊
  ␊
 ␉␉␉// Check if "Boot Banner"=N switch is present in config file.␊
 ␉␉␉getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig); ␊
 ␉␉␉clearBootArgs();␊
 ␉␉␉break;␊
 ␊
+␉␉//Azi:autoresolution - Reapply the patch if Graphics Mode was incorrect␊
+␉␉// or EDID Info was insane.␊
+␉␉case kF2Key:␊
+␉␉␊
+␉␉␉if ((gAutoResolution == true) && useGUI && map )␊
+␉␉␉{␊
+␉␉␉␉// get the new Graphics Mode key␊
+␉␉␉␉processBootOptions(); //Azi: use processBootArgument instead?␊
+␊
+//␉␉␉␉UInt32 paramsAR[4];␊
+␉␉␉␉paramsAR[3] = 0;␊
+␊
+␉␉␉␉getNumberArrayFromProperty(kGraphicsModeKey, paramsAR, 4);␊
+␊
+␉␉␉␉// user changed resolution...␊
+␉␉␉␉if ((paramsAR[0] != 0) && (paramsAR[1] != 0) &&␊
+␉␉␉␉␉(paramsAR[0] != map->currentX) && (paramsAR[1] != map->currentY))␊
+␉␉␉␉{␊
+␉␉␉␉␉//Azi: identical to "case kTabKey:"␉␉␉(check later)␊
+␉␉␉␉␉if (bootArgs->Video.v_display == GRAPHICS_MODE)␊
+␉␉␉␉␉{␊
+␉␉␉␉␉␉CursorState cursorState;␊
+␊
+␉␉␉␉␉␉// Go back to TEXT MODE while we change the mode␊
+␉␉␉␉␉␉setVideoMode(VGA_TEXT_MODE, 0);␊
+␊
+␉␉␉␉␉␉setCursorPosition(0, 0, 0);␊
+␉␉␉␉␉␉clearScreenRows(0, kScreenLastRow);␊
+␉␉␉␉␉␉changeCursor( 0, 0, kCursorTypeHidden, &cursorState );␊
+␊
+␉␉␉␉␉␉// Reapply patch␊
+␉␉␉␉␉␉patchVbios(map, paramsAR[0], paramsAR[1], paramsAR[2], 0, 0);␊
+␊
+␉␉␉␉␉␉if (useGUI && (gui.initialised == true))␊
+␉␉␉␉␉␉␉initGUI();␊
+␉␉␉␉␉␉// Make sure all values are set␊
+␉␉␉␉␉␉if (bootArgs->Video.v_display != GRAPHICS_MODE)␊
+␉␉␉␉␉␉␉bootArgs->Video.v_display = GRAPHICS_MODE;␊
+␊
+␉␉␉␉␉␉if (!useGUI)␊
+␉␉␉␉␉␉␉useGUI = true;␊
+␊
+␉␉␉␉␉␉// redraw the background buffer␊
+␉␉␉␉␉␉drawBackground();␊
+␉␉␉␉␉␉gui.devicelist.draw = true;␊
+␉␉␉␉␉␉gui.redraw = true;␊
+␊
+␉␉␉␉␉␉if (showBootBanner)␊
+␉␉␉␉␉␉{␊
+␉␉␉␉␉␉␉// Display banner and show hardware info.␊
+␉␉␉␉␉␉␉gprintf(&gui.screen, bootBanner + 1, (bootInfo->convmem + bootInfo->extmem) / 1024);␊
+␉␉␉␉␉␉}␊
+␊
+␉␉␉␉␉␉// redraw background␊
+␉␉␉␉␉␉memcpy(gui.backbuffer->pixels, gui.screen.pixmap->pixels,␊
+␉␉␉␉␉␉␉   gui.backbuffer->width * gui.backbuffer->height * 4);␊
+␊
+␉␉␉␉␉␉nextRow = kMenuTopRow;␊
+␉␉␉␉␉␉showPrompt = true;␊
+␊
+␉␉␉␉␉␉if (gDeviceCount)␊
+␉␉␉␉␉␉{␊
+␉␉␉␉␉␉␉showMenu( menuItems, gDeviceCount, selectIndex, kMenuTopRow + 2, kMenuMaxItems );␊
+␉␉␉␉␉␉␉nextRow += min( gDeviceCount, kMenuMaxItems ) + 3;␊
+␉␉␉␉␉␉}␊
+␊
+␉␉␉␉␉␉// Show the boot prompt.␊
+␉␉␉␉␉␉showPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot);␊
+␉␉␉␉␉␉showBootPrompt( nextRow, showPrompt );␊
+␊
+␉␉␉␉␉␉// this is used to avoid resetting the incorrect mode while quiting the boot menu␊
+//␉␉␉␉␉␉map->hasSwitched = true; (check again later!)␊
+␉␉␉␉␉}␊
+␉␉␉␉}␊
+␊
+␉␉␉␉clearBootArgs();␊
+␉␉␉␉key = 0;␊
+␉␉␉}␉␊
+␉␉␉else // if gAutoResolution == false...␊
+␉␉␉{␊
+␉␉␉␉// ... do "nothing".␉␉␉(Reviewing...)␊
+␉␉␉␉clearBootArgs();␊
+␉␉␉␉key = 0;␊
+␉␉␉}␊
+␉␉␉break;␊
+␊
 ␉␉case kF5Key:␊
 ␉␉␉// New behavior:␊
 ␉␉␉// Clear gBootVolume to restart the loop␊
 ␉␉␉␉␉showPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot);␊
 ␉␉␉␉␉showBootPrompt(nextRow, showPrompt);␊
 ␉␉␉␉␉//changeCursor( 0, kMenuTopRow, kCursorTypeUnderline, 0 );␊
+␉␉␉␉␉␊
+␉␉␉␉␉/*␊
+␉␉␉␉␉ * AutoResolution - make sure all values are set - Azi: think! it makes some sense!!␊
+␉␉␉␉␉ */␊
+//␉␉␉␉␉bootArgs->Video.v_display = VGA_TEXT_MODE;␊
+//␉␉␉␉␉useGUI = false;␊
+␉␉␉␉␉␊
 ␉␉␉␉} else {␊
 ␉␉␉␉␉gui.redraw = true;␊
 ␉␉␉␉␉setVideoMode(GRAPHICS_MODE, 0);␊
+␉␉␉␉␉␊
+␉␉␉␉␉/*␊
+␉␉␉␉␉ * AutoResolution - make sure all values are set - Azi: same as above...!?␊
+␉␉␉␉␉ */␊
+//␉␉␉␉␉bootArgs->Video.v_display = GRAPHICS_MODE;␊
+//␉␉␉␉␉useGUI = true;␊
+␉␉␉␉␉␊
 ␉␉␉␉␉updateVRAM();␊
 ␉␉␉␉}␊
 ␉␉␉}␊

-3
4 4
5 5
6 
7 6
8 7
9 8
+#␊
␊
menu "Modules"␊
source "i386/modules/Resolution/Cconfig"␊
source "i386/modules/klibc/Cconfig"␊
source "i386/modules/uClibcxx/Cconfig"␊
source "i386/modules/HelloWorld/Cconfig"␊
 #␊
 ␊
 menu "Modules"␊
-source "i386/modules/Resolution/Cconfig"␊
 source "i386/modules/klibc/Cconfig"␊
 source "i386/modules/uClibcxx/Cconfig"␊
 source "i386/modules/HelloWorld/Cconfig"␊

-11
12 12
13 13
14 
14
15 15
16 16
17 17
+include ${SRCROOT}/Make.rules␊
␊
# The order of building is important.␊
SUBDIRS = klibc uClibcxx Resolution HelloWorld␊
SUBDIRS = klibc uClibcxx HelloWorld␊
␊
␊
CFLAGS= -O3 $(MORECPP) -arch i386 -g -static␊
 include ${SRCROOT}/Make.rules␊
 ␊
 # The order of building is important.␊
-SUBDIRS = klibc uClibcxx Resolution HelloWorld␊
+SUBDIRS = klibc uClibcxx HelloWorld␊
 ␊
 ␊
 CFLAGS= -O3 $(MORECPP) -arch i386 -g -static␊

Download the corresponding diff file