Index: branches/meklort/i386/boot2/drivers.c =================================================================== --- branches/meklort/i386/boot2/drivers.c (revision 560) +++ branches/meklort/i386/boot2/drivers.c (revision 561) @@ -38,53 +38,11 @@ #include "bootstruct.h" #include "xml.h" #include "ramdisk.h" +#include "drivers.h" #include "modules.h" - extern char gMacOSVersion; -struct Module { - struct Module *nextModule; - long willLoad; - TagPtr dict; - char *plistAddr; - long plistLength; - char *executablePath; - char *bundlePath; - long bundlePathLength; -}; -typedef struct Module Module, *ModulePtr; - -struct DriverInfo { - char *plistAddr; - long plistLength; - void *executableAddr; - long executableLength; - void *bundlePathAddr; - long bundlePathLength; -}; -typedef struct DriverInfo DriverInfo, *DriverInfoPtr; - -#define kDriverPackageSignature1 'MKXT' -#define kDriverPackageSignature2 'MOSX' - -struct DriversPackage { - unsigned long signature1; - unsigned long signature2; - unsigned long length; - unsigned long alder32; - unsigned long version; - unsigned long numDrivers; - unsigned long reserved1; - unsigned long reserved2; -}; -typedef struct DriversPackage DriversPackage; - -enum { - kCFBundleType2, - kCFBundleType3 -}; - #ifndef OPTION_ROM long (*LoadExtraDrivers_p)(FileLoadDrivers_t FileLoadDrivers_p); #endif Index: branches/meklort/i386/modules/KextPatcher/kext_patcher.c =================================================================== --- branches/meklort/i386/modules/KextPatcher/kext_patcher.c (revision 560) +++ branches/meklort/i386/modules/KextPatcher/kext_patcher.c (revision 561) @@ -10,11 +10,14 @@ #include "libsaio.h" #include "kext_patcher.h" -//#include "platform.h" +#include "pci.h" +#include "drivers.h" +#include "mkext.h" #include "modules.h" -//extern PlatformInfo_t Platform; +void KextPatcher_hook(pci_dt_t* current, void* arg2, void* arg3, void* arg4); + /** ** KextPatcher_start -> module start ** Notified the module system that this module will hook into the @@ -26,6 +29,7 @@ // execute_hook("LoadDriverMKext", (void*)package, (void*) length, NULL, NULL); // execute_hook("LoadMatchedModules", module, &length, executableAddr, NULL); + register_hook_callback("PCIDevice", &KextPatcher_hook); register_hook_callback("LoadMatchedModules", &kext_loaded); register_hook_callback("LoadDriverMKext", &mkext_loaded); @@ -36,8 +40,12 @@ ** This function will be used to patch kexts ( eg AppleInteIntegratedFramebuffer) ** and their plists when they are loaded into memmory **/ -void kext_loaded(void* module, void* length, void* executableAddr, void* arg3) +void kext_loaded(void* moduletmp, void* lengthprt, void* executableAddr, void* arg3) { + long length = *(long*)lengthprt; + ModulePtr module = moduletmp; + printf("Loading %s, lenght is %d\n", module->plistAddr, length); + getc(); } /** @@ -47,6 +55,14 @@ ** what sort of slowdown this will cause and if it's worth implimenting. **/ -void mkext_loaded(void* filespec, void* package, void* lenght, void* arg3) +void mkext_loaded(void* filespec, void* packagetmp, void* length, void* arg3) { + DriversPackage * package = packagetmp; + printf("Loading %s, length %d\n", filespec, length); + getc(); +} + +void KextPatcher_hook(pci_dt_t* current, void* arg2, void* arg3, void* arg4) +{ + // Lets do some patching. } \ No newline at end of file Index: branches/meklort/i386/modules/GraphicsEnabler/gma.c =================================================================== --- branches/meklort/i386/modules/GraphicsEnabler/gma.c (revision 0) +++ branches/meklort/i386/modules/GraphicsEnabler/gma.c (revision 561) @@ -0,0 +1,153 @@ +/* +Original patch by nawcom -> http://forum.voodooprojects.org/index.php/topic,1029.msg4427.html#msg4427 +*/ +#include "libsaio.h" +#include "bootstruct.h" +#include "pci.h" +#include "platform.h" +#include "device_inject.h" +#include "gma.h" + +#ifndef DEBUG_GMA +#define DEBUG_GMA 0 +#endif + +#if DEBUG_GMA +#define DBG(x...) printf(x) +#else +#define DBG(x...) +#endif + +uint8_t GMAX3100_vals[22][4] = { + { 0x01,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x08 }, + { 0x64,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x08 }, + { 0x01,0x00,0x00,0x00 }, + { 0x20,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, + { 0x20,0x03,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x08,0x52,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, + { 0x01,0x00,0x00,0x00 }, + { 0x3B,0x00,0x00,0x00 }, + { 0x00,0x00,0x00,0x00 } +}; +uint8_t reg_TRUE[] = { 0x01 ,0x00 ,0x00 ,0x00 }; +uint8_t reg_FALSE[] = { 0x00,0x00,0x00,0x00 }; + +static struct gma_gpu_t KnownGPUS[] = { + { 0x00000000, "Unknown" }, + { 0x808627A2, "Mobile GMA950" }, + { 0x808627AE, "Mobile GMA950" }, + { 0x808627A6, "Mobile GMA950" }, + { 0x80862772, "Desktop GMA950" }, + { 0x80862776, "Desktop GMA950" }, + { 0x80862A02, "GMAX3100" }, + { 0x80862A03, "GMAX3100" }, + { 0x80862A12, "GMAX3100" }, + { 0x80862A13, "GMAX3100" }, + { 0x80862A42, "GMAX3100" }, + { 0x80862A43, "GMAX3100" }, +}; + +char *get_gma_model(uint32_t id) { + int i=0; + for(i = 0; i < (sizeof(KnownGPUS) / sizeof(KnownGPUS[0])); i++) { + if(KnownGPUS[i].device == id) + return KnownGPUS[i].name; + } + return KnownGPUS[0].name; +} + +bool setup_gma_devprop(pci_dt_t *gma_dev) +{ + //int len; + char *devicepath; + volatile uint8_t *regs; + uint32_t bar[7]; + char *model; + uint8_t BuiltIn = 0x00; + uint8_t ClassFix[4] = { 0x00, 0x00, 0x03, 0x00 }; + + devicepath = get_pci_dev_path(gma_dev); + + bar[0] = pci_config_read32(gma_dev->dev.addr, 0x10); + regs = (uint8_t *) (bar[0] & ~0x0f); + + model = get_gma_model((gma_dev->vendor_id << 16) | gma_dev->device_id); + + verbose("Intel %s [%04x:%04x] :: %s\n", + model, gma_dev->vendor_id, gma_dev->device_id, devicepath); + + if (!string) + string = devprop_create_string(); + struct DevPropDevice *device = malloc(sizeof(struct DevPropDevice)); + device = devprop_add_device(string, devicepath); + + if(!device) + { + printf("Failed initializing dev-prop string dev-entry, press any key...\n"); + + getc(); + return false; + } + + devprop_add_value(device, "model", (uint8_t*)model, (strlen(model) + 1)); + devprop_add_value(device, "device_type", (uint8_t*)"display", 8); + + if (model == (char *)"Mobile GMA950") { + devprop_add_value(device, "AAPL,HasPanel", reg_TRUE, 4); + devprop_add_value(device, "built-in", &BuiltIn, 1); + devprop_add_value(device, "class-code", ClassFix, 4); + } else if (model == (char *)"Desktop GMA950") { + BuiltIn = 0x01; + devprop_add_value(device, "built-in", &BuiltIn, 1); + devprop_add_value(device, "class-code", ClassFix, 4); + } else if (model == (char *)"GMAX3100") { + devprop_add_value(device, "AAPL,HasPanel",GMAX3100_vals[0], 4); + devprop_add_value(device, "AAPL,SelfRefreshSupported",GMAX3100_vals[1], 4); + devprop_add_value(device, "AAPL,aux-power-connected",GMAX3100_vals[2], 4); + devprop_add_value(device, "AAPL,backlight-control",GMAX3100_vals[3], 4); + devprop_add_value(device, "AAPL00,blackscreen-preferences",GMAX3100_vals[4], 4); + devprop_add_value(device, "AAPL01,BacklightIntensity",GMAX3100_vals[5], 4); + devprop_add_value(device, "AAPL01,blackscreen-preferences",GMAX3100_vals[6], 4); + devprop_add_value(device, "AAPL01,DataJustify",GMAX3100_vals[7], 4); + devprop_add_value(device, "AAPL01,Depth",GMAX3100_vals[8], 4); + devprop_add_value(device, "AAPL01,Dither",GMAX3100_vals[9], 4); + devprop_add_value(device, "AAPL01,DualLink",GMAX3100_vals[10], 4); + devprop_add_value(device, "AAPL01,Height",GMAX3100_vals[11], 4); + devprop_add_value(device, "AAPL01,Interlace",GMAX3100_vals[12], 4); + devprop_add_value(device, "AAPL01,Inverter",GMAX3100_vals[13], 4); + devprop_add_value(device, "AAPL01,InverterCurrent",GMAX3100_vals[14], 4); + devprop_add_value(device, "AAPL01,InverterCurrency",GMAX3100_vals[15], 4); + devprop_add_value(device, "AAPL01,LinkFormat",GMAX3100_vals[16], 4); + devprop_add_value(device, "AAPL01,LinkType",GMAX3100_vals[17], 4); + devprop_add_value(device, "AAPL01,Pipe",GMAX3100_vals[18], 4); + devprop_add_value(device, "AAPL01,PixelFormat",GMAX3100_vals[19], 4); + devprop_add_value(device, "AAPL01,Refresh",GMAX3100_vals[20], 4); + devprop_add_value(device, "AAPL01,Stretch",GMAX3100_vals[21], 4); + devprop_add_value(device, "class-code", ClassFix, 4); + } + + stringdata = malloc(sizeof(uint8_t) * string->length); + if(!stringdata) + { + printf("no stringdata press a key...\n"); + getc(); + return false; + } + + memcpy(stringdata, (uint8_t*)devprop_generate_string(string), string->length); + stringlength = string->length; + + return true; +} Index: branches/meklort/i386/modules/GraphicsEnabler/gma.h =================================================================== --- branches/meklort/i386/modules/GraphicsEnabler/gma.h (revision 0) +++ branches/meklort/i386/modules/GraphicsEnabler/gma.h (revision 561) @@ -0,0 +1,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 */