From 931b6418bf25e2fd6d515ddab9202d72ff419a8a Mon Sep 17 00:00:00 2001
From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Tue, 8 Sep 2009 16:25:12 +0000
Subject: [PATCH] Changed the prototype of videomode() to take and return an
 unsigned instead of an unsigned char. Two more video mode constants as
 discussed on the list.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4133 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 doc/funcref.sgml        | 2 +-
 include/c128.h          | 8 +++++---
 libsrc/c128/videomode.s | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 73d14432a..294265c78 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -5032,7 +5032,7 @@ used in presence of a prototype.
 <descrip>
 <tag/Function/Switch to either 40 or 80 column mode.
 <tag/Header/<tt/<ref id="c128.h" name="c128.h">/
-<tag/Declaration/<tt/unsigned char __fastcall__ videomode (unsigned char Mode);/
+<tag/Declaration/<tt/unsigned __fastcall__ videomode (unsigned Mode);/
 <tag/Description/Switch to 40 or 80 column mode depending on the argument. If
 the requested mode is already active, nothing happens. The old mode is returned
 from the call.
diff --git a/include/c128.h b/include/c128.h
index d4df9919b..37a813f8c 100644
--- a/include/c128.h
+++ b/include/c128.h
@@ -62,7 +62,7 @@
 #define COLOR_CYAN      	0x03
 #define COLOR_VIOLET 	       	0x04
 #define COLOR_GREEN  	       	0x05
-#define COLOR_BLUE   	       	0x06       
+#define COLOR_BLUE   	       	0x06
 #define COLOR_YELLOW 	       	0x07
 #define COLOR_ORANGE 	       	0x08
 #define COLOR_BROWN  	       	0x09
@@ -74,8 +74,10 @@
 #define COLOR_GRAY3  	       	0x0F
 
 /* Video mode defines */
-#define VIDEOMODE_40COL         0x00
-#define VIDEOMODE_80COL         0x80
+#define VIDEOMODE_40x25         0x00
+#define VIDEOMODE_80x25         0x80
+#define VIDEOMODE_40COL         VIDEOMODE_40x25
+#define VIDEOMODE_80COL         VIDEOMODE_80x25
 
 
 
diff --git a/libsrc/c128/videomode.s b/libsrc/c128/videomode.s
index 3e34a65d2..7825eca2c 100644
--- a/libsrc/c128/videomode.s
+++ b/libsrc/c128/videomode.s
@@ -1,12 +1,12 @@
 ;
 ; Ullrich von Bassewitz, 2009-09-07
 ;
-; unsigned char __fastcall__ videomode (unsigned char Mode);
+; unsigned __fastcall__ videomode (unsigned Mode);
 ; /* Set the video mode, return the old mode */
 ;
 
 	.export		_videomode
-        .import         SWAPPER, BSOUT  
+        .import         SWAPPER, BSOUT
 
         .include        "c128.inc"
 
-- 
2.39.5