Minor changes and cleanup

git-svn-id: svn://svn.cc65.org/cc65/trunk@2796 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/Makefile b/libsrc/Makefile
index 538ab4de6c7f815b1faaff8426640613bd322ba8..0e84f96e703aaf841d1574bc7476dc44905ecab0 100644 (file)
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -172,7 +172,7 @@ cbm610lib:
        done
        mv cbm610/crt0.o cbm610.o
        cp cbm610/*.emd .
-       cp cbm610/*.ser .
+       cp cbm610/cbm610-stdser.ser cbm610-std.ser
 
 #-----------------------------------------------------------------------------
 # GEOS on the C64/128

diff --git a/libsrc/cbm610/cbm610.inc b/libsrc/cbm610/cbm610.inc
index f05a5f3e506806320dfdca11e1796c4c42e399f8..ea85cd50d0a172f9e7ec4f1f992bfb449d20debe 100644 (file)
--- a/libsrc/cbm610/cbm610.inc
+++ b/libsrc/cbm610/cbm610.inc
@@ -7,37 +7,10 @@
 
 
 ; ---------------------------------------------------------------------------
-; Zeropage stuff
-
-ExecReg                = $0000
-IndReg         = $0001
-
-FNAM_ADR        := $90          ; File name address
-FNAM_SEG        := $92          ; Unused
-ST              := $9C          ; Status
-FNAM_LEN        := $9D
-LFN             := $9E
-DEVNUM          := $9F
-SECADR          := $A0
-;CharPtr               = $C8
-;CURS_Y                = $CA
-;CURS_X                = $CB
-GrafMode               = $CC
-LastIndex              = $CD
-KeyIndex               = $D1
-Config                 = $D4
-RepeatCount            = $D7
-RepeatDelay            = $D8
-ModKey                 = $E0
-NorKey                 = $E1
-
-
-; ---------------------------------------------------------------------------
-; Page 3 variables
-
-RVS                 = $0397
-KeyBuf              = $03AB    ; Keyboard buffer
+; Zeropage registers
 
+ExecReg                = $00
+IndReg         = $01
 
 ; ---------------------------------------------------------------------------
 ; Screen size
@@ -51,37 +24,10 @@ YSIZE           = 25
 
 ; I/O  $d800: CRTC 6545
 
-CRTC           = $D800
-CRTC_ADDR      = $00
-CRTC_DATA      = $01
-
-
-; I/O  $da00: SID 6581
-
-;      sid             =       $da00
-
-Osc1           =       $00
-Osc2           =       $07
-Osc3           =       $0e
-
-FreqLo         =       $00
-FreqHi         =       $01
-PulseF         =       $02
-PulseC         =       $03
-OscCtl         =       $04
-AtkDcy         =       $05
-SusRel         =       $06
-
-FiCtlLo                =       $15
-FiCtlHi                =       $16
-Resonance      =       $17
-Volume         =       $18
-PotX           =       $19
-PotY           =       $1A
-Random         =       $1B
-Env3           =       $1C
-
-
+.struct CRTC
+        ADDR           .byte
+        DATA           .byte
+.endstruct
 
 ; I/O  $db00: CIA 6526 Inter Process Communication
 ;
@@ -118,13 +64,13 @@ Env3               =       $1C
 
 
 ; I/O  $dc00: CIA 6526
-
+;
 ;      cia             =       $dc00
 
 
 
 ; I/O  $dd00: ACIA 6551
-
+;
 ;      acia            =       $dd00
 
 .struct ACIA
@@ -136,7 +82,7 @@ Env3         =       $1C
 
 
 ; I/O  $de00: Triport #1 6525
-
+;
 ;      tpi1            =       $de00
 
 .struct TPI

diff --git a/libsrc/cbm610/cputc.s b/libsrc/cbm610/cputc.s
index cc73d739b298711bba4c72d619cd72dbda85c4d4..c464c8d2b48b4e951cb7d2b1a1fff5f5ff0d1b8d 100644 (file)
--- a/libsrc/cbm610/cputc.s
+++ b/libsrc/cbm610/cputc.s
@@ -11,7 +11,8 @@
        .import         _gotoxy
        .import         popa
 
-        .import         ktmp: zp, crtc: zp, CURS_X: zp, CURS_Y: zp, CharPtr: zp
+        .import         ktmp: zp, crtc: zp, CURS_X: zp, CURS_Y: zp, RVS: zp
+        .import         CharPtr: zp
 
        .include        "cbm610.inc"
 

diff --git a/libsrc/cbm610/extzp.inc b/libsrc/cbm610/extzp.inc
index 783f6dca0906dcaded35c0bf6e667d0f34922c61..43e8697bfef94a57908a409ff06675e129306f39 100644 (file)
--- a/libsrc/cbm610/extzp.inc
+++ b/libsrc/cbm610/extzp.inc
@@ -9,5 +9,6 @@
         .globalzp       sysp1, sysp3, crtc, sid, ipccia, cia, acia, tpi1, tpi2
         .globalzp       ktab1, ktab2, ktab3, ktab4
 
-        .globalzp       sysp0, time, segsave, ktmp, CURS_X, CURS_Y, CharPtr
+        .globalzp       sysp0, time, segsave, ktmp, CURS_X, CURS_Y, RVS
+        .globalzp       CharPtr
 

diff --git a/libsrc/cbm610/extzp.s b/libsrc/cbm610/extzp.s
index f98f1165b0517f29dbb83359e31b0248f7a77203..7417d6447179ad0d3195368ceb20b2a6d92a50d9 100644 (file)
--- a/libsrc/cbm610/extzp.s
+++ b/libsrc/cbm610/extzp.s
@@ -37,8 +37,10 @@ scanbuf:        .byte   0
 ktmp:           .byte   0
 CURS_X:         .byte   0
 CURS_Y:         .byte   0
+RVS:            .byte   0
 CharPtr:        .word   0
 
 
 
 
+

diff --git a/libsrc/cbm610/kreadst.s b/libsrc/cbm610/kreadst.s
index d2bdec781af062221ac89e2046f83388b8fb9c5b..d9bbf7c2d69f36b60a6b5bd58b9ff48969019cd4 100644 (file)
--- a/libsrc/cbm610/kreadst.s
+++ b/libsrc/cbm610/kreadst.s
@@ -16,8 +16,8 @@
 
         jsr     sys_bank
         sty     ktmp                    ; Save Y register
-        ldy     #ST
-        lda     (sysp0),y               ; Load ST from system bank
+        ldy     #$9C                    ; STATUS
+        lda     (sysp0),y               ; Load STATUS from system bank
         ldy     ktmp
         jmp     restore_bank            ; Will set condition codes on A
 

diff --git a/libsrc/cbm610/ksetnam.s b/libsrc/cbm610/ksetnam.s
index c377b3bb6e63ad21ac0568b21bd1c9d5574418b0..aeb72bd0b1d63cfd82df62ddade305cb2d099dd8 100644 (file)
--- a/libsrc/cbm610/ksetnam.s
+++ b/libsrc/cbm610/ksetnam.s
@@ -12,9 +12,8 @@
 
         .import         sys_bank, restore_bank
         .import         sysp0: zp, ktmp: zp
-
-       .include        "cbm610.inc"
-
+                                                  
+        .include        "cbm610.inc"
 
 .proc   SETNAM
 
@@ -23,7 +22,7 @@
         sty     ktmp
 
         txa
-        ldy     #FNAM_ADR
+        ldy     #$90                    ; FNAM
         sta     (sysp0),y
 
         lda     ktmp
@@ -31,10 +30,10 @@
         sta     (sysp0),y
 
        lda     ExecReg                 ; Assume name is always in this segment
-       ldy     #FNAM_SEG
+       ldy     #$92                    ; FNAM_SEG
        sta     (sysp0),y
 
-        ldy     #FNAM_LEN
+        ldy     #$9D                    ; FNAM_LEN
         pla
         sta     (sysp0),y
         ldy     ktmp

diff --git a/libsrc/cbm610/revers.s b/libsrc/cbm610/revers.s
index d5958a64ddc41a30ddb5c2cc14bbe1d5b4b9faa0..10dba117ebf9ccbe32f9509609b376b27518fc94 100644 (file)
--- a/libsrc/cbm610/revers.s
+++ b/libsrc/cbm610/revers.s
@@ -6,7 +6,10 @@
 
        .export         _revers
 
+        .import         RVS: zp
+
         .include        "cbm610.inc"
+                               
 
 .proc   _revers