From c8f4ef21e039e177e5acd62998a7da65e58cdcff Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Sun, 12 Jun 2022 17:06:20 -0700
Subject: [PATCH] retry failed I/O

---
 res/dsk/Columns.po | Bin 143360 -> 143360 bytes
 src/constants.a    |  14 +++++++-------
 src/prorwts2.a     |   2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/dsk/Columns.po b/res/dsk/Columns.po
index 08cd07006320ca4a082919e4d8e3e2f545218b55..d85fbc637aca69d7ee4657ed71d57fa1eedc8f68 100644
GIT binary patch
delta 20
bcmZp8z|ru4V}o)4qf4_&z;=}Y#yj@`RM`j@

delta 20
bcmZp8z|ru4V}o)4qf@g=z;=}Y#yj@`RK*At

diff --git a/src/constants.a b/src/constants.a
index 91d2b028e..1ccd478ab 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -11,7 +11,7 @@
 ; ...unused...
 ; E000..E3FF - HGR font data
 ; ...unused...
-; E76A..FFEB - main program code
+; E73A..FFEB - main program code
 ; FFEC..FFF9 - API functions and global constants available for main program
 ;              code, prelaunchers, transition effects, &c.
 ;              (LoadFileDirect, Wait/UnwaitForVBL, MockingboardStuff, MachineStatus)
@@ -19,10 +19,10 @@
 ;
 ; LC RAM BANK 2
 ; D000..D5FF - ProRWTS data
-; D600..D8B4 - ProRWTS code
-; D8B5..DC6D - ProRWTS glue code
-; DC6E..DC73 - backup of stack (during gameplay and self-running demos)
-; DC74..DC79 - okvs cache (attract state saved across self-running demo)
+; D600..D8B6 - ProRWTS code
+; D8B7..DC6F - ProRWTS glue code
+; DC70..DC75 - backup of stack (during gameplay and self-running demos)
+; DC76..DC7B - okvs cache (attract state saved across self-running demo)
 ; ...unused...
 ; DFB4..DFFF - (de)acceleration function
 ;
@@ -214,8 +214,8 @@ PRELAUNCH_STANDARD_SIZE = 61         ; LoadStandardPrelaunch, eventually to be d
 ; shared symbols for prelaunch and effects to call ProRWTS2 functions
 iCurBlockLo    = $D601               ; constant
 iCurBlockHi    = $D603               ; constant
-launchpatch    = $D853               ; glue.launch.a
-itraverse      = $DB42               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
+launchpatch    = $D855               ; glue.launch.a
+itraverse      = $DB44               ; Roger Rabbit, avoid, use Infiltrator 2 style instead
                                      ; also Columns (via file in disk image)
 ldrlo          = $55                 ; constant
 ldrhi          = $56                 ; constant
diff --git a/src/prorwts2.a b/src/prorwts2.a
index 368025a7f..97c801e27 100644
--- a/src/prorwts2.a
+++ b/src/prorwts2.a
@@ -3538,6 +3538,7 @@ unrentrysei = unrelochdd + (* - reloc)
                 php
                 sei
 } ;no_interrupts = 1
+retry
 unrentry = unrelochdd + (* - reloc)
                 jsr     $d1d1
 !if use_smartport = 1 {
@@ -3546,6 +3547,7 @@ pcommand        !byte   $2c ;hide packet in non-SmartPort mode
 unrppacket = unrelochdd + (* - reloc)
                 !word   unrelochdd + (packet - reloc)
 } ;use_smartport = 1
+                bcs     retry
 !if no_interrupts = 1 {
                 plp
 } ;no_interrupts = 1