Chameleon

Chameleon Commit Details

Date:2010-09-25 17:27:30 (13 years 6 months ago)
Author:Evan Lojewski
Commit:550
Parents: 549
Message:Removed static keyword from moduels. Fixed a few issues. NOTE: ACPI module is currently required for a proper boot.
Changes:
M/branches/meklort/i386/libsaio/platform.c
M/branches/meklort/i386/modules/Memory/spd.c
M/branches/meklort/i386/boot2/boot.c
M/branches/meklort/i386/modules/Memory/Memory.c
M/branches/meklort/i386/modules/Memory/dram_controllers.c
M/branches/meklort/i386/modules/GraphicsEnabler/GraphicsEnabler.c
M/branches/meklort/i386/modules/GraphicsEnabler/nvidia.c
M/branches/meklort/i386/modules/GraphicsEnabler/ati.c
M/branches/meklort/i386/modules/HelloWorld/HelloWorld.c

File differences

branches/meklort/i386/libsaio/platform.c
3535
3636
3737
38
39
40
41
42
43
44
45
38
4639
4740
4841
static bool done = false;␊
if (done) return;␊
␊
␉bool useAutodetection = true;␊
getBoolForKey(kUseMemDetect, &useAutodetection, &bootInfo->bootConfig);␊
␊
␊
if (useAutodetection) {␊
␉␉execute_hook("ScanMemory", NULL, NULL, NULL, NULL);␊
␉␉//getc();␊
}␊
␉execute_hook("ScanMemory", NULL, NULL, NULL, NULL);␊
done = true;␊
}␊
␊
branches/meklort/i386/boot2/boot.c
200200
201201
202202
203
203
204204
205205
206206
finalizeBootStruct();␊
␉␊
␉execute_hook("Kernel Start", (void*)kernelEntry, (void*)bootArgs, NULL, NULL);␉// Notify modules that the kernel is about to be started␊
␉␊
␊
␉// Jump to kernel's entry point. There's no going back now.␊
startprog( kernelEntry, bootArgs );␊
␉␊
branches/meklort/i386/modules/Memory/spd.c
2424
2525
2626
27
27
2828
2929
3030
......
4141
4242
4343
44
44
4545
4646
4747
......
202202
203203
204204
205
205206
206207
207
208208
209209
210210
......
219219
220220
221221
222
222223
223224
224
225225
226226
227227
......
349349
350350
351351
352
352
353353
354354
355355
#define DBG(x...)␊
#endif␊
␊
static const char *spd_memory_types[] =␊
const char *spd_memory_types[] =␊
{␊
␉"RAM", /* 00h Undefined */␊
␉"FPM", /* 01h FPM */␊
};␊
␊
#define UNKNOWN_MEM_TYPE 2␊
static uint8_t spd_mem_to_smbios[] =␊
uint8_t spd_mem_to_smbios[] =␊
{␊
␉UNKNOWN_MEM_TYPE, /* 00h Undefined */␊
␉UNKNOWN_MEM_TYPE, /* 01h FPM */␊
#define SLST(a) ((uint8_t)(spd[a] & 0x0f))␊
␊
/** Get DDR3 or DDR2 serial number, 0 most of the times, always return a valid ptr */␊
char asciiSerial[16];␊
const char *getDDRSerial(const char* spd)␊
{␊
static char asciiSerial[16];␊
␊
if (spd[SPD_MEMORY_TYPE]==SPD_MEMORY_TYPE_SDRAM_DDR3) // DDR3␊
{␊
}␊
␊
/** Get DDR3 or DDR2 Part Number, always return a valid ptr */␊
char asciiPartNo[32];␊
const char * getDDRPartNum(char* spd, uint32_t base, int slot)␊
{␊
␉static char asciiPartNo[32];␊
␉int i, start=0, index = 0;␊
␊
if (spd[SPD_MEMORY_TYPE]==SPD_MEMORY_TYPE_SDRAM_DDR3) {␊
} // for␊
}␊
␊
static struct smbus_controllers_t smbus_controllers[] = {␊
struct smbus_controllers_t smbus_controllers[] = {␊
␊
␉{0x8086, 0x269B, "ESB2", read_smb_intel },␊
␉{0x8086, 0x25A4, "6300ESB", read_smb_intel },␊
branches/meklort/i386/modules/Memory/Memory.c
1010
1111
1212
13
13
14
1415
1516
1617
......
3839
3940
4041
41
42
43
44
45
46
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
4758
#include "platform.h"␊
#include "dram_controllers.h"␊
#include "spd.h"␊
#include "mem.h"␊
#include "boot.h"␊
#include "bootstruct.h"␊
#include "modules.h"␊
␊
pci_dt_t * dram_controller_dev = NULL;␊
␊
void Memory_hook(void* arg1, void* arg2, void* arg3, void* arg4)␊
{␊
␉if (dram_controller_dev!=NULL) {␊
␉␉scan_dram_controller(dram_controller_dev); // Rek: pci dev ram controller direct and fully informative scan ...␊
␉}␊
␉scan_memory(Platform); // unfortunately still necesary for some comp where spd cant read correct speed␊
␉scan_spd(Platform);␊
␊
␉␊
␉␊
␉bool useAutodetection = true;␊
getBoolForKey(kUseMemDetect, &useAutodetection, &bootInfo->bootConfig);␊
␉␊
␉␊
if (useAutodetection) {␊
␉␉␊
␉␉if (dram_controller_dev!=NULL) {␊
␉␉␉scan_dram_controller(dram_controller_dev); // Rek: pci dev ram controller direct and fully informative scan ...␊
␉␉}␊
␉␉scan_memory(Platform); // unfortunately still necesary for some comp where spd cant read correct speed␊
␉␉scan_spd(Platform);␊
␉␉//getc();␊
}␊
␉␊
}
branches/meklort/i386/modules/Memory/dram_controllers.c
4545
4646
4747
48
4849
4950
5051
5152
52
5353
5454
5555
......
485485
486486
487487
488
488
489489
490490
491491
......
525525
526526
527527
528
528
529529
530530
531531
}␊
␊
int nhm_bus = 0x3F;␊
long possible_nhm_bus[] = {0xFF, 0x7F, 0x3F};␊
␊
// Setup Nehalem Integrated Memory Controller␊
static void setup_nhm(pci_dt_t *dram_dev)␊
{␊
␉static long possible_nhm_bus[] = {0xFF, 0x7F, 0x3F};␊
␉unsigned long did, vid;␊
␉int i;␊
␉␊
␉␉Platform->RAM.Channels = SMB_MEM_CHANNEL_DUAL;␊
}␊
␊
static struct mem_controller_t dram_controllers[] = {␊
struct mem_controller_t dram_controllers[] = {␊
␊
␉// Default unknown chipset␊
␉{ 0, 0, "",␉NULL, NULL, NULL },␊
␉␊
};␊
␊
static const char *memory_channel_types[] =␊
const char *memory_channel_types[] =␊
{␊
␉"Unknown", "Single", "Dual", "Triple"␊
};␉␉␉␊
branches/meklort/i386/modules/GraphicsEnabler/GraphicsEnabler.c
2323
2424
2525
26
27
28
29
26
27
3028
31
29
3230
3331
3432
3533
36
34
3735
36
3837
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
5555
56
5657
5758
}␊
␊
␊
void GraphicsEnabler_hook(void* arg1, void* arg2, void* arg3, void* arg4)␊
{␊
␉pci_dt_t* current = arg1;␊
␊
void GraphicsEnabler_hook(pci_dt_t* current, void* arg2, void* arg3, void* arg4)␊
{␉␊
␉if(current->class_id != PCI_CLASS_DISPLAY_VGA) return;␊
␊
␉␊
␉char *devicepath = get_pci_dev_path(current);␊
␉␊
␉bool do_gfx_devprop = false;␊
␉getBoolForKey(kGraphicsEnabler, &do_gfx_devprop, &bootInfo->bootConfig);␊
␊
␉␊
␉if (do_gfx_devprop)␊
␉{␊
␉␉switch (current->vendor_id)␊
␉{␊
␉␉case PCI_VENDOR_ID_ATI:␊
␉␉␉verbose("ATI VGA Controller [%04x:%04x] :: %s \n", ␊
␉␉␉␉␉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 */␊
␉␉␉verbose("Intel VGA Controller [%04x:%04x] :: %s (currently NOT SUPPORTED)\n", ␊
␉␉␉␉␉current->vendor_id, current->device_id, devicepath);␊
␉␉␉break;␊
␉␉␉␊
␉␉case PCI_VENDOR_ID_NVIDIA: ␊
␉␉␉setup_nvidia_devprop(current);␊
␉␉␉break;␊
␉␉{␊
␉␉␉case PCI_VENDOR_ID_ATI:␊
␉␉␉␉verbose("ATI VGA Controller [%04x:%04x] :: %s \n", ␊
␉␉␉␉␉␉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␊
␉␉␉␉verbose("Intel VGA Controller [%04x:%04x] :: %s (currently NOT SUPPORTED)\n", ␊
␉␉␉␉␉␉current->vendor_id, current->device_id, devicepath);␊
␉␉␉␉break;␊
␉␉␉␉␊
␉␉␉case PCI_VENDOR_ID_NVIDIA: ␊
␉␉␉␉setup_nvidia_devprop(current);␊
␉␉␉␉break;␊
␉␉}␊
␉}␊
␊
␉␊
}␊
branches/meklort/i386/modules/GraphicsEnabler/nvidia.c
5757
5858
5959
60
60
6161
6262
6363
......
8585
8686
8787
88
88
8989
9090
9191
......
9393
9494
9595
96
96
9797
9898
9999
#include "nvidia.h"␊
␊
#ifndef DEBUG_NVIDIA␊
#define DEBUG_NVIDIA 0␊
#define DEBUG_NVIDIA 1␊
#endif␊
␊
#if DEBUG_NVIDIA␊
const char *nvidia_name_1[]␉␉=␉{ "@1,name",␉␉"NVDA,Display-B" };␊
const char *nvidia_slot_name[]␉␉=␉{ "AAPL,slot-name",␉"Slot-1" };␊
␊
static uint8_t default_NVCAP[]= {␊
uint8_t default_NVCAP[]= {␊
␉0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00,␊
␉0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a,␊
␉0x00, 0x00, 0x00, 0x00␊
␊
#define NVCAP_LEN ( sizeof(default_NVCAP) / sizeof(uint8_t) )␊
␊
static struct nv_chipsets_t NVKnownChipsets[] = {␊
struct nv_chipsets_t NVKnownChipsets[] = {␊
␉{ 0x00000000, "Unknown" },␊
␉{ 0x10DE0040, "GeForce 6800 Ultra" },␊
␉{ 0x10DE0041, "GeForce 6800" },␊
branches/meklort/i386/modules/GraphicsEnabler/ati.c
1919
2020
2121
22
23
22
23
2424
2525
2626
......
111111
112112
113113
114
114
115115
116116
117117
......
156156
157157
158158
159
160
159
160
161161
162162
163163
......
169169
170170
171171
172
173
174
175
176
177
172
173
174
175
176
177
178178
179179
180
180
181181
182182
183183
......
222222
223223
224224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242242
243243
244244
245245
246246
247247
248
248
249249
250250
251
251
252252
253253
254254
......
295295
296296
297297
298
298
299299
300300
301301
......
303303
304304
305305
306
306
307307
308308
309309
......
314314
315315
316316
317
317
318318
319319
320320
......
330330
331331
332332
333
333
334334
335335
336336
......
348348
349349
350350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370370
371371
372372
373373
374
374
375375
376376
377
377
378378
379379
380380
......
387387
388388
389389
390
390
391391
392392
393393
......
404404
405405
406406
407
407
408408
409409
410410
......
416416
417417
418418
419
419
420420
421421
422422
......
429429
430430
431431
432
432
433433
434434
435435
......
448448
449449
450450
451
452
453
454
451
452
453
454
455455
456456
457457
458458
459
460
461
462
463
464
465
466
459
460
461
462
463
464
465
466
467467
468468
469469
470470
471471
472472
473
474
473
474
475475
476476
477477
......
535535
536536
537537
538
538
539539
540540
541541
......
544544
545545
546546
547
548
547
548
549549
550550
551551
......
634634
635635
636636
637
637
638638
639
639
640640
641641
642642
......
644644
645645
646646
647
647
648648
649649
650650
......
656656
657657
658658
659
659
660660
661661
662662
......
665665
666666
667667
668
668
669669
670
671
672
670
671
672
673673
674674
675675
......
687687
688688
689689
690
690
691691
692692
693693
694694
695
695
696696
697697
698
698
699699
700700
701
701
702702
703703
704
704
705705
706706
707
707
708708
709709
710
710
711711
712712
713
713
714714
715715
716716
......
744744
745745
746746
747
747
748748
749749
750750
751
751
752752
753753
754
754
755755
756756
757757
......
775775
776776
777777
778
778
779779
780780
/*␊
* Alternatively you can choose to comply with APSL␊
*/␊
␊
␊
␊
␊
#include "libsaio.h"␊
#include "boot.h"␊
#include "bootstruct.h"␊
};␊
␊
// Known cards as of 2008/08/26␊
static struct ati_chipsets_t ATIKnownChipsets[] = {␊
struct ati_chipsets_t ATIKnownChipsets[] = {␊
␉{ 0x00000000, "Unknown" } ,␊
␉{ 0x10029589, "ATI Radeon 2600 Series"} ,␊
␉{ 0x10029588, "ATI Radeon 2600 Series"} ,␊
␉{ 0x1002945A, "ATI Radeon 4800 Mobility Series"} ,␊
␉{ 0x1002945B, "ATI Radeon 4800 Mobility Series"} ,␊
␉{ 0x1002944B, "ATI Radeon 4800 Mobility Series"} ,␊
{ 0x10029490, "ATI Radeon 4670 Series"} ,␊
{ 0x10029498, "ATI Radeon 4650 Series"} ,␊
␉{ 0x10029490, "ATI Radeon 4670 Series"} ,␊
␉{ 0x10029498, "ATI Radeon 4650 Series"} ,␊
␉{ 0x10029490, "ATI Radeon 4600 Series"} ,␊
␉{ 0x10029498, "ATI Radeon 4600 Series"} ,␊
␉{ 0x1002949E, "ATI Radeon 4600 Series"} ,␊
␉{ 0x10029552, "ATI Radeon 4300 Mobility Series"} ,␊
␉{ 0x10029553, "ATI Radeon 4500 Mobility Series"} ,␊
␉{ 0x1002954F, "ATI Radeon 4300 Series"} ,␊
{ 0x100294B3, "ATI Radeon 4770 Series"} ,␊
{ 0x100294B5, "ATI Radeon 4770 Series"} ,␊
{ 0x100268B8, "ATI Radeon 5700 Series"} ,␊
{ 0x100268BE, "ATI Radeon 5700 Series"} ,␊
{ 0x10026898, "ATI Radeon 5800 Series"} ,␊
{ 0x10026899, "ATI Radeon 5800 Series"}␊
␉{ 0x100294B3, "ATI Radeon 4770 Series"} ,␊
␉{ 0x100294B5, "ATI Radeon 4770 Series"} ,␊
␉{ 0x100268B8, "ATI Radeon 5700 Series"} ,␊
␉{ 0x100268BE, "ATI Radeon 5700 Series"} ,␊
␉{ 0x10026898, "ATI Radeon 5800 Series"} ,␊
␉{ 0x10026899, "ATI Radeon 5800 Series"}␊
};␊
␊
static struct ati_chipsets_t ATIKnownFramebuffers[] = {␊
struct ati_chipsets_t ATIKnownFramebuffers[] = {␊
␉{ 0x00000000, "Megalodon" },␊
␉{ 0x10029589, "Lamna"} ,␊
␉{ 0x10029588, "Lamna"} ,␊
␉{ 0x1002945A, "Motmot"} ,␊
␉{ 0x1002945B, "Motmot"} ,␊
␉{ 0x1002944B, "Motmot"} ,␊
{ 0x10029490, "Peregrine"} ,␊
{ 0x10029498, "Peregrine"} ,␊
{ 0x1002949E, "Peregrine"} ,␊
{ 0x10029480, "Peregrine"} ,␊
{ 0x10029488, "Peregrine"} ,␊
{ 0x10029540, "Peregrine"} ,␊
{ 0x10029541, "Peregrine"} ,␊
{ 0x1002954E, "Peregrine"} ,␊
{ 0x10029552, "Peregrine"} ,␊
{ 0x10029553, "Peregrine"} ,␊
{ 0x1002954F, "Peregrine"} ,␊
{ 0x100294B3, "Peregrine"},␊
{ 0x100294B5, "Peregrine"},␊
{ 0x100268B8, "Motmot"},␊
{ 0x100268BE, "Motmot"},␊
{ 0x10026898, "Motmot"},␊
{ 0x10026899, "Motmot"}␊
␉{ 0x10029490, "Peregrine"} ,␊
␉{ 0x10029498, "Peregrine"} ,␊
␉{ 0x1002949E, "Peregrine"} ,␊
␉{ 0x10029480, "Peregrine"} ,␊
␉{ 0x10029488, "Peregrine"} ,␊
␉{ 0x10029540, "Peregrine"} ,␊
␉{ 0x10029541, "Peregrine"} ,␊
␉{ 0x1002954E, "Peregrine"} ,␊
␉{ 0x10029552, "Peregrine"} ,␊
␉{ 0x10029553, "Peregrine"} ,␊
␉{ 0x1002954F, "Peregrine"} ,␊
␉{ 0x100294B3, "Peregrine"},␊
␉{ 0x100294B5, "Peregrine"},␊
␉{ 0x100268B8, "Motmot"},␊
␉{ 0x100268BE, "Motmot"},␊
␉{ 0x10026898, "Motmot"},␊
␉{ 0x10026899, "Motmot"}␊
};␊
␊
static uint32_t accessROM(pci_dt_t *ati_dev, unsigned int mode)␊
{␊
␉uint32_t␉␉bar[7];␊
␉volatile uint32_t␉*regs;␊
␊
␉␊
␉bar[2] = pci_config_read32(ati_dev->dev.addr, 0x18 );␊
␉regs = (uint32_t *) (bar[2] & ~0x0f);␊
␊
␉␊
␉if (mode) {␊
␉␉if (mode != 1) {␊
␉␉␉return 0xe00002c7;␊
␉uint32_t␉␉*BIOSBase;␊
␉uint32_t␉␉counter;␊
␉volatile uint32_t␉*regs;␊
␊
␉␊
␉bar[2] = pci_config_read32(ati_dev->dev.addr, 0x18 );␊
␉regs = (volatile uint32_t *) (bar[2] & ~0x0f);␊
␉accessROM(ati_dev, 0);␊
␉REG32R(0xac);␊
␉REG32W(0xa8, 0);␊
␉REG32R(0xac);␉␊
␊
␉␊
␉BIOSBase = malloc(0x10000);␊
␉REG32W(0xa8, 0);␊
␉BIOSBase[0] = REG32R(0xac);␊
␉␉counter +=4;␊
␉} while (counter != 0x10000);␊
␉accessROM((pci_dt_t *)regs, 1);␊
␊
␉␊
␉if (*(uint16_t *)BIOSBase != 0xAA55) {␊
␉␉printf("Wrong BIOS signature: %04x\n", *(uint16_t *)BIOSBase);␊
␉␉return 0;␊
␉uint32_t␉␉bar[7];␊
␉uint32_t␉␉size;␊
␉volatile uint32_t␉*regs;␊
␊
␉␊
␉bar[2] = pci_config_read32(ati_dev->dev.addr, 0x18 );␊
␉regs = (uint32_t *) (bar[2] & ~0x0f);␊
␉if (ati_dev->device_id < 0x9400) {␊
static bool radeon_card_posted(pci_dt_t *ati_dev)␊
{␊
␉// if devid matches biosimage(from legacy) devid - posted card, fails with X2/crossfire cards.␊
/*␉char *biosimage = 0xC0000;␊
␉␊
␉if ((uint8_t)biosimage[0] == 0x55 && (uint8_t)biosimage[1] == 0xaa)␊
␉{␊
␉␉struct pci_rom_pci_header_t *rom_pci_header; ␊
␉␉rom_pci_header = (struct pci_rom_pci_header_t*)(biosimage + (uint8_t)biosimage[24] + (uint8_t)biosimage[25]*256);␊
␉␊
␉if (rom_pci_header->signature == 0x52494350)␊
␉␉{␊
␉␉if (rom_pci_header->device == ati_dev->device_id)␊
␉␉␉{␊
␉␉␉␉return true;␊
␉␉␉␉printf("Card was POSTed\n");␊
␉␉␉}␊
␉␉}␊
␉}␊
␉return false;␊
␉printf("Card was not POSTed\n");␊
␉*/␊
␉/*␉char *biosimage = 0xC0000;␊
␉ ␊
␉ if ((uint8_t)biosimage[0] == 0x55 && (uint8_t)biosimage[1] == 0xaa)␊
␉ {␊
␉ struct pci_rom_pci_header_t *rom_pci_header; ␊
␉ rom_pci_header = (struct pci_rom_pci_header_t*)(biosimage + (uint8_t)biosimage[24] + (uint8_t)biosimage[25]*256);␊
␉ ␊
␉ if (rom_pci_header->signature == 0x52494350)␊
␉ {␊
␉ if (rom_pci_header->device == ati_dev->device_id)␊
␉ {␊
␉ return true;␊
␉ printf("Card was POSTed\n");␊
␉ }␊
␉ }␊
␉ }␊
␉ return false;␊
␉ printf("Card was not POSTed\n");␊
␉ */␊
␉//fails yet␊
␉uint32_t␉␉bar[7];␊
␉uint32_t␉␉val;␊
␉volatile uint32_t␉*regs;␊
␊
␉␊
␉bar[2] = pci_config_read32(ati_dev->dev.addr, 0x18);␊
␉regs = (uint32_t *) (bar[2] & ~0x0f);␊
␊
␉␊
␉val = REG32R(AVIVO_D1CRTC_CONTROL) | REG32R(AVIVO_D2CRTC_CONTROL);␊
␉if (val & AVIVO_CRTC_EN) {␊
␉␉return true;␊
{␊
␉int␉fd;␊
␉int␉size;␊
␊
␉␊
␉if ((fd = open_bvdev("bt(0,0)", filename, 0)) < 0) {␊
␉␉return 0;␊
␉}␊
static char *get_ati_model(uint32_t id)␊
{␊
␉int␉i;␊
␊
␉␊
␉for (i=0; i< (sizeof(ATIKnownChipsets) / sizeof(ATIKnownChipsets[0])); i++) {␊
␉␉if (ATIKnownChipsets[i].device == id) {␊
␉␉␉return ATIKnownChipsets[i].name;␊
static char *get_ati_fb(uint32_t id)␊
{␊
␉int␉i;␊
␊
␉␊
␉for (i=0; i< (sizeof(ATIKnownFramebuffers) / sizeof(ATIKnownFramebuffers[0])); i++) {␊
␉␉if (ATIKnownFramebuffers[i].device == id) {␊
␉␉␉return ATIKnownFramebuffers[i].name;␊
{␊
␉int␉i;␊
␉uint8_t␉*config_space;␊
␊
␉␊
␉if (!device || !ati_dev) {␊
␉␉return 0;␊
␉}␊
␉if(!device)␊
␉␉return 0;␊
␉␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_compatible_0))␊
//␉␉return 0;␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_compatible_1))␊
//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_compatible_0))␊
␉//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_compatible_1))␊
␉//␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_device_type_0))␊
␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_device_type_1))␊
␉␉return 0;␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_device_type))␊
//␉␉return 0;␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_name_0))␊
//␉␉return 0;␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_name_1))␊
//␉␉return 0;␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_name))␊
//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_device_type))␊
␉//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_name_0))␊
␉//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_name_1))␊
␉//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_name))␊
␉//␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_efidisplay_0))␊
␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_display_type_0))␊
␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_display_type_1))␊
␉␉return 0;␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_slot_name))␊
//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_slot_name))␊
␉//␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_card_no))␊
␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_copyright))␊
{␊
␉if(!device)␊
␉␉return 0;␊
␊
␉␊
␉if(!DP_ADD_TEMP_VAL_DATA(device, ati_platform_info))␊
␉␉return 0;␉␊
␉if(!DP_ADD_TEMP_VAL(device, ati_device_type_0))␊
␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_efidisplay_0_n4))␊
␉␉return 0;␊
//␉if(!DP_ADD_TEMP_VAL(device, ati_slot_name_n4))␊
//␉␉return 0;␊
␉//␉if(!DP_ADD_TEMP_VAL(device, ati_slot_name_n4))␊
␉//␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_card_no))␊
␉␉return 0;␊
␉if(!DP_ADD_TEMP_VAL(device, ati_copyright))␊
␉uint8_t␉␉␉cmd;␊
␉bool␉␉␉doit;␊
␉bool␉␉␉toFree;␊
␊
␉␊
␉devicepath = get_pci_dev_path(ati_dev);␊
␊
␉␊
␉cmd = pci_config_read8(ati_dev->dev.addr, 4);␊
␉verbose("old pci command - %x\n", cmd);␊
␉if (cmd == 0) {␊
␉␉cmd = pci_config_read8(ati_dev->dev.addr, 4);␊
␉␉verbose("new pci command - %x\n", cmd);␊
␉}␊
␊
␉␊
␉model = get_ati_model((ati_dev->vendor_id << 16) | ati_dev->device_id);␊
␉framebuffer = get_ati_fb((ati_dev->vendor_id << 16) | ati_dev->device_id);␊
␉if (!string) {␊
␉␉getc();␊
␉␉return false;␊
␉}␊
␊
␉␊
␉/* FIXME: for primary graphics card only */␊
␉if (radeon_card_posted(ati_dev)) {␊
␉␉boot_display = 1;␊
␉}␊
␉verbose("boot display - %x\n", boot_display);␊
␉devprop_add_value(device, "@0,AAPL,boot-display", (uint8_t*)&boot_display, 4);␊
␊
␉␊
␉if((framebuffer[0] == 'M' && framebuffer[1] == 'o' && framebuffer[2] == 't') || ␊
(framebuffer[0] == 'S' && framebuffer[1] == 'h' && framebuffer[2] == 'r') || ␊
(framebuffer[0] == 'P' && framebuffer[1] == 'e' && framebuffer[2] == 'r')) //faster than strcmp ;)␊
devprop_add_ati_template_4xxx(device);␊
␉ (framebuffer[0] == 'S' && framebuffer[1] == 'h' && framebuffer[2] == 'r') || ␊
␉ (framebuffer[0] == 'P' && framebuffer[1] == 'e' && framebuffer[2] == 'r')) //faster than strcmp ;)␊
␉␉devprop_add_ati_template_4xxx(device);␊
␉else {␊
␉␉devprop_add_ati_template(device);␊
␉␉vram_size = getvramsizekb(ati_dev) * 1024;␊
␉}␊
␉devprop_add_value(device, "model", (uint8_t*)model, (strlen(model) + 1));␊
␉devprop_add_value(device, "ATY,DeviceID", (uint8_t*)&ati_dev->device_id, 2);␊
␊
␉␊
␉//fb setup␊
␉sprintf(tmp, "Slot-%x",devices_number);␊
␉devprop_add_value(device, "AAPL,slot-name", (uint8_t*)tmp, strlen(tmp) + 1);␊
␉devices_number++;␊
␊
␉␊
␉sprintf(tmp, ati_compatible_0[1], framebuffer);␊
␉devprop_add_value(device, (char *) ati_compatible_0[0], (uint8_t *)tmp, strlen(tmp) + 1);␊
␊
␉␊
␉sprintf(tmp, ati_compatible_1[1], framebuffer);␊
␉devprop_add_value(device, (char *) ati_compatible_1[0], (uint8_t *)tmp, strlen(tmp) + 1);␊
␊
␉␊
␉sprintf(tmp, ati_device_type[1], framebuffer);␊
␉devprop_add_value(device, (char *) ati_device_type[0], (uint8_t *)tmp, strlen(tmp) + 1);␊
␊
␉␊
␉sprintf(tmp, ati_name[1], framebuffer);␊
␉devprop_add_value(device, (char *) ati_name[0], (uint8_t *)tmp, strlen(tmp) + 1);␊
␊
␉␊
␉sprintf(tmp, ati_name_0[1], framebuffer);␊
␉devprop_add_value(device, (char *) ati_name_0[0], (uint8_t *)tmp, strlen(tmp) + 1);␊
␊
␉␊
␉sprintf(tmp, ati_name_1[1], framebuffer);␊
␉devprop_add_value(device, (char *) ati_name_1[0], (uint8_t *)tmp, strlen(tmp) + 1);␊
␊
␉␊
␉sprintf(tmp, "/Extra/%04x_%04x.rom", (uint16_t)ati_dev->vendor_id, (uint16_t)ati_dev->device_id);␊
␉if (getBoolForKey(kUseAtiROM, &doit, &bootInfo->bootConfig) && doit) {␊
␉␉verbose("looking for ati video bios file %s\n", tmp);␊
␉} else {␊
␉␉toFree = true;␊
␉}␊
␊
␉␊
␉if (bios[0] == 0x55 && bios[1] == 0xaa) {␊
␉␉printf("Found bios image\n");␊
␉␉bios_size = bios[2] * 512;␊
␊
␉␉␊
␉␉struct pci_rom_pci_header_t *rom_pci_header;␊
␉␉rom_pci_header = (struct pci_rom_pci_header_t*)(bios + bios[24] + bios[25]*256);␊
␊
␉␉␊
␉␉if (rom_pci_header->signature == 0x52494350) {␊
␉␉␉if (rom_pci_header->device != ati_dev->device_id) {␊
␉␉␉␉verbose("Bios image (%x) doesnt match card (%x), ignoring\n", rom_pci_header->device, ati_dev->device_id);␊
␉stringdata = malloc(sizeof(uint8_t) * string->length);␊
␉memcpy(stringdata, (uint8_t*)devprop_generate_string(string), string->length);␊
␉stringlength = string->length;␊
␊
␉␊
␉return true;␊
}␊
branches/meklort/i386/modules/HelloWorld/HelloWorld.c
1717
1818
1919
20
21
2022
2123
{␊
␉//printf("Hooking 'ExecKernel'\n");␊
␉register_hook_callback("ExecKernel", &helloWorld);␊
␉register_hook_callback("Kernel Start", &helloWorld);␊
␊
}␊
␊

Archive Download the corresponding diff file

Revision: 550