X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libsrc%2Fc64%2Fc64-vdc.s;h=5f3d9d9a723c06d1f0e3216ec241551a614d51b5;hb=9b7fcec4b43149a3be2ac2ddbeb2c914f36ebfb9;hp=3e324e5d9891883c858b6adb41051f3fa465fd1b;hpb=46773e5e9b104e7925ef7b62e82441b6226f821d;p=cc65

diff --git a/libsrc/c64/c64-vdc.s b/libsrc/c64/c64-vdc.s
index 3e324e5d9..5f3d9d9a7 100644
--- a/libsrc/c64/c64-vdc.s
+++ b/libsrc/c64/c64-vdc.s
@@ -21,12 +21,12 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION		; EM API version number
 
 ; Jump table.
 
         .word   INSTALL
-        .word   DEINSTALL
+        .word   UNINSTALL
         .word   PAGECOUNT
         .word   MAP
 	.word	USE
@@ -99,14 +99,14 @@ INSTALL:
 
 	ldx	#VDC_CSET
 	lda	tmp1
-	jsr	vdcputreg	; restore 16/64k flag
-	jmp	@endok		; and leave default values for 16k
+ 	jsr	vdcputreg	; restore 16/64k flag
+ 	jmp	@endok		; and leave default values for 16k
 
 @have64k:
-	lda	#<256
-	ldx	#>256
-	sta	pagecount
-	stx	pagecount+1
+ 	lda	#<256
+ 	ldx	#>256
+ 	sta	pagecount
+ 	stx	pagecount+1
 @endok:
 	lda     #<EM_ERR_OK
         ldx     #>EM_ERR_OK
@@ -141,11 +141,11 @@ settestadr2:
 	jmp	vdcsetsrcaddr
 
 ; ------------------------------------------------------------------------
-; 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:
     	;on C128 restore font and clear the screen?
         rts
 
@@ -255,7 +255,7 @@ COPYFROM:
 	jsr	setup
 	beq	@L2			; Skip if no full pages
 
-; Copy full pages 
+; Copy full pages
 
 @L1:    jsr     transferin
         inc     ptr1+1
@@ -265,7 +265,7 @@ COPYFROM:
 
 ; 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
@@ -273,11 +273,7 @@ COPYFROM:
 ; Transfer the bytes in the last page
 
     	ldy	#0
-	ldx	#VDC_DATA
-	stx	VDC_ADDR_REG
-@L3:	bit	VDC_ADDR_REG
-	bpl	@L3
-	lda	VDC_DATA_REG
+@L3:	jsr	vdcgetbyte
 	sta	(ptr2),y
 	iny
 	dec	tmp1
@@ -295,7 +291,7 @@ COPYTO:
 	jsr	setup
 	beq	@L2			; Skip if no full pages
 
-; Copy full pages 
+; Copy full pages
 
 @L1:    jsr     transferout
         inc     ptr1+1
@@ -305,7 +301,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
@@ -313,12 +309,8 @@ COPYTO:
 ; Transfer the bytes in the last page
 
     	ldy	#0
-	ldx	#VDC_DATA
-	stx	VDC_ADDR_REG
-@L3:	bit	VDC_ADDR_REG
-	bpl	@L3
-	lda	(ptr2),y
-	sta	VDC_DATA_REG
+@L3:	lda	(ptr2),y
+	jsr	vdcputbyte
 	iny
 	dec	tmp1
 	lda	tmp1
@@ -368,21 +360,21 @@ 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
 	rts