From ae8c0dc6674c5cd4d3595f3e072942d87afaa3ac Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Wed, 17 Dec 2003 09:28:28 +0000
Subject: [PATCH] Use new decls

git-svn-id: svn://svn.cc65.org/cc65/trunk@2779 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 libsrc/geos/devel/geos-stdjoy.s |  7 +++----
 libsrc/geos/devel/geos-vdc.s    | 18 +++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/libsrc/geos/devel/geos-stdjoy.s b/libsrc/geos/devel/geos-stdjoy.s
index d525e7c05..8b654bc9c 100644
--- a/libsrc/geos/devel/geos-stdjoy.s
+++ b/libsrc/geos/devel/geos-stdjoy.s
@@ -18,11 +18,11 @@
 ; Header. Includes jump table
 
 .segment        "JUMPTABLE"
-
+					     
 ; 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)
 
@@ -64,8 +64,7 @@ JOY_COUNT       = 2             ; Number of joysticks we support
 INSTALL:
         lda     #<JOY_ERR_OK
         ldx     #>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/geos/devel/geos-vdc.s b/libsrc/geos/devel/geos-vdc.s
index 6318ff88c..dda119b09 100644
--- a/libsrc/geos/devel/geos-vdc.s
+++ b/libsrc/geos/devel/geos-vdc.s
@@ -22,7 +22,7 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION		; EM API version number
 
 ; Jump table.
 
@@ -293,8 +293,8 @@ COPYFROM:
         bne     @L1
 
 ; Copy the remainder of the page
-
-@L2:    ldy     #EM_COPY_COUNT
+		 
+@L2:    ldy     #EM_COPY::COUNT
         lda     (ptr3),y                ; Get bytes in last page
         beq     @L4
         sta	tmp1
@@ -338,7 +338,7 @@ COPYTO:
 
 ; Copy the remainder of the page
 
-@L2:    ldy     #EM_COPY_COUNT
+@L2:    ldy     #EM_COPY::COUNT
         lda     (ptr3),y                ; Get bytes in last page
         beq     @L4
         sta	tmp1
@@ -405,22 +405,22 @@ setup:
 	sta     ptr3
         stx     ptr3+1                  ; Save the passed em_copy pointer
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr3),y
         sta     ptr1
-        ldy     #EM_COPY_PAGE
+        ldy     #EM_COPY::PAGE
         lda     (ptr3),y
         sta     ptr1+1                  ; From
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr3),y
         sta     ptr2
         iny
         lda     (ptr3),y
         sta     ptr2+1                  ; To
 
-	ldy     #EM_COPY_COUNT+1
+	ldy     #EM_COPY::COUNT+1
         lda     (ptr3),y                ; Get number of pages
-        sta     tmp1
+        sta     tmp1	  
 	rts