From 54a656f33ed16e56f5d5129c7dfc5d5224793fde Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Mon, 6 Sep 2021 23:43:42 -0400
Subject: [PATCH] Cleaned up CRTFILE.

---
 applecorn.po    | Bin 819200 -> 819200 bytes
 applecorn.s     |   2 ++
 auxmem.bytwrd.s |   2 ++
 auxmem.chario.s |   2 ++
 auxmem.hostfs.s |   2 ++
 auxmem.init.s   |   2 ++
 auxmem.misc.s   |   2 ++
 auxmem.mosequ.s |   2 ++
 auxmem.oscli.s  |   2 ++
 auxmem.vdu.s    |   2 ++
 mainmem.fsequ.s |   2 ++
 mainmem.init.s  |   2 ++
 mainmem.ldr.s   |   2 ++
 mainmem.lists.s |   2 ++
 mainmem.menu.s  |   2 ++
 mainmem.misc.s  |  21 +++++++++++++++++-
 mainmem.path.s  |   2 ++
 mainmem.svc.s   |  55 +++++-------------------------------------------
 18 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 8fd314410973661ac6cf51345209418512a3fc70..fa1537778b6423036dad817ffea952bdedbd3cec 100644
GIT binary patch
delta 3835
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
LMAvT^^~3)F&=rgE

delta 4900
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
AzyJUM

diff --git a/applecorn.s b/applecorn.s
index 20c1336..e43f2f5 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -183,3 +183,5 @@ MAINZP      MAC
 * Automatically save the object file:
             SAV   APPLECORN
 
+
+
diff --git a/auxmem.bytwrd.s b/auxmem.bytwrd.s
index 2e77e50..02883e0 100644
--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@@ -539,3 +539,5 @@ OSBM2        ASC   ').'
 
 
 
+
+
diff --git a/auxmem.chario.s b/auxmem.chario.s
index 7c5e1d5..cfd1618 100644
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@@ -443,3 +443,5 @@ KBDDONE      RTS
 
 
 
+
+
diff --git a/auxmem.hostfs.s b/auxmem.hostfs.s
index 14b9d39..5ca07d7 100644
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@@ -899,3 +899,5 @@ ERROR2E     DW    $C800
 
 
 
+
+
diff --git a/auxmem.init.s b/auxmem.init.s
index 1a2901e..8af4403 100644
--- a/auxmem.init.s
+++ b/auxmem.init.s
@@ -156,3 +156,5 @@ HELLO       ASC   'Applecorn MOS 2021-09-06 snapshot'
 
 
 
+
+
diff --git a/auxmem.misc.s b/auxmem.misc.s
index 97fe0e6..2de4571 100644
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@@ -470,3 +470,5 @@ AUXBLK      ASC   '**ENDOFCODE**'
 
 
 
+
+
diff --git a/auxmem.mosequ.s b/auxmem.mosequ.s
index 46b86d1..a683d7c 100644
--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@@ -72,3 +72,5 @@ OSFILECB    EQU   $2EE        ; OSFILE control block
 
 
 
+
+
diff --git a/auxmem.oscli.s b/auxmem.oscli.s
index 484dc62..35e1a6f 100644
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@@ -572,3 +572,5 @@ ECHO3        PHP
 
 
 
+
+
diff --git a/auxmem.vdu.s b/auxmem.vdu.s
index 2c03c89..d3b98d0 100644
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@@ -501,3 +501,5 @@ BYTEA0      LDY   #79           ; Read VDU variable $09,$0A
 
 
 
+
+
diff --git a/mainmem.fsequ.s b/mainmem.fsequ.s
index 0b94a4b..d3635bd 100644
--- a/mainmem.fsequ.s
+++ b/mainmem.fsequ.s
@@ -48,3 +48,5 @@ GEOFCMD     EQU   $D1
 
 
 
+
+
diff --git a/mainmem.init.s b/mainmem.init.s
index c167ff6..7c2d6d0 100644
--- a/mainmem.init.s
+++ b/mainmem.init.s
@@ -94,3 +94,5 @@ RESET       TSX
 
 
 
+
+
diff --git a/mainmem.ldr.s b/mainmem.ldr.s
index b74db4c..4701e23 100644
--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@@ -123,3 +123,5 @@ CANTOPEN    ASC   "Unable to open ROM file"
 
 
 
+
+
diff --git a/mainmem.lists.s b/mainmem.lists.s
index 0d2a7bb..1a3ce34 100644
--- a/mainmem.lists.s
+++ b/mainmem.lists.s
@@ -98,3 +98,5 @@ QUITPL      HEX   04          ; Number of parameters
 
 
 
+
+
diff --git a/mainmem.menu.s b/mainmem.menu.s
index 28e4473..5591ea9 100644
--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@@ -129,3 +129,5 @@ ROM8        STR   "USERROM2.ROM"
 
 
 
+
+
diff --git a/mainmem.misc.s b/mainmem.misc.s
index b61ec67..a54c7b6 100644
--- a/mainmem.misc.s
+++ b/mainmem.misc.s
@@ -87,7 +87,24 @@ SETINFO     LDA   #$07           ; SET_FILE_INFO 7 parms
             RTS
 
 * Create disk file
-CRTFILE     JSR   MLI
+* Uses filename in MOSFILE
+CRTFILE     JSR   MLI            ; GET_TIME
+            DB    GTIMECMD
+            LDA   #<MOSFILE
+            STA   CREATEPL+1
+            LDA   #>MOSFILE
+            STA   CREATEPL+2
+            LDA   #$C3           ; Open permissions
+            STA   CREATEPL+3
+            LDA   $BF90          ; Current date
+            STA   CREATEPL+8
+            LDA   $BF91
+            STA   CREATEPL+9
+            LDA   $BF92          ; Current time
+            STA   CREATEPL+10
+            LDA   $BF93
+            STA   CREATEPL+11
+            JSR   MLI
             DB    CREATCMD
             DW    CREATEPL
             RTS
@@ -130,3 +147,5 @@ FILEREFS    DB    $00,$00,$00,$00
 
 
 
+
+
diff --git a/mainmem.path.s b/mainmem.path.s
index 90f1d72..33dac84 100644
--- a/mainmem.path.s
+++ b/mainmem.path.s
@@ -274,3 +274,5 @@ PREFIX      DS    65           ; Buffer for ProDOS prefix
 
 
 
+
+
diff --git a/mainmem.svc.s b/mainmem.svc.s
index 5df6cf6..f3b0a20 100644
--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@@ -52,31 +52,13 @@ MAKEDIR      >>>   ENTMAIN
              JSR   COPYFB             ; Copy back to aux mem
              CMP   #$02
              BEQ   :EXIT              ; Dir already exists
-* Make into a subroutine
              LDA   #$0D               ; 'Directory'
              STA   CREATEPL+7         ; ->Storage type
              LDA   #$0F               ; 'Directory'
              STA   CREATEPL+4         ; ->File type
-* subroutine....
-             LDA   #<MOSFILE
-             STA   CREATEPL+1
-             LDA   #>MOSFILE
-             STA   CREATEPL+2
-             LDA   #$C3               ; 'Default access'
-             STA   CREATEPL+3         ; ->Access
              STZ   CREATEPL+5         ; Aux type LSB
              STZ   CREATEPL+6         ; Aux type MSB
-* Don't we have to make a call to update BF90-BF93?
-             LDA   $BF90              ; Current date
-             STA   CREATEPL+8
-             LDA   $BF91
-             STA   CREATEPL+9
-             LDA   $BF92              ; Current time
-             STA   CREATEPL+10
-             LDA   $BF93
-             STA   CREATEPL+11
-             JSR   CRTFILE
-* ...
+             JSR   CRTFILE            ; Create MOSFILE
              BCS   :EXIT              ; Failed, exit with ProDOS result
              JSR   UPDFB              ; Update FILEBLK
              JSR   COPYFB             ; Copy FILEBLK to aux mem
@@ -118,33 +100,19 @@ OFILE        >>>   ENTMAIN
              CMP   #$80               ; Write mode
              BNE   :S0
              JSR   DESTROY
-* Make into a subroutine
              LDA   #$01               ; Storage type - file
              STA   CREATEPL+7
              LDA   #$06               ; Filetype BIN
              STA   CREATEPL+4
-             LDA   #<MOSFILE          ; Attempt to create file
-             STA   CREATEPL+1
+             LDA   #<MOSFILE
              STA   OPENPL+1
              LDA   #>MOSFILE
-             STA   CREATEPL+2
              STA   OPENPL+2
-             LDA   #$C3               ; Access unlocked
-             STA   CREATEPL+3
              LDA   #$00               ; Auxtype
              STA   CREATEPL+5
              LDA   #$00
              STA   CREATEPL+6
-             LDA   $BF90              ; Current date
-             STA   CREATEPL+8
-             LDA   $BF91
-             STA   CREATEPL+9
-             LDA   $BF92              ; Current time
-             STA   CREATEPL+10
-             LDA   $BF93
-             STA   CREATEPL+11
-             JSR   CRTFILE
-* ...
+             JSR   CRTFILE            ; Create MOSFILE
 :S0          LDA   #$00               ; Look for empty slot
              JSR   FINDBUF
              STX   BUFIDX
@@ -435,34 +403,19 @@ SAVEFILE     >>>   ENTMAIN
              DB    DESTCMD
              DW    DESTPL
              STZ   :BLOCKS
-* TO DO: Make this a subroutine
              LDA   #$01               ; Storage type - file
              STA   CREATEPL+7
              LDA   #$06               ; Filetype BIN
              STA   CREATEPL+4
-* subroutine....
              LDA   #<MOSFILE
-             STA   CREATEPL+1
              STA   OPENPL+1
              LDA   #>MOSFILE
-             STA   CREATEPL+2
              STA   OPENPL+2
-             LDA   #$C3               ; Access unlocked
-             STA   CREATEPL+3
              LDA   FBLOAD             ; Auxtype = load address
              STA   CREATEPL+5
              LDA   FBLOAD+1
              STA   CREATEPL+6
-             LDA   $BF90              ; Current date
-             STA   CREATEPL+8
-             LDA   $BF91
-             STA   CREATEPL+9
-             LDA   $BF92              ; Current time
-             STA   CREATEPL+10
-             LDA   $BF93
-             STA   CREATEPL+11
              JSR   CRTFILE
-* ...
              BCS   :FWD1              ; :CANTOPEN error
              JSR   OPENFILE
              BCS   :FWD1              ; :CANTOPEN error
@@ -845,3 +798,5 @@ MAINRDEXIT   >>>   XF2AUX,NULLRTS     ; Back to an RTS
 
 
 
+
+