[4.1.4] Another sp_init patch after I bodged the last one.

Author: markjfisher

Changelog.md

@@ -6,6 +6,10 @@
 - Add fuji_open_directory2 prototype for applications to send path and
   filter separately rather than in fixed 256 byte buffer with \0 delimiter. Used by CBM.
 
+## [4.1.4] - 2024-06-05
+
+- Fix sp_init again! Thanks again to @shunkita for noticing I'd broken their update.
+
 ## [4.1.3] - 2024-06-03
 
 - Fix sp_init to find any SP device with network device, skipping past any higher cards if they don't have it

apple2/src/bus/sp_init.c

@@ -16,7 +16,7 @@ uint8_t sp_init() {
 	uint8_t offset;
 	uint16_t dispatch_address;
 
-	// reset any previous values, we are going to rescan.
+	// reset network id and is_init flag, we are going to rescan.
 	sp_network = 0;
 	sp_is_init = 0;
 
@@ -36,16 +36,19 @@ uint8_t sp_init() {
 			sp_dispatch_fn[0] = dispatch_address & 0xFF;
 			sp_dispatch_fn[1] = dispatch_address >> 8;
 
-			// now find and return the network id. it's stored in sp_network after calling sp_get_network_id
+			// now find and return the network id. it's stored in sp_network after calling sp_get_network_id.
+			// we need to set sp_is_init to 1 to stop sp_get_network_id from calling init again and recursing.
+			sp_is_init = 1;
 			sp_get_network_id();
 			if (sp_network != 0) {
-				sp_is_init = 1;
 				return sp_network;
 			}
+			// it failed to find a network on this SP device, so reset sp_is_init and reloop/exit
+			sp_is_init = 0;
 		}
 	}
 
-	// If no match is found, ensure dispatch function is cleared then return 0 for network not found.
+	// If no match is found, ensure dispatch function is cleared, sp_is_init is already 0, then return 0 for network not found.
 	sp_dispatch_fn[0] = 0;
 	sp_dispatch_fn[1] = 0;
 	return 0;

version.txt

@@ -1 +1 @@
-4.1.3
+4.1.4