Merge pull request #2371 from alexthissen/lynx-upload

Lynx upload fixes for IRQ and configuration

libsrc/lynx/lseek.s

@@ -18,7 +18,7 @@
         .import         ldeaxysp, decsp2, pushax, incsp8
         .import         tosandeax,decax1,tosdiveax,axlong,ldaxysp
         .import         lynxskip0, lynxblock,tosasreax
-        .import         __BLOCKSIZE__
+        .import         __BANK0BLOCKSIZE__
         .importzp       _FileCurrBlock
 
 .segment        "CODE"
@@ -32,15 +32,15 @@
         jsr     ldeaxysp
         jsr     pusheax
         ldx     #$00
-        lda     #<(__BLOCKSIZE__/1024 + 9)
+        lda     #<(__BANK0BLOCKSIZE__/1024 + 9)
         jsr     tosasreax
         sta     _FileCurrBlock
         jsr     lynxblock
         ldy     #$05
         jsr     ldeaxysp
         jsr     pusheax
-        lda     #<(__BLOCKSIZE__-1)
-        ldx     #>(__BLOCKSIZE__-1)
+        lda     #<(__BANK0BLOCKSIZE__-1)
+        ldx     #>(__BANK0BLOCKSIZE__-1)
         jsr     axlong
         jsr     tosandeax
         eor     #$FF

libsrc/lynx/lynx-cart.s

@@ -17,7 +17,7 @@
         .include "extzp.inc"
         .export  lynxskip0, lynxread0
         .export  lynxblock
-        .import  __BLOCKSIZE__
+        .import  __BANK0BLOCKSIZE__
 
         .code
 
@@ -88,7 +88,7 @@ lynxblock:
         lda __iodat
         sta IODAT
         stz _FileBlockByte
-        lda #<($100-(>__BLOCKSIZE__))
+        lda #<($100-(>__BANK0BLOCKSIZE__))
         sta _FileBlockByte+1
         ply
         plx

libsrc/lynx/uploader.s

@@ -33,7 +33,7 @@ loop1:
 cont1:
         jsr     read_byte
         sta     (load_ptr2),y
-        sta     PALETTE         ; feedback ;-)
+        sta     PALETTE + 1         ; feedback ;-)
         iny
         bne     loop1
         inc     load_ptr2+1
@@ -69,6 +69,8 @@ again:
 ; last action : clear interrupt
 ;
 exit:
+        lda     #$10
+        sta     INTRST
         clc
         rts