Rename FNAM_ADR to FNAM, use new := operator for addresses

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

diff --git a/libsrc/plus4/ksetnam.s b/libsrc/plus4/ksetnam.s
index 283fbea186a9d353ad2114796f76f1dcb7299f86..93ecbc74aa709163a4c8e467ca087027812bda4b 100644 (file)
--- a/libsrc/plus4/ksetnam.s
+++ b/libsrc/plus4/ksetnam.s
@@ -47,8 +47,8 @@
 
 ; Instead of banking in the ROM, store the values directly into the zeropage
 
-@L3:    stx     FNAM_ADR
-        sty     FNAM_ADR+1
+@L3:    stx     FNAM
+        sty     FNAM+1
 
 ; Return to caller
 

diff --git a/libsrc/plus4/plus4.inc b/libsrc/plus4/plus4.inc
index 0d51f0aaf852816703c85de220bd3b1297255e70..aab3b7ac1ef7de6b2201afe57537fb64458012c0 100644 (file)
--- a/libsrc/plus4/plus4.inc
+++ b/libsrc/plus4/plus4.inc
@@ -6,40 +6,40 @@
 ; ---------------------------------------------------------------------------
 ; Zero page, Commodore stuff
 
-TMPPTR          = $22           ; Temporary ptr used by BASIC
-ST             = $90           ; IEC status byte
-TIME            = $A3           ; 60HZ clock
-FNAM_LEN               = $AB           ; Length of filename
-LFN             = $AC           ; Logical file number
-SECADR         = $AD           ; Secondary address
-DEVNUM         = $AE           ; Device number
-FNAM_ADR        = $AF           ; Pointer to filename for OPEN
-KEY_COUNT              = $EF           ; Number of keys in input buffer
-RVS             = $C2           ; Reverse flag
-CURS_X         = $CA           ; Cursor column
-CURS_Y         = $CD           ; Cursor row
-SCREEN_PTR     = $C8           ; Pointer to current char in text screen
-CRAM_PTR       = $EA           ; Pointer to current char in color RAM
-
-INBUF          = $25E          ; BASIC Input buffer
-CHARCOLOR       = $53B
-FKEY_COUNT     = $55D          ; Characters for function key
-FKEY_SPACE     = $55F          ; Function key definitions
-FKEY_ORIG      = $F3D2         ; Original definitions
+TMPPTR          := $22          ; Temporary ptr used by BASIC
+ST                     := $90          ; IEC status byte
+TIME            := $A3          ; 60HZ clock
+FNAM_LEN               := $AB          ; Length of filename
+LFN             := $AC          ; Logical file number
+SECADR                 := $AD          ; Secondary address
+DEVNUM                 := $AE          ; Device number
+FNAM            := $AF          ; Pointer to filename for OPEN
+KEY_COUNT              := $EF          ; Number of keys in input buffer
+RVS             := $C2          ; Reverse flag
+CURS_X                 := $CA          ; Cursor column
+CURS_Y                 := $CD          ; Cursor row
+SCREEN_PTR             := $C8          ; Pointer to current char in text screen
+CRAM_PTR               := $EA          ; Pointer to current char in color RAM
+
+INBUF                  := $25E         ; BASIC Input buffer
+CHARCOLOR       := $53B
+FKEY_COUNT             := $55D         ; Characters for function key
+FKEY_SPACE             := $55F         ; Function key definitions
+FKEY_ORIG              := $F3D2        ; Original definitions
 
 ; ---------------------------------------------------------------------------
 ; Kernal routines
 
 ; Direct entries
-CLRSCR         = $D88B
-KBDREAD                = $D8C1
+CLRSCR                 := $D88B
+KBDREAD                := $D8C1
 
 ; ---------------------------------------------------------------------------
 ; Vector and other locations
 
-IRQVec         = $0314
-BRKVec         = $0316
-NMIVec         = $0318
+IRQVec                 := $0314
+BRKVec                 := $0316
+NMIVec                 := $0318
 
 ; ---------------------------------------------------------------------------
 ; Screen size
@@ -50,34 +50,34 @@ YSIZE           = 25
 ; ---------------------------------------------------------------------------
 ; I/O
 
-TED_T1LO       = $FF00
-TED_T1HI       = $FF01
-TED_T2LO       = $FF02
-TED_T2HI       = $FF03
-TED_T3LO       = $FF04
-TED_T4HI       = $FF05
-TED_MULTI1      = $FF07
-TED_KBD                = $FF08
-TED_CURSHI     = $FF0C
-TED_CURSLO     = $FF0D
-TED_V1FRQLO    = $FF0E
-TED_V2FRQLO    = $FF0F
-TED_V2FRQHI    = $FF10
-TED_BGCOLOR    = $FF15
-TED_COLOR1     = $FF16
-TED_COLOR2     = $FF17
-TED_COLOR3     = $FF18
-TED_BORDERCOLOR        = $FF19
-TED_VLINEHI    = $FF1C
-TED_VLINELO    = $FF1D
-TED_HPOS       = $FF1E
-TED_ROMSEL     = $FF3E
-TED_RAMSEL     = $FF3F
+TED_T1LO               := $FF00
+TED_T1HI               := $FF01
+TED_T2LO               := $FF02
+TED_T2HI               := $FF03
+TED_T3LO               := $FF04
+TED_T4HI               := $FF05
+TED_MULTI1      := $FF07
+TED_KBD                := $FF08
+TED_CURSHI             := $FF0C
+TED_CURSLO             := $FF0D
+TED_V1FRQLO            := $FF0E
+TED_V2FRQLO            := $FF0F
+TED_V2FRQHI            := $FF10
+TED_BGCOLOR            := $FF15
+TED_COLOR1             := $FF16
+TED_COLOR2             := $FF17
+TED_COLOR3             := $FF18
+TED_BORDERCOLOR        := $FF19
+TED_VLINEHI            := $FF1C
+TED_VLINELO            := $FF1D
+TED_HPOS               := $FF1E
+TED_ROMSEL             := $FF3E
+TED_RAMSEL             := $FF3F
 
 ; ---------------------------------------------------------------------------
 ; RAM/ROM selection addresses
 
-ENABLE_ROM      = TED_ROMSEL
-ENABLE_RAM      = TED_RAMSEL
+ENABLE_ROM      := TED_ROMSEL
+ENABLE_RAM      := TED_RAMSEL