diff options
author | Jon Taylor <taylorj@ggi-project.org> | 2000-01-07 08:34:43 +0000 |
---|---|---|
committer | Jon Taylor <taylorj@ggi-project.org> | 2000-01-07 08:34:43 +0000 |
commit | c6c06c92b2b85cd0401fd107c825829a39d186be (patch) | |
tree | f164cb8deabb86838e59193b495e68201346a80b /src/mesa/drivers/ggi/display | |
parent | 3c3533c5c8070fcca25247945cebedea60616082 (diff) |
* Fixups to the GGIMesa code to reflect the recent DD API changes
* Added a new GGIMesa debugging-print subsystem
Diffstat (limited to 'src/mesa/drivers/ggi/display')
-rw-r--r-- | src/mesa/drivers/ggi/display/fbdev_mode.c | 11 | ||||
-rw-r--r-- | src/mesa/drivers/ggi/display/fbdev_visual.c | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/mesa/drivers/ggi/display/fbdev_mode.c b/src/mesa/drivers/ggi/display/fbdev_mode.c index 6815e5f198..f7f8f0b7fe 100644 --- a/src/mesa/drivers/ggi/display/fbdev_mode.c +++ b/src/mesa/drivers/ggi/display/fbdev_mode.c @@ -1,4 +1,4 @@ -/* $Id: fbdev_mode.c,v 1.3 1999/08/22 08:56:50 jtaylor Exp $ +/* $Id: fbdev_mode.c,v 1.4 2000/01/07 08:34:44 jtaylor Exp $ ****************************************************************************** display-fbdev-mesa @@ -38,6 +38,7 @@ #include <ggi/internal/ggi-dl.h> #include <ggi/mesa/ggimesa_int.h> #include <ggi/mesa/display_fbdev.h> +#include <ggi/mesa/debug.h> #ifndef MAP_FAILED #define MAP_FAILED ((void*)-1) @@ -86,7 +87,7 @@ static int do_setmode(ggi_visual *vis) return GGI_EFATAL; } - gl_ggiDEBUG("Success in loading %s (%s)\n", libname, libargs); + GGIMESADPRINT_CORE("Success in loading %s (%s)\n", libname, libargs); } if (priv->oldpriv->accel && @@ -101,7 +102,7 @@ static int do_setmode(ggi_visual *vis) ggiIndicateChange(vis, GGI_CHG_APILIST); - gl_ggiDEBUG("display-fbdev-mesa: do_setmode SUCCESS\n"); + GGIMESADPRINT_CORE("display-fbdev-mesa: do_setmode SUCCESS\n"); return 0; } @@ -115,7 +116,7 @@ int GGIMesa_fbdev_setmode(ggi_visual *vis, ggi_mode *mode) return err; } - gl_ggiDEBUG("display-fbdev-mesa: setmode %dx%d#%dx%dF%d[0x%02x]\n", + GGIMESADPRINT_CORE("display-fbdev-mesa: setmode %dx%d#%dx%dF%d[0x%02x]\n", mode->visible.x, mode->visible.y, mode->virt.x, mode->virt.y, mode->frames, mode->graphtype); @@ -128,7 +129,7 @@ int GGIMesa_fbdev_setmode(ggi_visual *vis, ggi_mode *mode) return err; } - gl_ggiDEBUG("display-fbdev-mesa: setmode success.\n"); + GGIMESADPRINT_CORE("display-fbdev-mesa: setmode success.\n"); return 0; } diff --git a/src/mesa/drivers/ggi/display/fbdev_visual.c b/src/mesa/drivers/ggi/display/fbdev_visual.c index 3723dc6a45..8a375da66b 100644 --- a/src/mesa/drivers/ggi/display/fbdev_visual.c +++ b/src/mesa/drivers/ggi/display/fbdev_visual.c @@ -1,4 +1,4 @@ -/* $Id: fbdev_visual.c,v 1.4 1999/08/24 02:03:34 jtaylor Exp $ +/* $Id: fbdev_visual.c,v 1.5 2000/01/07 08:34:44 jtaylor Exp $ ****************************************************************************** display-fbdev-mesa: visual handling @@ -28,6 +28,7 @@ #include <ggi/internal/ggi-dl.h> #include <ggi/mesa/ggimesa_int.h> #include <ggi/mesa/display_fbdev.h> +#include <ggi/mesa/debug.h> #include <stdio.h> #include <stdlib.h> @@ -105,8 +106,7 @@ static int changed(ggi_visual_t vis, int whatchanged) int GGIdlinit(ggi_visual *vis, const char *args, void *argptr) { struct fbdev_priv_mesa *priv; - char libname[256], libargs[256]; - int id, err; + int err; ggifunc_getapi *oldgetapi; GGIMESA_PRIVATE(vis) = priv = malloc(sizeof(struct fbdev_priv_mesa)); @@ -115,12 +115,12 @@ int GGIdlinit(ggi_visual *vis, const char *args, void *argptr) return GGI_DL_ERROR; } - priv->oldpriv = LIBGGI_PRIVATE(vis); // Hook back + priv->oldpriv = LIBGGI_PRIVATE(vis); /* Hook back */ err = ggLoadConfig(conffile, &_configHandle); if (err != GGI_OK) { - gl_ggiPrint("display-fbdev: Couldn't open %s\n", conffile); + GGIMESADPRINT_CORE("display-fbdev: Couldn't open %s\n", conffile); return err; } |