Move TR-DOS .drives, .step-rates and .fda to the library.

FossilOrigin-Name: 1840ab22826e2522450da561f51a35110fbf13ff090b592032d1e24c2c9ba540

Author: programandala-net

VERSIONS.adoc

@@ -1,6 +1,6 @@
 = Solo Forth version history
 :author: Marcos Cruz (programandala.net)
-:revdate: 2021-01-05
+:revdate: 2021-01-06
 :toc:
 
 // This file is part of Solo Forth
@@ -50,13 +50,15 @@ http://qbi2005.windows.cervantesvirtual.com/wfrmVistaImagen.aspx?imagen=00096057
 === Improvements
 
 - Improve the documentation.
+- Improve TR-DOS `.step-rates`.
 
 // Other changes {{{2
 === Other changes
 
 - Deactivate assembler instructions `stpx,` and `ftpx,`, which need to
   be fixed.
 - Remove `transfer-bytes` from +3DOS.
+- Move TR-DOS `.drives`, `.step-rates` and `.fda` to the library.
 
 // Version 0.14.0-rc.124  {{{1
 == Version 0.14.0-rc.124
@@ -381,7 +383,7 @@ http://qbi2005.windows.cervantesvirtual.com/wfrmVistaImagen.aspx?imagen=00096057
 - Make `order,`, `@order`, `wordlists,` and `@wordlists` independent
   from `marker`.
 - Move `0exit` to the kernel; no data/code space needed, because of
-  the space saved by using this word instead of `0= ?exit` and `if`. 
+  the space saved by using this word instead of `0= ?exit` and `if`.
 - Make paren comments multiline in the Vim syntax file.
 - Make `do_create` and `do_variable` Z80 entries 8 T States faster, by
   moving them from the `noop` word to the `next` entry.
@@ -1359,7 +1361,7 @@ to use all the paged memory.  It has been called "far memory".
   `call,` in the `z80-asm,` assembler. So it has been renamed, moved
   to the `assembler` word list and removed from the assembler.
 - Move `8*` from the assemblers to the operators.
- 
+
 // Version 0.10.0  {{{1
 == Version 0.10.0
 

src/kernel.trdos.z80s

@@ -3,8 +3,8 @@
 ; This file is part of Solo Forth
 ; http://programandala.net/en.program.solo_forth.html
 
-; Last modified: 202101051821
-; See change log at the end of the file
+; Last modified: 202101061724.
+; See change log at the end of the file.
 
 ; ==============================================================
 ; Description
@@ -14,7 +14,7 @@
 ; ==============================================================
 ; Author
 
-; Marcos Cruz (programandala.net), 2016, 2017, 2018, 2020.
+; Marcos Cruz (programandala.net), 2016, 2017, 2018, 2020, 2021.
 
 ; ==============================================================
 ; License
@@ -854,20 +854,13 @@ list_command:
 endif
 
 ; ----------------------------------------------
-  _colon_header dot_drives_,'.drives'
 
-  ; XXX TMP -- for debugging
-  ; XXX TODO -- Move to the library.
+if 0 ; debugging
 
-; doc{
-;
-; .drives ( -- ) "dot-drives"
-;
-; Display TR-DOS variables related to disk drives.
-;
-; See also: `.step-rates`, `.fda`.
-;
-; }doc
+  _colon_header dot_drives_,'.drives'
+
+  ; XXX REMARK -- This word is in the library. This copy is
+  ; preserved to be activated for debugging.
 
   dw cr_
   _literal trdos_variable.current_temporary_drive
@@ -892,92 +885,58 @@ endif
   dw cr_
   dw paren_dot_quote_
   _string "Drive modes"
-  _literal 23756
-  _literal 23752
+  _literal trdos_variable.drive_d_mode+1
+  _literal trdos_variable.drive_a_mode
   dw paren_do_,dot_drives.exit
   dw cr_,i_,dup_,u_dot_,c_fetch_,dot_
   dw paren_loop_
 dot_drives.exit
   dw exit_
 
-; Value of some TR-DOS variables after changing the default drive with
-; command `*"a"`, `*"b"`, etc.
-;
-;        A  B  C  D
-;
-; 23798  0  1  2  3  = current drive
-; 23800  0  0  0  0  = two-files drive
-; 23801  0  0  0  0  = cat drive
-; 23833  0  1  2  3  = default drive
-
-; After booting Solo Forth from drive A:
-
-; 23798  0  = current drive
-; 23800  0  = two-files drive
-; 23801  0  = cat drive
-; 23833  0  = default drive
+endif
 
-; After booting Solo Forth from drive B:
+; ----------------------------------------------
 
-; 23798  1  = current drive
-; 23800  0  = two-files drive
-; 23801  0  = cat drive
-; 23833  1  = default drive
+if 0 ; debugging
 
-; ----------------------------------------------
   _colon_header dot_step_rates_,'.step-rates'
 
-  ; XXX TMP -- for debugging
-  ; XXX TODO -- Move to the library.
-
-; doc{
-;
-; .step-rates ( -- ) "dot-step-rates"
-;
-; Display the configured step rates of the TR-DOS disk drives.
-;
-; See also: `.drives`, `.fda`.
-;
-; }doc
+  ; XXX REMARK -- This word is in the library. This copy is
+  ; preserved to be activated for debugging.
 
   dw cr_
   dw paren_dot_quote_
-  _string 'Drive A: '
+  _string 'Drive 0/A: '
   _literal trdos_variable.drive_a_step_rate
   dw dup_,dot_,c_fetch_,dot_
   dw cr_
   dw paren_dot_quote_
-  _string 'Drive B: '
+  _string 'Drive 1/B: '
   _literal trdos_variable.drive_b_step_rate
   dw dup_,dot_,c_fetch_,dot_
   dw cr_
   dw paren_dot_quote_
-  _string 'Drive C: '
+  _string 'Drive 2/C: '
   _literal trdos_variable.drive_c_step_rate
   dw dup_,dot_,c_fetch_,dot_
   dw cr_
   dw paren_dot_quote_
-  _string 'Drive D: '
+  _string 'Drive 3/D: '
   _literal trdos_variable.drive_d_step_rate
   dw dup_,dot_,c_fetch_,dot_
   dw cr_
   dw exit_
 
+endif
+
 ; ----------------------------------------------
-  _colon_header dot_f_d_a_,'.fda'
 
-  ; XXX TMP -- for debugging
-  ; XXX TODO -- Move to the library.
+if 0 ; debugging
 
-; doc{
-;
-; .fda ( -- ) "dot-F-D-A"
-;
-; Display the contents of TR-DOS File Descriptor Area.
-;
-; See also: `.drives`, `.step-rates`.
-;
-; }doc
+  _colon_header dot_f_d_a_,'.fda'
+
+  ; XXX REMARK -- This word is in the library. This copy is
+  ; preserved to be activated for debugging.
 
   dw cr_,paren_dot_quote_
   _string "Filename and type:"
@@ -1004,6 +963,8 @@ dot_drives.exit
   dw c_fetch_,dot_
   dw exit_
 
+endif
+
 ; ----------------------------------------------
   _colon_header sector_number_sign_,'sector#'
 
@@ -1125,5 +1086,9 @@ endif ; defined trdos
 ;
 ; 2021-01-05: Improve documentation of `transfer-block` and
 ; `set-drive`.
+;
+; 2021-01-06: Move `.drives`, `.step-rates` and `.fda` to the
+; library, but keep deactivated copies to be used for debugging
+; in case the disk access fails. Improve `.step-rates`.
 
 ; vim: filetype=z80:textwidth=64

src/lib/dos.trdos.fs

@@ -3,7 +3,7 @@
   \ This file is part of Solo Forth
   \ http://programandala.net/en.program.solo_forth.html
 
-  \ Last modified: 202007282057
+  \ Last modified: 202101061709
   \ See change log at the end of the file
 
   \ ===========================================================
@@ -242,7 +242,7 @@ unneeding /fda ?\ $10 cconstant /fda
   \
   \ }doc
 
-( files/disk /filename -filename -fda-filename )
+( files/disk /filename -filename -fda-filename .fda )
 
 unneeding files/disk ?\ 128 cconstant files/disk
 
@@ -313,7 +313,26 @@ unneeding -fda-filename ?( need fda need -filename
   \
   \ }doc
 
-( set-filename get-filename filename>filetype )
+unneeding .fda ?( need fda
+
+: .fda ( -- )
+  cr ." Filename and type:" fda-filename 8 type
+  '<' emit fda-filetype c@ emit '>' emit
+  cr ." Start address:    " fda-filestart @ u.
+  cr ." Lenght in bytes:  " fda-filelength @ u.
+  cr ." Lenght in sectors:" fda-filesectors c@ . ; ?)
+
+  \ doc{
+  \
+  \ .fda ( -- ) "dot-F-D-A"
+  \
+  \ Display the contents of TR-DOS File Descriptor Area.
+  \
+  \ See also: `.drives`, `.step-rates`.
+  \
+  \ }doc
+
+( set-filename get-filename filename>filetype .drives )
 
 unneeding set-filename ?(
 
@@ -368,7 +387,48 @@ unneeding filename>filetype
   \
   \ }doc
 
-( get-drive (acat acat )
+unneeding .drives ?(
+
+: .drives ( -- ) cr 23798 dup . c@ . ."  current"
+                 cr 23800 dup . c@ . ."  two files"
+                 cr 27801 dup . c@ . ."  cat"
+                 cr 23833 dup . c@ . ."  default"
+  cr ." Drive modes" 23756 23752 ?do cr i dup u. c@ . loop ; ?)
+
+  \ doc{
+  \
+  \ .drives ( -- ) "dot-drives"
+  \
+  \ Display TR-DOS variables related to disk drives.
+  \
+  \ See also: `.step-rates`, `.fda`.
+  \
+  \ }doc
+
+  \ XXX REMARK: Value of some TR-DOS variables after changing
+  \ the default drive with command `*"a"`, `*"b"`, etc.:
+
+  \        A  B  C  D
+  \ 23798  0  1  2  3  = current drive
+  \ 23800  0  0  0  0  = two-files drive
+  \ 23801  0  0  0  0  = cat drive
+  \ 23833  0  1  2  3  = default drive
+
+  \ After booting Solo Forth from drive A:
+
+  \ 23798  0  = current drive
+  \ 23800  0  = two-files drive
+  \ 23801  0  = cat drive
+  \ 23833  0  = default drive
+
+  \ After booting Solo Forth from drive B:
+
+  \ 23798  1  = current drive
+  \ 23800  0  = two-files drive
+  \ 23801  0  = cat drive
+  \ 23833  1  = default drive
+
+( get-drive (acat acat .step-rates )
 
 unneeding get-drive
 
@@ -429,6 +489,23 @@ unneeding acat ?\ need (acat : acat ( -- ) (acat throw ;
   \
   \ }doc
 
+unneeding .step-rates ?(
+
+: .step-rates ( -- ) cr ." Drive 0/A: " 23802 dup . c@ .
+                     cr ." Drive 1/B: " 23803 dup . c@ .
+                     cr ." Drive 2/C: " 23804 dup . c@ .
+                     cr ." Drive 3/D: " 23805 dup . c@ . cr ;
+
+  \ doc{
+  \
+  \ .step-rates ( -- ) "dot-step-rates"
+  \
+  \ Display the configured step rates of the TR-DOS disk drives.
+  \
+  \ See also: `.drives`, `.fda`.
+  \
+  \ }doc
+
 ( 2-block-drives 3-block-drives 4-block-drives )
 
 unneeding 2-block-drives ?( need set-block-drives
@@ -1424,5 +1501,8 @@ need read-file-descriptor need write-file-descriptor
   \ 2020-07-11: Add title to tables.
   \
   \ 2020-07-28: Replace "Note:" with the "NOTE:" markup.
+  \
+  \ 2021-01-06: Move `.drives`, `.step-rates` and `.fda` from
+  \ the TR-DOS kernel.
 
   \ vim: filetype=soloforth

src/version.z80s

@@ -12,7 +12,7 @@ version_patch:                equ 0
 version_prerelease_id:        equ 'r'
   ; 'd' for "dev", 'p' for "pre", 'r' for "rc", zero if none
 
-version_prerelease:           equ 135
+version_prerelease:           equ 136
 
 version_build_high_part:      equ $0134
-version_build_low_part:       equ $61B9  ; build 20210105
+version_build_low_part:       equ $61BA  ; build 20210106