From 4aa00e84e1e5ae9cb54999575faf4b77eb86d9cf Mon Sep 17 00:00:00 2001
From: "ol.sc" <ol.sc@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Mon, 2 May 2011 10:38:48 +0000
Subject: [PATCH] Removed tgi_load() and all corresponding infrastructure. The
 idea behind tgi_load() was to be able to describe a TGI mode in a
 target-neutral way by resolution and colordepth. However it turned out that
 there arn't any cc65 targets sharing any resolution. As a result the only
 working target-independent approach for a TGI program is to call
 tgi_loaddriver(tgi_stddrv); and then look up the resolution provided - and to
 adapt to that resolution.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5016 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 asminc/tgi-kernel.inc              |  1 -
 asminc/tgi-mode.inc                | 65 ------------------------------
 doc/funcref.sgml                   | 26 +-----------
 include/tgi.h                      | 17 +-------
 include/tgi/tgi-mode.h             | 61 ----------------------------
 libsrc/apple2/Makefile             |  2 +-
 libsrc/apple2/apple2-280-192-8.s   |  1 -
 libsrc/apple2/apple2-40-48-16.s    |  1 -
 libsrc/apple2/tgi_mode_table.s     | 28 -------------
 libsrc/apple2/tgi_stddrv.s         | 18 +++++++++
 libsrc/apple2enh/Makefile          |  2 +-
 libsrc/atari/Makefile              |  2 +-
 libsrc/atari/atari-10.s            |  1 -
 libsrc/atari/atari-10p2.s          |  1 -
 libsrc/atari/atari-11.s            |  1 -
 libsrc/atari/atari-14.s            |  1 -
 libsrc/atari/atari-15.s            |  1 -
 libsrc/atari/atari-15p2.s          |  1 -
 libsrc/atari/atari-3.s             |  1 -
 libsrc/atari/atari-4.s             |  1 -
 libsrc/atari/atari-5.s             |  1 -
 libsrc/atari/atari-6.s             |  1 -
 libsrc/atari/atari-7.s             |  1 -
 libsrc/atari/atari-8.s             |  1 -
 libsrc/atari/atari-8p2.s           |  1 -
 libsrc/atari/atari-9.s             |  1 -
 libsrc/atari/atari-9p2.s           |  1 -
 libsrc/atari/tgi_mode_table.s      | 38 -----------------
 libsrc/atari/tgi_stddrv.s          | 13 ++++++
 libsrc/atmos/atmos-240-200-2.s     |  1 -
 libsrc/c128/Makefile               |  2 +-
 libsrc/c128/c128-640-200-2.s       |  1 -
 libsrc/c128/c128-640-480-2.s       |  1 -
 libsrc/c128/tgi_mode_table.s       | 23 -----------
 libsrc/c128/tgi_stddrv.s           | 13 ++++++
 libsrc/c64/Makefile                |  2 +-
 libsrc/c64/c64-320-200-2.s         |  1 -
 libsrc/c64/tgi_mode_table.s        | 24 -----------
 libsrc/c64/tgi_stddrv.s            | 13 ++++++
 libsrc/geos/devel/Makefile         |  2 +-
 libsrc/geos/devel/geos-tgi.s       |  1 -
 libsrc/geos/devel/tgi_mode_table.s | 24 -----------
 libsrc/geos/devel/tgi_stddrv.s     | 13 ++++++
 libsrc/lynx/lynx-160-102-16.s      |  1 -
 libsrc/tgi/Makefile                |  3 --
 libsrc/tgi/tgi_load.c              | 63 -----------------------------
 libsrc/tgi/tgi_stddrv.s            | 11 -----
 libsrc/tgi/tgi_stdmode.s           | 11 -----
 48 files changed, 78 insertions(+), 422 deletions(-)
 delete mode 100644 asminc/tgi-mode.inc
 delete mode 100644 include/tgi/tgi-mode.h
 delete mode 100644 libsrc/apple2/tgi_mode_table.s
 create mode 100644 libsrc/apple2/tgi_stddrv.s
 delete mode 100644 libsrc/atari/tgi_mode_table.s
 create mode 100644 libsrc/atari/tgi_stddrv.s
 delete mode 100644 libsrc/c128/tgi_mode_table.s
 create mode 100644 libsrc/c128/tgi_stddrv.s
 delete mode 100644 libsrc/c64/tgi_mode_table.s
 create mode 100644 libsrc/c64/tgi_stddrv.s
 delete mode 100644 libsrc/geos/devel/tgi_mode_table.s
 create mode 100644 libsrc/geos/devel/tgi_stddrv.s
 delete mode 100644 libsrc/tgi/tgi_load.c
 delete mode 100644 libsrc/tgi/tgi_stddrv.s
 delete mode 100644 libsrc/tgi/tgi_stdmode.s

diff --git a/asminc/tgi-kernel.inc b/asminc/tgi-kernel.inc
index 76f96f135..5bca0b630 100644
--- a/asminc/tgi-kernel.inc
+++ b/asminc/tgi-kernel.inc
@@ -204,7 +204,6 @@ TGI_CLIP_TOP            = $08
         .global _tgi_ioctl
         .global _tgi_line
         .global _tgi_lineto
-        .global _tgi_load
         .global _tgi_load_driver
         .global _tgi_outtext
         .global _tgi_outtextxy
diff --git a/asminc/tgi-mode.inc b/asminc/tgi-mode.inc
deleted file mode 100644
index d3f7e92b1..000000000
--- a/asminc/tgi-mode.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-;*****************************************************************************/
-;*                                                                           */
-;*                                 tgi-mode.inc                              */
-;*                                                                           */
-;*                             TGI mode definitions                          */
-;*                                                                           */
-;*                                                                           */
-;*                                                                           */
-;* (C) 2002-2003 Ullrich von Bassewitz                                       */
-;*               Römerstraße 52                                              */
-;*               D-70794 Filderstadt                                         */
-;* EMail:        uz@cc65.org                                                 */
-;*                                                                           */
-;*                                                                           */
-;* This software is provided 'as-is', without any expressed or implied       */
-;* warranty.  In no event will the authors be held liable for any damages    */
-;* arising from the use of this software.                                    */
-;*                                                                           */
-;* Permission is granted to anyone to use this software for any purpose,     */
-;* including commercial applications, and to alter it and redistribute it    */
-;* freely, subject to the following restrictions:                            */
-;*                                                                           */
-;* 1. The origin of this software must not be misrepresented; you must not   */
-;*    claim that you wrote the original software. If you use this software   */
-;*    in a product, an acknowledgment in the product documentation would be  */
-;*    appreciated but is not required.                                       */
-;* 2. Altered source versions must be plainly marked as such, and must not   */
-;*    be misrepresented as being the original software.                      */
-;* 3. This notice may not be removed or altered from any source              */
-;*    distribution.                                                          */
-;*                                                                           */
-;*****************************************************************************/
-
-
-
-; Graphics modes. Zero may not be used as a mode number.
-.enum
-        TGI_MODE_INVALID
-        TGI_MODE_320_200_2      ; 320x200,  2 colors (b/w)
-        TGI_MODE_160_200_4      ; 160x200,  4 colors
-        TGI_MODE_640_200_2	; 640x200,  2 colors (b/w)
-        TGI_MODE_640_480_2	; 640x480,  2 colors (b/w)
-        TGI_MODE_280_192_8      ; 280x192,  8 colors
-        TGI_MODE_40_48_16       ; 40x48,   16 colors
-        TGI_MODE_320_192_2
-        TGI_MODE_160_192_4
-        TGI_MODE_160_192_2
-        TGI_MODE_160_96_4
-        TGI_MODE_160_96_2
-        TGI_MODE_80_48_4
-        TGI_MODE_80_48_2
-        TGI_MODE_40_24_4
-        TGI_MODE_80_192_16b     ; 80x192,  16 shades of the same color
-        TGI_MODE_80_192_9
-        TGI_MODE_80_192_16h     ; 80x192,  16 colors with the same brightness
-        TGI_MODE_320_192_2_2p
-        TGI_MODE_80_192_16b_2p
-        TGI_MODE_160_192_4_2p
-        TGI_MODE_80_192_9_2p
-        TGI_MODE_160_102_16     ; 160x102, 16 colors
-        TGI_MODE_240_200_2      ; 240x200,  2 colors (b/w)
-.endenum
-
-
-                                
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 5b8138bc9..6529217ff 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -531,7 +531,6 @@ communication.
 <item><ref id="tgi_ioctl" name="tgi_ioctl">
 <item><ref id="tgi_line" name="tgi_line">
 <item><ref id="tgi_lineto" name="tgi_lineto">
-<item><ref id="tgi_load" name="tgi_load">
 <item><ref id="tgi_load_driver" name="tgi_load_driver">
 <item><ref id="tgi_outtext" name="tgi_outtext">
 <item><ref id="tgi_outtextxy" name="tgi_outtextxy">
@@ -5750,34 +5749,11 @@ be used in presence of a prototype.
 </quote>
 
 
-<sect1>tgi_load<label id="tgi_load"><p>
-
-<quote>
-<descrip>
-<tag/Function/Load and install the matching driver for the given mode.
-<tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
-<tag/Declaration/<tt/void __fastcall__ tgi_load (unsigned char mode);/
-<tag/Description/Load and install the matching driver for the given mode.
-Will just load the driver and check if loading was successul.
-Will not switch to graphics mode.
-<tag/Limits/<itemize>
-<item>The function is only available as fastcall function, so it may only
-be used in presence of a prototype.
-</itemize>
-<tag/Availability/cc65
-<tag/See also/Other tgi functions.
-<tag/Example/None.
-</descrip>
-</quote>
-
-
 <sect1>tgi_load_driver<label id="tgi_load_driver"><p>
 
 <quote>
 <descrip>
-<tag/Function/Load and install the given driver. This function is identical
-to tgi_load with the only difference that the name of the driver is specified
-explicitly.
+<tag/Function/Load and install the given driver.
 <tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
 <tag/Declaration/<tt/void __fastcall__ tgi_load_driver (const char *name);/
 <tag/Description/Load and install the driver by name.
diff --git a/include/tgi.h b/include/tgi.h
index a3f35bdea..fe87ebf75 100644
--- a/include/tgi.h
+++ b/include/tgi.h
@@ -38,9 +38,6 @@
 
 
 
-#ifndef _TGI_MODE_H
-#include <tgi/tgi-mode.h>
-#endif
 #ifndef _TGI_ERROR_H
 #include <tgi/tgi-error.h>
 #endif
@@ -64,9 +61,6 @@
 /* The name of the standard tgi driver for a platform */
 extern const char tgi_stddrv[];
 
-/* The default tgi mode for a platform */
-extern const unsigned char tgi_stdmode;
-
 /* A vector font definition */
 typedef struct tgi_vectorfont tgi_vectorfont;
 
@@ -78,17 +72,8 @@ typedef struct tgi_vectorfont tgi_vectorfont;
 
 
 
-void __fastcall__ tgi_load (unsigned char mode);
-/* Load and install the matching driver for the given mode. Will just load
- * the driver and check if loading was successul. Will not switch to gaphics
- * mode.
- */
-
 void __fastcall__ tgi_load_driver (const char* name);
-/* Load and install the given driver. This function is identical to tgi_load
- * with the only difference that the name of the driver is specified
- * explicitly.
- */
+/* Load and install the given driver. */
 
 void __fastcall__ tgi_unload (void);
 /* Uninstall, then unload the currently loaded driver. Will call tgi_done if
diff --git a/include/tgi/tgi-mode.h b/include/tgi/tgi-mode.h
deleted file mode 100644
index 60268322c..000000000
--- a/include/tgi/tgi-mode.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************/
-/*                                                                           */
-/*                                  tgi-mode.h                               */
-/*                                                                           */
-/*                             TGI mode definitions                          */
-/*                                                                           */
-/*                                                                           */
-/*                                                                           */
-/* (C) 2002-2003 Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
-/*                                                                           */
-/*                                                                           */
-/* This software is provided 'as-is', without any expressed or implied       */
-/* warranty.  In no event will the authors be held liable for any damages    */
-/* arising from the use of this software.                                    */
-/*                                                                           */
-/* Permission is granted to anyone to use this software for any purpose,     */
-/* including commercial applications, and to alter it and redistribute it    */
-/* freely, subject to the following restrictions:                            */
-/*                                                                           */
-/* 1. The origin of this software must not be misrepresented; you must not   */
-/*    claim that you wrote the original software. If you use this software   */
-/*    in a product, an acknowledgment in the product documentation would be  */
-/*    appreciated but is not required.                                       */
-/* 2. Altered source versions must be plainly marked as such, and must not   */
-/*    be misrepresented as being the original software.                      */
-/* 3. This notice may not be removed or altered from any source              */
-/*    distribution.                                                          */
-/*                                                                           */
-/*****************************************************************************/
-
-
-
-#ifndef _TGI_MODE_H
-#define _TGI_MODE_H
-
-
-
-/*****************************************************************************/
-/*		  		   Constants                                 */
-/*****************************************************************************/
-
-
-
-/* Graphics modes. Zero may not be used as a mode number. */
-#define TGI_MODE_320_200_2      1U      /* 320x200, 2 colors (b/w) */
-#define TGI_MODE_160_200_4      2U      /* 160x200, 4 colors */
-#define TGI_MODE_640_200_2	3U	/* 640x200, 2 colors (b/w) */
-#define TGI_MODE_640_480_2	4U	/* 640x480, 2 colors (b/w) */
-#define TGI_MODE_280_192_8      5U      /* 280x192, 8 colors */
-#define TGI_MODE_40_48_16       6U      /* 40x48,  16 colors */
-
-
-
-/* End of tgi-mode.h */
-#endif
-
-
-
diff --git a/libsrc/apple2/Makefile b/libsrc/apple2/Makefile
index a5f45f3ef..242893d1e 100644
--- a/libsrc/apple2/Makefile
+++ b/libsrc/apple2/Makefile
@@ -104,7 +104,7 @@ S_OBJS=	_scrsize.o	\
         systime.o       \
         sysuname.o      \
         tgi_colors.o    \
-        tgi_mode_table.o\
+        tgi_stddrv.o    \
         toascii.o       \
         vtabz.o         \
      	wherex.o       	\
diff --git a/libsrc/apple2/apple2-280-192-8.s b/libsrc/apple2/apple2-280-192-8.s
index e905a8aec..36bae836e 100644
--- a/libsrc/apple2/apple2-280-192-8.s
+++ b/libsrc/apple2/apple2-280-192-8.s
@@ -8,7 +8,6 @@
 	.include	"zeropage.inc"
 
 	.include	"tgi-kernel.inc"
-	.include	"tgi-mode.inc"
 	.include	"tgi-error.inc"
 	.include	"apple2.inc"
 
diff --git a/libsrc/apple2/apple2-40-48-16.s b/libsrc/apple2/apple2-40-48-16.s
index 1b975cb37..3f439cadc 100644
--- a/libsrc/apple2/apple2-40-48-16.s
+++ b/libsrc/apple2/apple2-40-48-16.s
@@ -8,7 +8,6 @@
 	.include	"zeropage.inc"
 
 	.include	"tgi-kernel.inc"
-	.include	"tgi-mode.inc"
 	.include	"tgi-error.inc"
 	.include	"apple2.inc"
 
diff --git a/libsrc/apple2/tgi_mode_table.s b/libsrc/apple2/tgi_mode_table.s
deleted file mode 100644
index e347716f3..000000000
--- a/libsrc/apple2/tgi_mode_table.s
+++ /dev/null
@@ -1,28 +0,0 @@
-;
-; Ullrich von Bassewitz, 31.05.2002
-;
-; Apple II mode table for tgi_map_mode
-;
-
-        .export		_tgi_mode_table
-
-        .include	"tgi-mode.inc"
-
-;----------------------------------------------------------------------------
-; Mode table. Contains entries of mode and driver name, the driver name being
-; null terminated. A mode with code zero terminates the list. The first entry
-; defines also the default mode and driver for the system.
-; BEWARE: The current implementation of tgi_map_mode does not work with tables
-; larger that 255 bytes!
-
-	.rodata
-
-_tgi_mode_table:
-        .ifdef	__APPLE2ENH__
-        .byte   TGI_MODE_280_192_8, "A2E.HI.TGI", 0
-        .byte   TGI_MODE_40_48_16,  "A2E.LO.TGI", 0
-        .else
-        .byte   TGI_MODE_280_192_8, "A2.HI.TGI", 0
-        .byte   TGI_MODE_40_48_16,  "A2.LO.TGI", 0
-        .endif
-        .byte   0		; End marker
diff --git a/libsrc/apple2/tgi_stddrv.s b/libsrc/apple2/tgi_stddrv.s
new file mode 100644
index 000000000..15d56127c
--- /dev/null
+++ b/libsrc/apple2/tgi_stddrv.s
@@ -0,0 +1,18 @@
+;
+; Name of the standard tgi driver
+;
+; Oliver Schmidt, 2011-05-02
+;
+; const char tgi_stddrv[];
+;
+
+        .export	_tgi_stddrv
+
+.rodata
+
+_tgi_stddrv:
+        .ifdef	__APPLE2ENH__
+        .asciiz	"A2E.HI.TGI"
+        .else
+        .asciiz	"A2.HI.TGI"
+        .endif
diff --git a/libsrc/apple2enh/Makefile b/libsrc/apple2enh/Makefile
index 9bdeea289..746bc1bc5 100644
--- a/libsrc/apple2enh/Makefile
+++ b/libsrc/apple2enh/Makefile
@@ -108,7 +108,7 @@ S_OBJS=	_scrsize.o	\
         sysuname.o      \
 	textframe.o	\
         tgi_colors.o    \
-        tgi_mode_table.o\
+        tgi_stddrv.o    \
         toascii.o       \
         videomode.o     \
         vtabz.o         \
diff --git a/libsrc/atari/Makefile b/libsrc/atari/Makefile
index 2eb51d910..068a244ba 100644
--- a/libsrc/atari/Makefile
+++ b/libsrc/atari/Makefile
@@ -114,7 +114,7 @@ OBJS = 	_scrsize.o      \
 	systime.o       \
 	sysuname.o      \
 	tgi_colors.o    \
-	tgi_mode_table.o\
+	tgi_stddrv.o    \
 	toascii.o       \
 	tvtype.o        \
 	ucase_fn.o      \
diff --git a/libsrc/atari/atari-10.s b/libsrc/atari/atari-10.s
index 7a1e451d2..a7da93b97 100644
--- a/libsrc/atari/atari-10.s
+++ b/libsrc/atari/atari-10.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-10p2.s b/libsrc/atari/atari-10p2.s
index 228739d76..e29ff601c 100644
--- a/libsrc/atari/atari-10p2.s
+++ b/libsrc/atari/atari-10p2.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-11.s b/libsrc/atari/atari-11.s
index 51bae0a4f..2e2dfd842 100644
--- a/libsrc/atari/atari-11.s
+++ b/libsrc/atari/atari-11.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-14.s b/libsrc/atari/atari-14.s
index 9fd10e913..ebd243067 100644
--- a/libsrc/atari/atari-14.s
+++ b/libsrc/atari/atari-14.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-15.s b/libsrc/atari/atari-15.s
index be37c72ad..08497db37 100644
--- a/libsrc/atari/atari-15.s
+++ b/libsrc/atari/atari-15.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-15p2.s b/libsrc/atari/atari-15p2.s
index a49558dbd..a3cdd7726 100644
--- a/libsrc/atari/atari-15p2.s
+++ b/libsrc/atari/atari-15p2.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-3.s b/libsrc/atari/atari-3.s
index 9034a9c7f..24dca69de 100644
--- a/libsrc/atari/atari-3.s
+++ b/libsrc/atari/atari-3.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-4.s b/libsrc/atari/atari-4.s
index 360f2d049..785e742e5 100644
--- a/libsrc/atari/atari-4.s
+++ b/libsrc/atari/atari-4.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-5.s b/libsrc/atari/atari-5.s
index bd4e3dacd..c8c699753 100644
--- a/libsrc/atari/atari-5.s
+++ b/libsrc/atari/atari-5.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-6.s b/libsrc/atari/atari-6.s
index 58b1f4686..091b698d4 100644
--- a/libsrc/atari/atari-6.s
+++ b/libsrc/atari/atari-6.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-7.s b/libsrc/atari/atari-7.s
index a09d149b9..95a05d4e8 100644
--- a/libsrc/atari/atari-7.s
+++ b/libsrc/atari/atari-7.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-8.s b/libsrc/atari/atari-8.s
index b609114d5..fe97a5a0a 100644
--- a/libsrc/atari/atari-8.s
+++ b/libsrc/atari/atari-8.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-8p2.s b/libsrc/atari/atari-8p2.s
index 314da1b9d..162aa4460 100644
--- a/libsrc/atari/atari-8p2.s
+++ b/libsrc/atari/atari-8p2.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-9.s b/libsrc/atari/atari-9.s
index 4cd43bb1a..38e23702a 100644
--- a/libsrc/atari/atari-9.s
+++ b/libsrc/atari/atari-9.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/atari-9p2.s b/libsrc/atari/atari-9p2.s
index 4f6dcec67..f8418f112 100644
--- a/libsrc/atari/atari-9p2.s
+++ b/libsrc/atari/atari-9p2.s
@@ -8,7 +8,6 @@
 	.include 	"zeropage.inc"
 
 	.include 	"tgi-kernel.inc"
-	.include        "tgi-mode.inc"
 	.include        "tgi-error.inc"
 
 	.macpack        generic
diff --git a/libsrc/atari/tgi_mode_table.s b/libsrc/atari/tgi_mode_table.s
deleted file mode 100644
index 5a7ab2cc0..000000000
--- a/libsrc/atari/tgi_mode_table.s
+++ /dev/null
@@ -1,38 +0,0 @@
-;
-; Atari mode table for tgi_map_mode
-;
-
- 	.export	       	_tgi_mode_table
-
-	.include	"tgi-mode.inc"
-
-;----------------------------------------------------------------------------
-; Mode table. Contains entries of mode and driver name, the driver name being
-; null terminated. A mode with code zero terminates the list. The first entry
-; defines also the default mode and driver for the system.
-; BEWARE: The current implementation of tgi_map_mode does not work with tables
-; larger that 255 bytes!
-
-.rodata
-
-_tgi_mode_table:
-        .byte   TGI_MODE_320_192_2, "ATARI8.TGI", 0
-        .byte   TGI_MODE_160_192_4, "ATARI15.TGI", 0
-        .byte   TGI_MODE_160_192_2, "ATARI14.TGI", 0
-        .byte   TGI_MODE_160_96_4, "ATARI7.TGI", 0
-        .byte   TGI_MODE_160_96_2, "ATARI6.TGI", 0
-        .byte   TGI_MODE_80_48_4, "ATARI5.TGI", 0
-        .byte   TGI_MODE_80_48_2, "ATARI4.TGI", 0
-        .byte   TGI_MODE_40_24_4, "ATARI3.TGI", 0
-        .byte   TGI_MODE_80_192_16b, "ATARI9.TGI", 0
-        .byte   TGI_MODE_80_192_9, "ATARI10.TGI", 0
-        .byte   TGI_MODE_80_192_16h, "ATARI11.TGI", 0
-	; Double paged drivers
-        .byte   TGI_MODE_320_192_2_2p, "ATR8P2.TGI", 0
-        .byte   TGI_MODE_80_192_16b_2p, "ATR9P2.TGI", 0
-        .byte   TGI_MODE_160_192_4_2p, "ATR15P2.TGI", 0
-        .byte   TGI_MODE_80_192_9_2p, "ATR10P2.TGI", 0
-
-        .byte   0       ; End marker
-
-
diff --git a/libsrc/atari/tgi_stddrv.s b/libsrc/atari/tgi_stddrv.s
new file mode 100644
index 000000000..219842b08
--- /dev/null
+++ b/libsrc/atari/tgi_stddrv.s
@@ -0,0 +1,13 @@
+;
+; Name of the standard tgi driver
+;
+; Oliver Schmidt, 2011-05-02
+;
+; const char tgi_stddrv[];
+;
+
+        .export	_tgi_stddrv
+
+.rodata
+
+_tgi_stddrv:	.asciiz	"atari8.tgi"
diff --git a/libsrc/atmos/atmos-240-200-2.s b/libsrc/atmos/atmos-240-200-2.s
index f978f36b9..6c6a9bb99 100644
--- a/libsrc/atmos/atmos-240-200-2.s
+++ b/libsrc/atmos/atmos-240-200-2.s
@@ -7,7 +7,6 @@
 	.include	"zeropage.inc"
 
 	.include	"tgi-kernel.inc"
-	.include	"tgi-mode.inc"
 	.include	"tgi-error.inc"
 	.include	"atmos.inc"
 
diff --git a/libsrc/c128/Makefile b/libsrc/c128/Makefile
index 18b7af1a7..f462ddf99 100644
--- a/libsrc/c128/Makefile
+++ b/libsrc/c128/Makefile
@@ -68,7 +68,7 @@ OBJS =	_scrsize.o		\
         systime.o               \
         sysuname.o              \
         tgi_colors.o            \
-	tgi_mode_table.o	\
+	tgi_stddrv.o            \
 	toggle_videomode.o      \
         videomode.o
 
diff --git a/libsrc/c128/c128-640-200-2.s b/libsrc/c128/c128-640-200-2.s
index 9055e0dc3..118a93e6e 100644
--- a/libsrc/c128/c128-640-200-2.s
+++ b/libsrc/c128/c128-640-200-2.s
@@ -23,7 +23,6 @@
 	.include     	"zeropage.inc"
 
       	.include     	"tgi-kernel.inc"
-        .include        "tgi-mode.inc"
         .include        "tgi-error.inc"
 
 
diff --git a/libsrc/c128/c128-640-480-2.s b/libsrc/c128/c128-640-480-2.s
index 43599dec4..bd9286221 100644
--- a/libsrc/c128/c128-640-480-2.s
+++ b/libsrc/c128/c128-640-480-2.s
@@ -24,7 +24,6 @@
 	.include     	"zeropage.inc"
 
       	.include     	"tgi-kernel.inc"
-        .include        "tgi-mode.inc"
         .include        "tgi-error.inc"
 
 
diff --git a/libsrc/c128/tgi_mode_table.s b/libsrc/c128/tgi_mode_table.s
deleted file mode 100644
index 84ebc37e3..000000000
--- a/libsrc/c128/tgi_mode_table.s
+++ /dev/null
@@ -1,23 +0,0 @@
-;
-; Ullrich von Bassewitz, 03.10.2002
-;
-; C128 mode table for tgi_map_mode
-;
-
- 	.export	       	_tgi_mode_table
-
-	.include	"tgi-mode.inc"
-
-;----------------------------------------------------------------------------
-; Mode table. Contains entries of mode and driver name, the driver name being
-; null terminated. A mode with code zero terminates the list. The first entry
-; defines also the default mode and driver for the system.
-; BEWARE: The current implementation of tgi_map_mode does not work with tables
-; larger that 255 bytes!
-
-.rodata
-
-_tgi_mode_table:
-	.byte	TGI_MODE_640_200_2, "c128-vdc.tgi", 0
-	.byte	TGI_MODE_640_480_2, "c128-vdc2.tgi", 0
-        .byte   0       ; End marker
diff --git a/libsrc/c128/tgi_stddrv.s b/libsrc/c128/tgi_stddrv.s
new file mode 100644
index 000000000..70dadde67
--- /dev/null
+++ b/libsrc/c128/tgi_stddrv.s
@@ -0,0 +1,13 @@
+;
+; Name of the standard tgi driver
+;
+; Oliver Schmidt, 2011-05-02
+;
+; const char tgi_stddrv[];
+;
+
+        .export	_tgi_stddrv
+
+.rodata
+
+_tgi_stddrv:	.asciiz	"c128-vdc.tgi"
diff --git a/libsrc/c64/Makefile b/libsrc/c64/Makefile
index f21c140c8..4fb2af916 100644
--- a/libsrc/c64/Makefile
+++ b/libsrc/c64/Makefile
@@ -67,7 +67,7 @@ OBJS = 	_scrsize.o     	 	\
         systime.o               \
         sysuname.o              \
         tgi_colors.o            \
-        tgi_mode_table.o
+        tgi_stddrv.o
 
 #--------------------------------------------------------------------------
 # Drivers
diff --git a/libsrc/c64/c64-320-200-2.s b/libsrc/c64/c64-320-200-2.s
index 65b0076a9..0d66a6ea7 100644
--- a/libsrc/c64/c64-320-200-2.s
+++ b/libsrc/c64/c64-320-200-2.s
@@ -7,7 +7,6 @@
 	.include 	"zeropage.inc"
 
       	.include 	"tgi-kernel.inc"
-        .include        "tgi-mode.inc"
         .include        "tgi-error.inc"
 
 
diff --git a/libsrc/c64/tgi_mode_table.s b/libsrc/c64/tgi_mode_table.s
deleted file mode 100644
index cb7740853..000000000
--- a/libsrc/c64/tgi_mode_table.s
+++ /dev/null
@@ -1,24 +0,0 @@
-;
-; Ullrich von Bassewitz, 31.05.2002
-;
-; C64 mode table for tgi_map_mode
-;
-
- 	.export	       	_tgi_mode_table
-
-	.include	"tgi-mode.inc"
-
-;----------------------------------------------------------------------------
-; Mode table. Contains entries of mode and driver name, the driver name being
-; null terminated. A mode with code zero terminates the list. The first entry
-; defines also the default mode and driver for the system.
-; BEWARE: The current implementation of tgi_map_mode does not work with tables
-; larger that 255 bytes!
-
-.rodata
-
-_tgi_mode_table:
-        .byte   TGI_MODE_320_200_2, "c64-hi.tgi", 0
-        .byte   0       ; End marker
-
-
diff --git a/libsrc/c64/tgi_stddrv.s b/libsrc/c64/tgi_stddrv.s
new file mode 100644
index 000000000..4a8e49db8
--- /dev/null
+++ b/libsrc/c64/tgi_stddrv.s
@@ -0,0 +1,13 @@
+;
+; Name of the standard tgi driver
+;
+; Oliver Schmidt, 2011-05-02
+;
+; const char tgi_stddrv[];
+;
+
+        .export	_tgi_stddrv
+
+.rodata
+
+_tgi_stddrv:	.asciiz	"c64-hi.tgi"
diff --git a/libsrc/geos/devel/Makefile b/libsrc/geos/devel/Makefile
index 53db0fb78..b2d9bb197 100644
--- a/libsrc/geos/devel/Makefile
+++ b/libsrc/geos/devel/Makefile
@@ -33,7 +33,7 @@ S_OBJS	= crt0.o                \
           oserrlist.o           \
           randomize.o           \
 	  tgi_colors.o		\
-          tgi_mode_table.o
+          tgi_stddrv.o
 
 #--------------------------------------------------------------------------
 # Drivers
diff --git a/libsrc/geos/devel/geos-tgi.s b/libsrc/geos/devel/geos-tgi.s
index fa5a326b2..d7484b47f 100644
--- a/libsrc/geos/devel/geos-tgi.s
+++ b/libsrc/geos/devel/geos-tgi.s
@@ -6,7 +6,6 @@
 	.include 	"zeropage.inc"
 
       	.include 	"tgi-kernel.inc"
-        .include        "tgi-mode.inc"
         .include        "tgi-error.inc"
 
 	.include	"../inc/const.inc"
diff --git a/libsrc/geos/devel/tgi_mode_table.s b/libsrc/geos/devel/tgi_mode_table.s
deleted file mode 100644
index 4076fbdd8..000000000
--- a/libsrc/geos/devel/tgi_mode_table.s
+++ /dev/null
@@ -1,24 +0,0 @@
-;
-; Maciej 'YTM/Elysium' Witkowiak <ytm@elysium.pl>
-; 28.12.2002
-;
-; GEOS mode table for tgi_map_mode
-;
-
- 	.export	       	_tgi_mode_table
-
-	.include	"tgi-mode.inc"
-
-;----------------------------------------------------------------------------
-; Mode table. Contains entries of mode and driver name, the driver name being
-; null terminated. A mode with code zero terminates the list. The first entry
-; defines also the default mode and driver for the system.
-; BEWARE: The current implementation of tgi_map_mode does not work with tables
-; larger that 255 bytes!
-
-.rodata
-
-_tgi_mode_table:
-	.byte	TGI_MODE_320_200_2, "GEOS-TGI.TGI", 0
-	.byte	TGI_MODE_640_200_2, "GEOS-TGI.TGI", 0
-        .byte   0       ; End marker
diff --git a/libsrc/geos/devel/tgi_stddrv.s b/libsrc/geos/devel/tgi_stddrv.s
new file mode 100644
index 000000000..6745c2301
--- /dev/null
+++ b/libsrc/geos/devel/tgi_stddrv.s
@@ -0,0 +1,13 @@
+;
+; Name of the standard tgi driver
+;
+; Oliver Schmidt, 2011-05-02
+;
+; const char tgi_stddrv[];
+;
+
+        .export	_tgi_stddrv
+
+.rodata
+
+_tgi_stddrv:	.asciiz	"geos-tgi.tgi"
diff --git a/libsrc/lynx/lynx-160-102-16.s b/libsrc/lynx/lynx-160-102-16.s
index 8610531ca..4a4d6175b 100644
--- a/libsrc/lynx/lynx-160-102-16.s
+++ b/libsrc/lynx/lynx-160-102-16.s
@@ -11,7 +11,6 @@
 	.include 	"extzp.inc"
 
       	.include 	"tgi-kernel.inc"
-        .include        "tgi-mode.inc"
         .include        "tgi-error.inc"
 
 	.include        "lynx.inc"
diff --git a/libsrc/tgi/Makefile b/libsrc/tgi/Makefile
index 6571d000d..923d844a3 100644
--- a/libsrc/tgi/Makefile
+++ b/libsrc/tgi/Makefile
@@ -30,7 +30,6 @@ CFLAGS	= -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 # Object files
 
 C_OBJS =        tgi_arc.o               \
-                tgi_load.o              \
                 tgi_load_driver.o       \
                 tgi_load_vectorfont.o   \
                 tgi_pieslice.o
@@ -79,8 +78,6 @@ S_OBJS =       	tgi-kernel.o   	        \
                 tgi_setpalette.o        \
                 tgi_setpixel.o          \
                 tgi_setviewpage.o       \
-                tgi_stddrv.o            \
-                tgi_stdmode.o           \
                 tgi_textheight.o        \
                 tgi_textwidth.o         \
                 tgi_textstyle.o         \
diff --git a/libsrc/tgi/tgi_load.c b/libsrc/tgi/tgi_load.c
deleted file mode 100644
index 99959ca95..000000000
--- a/libsrc/tgi/tgi_load.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************/
-/*                                                                           */
-/*                                tgi_load.c                                 */
-/*                                                                           */
-/*                       Loader module for TGI drivers                       */
-/*                                                                           */
-/*                                                                           */
-/*                                                                           */
-/* (C) 2002-2009, Ullrich von Bassewitz                                      */
-/*                Roemerstrasse 52                                           */
-/*                D-70794 Filderstadt                                        */
-/* EMail:         uz@cc65.org                                                */
-/*                                                                           */
-/*                                                                           */
-/* This software is provided 'as-is', without any expressed or implied       */
-/* warranty.  In no event will the authors be held liable for any damages    */
-/* arising from the use of this software.                                    */
-/*                                                                           */
-/* Permission is granted to anyone to use this software for any purpose,     */
-/* including commercial applications, and to alter it and redistribute it    */
-/* freely, subject to the following restrictions:                            */
-/*                                                                           */
-/* 1. The origin of this software must not be misrepresented; you must not   */
-/*    claim that you wrote the original software. If you use this software   */
-/*    in a product, an acknowledgment in the product documentation would be  */
-/*    appreciated but is not required.                                       */
-/* 2. Altered source versions must be plainly marked as such, and must not   */
-/*    be misrepresented as being the original software.                      */
-/* 3. This notice may not be removed or altered from any source              */
-/*    distribution.                                                          */
-/*                                                                           */
-/*****************************************************************************/
-
-
-
-#include <tgi.h>
-#include <tgi/tgi-kernel.h>
-
-
-
-/*****************************************************************************/
-/*                                   Code                                    */
-/*****************************************************************************/
-
-
-
-void __fastcall__ tgi_load (unsigned char mode)
-/* Install the matching driver for the given mode. Will just load the driver
- * and check if loading was successul. Will not switch to gaphics mode.
- */
-{
-    const char* name = tgi_map_mode (mode);
-    if (name == 0) {
-        /* No driver for this mode */
-        tgi_error = TGI_ERR_NO_DRIVER;
-    } else {
-        /* Load the driver */
-        tgi_load_driver (name);
-    }
-}
-
-
-
diff --git a/libsrc/tgi/tgi_stddrv.s b/libsrc/tgi/tgi_stddrv.s
deleted file mode 100644
index 606474f06..000000000
--- a/libsrc/tgi/tgi_stddrv.s
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; Name of the standard tgi driver
-;
-; Ullrich von Bassewitz, 2009-09-11
-;
-; const char tgi_stddrv[];
-;
-                    
-        .import _tgi_mode_table
-	.export	_tgi_stddrv     = _tgi_mode_table + 1
-
diff --git a/libsrc/tgi/tgi_stdmode.s b/libsrc/tgi/tgi_stdmode.s
deleted file mode 100644
index 5dcd17fad..000000000
--- a/libsrc/tgi/tgi_stdmode.s
+++ /dev/null
@@ -1,11 +0,0 @@
-;
-; Standard tgi mode
-;
-; Ullrich von Bassewitz, 2009-09-11
-;
-; const unsigned char tgi_stdmode[];
-;
-
-        .import _tgi_mode_table
-	.export	_tgi_stdmode    = _tgi_mode_table
-