From e9b8f5d814a7ce103f60c06482f3e875e74fee3c Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Thu, 6 Sep 2018 01:10:47 +0200
Subject: [PATCH] Atari: Add detection of RealDOS
 (http://www.realdos.net/realdos.html).

---
 asminc/atari.inc         |  7 ++++---
 include/atari.h          | 19 ++++---------------
 libsrc/atari/dosdetect.s |  5 +++++
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/asminc/atari.inc b/asminc/atari.inc
index 1b995e380..7b16b528f 100644
--- a/asminc/atari.inc
+++ b/asminc/atari.inc
@@ -1005,12 +1005,13 @@ diopp_size   = 5        ; size of structure
 SPARTADOS    = 0
 OSADOS       = 1        ; OS/A+
 XDOS         = 2
-ATARIDOS     = 3
-MYDOS        = 4
+REALDOS      = 3
+ATARIDOS     = 4
+MYDOS        = 5
 NODOS        = 255
 ; The DOSes with dos_type below or equal MAX_DOS_WITH_CMDLINE do support
 ; command line arguments.
-MAX_DOS_WITH_CMDLINE = XDOS
+MAX_DOS_WITH_CMDLINE = REALDOS
 
 ;-------------------------------------------------------------------------
 ; XDOS defines (version 2.4, taken from xdos24.pdf)
diff --git a/include/atari.h b/include/atari.h
index 4bed8d7a7..d9463904c 100644
--- a/include/atari.h
+++ b/include/atari.h
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2006 Mark Keates <markk@dendrite.co.uk>                          */
+/* (C) 2000-2018 Mark Keates <markk@dendrite.co.uk>                          */
 /*               Freddy Offenga <taf_offenga@yahoo.com>                      */
 /*               Christian Groessler <chris@groessler.org>                   */
 /*                                                                           */
@@ -232,18 +232,6 @@ extern void atrx15_tgi[];
 extern void atrx15p2_tgi[];
 #endif
 
-/* provide old names for backwards compatibility */
-#ifdef ATARI_COMPAT_PRE_2_11
-#define setcolor     _setcolor
-#define setcolor_low _setcolor_low
-#define getcolor     _getcolor
-#define graphics     _graphics
-#define scroll       _scroll
-#define save_vecs    _save_vecs
-#define rest_vecs    _rest_vecs
-#define getdefdev    _getdefdev
-#endif  /* #ifdef ATARI_COMPAT_PRE_2_11 */
-
 /* get_ostype return value defines (for explanation, see ostype.s) */
 /* masks */
 #define AT_OS_TYPE_MAIN  7
@@ -275,8 +263,9 @@ extern void atrx15p2_tgi[];
 #define SPARTADOS   0
 #define OSADOS      1
 #define XDOS        2
-#define ATARIDOS    3
-#define MYDOS       4
+#define REALDOS     3
+#define ATARIDOS    4
+#define MYDOS       5
 #define NODOS       255
 
 /* Define hardware */
diff --git a/libsrc/atari/dosdetect.s b/libsrc/atari/dosdetect.s
index 68f4aefb2..7e6088d97 100644
--- a/libsrc/atari/dosdetect.s
+++ b/libsrc/atari/dosdetect.s
@@ -20,6 +20,8 @@ detect: lda     DOS
         beq     mydos
         cmp     #'X'            ; XDOS
         beq     xdos
+        cmp     #'R'            ; RealDOS
+        beq     rdos
 
         lda     #$4C            ; probably default
         ldy     #COMTAB
@@ -41,6 +43,9 @@ spdos:  lda     #SPARTADOS
 mydos:  lda     #MYDOS
         .byte   $2C             ; BIT <abs>
 
+rdos:   lda     #REALDOS
+        .byte   $2C             ; BIT <abs>
+
 xdos:   lda     #XDOS
         sta     __dos_type
 done:   rts