(2.1.5) Fix sp_init to detect correct SP unit when there are multiple

Author: markjfisher

Changelog.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [2.1.5] - 2024-01-07
+
+### Fixed
+
+- [apple2] sp_init multiple SP device detection (thanks @ShunKita)
+
 ## [2.1.4] - 2024-01-06
 
 ### Fixed

apple2/src/fn_fuji/sp_init.s

@@ -81,16 +81,17 @@
         pushax  ptr1
 
         jsr     _sp_find_network
+        beq     @not_found_nw
         bpl     @found_network
-        beq     :+
 
         ; we had a -ve value, which indicates a real SP error of some kind, capture it
         ; so we can indicate the issue at the end if we didn't find a SP with network
         sta     last_sp_error
 
         ; as we didn't find network, keep trying more slots
         ; restore ptr1
-:       popax   ptr1
+@not_found_nw:
+        popax   ptr1
         ; restore the id we last tried into X
         pla
         tax

version.txt

@@ -1 +1 @@
-2.1.4
+2.1.5