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
2011-05-02 10:38:48 +00:00
parent 97b950b8d8
commit 4aa00e84e1
48 changed files with 78 additions and 422 deletions
--- 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      \
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/libsrc/atari/tgi_mode_table.s
+++ b/libsrc/atari/tgi_mode_table.s
@@ -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
-
-
--- a/libsrc/atari/tgi_stddrv.s
+++ 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"