diff --git a/device.aii b/device.aii index 0d15ce9..0aa6b85 100644 --- a/device.aii +++ b/device.aii @@ -36,7 +36,7 @@ device_write proc export ; - ; inputs: a = block number. (1024 blocks) + ; inputs: a = block number. (1024 byte block) ; ; read_data_block proc export @@ -59,11 +59,16 @@ loop rts read_it + ; a = block num (1024-byte). + ; multiply x 2 for 512-byte blocks. + asl a sta dev_blk_num - stz dev_blk_num+2 + lda #0 + rol a + sta dev_blk_num+2 lda #1024 - sta dev_blk_size + ;sta dev_blk_size sta dev_req_cnt stz dev_req_cnt+2 diff --git a/get_dir_entry.aii b/get_dir_entry.aii index e039dd4..fb63cea 100644 --- a/get_dir_entry.aii +++ b/get_dir_entry.aii @@ -238,8 +238,9 @@ init proc lda #in_cache sta dev_parms.dev_cache_pr + ; should probably read half-blocks... lda #1024 - sta dev_parms.dev_blk_size + ;sta dev_parms.dev_blk_size sta dev_parms.dev_req_cnt diff --git a/get_file_info.aii b/get_file_info.aii index c10a186..0d43c23 100644 --- a/get_file_info.aii +++ b/get_file_info.aii @@ -42,7 +42,7 @@ get_file_info procname export ;~DebugSetTrace #1 - brk $ea + ;brk $ea jsr path_to_inode bcs exit @@ -165,8 +165,8 @@ load_inode procname export sta dev_blk_num lda #512 + ;sta dev_blk_size sta dev_req_cnt - sta dev_blk_size ; dev_num must already be set up. ;lda device ;;;; diff --git a/id_disk.aii b/id_disk.aii index 0cc54eb..eca7eab 100644 --- a/id_disk.aii +++ b/id_disk.aii @@ -49,12 +49,13 @@ id_disk procname export sta dev_num lda #512 - sta dev_blk_size + ;sta dev_blk_size + sta dev_req_cnt + + lda #SUPER_BLOCK*2 sta dev_blk_num - lda #512 - sta dev_req_cnt jsr device_read bcs exit diff --git a/main.aii b/main.aii index 3c23b1b..0dbfc0e 100644 --- a/main.aii +++ b/main.aii @@ -219,14 +219,19 @@ app_entry procname sta io_buffer+2 sta dev_parms.dev_buff+2 + ; + ; minix uses 1024 byte blocks... however, appledisk3.5 can only read 256, 512, or 524 byte blocks. + ; + lda #512 + sta dev_parms.dev_blk_size + stz dev_parms.dev_blk_size+2 + stz dev_parms.dev_num stz dev_parms.dev_callnum stz dev_parms.dev_req_cnt stz dev_parms.dev_req_cnt+2 stz dev_parms.dev_blk_num stz dev_parms.dev_blk_num+2 - stz dev_parms.dev_blk_size - stz dev_parms.dev_blk_size+2 stz my_fcr stz my_fcr+2 @@ -239,6 +244,7 @@ app_entry procname stz >8