Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build and warnings. Thanks to Jonas for reporting this.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10395 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-12-12 16:19:46 +00:00
parent 34d0fe82c4
commit 71a81208ef
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kernel/apps/cpuinfo/main.c
View File

@ -112,18 +112,18 @@ opt_identify(cpuid_info *info, int vendor_tag)
// the 'vendorid' field of the info struct is not null terminated, // the 'vendorid' field of the info struct is not null terminated,
// so it is copied into a properly terminated local string buffer // so it is copied into a properly terminated local string buffer
memcpy(vendorID, info->eax_0.vendorid, 12); memcpy(vendorID, info->eax_0.vendor_id, 12);
printf("%12s '%s'\n", "Vendor ID:", vendorID); printf("%12s '%s'\n", "Vendor ID:", vendorID);
switch (vendor_tag) { switch (vendor_tag) {
case 'uneG': // "GenuineIntel" case 'uneG': // "GenuineIntel"
Intel_identify(info); Intel_identify(info);
break; break;
case 'htuA': // "AuthenticAMD" case 'htuA': // "AuthenticAMD"
AMD_identify(info); AMD_identify(info);
break; break;
case 'iryC': // "CyrixInstead" case 'iryC': // "CyrixInstead"
Cyrix_identify(info); Cyrix_identify(info);
break; break;
@ -138,11 +138,11 @@ opt_features(cpuid_info *info, int vendor_tag)
case 'uneG': // "GenuineIntel" case 'uneG': // "GenuineIntel"
Intel_features(info); Intel_features(info);
break; break;
case 'htuA': // "AuthenticAMD" case 'htuA': // "AuthenticAMD"
AMD_features(info); AMD_features(info);
break; break;
case 'iryC': // "CyrixInstead" case 'iryC': // "CyrixInstead"
Cyrix_features(info); Cyrix_features(info);
break; break;
@ -157,11 +157,11 @@ opt_TLB_cache(cpuid_info *info, int vendor_tag)
case 'uneG': // "GenuineIntel" case 'uneG': // "GenuineIntel"
Intel_TLB_cache(info); Intel_TLB_cache(info);
break; break;
case 'htuA': // "AuthenticAMD" case 'htuA': // "AuthenticAMD"
AMD_TLB_cache(info); AMD_TLB_cache(info);
break; break;
case 'iryC': // "CyrixInstead" case 'iryC': // "CyrixInstead"
Cyrix_TLB_cache(info); Cyrix_TLB_cache(info);
break; break;
@ -263,8 +263,8 @@ Intel_identify(cpuid_info *info)
if (info->regs.eax & 0x80000000) { if (info->regs.eax & 0x80000000) {
// extended feature/signature bits supported // extended feature/signature bits supported
if (info->regs.eax >= 0x80000004) { if (info->regs.eax >= 0x80000004) {
int i; uint32 i;
printf("\nExtended brand string:\n'"); printf("\nExtended brand string:\n'");
for (i = 0x80000002; i <= 0x80000004; ++i) { for (i = 0x80000002; i <= 0x80000004; ++i) {
get_cpuid(info, i, 0); get_cpuid(info, i, 0);
@ -388,7 +388,7 @@ Intel_TLB_cache(cpuid_info *info)
#define BIT_31_MASK (1 << 31) #define BIT_31_MASK (1 << 31)
int pass, matches; // counters uint32 pass, matches; // counters
uint32 reg; // value of an individual register (eax, ebx, ecx, edx) uint32 reg; // value of an individual register (eax, ebx, ecx, edx)
uint8 db; // descriptor byte uint8 db; // descriptor byte
int indexOf[256] = {0}; // converts descriptor bytes to table indexes int indexOf[256] = {0}; // converts descriptor bytes to table indexes