Minor fixes for BBC Micro

Added additional workspace claims as a precaution on BBC Micros. Also modified the IDE project file for cleaner loading in BeebEm during development
simoninns · Feb 4, 2017 · ee6ef33 · ee6ef33
1 parent a071a56
commit ee6ef33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/BeebSCSI_ROM/.vscode/tasks.json b/BeebSCSI_ROM/.vscode/tasks.json
@@ -26,7 +26,7 @@
                 }
             },
             "args": [
-                "BeebAsm.exe -v -i main.asm -do main.ssd -boot Main"
+                "BeebAsm.exe -v -i main.asm -do main.ssd"
             ],
             "isBuildCommand": true
         },

diff --git a/BeebSCSI_ROM/main.asm b/BeebSCSI_ROM/main.asm
@@ -455,6 +455,7 @@ GUARD &C000                                 ; Do not exceed 16 Kbytes
         \\ File system is ADFS.  Use OSWORD &72
         LDA #&72                                ; Execute OSWORD &72 (ADFS)
         JSR osword
+        JSR claimSharedWorkspace                ; Reclaim workspace after OSWORD call
         JMP scsiDscCheckResult
 
         .scsiDscSendToVFS
@@ -586,6 +587,7 @@ GUARD &C000                                 ; Do not exceed 16 Kbytes
         \\ File system is ADFS.  Use OSWORD &72
         LDA #&72                                ; Execute OSWORD &72 (ADFS)
         JSR osword
+        JSR claimSharedWorkspace                ; Reclaim workspace after OSWORD call
         JMP scsiStatusCheckResult
 
         .scsiStatusSendToVFS
@@ -900,12 +902,14 @@ GUARD &C000                                 ; Do not exceed 16 Kbytes
         \\ File system is ADFS.  Use OSWORD &72
         LDA #&72                                ; Execute OSWORD &72 (ADFS)
         JSR osword
+        JSR claimSharedWorkspace                ; Reclaim workspace after OSWORD call
         JMP scsiJukeCheckResult
 
         .scsiJukeSendToVFS
             \\ File system is VFS.  Use OSWORD &62
             LDA #&62                                ; Execute OSWORD &62 (VFS)
             JSR osword
+            JSR claimSharedWorkspace                ; Reclaim workspace after OSWORD call
 
         \\ Ensure the SCSI command successfully executed
         .scsiJukeCheckResult
@@ -958,6 +962,7 @@ GUARD &C000                                 ; Do not exceed 16 Kbytes
         TAY
         LDA #&64
         JSR osword                          ; Get F-Code response
+        JSR claimSharedWorkspace            ; Reclaim workspace after OSWORD call
 
     \\ Show the returned 16 bytes of ASCII
     .showfcodeoutput