Shortenned the CBM close() by a byte and a cycle.

[cc65] / libsrc / cbm / close.s

diff --git a/libsrc/cbm/close.s b/libsrc/cbm/close.s
index 989d8953ba23966c4e7add1ce700aee50a36ab76..b43c07b57e54206e058339763c5559302f705e6d 100644 (file)
--- a/libsrc/cbm/close.s
+++ b/libsrc/cbm/close.s
@@ -8,7 +8,6 @@
 
         .import         CLOSE
         .import         readdiskerror, closecmdchannel
-        .import         __oserror
         .importzp       tmp2
 
         .include        "errno.inc"
@@ -18,7 +17,7 @@
 
 ;--------------------------------------------------------------------------
 ; _close
-
+                                                   
 .proc   _close
 
 ; Check if we have a valid handle
@@ -34,14 +33,14 @@
         tax
         lda     fdtab,x         ; Get flags for this handle
         and     #LFN_OPEN
-        beq     notopen
+        beq     invalidfd
 
 ; Valid lfn, close it. The close call is always error free, at least as far
 ; as the kernal is involved
 
         lda     #LFN_CLOSED
         sta     fdtab,x
-        lda     tmp2            ; Get the handle
+        txa                     ; Get handle
         clc
         adc     #LFN_OFFS       ; Make LFN from handle
         jsr     CLOSE
@@ -49,41 +48,20 @@
 ; Read the drive error channel, then close it
 
         ldy     tmp2            ; Get the handle
-        ldx     unittab,y       ; Get teh disk for this handle
+        ldx     unittab,y       ; Get the disk for this handle
         jsr     readdiskerror   ; Read the disk error code
         pha                     ; Save it on stack
         ldy     tmp2
         ldx     unittab,y
         jsr     closecmdchannel ; Close the disk command channel
         pla                     ; Get the error code from the disk
-        bne     error           ; Jump if error
-
-; Successful
+        jmp     __mappederrno   ; Set _oserror and _errno, return 0/-1
 
-        tax                     ; Return zero in a/x
-        rts
-
-; Error entry, file descriptor is invalid
+; Error entry: The given file descriptor is not valid or not open
 
 invalidfd:
-        lda     #EINVAL
-        sta     __errno
-        lda     #0
-        sta     __errno+1
-        beq     errout
-
-; Error entry, file is not open
-
-notopen:
-        lda     #3              ; File not open
-        bne     error
-
-; Error entry, status not ok
-
-error:  sta     __oserror
-errout: lda     #$FF
-        tax                     ; Return -1
-        rts
+        lda     #EBADF
+        jmp     __directerrno   ; Set _errno, clear _oserror, return -1
 
 .endproc