From 48f09a2bd2245ba29eef787174544655a0073889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 23 May 2006 19:04:55 +0000 Subject: [PATCH] Removed the BeOS specific perfmon_kernel.h header - Haiku's kernel doesn't export those functions. The log_coll stuff now uses system_time() instead if enabled - that should be good enough. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17567 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../private/graphics/common/perfmon_kernel.h | 36 ------------------- .../kernel/drivers/graphics/common/log_coll.c | 12 +++---- 2 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 headers/private/graphics/common/perfmon_kernel.h diff --git a/headers/private/graphics/common/perfmon_kernel.h b/headers/private/graphics/common/perfmon_kernel.h deleted file mode 100644 index bffed0080c..0000000000 --- a/headers/private/graphics/common/perfmon_kernel.h +++ /dev/null @@ -1,36 +0,0 @@ -/* ++++++++++ - File: perfmon_kernel.h - Description: kernel mode interface to performance counters and time stamp - registers of 586 and 686 CPUs - - DO NOT use these functions in the production code !!! - This interface WILL BE CHANGED in the next releases. - - Copyright (c) 1998 by Be Incorporated. All Rights Reserved. -+++++ */ - - -#ifndef _PERFMON_KERNEL_H -#define _PERFMON_KERNEL_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#if __INTEL__ - -extern _IMPEXP_KERNEL uint64 read_msr(uint32 msr); -extern _IMPEXP_KERNEL void write_msr(uint32 msr, uint64 val); -extern _IMPEXP_KERNEL uint64 read_pmc(uint32 pmc); -extern _IMPEXP_KERNEL uint64 read_tsc(void); - -#endif - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/add-ons/kernel/drivers/graphics/common/log_coll.c b/src/add-ons/kernel/drivers/graphics/common/log_coll.c index 811e749e50..f9dec1e79f 100644 --- a/src/add-ons/kernel/drivers/graphics/common/log_coll.c +++ b/src/add-ons/kernel/drivers/graphics/common/log_coll.c @@ -1,21 +1,21 @@ /* Copyright (c) 2002, Thomas Kurschel - Part of Radeon driver - + Both kernel and user space part. (init and clean-up must be done in kernel space). */ +#include "log_coll.h" + #include +#include + #include #include -#include -#include "log_coll.h" -#include #include typedef struct log_info_t { @@ -47,7 +47,7 @@ void log( log_info *li, uint16 what, const uint8 num_args, ... ) entry = (log_entry *)&li->log_buffer[pos]; - entry->tsc = read_tsc(); + entry->tsc = system_time(); entry->what = what; entry->num_args = num_args;