From 035e8d01439b2b77501329db1f5f9a1d370f7388 Mon Sep 17 00:00:00 2001 From: Jon Taylor Date: Sat, 21 Aug 1999 22:36:52 +0000 Subject: [PATCH] *** empty log message *** --- src/mesa/drivers/ggi/default/genkgi.conf.in | 4 --- src/mesa/drivers/ggi/default/genkgi.h | 6 ++-- src/mesa/drivers/ggi/default/genkgi_mode.c | 4 +-- src/mesa/drivers/ggi/default/genkgi_visual.c | 32 +++++++++----------- 4 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 src/mesa/drivers/ggi/default/genkgi.conf.in diff --git a/src/mesa/drivers/ggi/default/genkgi.conf.in b/src/mesa/drivers/ggi/default/genkgi.conf.in deleted file mode 100644 index 8b3a25431b6..00000000000 --- a/src/mesa/drivers/ggi/default/genkgi.conf.in +++ /dev/null @@ -1,4 +0,0 @@ -# GGIMesa genkgi helper configuration -.root: @ggi_libdir@/ggi/mesa/default/ - -tgt-fbdev-kgicon-savage4-mesa kgi/savage4.so diff --git a/src/mesa/drivers/ggi/default/genkgi.h b/src/mesa/drivers/ggi/default/genkgi.h index 135c9aeec3d..c5a725cad82 100644 --- a/src/mesa/drivers/ggi/default/genkgi.h +++ b/src/mesa/drivers/ggi/default/genkgi.h @@ -1,10 +1,10 @@ -/* $Id: genkgi.h,v 1.1 1999/08/21 05:59:29 jtaylor Exp $ +/* $Id: genkgi.h,v 1.2 1999/08/21 22:36:52 jtaylor Exp $ ****************************************************************************** GGIMesa - KGIcon specific overrides for fbcon-mesa API header - Copyright (C) 1999 Creative Labs + Copyright (C) 1999 Jon Taylor [taylorj@ggi-project.org] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -28,7 +28,7 @@ #include -#include +#include //ggifunc_setmode GGIMesa_genkgi_setmode; ggifunc_getapi GGIMesa_genkgi_getapi; diff --git a/src/mesa/drivers/ggi/default/genkgi_mode.c b/src/mesa/drivers/ggi/default/genkgi_mode.c index 81cf6c84071..67e0145f705 100644 --- a/src/mesa/drivers/ggi/default/genkgi_mode.c +++ b/src/mesa/drivers/ggi/default/genkgi_mode.c @@ -1,9 +1,9 @@ -/* $Id: genkgi_mode.c,v 1.1 1999/08/21 05:59:29 jtaylor Exp $ +/* $Id: genkgi_mode.c,v 1.2 1999/08/21 22:36:52 jtaylor Exp $ ****************************************************************************** display-fbdev-kgicon-generic-mesa - Copyright (C) 1999 Creative Labs + Copyright (C) 1999 Jon Taylor [taylorj@ggi-project.org] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/mesa/drivers/ggi/default/genkgi_visual.c b/src/mesa/drivers/ggi/default/genkgi_visual.c index 1c90120b3e6..bb23cb4f39e 100644 --- a/src/mesa/drivers/ggi/default/genkgi_visual.c +++ b/src/mesa/drivers/ggi/default/genkgi_visual.c @@ -1,11 +1,9 @@ -/* $Id: genkgi_visual.c,v 1.1 1999/08/21 05:59:29 jtaylor Exp $ +/* $Id: genkgi_visual.c,v 1.2 1999/08/21 22:36:52 jtaylor Exp $ ****************************************************************************** - display-fbdev-mesa-generic-kgi: visual handling - - Copyright (C) 1998 Andrew Apted [andrew@ggi-project.org] - Copyright (C) 1999 Marcus Sundberg [marcus@ggi-project.org] - Copyright (C) 1999 Creative Labs + genkgi_visual.c: visual handling for the generic KGI helper + + Copyright (C) 1999 Jon Taylor [taylorj@ggi-project.org] Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -29,7 +27,7 @@ #include #include -#include +#include #include "genkgi.h" #include @@ -52,16 +50,16 @@ #include -static int refcount = 0; -static int vtnum; -static void *_ggi_fbdev_lock = NULL; -#ifdef FBIOGET_CON2FBMAP -static struct fb_con2fbmap origconmap; -#endif +//static int refcount = 0; +//static int vtnum; +//static void *_ggi_fbdev_lock = NULL; +//#ifdef FBIOGET_CON2FBMAP +//static struct fb_con2fbmap origconmap; +//#endif -#define MAX_DEV_LEN 63 +//#define MAX_DEV_LEN 63 #define DEFAULT_FBNUM 0 - +#if 0 static char accel_prefix[] = "tgt-fbdev-kgicon-"; #define PREFIX_LEN (sizeof(accel_prefix)) @@ -76,7 +74,7 @@ static accel_info accel_strings[] = }; #define NUM_ACCELS (sizeof(accel_strings)/sizeof(accel_info)) - +#endif /* FIXME: These should be defined in the makefile system */ #define CONF_FILE "/usr/local/etc/ggi/mesa/targets/genkgi.conf" void *_configHandle; @@ -143,7 +141,7 @@ int GGIdlinit(ggi_visual *vis, const char *args, void *argptr) * the acceleration type. */ priv->have_accel = 0; -#if 1 +#if 0 if (stat("/proc/savage4", &junk) == 0) { sprintf(priv->accel, "%s%s", accel_prefix, "savage4"); -- 2.30.2