From: ol.sc Date: Sat, 17 Jul 2010 19:16:25 +0000 (+0000) Subject: Read number of total blocks from ProDOS 8 volume directory header - and fall back... X-Git-Tag: V2.13.3~685 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=07680d2376b20acba846fb56df41be234fdff064;p=cc65 Read number of total blocks from ProDOS 8 volume directory header - and fall back on the constant 280 only for non-ProDOS 8 disks. git-svn-id: svn://svn.cc65.org/cc65/trunk@4750 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/doc/apple2.sgml b/doc/apple2.sgml index 7b4bd7226..16ea35dd7 100644 --- a/doc/apple2.sgml +++ b/doc/apple2.sgml @@ -433,13 +433,6 @@ BASIC.SYSTEM) there are some limitations for DOS 3.3:

-DIO

- -Although generally works with all ProDOS 8 -devices, the function -simply always return 280 (which is only correct for a 140 KB disk). - - Direct console I/O

@@ -493,15 +486,27 @@ name="assembler manual">. DIO

-The function has the single parameter - - + has the single + parameter drive_id = slot * 16 + (drive - 1) * 128 - + + + so that for example slot 6 drive 2 is mapped to returns + the correct sector count for all ProDOS 8 disks. However for any non-ProDOS 8 + disk it simply always return 280 (which is only correct for a 140 KB disk). + This condition is indicated by the _oserror value 82. + +

diff --git a/doc/apple2enh.sgml b/doc/apple2enh.sgml index 70fdcf4e7..9286005f5 100644 --- a/doc/apple2enh.sgml +++ b/doc/apple2enh.sgml @@ -434,13 +434,6 @@ BASIC.SYSTEM) there are some limitations for DOS 3.3:

-DIO

- -Although generally works with all ProDOS 8 -devices, the function -simply always return 280 (which is only correct for a 140 KB disk). - - Direct console I/O

@@ -499,15 +492,27 @@ name="assembler manual">. DIO

-The function has the single parameter - - + has the single + parameter drive_id = slot * 16 + (drive - 1) * 128 - + + + so that for example slot 6 drive 2 is mapped to returns + the correct sector count for all ProDOS 8 disks. However for any non-ProDOS 8 + disk it simply always return 280 (which is only correct for a 140 KB disk). + This condition is indicated by the _oserror value 82. + +

diff --git a/libsrc/apple2/diosectcount.s b/libsrc/apple2/diosectcount.s index 749248232..41bcb3045 100644 --- a/libsrc/apple2/diosectcount.s +++ b/libsrc/apple2/diosectcount.s @@ -5,8 +5,91 @@ ; .export _dio_query_sectcount + .import _dio_query_sectsize, _malloc, _free + + .include "zeropage.inc" + .include "errno.inc" + .include "mli.inc" _dio_query_sectcount: - lda #<280 - ldx #>280 + + ; Set handle + sta mliparam + MLI::ON_LINE::UNIT_NUM + + ; Get ProDOS 8 block size (clears __oserror) + jsr _dio_query_sectsize + + ; Alloc buffer + jsr _malloc + sta ptr4 + stx ptr4+1 + + ; Set buffer + sta mliparam + MLI::ON_LINE::DATA_BUFFER + stx mliparam + MLI::ON_LINE::DATA_BUFFER+1 + + ; Check buffer (hibyte is enough) + txa + beq nomem + + ; Get device state + lda #ON_LINE_CALL + ldx #ON_LINE_COUNT + jsr callmli + bcs check + + ; UNIT_NUM already set + .assert MLI::RW_BLOCK::UNIT_NUM = MLI::ON_LINE::UNIT_NUM, error + + ; DATA_BUFFER already set + .assert MLI::RW_BLOCK::DATA_BUFFER = MLI::ON_LINE::DATA_BUFFER, error + + ; Read volume directory key block + tax ; A = 0 + lda #$02 + sta mliparam + MLI::RW_BLOCK::BLOCK_NUM + stx mliparam + MLI::RW_BLOCK::BLOCK_NUM+1 + lda #READ_BLOCK_CALL + ldx #RW_BLOCK_COUNT + jsr callmli + bcs oserr + + ; Get and save total blocks from volume directory header + ldy #$29 + lda (ptr4),y + pha + iny + lda (ptr4),y + pha + + ; Cleanup buffer +done: lda ptr4 + ldx ptr4+1 + jsr _free + + ; Restore total blocks and return + pla + tax + pla rts + +nomem: lda #$FF ; Error code for sure not used by MLI +oserr: sta __oserror + + ; Save total blocks for failure + lda #$00 + pha + pha + beq done ; Branch always + + ; Check for non-ProDOS disk +check: cmp #$52 ; "Not a ProDOS volume" + bne oserr + sta __oserror + + ; Save total blocks for a 16-sector disk + lda #<280 + pha + lda #>280 + pha + bne done ; Branch always