remove superfluous ".code" line

[cc65] / libsrc / c128 / c128-reu.s

diff --git a/libsrc/c128/c128-reu.s b/libsrc/c128/c128-reu.s
index 0dd83db965e702318657a2260ba0c7819e9f9177..4f86f6aee387228dfc2581f80b98e99514d147a3 100644 (file)
--- a/libsrc/c128/c128-reu.s
+++ b/libsrc/c128/c128-reu.s
@@ -1,5 +1,6 @@
 ;
-; Extended memory driver for the Commodore REU
+; Extended memory driver for the Commodore REU. Driver works without
+; problems when statically linked.
 ;
 ; Ullrich von Bassewitz, 2002-11-29
 ;
@@ -8,6 +9,7 @@
 
        .include        "em-kernel.inc"
         .include        "em-error.inc"
+       .include        "c128.inc"
 
 
         .macpack        generic
@@ -21,14 +23,15 @@
 ; 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
         .word   COMMIT
        .word   COPYFROM
         .word   COPYTO
@@ -52,11 +55,10 @@ OP_COPYTO       = $EC
 ; ------------------------------------------------------------------------
 ; Data.
 
-.data
+.bss
 pagecount:      .res    2               ; Number of pages available
-curpage:        .word   $FFFF           ; Current page number (invalid)
+curpage:        .res    2               ; Current page number
 
-.bss
 window:         .res    256             ; Memory "window"
 
 reu_params:     .word  $0000           ; Host address, lo, hi
@@ -76,39 +78,41 @@ reu_params:     .word       $0000           ; Host address, lo, hi
 ;
 
 INSTALL:
+        ldx     #$00                    ; High byte of return code
         lda     #$55
         sta     REU_REUADDR
         cmp     REU_REUADDR             ; Check for presence of REU
         bne     nodevice
-        lda     #$AA
+        asl     a                       ; A = $AA
         sta     REU_REUADDR
         cmp     REU_REUADDR             ; Check for presence of REU
         bne     nodevice
 
-        ldx     #>(128*4)               ; Assume 128KB
+        ldy     #>(128*4)               ; Assume 128KB
         lda     REU_STATUS
         and     #$10                    ; Check size bit
         beq     @L1
-        ldx     #>(256*4)               ; 256KB when size bit is set
-@L1:    stx     pagecount+1
+        ldy     #>(256*4)               ; 256KB when size bit is set
+@L1:    sty     pagecount+1
 
-        lda     #<EM_ERR_OK
-        ldx     #>EM_ERR_OK
+        ldy     #$FF
+        sty     curpage
+        sty     curpage+1               ; Invalidate the current page
+        txa                             ; X = A = EM_ERR_OK
         rts
 
 ; No REU found
 
 nodevice:
-        lda     #<EM_ERR_NO_DEVICE
-        ldx     #>EM_ERR_NO_DEVICE
-        rts
+        lda     #EM_ERR_NO_DEVICE
+;       rts                             ; Run into UNINSTALL instead
 
 ; ------------------------------------------------------------------------
-; 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:
         rts
 
 
@@ -123,8 +127,8 @@ PAGECOUNT:
 
 ; ------------------------------------------------------------------------
 ; MAP: Map the page in a/x into memory and return a pointer to the page in
-; a/x. The contents of the currently mapped page (if any) are assumed to be
-; dirty and must be saved into secondary storage if this is necessary.
+; a/x. The contents of the currently mapped page (if any) may be discarded
+; by the driver.
 ;
 
 MAP:    sta     curpage
@@ -137,6 +141,15 @@ MAP:    sta     curpage
         ldx     #>window                ; Return the window address
 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
+        ldx     #>window                ; Return the window
+        rts
+
 ; ------------------------------------------------------------------------
 ; COMMIT: Commit changes in the memory window to extended storage.
 
@@ -210,15 +223,14 @@ transfer1:
 transfer:
         sty            REU_COMMAND     ; Issue command
 
-        ldy    $01             ; Save the value of the c64 control port...
-        tya                    ;
-        ora    #$03            ; Turn on lower 3 bits to bank out ROMs, I/O.
+        ldy            MMU_CR          ; Save the current MMU settings
+       lda     #MMU_CFG_RAM0   ;
        sei                     ;
-        sta    $01
+        sta    MMU_CR          ; Enable RAM in bank #0
         lda     REU_TRIGGER     ; Don't change $FF00
         sta    REU_TRIGGER     ; Start the transfer...
 
-        sty     $01             ; Restore the old configuration
+        sty     MMU_CR          ; Restore the old configuration
         cli
         rts