Start on FILE i/O

rom/input.s

@@ -22,13 +22,11 @@ L2A67:
 SYNERR4:
         jmp     SYNERR
 RESPERR:
-.ifdef CONFIG_FILE
         lda     CURDVC
         beq     LCA8F
         ldx     #ERR_BADDATA
         jmp     ERROR
 LCA8F:
-.endif
         lda     #<ERRREENTRY
         ldy     #>ERRREENTRY
         jsr     STROUT
@@ -45,7 +43,6 @@ RTS20:
 GET:
         jsr     ERRDIR
 ; CBM: if GET#, then switch input
-.ifdef CONFIG_FILE
         cmp     #'#'
         bne     LCAB6
         jsr     CHRGET
@@ -55,7 +52,6 @@ GET:
         jsr     CHKIN
         stx     CURDVC
 LCAB6:
-.endif
         ldx     #<(INPUTBUFFER+1)
         ldy     #>(INPUTBUFFER+1)
         lda     #$00
@@ -63,16 +59,13 @@ LCAB6:
         lda     #$40
         jsr     PROCESS_INPUT_LIST
 ; CBM: if GET#, then switch input back
-.ifdef CONFIG_FILE
         ldx     CURDVC
         bne     LCAD8
-.endif
         rts
 
 ; ----------------------------------------------------------------------------
 ; "INPUT#" STATEMENT
 ; ----------------------------------------------------------------------------
-.ifdef CONFIG_FILE
 INPUTH:
         jsr     GETBYT
         lda     #$2C
@@ -88,7 +81,6 @@ LCAD8:
         stx     CURDVC
         rts
 LCAE0:
-.endif
 
 ; ----------------------------------------------------------------------------
 ; "INPUT" STATEMENT
@@ -107,30 +99,24 @@ L2A9E:
         sta     INPUTBUFFER-1
 LCAF8:
         jsr     NXIN
-  .ifdef CONFIG_FILE
         lda     CURDVC
         beq     LCB0C
-        lda     Z96
-        and     #$02
+        lda     IO_FILE_STATUS
+        and     #FILE_STATUS_EOF
         beq     LCB0C
         jsr     LCAD6
         jmp     DATA
 LCB0C:
-  .endif
         lda     INPUTBUFFER
         bne     L2ABE
-  .ifdef CONFIG_FILE
         lda     CURDVC
         bne     LCAF8
-  .endif
         clc
         jmp     CONTROL_C_TYPED
 
 NXIN:
-  .ifdef CONFIG_FILE
         lda     CURDVC
         bne     LCB21
-  .endif
         jsr     OUTQUES	; '?'
         jsr     OUTSP
 LCB21:
@@ -196,10 +182,8 @@ PROCESS_INPUT_ITEM:
         bne     L2AF8	; always
 L2AF0:
         bmi     FINDATA
-.ifdef CONFIG_FILE
         lda     CURDVC
         bne     LCB64
-.endif
         jsr     OUTQUES
 LCB64:
         jsr     NXIN
@@ -300,10 +284,8 @@ L2B94:
         ldy     #$00
         lda     (INPTR),y
         beq     L2BA1
-.ifdef CONFIG_FILE
         lda     CURDVC
         bne     L2BA1
-.endif
         lda     #<ERREXTRA
         ldy     #>ERREXTRA
         jmp     STROUT