Chameleon

Chameleon Commit Details

Date:2010-09-23 07:35:36 (13 years 6 months ago)
Author:Evan Lojewski
Commit:545
Parents: 544
Message:Modules bugfix with Platform variable change. Removed a few warnings.
Changes:
M/branches/meklort/i386/boot2/graphics.c
M/branches/meklort/i386/modules/GUI/GUI_module.c
M/branches/meklort/i386/modules/KernelPatcher/kernel_patcher.c
M/branches/meklort/i386/modules/Memory/spd.c
M/branches/meklort/i386/modules/Memory/Memory.c
M/branches/meklort/i386/boot2/graphics.h

File differences

branches/meklort/i386/boot2/graphics.c
5555
5656
5757
58
58
5959
6060
6161
// Return the VESA mode that matches the properties specified.␊
// If a mode is not found, then return the "best" available mode.␊
␊
static unsigned short␊
unsigned short␊
getVESAModeWithProperties( unsigned short width,␊
␉␉␉␉␉␉ unsigned short height,␊
␉␉␉␉␉␉ unsigned char bitsPerPixel,␊
branches/meklort/i386/boot2/graphics.h
99
1010
1111
12
1213
13
1414
1515
1616
......
4545
4646
4747
48
49
50
51
52
53
54
55
4856
57
58
4959
␊
#include "boot.h"␊
#include "bootstruct.h"␊
#include "vbe.h"␊
␊
␊
#ifndef __BOOT_GRAPHICS_H␊
#define __BOOT_GRAPHICS_H␊
␊
␉␉␉␉␉␉ unsigned long maxArrayCount );␊
␊
␊
unsigned short␊
getVESAModeWithProperties( unsigned short width,␊
␉␉␉␉␉␉ unsigned short height,␊
␉␉␉␉␉␉ unsigned char bitsPerPixel,␊
␉␉␉␉␉␉ unsigned short attributesSet,␊
␉␉␉␉␉␉ unsigned short attributesClear,␊
␉␉␉␉␉␉ VBEModeInfoBlock * outModeInfo,␊
␉␉␉␉␉␉ unsigned short * vesaVersion );␊
␊
␊
␊
#endif /* !__BOOT_GRAPHICS_H */␊
branches/meklort/i386/modules/GUI/GUI_module.c
4848
4949
5050
51
52
53
54
55
56
57
58
59
60
61
62
5163
5264
5365
......
438450
439451
440452
441
442453
443454
444455
......
454465
455466
456467
457
468
458469
459470
460471
extern char *msgbuf;␊
extern char *cursor;␊
␊
␊
␊
␊
char GUI_bootRescanPrompt[] =␊
"Press Enter to start up Darwin/x86 with no options, or you can:\n"␊
" Press F5 after you swapped the media. The drive will be rescanned.\n"␊
" Type -v and press Enter to start up with diagnostic messages\n"␊
" Type ? and press Enter to learn about advanced startup options\n\n"␊
"boot: ";␊
␊
␊
␊
/**␊
** The kernel is about to start, draw the boot graphics if we are not in␊
** verbose mode.␊
static void GUI_showBootPrompt(int row, bool visible)␊
{␊
␉extern char bootPrompt[];␊
␉extern char bootRescanPrompt[];␊
␉␊
␉if( bootArgs->Video.v_display == VGA_TEXT_MODE )␊
␉{␊
␉␉{␊
␉␉␉if (gEnableCDROMRescan)␊
␉␉␉{␊
␉␉␉␉printf( bootRescanPrompt );␊
␉␉␉␉printf( GUI_bootRescanPrompt );␊
␉␉␉} ␊
␉␉␉else␊
␉␉␉{␊
branches/meklort/i386/modules/KernelPatcher/kernel_patcher.c
279279
280280
281281
282
282
283283
284284
285285
␉␊
␉␊
␉␊
␉UInt32 jumpLocation = 0;␊
␉//UInt32 jumpLocation = 0;␊
␉␊
␉␊
␉if(symbol == 0 || symbol->addr == 0)␊
branches/meklort/i386/modules/Memory/spd.c
7171
7272
7373
74
74
75
76
77
7578
7679
7780
/** Read one byte from the intel i2c, used for reading SPD on intel chipsets only. */␊
unsigned char smb_read_byte_intel(uint32_t base, uint8_t adr, uint8_t cmd)␊
{␊
int l1, h1, l2, h2;␊
int l1 = 0;␊
␉int l2 = 0;␊
␉int h1 = 0;␊
␉int h2 = 0;␊
unsigned long long t;␊
␉␊
outb(base + SMBHSTSTS, 0x1f);␉␉␉␉␉// reset SMBus Controller␊
branches/meklort/i386/modules/Memory/Memory.c
4141
4242
4343
44
45
44
45
4646
4747
␉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);␊
␉scan_memory(Platform); // unfortunately still necesary for some comp where spd cant read correct speed␊
␉scan_spd(Platform);␊
␊
}

Archive Download the corresponding diff file

Revision: 545