Index: branches/azimutz/trunkAutoResolution/version =================================================================== --- branches/azimutz/trunkAutoResolution/version (revision 996) +++ branches/azimutz/trunkAutoResolution/version (revision 997) @@ -1 +1 @@ -2.0-RC5 \ No newline at end of file +2.0-RC5 trunkAutoResolution \ No newline at end of file Index: branches/azimutz/trunkAutoResolution/i386/libsaio/console.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/console.c (revision 996) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/console.c (revision 997) @@ -53,28 +53,28 @@ bool gVerboseMode; bool gErrors; -/** Kabyl: BooterLog - -Azi: Doubled available log size; this seems to fix some hangs and instant reboots caused by -booting with -f (ignore caches). 96kb are enough to hold full log, booting with -f; even so, -this depends on how much we "play" at the boot prompt and with what patches we're playing, -depending on how much they print to the log. -**/ //Azi: closing **/ alows colapse/expand... is this desirable?? colapsing an entire page - // will also colapse comments.... +/* + * Azi: Doubled available log size; this seems to fix some hangs and instant reboots caused by + * booting with -f (ignore caches). 96kb are enough to hold full log, booting with -f; even so, + * this depends on how much we "play" at the boot prompt and with what patches we're playing, + * depending on how much they print to the log. + * + * Kabyl: BooterLog + */ #define BOOTER_LOG_SIZE (128 * 1024) #define SAFE_LOG_SIZE 134 char *msgbuf = 0; char *cursor = 0; -struct putc_info //Azi: same as below +struct putc_info { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) //Azi: exists on printf.c & gui.c +sputc(int c, struct putc_info * pi) { if (pi->last_str) if (pi->str == pi->last_str) Index: branches/azimutz/trunkAutoResolution/i386/libsaio/bootstruct.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/bootstruct.c (revision 996) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/bootstruct.c (revision 997) @@ -116,7 +116,8 @@ bootArgs = (boot_args *)AllocateKernelMemory(sizeof(boot_args)); bcopy(oldAddr, bootArgs, sizeof(boot_args)); } - else { + else + { void *oldAddr = bootArgsPreLion; bootArgsPreLion = (boot_args_pre_lion *)AllocateKernelMemory(sizeof(boot_args_pre_lion)); bcopy(oldAddr, bootArgsPreLion, sizeof(boot_args_pre_lion)); Index: branches/azimutz/trunkAutoResolution/i386/libsaio/bootstruct.h =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/bootstruct.h (revision 996) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/bootstruct.h (revision 997) @@ -1,4 +1,4 @@ -/** <-- JavaDoc style (doxygen) //Azi +/* * Copyright (c) 2002-2003 Apple Computer, Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ @@ -30,7 +30,7 @@ #include "bios.h" #include "device_tree.h" -/*! <-- QT style (doxygen) //Azi +/*! Kernel boot args global also used by booter for its own data. */ extern boot_args *bootArgs; Index: branches/azimutz/trunkAutoResolution/i386/libsaio/nvidia.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/libsaio/nvidia.c (revision 996) +++ branches/azimutz/trunkAutoResolution/i386/libsaio/nvidia.c (revision 997) @@ -1318,41 +1318,39 @@ } } - if (getValueForKey(kdcfg0, &value, &len, &bootInfo->bootConfig) && len == DCFG0_LEN * 2) - { + if (getValueForKey(kdcfg0, &value, &len, &bootInfo->bootConfig) && len == DCFG0_LEN * 2){ + uint8_t new_dcfg0[DCFG0_LEN]; - + if (hex2bin(value, new_dcfg0, DCFG0_LEN) == 0) { - verbose("Using user supplied @0,display-cfg\n"); + memcpy(default_dcfg_0, new_dcfg0, DCFG0_LEN); + + verbose("Using user supplied @0,display-cfg\n"); printf("@0,display-cfg: %02x%02x%02x%02x\n", default_dcfg_0[0], default_dcfg_0[1], default_dcfg_0[2], default_dcfg_0[3]); - devprop_add_value(device, "@0,display-cfg", default_dcfg_0, DCFG0_LEN); + } - - - } - if (getValueForKey(kdcfg1, &value, &len, &bootInfo->bootConfig) && len == DCFG1_LEN * 2) - { + if (getValueForKey(kdcfg1, &value, &len, &bootInfo->bootConfig) && len == DCFG1_LEN * 2){ + uint8_t new_dcfg1[DCFG1_LEN]; - + if (hex2bin(value, new_dcfg1, DCFG1_LEN) == 0) { - verbose("Using user supplied @1,display-cfg\n"); memcpy(default_dcfg_1, new_dcfg1, DCFG1_LEN); + + verbose("Using user supplied @1,display-cfg\n"); printf("@1,display-cfg: %02x%02x%02x%02x\n", default_dcfg_1[0], default_dcfg_1[1], default_dcfg_1[2], default_dcfg_1[3]); - - - devprop_add_value(device, "@1,display-cfg", default_dcfg_1, DCFG1_LEN); + } + } - @@ -1370,9 +1368,10 @@ devprop_add_value(device, "VRAM,totalsize", (uint8_t*)&videoRam, 4); devprop_add_value(device, "model", (uint8_t*)model, strlen(model) + 1); devprop_add_value(device, "rom-revision", (uint8_t*)biosVersion, strlen(biosVersion) + 1); + devprop_add_value(device, "@0,display-cfg", default_dcfg_0, DCFG0_LEN); + devprop_add_value(device, "@1,display-cfg", default_dcfg_1, DCFG1_LEN); - if (getBoolForKey(kVBIOS, &doit, &bootInfo->bootConfig) && doit) { devprop_add_value(device, "vbios", rom, (nvBiosOveride > 0) ? nvBiosOveride : (rom[2] * 512)); } Index: branches/azimutz/trunkAutoResolution/i386/boot2/graphics.c =================================================================== --- branches/azimutz/trunkAutoResolution/i386/boot2/graphics.c (revision 996) +++ branches/azimutz/trunkAutoResolution/i386/boot2/graphics.c (revision 997) @@ -431,7 +431,6 @@ //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); Index: branches/azimutz/trunkAutoResolution/doc/BootHelp.txt =================================================================== --- branches/azimutz/trunkAutoResolution/doc/BootHelp.txt (revision 996) +++ branches/azimutz/trunkAutoResolution/doc/BootHelp.txt (revision 997) @@ -1,7 +1,7 @@ The boot: prompt waits for you to type advanced startup options. If you don't type anything, the computer continues starting up normally. It uses the kernel and configuration files on the startup device, which it also -uses as the root device. +uses as the root device. Advanced startup options use the following syntax: @@ -17,7 +17,7 @@ flags: -v (verbose) -s (single user mode) -x (safe mode) -f (ignore caches) -F (ignore "Kernel Flags" specified in boot configuration file) - + "Graphics Mode"="WIDTHxHEIGHTxDEPTH" (e.g. "1024x768x32") kernel flags (e.g. debug=0x144) @@ -25,8 +25,8 @@ Example: mach_kernel rd=disk0s1 -v "Graphics Mode"="1920x1200x32" -If the computer won't start up properly, you may be able to start it up -using safe mode. Type -x to start up in safe mode, which ignores all +If the computer won't start up properly, you may be able to start it up +using safe mode. Type -x to start up in safe mode, which ignores all cached driver files. Special booter hotkeys: @@ -45,10 +45,10 @@ Wait=Yes|No Prompt for a key press before starting the kernel. "Quiet Boot"=Yes|No Use quiet boot mode (no messages or prompt). Timeout=8 Number of seconds to pause at the boot: prompt. - "Instant Menu"=Yes Force displaying the partition selection menu. + "Instant Menu"=Yes Force displaying the partition selection menu. "Default Partition" Sets the default boot partition, - =hd(x,y)|UUID|"Label" Specified as a disk/partition pair, an UUID, or a + =hd(x,y)|UUID|"Label" Specified as a disk/partition pair, an UUID, or a label enclosed in quotes. "Hide Partition" Remove unwanted partition(s) from the boot menu. @@ -57,7 +57,7 @@ "Rename Partition" Rename partition(s) for the boot menu. =partition Where partition is hd(x,y), UUID or label enclosed - [;partition2 in quotes. The alias can optionally be quoted too. + [;partition2 in quotes. The alias can optionally be quoted too. ...] GUI=No Disable the GUI (enabled by default). @@ -66,20 +66,18 @@ PciRoot= Use an alternate value for PciRoot (default value 0). - UseKernelCache=Yes|No Default is No. Yes will load pre-linked kernel and will + UseKernelCache=Yes|No Default is No. Yes will load pre-linked kernel and will ignore /E/E and /S/L/E/Extensions.mkext. GraphicsEnabler=Yes|No Automatic device-properties generation for gfx cards. AtiConfig= Use a different card config - UseAtiROM=Yes|No Use an alternate Ati ROM image + UseAtiROM=Yes|No Use an alternate Ati ROM image (path: /Extra/__.rom) - UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image + UseNvidiaROM=Yes|No Use an alternate Nvidia ROM image (path: /Extra/_.rom) VBIOS=Yes|No Inject NVIDIA VBIOS into device-properties. - display_0= Inject alternate value of display-cfg into NVDA,Display-A@0. - MUST BE 8 Chars in length (HEX) - display_1= Inject alternate value of display-cfg into NVDA,Display-B@1. - MUST BE 8 Chars in length (HEX) + display_0= Inject alternate value of display-cfg into NVDA,Display-A@0 (HEX). + display_1= Inject alternate value of display-cfg into NVDA,Display-B@1 (HEX). EthernetBuiltIn=Yes|No Automatic "built-in"=yes device-properties generation for ethernet interfaces. @@ -93,11 +91,11 @@ Wake=No Disable wake up after hibernation (default: enabled). ForceWake=Yes Force using the sleepimage (disabled by default). - WakeImage= Use an alternate sleepimage file. + WakeImage= Use an alternate sleepimage file. (default path is /private/var/vm/sleepimage). DropSSDT=Yes Skip the SSDT tables while relocating the ACPI tables. - DSDT= Use an alternate DSDT.aml file + DSDT= Use an alternate DSDT.aml file (default paths: /DSDT.aml /Extra/DSDT.aml bt(0,0)/Extra/DSDT.aml). @@ -110,7 +108,7 @@ EnableC3State=Yes Enable specific Processor power state, C3. EnableC4State=Yes Enable specific Processor power state, C4. - SMBIOS= Use an alternate SMBIOS.plist file + SMBIOS= Use an alternate SMBIOS.plist file (default paths: /Extra/SMBIOS.plist bt(0,0)/Extra/SMBIOS.plist). @@ -118,7 +116,7 @@ smbios.plist doesn't exist, factory values are kept. "Scan Single Drive" Scan the drive only where the booter got loaded from. - =Yes|No Fix rescan pbs when using a DVD reader in AHCI mode. + =Yes|No Fix rescan pbs when using a DVD reader in AHCI mode. Rescan=Yes Enable CD-ROM rescan mode. "Rescan Prompt"=Yes Prompts for enable CD-ROM rescan mode. SystemId= Set manually the system id UUID, Property changes on: branches/azimutz/trunkAutoResolution ___________________________________________________________________ Added: svn:mergeinfo Merged /branches/rekursor/trunkAutoResolution:r3-22 Merged /trunk:r945-995