Updated to use cbm_kernal.inc. Whitespace cleanups

[cc65] / libsrc / apple2 / dosdetect.s

diff --git a/libsrc/apple2/dosdetect.s b/libsrc/apple2/dosdetect.s
index 9b3731ac56972d3e439be5fa467798d5ab2912cf..46fbb5484b9218f2ab328b2c3e5a01dbf59f9736 100644 (file)
--- a/libsrc/apple2/dosdetect.s
+++ b/libsrc/apple2/dosdetect.s
@@ -3,43 +3,46 @@
 ;
 ; Identify DOS version we're running on as one of these:
 ;
-; AppleDOS 3.3 $00
-; ProDOS 1.0.1 $10
-; ProDOS 1.0.2 $10
-; ProDOS 1.1.1 $11
-; ProDOS 1.2   $12
-; ProDOS 1.3   $13
-; ProDOS 1.4   $14
-; ProDOS 1.5   $15
-; ProDOS 1.6   $16
-; ProDOS 1.7   $17
-; ProDOS 1.8   $18
-; ProDOS 1.9   $18
-; ProDOS 2.0.1  $21
-; ProDOS 2.0.2  $22
-; ProDOS 2.0.3  $23
+; AppleDOS 3.3   - $00
+; ProDOS 8 1.0.1 - $10
+; ProDOS 8 1.0.2 - $10
+; ProDOS 8 1.1.1 - $11
+; ProDOS 8 1.2   - $12
+; ProDOS 8 1.3   - $13
+; ProDOS 8 1.4   - $14
+; ProDOS 8 1.5   - $15
+; ProDOS 8 1.6   - $16
+; ProDOS 8 1.7   - $17
+; ProDOS 8 1.8   - $18
+; ProDOS 8 1.9   - $18
+; ProDOS 8 2.0.1 - $21
+; ProDOS 8 2.0.2 - $22
+; ProDOS 8 2.0.3 - $23
+;
 
-       .constructor    initdostype
-       .export         __dos_type
+        .constructor    initdostype, 25
+        .export         __dos_type
 
-       .include        "apple2.inc"
+        .include        "mli.inc"
 
 ; Identify DOS version according to:
-; - "Beneath Apple ProDOS", chapter 6-63
-; - "Apple II ProDOS 8 TechNote #023: ProDOS 8 Changes and Minutia"
+; - Beneath Apple ProDOS, chapter 6-63
+; - Apple II ProDOS 8 TechNote #23, ProDOS 8 Changes and Minutia
 ; - ProDOS TechRefMan, chapter 5.2.4
 
+        .segment        "ONCE"
+
 initdostype:
-       lda     MLI
-       cmp     #$4C            ; Is MLI present? (JMP opcode)
-       bne     done
-       lda     $BFFF           ; ProDOS KVERSION
-       cmp     #$10
-       bcs     :+
-       ora     #$10            ; Make high nibble match major version
-:      sta     __dos_type
-done:  rts
+        lda     $BF00
+        cmp     #$4C            ; Is MLI present? (JMP opcode)
+        bne     done
+        lda     KVERSION        ; ProDOS 8 kernel version
+        cmp     #$10
+        bcs     :+
+        ora     #$10            ; Make high nibble match major version
+:       sta     __dos_type
+done:   rts
 
-       .bss
+        .data
 
-__dos_type:    .res    1
+__dos_type:     .byte   $00