Chameleon

Chameleon Commit Details

Date:2015-05-22 22:21:34 (8 years 11 months ago)
Author:ErmaC
Commit:2692
Parents: 2691
Message:Typo
Changes:
M/branches/ErmaC/Enoch/i386/libsaio/hda.c
M/branches/ErmaC/Enoch/i386/libsaio/ati.c
M/branches/ErmaC/Enoch/i386/libsaio/biosfn.c
M/branches/ErmaC/Enoch/i386/libsaio/hda.h
M/branches/ErmaC/Enoch/i386/libsaio/gma.c
M/branches/ErmaC/Enoch/i386/boot2/boot.c
M/branches/ErmaC/Enoch/i386/libsaio/nvidia.c
M/branches/ErmaC/Enoch/i386/boot2/boot.h

File differences

branches/ErmaC/Enoch/i386/libsaio/gma.c
462462
463463
464464
465
465
466466
467467
468468
␊
␉model = get_gma_controller_name(device_id, vendor_id);␊
␊
␉verbose("\tClass code: [%04x]\n", gma_dev->class_id);␊
␉verbose("\tClass code: [%04X]\n", gma_dev->class_id);␊
␊
␉verbose("\t%s [%04x:%04x] (rev %02x)\nSubsystem: [%04x:%04x] :: %s\n",␊
␉␉␉model, gma_dev->vendor_id, gma_dev->device_id, gma_dev->revision_id, gma_dev->subsys_id.subsys.vendor_id, gma_dev->subsys_id.subsys.device_id, devicepath);␊
branches/ErmaC/Enoch/i386/libsaio/hda.c
178178
179179
180180
181
181182
182183
183184
......
659660
660661
661662
662
663
663664
664665
665666
␉{ HDA_NVIDIA_GK106,␉"GK106" /*, 0, ? */ },␊
␉{ HDA_NVIDIA_GK107,␉"GK107" /*, 0, ? */ },␊
␉{ HDA_NVIDIA_GK104,␉"GK104" /*, 0, ? */ },␊
␊
␉//1002 Advanced Micro Devices [AMD] nee ATI Technologies Inc␊
␉{ HDA_ATI_SB450,␉"SB4x0" /*, 0, 0 */ },␊
␉{ HDA_ATI_SB600,␉"SB600" /*, 0, 0 */ },␊
␉uint16_t␉controller_device_id = hda_dev->device_id;␊
␉const char␉*value;␊
␊
␉verbose("\tClass code: [%04x]\n", hda_dev->class_id);␊
␉verbose("\tClass code: [%04X]\n", hda_dev->class_id);␊
␊
␉devicepath = get_pci_dev_path(hda_dev);␊
␉controller_name = get_hda_controller_name(controller_device_id, controller_vendor_id);␊
branches/ErmaC/Enoch/i386/libsaio/hda.h
7777
7878
7979
80
81
82
80
81
82
8383
8484
8585
......
441441
442442
443443
444
444445
445446
446447
struct hdacc_codecs;␊
typedef struct␊
{␊
␉uint32_t cid;␊
␉uint16_t revid;␊
␉char *name;␊
␉uint32_t id;␊
␉uint32_t rev;␊
␉const char *name;␊
} hdacc_codecs;␊
*/␊
␊
#define HDA_CODEC_ALC882 HDA_CODEC_CONSTRUCT(REALTEK, 0x0882)␊
#define HDA_CODEC_ALC883 HDA_CODEC_CONSTRUCT(REALTEK, 0x0883)␊
#define HDA_CODEC_ALC885 HDA_CODEC_CONSTRUCT(REALTEK, 0x0885)␊
#define HDA_CODEC_ALC886 HDA_CODEC_CONSTRUCT(REALTEK, 0x0886)␊
#define HDA_CODEC_ALC887 HDA_CODEC_CONSTRUCT(REALTEK, 0x0887)␊
#define HDA_CODEC_ALC888 HDA_CODEC_CONSTRUCT(REALTEK, 0x0888)␊
#define HDA_CODEC_ALC889 HDA_CODEC_CONSTRUCT(REALTEK, 0x0889)␊
branches/ErmaC/Enoch/i386/libsaio/nvidia.c
21132113
21142114
21152115
2116
2116
21172117
21182118
21192119
␉// get card type␊
␉nvCardType = (REG32(0) >> 20) & 0x1ff;␊
␊
␉verbose("\tClass code: [%04x]\n", nvda_dev->class_id);␊
␉verbose("\tClass code: [%04X]\n", nvda_dev->class_id);␊
␊
␉model = get_nvidia_model(((nvda_dev->vendor_id << 16) | nvda_dev->device_id),((nvda_dev->subsys_id.subsys.vendor_id << 16) | nvda_dev->subsys_id.subsys.device_id));␊
␊
branches/ErmaC/Enoch/i386/libsaio/ati.c
16461646
16471647
16481648
1649
1649
16501650
16511651
16521652
//␉static char compatible[64];␊
␉char *devicepath;␊
␊
␉verbose("\tClass code: [%04x]\n", ati_dev->class_id );␊
␉verbose("\tClass code: [%04X]\n", ati_dev->class_id );␊
␊
␉if (!init_card(ati_dev))␊
␉{␊
branches/ErmaC/Enoch/i386/libsaio/biosfn.c
4545
4646
4747
48
48
4949
5050
51
51
5252
5353
5454
......
136136
137137
138138
139
139
140140
141141
142142
......
207207
208208
209209
210
210
211211
212212
213213
......
279279
280280
281281
282
282
283283
284284
285285
␊
␊
#ifndef DEBUG_MEMRANGE␊
␉#define DEBUG_MEMRANGE 1␊
␉#define MEMRANGE 1␊
#endif␊
␊
#if DEBUG_MEMRANGE␊
#if MEMRANGE␊
␉#define DBG(x...)␉printf(x)␊
#else␊
␉#define DBG(x...)␉msglog(x)␊
#endif␊
}␊
␊
#if DEBUG_MEMRANGE␊
#if MEMRANGE␊
␊
static unsigned long rerangeMemoryMap(unsigned long count);␊
static unsigned long rerangeMemoryMap(unsigned long count)␊
␊
␉MemoryRange *␉range = (MemoryRange *)BIOS_ADDR;␊
␉unsigned long␉count = 0;␊
#if DEBUG_MEMRANGE␊
#if MEMRANGE␊
␉unsigned long␉rerangedCount;␊
#endif␊
␉unsigned long long␉conMemSize = 0;␊
␉*conMemSizePtr = conMemSize / 1024; // size in KB␊
␉*extMemSizePtr = extMemSize / 1024; // size in KB␊
␊
#if DEBUG_MEMRANGE␊
#if MEMRANGE␊
␉rerangedCount = rerangeMemoryMap(count);␊
␉range += rerangedCount - count;␊
#endif␊
branches/ErmaC/Enoch/i386/boot2/boot.c
640640
641641
642642
643
643
644
644645
645646
646647
␉␉␉}␊
␉␉}␊
␊
␉␉if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {␊
␉␉if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig))␊
␉␉{␊
␉␉␉if (strncmp(val, "i386", sizeof("i386") ) == 0)␊
␉␉␉{␊
␉␉␉␉archCpuType = CPU_TYPE_I386;␊
branches/ErmaC/Enoch/i386/boot2/boot.h
8585
8686
8787
88
88
8989
9090
9191
#define kScanSingleDriveKey␉␉"Scan Single Drive"␊
#define kInstantMenuKey␉␉␉"Instant Menu"␊
#define kDefaultKernel␉␉␉"mach_kernel"␊
#define kOSXKernel␉␉␉"kernel"␉␉// Yosemite␊
#define kOSXKernel␉␉␉"kernel"␉␉// Yosemite+␊
#define kGUIKey␉␉␉␉"GUI"␊
#define kBootBannerKey␉␉␉"Boot Banner"␊
#define kShowInfoKey␉␉␉"ShowInfo"␉␉// gui.c␊

Archive Download the corresponding diff file

Revision: 2692