[apple2] small refactor to sp_init [4.1.3]

Author: markjfisher

Changelog.md

@@ -2,13 +2,14 @@
 
 ## [Unreleased]
 
-## [4.2.0] - 2024-XX-YY
-
 - Implement commodore fujinet-lib functions
-
 - 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.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
+
 ## [4.1.2] - 2024-05-20
 
 Bugfix:

Makefile

@@ -3,8 +3,7 @@
 # - recursive dirs for src
 # - final files go into build/ directory instead of root folder (e.g. lbl, com file etc)
 
-#TARGETS := atari apple2 apple2enh c64
-TARGETS := c64
+TARGETS := atari apple2 apple2enh c64
 PROGRAM := fujinet.lib
 LIBS    :=
 CONFIG  :=

apple2/src/bus/sp_init.c

@@ -14,10 +14,11 @@ uint8_t sp_init() {
 	uint8_t i;
 	bool match;
 	uint8_t offset;
-	uint8_t fn_device;
-	uint16_t tmp_addr;
+	uint16_t dispatch_address;
 
+	// reset any previous values, we are going to rescan.
 	sp_network = 0;
+	sp_is_init = 0;
 
 	for (base = 0xC700; base >= 0xC100; base -= 0x0100) {
 		match = true;
@@ -31,25 +32,20 @@ uint8_t sp_init() {
 		if (match) {
 			// If a match is found, calculate the dispatch function address
 			offset = read_memory(base + 0xFF);
-			tmp_addr = base + offset + 3;
-			sp_dispatch_fn[0] = tmp_addr & 0xFF;
-			sp_dispatch_fn[1] = (tmp_addr >> 8) & 0xFF;
-
-			// now find and return the network id.
-			sp_is_init = 1;
-
-			fn_device = sp_get_network_id();
-			if (fn_device != 0) {
-				return fn_device;
-			}
-			else {
-				sp_is_init = 0;
+			dispatch_address = base + offset + 3;
+			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
+			sp_get_network_id();
+			if (sp_network != 0) {
+				sp_is_init = 1;
+				return sp_network;
 			}
 		}
 	}
 
 	// If no match is found, ensure dispatch function is cleared then return 0 for network not found.
-	sp_is_init = 0;
 	sp_dispatch_fn[0] = 0;
 	sp_dispatch_fn[1] = 0;
 	return 0;

commodore/src/fn_fuji/fuji_unmount_host_slot.c

@@ -1,6 +1,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "fujinet-fuji.h"
+#include "fujinet-fuji-cbm.h"
 
 bool fuji_unmount_host_slot(uint8_t hs)
 {

version.txt

@@ -1 +1 @@
-4.1.2
+4.1.3