Merge pull request #28 from peterferrie/master

multiple RAM disk bug fixes

src/mli.a

@@ -67,8 +67,6 @@ WriteTrackMLI
                           ; page 6-19
          sta   mliparam+1
          lda   SLOT
-         sec
-         sbc   #$30
          asl
          asl
          asl
@@ -685,6 +683,7 @@ WriteRAMToDisk
          sta   mliparam+2
          sta   mliparam+3
          sta   mliparam+4
+         sta   gTrack
          jsr   SwapProDOS
          lda   gRAMDiskRef
          jsr   SetMark

src/passport.a

@@ -458,8 +458,7 @@ nextsector
          bne   .passprint ; always branches
 .passcrack
          lda   gUsingRAMDisk
-         cmp   #FALSE
-         beq   .skipram
+         bne   .skipram
          lda   #s_writing
          jsr   PrintByID
          jsr   WriteRAMToDisk

src/slots.a

@@ -93,7 +93,6 @@ ScanForRAMDisk
          lsr
          lsr
          lsr
-         sta   .driverbase+1
          lsr
          tay
          pla
@@ -112,23 +111,21 @@ ScanForRAMDisk
          cmp   #$0F
          bne   -
 
-.driverbase
-         ldx   #$d1
-         lda   $BF11,x
-         sta   .drivercode+2
-         and   #$f0
-         cmp   #$c0
-         bne   +
-
-         ;RAMFactor detection
-         ;looks like a SmartPort device
-
-.drivercode
-         lda   $d100
-         cmp   #$c9
-         bne   -
+         ;check for RAM[x] by name
 
+         ldy   OnlineReturn
+         cpy   #4
+         beq   +
+         cpy   #6
+         bcs   -
+         dey
 +
+--       lda   SlashRAM-1,y
+         cmp   VolumeName-1,y
+         bne   -
+         dey
+         bne   --
+
          ;check free space
          ;need at least $118 blocks
 
@@ -147,4 +144,6 @@ ScanForRAMDisk
          sta   gUsingRAMDisk
 .done
          rts
+
+SlashRAM !byte $2F, $52, $41, $4D
 }

src/strings/en.a

@@ -222,7 +222,7 @@ StringTable
 ; can be set directly before calling PrintByID.
 ;
 .header
-         !text "Passport by 4am               2017-08-03",$00
+         !text "Passport by 4am               2017-08-07",$00
 .mainmenu
          !text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D
          !text "              "