From b15e4106dcdee8edb99ded4e266008eee5455ecb Mon Sep 17 00:00:00 2001 From: cuz Date: Tue, 16 Dec 2003 22:38:12 +0000 Subject: [PATCH] Use new joystick decls git-svn-id: svn://svn.cc65.org/cc65/trunk@2777 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/apple2/apple2-stdjoy.s | 5 ++--- libsrc/atari/atari-stdjoy.s | 5 ++--- libsrc/c128/c128-ptvjoy.s | 15 +++++++-------- libsrc/c128/c128-stdjoy.s | 5 ++--- libsrc/c64/c64-hitjoy.s | 12 +----------- libsrc/c64/c64-ptvjoy.s | 11 +++++------ libsrc/c64/c64-stdjoy.s | 4 ++-- libsrc/cbm510/cbm510-stdjoy.s | 3 +-- libsrc/joystick/joy-kernel.s | 17 ++++++++--------- libsrc/plus4/plus4-stdjoy.s | 7 +++---- libsrc/vic20/vic20-stdjoy.s | 5 ++--- 11 files changed, 35 insertions(+), 54 deletions(-) diff --git a/libsrc/apple2/apple2-stdjoy.s b/libsrc/apple2/apple2-stdjoy.s index 14bb5fd83..a6e7fc9dc 100644 --- a/libsrc/apple2/apple2-stdjoy.s +++ b/libsrc/apple2/apple2-stdjoy.s @@ -28,7 +28,7 @@ OFFS = 10 ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -70,8 +70,7 @@ JOY_COUNT = 2 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ ; UNINSTALL routine. Is called before the driver is removed from memory. diff --git a/libsrc/atari/atari-stdjoy.s b/libsrc/atari/atari-stdjoy.s index b0f9c0cdd..c89044b19 100644 --- a/libsrc/atari/atari-stdjoy.s +++ b/libsrc/atari/atari-stdjoy.s @@ -23,7 +23,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -65,8 +65,7 @@ JOY_COUNT = 4 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ ; UNINSTALL routine. Is called before the driver is removed from memory. diff --git a/libsrc/c128/c128-ptvjoy.s b/libsrc/c128/c128-ptvjoy.s index af9be13de..c188cc177 100644 --- a/libsrc/c128/c128-ptvjoy.s +++ b/libsrc/c128/c128-ptvjoy.s @@ -1,6 +1,6 @@ ; ; PTV-4 Player joystick driver for the C128 -; +; ; Ullrich von Bassewitz, 2003-09-28, using the C64 driver from ; Groepaz/Hitmen, 2002-12-23, which is ; obviously based on Ullrichs driver :) @@ -21,8 +21,8 @@ ; Driver signature - .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte $6A, $6F, $79 ; "joy" + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -38,7 +38,7 @@ ; Jump table. .word INSTALL - .word DEINSTALL + .word UNINSTALL .word COUNT .word READ @@ -60,15 +60,14 @@ JOY_COUNT = 4 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ -; DEINSTALL routine. Is called before the driver is removed from memory. +; UNINSTALL routine. Is called before the driver is removed from memory. ; Can do cleanup or whatever. Must not return anything. ; -DEINSTALL: +UNINSTALL: rts diff --git a/libsrc/c128/c128-stdjoy.s b/libsrc/c128/c128-stdjoy.s index ba0018701..38e740a1a 100644 --- a/libsrc/c128/c128-stdjoy.s +++ b/libsrc/c128/c128-stdjoy.s @@ -23,7 +23,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -65,8 +65,7 @@ JOY_COUNT = 2 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ ; UNINSTALL routine. Is called before the driver is removed from memory. diff --git a/libsrc/c64/c64-hitjoy.s b/libsrc/c64/c64-hitjoy.s index cb5dde3d9..72e2ff13d 100755 --- a/libsrc/c64/c64-hitjoy.s +++ b/libsrc/c64/c64-hitjoy.s @@ -21,7 +21,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -103,11 +103,9 @@ pollirq: ldy #$00 ; port b direction sty $dd03 ; => input -; ldy #$00 sty $dd05 ; cia2 timer a highbyte sty $dc05 ; cia1 timer a highbyte iny -; lda #$01 sty $dd04 ; cia2 timer a lowbyte sty $dc04 ; cia1 timer a lowbyte @@ -119,10 +117,6 @@ pollirq: ; serial port: input ; cia 1 setup - -; lda #%00000001 -; sty $dc0d ; irq ctrl reg - lda #%01010001 sta $dc0e ; control register a ; timer: start @@ -132,13 +126,11 @@ pollirq: ; read directions 3 - lda $dd01 ;read cia 2 port b and #$0f sta temp3 ; read button 3 - lda $dd02 ;cia 2 port a and #%11111011 ;data direction sta $dd02 ;=> bit 2 input @@ -151,7 +143,6 @@ pollirq: sta temp3 ; read directions 4 - lda $dd01 ;read cia 2 port b lsr a lsr a @@ -160,7 +151,6 @@ pollirq: sta temp4 ; read button 4 - ldx #$ff ;serial data register stx $dc0c;=> writing $ff causes ;cia to output some diff --git a/libsrc/c64/c64-ptvjoy.s b/libsrc/c64/c64-ptvjoy.s index 9c5db39f0..60950ff59 100755 --- a/libsrc/c64/c64-ptvjoy.s +++ b/libsrc/c64/c64-ptvjoy.s @@ -21,7 +21,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -37,7 +37,7 @@ ; Jump table. .word INSTALL - .word DEINSTALL + .word UNINSTALL .word COUNT .word READ @@ -59,15 +59,14 @@ JOY_COUNT = 4 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ -; DEINSTALL routine. Is called before the driver is removed from memory. +; UNINSTALL routine. Is called before the driver is removed from memory. ; Can do cleanup or whatever. Must not return anything. ; -DEINSTALL: +UNINSTALL: rts diff --git a/libsrc/c64/c64-stdjoy.s b/libsrc/c64/c64-stdjoy.s index 4b4ae0c68..bfad0af0a 100644 --- a/libsrc/c64/c64-stdjoy.s +++ b/libsrc/c64/c64-stdjoy.s @@ -22,7 +22,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -65,7 +65,7 @@ INSTALL: lda #JOY_ERR_OK -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ ; UNINSTALL routine. Is called before the driver is removed from memory. diff --git a/libsrc/cbm510/cbm510-stdjoy.s b/libsrc/cbm510/cbm510-stdjoy.s index 20d8c30df..5f5a26b15 100644 --- a/libsrc/cbm510/cbm510-stdjoy.s +++ b/libsrc/cbm510/cbm510-stdjoy.s @@ -23,7 +23,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -65,7 +65,6 @@ JOY_COUNT = 2 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - ; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ diff --git a/libsrc/joystick/joy-kernel.s b/libsrc/joystick/joy-kernel.s index fbed5ce0a..7b8c878e5 100644 --- a/libsrc/joystick/joy-kernel.s +++ b/libsrc/joystick/joy-kernel.s @@ -6,7 +6,7 @@ .export _joy_install, _joy_uninstall, _joy_masks .export joy_clear_ptr - + .importzp ptr1 .include "joy-kernel.inc" @@ -20,7 +20,7 @@ .bss _joy_drv: .res 2 ; Pointer to driver -_joy_masks: .res JOY_MASK_COUNT +_joy_masks: .res .sizeof(JOY_HDR::MASKS) ; Jump table for the driver functions. .data @@ -32,8 +32,7 @@ joy_read: jmp $0000 ; Driver header signature .rodata -joy_sig: .byte $6A, $6F, $79, $00 ; "joy", version -joy_sig_len = * - joy_sig +joy_sig: .byte $6A, $6F, $79, JOY_API_VERSION ; "joy", version ;---------------------------------------------------------------------------- @@ -49,7 +48,7 @@ _joy_install: ; Check the driver signature - ldy #joy_sig_len-1 + ldy #.sizeof(joy_sig)-1 @L0: lda (ptr1),y cmp joy_sig,y bne inv_drv @@ -58,8 +57,8 @@ _joy_install: ; Copy the mask array - ldy #JOY_MASKS + JOY_MASK_COUNT - 1 - ldx #JOY_MASK_COUNT-1 + ldy #JOY_HDR::MASKS + .sizeof(JOY_HDR::MASKS) - 1 + ldx #.sizeof(JOY_HDR::MASKS)-1 @L1: lda (ptr1),y sta _joy_masks,x dey @@ -68,12 +67,12 @@ _joy_install: ; Copy the jump vectors - ldy #JOY_HDR_JUMPTAB + ldy #JOY_HDR::JUMPTAB ldx #0 @L2: inx ; Skip the JMP opcode jsr copy ; Copy one byte jsr copy ; Copy one byte - cpx #(JOY_HDR_JUMPCOUNT*3) + cpy #(JOY_HDR::JUMPTAB + .sizeof(JOY_HDR::JUMPTAB)) bne @L2 jmp joy_install ; Call driver install routine diff --git a/libsrc/plus4/plus4-stdjoy.s b/libsrc/plus4/plus4-stdjoy.s index ed5af58eb..45282bbda 100644 --- a/libsrc/plus4/plus4-stdjoy.s +++ b/libsrc/plus4/plus4-stdjoy.s @@ -22,7 +22,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -43,7 +43,7 @@ .word READ ; ------------------------------------------------------------------------ -; Constants +; Constants JOY_COUNT = 2 ; Number of joysticks we support @@ -64,8 +64,7 @@ JOY_COUNT = 2 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ ; UNINSTALL routine. Is called before the driver is removed from memory. diff --git a/libsrc/vic20/vic20-stdjoy.s b/libsrc/vic20/vic20-stdjoy.s index 313f69410..80d51d136 100644 --- a/libsrc/vic20/vic20-stdjoy.s +++ b/libsrc/vic20/vic20-stdjoy.s @@ -23,7 +23,7 @@ ; Driver signature .byte $6A, $6F, $79 ; "joy" - .byte $00 ; Driver API version number + .byte JOY_API_VERSION ; Driver API version number ; Button state masks (8 values) @@ -65,8 +65,7 @@ JOY_COUNT = 1 ; Number of joysticks we support INSTALL: lda #JOY_ERR_OK - -; rts ; Run into DEINSTALL instead +; rts ; Run into UNINSTALL instead ; ------------------------------------------------------------------------ ; UNINSTALL routine. Is called before the driver is removed from memory.