Index: branches/azimutz/Chazi/i386/libsaio/vbe.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/vbe.c (revision 469) +++ branches/azimutz/Chazi/i386/libsaio/vbe.c (revision 470) @@ -106,6 +106,21 @@ } /* + *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 Index: branches/azimutz/Chazi/i386/libsaio/device_tree.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/device_tree.c (revision 469) +++ branches/azimutz/Chazi/i386/libsaio/device_tree.c (revision 470) @@ -397,6 +397,8 @@ _PrintTree(node, 0); } +//Azi: from autoresolution - check this stuff +#if 0 void DT__PrintFlattenedNode(DTEntry entry, int level) { @@ -535,6 +537,5 @@ return 0; } - #endif - +#endif Index: branches/azimutz/Chazi/i386/libsaio/vbe.h =================================================================== --- branches/azimutz/Chazi/i386/libsaio/vbe.h (revision 469) +++ branches/azimutz/Chazi/i386/libsaio/vbe.h (revision 470) @@ -35,6 +35,9 @@ #ifndef __LIBSAIO_VBE_H #define __LIBSAIO_VBE_H +#include "edid.h" //Azi:autoresolution +#include "autoresolution.h" + #define MIN_VESA_VERSION 0x200 #define SEG(address) \ @@ -268,6 +271,11 @@ */ 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); Index: branches/azimutz/Chazi/i386/libsaio/Makefile =================================================================== --- branches/azimutz/Chazi/i386/libsaio/Makefile (revision 469) +++ branches/azimutz/Chazi/i386/libsaio/Makefile (revision 470) @@ -47,7 +47,6 @@ pci_root.o convert.o mem.o aml_generator.o \ autoresolution.o edid.o - SAIO_EXTERN_OBJS = console.o SFILES = Index: branches/azimutz/Chazi/i386/libsaio/pci_setup.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/pci_setup.c (revision 469) +++ branches/azimutz/Chazi/i386/libsaio/pci_setup.c (revision 470) @@ -4,6 +4,7 @@ #include "pci.h" #include "nvidia.h" #include "ati.h" +#include "gma.h" //Azi:autoresolution extern void set_eth_builtin(pci_dt_t *eth_dev); extern void notify_usb_dev(pci_dt_t *pci_dev); @@ -30,7 +31,7 @@ switch (current->class_id) { case PCI_CLASS_BRIDGE_HOST: - dram_controller_dev = current; + dram_controller_dev = current; break; case PCI_CLASS_NETWORK_ETHERNET: @@ -44,15 +45,19 @@ { case PCI_VENDOR_ID_ATI: verbose("ATI VGA Controller [%04x:%04x] :: %s \n", - current->vendor_id, current->device_id, devicepath); + current->vendor_id, current->device_id, devicepath); setup_ati_devprop(current); break; - case PCI_VENDOR_ID_INTEL: - /* message to be removed once support for these cards is added */ + case PCI_VENDOR_ID_INTEL: // AutoResolution + verbose("Intel Graphics Controller [%04x:%04x] :: %s \n", + current->vendor_id, current->device_id, devicepath); + setup_gma_devprop(current); + break; + /* message to be removed once support for these cards is added verbose("Intel VGA Controller [%04x:%04x] :: %s (currently NOT SUPPORTED)\n", - current->vendor_id, current->device_id, devicepath); - break; + current->vendor_id, current->device_id, devicepath); + break;*/ case PCI_VENDOR_ID_NVIDIA: setup_nvidia_devprop(current); Index: branches/azimutz/Chazi/i386/libsaio/edid.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/edid.c (revision 469) +++ branches/azimutz/Chazi/i386/libsaio/edid.c (revision 470) @@ -9,8 +9,6 @@ #include "libsaio.h" -#include "edid.h" -#include "vbe.h" #include "bootstruct.h" #include "graphics.h" #include "boot.h" Index: branches/azimutz/Chazi/i386/boot2/ramdisk.h =================================================================== --- branches/azimutz/Chazi/i386/boot2/ramdisk.h (revision 469) +++ branches/azimutz/Chazi/i386/boot2/ramdisk.h (revision 470) @@ -7,6 +7,9 @@ #ifndef __BOOT_RAMDISK_H #define __BOOT_RAMDISK_H +//Azi:includes +#include "saio_internal.h" // get back to this later + #define RAMDISKCONFIG_FILENAME "rd(0,0)/RAMDisk.plist" //#define kPostbootRamdisk void md0Ramdisk(); Index: branches/azimutz/Chazi/i386/boot2/gui.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/gui.c (revision 469) +++ branches/azimutz/Chazi/i386/boot2/gui.c (revision 470) @@ -680,9 +680,8 @@ int initGUI(void) { - int val; - int len; - char dirspec[256]; + int val, len, count; + char dirspec[128]; //Azi: a bit of testing*** getValueForKey( "Theme", &theme_name, &len, &bootInfo->bootConfig ); if ((strlen(theme_name) + 27) > sizeof(dirspec)) { Index: branches/azimutz/Chazi/i386/boot2/gui.h =================================================================== --- branches/azimutz/Chazi/i386/boot2/gui.h (revision 469) +++ branches/azimutz/Chazi/i386/boot2/gui.h (revision 470) @@ -14,8 +14,6 @@ //#include "graphic_utils.h" - same as above #include "graphics.h" #include "picopng.h" -#include "autoresolution.h" -#include "edid.h" #ifndef __BOOT2_GUI_H #define __BOOT2_GUI_H