]> git.sur5r.net Git - cc65/commitdiff
Moved most platform assembler includes into asminc, so they will be available
authoruz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Thu, 24 Sep 2009 17:44:22 +0000 (17:44 +0000)
committeruz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Thu, 24 Sep 2009 17:44:22 +0000 (17:44 +0000)
in the distribution.
Added --forget-inc-paths to the command line of the assembler in the
Makefiles, because the assembler does now have builtin paths and will find
include files from an installation first.
Hopefully fixed any problems that arose from the two changes.

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

43 files changed:
asminc/c128.inc [new file with mode: 0644]
asminc/c64.inc [new file with mode: 0644]
asminc/cbm510.inc [new file with mode: 0644]
asminc/cbm610.inc [new file with mode: 0644]
asminc/nes.inc [new file with mode: 0644]
asminc/plus4.inc [new file with mode: 0644]
asminc/supervision.inc [new file with mode: 0644]
asminc/vic20.inc [new file with mode: 0644]
libsrc/apple2/Makefile
libsrc/apple2enh/Makefile
libsrc/atari/Makefile
libsrc/c128/Makefile
libsrc/c128/c128.inc [deleted file]
libsrc/c16/Makefile
libsrc/c16/break.s
libsrc/c16/c16-ram.s
libsrc/c16/cgetc.s
libsrc/c16/clrscr.s
libsrc/c16/color.s
libsrc/c16/conio.s
libsrc/c16/cputc.s
libsrc/c16/crt0.s
libsrc/c16/get_tv.s
libsrc/c16/kbhit.s
libsrc/c16/mainargs.s
libsrc/c16/randomize.s
libsrc/c16/revers.s
libsrc/c64/Makefile
libsrc/c64/c64.inc [deleted file]
libsrc/cbm510/Makefile
libsrc/cbm510/cbm510.inc [deleted file]
libsrc/cbm610/Makefile
libsrc/cbm610/cbm610.inc [deleted file]
libsrc/lynx/Makefile
libsrc/nes/Makefile
libsrc/nes/nes.inc [deleted file]
libsrc/plus4/Makefile
libsrc/plus4/plus4-stdjoy.s
libsrc/plus4/plus4.inc [deleted file]
libsrc/supervision/Makefile
libsrc/supervision/supervision.inc [deleted file]
libsrc/vic20/Makefile
libsrc/vic20/vic20.inc [deleted file]

diff --git a/asminc/c128.inc b/asminc/c128.inc
new file mode 100644 (file)
index 0000000..ffe531b
--- /dev/null
@@ -0,0 +1,213 @@
+;
+; C64 generic definitions. Stolen from Elite128
+;
+
+
+; ---------------------------------------------------------------------------
+; Zero page, Commodore stuff
+
+ST                     := $90          ; IEC status byte
+
+TIME            := $A0          ; 60HZ clock
+FNAM_LEN               := $B7          ; Length of filename
+SECADR                 := $B9          ; Secondary address
+DEVNUM                 := $BA          ; Device number
+FNAM           := $BB          ; Address of filename
+FNAM_BANK              := $C7          ; Bank for filename
+KEY_COUNT              := $D0          ; Number of keys in input buffer
+FKEY_COUNT             := $D1          ; Characters for function key
+MODE                   := $D7          ; 40/80 column mode flag
+CURS_X                 := $EC          ; Cursor column
+CURS_Y                 := $EB          ; Cursor row
+SCREEN_PTR             := $E0          ; Pointer to current char in text screen
+CRAM_PTR               := $E2          ; Pointer to current char in color RAM
+
+CHARCOLOR       := $F1
+RVS             := $F3          ; Reverse output flag
+SCROLL                 := $F8          ; Disable scrolling flag
+
+BASIC_BUF              := $200         ; Location of command-line
+BASIC_BUF_LEN          = 162           ; Maximum length of command-line
+
+FETCH           := $2A2         ; Fetch subroutine in RAM
+FETVEC          := $2AA         ; Vector patch location for FETCH
+STASH           := $2AF         ; Stash routine in RAM
+STAVEC          := $2B9         ; Vector patch location for STASH
+PALFLAG         := $A03         ; $FF=PAL, $00=NTSC
+INIT_STATUS    := $A04         ; Flag: Reset/NMI Status
+FKEY_LEN       := $1000        ; Function key lengths
+FKEY_TEXT      := $100A        ; Function key texts
+
+; ---------------------------------------------------------------------------
+; Kernal routines
+
+; Direct entries
+CURS_SET               := $CD57
+CURS_ON                := $CD6F
+CURS_OFF        := $CD9F
+CLRSCR                 := $C142
+KBDREAD                := $C006
+NEWLINE                := $C363
+PRINT                  := $C322
+NMIEXIT         := $FF33
+INDFET          := $FF74
+
+; ---------------------------------------------------------------------------
+; Vectors
+
+IRQVec                 := $0314
+BRKVec                 := $0316
+NMIVec                 := $0318
+KeyStoreVec            := $033C
+
+; ---------------------------------------------------------------------------
+; I/O: VIC
+
+VIC                    := $D000
+VIC_SPR0_X             := $D000
+VIC_SPR0_Y             := $D001
+VIC_SPR1_X             := $D002
+VIC_SPR1_Y             := $D003
+VIC_SPR2_X             := $D004
+VIC_SPR2_Y             := $D005
+VIC_SPR3_X             := $D006
+VIC_SPR3_Y             := $D007
+VIC_SPR4_X             := $D008
+VIC_SPR4_Y             := $D009
+VIC_SPR5_X             := $D00A
+VIC_SPR5_Y             := $D00B
+VIC_SPR6_X             := $D00C
+VIC_SPR6_Y             := $D00D
+VIC_SPR7_X             := $D00E
+VIC_SPR7_Y             := $D00F
+VIC_SPR_HI_X           := $D010
+VIC_SPR_ENA            := $D015
+VIC_SPR_EXP_Y          := $D017
+VIC_SPR_EXP_X          := $D01D
+VIC_SPR_MCOLOR         := $D01C
+VIC_SPR_BG_PRIO := $D01B
+
+VIC_SPR_MCOLOR0 := $D025
+VIC_SPR_MCOLOR1 := $D026
+
+VIC_SPR0_COLOR         := $D027
+VIC_SPR1_COLOR         := $D028
+VIC_SPR2_COLOR         := $D029
+VIC_SPR3_COLOR         := $D02A
+VIC_SPR4_COLOR         := $D02B
+VIC_SPR5_COLOR         := $D02C
+VIC_SPR6_COLOR         := $D02D
+VIC_SPR7_COLOR         := $D02E
+
+VIC_CTRL1              := $D011
+VIC_CTRL2              := $D016
+
+VIC_HLINE              := $D012
+
+VIC_VIDEO_ADR          := $D018
+
+VIC_IRR                := $D019        ; Interrupt request register
+VIC_IMR                := $D01A        ; Interrupt mask register
+
+VIC_BORDERCOLOR := $D020
+VIC_BG_COLOR0          := $D021
+VIC_BG_COLOR1          := $D022
+VIC_BG_COLOR2          := $D023
+VIC_BG_COLOR3          := $D024
+
+; 128 stuff:
+VIC_KBD_128            := $D02F        ; Extended kbd bits (visible in 64 mode)
+VIC_CLK_128            := $D030        ; Clock rate register (visible in 64 mode)
+
+
+; ---------------------------------------------------------------------------
+; I/O: SID
+
+SID                    := $D400
+SID_S1Lo               := $D400
+SID_S1Hi               := $D401
+SID_PB1Lo              := $D402
+SID_PB1Hi              := $D403
+SID_Ctl1               := $D404
+SID_AD1                := $D405
+SID_SUR1               := $D406
+
+SID_S2Lo               := $D407
+SID_S2Hi               := $D408
+SID_PB2Lo              := $D409
+SID_PB2Hi              := $D40A
+SID_Ctl2               := $D40B
+SID_AD2                := $D40C
+SID_SUR2               := $D40D
+
+SID_S3Lo               := $D40E
+SID_S3Hi               := $D40F
+SID_PB3Lo              := $D410
+SID_PB3Hi              := $D411
+SID_Ctl3               := $D412
+SID_AD3                := $D413
+SID_SUR3               := $D414
+
+SID_FltLo              := $D415
+SID_FltHi              := $D416
+SID_FltCtl             := $D417
+SID_Amp                := $D418
+SID_ADConv1            := $D419
+SID_ADConv2            := $D41A
+SID_Noise              := $D41B
+SID_Read3              := $D41C
+
+; ---------------------------------------------------------------------------
+; I/O: VDC (128 only)
+
+VDC_INDEX              := $D600
+VDC_DATA               := $D601
+
+; ---------------------------------------------------------------------------
+; I/O: CIAs
+
+CIA1                   := $DC00
+CIA1_PRA               := $DC00
+CIA1_PRB               := $DC01
+CIA1_DDRA              := $DC02
+CIA1_DDRB              := $DC03
+CIA1_TOD10      := $DC08
+CIA1_TODSEC     := $DC09
+CIA1_TODMIN     := $DC0A
+CIA1_TODHR      := $DC0B
+CIA1_ICR               := $DC0D
+CIA1_CRA               := $DC0E
+CIA1_CRB               := $DC0F
+
+CIA2                   := $DD00
+CIA2_PRA               := $DD00
+CIA2_PRB               := $DD01
+CIA2_DDRA              := $DD02
+CIA2_DDRB              := $DD03
+CIA2_TOD10      := $DD08
+CIA2_TODSEC     := $DD09
+CIA2_TODMIN     := $DD0A
+CIA2_TODHR      := $DD0B
+CIA2_ICR               := $DD0D
+CIA2_CRA               := $DD0E
+CIA2_CRB               := $DD0F
+
+; ---------------------------------------------------------------------------
+; I/O: MMU
+
+MMU_CR                 := $FF00
+MMU_CFG_CC65    := %00001110    ; Bank 0 with kernal ROM
+MMU_CFG_RAM0           := %00111111    ; Bank 0 full RAM
+MMU_CFG_RAM1    := %01111111    ; Bank 1 full RAM
+
+; ---------------------------------------------------------------------------
+; Super CPU
+
+SCPU_VIC_Bank1         := $D075
+SCPU_Slow              := $D07A
+SCPU_Fast              := $D07B
+SCPU_EnableRegs := $D07E
+SCPU_DisableRegs:= $D07F
+SCPU_Detect            := $D0BC
+
+
diff --git a/asminc/c64.inc b/asminc/c64.inc
new file mode 100644 (file)
index 0000000..715e11d
--- /dev/null
@@ -0,0 +1,212 @@
+;
+; C64 generic definitions. Stolen from Elite128
+;
+
+
+; ---------------------------------------------------------------------------
+; Zero page, Commodore stuff
+
+ST                     := $90          ; IEC status byte
+
+TIME            := $A0          ; 60 HZ clock
+FNAM_LEN               := $B7          ; Length of filename
+SECADR                 := $B9          ; Secondary address
+DEVNUM                 := $BA          ; Device number
+FNAM            := $BB          ; Pointer to filename
+KEY_COUNT              := $C6          ; Number of keys in input buffer
+RVS             := $C7          ; Reverse flag
+CURS_FLAG              := $CC          ; 1 = cursor off
+CURS_BLINK             := $CD          ; Blink counter
+CURS_CHAR              := $CE          ; Character under the cursor
+CURS_STATE             := $CF          ; Cursor blink state
+SCREEN_PTR             := $D1          ; Pointer to current char in text screen
+CURS_X                 := $D3          ; Cursor column
+CURS_Y                 := $D6          ; Cursor row
+CRAM_PTR               := $F3          ; Pointer to current char in color RAM
+
+BASIC_BUF              := $200         ; Location of command-line
+BASIC_BUF_LEN  = 89            ; Maximum length of command-line
+
+CHARCOLOR       := $286
+CURS_COLOR      := $287                ; Color under the cursor
+PALFLAG                := $2A6         ; $01 = PAL, $00 = NTSC
+
+
+; ---------------------------------------------------------------------------
+; Kernal routines
+
+; Direct entries
+CLRSCR                 := $E544
+KBDREAD                := $E5B4
+NMIEXIT         := $FEBC
+
+; ---------------------------------------------------------------------------
+; Vector and other locations
+
+IRQVec                 := $0314
+BRKVec                 := $0316
+NMIVec                 := $0318
+
+; ---------------------------------------------------------------------------
+; Screen size
+
+XSIZE           = 40
+YSIZE           = 25
+
+; ---------------------------------------------------------------------------
+; I/O: VIC
+
+VIC                    := $D000
+VIC_SPR0_X             := $D000
+VIC_SPR0_Y             := $D001
+VIC_SPR1_X             := $D002
+VIC_SPR1_Y             := $D003
+VIC_SPR2_X             := $D004
+VIC_SPR2_Y             := $D005
+VIC_SPR3_X             := $D006
+VIC_SPR3_Y             := $D007
+VIC_SPR4_X             := $D008
+VIC_SPR4_Y             := $D009
+VIC_SPR5_X             := $D00A
+VIC_SPR5_Y             := $D00B
+VIC_SPR6_X             := $D00C
+VIC_SPR6_Y             := $D00D
+VIC_SPR7_X             := $D00E
+VIC_SPR7_Y             := $D00F
+VIC_SPR_HI_X           := $D010
+VIC_SPR_ENA            := $D015
+VIC_SPR_EXP_Y          := $D017
+VIC_SPR_EXP_X          := $D01D
+VIC_SPR_MCOLOR         := $D01C
+VIC_SPR_BG_PRIO := $D01B
+
+VIC_SPR_MCOLOR0 := $D025
+VIC_SPR_MCOLOR1 := $D026
+
+VIC_SPR0_COLOR         := $D027
+VIC_SPR1_COLOR         := $D028
+VIC_SPR2_COLOR         := $D029
+VIC_SPR3_COLOR         := $D02A
+VIC_SPR4_COLOR         := $D02B
+VIC_SPR5_COLOR         := $D02C
+VIC_SPR6_COLOR         := $D02D
+VIC_SPR7_COLOR         := $D02E
+
+VIC_CTRL1              := $D011
+VIC_CTRL2              := $D016
+
+VIC_HLINE              := $D012
+
+VIC_VIDEO_ADR          := $D018
+
+VIC_IRR                := $D019        ; Interrupt request register
+VIC_IMR                := $D01A        ; Interrupt mask register
+
+VIC_BORDERCOLOR := $D020
+VIC_BG_COLOR0          := $D021
+VIC_BG_COLOR1          := $D022
+VIC_BG_COLOR2          := $D023
+VIC_BG_COLOR3          := $D024
+
+; 128 stuff:
+VIC_KBD_128            := $D02F        ; Extended kbd bits (visible in 64 mode)
+VIC_CLK_128            := $D030        ; Clock rate register (visible in 64 mode)
+
+
+; ---------------------------------------------------------------------------
+; I/O: SID
+
+SID                    := $D400
+SID_S1Lo               := $D400
+SID_S1Hi               := $D401
+SID_PB1Lo              := $D402
+SID_PB1Hi              := $D403
+SID_Ctl1               := $D404
+SID_AD1                := $D405
+SID_SUR1               := $D406
+
+SID_S2Lo               := $D407
+SID_S2Hi               := $D408
+SID_PB2Lo              := $D409
+SID_PB2Hi              := $D40A
+SID_Ctl2               := $D40B
+SID_AD2                := $D40C
+SID_SUR2               := $D40D
+
+SID_S3Lo               := $D40E
+SID_S3Hi               := $D40F
+SID_PB3Lo              := $D410
+SID_PB3Hi              := $D411
+SID_Ctl3               := $D412
+SID_AD3                := $D413
+SID_SUR3               := $D414
+
+SID_FltLo              := $D415
+SID_FltHi              := $D416
+SID_FltCtl             := $D417
+SID_Amp                := $D418
+SID_ADConv1            := $D419
+SID_ADConv2            := $D41A
+SID_Noise              := $D41B
+SID_Read3              := $D41C
+
+; ---------------------------------------------------------------------------
+; I/O: VDC (128 only)
+
+VDC_INDEX              := $D600
+VDC_DATA               := $D601
+
+; ---------------------------------------------------------------------------
+; I/O: CIAs
+
+CIA1                   := $DC00
+CIA1_PRA               := $DC00
+CIA1_PRB               := $DC01
+CIA1_DDRA              := $DC02
+CIA1_DDRB              := $DC03
+CIA1_TOD10      := $DC08
+CIA1_TODSEC     := $DC09
+CIA1_TODMIN     := $DC0A
+CIA1_TODHR      := $DC0B
+CIA1_ICR               := $DC0D
+CIA1_CRA               := $DC0E
+CIA1_CRB               := $DC0F
+
+CIA2                   := $DD00
+CIA2_PRA               := $DD00
+CIA2_PRB               := $DD01
+CIA2_DDRA              := $DD02
+CIA2_DDRB              := $DD03
+CIA2_TOD10      := $DD08
+CIA2_TODSEC     := $DD09
+CIA2_TODMIN     := $DD0A
+CIA2_TODHR      := $DD0B
+CIA2_ICR               := $DD0D
+CIA2_CRA               := $DD0E
+CIA2_CRB               := $DD0F
+
+; ---------------------------------------------------------------------------
+; Super CPU
+
+SCPU_VIC_Bank1         := $D075
+SCPU_Slow              := $D07A
+SCPU_Fast              := $D07B
+SCPU_EnableRegs := $D07E
+SCPU_DisableRegs:= $D07F
+SCPU_Detect            := $D0BC
+
+
+; ---------------------------------------------------------------------------
+; Processor Port at $01
+
+LORAM          = $01           ; Enable the basic rom
+HIRAM          = $02           ; Enable the kernal rom
+IOEN           = $04           ; Enable I/O
+CASSDATA       = $08           ; Cassette data
+CASSPLAY       = $10           ; Cassette: Play
+CASSMOT                = $20           ; Cassette motor on
+TP_FAST                = $80           ; Switch Rossmoeller TurboProcess to fast mode
+
+RAMONLY                = $F8           ; (~(LORAM | HIRAM | IOEN)) & $FF
+
+
diff --git a/asminc/cbm510.inc b/asminc/cbm510.inc
new file mode 100644 (file)
index 0000000..0aad95f
--- /dev/null
@@ -0,0 +1,182 @@
+;
+; Zero page variables and I/O definitions for the CBM 510
+;
+; Taken from a kernal disassembly done by myself in 2000/2001.
+;
+; Ullrich von Bassewitz, 13.09.2001
+
+
+;-----------------------------------------------------------------------------
+; Zeropage stuff
+
+ExecReg                = $0000
+IndReg         = $0001
+
+; ---------------------------------------------------------------------------
+; Screen size
+
+XSIZE           = 40
+YSIZE           = 25
+
+;-----------------------------------------------------------------------------
+; I/O Definitions
+
+; I/O  $d800: VIC
+
+VIC_SPR0_X             = $00
+VIC_SPR0_Y             = $01
+VIC_SPR1_X             = $02
+VIC_SPR1_Y             = $03
+VIC_SPR2_X             = $04
+VIC_SPR2_Y             = $05
+VIC_SPR3_X             = $06
+VIC_SPR3_Y             = $07
+VIC_SPR4_X             = $08
+VIC_SPR4_Y             = $09
+VIC_SPR5_X             = $0A
+VIC_SPR5_Y             = $0B
+VIC_SPR6_X             = $0C
+VIC_SPR6_Y             = $0D
+VIC_SPR7_X             = $0E
+VIC_SPR7_Y             = $0F
+VIC_SPR_HI_X           = $10
+VIC_SPR_ENA            = $15
+VIC_SPR_EXP_Y          = $17
+VIC_SPR_EXP_X          = $1D
+VIC_SPR_MCOLOR         = $1C
+VIC_SPR_BG_PRIO = $1B
+
+VIC_SPR_MCOLOR0 = $25
+VIC_SPR_MCOLOR1 = $26
+
+VIC_SPR0_COLOR         = $27
+VIC_SPR1_COLOR         = $28
+VIC_SPR2_COLOR         = $29
+VIC_SPR3_COLOR         = $2A
+VIC_SPR4_COLOR         = $2B
+VIC_SPR5_COLOR         = $2C
+VIC_SPR6_COLOR         = $2D
+VIC_SPR7_COLOR         = $2E
+
+VIC_CTRL1              = $11
+VIC_CTRL2              = $16
+
+VIC_HLINE              = $12
+
+VIC_VIDEO_ADR          = $18
+
+VIC_IRR                = $19           ; Interrupt request register
+VIC_IMR                = $1A           ; Interrupt mask register
+
+VIC_BORDERCOLOR = $20
+VIC_BG_COLOR0          = $21
+VIC_BG_COLOR1          = $22
+VIC_BG_COLOR2          = $23
+VIC_BG_COLOR3          = $24
+
+
+
+; I/O  $da00: SID 6581
+
+SID_S1Lo               = $00
+SID_S1Hi               = $01
+SID_PB1Lo              = $02
+SID_PB1Hi              = $03
+SID_Ctl1               = $04
+SID_AD1                = $05
+SID_SUR1               = $06
+
+SID_S2Lo               = $07
+SID_S2Hi               = $08
+SID_PB2Lo              = $09
+SID_PB2Hi              = $0A
+SID_Ctl2               = $0B
+SID_AD2                = $0C
+SID_SUR2               = $0D
+
+SID_S3Lo               = $0E
+SID_S3Hi               = $0F
+SID_PB3Lo              = $10
+SID_PB3Hi              = $11
+SID_Ctl3               = $12
+SID_AD3                = $13
+SID_SUR3               = $14
+
+SID_FltLo              = $15
+SID_FltHi              = $16
+SID_FltCtl             = $17
+SID_Amp                = $18
+SID_ADConv1            = $19
+SID_ADConv2            = $1A
+SID_Noise              = $1B
+SID_Read3              = $1C
+
+
+; I/O  $db00: CIA 6526 Inter Process Communication
+; I/O  $dc00: CIA 6526
+
+.struct CIA
+        PRA     .byte
+        PRB     .byte
+        DDRA    .byte
+        DDRB    .byte
+        .union
+            .struct
+                TALO    .byte
+                TAHI    .byte
+            .endstruct
+            TA          .word
+        .endunion
+        .union
+            .struct
+                TBLO    .byte
+                TBHI    .byte
+            .endstruct
+            TB          .word
+        .endunion
+        TOD10   .byte
+        TODSEC  .byte
+        TODMIN  .byte
+        TODHR   .byte
+        SDR     .byte
+        ICR     .byte
+        CRA     .byte
+        CRB     .byte
+.endstruct
+
+
+; I/O  $dd00: ACIA 6551
+
+.struct ACIA
+        DATA    .byte
+        STATUS  .byte
+        CMD     .byte
+        CTRL    .BYTE
+.endstruct
+
+
+; I/O  $de00: Triport #1 6525
+; I/O  $df00: Triport #2 6525
+
+.struct TPI
+        PRA     .byte
+        PRB     .byte
+        .union
+                PRC     .byte
+                INT     .byte
+        .endunion
+        DDRA    .byte
+        DDRB    .byte
+        .union
+                DDRC    .byte
+                IMR     .byte
+        .endunion
+        CR      .byte
+        AIR     .byte
+.endstruct
+
+
+; Out video memory address
+
+COLOR_RAM   = $D400                    ; System bank
+
diff --git a/asminc/cbm610.inc b/asminc/cbm610.inc
new file mode 100644 (file)
index 0000000..ea85cd5
--- /dev/null
@@ -0,0 +1,110 @@
+;
+; Zeropage and I/O definitions for the CBM 610
+;
+; Taken from a kernal disassembly done by myself in 1987.
+;
+; Ullrich von Bassewitz, 28.09.1998
+
+
+; ---------------------------------------------------------------------------
+; Zeropage registers
+
+ExecReg                = $00
+IndReg         = $01
+
+; ---------------------------------------------------------------------------
+; Screen size
+
+XSIZE           = 80
+YSIZE           = 25
+
+; ---------------------------------------------------------------------------
+; I/O definitions
+
+
+; I/O  $d800: CRTC 6545
+
+.struct CRTC
+        ADDR           .byte
+        DATA           .byte
+.endstruct
+
+; I/O  $db00: CIA 6526 Inter Process Communication
+;
+;      IPCcia          =       $db00
+
+.struct CIA
+        PRA     .byte
+        PRB     .byte
+        DDRA    .byte
+        DDRB    .byte
+        .union
+            .struct
+                TALO    .byte
+                TAHI    .byte
+            .endstruct
+            TA          .word
+        .endunion
+        .union
+            .struct
+                TBLO    .byte
+                TBHI    .byte
+            .endstruct
+            TB          .word
+        .endunion
+        TOD10   .byte
+        TODSEC  .byte
+        TODMIN  .byte
+        TODHR   .byte
+        SDR     .byte
+        ICR     .byte
+        CRA     .byte
+        CRB     .byte
+.endstruct
+
+
+; I/O  $dc00: CIA 6526
+;
+;      cia             =       $dc00
+
+
+
+; I/O  $dd00: ACIA 6551
+;
+;      acia            =       $dd00
+
+.struct ACIA
+        DATA    .byte
+        STATUS  .byte
+        CMD     .byte
+        CTRL    .BYTE
+.endstruct
+
+
+; I/O  $de00: Triport #1 6525
+;
+;      tpi1            =       $de00
+
+.struct TPI
+        PRA     .byte
+        PRB     .byte
+        .union
+                PRC     .byte
+                INT     .byte
+        .endunion
+        DDRA    .byte
+        DDRB    .byte
+        .union
+                DDRC    .byte
+                IMR     .byte
+        .endunion
+        CR      .byte
+        AIR     .byte
+.endstruct
+
+
+; I/O  $df00: Triport #2 6525
+
+;      tpi2            =       $df00
+
+
diff --git a/asminc/nes.inc b/asminc/nes.inc
new file mode 100644 (file)
index 0000000..1ee5ebc
--- /dev/null
@@ -0,0 +1,93 @@
+;
+; NES definitions. By Groepaz/Hitmem.
+;
+
+
+;; FIXME: optimize zeropage usage
+
+SCREEN_PTR     = $62           ;2
+CRAM_PTR        = $64           ;2
+CHARCOLOR      = $66
+BGCOLOR                = $67
+RVS            = $68
+CURS_X         = $69
+CURS_Y         = $6a
+
+tickcount       = $6b           ;2
+
+VBLANK_FLAG    = $70
+
+ringbuff        = $0200
+ringwrite       = $71
+ringread        = $72
+ringcount       = $73
+
+ppuhi           = $74
+ppulo           = $75
+ppuval          = $76
+
+screenrows     = (30-1)
+charsperline    = 32
+xsize           = charsperline
+
+;; PPU defines
+
+PPU_CTRL1              = $2000
+PPU_CTRL2      = $2001
+PPU_STATUS     = $2002
+PPU_SPR_ADDR   = $2003
+PPU_SPR_IO     = $2004
+PPU_VRAM_ADDR1 = $2005
+PPU_VRAM_ADDR2 = $2006
+PPU_VRAM_IO    = $2007
+
+;; APU defines
+
+APU_PULSE1CTRL  = $4000         ; Pulse #1 Control Register (W)
+APU_PULSE1RAMP  = $4001         ; Pulse #1 Ramp Control Register (W)
+APU_PULSE1FTUNE = $4002         ; Pulse #1 Fine Tune (FT) Register (W)
+APU_PULSE1CTUNE = $4003         ; Pulse #1 Coarse Tune (CT) Register (W)
+APU_PULSE2CTRL  = $4004         ; Pulse #2 Control Register (W)
+APU_PULSE2RAMP  = $4005         ; Pulse #2 Ramp Control Register (W)
+APU_PULSE2FTUNE = $4006         ; Pulse #2 Fine Tune Register (W)
+APU_PULSE2STUNE = $4007         ; Pulse #2 Coarse Tune Register (W)
+APU_TRICTRL1    = $4008         ; Triangle Control Register #1 (W)
+APU_TRICTRL2    = $4009         ; Triangle Control Register #2 (?)
+APU_TRIFREQ1    = $400A         ; Triangle Frequency Register #1 (W)
+APU_TRIFREQ2    = $400B         ; Triangle Frequency Register #2 (W)
+APU_NOISECTRL   = $400C         ; Noise Control Register #1 (W)
+;;APU_ = $400D  ; Unused (???)
+APU_NOISEFREQ1  = $400E         ; Noise Frequency Register #1 (W)
+APU_NOISEFREQ2  = $400F         ; Noise Frequency Register #2 (W)
+APU_MODCTRL     = $4010         ; Delta Modulation Control Register (W)
+APU_MODDA       = $4011         ; Delta Modulation D/A Register (W)
+APU_MODADDR     = $4012         ; Delta Modulation Address Register (W)
+APU_MODLEN      = $4013         ; Delta Modulation Data Length Register (W)
+APU_SPR_DMA            = $4014         ; Sprite DMA Register (W)
+APU_CHANCTRL           = $4015         ; Sound/Vertical Clock Signal Register (R)
+APU_PAD1               = $4016         ; Joypad #1 (RW)
+APU_PAD2       = $4017         ; Joypad #2/SOFTCLK (RW)
+
+
+CH_HLINE       = 11
+CH_VLINE       = 14
+CH_ULCORNER    = 176
+CH_URCORNER    = 174
+CH_LLCORNER    = 173
+CH_LRCORNER    = 189
+CH_TTEE                = 178
+CH_RTEE                = 179
+CH_BTEE                = 177
+CH_LTEE                = 171
+CH_CROSS       = 123
+CH_CURS_UP             = 145
+CH_CURS_DOWN   = 17
+CH_CURS_LEFT   = 157
+CH_CURS_RIGHT  = 29
+CH_PI          = 126
+CH_DEL         = 20
+CH_INS         = 148
+CH_ENTER        = 10
+CH_STOP         = 3
+CH_ESC          = 27
+
diff --git a/asminc/plus4.inc b/asminc/plus4.inc
new file mode 100644 (file)
index 0000000..79d242e
--- /dev/null
@@ -0,0 +1,87 @@
+;
+; Plus/4 generic definitions.
+;
+
+
+; ---------------------------------------------------------------------------
+; 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            := $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
+
+BASIC_BUF              := $200         ; Location of command-line
+BASIC_BUF_LEN  = 89            ; Maximum length of command-line
+
+FNBUF                  := $25E         ; Buffer for filename
+FETCH           := $494         ; lda (zp),y from RAM
+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
+
+; ---------------------------------------------------------------------------
+; Vector and other locations
+
+IRQVec                 := $0314
+BRKVec                 := $0316
+NMIVec                 := $0318
+
+; ---------------------------------------------------------------------------
+; Screen size
+
+XSIZE           = 40
+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
+
+; ---------------------------------------------------------------------------
+; RAM/ROM selection addresses
+
+ENABLE_ROM      := TED_ROMSEL
+ENABLE_RAM      := TED_RAMSEL
+
+
diff --git a/asminc/supervision.inc b/asminc/supervision.inc
new file mode 100644 (file)
index 0000000..a75fb02
--- /dev/null
@@ -0,0 +1,76 @@
+; supervision symbols
+
+;  supervision 65c02s
+; in cc65 up to 2.9.1 65c02 means 65c02s
+.pc02
+
+lcd_addr = $4000
+LCD_LINESIZE = $30
+LCD_WIDTH = 160
+LCD_HEIGHT = 160
+; 2 bit per pixel, packed
+
+lcd_width = $2000
+lcd_height = $2001
+lcd_xpos = $2002 ; in pixel, bit 0+1 not used
+lcd_ypos = $2003 ; weird
+
+sv_port_r = $2021
+sv_port_w = $2022
+
+sv_timer_count = $2023
+; read for quitting
+sv_timer_quit = $2024
+
+; bit 0 timer, bit 1 dma
+sv_irq_source = $2027
+SV_IRQ_REQUEST_TIMER = 1
+SV_IRQ_REQUEST_DMA = 2
+
+; bit 5,6,7 select bank at 0x8000
+sv_bank = $2026
+SV_NMI_ENABLE_ON = 1
+SV_IRQ_ENABLE_TIMER = 2
+SV_IRQ_ENABLE_DMA = 4
+SV_LCD_ON = 8
+SV_TIMER_MODE_240Hz = $10 ; else 15360
+
+
+; low activ/pressed
+sv_control = $2020
+SV_RIGHT = 1
+SV_LEFT = 2
+SV_DOWN = 4
+SV_UP = 8
+SV_BUTTONB = $10
+SV_BUTTONA = $20
+SV_SELECT = $40
+SV_START = $80
+
+; frequency=125000/counter
+sv_audio_right_counter = $2010 ;word
+sv_audio_left_counter = $2014
+SV_AUDIO_ON =$40
+;bits 0..3 volume
+; bit 4 ?
+; bit 5 ?
+sv_audio_right_control = $2012
+sv_audio_left_control = $2016
+; write activates tone for x/60 sec (0 means 256)
+sv_audio_right_timer = $2013
+sv_audio_left_timer = $2017
+
+
+;read for irq quitting
+sv_dma_quit = $2025
+sv_dma_on = $201c
+; bit 7 true start, false stop
+sv_dma_start = $2018 ; word
+sv_dma_size = $201a ; *32 samples
+sv_dma_control = $201b
+; bit 0,1 speed: 0 15360, 11 15360/4
+; bit 2,3 volume: 0 silent, 11 loud
+
+sv_noise_volume = $2028 ; and frequency
+sv_noise_timer = $2029
+sv_noise_control = $202a
diff --git a/asminc/vic20.inc b/asminc/vic20.inc
new file mode 100644 (file)
index 0000000..4017625
--- /dev/null
@@ -0,0 +1,77 @@
+;
+; Vic20 generic definitions. Stolen mostly from c64.inc - Steve Schmidtke
+;
+
+
+; ---------------------------------------------------------------------------
+; Zero page, Commodore stuff
+
+ST                     := $90          ; IEC status byte
+
+TIME            := $A0          ; 60HZ clock
+FNAM_LEN               := $B7          ; Length of filename
+SECADR                 := $B9          ; Secondary address
+DEVNUM                 := $BA          ; Device number
+FNAM            := $BB          ; Pointer to filename
+KEY_COUNT              := $C6          ; Number of keys in input buffer
+RVS                    := $C7          ; Reverse flag
+CURS_FLAG              := $CC          ; 1 = cursor off
+CURS_BLINK             := $CD          ; Blink counter
+CURS_CHAR              := $CE          ; Character under the cursor
+CURS_STATE             := $CF          ; Cursor blink state
+SCREEN_PTR             := $D1          ; Pointer to current char in text screen
+CURS_X                 := $D3          ; Cursor column
+CURS_Y                 := $D6          ; Cursor row
+CRAM_PTR               := $F3          ; Pointer to current char in color RAM
+
+BASIC_BUF              := $200         ; Location of command-line
+BASIC_BUF_LEN  = 89            ; Maximum length of command-line
+
+CHARCOLOR       := $286
+CURS_COLOR      := $287                ; Color under the cursor
+
+
+; ---------------------------------------------------------------------------
+; Screen size
+
+XSIZE           = 22
+YSIZE           = 23
+
+; ---------------------------------------------------------------------------
+; Kernal routines
+
+; Direct entries
+CLRSCR                 := $E55F
+KBDREAD                := $E5CF
+
+; ---------------------------------------------------------------------------
+; Vector and other locations
+
+IRQVec                 := $0314
+BRKVec                 := $0316
+NMIVec                 := $0318
+
+; ---------------------------------------------------------------------------
+; I/O: 6560 VIC
+
+VIC                    := $9000
+VIC_LINES       := $9003        ; Screen lines, bit 7 is bit 0 from VIC_HLINE
+VIC_HLINE       := $9004        ; Rasterline, bits 1-8
+VIC_COLOR              := $900F        ; Border and background color
+
+; ---------------------------------------------------------------------------
+; I/O: 6522 VIA1
+
+VIA1                   := $9110
+VIA1_JOY               := $9111
+VIA1_DDRB              := $9112
+VIA1_DDRA              := $9113
+
+; ---------------------------------------------------------------------------
+; I/O: 6522 VIA2
+
+VIA2                   := $9120
+VIA2_JOY               := $9120
+VIA2_DDRB              := $9122
+VIA2_DDRA              := $9123
+
index adf96c6fe197d553b281abb2cf053a7a73d53f38..fe2bd1602bd531dde3c7d776a60abf21ac5e99d5 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
index e9e5d05f928e955a9931b2de379a4c1362bac455..af25f3eff2154476efeefba8f9c530028d99dc1f 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../apple2 -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../apple2 -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I ../apple2 -I ../../include
 
 #--------------------------------------------------------------------------
index 0ea8e48e9360fc0ba543b80d091542a775b438d0..4e0b93013c6a70f8862487985d71fbc43e8628d5 100644 (file)
@@ -30,7 +30,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
index 47f79575278f215f32d1522b3508e837c229f941..ee176650b247ac55e9221ab96d051cf4cf606bd7 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/c128/c128.inc b/libsrc/c128/c128.inc
deleted file mode 100644 (file)
index ffe531b..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-;
-; C64 generic definitions. Stolen from Elite128
-;
-
-
-; ---------------------------------------------------------------------------
-; Zero page, Commodore stuff
-
-ST                     := $90          ; IEC status byte
-
-TIME            := $A0          ; 60HZ clock
-FNAM_LEN               := $B7          ; Length of filename
-SECADR                 := $B9          ; Secondary address
-DEVNUM                 := $BA          ; Device number
-FNAM           := $BB          ; Address of filename
-FNAM_BANK              := $C7          ; Bank for filename
-KEY_COUNT              := $D0          ; Number of keys in input buffer
-FKEY_COUNT             := $D1          ; Characters for function key
-MODE                   := $D7          ; 40/80 column mode flag
-CURS_X                 := $EC          ; Cursor column
-CURS_Y                 := $EB          ; Cursor row
-SCREEN_PTR             := $E0          ; Pointer to current char in text screen
-CRAM_PTR               := $E2          ; Pointer to current char in color RAM
-
-CHARCOLOR       := $F1
-RVS             := $F3          ; Reverse output flag
-SCROLL                 := $F8          ; Disable scrolling flag
-
-BASIC_BUF              := $200         ; Location of command-line
-BASIC_BUF_LEN          = 162           ; Maximum length of command-line
-
-FETCH           := $2A2         ; Fetch subroutine in RAM
-FETVEC          := $2AA         ; Vector patch location for FETCH
-STASH           := $2AF         ; Stash routine in RAM
-STAVEC          := $2B9         ; Vector patch location for STASH
-PALFLAG         := $A03         ; $FF=PAL, $00=NTSC
-INIT_STATUS    := $A04         ; Flag: Reset/NMI Status
-FKEY_LEN       := $1000        ; Function key lengths
-FKEY_TEXT      := $100A        ; Function key texts
-
-; ---------------------------------------------------------------------------
-; Kernal routines
-
-; Direct entries
-CURS_SET               := $CD57
-CURS_ON                := $CD6F
-CURS_OFF        := $CD9F
-CLRSCR                 := $C142
-KBDREAD                := $C006
-NEWLINE                := $C363
-PRINT                  := $C322
-NMIEXIT         := $FF33
-INDFET          := $FF74
-
-; ---------------------------------------------------------------------------
-; Vectors
-
-IRQVec                 := $0314
-BRKVec                 := $0316
-NMIVec                 := $0318
-KeyStoreVec            := $033C
-
-; ---------------------------------------------------------------------------
-; I/O: VIC
-
-VIC                    := $D000
-VIC_SPR0_X             := $D000
-VIC_SPR0_Y             := $D001
-VIC_SPR1_X             := $D002
-VIC_SPR1_Y             := $D003
-VIC_SPR2_X             := $D004
-VIC_SPR2_Y             := $D005
-VIC_SPR3_X             := $D006
-VIC_SPR3_Y             := $D007
-VIC_SPR4_X             := $D008
-VIC_SPR4_Y             := $D009
-VIC_SPR5_X             := $D00A
-VIC_SPR5_Y             := $D00B
-VIC_SPR6_X             := $D00C
-VIC_SPR6_Y             := $D00D
-VIC_SPR7_X             := $D00E
-VIC_SPR7_Y             := $D00F
-VIC_SPR_HI_X           := $D010
-VIC_SPR_ENA            := $D015
-VIC_SPR_EXP_Y          := $D017
-VIC_SPR_EXP_X          := $D01D
-VIC_SPR_MCOLOR         := $D01C
-VIC_SPR_BG_PRIO := $D01B
-
-VIC_SPR_MCOLOR0 := $D025
-VIC_SPR_MCOLOR1 := $D026
-
-VIC_SPR0_COLOR         := $D027
-VIC_SPR1_COLOR         := $D028
-VIC_SPR2_COLOR         := $D029
-VIC_SPR3_COLOR         := $D02A
-VIC_SPR4_COLOR         := $D02B
-VIC_SPR5_COLOR         := $D02C
-VIC_SPR6_COLOR         := $D02D
-VIC_SPR7_COLOR         := $D02E
-
-VIC_CTRL1              := $D011
-VIC_CTRL2              := $D016
-
-VIC_HLINE              := $D012
-
-VIC_VIDEO_ADR          := $D018
-
-VIC_IRR                := $D019        ; Interrupt request register
-VIC_IMR                := $D01A        ; Interrupt mask register
-
-VIC_BORDERCOLOR := $D020
-VIC_BG_COLOR0          := $D021
-VIC_BG_COLOR1          := $D022
-VIC_BG_COLOR2          := $D023
-VIC_BG_COLOR3          := $D024
-
-; 128 stuff:
-VIC_KBD_128            := $D02F        ; Extended kbd bits (visible in 64 mode)
-VIC_CLK_128            := $D030        ; Clock rate register (visible in 64 mode)
-
-
-; ---------------------------------------------------------------------------
-; I/O: SID
-
-SID                    := $D400
-SID_S1Lo               := $D400
-SID_S1Hi               := $D401
-SID_PB1Lo              := $D402
-SID_PB1Hi              := $D403
-SID_Ctl1               := $D404
-SID_AD1                := $D405
-SID_SUR1               := $D406
-
-SID_S2Lo               := $D407
-SID_S2Hi               := $D408
-SID_PB2Lo              := $D409
-SID_PB2Hi              := $D40A
-SID_Ctl2               := $D40B
-SID_AD2                := $D40C
-SID_SUR2               := $D40D
-
-SID_S3Lo               := $D40E
-SID_S3Hi               := $D40F
-SID_PB3Lo              := $D410
-SID_PB3Hi              := $D411
-SID_Ctl3               := $D412
-SID_AD3                := $D413
-SID_SUR3               := $D414
-
-SID_FltLo              := $D415
-SID_FltHi              := $D416
-SID_FltCtl             := $D417
-SID_Amp                := $D418
-SID_ADConv1            := $D419
-SID_ADConv2            := $D41A
-SID_Noise              := $D41B
-SID_Read3              := $D41C
-
-; ---------------------------------------------------------------------------
-; I/O: VDC (128 only)
-
-VDC_INDEX              := $D600
-VDC_DATA               := $D601
-
-; ---------------------------------------------------------------------------
-; I/O: CIAs
-
-CIA1                   := $DC00
-CIA1_PRA               := $DC00
-CIA1_PRB               := $DC01
-CIA1_DDRA              := $DC02
-CIA1_DDRB              := $DC03
-CIA1_TOD10      := $DC08
-CIA1_TODSEC     := $DC09
-CIA1_TODMIN     := $DC0A
-CIA1_TODHR      := $DC0B
-CIA1_ICR               := $DC0D
-CIA1_CRA               := $DC0E
-CIA1_CRB               := $DC0F
-
-CIA2                   := $DD00
-CIA2_PRA               := $DD00
-CIA2_PRB               := $DD01
-CIA2_DDRA              := $DD02
-CIA2_DDRB              := $DD03
-CIA2_TOD10      := $DD08
-CIA2_TODSEC     := $DD09
-CIA2_TODMIN     := $DD0A
-CIA2_TODHR      := $DD0B
-CIA2_ICR               := $DD0D
-CIA2_CRA               := $DD0E
-CIA2_CRB               := $DD0F
-
-; ---------------------------------------------------------------------------
-; I/O: MMU
-
-MMU_CR                 := $FF00
-MMU_CFG_CC65    := %00001110    ; Bank 0 with kernal ROM
-MMU_CFG_RAM0           := %00111111    ; Bank 0 full RAM
-MMU_CFG_RAM1    := %01111111    ; Bank 1 full RAM
-
-; ---------------------------------------------------------------------------
-; Super CPU
-
-SCPU_VIC_Bank1         := $D075
-SCPU_Slow              := $D07A
-SCPU_Fast              := $D07B
-SCPU_EnableRegs := $D07E
-SCPU_DisableRegs:= $D07F
-SCPU_Detect            := $D0BC
-
-
index f8f4bf017ff777c7eb70d253225cde11b968d078..6aa5275ddbd5099614c4fc369b2bce0c7d25c9ec 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I. -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
index 76813595bd541463fbf59fe62314b71102216c6c..c51cc4b07bb21b2e24ace0df67bf7fb1bd1e00e7 100644 (file)
@@ -9,7 +9,7 @@
        .destructor     _reset_brk
        .export         _brk_a, _brk_x, _brk_y, _brk_sr, _brk_pc
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 
 .bss
index 30f6c469980f406900a7776265685866bf18d383..8f879095cc9ac94ab0126134b17a136eee365ff4 100644 (file)
@@ -9,7 +9,7 @@
 
        .include        "em-kernel.inc"
         .include        "em-error.inc"
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
         .macpack        generic
 
index dc6e1e8115e22cec8a91d3ffd74da3ac7506600b..5a2125a0afc089fd969362e6778b4352180c2571 100644 (file)
@@ -7,7 +7,7 @@
                .export         _cgetc
                .import         cursor
 
-               .include        "../plus4/plus4.inc"
+               .include        "plus4.inc"
 
 
 ; --------------------------------------------------------------------------
index ff8bd5d100f1d1c326005984cafa00c14e7a01e2..4b6c4835518d3b598677d3599ee10e2ad307ab3f 100644 (file)
@@ -6,7 +6,7 @@
 
        .export         _clrscr
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 _clrscr        = CLRSCR
 
index 7d54eafb5385cafae37b0a281235a33592cfd7a8..9d7107de8e12645f48ff24075a48af8e3561fb79 100644 (file)
@@ -8,7 +8,7 @@
 
        .export         _textcolor, _bgcolor, _bordercolor
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 _textcolor:
        ldx     CHARCOLOR       ; get old value
index c3269359a4e9d84fd7a3d53a03041bc88abc9ca7..23c7948560605f6ce4818c57270b7a974a1a21b6 100644 (file)
@@ -6,5 +6,5 @@
 
        .exportzp       CURS_X, CURS_Y
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
index 26bc2ae5a5a37cf44e67a2fb27951f3ba3675e5c..5788c1cb01540cb172105348bc4e4ce126d63267 100644 (file)
@@ -10,7 +10,7 @@
        .import         popa, _gotoxy
         .import         PLOT
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 
 _cputcxy:
index c967671c5df178984983ff3397c500c4c25eeb17..805d1c5ab2648604b0b02a994e4a82ed9b5e0e11 100644 (file)
@@ -13,7 +13,7 @@
        .import         __INTERRUPTOR_COUNT__
 
         .include        "zeropage.inc"
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 
 ; ------------------------------------------------------------------------
index 6f27e747ce5835e7a892f8e754ca8cdfa388fff2..84f09b12cf6247e0b93b2bd0d8d54daf419f22ab 100644 (file)
@@ -5,7 +5,7 @@
 ; /* Return the video mode the machine is using */
 ;
 
-        .include        "../plus4/plus4.inc"
+        .include        "plus4.inc"
        .include        "get_tv.inc"
 
 
index be64e64b2bb086ff0038ab2ff6a1cadeaf555a96..f1164bbaac5ea9913a82f739fe3b2804e7f900ab 100644 (file)
@@ -7,7 +7,7 @@
        .export         _kbhit
        .import         return0, return1
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 _kbhit:
        lda     KEY_COUNT       ; Get number of characters
index 863c8e473119db2a71b48a7dc5022d26042d485c..418bfe90f4a43bba68cfbcdeb0d62d7c9dd2120e 100644 (file)
@@ -25,7 +25,7 @@
        .constructor    initmainargs, 24
        .import         __argc, __argv
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 
 
index 8bde89c6f3e1c697fd5cfd944069f926718b453b..e65fd4dab747e2113a41358ce57dae5cb7f6d477 100644 (file)
@@ -8,7 +8,7 @@
        .export         __randomize
        .import         _srand
 
-       .include        "../plus4/plus4.inc"
+       .include        "plus4.inc"
 
 __randomize:
         ldx     TED_VLINELO     ; Use TED rasterline as high byte
index c9adac7f2b31b1816f9ef18f2b74f4cf49eb2d78..c48ff9862212c0ecd1918af22aba9ba39b067dc5 100644 (file)
@@ -6,7 +6,7 @@
 
        .export         _revers
 
-        .include        "../plus4/plus4.inc"
+        .include        "plus4.inc"
 
 .proc   _revers
 
index 42f51675866f3ce4e165dd29f9dab65fd75f7fbf..bfce3e8f934b7407e071be3fa51f056891695922 100644 (file)
@@ -14,7 +14,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/c64/c64.inc b/libsrc/c64/c64.inc
deleted file mode 100644 (file)
index 715e11d..0000000
+++ /dev/null
@@ -1,212 +0,0 @@
-;
-; C64 generic definitions. Stolen from Elite128
-;
-
-
-; ---------------------------------------------------------------------------
-; Zero page, Commodore stuff
-
-ST                     := $90          ; IEC status byte
-
-TIME            := $A0          ; 60 HZ clock
-FNAM_LEN               := $B7          ; Length of filename
-SECADR                 := $B9          ; Secondary address
-DEVNUM                 := $BA          ; Device number
-FNAM            := $BB          ; Pointer to filename
-KEY_COUNT              := $C6          ; Number of keys in input buffer
-RVS             := $C7          ; Reverse flag
-CURS_FLAG              := $CC          ; 1 = cursor off
-CURS_BLINK             := $CD          ; Blink counter
-CURS_CHAR              := $CE          ; Character under the cursor
-CURS_STATE             := $CF          ; Cursor blink state
-SCREEN_PTR             := $D1          ; Pointer to current char in text screen
-CURS_X                 := $D3          ; Cursor column
-CURS_Y                 := $D6          ; Cursor row
-CRAM_PTR               := $F3          ; Pointer to current char in color RAM
-
-BASIC_BUF              := $200         ; Location of command-line
-BASIC_BUF_LEN  = 89            ; Maximum length of command-line
-
-CHARCOLOR       := $286
-CURS_COLOR      := $287                ; Color under the cursor
-PALFLAG                := $2A6         ; $01 = PAL, $00 = NTSC
-
-
-; ---------------------------------------------------------------------------
-; Kernal routines
-
-; Direct entries
-CLRSCR                 := $E544
-KBDREAD                := $E5B4
-NMIEXIT         := $FEBC
-
-; ---------------------------------------------------------------------------
-; Vector and other locations
-
-IRQVec                 := $0314
-BRKVec                 := $0316
-NMIVec                 := $0318
-
-; ---------------------------------------------------------------------------
-; Screen size
-
-XSIZE           = 40
-YSIZE           = 25
-
-; ---------------------------------------------------------------------------
-; I/O: VIC
-
-VIC                    := $D000
-VIC_SPR0_X             := $D000
-VIC_SPR0_Y             := $D001
-VIC_SPR1_X             := $D002
-VIC_SPR1_Y             := $D003
-VIC_SPR2_X             := $D004
-VIC_SPR2_Y             := $D005
-VIC_SPR3_X             := $D006
-VIC_SPR3_Y             := $D007
-VIC_SPR4_X             := $D008
-VIC_SPR4_Y             := $D009
-VIC_SPR5_X             := $D00A
-VIC_SPR5_Y             := $D00B
-VIC_SPR6_X             := $D00C
-VIC_SPR6_Y             := $D00D
-VIC_SPR7_X             := $D00E
-VIC_SPR7_Y             := $D00F
-VIC_SPR_HI_X           := $D010
-VIC_SPR_ENA            := $D015
-VIC_SPR_EXP_Y          := $D017
-VIC_SPR_EXP_X          := $D01D
-VIC_SPR_MCOLOR         := $D01C
-VIC_SPR_BG_PRIO := $D01B
-
-VIC_SPR_MCOLOR0 := $D025
-VIC_SPR_MCOLOR1 := $D026
-
-VIC_SPR0_COLOR         := $D027
-VIC_SPR1_COLOR         := $D028
-VIC_SPR2_COLOR         := $D029
-VIC_SPR3_COLOR         := $D02A
-VIC_SPR4_COLOR         := $D02B
-VIC_SPR5_COLOR         := $D02C
-VIC_SPR6_COLOR         := $D02D
-VIC_SPR7_COLOR         := $D02E
-
-VIC_CTRL1              := $D011
-VIC_CTRL2              := $D016
-
-VIC_HLINE              := $D012
-
-VIC_VIDEO_ADR          := $D018
-
-VIC_IRR                := $D019        ; Interrupt request register
-VIC_IMR                := $D01A        ; Interrupt mask register
-
-VIC_BORDERCOLOR := $D020
-VIC_BG_COLOR0          := $D021
-VIC_BG_COLOR1          := $D022
-VIC_BG_COLOR2          := $D023
-VIC_BG_COLOR3          := $D024
-
-; 128 stuff:
-VIC_KBD_128            := $D02F        ; Extended kbd bits (visible in 64 mode)
-VIC_CLK_128            := $D030        ; Clock rate register (visible in 64 mode)
-
-
-; ---------------------------------------------------------------------------
-; I/O: SID
-
-SID                    := $D400
-SID_S1Lo               := $D400
-SID_S1Hi               := $D401
-SID_PB1Lo              := $D402
-SID_PB1Hi              := $D403
-SID_Ctl1               := $D404
-SID_AD1                := $D405
-SID_SUR1               := $D406
-
-SID_S2Lo               := $D407
-SID_S2Hi               := $D408
-SID_PB2Lo              := $D409
-SID_PB2Hi              := $D40A
-SID_Ctl2               := $D40B
-SID_AD2                := $D40C
-SID_SUR2               := $D40D
-
-SID_S3Lo               := $D40E
-SID_S3Hi               := $D40F
-SID_PB3Lo              := $D410
-SID_PB3Hi              := $D411
-SID_Ctl3               := $D412
-SID_AD3                := $D413
-SID_SUR3               := $D414
-
-SID_FltLo              := $D415
-SID_FltHi              := $D416
-SID_FltCtl             := $D417
-SID_Amp                := $D418
-SID_ADConv1            := $D419
-SID_ADConv2            := $D41A
-SID_Noise              := $D41B
-SID_Read3              := $D41C
-
-; ---------------------------------------------------------------------------
-; I/O: VDC (128 only)
-
-VDC_INDEX              := $D600
-VDC_DATA               := $D601
-
-; ---------------------------------------------------------------------------
-; I/O: CIAs
-
-CIA1                   := $DC00
-CIA1_PRA               := $DC00
-CIA1_PRB               := $DC01
-CIA1_DDRA              := $DC02
-CIA1_DDRB              := $DC03
-CIA1_TOD10      := $DC08
-CIA1_TODSEC     := $DC09
-CIA1_TODMIN     := $DC0A
-CIA1_TODHR      := $DC0B
-CIA1_ICR               := $DC0D
-CIA1_CRA               := $DC0E
-CIA1_CRB               := $DC0F
-
-CIA2                   := $DD00
-CIA2_PRA               := $DD00
-CIA2_PRB               := $DD01
-CIA2_DDRA              := $DD02
-CIA2_DDRB              := $DD03
-CIA2_TOD10      := $DD08
-CIA2_TODSEC     := $DD09
-CIA2_TODMIN     := $DD0A
-CIA2_TODHR      := $DD0B
-CIA2_ICR               := $DD0D
-CIA2_CRA               := $DD0E
-CIA2_CRB               := $DD0F
-
-; ---------------------------------------------------------------------------
-; Super CPU
-
-SCPU_VIC_Bank1         := $D075
-SCPU_Slow              := $D07A
-SCPU_Fast              := $D07B
-SCPU_EnableRegs := $D07E
-SCPU_DisableRegs:= $D07F
-SCPU_Detect            := $D0BC
-
-
-; ---------------------------------------------------------------------------
-; Processor Port at $01
-
-LORAM          = $01           ; Enable the basic rom
-HIRAM          = $02           ; Enable the kernal rom
-IOEN           = $04           ; Enable I/O
-CASSDATA       = $08           ; Cassette data
-CASSPLAY       = $10           ; Cassette: Play
-CASSMOT                = $20           ; Cassette motor on
-TP_FAST                = $80           ; Switch Rossmoeller TurboProcess to fast mode
-
-RAMONLY                = $F8           ; (~(LORAM | HIRAM | IOEN)) & $FF
-
-
index 2d1f36c066579e7788a2167307c5a951cfcac12f..0eadda41b620aa1be5ff20e721afce29d8213c22 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/cbm510/cbm510.inc b/libsrc/cbm510/cbm510.inc
deleted file mode 100644 (file)
index 0aad95f..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-;
-; Zero page variables and I/O definitions for the CBM 510
-;
-; Taken from a kernal disassembly done by myself in 2000/2001.
-;
-; Ullrich von Bassewitz, 13.09.2001
-
-
-;-----------------------------------------------------------------------------
-; Zeropage stuff
-
-ExecReg                = $0000
-IndReg         = $0001
-
-; ---------------------------------------------------------------------------
-; Screen size
-
-XSIZE           = 40
-YSIZE           = 25
-
-;-----------------------------------------------------------------------------
-; I/O Definitions
-
-; I/O  $d800: VIC
-
-VIC_SPR0_X             = $00
-VIC_SPR0_Y             = $01
-VIC_SPR1_X             = $02
-VIC_SPR1_Y             = $03
-VIC_SPR2_X             = $04
-VIC_SPR2_Y             = $05
-VIC_SPR3_X             = $06
-VIC_SPR3_Y             = $07
-VIC_SPR4_X             = $08
-VIC_SPR4_Y             = $09
-VIC_SPR5_X             = $0A
-VIC_SPR5_Y             = $0B
-VIC_SPR6_X             = $0C
-VIC_SPR6_Y             = $0D
-VIC_SPR7_X             = $0E
-VIC_SPR7_Y             = $0F
-VIC_SPR_HI_X           = $10
-VIC_SPR_ENA            = $15
-VIC_SPR_EXP_Y          = $17
-VIC_SPR_EXP_X          = $1D
-VIC_SPR_MCOLOR         = $1C
-VIC_SPR_BG_PRIO = $1B
-
-VIC_SPR_MCOLOR0 = $25
-VIC_SPR_MCOLOR1 = $26
-
-VIC_SPR0_COLOR         = $27
-VIC_SPR1_COLOR         = $28
-VIC_SPR2_COLOR         = $29
-VIC_SPR3_COLOR         = $2A
-VIC_SPR4_COLOR         = $2B
-VIC_SPR5_COLOR         = $2C
-VIC_SPR6_COLOR         = $2D
-VIC_SPR7_COLOR         = $2E
-
-VIC_CTRL1              = $11
-VIC_CTRL2              = $16
-
-VIC_HLINE              = $12
-
-VIC_VIDEO_ADR          = $18
-
-VIC_IRR                = $19           ; Interrupt request register
-VIC_IMR                = $1A           ; Interrupt mask register
-
-VIC_BORDERCOLOR = $20
-VIC_BG_COLOR0          = $21
-VIC_BG_COLOR1          = $22
-VIC_BG_COLOR2          = $23
-VIC_BG_COLOR3          = $24
-
-
-
-; I/O  $da00: SID 6581
-
-SID_S1Lo               = $00
-SID_S1Hi               = $01
-SID_PB1Lo              = $02
-SID_PB1Hi              = $03
-SID_Ctl1               = $04
-SID_AD1                = $05
-SID_SUR1               = $06
-
-SID_S2Lo               = $07
-SID_S2Hi               = $08
-SID_PB2Lo              = $09
-SID_PB2Hi              = $0A
-SID_Ctl2               = $0B
-SID_AD2                = $0C
-SID_SUR2               = $0D
-
-SID_S3Lo               = $0E
-SID_S3Hi               = $0F
-SID_PB3Lo              = $10
-SID_PB3Hi              = $11
-SID_Ctl3               = $12
-SID_AD3                = $13
-SID_SUR3               = $14
-
-SID_FltLo              = $15
-SID_FltHi              = $16
-SID_FltCtl             = $17
-SID_Amp                = $18
-SID_ADConv1            = $19
-SID_ADConv2            = $1A
-SID_Noise              = $1B
-SID_Read3              = $1C
-
-
-; I/O  $db00: CIA 6526 Inter Process Communication
-; I/O  $dc00: CIA 6526
-
-.struct CIA
-        PRA     .byte
-        PRB     .byte
-        DDRA    .byte
-        DDRB    .byte
-        .union
-            .struct
-                TALO    .byte
-                TAHI    .byte
-            .endstruct
-            TA          .word
-        .endunion
-        .union
-            .struct
-                TBLO    .byte
-                TBHI    .byte
-            .endstruct
-            TB          .word
-        .endunion
-        TOD10   .byte
-        TODSEC  .byte
-        TODMIN  .byte
-        TODHR   .byte
-        SDR     .byte
-        ICR     .byte
-        CRA     .byte
-        CRB     .byte
-.endstruct
-
-
-; I/O  $dd00: ACIA 6551
-
-.struct ACIA
-        DATA    .byte
-        STATUS  .byte
-        CMD     .byte
-        CTRL    .BYTE
-.endstruct
-
-
-; I/O  $de00: Triport #1 6525
-; I/O  $df00: Triport #2 6525
-
-.struct TPI
-        PRA     .byte
-        PRB     .byte
-        .union
-                PRC     .byte
-                INT     .byte
-        .endunion
-        DDRA    .byte
-        DDRB    .byte
-        .union
-                DDRC    .byte
-                IMR     .byte
-        .endunion
-        CR      .byte
-        AIR     .byte
-.endstruct
-
-
-; Out video memory address
-
-COLOR_RAM   = $D400                    ; System bank
-
index bd963d1da362b6a5675e46babc8cd30485da91bd..ac0293ed6fff53bdaf16a30106dac3acdcaa0784 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/cbm610/cbm610.inc b/libsrc/cbm610/cbm610.inc
deleted file mode 100644 (file)
index ea85cd5..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-;
-; Zeropage and I/O definitions for the CBM 610
-;
-; Taken from a kernal disassembly done by myself in 1987.
-;
-; Ullrich von Bassewitz, 28.09.1998
-
-
-; ---------------------------------------------------------------------------
-; Zeropage registers
-
-ExecReg                = $00
-IndReg         = $01
-
-; ---------------------------------------------------------------------------
-; Screen size
-
-XSIZE           = 80
-YSIZE           = 25
-
-; ---------------------------------------------------------------------------
-; I/O definitions
-
-
-; I/O  $d800: CRTC 6545
-
-.struct CRTC
-        ADDR           .byte
-        DATA           .byte
-.endstruct
-
-; I/O  $db00: CIA 6526 Inter Process Communication
-;
-;      IPCcia          =       $db00
-
-.struct CIA
-        PRA     .byte
-        PRB     .byte
-        DDRA    .byte
-        DDRB    .byte
-        .union
-            .struct
-                TALO    .byte
-                TAHI    .byte
-            .endstruct
-            TA          .word
-        .endunion
-        .union
-            .struct
-                TBLO    .byte
-                TBHI    .byte
-            .endstruct
-            TB          .word
-        .endunion
-        TOD10   .byte
-        TODSEC  .byte
-        TODMIN  .byte
-        TODHR   .byte
-        SDR     .byte
-        ICR     .byte
-        CRA     .byte
-        CRB     .byte
-.endstruct
-
-
-; I/O  $dc00: CIA 6526
-;
-;      cia             =       $dc00
-
-
-
-; I/O  $dd00: ACIA 6551
-;
-;      acia            =       $dd00
-
-.struct ACIA
-        DATA    .byte
-        STATUS  .byte
-        CMD     .byte
-        CTRL    .BYTE
-.endstruct
-
-
-; I/O  $de00: Triport #1 6525
-;
-;      tpi1            =       $de00
-
-.struct TPI
-        PRA     .byte
-        PRB     .byte
-        .union
-                PRC     .byte
-                INT     .byte
-        .endunion
-        DDRA    .byte
-        DDRB    .byte
-        .union
-                DDRC    .byte
-                IMR     .byte
-        .endunion
-        CR      .byte
-        AIR     .byte
-.endstruct
-
-
-; I/O  $df00: Triport #2 6525
-
-;      tpi2            =       $df00
-
-
index b355d9e8b58372d123b997f0f91bc4ab08fa4a0f..6f1aa071e68c39bab96fe3f969f15164cbf4be64 100644 (file)
@@ -14,7 +14,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS         = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
index 191f4bb06a573e6d4bf2317dd4cd4c855e857d75..f0fe1df21100509d3e48ac18fd27e4ab7dba8342 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/nes/nes.inc b/libsrc/nes/nes.inc
deleted file mode 100644 (file)
index 1ee5ebc..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-;
-; NES definitions. By Groepaz/Hitmem.
-;
-
-
-;; FIXME: optimize zeropage usage
-
-SCREEN_PTR     = $62           ;2
-CRAM_PTR        = $64           ;2
-CHARCOLOR      = $66
-BGCOLOR                = $67
-RVS            = $68
-CURS_X         = $69
-CURS_Y         = $6a
-
-tickcount       = $6b           ;2
-
-VBLANK_FLAG    = $70
-
-ringbuff        = $0200
-ringwrite       = $71
-ringread        = $72
-ringcount       = $73
-
-ppuhi           = $74
-ppulo           = $75
-ppuval          = $76
-
-screenrows     = (30-1)
-charsperline    = 32
-xsize           = charsperline
-
-;; PPU defines
-
-PPU_CTRL1              = $2000
-PPU_CTRL2      = $2001
-PPU_STATUS     = $2002
-PPU_SPR_ADDR   = $2003
-PPU_SPR_IO     = $2004
-PPU_VRAM_ADDR1 = $2005
-PPU_VRAM_ADDR2 = $2006
-PPU_VRAM_IO    = $2007
-
-;; APU defines
-
-APU_PULSE1CTRL  = $4000         ; Pulse #1 Control Register (W)
-APU_PULSE1RAMP  = $4001         ; Pulse #1 Ramp Control Register (W)
-APU_PULSE1FTUNE = $4002         ; Pulse #1 Fine Tune (FT) Register (W)
-APU_PULSE1CTUNE = $4003         ; Pulse #1 Coarse Tune (CT) Register (W)
-APU_PULSE2CTRL  = $4004         ; Pulse #2 Control Register (W)
-APU_PULSE2RAMP  = $4005         ; Pulse #2 Ramp Control Register (W)
-APU_PULSE2FTUNE = $4006         ; Pulse #2 Fine Tune Register (W)
-APU_PULSE2STUNE = $4007         ; Pulse #2 Coarse Tune Register (W)
-APU_TRICTRL1    = $4008         ; Triangle Control Register #1 (W)
-APU_TRICTRL2    = $4009         ; Triangle Control Register #2 (?)
-APU_TRIFREQ1    = $400A         ; Triangle Frequency Register #1 (W)
-APU_TRIFREQ2    = $400B         ; Triangle Frequency Register #2 (W)
-APU_NOISECTRL   = $400C         ; Noise Control Register #1 (W)
-;;APU_ = $400D  ; Unused (???)
-APU_NOISEFREQ1  = $400E         ; Noise Frequency Register #1 (W)
-APU_NOISEFREQ2  = $400F         ; Noise Frequency Register #2 (W)
-APU_MODCTRL     = $4010         ; Delta Modulation Control Register (W)
-APU_MODDA       = $4011         ; Delta Modulation D/A Register (W)
-APU_MODADDR     = $4012         ; Delta Modulation Address Register (W)
-APU_MODLEN      = $4013         ; Delta Modulation Data Length Register (W)
-APU_SPR_DMA            = $4014         ; Sprite DMA Register (W)
-APU_CHANCTRL           = $4015         ; Sound/Vertical Clock Signal Register (R)
-APU_PAD1               = $4016         ; Joypad #1 (RW)
-APU_PAD2       = $4017         ; Joypad #2/SOFTCLK (RW)
-
-
-CH_HLINE       = 11
-CH_VLINE       = 14
-CH_ULCORNER    = 176
-CH_URCORNER    = 174
-CH_LLCORNER    = 173
-CH_LRCORNER    = 189
-CH_TTEE                = 178
-CH_RTEE                = 179
-CH_BTEE                = 177
-CH_LTEE                = 171
-CH_CROSS       = 123
-CH_CURS_UP             = 145
-CH_CURS_DOWN   = 17
-CH_CURS_LEFT   = 157
-CH_CURS_RIGHT  = 29
-CH_PI          = 126
-CH_DEL         = 20
-CH_INS         = 148
-CH_ENTER        = 10
-CH_STOP         = 3
-CH_ESC          = 27
-
index e2bedca37f292f0447a95268d01a27b8c00c841f..b3a3c4eee8eb4d8b8c688bf0c199394b0eefccb2 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
index 4fe269a03dcbe9acea8d35605a3d05e4ace08e38..bdba131fb49ef0dec24fe89567a4a9a2a0ec1ee7 100644 (file)
@@ -9,7 +9,7 @@
 
        .include        "joy-kernel.inc"
         .include        "joy-error.inc"
-        .include        "../plus4/plus4.inc"
+        .include        "plus4.inc"
 
         .macpack        generic
 
diff --git a/libsrc/plus4/plus4.inc b/libsrc/plus4/plus4.inc
deleted file mode 100644 (file)
index 79d242e..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-;
-; Plus/4 generic definitions.
-;
-
-
-; ---------------------------------------------------------------------------
-; 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            := $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
-
-BASIC_BUF              := $200         ; Location of command-line
-BASIC_BUF_LEN  = 89            ; Maximum length of command-line
-
-FNBUF                  := $25E         ; Buffer for filename
-FETCH           := $494         ; lda (zp),y from RAM
-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
-
-; ---------------------------------------------------------------------------
-; Vector and other locations
-
-IRQVec                 := $0314
-BRKVec                 := $0316
-NMIVec                 := $0318
-
-; ---------------------------------------------------------------------------
-; Screen size
-
-XSIZE           = 40
-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
-
-; ---------------------------------------------------------------------------
-; RAM/ROM selection addresses
-
-ENABLE_ROM      := TED_ROMSEL
-ENABLE_RAM      := TED_RAMSEL
-
-
index 09a4d91fee22531841b16faa43ca9850a5ddc7f9..1fa38c32a42a180dbcaa17269b1e7d17ee0cb22e 100644 (file)
@@ -13,7 +13,7 @@ AS    = ../../src/ca65/ca65
 CC     = ../../src/cc65/cc65
 LD     = ../../src/ld65/ld65
 
-AFLAGS = -t $(SYS) -I../../asminc
+AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/supervision/supervision.inc b/libsrc/supervision/supervision.inc
deleted file mode 100644 (file)
index a75fb02..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-; supervision symbols
-
-;  supervision 65c02s
-; in cc65 up to 2.9.1 65c02 means 65c02s
-.pc02
-
-lcd_addr = $4000
-LCD_LINESIZE = $30
-LCD_WIDTH = 160
-LCD_HEIGHT = 160
-; 2 bit per pixel, packed
-
-lcd_width = $2000
-lcd_height = $2001
-lcd_xpos = $2002 ; in pixel, bit 0+1 not used
-lcd_ypos = $2003 ; weird
-
-sv_port_r = $2021
-sv_port_w = $2022
-
-sv_timer_count = $2023
-; read for quitting
-sv_timer_quit = $2024
-
-; bit 0 timer, bit 1 dma
-sv_irq_source = $2027
-SV_IRQ_REQUEST_TIMER = 1
-SV_IRQ_REQUEST_DMA = 2
-
-; bit 5,6,7 select bank at 0x8000
-sv_bank = $2026
-SV_NMI_ENABLE_ON = 1
-SV_IRQ_ENABLE_TIMER = 2
-SV_IRQ_ENABLE_DMA = 4
-SV_LCD_ON = 8
-SV_TIMER_MODE_240Hz = $10 ; else 15360
-
-
-; low activ/pressed
-sv_control = $2020
-SV_RIGHT = 1
-SV_LEFT = 2
-SV_DOWN = 4
-SV_UP = 8
-SV_BUTTONB = $10
-SV_BUTTONA = $20
-SV_SELECT = $40
-SV_START = $80
-
-; frequency=125000/counter
-sv_audio_right_counter = $2010 ;word
-sv_audio_left_counter = $2014
-SV_AUDIO_ON =$40
-;bits 0..3 volume
-; bit 4 ?
-; bit 5 ?
-sv_audio_right_control = $2012
-sv_audio_left_control = $2016
-; write activates tone for x/60 sec (0 means 256)
-sv_audio_right_timer = $2013
-sv_audio_left_timer = $2017
-
-
-;read for irq quitting
-sv_dma_quit = $2025
-sv_dma_on = $201c
-; bit 7 true start, false stop
-sv_dma_start = $2018 ; word
-sv_dma_size = $201a ; *32 samples
-sv_dma_control = $201b
-; bit 0,1 speed: 0 15360, 11 15360/4
-; bit 2,3 volume: 0 silent, 11 loud
-
-sv_noise_volume = $2028 ; and frequency
-sv_noise_timer = $2029
-sv_noise_control = $202a
index eae0e96c61b1e039ee6faa12cb3d2c725cd6a916..67433999f884b5c418ec2186940fb95e7b9992f8 100644 (file)
@@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
 CC = ../../src/cc65/cc65
 LD = ../../src/ld65/ld65
 
-AFLAGS=-t $(SYS) -I../../asminc
+AFLAGS=-t $(SYS) --forget-inc-paths -I../../asminc
 CFLAGS=-Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
 
 #--------------------------------------------------------------------------
diff --git a/libsrc/vic20/vic20.inc b/libsrc/vic20/vic20.inc
deleted file mode 100644 (file)
index 4017625..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-;
-; Vic20 generic definitions. Stolen mostly from c64.inc - Steve Schmidtke
-;
-
-
-; ---------------------------------------------------------------------------
-; Zero page, Commodore stuff
-
-ST                     := $90          ; IEC status byte
-
-TIME            := $A0          ; 60HZ clock
-FNAM_LEN               := $B7          ; Length of filename
-SECADR                 := $B9          ; Secondary address
-DEVNUM                 := $BA          ; Device number
-FNAM            := $BB          ; Pointer to filename
-KEY_COUNT              := $C6          ; Number of keys in input buffer
-RVS                    := $C7          ; Reverse flag
-CURS_FLAG              := $CC          ; 1 = cursor off
-CURS_BLINK             := $CD          ; Blink counter
-CURS_CHAR              := $CE          ; Character under the cursor
-CURS_STATE             := $CF          ; Cursor blink state
-SCREEN_PTR             := $D1          ; Pointer to current char in text screen
-CURS_X                 := $D3          ; Cursor column
-CURS_Y                 := $D6          ; Cursor row
-CRAM_PTR               := $F3          ; Pointer to current char in color RAM
-
-BASIC_BUF              := $200         ; Location of command-line
-BASIC_BUF_LEN  = 89            ; Maximum length of command-line
-
-CHARCOLOR       := $286
-CURS_COLOR      := $287                ; Color under the cursor
-
-
-; ---------------------------------------------------------------------------
-; Screen size
-
-XSIZE           = 22
-YSIZE           = 23
-
-; ---------------------------------------------------------------------------
-; Kernal routines
-
-; Direct entries
-CLRSCR                 := $E55F
-KBDREAD                := $E5CF
-
-; ---------------------------------------------------------------------------
-; Vector and other locations
-
-IRQVec                 := $0314
-BRKVec                 := $0316
-NMIVec                 := $0318
-
-; ---------------------------------------------------------------------------
-; I/O: 6560 VIC
-
-VIC                    := $9000
-VIC_LINES       := $9003        ; Screen lines, bit 7 is bit 0 from VIC_HLINE
-VIC_HLINE       := $9004        ; Rasterline, bits 1-8
-VIC_COLOR              := $900F        ; Border and background color
-
-; ---------------------------------------------------------------------------
-; I/O: 6522 VIA1
-
-VIA1                   := $9110
-VIA1_JOY               := $9111
-VIA1_DDRB              := $9112
-VIA1_DDRA              := $9113
-
-; ---------------------------------------------------------------------------
-; I/O: 6522 VIA2
-
-VIA2                   := $9120
-VIA2_JOY               := $9120
-VIA2_DDRB              := $9122
-VIA2_DDRA              := $9123
-