summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon Taylor <[email protected]>1999-08-21 22:46:13 +0000
committerJon Taylor <[email protected]>1999-08-21 22:46:13 +0000
commit14c53fe1d5490b94138ca570890f734641e99dac (patch)
treeb89390ebe823d33f50b3a4c61f773fbc2f58341b /src
parent035e8d01439b2b77501329db1f5f9a1d370f7388 (diff)
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/ggi/default/genkgi.conf.in4
-rw-r--r--src/mesa/drivers/ggi/default/genkgi_visual.c6
-rw-r--r--src/mesa/drivers/ggi/display/fbdev.conf.in4
-rw-r--r--src/mesa/drivers/ggi/display/fbdev_mode.c6
-rw-r--r--src/mesa/drivers/ggi/display/fbdev_visual.c8
5 files changed, 14 insertions, 14 deletions
diff --git a/src/mesa/drivers/ggi/default/genkgi.conf.in b/src/mesa/drivers/ggi/default/genkgi.conf.in
new file mode 100644
index 00000000000..8b3a25431b6
--- /dev/null
+++ b/src/mesa/drivers/ggi/default/genkgi.conf.in
@@ -0,0 +1,4 @@
+# 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_visual.c b/src/mesa/drivers/ggi/default/genkgi_visual.c
index bb23cb4f39e..a1de5ff7c38 100644
--- a/src/mesa/drivers/ggi/default/genkgi_visual.c
+++ b/src/mesa/drivers/ggi/default/genkgi_visual.c
@@ -1,4 +1,4 @@
-/* $Id: genkgi_visual.c,v 1.2 1999/08/21 22:36:52 jtaylor Exp $
+/* $Id: genkgi_visual.c,v 1.3 1999/08/21 22:46:13 jtaylor Exp $
******************************************************************************
genkgi_visual.c: visual handling for the generic KGI helper
@@ -59,7 +59,7 @@
//#define MAX_DEV_LEN 63
#define DEFAULT_FBNUM 0
-#if 0
+
static char accel_prefix[] = "tgt-fbdev-kgicon-";
#define PREFIX_LEN (sizeof(accel_prefix))
@@ -74,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;
diff --git a/src/mesa/drivers/ggi/display/fbdev.conf.in b/src/mesa/drivers/ggi/display/fbdev.conf.in
index 902a8be2ea0..2acb89426f6 100644
--- a/src/mesa/drivers/ggi/display/fbdev.conf.in
+++ b/src/mesa/drivers/ggi/display/fbdev.conf.in
@@ -1,6 +1,4 @@
# GGIMesa fbdev target configuration
.root: @ggi_libdir@/ggi/mesa/default
-tgt-fbdev-kgicon-generic-mesa kgi/genkgi.so
-
-# .include /usr/local/etc/ggi/mesa/genkgi.conf
+tgt-fbdev-kgicon-generic-mesa genkgi.so
diff --git a/src/mesa/drivers/ggi/display/fbdev_mode.c b/src/mesa/drivers/ggi/display/fbdev_mode.c
index 1c882f7f84c..478ad83801c 100644
--- a/src/mesa/drivers/ggi/display/fbdev_mode.c
+++ b/src/mesa/drivers/ggi/display/fbdev_mode.c
@@ -1,9 +1,9 @@
-/* $Id: fbdev_mode.c,v 1.1 1999/08/21 05:57:59 jtaylor Exp $
+/* $Id: fbdev_mode.c,v 1.2 1999/08/21 22:46:13 jtaylor Exp $
******************************************************************************
display-fbdev-mesa
- Copyright (C) 1999 Creative Labs
+ Copyright (C) 1999 Jon Taylor [[email protected]]
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -37,7 +37,7 @@
#include <ggi/internal/ggi-dl.h>
#include <ggi/mesa/ggimesa_int.h>
-#include <ggi/mesa/display/fbdev.h>
+#include <ggi/mesa/display_fbdev.h>
#ifndef MAP_FAILED
#define MAP_FAILED ((void*)-1)
diff --git a/src/mesa/drivers/ggi/display/fbdev_visual.c b/src/mesa/drivers/ggi/display/fbdev_visual.c
index 30ad3402260..60af90412af 100644
--- a/src/mesa/drivers/ggi/display/fbdev_visual.c
+++ b/src/mesa/drivers/ggi/display/fbdev_visual.c
@@ -1,11 +1,9 @@
-/* $Id: fbdev_visual.c,v 1.1 1999/08/21 05:57:59 jtaylor Exp $
+/* $Id: fbdev_visual.c,v 1.2 1999/08/21 22:46:13 jtaylor Exp $
******************************************************************************
display-fbdev-mesa: visual handling
- Copyright (C) 1998 Andrew Apted [[email protected]]
- Copyright (C) 1999 Marcus Sundberg [[email protected]]
- Copyright (C) 1999 Creative Labs
+ Copyright (C) 1999 Jon Taylor [[email protected]]
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 <ggi/internal/ggi-dl.h>
#include <ggi/mesa/ggimesa_int.h>
-#include <ggi/mesa/display/fbdev.h>
+#include <ggi/mesa/display_fbdev.h>
#include <stdio.h>
#include <stdlib.h>