Use changed EM decls

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

diff --git a/libsrc/c128/c128-georam.s b/libsrc/c128/c128-georam.s
index c521e4a4bec6b3392564db78cc0259d83988f4b7..5199e2ee468f91e01414b9d9a593d350bf1bb000 100644 (file)
--- a/libsrc/c128/c128-georam.s
+++ b/libsrc/c128/c128-georam.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.
 
@@ -225,7 +225,7 @@ setup:  sta     ptr1
 ; Get the page number from the struct and adjust it so that it may be used
 ; with the hardware. That is: lower 6 bits in tmp1, high bits in tmp2.
 
-        ldy     #EM_COPY_PAGE+1
+        ldy     #EM_COPY::PAGE+1
         lda     (ptr1),y
         sta     tmp2
         dey
@@ -240,16 +240,16 @@ setup:  sta     ptr1
 
 ; Get the buffer pointer into ptr2
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr1),y
         sta     ptr2
         iny
         lda     (ptr1),y
-        sta     ptr2+1                                              
+        sta     ptr2+1
 
 ; Get the count, calculate -(count-1) and store it into ptr3
 
-        ldy     #EM_COPY_COUNT
+        ldy     #EM_COPY::COUNT
         lda     (ptr1),y
         eor     #$FF
         sta     ptr3
@@ -260,7 +260,7 @@ setup:  sta     ptr1
 
 ; Get the page offset into X and clear Y
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr1),y
         tax
         ldy     #$00

diff --git a/libsrc/c128/c128-ram.s b/libsrc/c128/c128-ram.s
index 3c7e9b70ebe70149a693f41c276815d9f1fb4772..1211c444dad03dfb9c87fdc3786230a350fb143d 100644 (file)
--- a/libsrc/c128/c128-ram.s
+++ b/libsrc/c128/c128-ram.s
@@ -23,7 +23,7 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION                ; EM API version number
 
 ; Jump table.
 
@@ -165,16 +165,16 @@ COPYFROM:
         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
         clc
         adc     #>BASE
         sta     ptr1+1                  ; From
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr3),y
         sta     ptr2
         iny
@@ -184,7 +184,7 @@ COPYFROM:
         lda     #<ptr1
         sta     FETVEC
 
-        ldy     #EM_COPY_COUNT+1
+        ldy     #EM_COPY::COUNT+1
         lda     (ptr3),y                ; Get number of pages
         beq     @L2                     ; Skip if no full pages
         sta     tmp1
@@ -204,7 +204,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
@@ -230,16 +230,16 @@ COPYFROM:
 COPYTO: 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
         clc
         adc     #>BASE
         sta     ptr1+1                  ; To
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr3),y
         sta     ptr2
         iny
@@ -249,7 +249,7 @@ COPYTO: sta     ptr3
         lda     #<ptr1
         sta     STAVEC
 
-        ldy     #EM_COPY_COUNT+1
+        ldy     #EM_COPY::COUNT+1
         lda     (ptr3),y                ; Get number of pages
         beq     @L2                     ; Skip if no full pages
         sta     tmp1
@@ -269,7 +269,7 @@ COPYTO: sta     ptr3
 
 ; 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

diff --git a/libsrc/c128/c128-ramcart.s b/libsrc/c128/c128-ramcart.s
index 0931c3508428f84dc6e2619fcd611d81c8351825..ad76b4965f44e82dd98bc402f74b5b7d6acba58c 100644 (file)
--- a/libsrc/c128/c128-ramcart.s
+++ b/libsrc/c128/c128-ramcart.s
@@ -24,7 +24,7 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION                ; EM API version number
 
 ; Jump table.
 
@@ -252,7 +252,7 @@ setup:  sta     ptr1
 ; Get the page number from the struct and adjust it so that it may be used
 ; with the hardware. That is: lower 6 bits in tmp1, high bits in tmp2.
 
-        ldy     #EM_COPY_PAGE+1
+        ldy     #EM_COPY::PAGE+1
         lda     (ptr1),y
         sta     tmp2
         dey
@@ -261,7 +261,7 @@ setup:  sta     ptr1
 
 ; Get the buffer pointer into ptr2
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr1),y
         sta     ptr2
         iny
@@ -270,7 +270,7 @@ setup:  sta     ptr1
 
 ; Get the count, calculate -(count-1) and store it into ptr3
 
-        ldy     #EM_COPY_COUNT
+        ldy     #EM_COPY::COUNT
         lda     (ptr1),y
         eor     #$FF
         sta     ptr3
@@ -281,7 +281,7 @@ setup:  sta     ptr1
 
 ; Get the page offset into X and clear Y
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr1),y
         tax
         ldy     #$00

diff --git a/libsrc/c128/c128-reu.s b/libsrc/c128/c128-reu.s
index b097e6e9f61465f53b77993fd7ea87fdd558d6be..4f86f6aee387228dfc2581f80b98e99514d147a3 100644 (file)
--- a/libsrc/c128/c128-reu.s
+++ b/libsrc/c128/c128-reu.s
@@ -23,7 +23,7 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION                ; EM API version number
 
 ; Jump table.
 

diff --git a/libsrc/c128/c128-vdc.s b/libsrc/c128/c128-vdc.s
index 49badc3d116af4ee70ff873c032e0d342f2f915d..d2b6b9d8b31423e3a4d9d335f7c090d2aedbb245 100644 (file)
--- a/libsrc/c128/c128-vdc.s
+++ b/libsrc/c128/c128-vdc.s
@@ -21,7 +21,7 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION                ; EM API version number
 
 ; Jump table.
 
@@ -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
@@ -291,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
@@ -301,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
@@ -360,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

diff --git a/libsrc/c16/c16-ram.s b/libsrc/c16/c16-ram.s
index 2b603ae14ccd5c148de314cc1ae8c03604651d3f..30f6c469980f406900a7776265685866bf18d383 100644 (file)
--- a/libsrc/c16/c16-ram.s
+++ b/libsrc/c16/c16-ram.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.
 
@@ -183,22 +183,22 @@ COPYFROM:
         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
         add     #>BASE
         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
 
-common: ldy     #EM_COPY_COUNT+1
+common: ldy     #EM_COPY::COUNT+1
         lda     (ptr3),y                ; Get number of pages
         beq     @L2                     ; Skip if no full pages
         sta     tmp1
@@ -214,7 +214,7 @@ common: ldy     #EM_COPY_COUNT+1
 
 ; 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
         tax
@@ -249,15 +249,15 @@ common: ldy     #EM_COPY_COUNT+1
 COPYTO: sta     ptr3
         stx     ptr3+1                  ; Save the passed em_copy pointer
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr3),y
         sta     ptr2
-        ldy     #EM_COPY_PAGE
+        ldy     #EM_COPY::PAGE
         lda     (ptr3),y
         add     #>BASE
         sta     ptr2+1                  ; To
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr3),y
         sta     ptr1
         iny

diff --git a/libsrc/c64/c64-georam.s b/libsrc/c64/c64-georam.s
index fc003b6aab167e0679311d882481620603259b71..0e33b8d94bddac61cabc669a57fb53b59a2707ee 100644 (file)
--- a/libsrc/c64/c64-georam.s
+++ b/libsrc/c64/c64-georam.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.
 
@@ -86,7 +86,7 @@ PAGECOUNT:
 ; The GeoRAM cartridge does not copy but actually map the window, so USE is
 ; identical to MAP.
 
-USE     = MAP
+USE     = MAP            
 
 ; ------------------------------------------------------------------------
 ; MAP: Map the page in a/x into memory and return a pointer to the page in
@@ -225,7 +225,7 @@ setup:  sta     ptr1
 ; Get the page number from the struct and adjust it so that it may be used
 ; with the hardware. That is: lower 6 bits in tmp1, high bits in tmp2.
 
-        ldy     #EM_COPY_PAGE+1
+        ldy     #EM_COPY::PAGE+1
         lda     (ptr1),y
         sta     tmp2
         dey
@@ -240,7 +240,7 @@ setup:  sta     ptr1
 
 ; Get the buffer pointer into ptr2
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr1),y
         sta     ptr2
         iny
@@ -249,7 +249,7 @@ setup:  sta     ptr1
 
 ; Get the count, calculate -(count-1) and store it into ptr3
 
-        ldy     #EM_COPY_COUNT
+        ldy     #EM_COPY::COUNT
         lda     (ptr1),y
         eor     #$FF
         sta     ptr3
@@ -260,7 +260,7 @@ setup:  sta     ptr1
 
 ; Get the page offset into X and clear Y
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr1),y
         tax
         ldy     #$00

diff --git a/libsrc/c64/c64-ram.s b/libsrc/c64/c64-ram.s
index b0a60c1d9557cd3ec61dd7025e0af3bd71158a6c..f176eda494f031f4f5e58cc740d236593e7ab228 100644 (file)
--- a/libsrc/c64/c64-ram.s
+++ b/libsrc/c64/c64-ram.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.
 
@@ -162,7 +162,7 @@ loop:       .repeat 8
 
 ; Done
 
-done:   rts
+done:   rts              
 
 ; ------------------------------------------------------------------------
 ; COPYFROM: Copy from extended into linear memory. A pointer to a structure
@@ -173,24 +173,24 @@ done:   rts
 COPYFROM:
         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
         clc
         adc     #>BASE
         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
 
-common: ldy     #EM_COPY_COUNT+1
+common: ldy     #EM_COPY::COUNT+1
         lda     (ptr3),y                ; Get number of pages
         beq     @L2                     ; Skip if no full pages
         sta     tmp1
@@ -206,7 +206,7 @@ common: ldy     #EM_COPY_COUNT+1
 
 ; 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
         tax
@@ -245,16 +245,16 @@ common: ldy     #EM_COPY_COUNT+1
 COPYTO: sta     ptr3
         stx     ptr3+1                  ; Save the passed em_copy pointer
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr3),y
         sta     ptr2
-        ldy     #EM_COPY_PAGE
+        ldy     #EM_COPY::PAGE
         lda     (ptr3),y
         clc
         adc     #>BASE
         sta     ptr2+1                  ; To
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr3),y
         sta     ptr1
         iny

diff --git a/libsrc/c64/c64-ramcart.s b/libsrc/c64/c64-ramcart.s
index bd77410488bbb63ce86fef6ce3ee60d6ee2b2dad..43e42af3b6c0c468f0e9e39e080520857943e08e 100644 (file)
--- a/libsrc/c64/c64-ramcart.s
+++ b/libsrc/c64/c64-ramcart.s
@@ -24,7 +24,7 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION                ; EM API version number
 
 ; Jump table.
 
@@ -252,7 +252,7 @@ setup:  sta     ptr1
 ; Get the page number from the struct and adjust it so that it may be used
 ; with the hardware. That is: lower 6 bits in tmp1, high bits in tmp2.
 
-        ldy     #EM_COPY_PAGE+1
+        ldy     #EM_COPY::PAGE+1
         lda     (ptr1),y
         sta     tmp2
         dey
@@ -261,7 +261,7 @@ setup:  sta     ptr1
 
 ; Get the buffer pointer into ptr2
 
-        ldy     #EM_COPY_BUF
+        ldy     #EM_COPY::BUF
         lda     (ptr1),y
         sta     ptr2
         iny
@@ -270,7 +270,7 @@ setup:  sta     ptr1
 
 ; Get the count, calculate -(count-1) and store it into ptr3
 
-        ldy     #EM_COPY_COUNT
+        ldy     #EM_COPY::COUNT
         lda     (ptr1),y
         eor     #$FF
         sta     ptr3
@@ -281,7 +281,7 @@ setup:  sta     ptr1
 
 ; Get the page offset into X and clear Y
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr1),y
         tax
         ldy     #$00

diff --git a/libsrc/c64/c64-reu.s b/libsrc/c64/c64-reu.s
index 4fd5e3db7100325965ea6b4c9f2961365a205191..59dbb791337f76019034c4dcedb53c782af7c682 100644 (file)
--- a/libsrc/c64/c64-reu.s
+++ b/libsrc/c64/c64-reu.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.
 
@@ -142,7 +142,7 @@ done:   rts
 
 ; ------------------------------------------------------------------------
 ; USE: Tell the driver that the window is now associated with a given page.
-
+                                       
 USE:    sta     curpage
         stx     curpage+1               ; Remember the page
         lda     #<window

diff --git a/libsrc/c64/c64-vdc.s b/libsrc/c64/c64-vdc.s
index 86e3ad91c51a695df07fc73a4b1c001fa5fd377e..5f3d9d9a723c06d1f0e3216ec241551a614d51b5 100644 (file)
--- a/libsrc/c64/c64-vdc.s
+++ b/libsrc/c64/c64-vdc.s
@@ -21,7 +21,7 @@
 ; Driver signature
 
         .byte   $65, $6d, $64           ; "emd"
-        .byte   $00                     ; EM API version number
+        .byte   EMD_API_VERSION                ; EM API version number
 
 ; Jump table.
 
@@ -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
@@ -301,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
@@ -360,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

diff --git a/libsrc/cbm510/cbm510-ram.s b/libsrc/cbm510/cbm510-ram.s
index 3b91f0bb9aa2844c66290932a96719ef18ea62d1..f744d019c22bf227d554641ecd4c2750fd4e3eee 100644 (file)
--- a/libsrc/cbm510/cbm510-ram.s
+++ b/libsrc/cbm510/cbm510-ram.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.
 
@@ -73,7 +73,7 @@ INSTALL:
 
         lda     #<EM_ERR_OK
         ldx     #>EM_ERR_OK
-        rts
+;       rts                            ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
 ; UNINSTALL routine. Is called before the driver is removed from memory.
@@ -263,23 +263,23 @@ COPYTO: jsr     setup
 setup:  sta     ptr3
         stx     ptr3+1                  ; Save the passed em_copy pointer
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr3),y
         add     #OFFS
         sta     ptr1
-        ldy     #EM_COPY_PAGE
+        ldy     #EM_COPY::PAGE
         lda     (ptr3),y
         adc     #$00
         sta     ptr1+1
 
-        ldy     #EM_COPY_COUNT
+        ldy     #EM_COPY::COUNT
         lda     (ptr3),y
         sta     ptr2
         iny
         lda     (ptr3),y
         sta     ptr2+1                  ; Get count into ptr2
 
-        ldy     #EM_COPY_BUF+1
+        ldy     #EM_COPY::BUF+1
         lda     (ptr1),y
         tax
         dey

diff --git a/libsrc/cbm610/cbm610-ram.s b/libsrc/cbm610/cbm610-ram.s
index 2798f83ad6da3a30af9b7a62ff560cbb5ddf7a2f..af441f21d5dd5edd4f32b06110d77750351dc897 100644 (file)
--- a/libsrc/cbm610/cbm610-ram.s
+++ b/libsrc/cbm610/cbm610-ram.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.
 
@@ -73,7 +73,7 @@ INSTALL:
 
         lda     #<EM_ERR_OK
         ldx     #>EM_ERR_OK
-        rts
+;       rts                            ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
 ; UNINSTALL routine. Is called before the driver is removed from memory.
@@ -263,23 +263,23 @@ COPYTO: jsr     setup
 setup:  sta     ptr3
         stx     ptr3+1                  ; Save the passed em_copy pointer
 
-        ldy     #EM_COPY_OFFS
+        ldy     #EM_COPY::OFFS
         lda     (ptr3),y
         add     #OFFS
         sta     ptr1
-        ldy     #EM_COPY_PAGE
+        ldy     #EM_COPY::PAGE
         lda     (ptr3),y
         adc     #$00
         sta     ptr1+1
 
-        ldy     #EM_COPY_COUNT
+        ldy     #EM_COPY::COUNT
         lda     (ptr3),y
         sta     ptr2
         iny
         lda     (ptr3),y
         sta     ptr2+1                  ; Get count into ptr2
 
-        ldy     #EM_COPY_BUF+1
+        ldy     #EM_COPY::BUF+1
         lda     (ptr1),y
         tax
         dey

diff --git a/libsrc/em/em-kernel.s b/libsrc/em/em-kernel.s
index 31c331f4acf8394cec244ec518f028a9362298c4..1c9591e28d9b2c9b97c60c98a37a5a825504048c 100644 (file)
--- a/libsrc/em/em-kernel.s
+++ b/libsrc/em/em-kernel.s
@@ -33,8 +33,7 @@ emd_copyto:     jmp     return0
 
 ; Driver header signature
 .rodata
-emd_sig:        .byte   $65, $6d, $64, $00      ; "emd", version
-emd_sig_len     = * - emd_sig
+emd_sig:        .byte   $65, $6d, $64, EMD_API_VERSION ; "emd", version
 
 
 ;----------------------------------------------------------------------------
@@ -50,7 +49,7 @@ _em_install:
 
 ; Check the driver signature
 
-        ldy     #emd_sig_len-1
+        ldy     #.sizeof(emd_sig)-1
 @L0:    lda     (ptr1),y
         cmp     emd_sig,y
         bne     inv_drv
@@ -59,12 +58,12 @@ _em_install:
 
 ; Copy the jump vectors
 
-        ldy     #EMD_HDR_JUMPTAB
+        ldy     #EMD_HDR::JUMPTAB
         ldx     #0
 @L1:    inx                             ; Skip the JMP opcode
         jsr     copy                    ; Copy one byte
         jsr     copy                    ; Copy one byte
-        cpx     #(EMD_HDR_JUMPCOUNT*3)
+        cpy     #(EMD_HDR::JUMPTAB + .sizeof(EMD_HDR::JUMPTAB))
         bne     @L1
 
         jmp     emd_install             ; Call driver install routine