Chameleon Commit Details - 205 - Chameleon open source boot loader project.

Date:

2010-07-23 11:23:59 (13 years 8 months ago)

Author:

Kabyl

Commit:

205

Parents:

204

Message:

support for more CPU models, usb_loop() runs before the wait for a key

Changes:

M	/trunk/i386/boot2/boot.c
M	/trunk/i386/libsaio/cpu.c

File differences

-166
167 167
168 168
169 
169
170
170 171
171 172
172 173
+␉if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ((p->CPU.Family == 0x06) || (p->CPU.Family == 0x0f))) {␊
␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0c) || (p->CPU.Family == 0x0f && p->CPU.Model >= 0x03)) {␊
␉␉␉/* Nehalem CPU model */␊
␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == 0x1a || p->CPU.Model == 0x1e)) {␊
␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == 0x1a || p->CPU.Model == 0x1e␊
␉␉␉ || p->CPU.Model == 0x1f || p->CPU.Model == 0x25 || p->CPU.Model == 0x2c)) {␊
␉␉␉␉msr = rdmsr64(MSR_PLATFORM_INFO);␊
␉␉␉␉DBG("msr(%d): platform_info %08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉currcoef = (msr >> 8) & 0xff;␊
 ␉if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ((p->CPU.Family == 0x06) || (p->CPU.Family == 0x0f))) {␊
 ␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0c) || (p->CPU.Family == 0x0f && p->CPU.Model >= 0x03)) {␊
 ␉␉␉/* Nehalem CPU model */␊
-␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == 0x1a || p->CPU.Model == 0x1e)) {␊
+␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == 0x1a || p->CPU.Model == 0x1e␊
+␉␉␉ || p->CPU.Model == 0x1f || p->CPU.Model == 0x25 || p->CPU.Model == 0x2c)) {␊
 ␉␉␉␉msr = rdmsr64(MSR_PLATFORM_INFO);␊
 ␉␉␉␉DBG("msr(%d): platform_info %08x\n", __LINE__, msr & 0xffffffff);␊
 ␉␉␉␉currcoef = (msr >> 8) & 0xff;␊

-174
175 175
176 176
177
178
177 179
178 180
179 181
180 182
181 183
182 184
183 
184 
185 185
186 186
187 187
+        }␊
    }␊
␊
␉usb_loop();␊
␊
    bool dummyVal;␊
␉if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) {␊
␉␉printf("Press any key to continue...");␊
␉␉getc();␊
␉}␊
␊
␉usb_loop();␊
␊
    // If we were in text mode, switch to graphics mode.␊
    // This will draw the boot graphics unless we are in␊
    // verbose mode.␊
         }␊
     }␊
 ␊
+␉usb_loop();␊
+␊
     bool dummyVal;␊
 ␉if (getBoolForKey(kWaitForKeypressKey, &dummyVal, &bootInfo->bootConfig) && dummyVal) {␊
 ␉␉printf("Press any key to continue...");␊
 ␉␉getc();␊
 ␉}␊
 ␊
-␉usb_loop();␊
-␊
     // If we were in text mode, switch to graphics mode.␊
     // This will draw the boot graphics unless we are in␊
     // verbose mode.␊