# Atari
atarilib:
- for i in atari common runtime conio dbg em tgi; do \
+ for i in atari common runtime conio dbg em joystick tgi; do \
AS=$(AS) \
CC=$(CC) \
LD=$(LD) \
# Oric Atmos
atmoslib:
- for i in atmos common runtime em tgi; do \
+ for i in atmos common runtime em joystick tgi; do \
AS=$(AS) \
CC=$(CC) \
LD=$(LD) \
# Vic20
vic20lib:
- for i in vic20 cbm common runtime conio dbg em tgi; do \
+ for i in vic20 cbm common runtime conio dbg em joystick tgi; do \
AS=$(AS) \
CC=$(CC) \
LD=$(LD) \
# C16, C116
c16lib:
- for i in c16 cbm common runtime conio dbg em tgi; do \
+ for i in c16 cbm common runtime conio dbg em joystick tgi; do \
AS=$(AS) \
CC=$(CC) \
LD=$(LD) \
# C64
c64lib:
- for i in c64 cbm common runtime conio dbg em tgi; do \
+ for i in c64 cbm common runtime conio dbg em joystick tgi; do \
AS=$(AS) \
CC=$(CC) \
LD=$(LD) \
$(AR) a c64.lib $$i/*.o;\
done
mv c64/crt0.o c64.o
- cp c64/c64-320-200-2.tgi c64-hi.tgi
cp c64/*.emd .
+ cp c64/*.joy .
+ cp c64/c64-320-200-2.tgi c64-hi.tgi
#-----------------------------------------------------------------------------
# C128
c128lib:
- for i in c128 cbm common runtime conio dbg em tgi; do \
+ for i in c128 cbm common runtime conio dbg em joystick tgi; do \
AS=$(AS) \
CC=$(CC) \
LD=$(LD) \
# Commdore P500 / CBM 5x0
cbm510lib:
- for i in cbm510 cbm common runtime conio dbg em tgi; do \
+ for i in cbm510 cbm common runtime conio dbg em joystick tgi; do \
CC=$(CC) \
AS=$(AS) \
LD=$(LD) \
# Commodore Plus/4
plus4lib:
- for i in plus4 cbm common runtime conio dbg em tgi; do \
+ for i in plus4 cbm common runtime conio dbg em joystick tgi; do \
CC=$(CC) \
AS=$(AS) \
LD=$(LD) \
%.emd: %.o ../runtime/zeropage.o
@$(LD) -t module -o $@ $^
+%.joy: %.o ../runtime/zeropage.o
+ @$(LD) -t module -o $@ $^
+
%.tgi: %.o ../runtime/zeropage.o
@$(LD) -t module -o $@ $^
kernal.o \
mouse.o \
randomize.o \
- readjoy.o \
revers.o \
rs232.o \
tgi_mode_table.o
#--------------------------------------------------------------------------
# Drivers
-TGIS = c64-320-200-2.tgi
+EMDS = c64-georam.emd c64-ram.emd c64-reu.emd c64-vdc.emd
+
+JOYS = c64-stdjoy.joy
-EMDS = c64-georam.emd c64-ram.emd c64-reu.emd c64-vdc.emd
+TGIS = c64-320-200-2.tgi
#--------------------------------------------------------------------------
# Targets
-all: $(OBJS) $(EMDS) $(TGIS)
+all: $(OBJS) $(EMDS) $(JOYS) $(TGIS)
../runtime/zeropage.o:
$(MAKE) -C $(dir $@) $(notdir $@)
clean:
- @rm -f $(OBJS) $(EMDS:.emd=.o) $(TGIS:.tgi=.o)
+ @rm -f $(OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(TGIS:.tgi=.o)
--- /dev/null
+;
+; Standard joystick driver for the C64
+;
+; Ullrich von Bassewitz, 2002-12-20
+;
+
+ .include "zeropage.inc"
+
+ .include "joy-kernel.inc"
+ .include "joy-error.inc"
+ .include "c64.inc"
+
+ .macpack generic
+
+
+; ------------------------------------------------------------------------
+; Header. Includes jump table
+
+.segment "JUMPTABLE"
+
+; Driver signature
+
+ .byte $6A, $6F, $79 ; "joy"
+ .byte $00 ; Driver API version number
+
+; Button state masks (8 values)
+
+ .byte $01 ; JOY_UP
+ .byte $02 ; JOY_DOWN
+ .byte $04 ; JOY_LEFT
+ .byte $08 ; JOY_RIGHT
+ .byte $10 ; JOY_FIRE
+ .byte $00 ; Future expansion
+ .byte $00 ; Future expansion
+ .byte $00 ; Future expansion
+
+; Jump table.
+
+ .word INSTALL
+ .word DEINSTALL
+ .word COUNT
+ .word READ
+
+; ------------------------------------------------------------------------
+; Constants
+
+JOY_COUNT = 2 ; Number of joysticks we support
+
+
+; ------------------------------------------------------------------------
+; Data.
+
+
+.code
+
+; ------------------------------------------------------------------------
+; INSTALL routine. Is called after the driver is loaded into memory. If
+; possible, check if the hardware is present and determine the amount of
+; memory available.
+; Must return an JOY_ERR_xx code in a/x.
+;
+
+INSTALL:
+ lda #<JOY_ERR_OK
+ ldx #>JOY_ERR_OK
+
+; rts ; Run into DEINSTALL instead
+
+; ------------------------------------------------------------------------
+; DEINSTALL routine. Is called before the driver is removed from memory.
+; Can do cleanup or whatever. Must not return anything.
+;
+
+DEINSTALL:
+ rts
+
+
+; ------------------------------------------------------------------------
+; COUNT: Return the total number of available joysticks in a/x.
+;
+
+COUNT:
+ lda #<JOY_COUNT
+ ldx #>JOY_COUNT
+ rts
+
+; ------------------------------------------------------------------------
+; READ: Read a particular joystick passed in A.
+;
+
+READ: tax ; Joystick number into X
+ bne joy2
+
+; Read joystick 1
+
+joy1: lda #$7F
+ sei
+ sta CIA1_PRA
+ lda CIA1_PRB
+ cli
+ and #$1F
+ eor #$1F
+ rts
+
+; Read joystick 2
+
+joy2: ldx #0
+ lda #$E0
+ ldy #$FF
+ sei
+ sta CIA1_DDRA
+ lda CIA1_PRA
+ sty CIA1_DDRA
+ cli
+ and #$1F
+ eor #$1F
+ rts
+
+
+++ /dev/null
-;
-; Ullrich von Bassewitz, 23.09.1998
-;
-; unsigned readjoy (unsigned char joy);
-;
-
- .export _readjoy
-
- .include "c64.inc"
-
-
-.proc _readjoy
-
- tax ; Joystick number into X
- bne joy2
-
-; Read joystick 1
-
-joy1: lda #$7F
- sei
- sta CIA1_PRA
- lda CIA1_PRB
- cli
- and #$1F
- eor #$1F
- rts
-
-; Read joystick 2
-
-joy2: ldx #0
- lda #$E0
- ldy #$FF
- sta CIA1_DDRA
- lda CIA1_PRA
- sty CIA1_DDRA
- and #$1F
- eor #$1F
- rts
-
-.endproc
-
; Common functions of the joystick API.
;
- .export _joy_install, _joy_deinstall
+ .export _joy_install, _joy_deinstall, _joy_masks
.importzp ptr1
; Copy the mask array
ldy #JOY_MASKS + JOY_MASK_COUNT - 1
- ldx #JOY_MASK_COUNT
+ ldx #JOY_MASK_COUNT-1
@L1: lda (ptr1),y
sta _joy_masks,x
dey
projects / cc65 / commitdiff