Merge branch 'master' into kbrepeat

[cc65] / libsrc / cbm / rwcommon.s

diff --git a/libsrc/cbm/rwcommon.s b/libsrc/cbm/rwcommon.s
index 2e124c7b0acb5d94a1f161d463848327938e1e2d..c044b6c38e3b4a96103c1fd5c0c92687acbe0d67 100644 (file)
--- a/libsrc/cbm/rwcommon.s
+++ b/libsrc/cbm/rwcommon.s
@@ -9,6 +9,7 @@
         .import         popax
         .importzp       ptr1, ptr2, ptr3, tmp2
 
+        .include        "errno.inc"
         .include        "filedes.inc"
 
 
@@ -20,7 +21,6 @@
 
 .proc   rwcommon
 
-        jsr     popax           ; Get count
         eor     #$FF
         sta     ptr1
         txa
@@ -36,11 +36,11 @@
         sta     ptr3+1          ; Clear ptr3
 
         jsr     popax           ; Get the handle
-        sta     tmp2
         cpx     #$01
-        bcs     inv
-        cmp     #MAX_FDS
-inv:    rts
+        bcs     @L9
+        cmp     #MAX_FDS        ; Set carry if fd too large
+        sta     tmp2
+@L9:    rts                     ; Return with result in carry
 
 .endproc