The spans do now contain the size of a span, no longer the end offset.

[cc65] / libsrc / atari / getdefdev.s

diff --git a/libsrc/atari/getdefdev.s b/libsrc/atari/getdefdev.s
index 92db7484823444cc6389138c971b7e226e7d5a6b..a6d13e86e84e97d66bfbe36ff495d357a2f2761d 100644 (file)
--- a/libsrc/atari/getdefdev.s
+++ b/libsrc/atari/getdefdev.s
@@ -1,5 +1,5 @@
 ;
-; Freddy Offenga & Christian Groessler, June 2004
+; Freddy Offenga & Christian Groessler, December 2004
 ;
 ; function to get default device: char *_getdefdev(void);
 ;
@@ -16,7 +16,11 @@
 
        .include        "atari.inc"
        .import         __dos_type
-       .export         __getdefdev             ; get default device (e.g. "D1:")
+       .export         __getdefdev             ; get default device
+       .export         __defdev                ; this is the default device string (e.g. "D1:")
+.ifdef DYNAMIC_DD
+       .constructor    __getdefdev,24
+.endif
 
 ; Get default device (LBUF will be destroyed!!)
 
@@ -62,21 +66,25 @@ crvec:      jsr     $FFFF           ; will be set to crunch vector
 
        ldy     #COMFNAM        ;  COMFNAM is always "Dn:"
        lda     (DOSVEC),y
-       sta     defdev
+       sta     __defdev
        iny
        lda     (DOSVEC),y
-       sta     defdev+1
+       sta     __defdev+1
 
-; return ointer to default device
+; Return pointer to default device
 
-finish:        lda     #<defdev
-       ldx     #>defdev
+finish:        lda     #<__defdev
+       ldx     #>__defdev
        rts
 
        .data
 
 ; Default device
 
-defdev:
+__defdev:
+.ifdef DEFAULT_DEVICE
+       .byte   'D', '0'+DEFAULT_DEVICE, ':', 0
+.else
        .byte   "D1:", 0
+.endif