From d481557541873312894557675ef0c707886cbaa3 Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Tue, 21 Jan 2014 22:58:50 +0100
Subject: [PATCH 1/2] add addresses of static drivers of the runtime

---
 include/atari.h | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/include/atari.h b/include/atari.h
index ff23526ee..82cd07330 100644
--- a/include/atari.h
+++ b/include/atari.h
@@ -169,9 +169,16 @@ extern char *_getdefdev(void);          /* get default floppy device */
 
 /* global variables */
 extern unsigned char _dos_type;         /* the DOS flavour */
+#ifndef __ATARIXL__
 extern void atr130_emd[];
 extern void atrstd_joy[];               /* referred to by joy_static_stddrv[] */
 extern void atrmj8_joy[];
+extern void atrjoy_mou[];
+extern void atrst_mou[];                /* referred to by mouse_static_stddrv[] */
+extern void atrami_mou[];
+extern void atrtrk_mou[];
+extern void atrtt_mou[];
+extern void atrrdev_ser[];
 extern void atr3_tgi[];
 extern void atr4_tgi[];
 extern void atr5_tgi[];
@@ -187,6 +194,32 @@ extern void atr11_tgi[];
 extern void atr14_tgi[];
 extern void atr15_tgi[];
 extern void atr15p2_tgi[];
+#else
+extern void atrx130_emd[];
+extern void atrxstd_joy[];              /* referred to by joy_static_stddrv[] */
+extern void atrxmj8_joy[];
+extern void atrxjoy_mou[];
+extern void atrxst_mou[];               /* referred to by mouse_static_stddrv[] */
+extern void atrxami_mou[];
+extern void atrxtrk_mou[];
+extern void atrxtt_mou[];
+extern void atrxrdev_ser[];
+extern void atrx3_tgi[];
+extern void atrx4_tgi[];
+extern void atrx5_tgi[];
+extern void atrx6_tgi[];
+extern void atrx7_tgi[];
+extern void atrx8_tgi[];                /* referred to by tgi_static_stddrv[] */
+extern void atrx8p2_tgi[];
+extern void atrx9_tgi[];
+extern void atrx9p2_tgi[];
+extern void atrx10_tgi[];
+extern void atrx10p2_tgi[];
+extern void atrx11_tgi[];
+extern void atrx14_tgi[];
+extern void atrx15_tgi[];
+extern void atrx15p2_tgi[];
+#endif
 
 /* provide old names for backwards compatibility */
 #ifdef ATARI_COMPAT_PRE_2_11

From 33bc340814dc2b95c8139aaaa43127382ad7b7ad Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Tue, 21 Jan 2014 23:08:32 +0100
Subject: [PATCH 2/2] add missing stddrv defines for atarixl

---
 libsrc/atari/joy_stat_stddrv.s | 8 ++++++++
 libsrc/atari/joy_stddrv.s      | 7 ++++++-
 libsrc/atari/tgi_stat_stddrv.s | 8 ++++++++
 libsrc/atari/tgi_stddrv.s      | 7 ++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/libsrc/atari/joy_stat_stddrv.s b/libsrc/atari/joy_stat_stddrv.s
index cbaf344d0..4528aa20d 100644
--- a/libsrc/atari/joy_stat_stddrv.s
+++ b/libsrc/atari/joy_stat_stddrv.s
@@ -7,8 +7,16 @@
 ;
 
         .export _joy_static_stddrv
+        .ifdef  __ATARIXL__
+        .import _atrxstd_joy
+        .else
         .import _atrstd_joy
+        .endif
 
 .rodata
 
+        .ifdef  __ATARIXL__
+_joy_static_stddrv := _atrxstd_joy
+        .else
 _joy_static_stddrv := _atrstd_joy
+        .endif
diff --git a/libsrc/atari/joy_stddrv.s b/libsrc/atari/joy_stddrv.s
index f3ab74e7b..e82dadb73 100644
--- a/libsrc/atari/joy_stddrv.s
+++ b/libsrc/atari/joy_stddrv.s
@@ -10,4 +10,9 @@
 
 .rodata
 
-_joy_stddrv:    .asciiz "atrstd.joy"
+_joy_stddrv:
+        .ifdef  __ATARIXL__
+                .asciiz "atrxstd.joy"
+        .else
+                .asciiz "atrstd.joy"
+        .endif
diff --git a/libsrc/atari/tgi_stat_stddrv.s b/libsrc/atari/tgi_stat_stddrv.s
index 5f1be70f8..dc3b7cc71 100644
--- a/libsrc/atari/tgi_stat_stddrv.s
+++ b/libsrc/atari/tgi_stat_stddrv.s
@@ -7,8 +7,16 @@
 ;
 
         .export _tgi_static_stddrv
+        .ifdef  __ATARIXL__
+        .import _atrx8_tgi
+        .else
         .import _atr8_tgi
+        .endif
 
 .rodata
 
+        .ifdef  __ATARIXL__
+_tgi_static_stddrv := _atrx8_tgi
+        .else
 _tgi_static_stddrv := _atr8_tgi
+        .endif
diff --git a/libsrc/atari/tgi_stddrv.s b/libsrc/atari/tgi_stddrv.s
index bec030511..e2f68a50e 100644
--- a/libsrc/atari/tgi_stddrv.s
+++ b/libsrc/atari/tgi_stddrv.s
@@ -10,4 +10,9 @@
 
 .rodata
 
-_tgi_stddrv:    .asciiz "atr8.tgi"
+_tgi_stddrv:
+        .ifdef  __ATARIXL__
+                .asciiz "atrx8.tgi"
+        .else
+                .asciiz "atr8.tgi"
+        .endif