Chameleon

Chameleon Commit Details

Date:2015-01-24 16:59:16 (4 years 5 months ago)
Author:ErmaC
Commit:2546
Parents: 2545
Message:Typo
Changes:
M/trunk/i386/boot2/boot.c
M/trunk/i386/libsaio/cpu.c
M/trunk/i386/libsaio/platform.h

File differences

trunk/i386/libsaio/cpu.c
654654
655655
656656
657
657
658658
659659
660660
......
664664
665665
666666
667
667
668668
669669
670670
671671
672672
673
673
674674
675675
676676
......
688688
689689
690690
691
691
692692
693693
694694
......
696696
697697
698698
699
699
700700
701701
702702
......
773773
774774
775775
776
777
778
776
777
778
779779
780
781
780
781
782782
783
783
784784
785785
786786
......
788788
789789
790790
791
792
791
792
793793
794794
795795
break;
}
}
/* Mobile CPU */
// Mobile CPU
if (rdmsr64(MSR_IA32_PLATFORM_ID) & (1<<28))
{
p->CPU.Features |= CPU_FEATURE_MOBILE;
{
switch(p->CPU.ExtFamily)
{
case 0x00: /* K8 */
case 0x00: //* K8 *//
msr = rdmsr64(K8_FIDVID_STATUS);
maxcoef = bitfield(msr, 21, 16) / 2 + 4;
currcoef = bitfield(msr, 5, 0) / 2 + 4;
break;
case 0x01: /* K10 */
case 0x01: //* K10 *//
msr = rdmsr64(K10_COFVID_STATUS);
do_cpuid2(0x00000006, 0, p->CPU.CPUID[CPUID_6]);
// EffFreq: effective frequency interface
break;
case 0x05: /* K14 */
case 0x05: //* K14 *//
msr = rdmsr64(K10_COFVID_STATUS);
currcoef = (bitfield(msr, 54, 49) + 0x10) << 2;
currdiv = (bitfield(msr, 8, 4) + 1) << 2;
break;
case 0x02: /* K11 */
case 0x02: //* K11 *//
// not implimented
break;
}
DBG("\n---------------------------------------------\n");
DBG("------------------ CPU INFO -----------------\n");
DBG("---------------------------------------------\n");
DBG("Brand String: %s\n",p->CPU.BrandString); // Processor name (BIOS)
DBG("Vendor: 0x%x\n",p->CPU.Vendor); // Vendor ex: GenuineIntel
DBG("Family: 0x%x\n",p->CPU.Family); // Family ex: 6 (06h)
DBG("Brand String: %s\n",p->CPU.BrandString);// Processor name (BIOS)
DBG("Vendor: 0x%x\n",p->CPU.Vendor);// Vendor ex: GenuineIntel
DBG("Family: 0x%x\n",p->CPU.Family);// Family ex: 6 (06h)
DBG("ExtFamily: 0x%x\n",p->CPU.ExtFamily);
DBG("Signature: %x\n",p->CPU.Signature); // CPUID signature
DBG("Model: 0x%x\n",p->CPU.Model); // Model ex: 37 (025h)
DBG("Signature: %x\n",p->CPU.Signature);// CPUID signature
DBG("Model: 0x%x\n",p->CPU.Model);// Model ex: 37 (025h)
DBG("ExtModel: 0x%x\n",p->CPU.ExtModel);
DBG("Stepping: 0x%x\n",p->CPU.Stepping); // Stepping ex: 5 (05h)
DBG("Stepping: 0x%x\n",p->CPU.Stepping);// Stepping ex: 5 (05h)
DBG("MaxCoef: 0x%x\n",p->CPU.MaxCoef);
DBG("CurrCoef: 0x%x\n",p->CPU.CurrCoef);
DBG("MaxDiv: 0x%x\n",p->CPU.MaxDiv);
DBG("TSCFreq: %dMHz\n",p->CPU.TSCFrequency / 1000000);
DBG("FSBFreq: %dMHz\n",p->CPU.FSBFrequency / 1000000);
DBG("CPUFreq: %dMHz\n",p->CPU.CPUFrequency / 1000000);
DBG("Cores: %d\n",p->CPU.NoCores); // Cores
DBG("Logical processor: %d\n",p->CPU.NoThreads); // Logical procesor
DBG("Cores: %d\n",p->CPU.NoCores);// Cores
DBG("Logical processor: %d\n",p->CPU.NoThreads);// Logical procesor
DBG("Features: 0x%08x\n",p->CPU.Features);
DBG("\n---------------------------------------------\n");
trunk/i386/libsaio/platform.h
8888
8989
9090
91
91
9292
93
93
9494
9595
9696
#define CPU_FEATURE_MSR0x00000200// MSR Support
/* SMBIOS Memory Types */
#define SMB_MEM_TYPE_UNDEFINED0
#define SMB_MEM_TYPE_UNDEFINED0
#define SMB_MEM_TYPE_OTHER1
#define SMB_MEM_TYPE_UNKNOWN2
#define SMB_MEM_TYPE_UNKNOWN2
#define SMB_MEM_TYPE_DRAM3
#define SMB_MEM_TYPE_EDRAM4
#define SMB_MEM_TYPE_VRAM5
trunk/i386/boot2/boot.c
7272
7373
7474
75
75
76
77
78
79
7680
7781
7882
......
8185
8286
8387
84
88
89
8590
8691
87
8892
93
94
95
96
8997
9098
9199
*/
#define kBootErrorTimeout 5
boolgOverrideKernel, gEnableCDROMRescan, gScanSingleDrive, useGUI;
boolgOverrideKernel;
boolgEnableCDROMRescan;
boolgScanSingleDrive;
booluseGUI;
static boolgUnloadPXEOnExit = false;
static chargCacheNameAdler[64 + 256];
chargRootDevice[ROOT_DEVICE_SIZE];
chargMKextName[512];
chargMacOSVersion[8];
intbvCount = 0, gDeviceCount = 0;
intbvCount = 0;
intgDeviceCount = 0;
//intmenucount = 0;
longgBootMode; /* defaults to 0 == kBootModeNormal */
BVRefbvr, menuBVR, bvChain;
BVRefbvr;
BVRefmenuBVR;
BVRefbvChain;
static unsigned longAdler32(unsigned char *buffer, long length);
//static voidselectBiosDevice(void);

Archive Download the corresponding diff file

Revision: 2546