v1.04 baseline

Bugfixes to check before changing the size of a chain on disc and update the cache block descriptor after getting a block to store. Change to the disk error reporting screen text.
stardot · Jan 2, 2023 · 2e10cb5 · 2e10cb5
1 parent d4039af
commit 2e10cb5
Show file tree

Hide file tree

Showing 19 changed files with 67 additions and 21 deletions.
diff --git a/Level3/Binary Files/FS3-103.inf b/Level3/Binary Files/FS3-103.inf
diff --git a/Level3/Binary Files/FS3-103d.inf b/Level3/Binary Files/FS3-103d.inf
diff --git a/Level3/Binary Files/FS3-103 → Level3/Binary Files/FS3-104 b/Level3/Binary Files/FS3-103 → Level3/Binary Files/FS3-104
diff --git a/Level3/Binary Files/FS3-104.inf b/Level3/Binary Files/FS3-104.inf
@@ -0,0 +1 @@
+$.FS3-104 00000400 00000400
diff --git a/Level3/Binary Files/Original binary/FS3-103 → Level3/Binary Files/FS3-104d b/Level3/Binary Files/Original binary/FS3-103 → Level3/Binary Files/FS3-104d
diff --git a/Level3/Binary Files/FS3-104d.INF b/Level3/Binary Files/FS3-104d.INF
@@ -0,0 +1 @@
+FS3-104d    00000400 00000400 000086D2 WR 
diff --git a/Level3/Binary Files/Original binary/FS3-103.INF b/Level3/Binary Files/Original binary/FS3-103.INF
diff --git a/Level3/Binary Files/FS3-103d → Level3/Binary Files/Original binary/FS3-104 b/Level3/Binary Files/FS3-103d → Level3/Binary Files/Original binary/FS3-104
diff --git a/Level3/Binary Files/Original binary/FS3-104.INF b/Level3/Binary Files/Original binary/FS3-104.INF
@@ -0,0 +1 @@
+FS3-104    00000400 00000400 000086D2 WR 
diff --git a/Level3/Change Log.txt b/Level3/Change Log.txt
@@ -1,3 +1,39 @@
+Version 1.04
+============
+
+Date - estimated sometime after June 1986. no dated comments after June 1986
+
+Binary Files (* denotes the official ACORN released version)
+============
+  FS3-104  - Assembler options: DONGLE=1 (absent)
+* FS3-104d - Assembler options: DONGLE=0 (present)
+
+Comments
+========
+
+Changes (from v1.03)
+====================
+
+HEADER FILE 1
+         Uade01 Line 0060 VERLB, version changed from 3 to 4
+
+MAPMAN
+         Uade10 Line 0300 JSR FNDMAP added to check before changing size of a chain
+                          on disc
+         Uade10 Line 0322 BCS branch added
+
+MAP BLOCK AND BIT MAP MANAGEMENT
+         MBBMCM Line 0152 bugfix: Update the cache block descriptor after 
+                          getting a block to store
+
+DSCMAN
+         Uade14 Line 0754 changed disc error reporting text 
+                     0754 "       : Disc Error. " to "Disc Error N0. "
+         Uade14 Line 0759 " At " to " At Disc Address "    
+
+
+-------------------------------------------------------------------------------
+
 Version 1.03
 ============
 

diff --git a/Level3/SRC/L3/MBBMCM b/Level3/SRC/L3/MBBMCM
@@ -149,7 +149,9 @@ GTSR1 LDYIM CAFLG
  JMP GTBGT
 GTBND1 TAX ; preserve error
  PLA       ; restore stack LH 17/1/86 ***
+ STA GNCBPT + 1
  PLA
+ STA GNCBPT
  TXA
 GTBND RTS
 ;

diff --git a/Level3/SRC/L3/Uade01 b/Level3/SRC/L3/Uade01
@@ -57,7 +57,7 @@ DONGLE * 0 ;Real Time Clock present(=0) absent(=1)
 
 
 VERLA * "0"
-VERLB * "3"
+VERLB * "4"
 DEBUG *  0 ;Make this +ve for debug letters
 MASK * &FF ;protection state
 

diff --git a/Level3/SRC/L3/Uade0E b/Level3/SRC/L3/Uade0E
@@ -514,6 +514,7 @@ OUTRTD
 
  LDA TDATE
  JSR OUTDEC
+
  LDAIM ":"
  JSR OUTCH
 

diff --git a/Level3/SRC/L3/Uade10 b/Level3/SRC/L3/Uade10
@@ -296,7 +296,10 @@ MPCRND LDYIM ARGG
 
 
 
-MPCHSZ LDYIM ARGJ
+MPCHSZ
+ JSR FNDMAP
+ BNE MPCHJX ;catch errors
+ LDYIM ARGJ
  JSR MPFRAD ;get size of chain
  BNE MPCHJX ;catch errors
 
@@ -316,7 +319,7 @@ MPCHJA LDAAX MPNWFR - :LSB:-3
 
  LDAIM MPERRN
  BCC MPCHJX ;exit 'cos there's no room
-
+ BCS MPCSCN
 MPCHSJ JSR FNDMAP
  BEQ MPCSCN
 MPCHJX JMP MPCHEN

diff --git a/Level3/SRC/L3/Uade14 b/Level3/SRC/L3/Uade14
@@ -751,12 +751,12 @@ LHDSCR PHA
  LDYIM /(DSCCB )
  JSR OSWORD
  JSR VSTRIN
- = "       : Disc Error. "
+ = "Disc Error N0. "
  NOP
  LDA DSCCB+3
  JSR WHEX
  JSR VSTRIN
- = " At "
+ = " At Disc Address "
  NOP
  LDA DSCCB+2
  JSR WHEX

diff --git a/Level3/SRC/README b/Level3/SRC/README
@@ -1,4 +1,4 @@
-Level 3 File Server v1.03
+Level 3 File Server v1.04
 =========================
 
 This disc contains a recreation of the source code for the Acorn Level 3 
@@ -39,26 +39,30 @@ Files
   Location for the assembled parts. Do not delete or the assembler will fail.
 
 
-Version 1.03
+Version 1.04
 ============
 
-Date - estimated about June 1986. Last comment was 5/6/86
+Date - estimated sometime after June 1986. no dated comments after June 1986
 
 Comments
 ========
-A reference is made in file STRMAN to code from v1.02.
 
-Changes (from v1.01)
+Changes (from v1.03)
 ====================
 
 HEADER FILE 1
-         Uade01 Line 0060 VERLB, version changed from 1 to 3
+         Uade01 Line 0060 VERLB, version changed from 3 to 4
 
-STRMAN
-         Uade0B Line 0246 bugfix: introduced at v1.02. When removing objects
-                          from the disc, age the entries on ensure and remove
-                          them on destroy from cache
+MAPMAN
+         Uade10 Line 0300 JSR FNDMAP added to check before changing size of a chain
+                          on disc
+         Uade10 Line 0322 BCS branch added
 
-DSCMAN
-05/06/86 Uade14 Line 0743-0789 Report disk errors to screen
+MAP BLOCK AND BIT MAP MANAGEMENT
+         MBBMCM Line 0152 bugfix: Update the cache block descriptor after 
+                          getting a block to store
 
+DSCMAN
+         Uade14 Line 0754 changed disc error reporting text 
+                     0754 "       : Disc Error. " to "Disc Error N0. "
+                     0759 " At " to " At Disc Address "    
diff --git a/Level3/SRC/README.INF b/Level3/SRC/README.INF
@@ -1 +1 @@
-README     FFFFFF59 18948126 000007AC WR 
+README     FFFFFF59 18948126 0000087C WR 
diff --git a/Level3/adfs/Level3-103bin.adl → Level3/adfs/Level3-104bin.adl b/Level3/adfs/Level3-103bin.adl → Level3/adfs/Level3-104bin.adl
diff --git a/Level3/adfs/Level3-103src.adl → Level3/adfs/Level3-104src.adl b/Level3/adfs/Level3-103src.adl → Level3/adfs/Level3-104src.adl