i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libroot: Avoid conflicts with legacy CPU and platform enums

Browse Source
This commit is contained in:
Pawel Dziepak
2014-01-20 00:32:57 +01:00
parent 32d1afe024
commit 25dcdbc2b5
1 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/os/system_info.cpp
+5 -35
View File
@@ -18,39 +18,9 @@
#if _BEOS_R5_COMPATIBLE_ #if _BEOS_R5_COMPATIBLE_
enum cpu_type { #define LEGACY_B_CPU_X86 15
B_CPU_PPC_601 = 1,
B_CPU_PPC_603 = 2,
B_CPU_PPC_603e = 3,
B_CPU_PPC_604 = 4,
B_CPU_PPC_604e = 5,
B_CPU_PPC_686 = 13,
B_CPU_AMD_29K,
B_CPU_X86,
B_CPU_MC6502,
B_CPU_Z80,
B_CPU_ALPHA,
B_CPU_MIPS,
B_CPU_HPPA,
B_CPU_M68K,
B_CPU_ARM,
B_CPU_SH,
B_CPU_SPARC
};
enum platform_type { #define LEGACY_B_AT_CLONE_PLATFORM 2
B_BEBOX_PLATFORM = 0,
B_MAC_PLATFORM,
B_AT_CLONE_PLATFORM,
B_ENIAC_PLATFORM,
B_APPLE_II_PLATFORM,
B_CRAY_PLATFORM,
B_LISA_PLATFORM,
B_TI_994A_PLATFORM,
B_TIMEX_SINCLAIR_PLATFORM,
B_ORAC_1_PLATFORM,
B_HAL_PLATFORM
};
typedef struct { typedef struct {
bigtime_t active_time; /* usec of doing useful work since boot */ bigtime_t active_time; /* usec of doing useful work since boot */
@@ -117,8 +87,8 @@ _get_system_info(legacy_system_info* info, size_t size)
for (int32 i = 0; i < info->cpu_count; i++) for (int32 i = 0; i < info->cpu_count; i++)
info->cpu_infos[i].active_time = cpuInfos[i].active_time; info->cpu_infos[i].active_time = cpuInfos[i].active_time;
info->platform_type = B_AT_CLONE_PLATFORM; info->platform_type = LEGACY_B_AT_CLONE_PLATFORM;
info->cpu_type = B_CPU_X86; info->cpu_type = LEGACY_B_CPU_X86;
uint32 topologyNodeCount = 0; uint32 topologyNodeCount = 0;
cpu_topology_node_info* topology = NULL; cpu_topology_node_info* topology = NULL;
@@ -173,7 +143,7 @@ _get_system_info(legacy_system_info* info, size_t size)
} }
#endif #endif // _BEOS_R5_COMPATIBLE_
status_t status_t