From 2bfb2cd4430efb9902547fdc58572e4a1543616c Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Fri, 28 Dec 2018 21:43:46 -0800
Subject: [PATCH] Use '<=1600 blocks' heuristic for 3.5 disks; tentatively
 fixes #6

---
 desktop/desktop_main.s | 55 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s
index 125b32c..a3a918b 100644
--- a/desktop/desktop_main.s
+++ b/desktop/desktop_main.s
@@ -8576,20 +8576,63 @@ ram:    return  #device_type_ramdisk
 
 :       lda     unit_number     ; low nibble is high nibble of $CnFE
 
-        ;; This would be correct, but fall back on old heuristic
-        ;; instead since it's used elsewhere.
-;;;         and     #%00001000      ; bit 3 = is removable?
-        and     #%00001111
-        cmp     #DT_REMOVABLE
+        ;; Old heuristic. Invalid on UDC, etc.
+        ;;         and     #%00001111
+        ;;         cmp     #DT_REMOVABLE
 
-        bne     :+
+        ;; Better heuristic, but still invalid on UDC, Virtual II, etc.
+        ;;         and     #%00001000      ; bit 3 = is removable?
+
+        ;; So instead, just assume <=1600 blocks is a 3.5" floppy
+        jsr     get_block_count
+        bcs     :+
+        stax    blocks
+        cmp16   blocks, #1601
+        bcs     :+
         return  #device_type_removable
 
 :       return  #device_type_profile
 
 unit_number:    .byte   0
+
+blocks: .word   0
 .endproc
 
+;;; ============================================================
+;;; Get the block count for a given unit number.
+;;; Input: A=unit_number
+;;; Output: C=0, blocks in A,X on success, C=1 on error
+.proc get_block_count_impl
+        DEFINE_ON_LINE_PARAMS on_line_params,, buffer
+        DEFINE_GET_FILE_INFO_PARAMS get_file_info_params, path
+
+start:  sta     on_line_params::unit_num
+        MLI_RELAY_CALL ON_LINE, on_line_params
+        bne     error
+
+        ;; Prefix the path with '/'
+        lda     buffer
+        and     #%00001111      ; mask off name length
+        clc
+        adc     #1              ; account for '/'
+        sta     path
+        copy    #'/', buffer
+
+        MLI_RELAY_CALL GET_FILE_INFO, get_file_info_params
+        bne     error
+
+        ldax    get_file_info_params::aux_type
+        clc
+        rts
+
+error:  sec
+        rts
+
+path:   .byte   0               ; becomes length-prefixed path
+buffer: .res    16, 0            ; length overwritten with '/'
+.endproc
+        get_block_count := get_block_count_impl::start
+
 ;;; ============================================================
 ;;; Create Volume Icon. unit_number passed in A