From: cpg <cpg@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 26 Nov 2009 18:47:14 +0000 (+0000)
Subject: don't hardcode 'D' as device name, use __defdev
X-Git-Tag: V2.13.1~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e65719bf98563180cc3d373276a44d4b816519e6;p=cc65

don't hardcode 'D' as device name, use __defdev

git-svn-id: svn://svn.cc65.org/cc65/trunk@4495 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/libsrc/atari/ucase_fn.s b/libsrc/atari/ucase_fn.s
index 0d6bc8678..bbc6d1926 100644
--- a/libsrc/atari/ucase_fn.s
+++ b/libsrc/atari/ucase_fn.s
@@ -20,9 +20,7 @@
 
 .ifdef	DEFAULT_DEVICE
 	.importzp tmp2
-.ifdef	DYNAMIC_DD
 	.import	__defdev
-.endif
 .endif
 	.importzp tmp3,ptr4,sp
 	.import	_strupr,subysp
@@ -82,7 +80,7 @@ loop2:	lda	(ptr4),y
 	cmp	#1		; was device present in passed string?
 	beq	hasdev2		; yes, don't prepend something
 
-	inc	tmp3		; no, prepend "D:"
+	inc	tmp3		; no, prepend "D:" (or other device)
 	inc	tmp3		; adjust stack size used
 	inc	tmp3
 	ldy	#3
@@ -91,15 +89,11 @@ loop2:	lda	(ptr4),y
 	lda	#':'
 	sta	(sp),y		; insert ':'
 	dey
-.ifdef	DYNAMIC_DD
 	lda	__defdev+1
-.else
-	lda	#'0'+DEFAULT_DEVICE
-.endif
 	sta	(sp),y		; insert device number
 	dey
-	lda	#'D'
-	sta	(sp),y		; insert 'D'
+	lda	__defdev
+	sta	(sp),y		; insert device name (normally 'D' or 'H')
 hasdev2:
 .endif
 	; uppercase the temp. filename