From 1aa28b3fe398f083f73d805a6eb004b3eed02aae Mon Sep 17 00:00:00 2001 From: Jon Smirl Date: Tue, 21 Oct 2003 06:26:05 +0000 Subject: Clean out some unused files --- src/mesa/drivers/dri/common/hwlog.c | 142 ------------------------------------ src/mesa/drivers/dri/common/hwlog.h | 101 ------------------------- 2 files changed, 243 deletions(-) delete mode 100644 src/mesa/drivers/dri/common/hwlog.c delete mode 100644 src/mesa/drivers/dri/common/hwlog.h (limited to 'src/mesa/drivers/dri/common') diff --git a/src/mesa/drivers/dri/common/hwlog.c b/src/mesa/drivers/dri/common/hwlog.c deleted file mode 100644 index ff6e7d92119..00000000000 --- a/src/mesa/drivers/dri/common/hwlog.c +++ /dev/null @@ -1,142 +0,0 @@ -/* - * GLX Hardware Device Driver common code - * - * Based on the original MGA G200 driver (c) 1999 Wittawat Yamwong - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * - * Wittawat Yamwong - */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.c,v 1.3 2001/08/18 02:51:03 dawes Exp $ */ - -#include "hwlog.h" -hwlog_t hwlog = { 0,0,0, "[???] "}; - - -/* Should be shared, but is this a good place for it? - */ -#include -#include - - -int usec( void ) -{ - struct timeval tv; - struct timezone tz; - - gettimeofday( &tv, &tz ); - - return (tv.tv_sec & 2047) * 1000000 + tv.tv_usec; -} - - -#ifdef HW_LOG_ENABLED -int hwOpenLog(const char *filename, char *prefix) -{ - hwCloseLog(); - hwSetLogLevel(0); - hwlog.prefix=prefix; - if (!filename) - return -1; - if ((hwlog.file = fopen(filename,"w")) == NULL) - return -1; - return 0; -} - -void hwCloseLog() -{ - if (hwlog.file) { - fclose(hwlog.file); - hwlog.file = NULL; - } -} - -int hwIsLogReady() -{ - return (hwlog.file != NULL); -} - -void hwSetLogLevel(int level) -{ - hwlog.level = level; -} - -int hwGetLogLevel() -{ - return hwlog.level; -} - -void hwLog(int level, const char *format, ...) -{ - va_list ap; - va_start(ap,format); - hwLogv(level,format,ap); - va_end(ap); -} - -void hwLogv(int l, const char *format, va_list ap) -{ - if (hwlog.file && (l <= hwlog.level)) { - vfprintf(hwlog.file,format,ap); - fflush(hwlog.file); - } -} - -void hwMsg(int l, const char *format, ...) -{ - va_list ap; - va_start(ap, format); - - if (l <= hwlog.level) { - if (hwIsLogReady()) { - int t = usec(); - - hwLog(l, "%6i:", t - hwlog.timeTemp); - hwlog.timeTemp = t; - hwLogv(l, format, ap); - } else { - fprintf(stderr, hwlog.prefix); - vfprintf(stderr, format, ap); - } - } - - va_end(ap); -} - -#else /* ifdef HW_LOG_ENABLED */ - -int hwlogdummy() -{ - return 0; -} - -#endif - -void hwError(const char *format, ...) -{ - va_list ap; - va_start(ap, format); - - fprintf(stderr, hwlog.prefix); - vfprintf(stderr, format, ap); - hwLogv(0, format, ap); - - va_end(ap); -} diff --git a/src/mesa/drivers/dri/common/hwlog.h b/src/mesa/drivers/dri/common/hwlog.h deleted file mode 100644 index 6c5a185552b..00000000000 --- a/src/mesa/drivers/dri/common/hwlog.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * GLX Hardware Device Driver common code - * - * Based on the original MGA G200 driver (c) 1999 Wittawat Yamwong - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * WITTAWAT YAMWONG, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * - * Wittawat Yamwong - */ -/* $XFree86: xc/lib/GL/mesa/src/drv/common/hwlog.h,v 1.5 2001/10/31 23:22:57 tsi Exp $ */ - -/* Usage: - * - use mgaError for error messages. Always write to X error and log file. - * - use mgaMsg for debugging. Can be disabled by undefining MGA_LOG_ENABLED. - */ - -#ifndef HWLOG_INC -#define HWLOG_INC - - -#include -#include - -#define DBG_LEVEL_BASE 1 -#define DBG_LEVEL_VERBOSE 10 -#define DBG_LEVEL_ENTEREXIT 20 - -typedef struct -{ - FILE *file; - int level; - unsigned int timeTemp; - char *prefix; -} hwlog_t; - -extern hwlog_t hwlog; - - -#ifdef HW_LOG_ENABLED - -/* open and close log file. */ -int hwOpenLog(const char *filename, char *prefix); -void hwCloseLog(void); - -/* return 1 if log file is succesfully opened */ -int hwIsLogReady(void); - -/* set current log level to 'level'. Messages with level less than or equal - the current log level will be written to the log file. */ -void hwSetLogLevel(int level); -int hwGetLogLevel(void); - -/* hwLog and hwLogv write a message to the log file. */ -/* do not call these directly, use hwMsg() instead */ -void hwLog(int level, const char *format, ...); -void hwLogv(int level, const char *format, va_list ap); - -int usec( void ); - -/* hwMsg writes a message to the log file or to the standard X error file. */ -void hwMsg(int level, const char *format, ...); - - -#else - - -static __inline__ int hwOpenLog(const char *f, char *prefix) { hwlog.prefix=prefix; return -1; } -#define hwIsLogReady() (0) -#define hwGetLogLevel() (-1) -#define hwLogLevel(n) (0) -#define hwLog() -#define hwMsg() - -#define hwCloseLog() -#define hwSetLogLevel(x) -#define hwLogv(l,f,a) - - -#endif - -void hwError(const char *format, ...); - - -#endif -- cgit v1.2.3