From a0359724ffd385da4d8c278dde085d5bd1e71fa2 Mon Sep 17 00:00:00 2001
From: "ol.sc" <ol.sc@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Wed, 16 Jun 2010 21:19:47 +0000
Subject: [PATCH] - Use ProDOS 8 unit number as parameter. - Don't access the
 drive, just check its presence.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4723 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 libsrc/apple2/dioopen.s | 60 +++++++++++++----------------------------
 1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/libsrc/apple2/dioopen.s b/libsrc/apple2/dioopen.s
index 16269daa2..3c664970d 100644
--- a/libsrc/apple2/dioopen.s
+++ b/libsrc/apple2/dioopen.s
@@ -3,55 +3,33 @@
 ;
 ; dhandle_t __fastcall__ dio_open (driveid_t drive_id);
 ;
-; drive_id = (slot * 2) + (drive - 1)
 
         .export 	_dio_open
-        .import		return0
+        .import 	return0, __dos_type
 
-        .include	"zeropage.inc"
         .include	"errno.inc"
         .include	"mli.inc"
 
 _dio_open:
-        ; Convert drive id into unit number
-        lsr
-        bcc	:+
-        ora	#%00001000
-:       asl
-        asl
-        asl
-        asl
-        tay			; Save handle
-
-        ; Set handle
-        sta	mliparam + MLI::ON_LINE::UNIT_NUM
-
-        ; Alloc 16-byte buffer just below stack
-        lda	sp
-        sec
-        sbc	#16
-        sta	mliparam + MLI::ON_LINE::DATA_BUFFER
-        lda	sp+1
-        sbc	#$00
-        sta	mliparam + MLI::ON_LINE::DATA_BUFFER+1
-
-        ; Get device state
-        lda	#ON_LINE_CALL
-        ldx	#ON_LINE_COUNT
-        jsr	callmli
-        bcc	:+
-
-        ; DIO level access doesn't necessarily need a
-        ; ProDOS 8 disk so ignore "high level" errors
-        cmp	#$40
-        bcc	oserr
+        ; Check for ProDOS 8
+        ldx	__dos_type
+        bne	:+
+        lda	#$01		; "Bad system call number"
+        bne	oserr		; Branch always
+
+        ; Walk device list
+:       ldx	DEVCNT
+:       cmp	DEVLST,x
+        beq	:+		; Found drive_id in device list
+        dex
+        bpl	:-
+        lda	#$28		; "No device connected"
+        
+        ; Return oserror
+oserr:  sta	__oserror
+        jmp	return0
 
         ; Return success
-:       tya			; Restore handle
-        ldx	#$00
+:       ldx	#$00
         stx	__oserror
         rts
-
-        ; Return oserror
-oserr:  sta     __oserror
-        jmp	return0
-- 
2.39.5