Added joystick drivers for C16 and Atari

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

libsrc/Makefile

@@ -108,6 +108,7 @@ c16lib:
 	    $(AR) a c16.lib $$i/*.o;\
 	done
 	mv c16/crt0.o c16.o
+	cp c16/*.joy .
 
 #-----------------------------------------------------------------------------
 # C64

libsrc/atari/.cvsignore

@@ -0,0 +1,3 @@
+*.emd
+*.joy
+*.tgi

libsrc/atari/Makefile

@@ -8,6 +8,9 @@ ATARIDEFS = -DNUMDRVS=4 -DUCASE_FILENAME=1
 
 .SUFFIXES: .o .s .c
 
+#--------------------------------------------------------------------------
+# Rules
+
 %.o:   	%.c
 	@$(CC) $(CFLAGS) $(ATARIDEFS) $<
 	@$(AS) -o $@ $(AFLAGS) $(*).s
@@ -15,6 +18,18 @@ ATARIDEFS = -DNUMDRVS=4 -DUCASE_FILENAME=1
 %.o:	%.s
 	@$(AS) -g -o $@ $(AFLAGS) $(ATARIDEFS) $<
 
+%.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 $@ $^
+
+#--------------------------------------------------------------------------
+# Object files
+
 OBJS =	_scrsize.o   \
 	break.o      \
 	cclear.o     \
@@ -68,8 +83,23 @@ OBJS =	_scrsize.o   \
 	write.o
 
 
-all:   	$(OBJS)
+#--------------------------------------------------------------------------
+# Drivers
+
+EMDS =
+
+JOYS = atari-stdjoy.joy
+
+TGIS =
+
+#--------------------------------------------------------------------------
+# Targets
+
+all: 	$(OBJS) $(EMDS) $(JOYS) $(TGIS)
+
+../runtime/zeropage.o:
+	$(MAKE) -C $(dir $@) $(notdir $@)
 
 clean:
-	@rm -f $(OBJS)
+	@rm -f $(OBJS) $(EMDS:.emd=.o) $(JOYS:.joy=.o) $(TGIS:.tgi=.o)
 

libsrc/atari/atari-stdjoy.s

@@ -0,0 +1,107 @@
+;
+; Standard joystick driver for the Atari
+;
+; Ullrich von Bassewitz, 2002-12-21
+; Using the readjoy code from Christian Groessler
+;
+
+ 	.include 	"zeropage.inc"
+
+      	.include 	"joy-kernel.inc"
+        .include        "joy-error.inc"
+        .include        "atari.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   READJOY
+
+; ------------------------------------------------------------------------
+; Constants
+
+JOY_COUNT       = 4             ; 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.
+;
+
+READJOY:
+	and	#3		; fix joystick number
+	tax			; Joystick number (0-3) into X
+
+; Read joystick
+
+	lda	STRIG0,x	; get button
+	asl	a
+	asl	a
+	asl	a
+	asl	a
+	ora	STICK0,x	; add position information
+	eor	#$1F
+	ldx	#0		; fix X
+     	rts
+

libsrc/c16/.cvsignore

@@ -0,0 +1,3 @@
+*.emd
+*.joy
+*.tgi

libsrc/c16/Makefile

@@ -45,7 +45,7 @@ OBJS =	_scrsize.o	\
 
 EMDS =
 
-JOYS = 
+JOYS = c16-stdjoy.joy
 
 TGIS =
 

libsrc/c16/c16-stdjoy.s

@@ -0,0 +1,8 @@
+;
+; Standard joystick driver for the Plus/4
+;
+; Ullrich von Bassewitz, 2002-12-21
+;
+
+	.include	"../plus4/plus4-stdjoy.s"
+

libsrc/plus4/plus4-stdjoy.s

@@ -8,7 +8,7 @@
 
       	.include 	"joy-kernel.inc"
         .include        "joy-error.inc"
-        .include        "plus4.inc"
+        .include        "../plus4/plus4.inc"
 
         .macpack        generic