Cleaning telestrat.cfg (no need to have bashead segment). Some primitives added

[cc65] / libsrc / c16 / cgetc.s

diff --git a/libsrc/c16/cgetc.s b/libsrc/c16/cgetc.s
index 5a2125a0afc089fd969362e6778b4352180c2571..a61373ac709b8997f85033c9b27eba313bcee2df 100644 (file)
--- a/libsrc/c16/cgetc.s
+++ b/libsrc/c16/cgetc.s
@@ -4,89 +4,85 @@
 ; char cgetc (void);
 ;
 
-               .export         _cgetc
-               .import         cursor
+        .export         _cgetc
+        .import         cursor
 
-               .include        "plus4.inc"
+        .include        "plus4.inc"
 
 
 ; --------------------------------------------------------------------------
 
-_cgetc:        lda     KEY_COUNT       ; Get number of characters
-               ora     FKEY_COUNT      ; Or with number of function key chars
-               bne     L2              ; Jump if there are already chars waiting
+_cgetc: lda     KEY_COUNT       ; Get number of characters
+        ora     FKEY_COUNT      ; Or with number of function key chars
+        bne     L2              ; Jump if there are already chars waiting
 
 ; Switch on the cursor if needed
 
-               ldy     CURS_X
-               lda     (CRAM_PTR),y    ; Get current char
-               pha                     ; And save it
-               lda     CHARCOLOR
-               sta     (CRAM_PTR),y
-
-               lda     cursor
-               beq     L1              ; Jump if no cursor
-               tya
-               clc
-               adc     SCREEN_PTR
-               sta     TED_CURSLO
-               lda     SCREEN_PTR+1
-               adc     #$00
-               sbc     #$0B            ; + carry = $C00 (screen address)
-               sta     TED_CURSHI
-
-L1:            lda     KEY_COUNT
-               ora     FKEY_COUNT
-               beq     L1
-               pla
-               sta     (CRAM_PTR),y
-               lda     #$ff
-               sta     TED_CURSLO      ; Cursor off
-               sta     TED_CURSHI
-
-L2:            jsr     KBDREAD         ; Read char and return in A
-               ldx     #0
-               rts
+        ldy     CURS_X
+        lda     (CRAM_PTR),y    ; Get current char
+        pha                     ; And save it
+        lda     CHARCOLOR
+        sta     (CRAM_PTR),y
+
+        lda     cursor
+        beq     L1              ; Jump if no cursor
+        tya
+        clc
+        adc     SCREEN_PTR
+        sta     TED_CURSLO
+        lda     SCREEN_PTR+1
+        adc     #$00
+        sbc     #$0B            ; + carry = $C00 (screen address)
+        sta     TED_CURSHI
+
+L1:     lda     KEY_COUNT
+        ora     FKEY_COUNT
+        beq     L1
+        pla
+        sta     (CRAM_PTR),y
+        lda     #$ff
+        sta     TED_CURSLO      ; Cursor off
+        sta     TED_CURSHI
+
+L2:     jsr     KBDREAD         ; Read char and return in A
+        ldx     #0
+        rts
 
 ; --------------------------------------------------------------------------
 ; Make the function keys return function key codes instead of the current
 ; strings so the program will see and may handle them.
 ; Undo this change when the program ends
 
-       .constructor    initkbd
-       .destructor     donekbd
+        .constructor    initkbd
+        .destructor     donekbd
 
-.segment        "INIT"
+.segment        "ONCE"
 
-.proc  initkbd
+.proc   initkbd
 
-       ldy     #15
-@L1:   lda     fnkeys,y
-       sta     FKEY_SPACE,y
-       dey
-       bpl     @L1
-       rts
+        ldy     #7
+@L1:    lda     fnkeys,y
+        sta     FKEY_SPACE+8,y
+        lda     #$01            ; Lower 8 places are all $01
+        sta     FKEY_SPACE,y
+        dey
+        bpl     @L1
+        rts
 
 .endproc
 
+fnkeys: .byte   133, 137, 134, 138, 135, 139, 136, 140
+
 
 .code
 
-.proc  donekbd
+.proc   donekbd
 
-       ldx     #$39            ; Copy the original function keys
-@L1:   lda     FKEY_ORIG,x
-       sta     FKEY_SPACE,x
-       dex
-       bpl     @L1
-       rts
+        ldx     #$39            ; Copy the original function keys
+@L1:    lda     FKEY_ORIG,x
+        sta     FKEY_SPACE,x
+        dex
+        bpl     @L1
+        rts
 
 .endproc
-
-
-; Function key table, readonly
-
-.rodata
-fnkeys:        .byte   $01, $01, $01, $01, $01, $01, $01, $01
-       .byte   133, 137, 134, 138, 135, 139, 136, 140
-