From de69ef37bb227f2460fb8f1866c28d3e215fef5d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Dec 2005 23:12:49 +0000 Subject: [PATCH] Added a good deal of "#ifdef __INTEL__"s to allow compilation on PPC. As one of the TODOs already says, the architecture specific parts should be factored out into separate source files. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15480 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/sysinfo.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/bin/sysinfo.c b/src/bin/sysinfo.c index ee68d1b2b1..b2cd7e8e67 100644 --- a/src/bin/sysinfo.c +++ b/src/bin/sysinfo.c @@ -17,6 +17,7 @@ // ToDo: -disable_cpu_sn option is not yet implemented // ToDo: most of this file should go into an architecture dependent source file +#ifdef __INTEL__ struct cache_description { uint8 code; @@ -115,6 +116,8 @@ print_intel_cache_descriptors(enum cpu_types type, cpuid_info *info) } } +#endif // __INTEL__ + static void print_TLB(uint32 reg, const char *pages) @@ -178,6 +181,8 @@ print_level1_cache(uint32 reg, const char *name) } +#ifdef __INTEL__ + static void print_cache_descriptors(int32 cpu) { @@ -205,6 +210,8 @@ print_transmeta_features(uint32 features) printf("\t\tFCMOV\n"); } +#endif // __INTEL__ + static void print_amd_power_management_features(uint32 features) @@ -321,6 +328,8 @@ print_features(uint32 features) } +#ifdef __INTEL__ + static void print_processor_signature(cpuid_info *info, const char *prefix) { @@ -333,6 +342,8 @@ print_processor_signature(cpuid_info *info, const char *prefix) info->eax_1.features); } +#endif // __INTEL__ + static void dump_platform(system_info *info) @@ -344,6 +355,8 @@ dump_platform(system_info *info) } +#ifdef __INTEL__ + static void dump_cpu(system_info *info, int32 cpu) { @@ -474,6 +487,8 @@ dump_cpu(system_info *info, int32 cpu) putchar('\n'); } +#endif // __INTEL__ + static void dump_cpus(system_info *info) @@ -492,8 +507,10 @@ dump_cpus(system_info *info) info->cpu_clock_speed / 1000000, info->id[0], info->id[1]); +#ifdef __INTEL__ for (cpu = 0; cpu < info->cpu_count; cpu++) dump_cpu(info, cpu); +#endif // __INTEL__ }