4.7.5 release candidate with sp_init fix for apple2 (#25)

* [apple2] fix sp_init.s not checking all SP devices

* 4.7.5 release candidate

Author: markjfisher

Changelog.md

@@ -2,6 +2,28 @@
 
 ## [Unreleased]
 
+## [4.7.5] - 2025-04-18
+
+- [apple2] fix sp_init.s not checking all SP devices (HEAD -> main) [Mark Fisher]
+- [coco] fix network_json_parse and network_json_query (upstream/main) [Jan Krupa]
+- [pmd85] fix network_json_parse and network_json_query [Jan Krupa]
+- [pmd85] forgotten network_read_nb() [Jan Krupa]
+- [pmd85] add fuji_ and network_ functions for pmd85 target [Jan Krupa]
+- Const needed in function declaration for network_http_set_channel_mode [Brad Colbert]
+- [msdos] match changes upstream in INT F5 (register changes) [Thomas Cherryhomes]
+- [msdos] first pass of fuji part of fn-lib. [Thomas Cherryhomes]
+- [msdos] fix build.mk for more of watcom's watcomisms. [Thomas Cherryhomes]
+- [msdos] include. [Thomas Cherryhomes]
+- [msdos][fuji] base64_decode_compute [Thomas Cherryhomes]
+- [msdos] add bus methods that talk via INT F5 [Thomas Cherryhomes]
+- [apple2gs] Fix sp_control param count issue [Eric Le Bras]
+- [coco] update error processing [Jan Krupa]
+- [coco] fix compile errors, add missing "const" [Jan Krupa]
+- Added 'const' to input parameter pointers. [Oliver Schmidt]
+- [coco] update *_get_response functions [Jan Krupa]
+- introduce zcc and pmd85 into makefiles [Jan Krupa]
+- [apple2gs] optimize all bus and fn_clock calls to asm [Eric Le Bras]
+
 ## [4.7.4] - 2024-11-13
 
 - [coco] fix data size for host/device slots when pushing back to FN

Makefile

@@ -3,9 +3,9 @@
 # Set the TARGETS and PROGRAM values as required.
 # See makefiles/build.mk for details on directory structure for src files and how to add custom extensions to the build.
 
-# TARGETS = atari c64 apple2 apple2enh apple2gs coco
+TARGETS = atari c64 apple2 apple2enh apple2gs coco
 # TARGETS = pmd85
-TARGETS = msdos
+# TARGETS = msdos
 PROGRAM := fujinet.lib
 
 SUB_TASKS := clean disk test release

apple2/apple2-6502/bus/sp_init.s

@@ -72,9 +72,7 @@ check_network:
         lda     #$01
         sta     _sp_is_init
         
-        ; store ptr1, and X while we go do stuff
-        lda     ptr1
-        pha
+        ; store ptr1 high byte, and X while we go do stuff.
         lda     ptr1+1
         pha
 .if (.cpu .bitand ::CPU_ISET_65SC02)
@@ -84,7 +82,7 @@ check_network:
         pha
 .endif
         jsr     _sp_get_network_id
-
+        ; Z flag set if it's not found
         bne     found_network
 
         ; failed to find a network device on this card, try the next one
@@ -97,14 +95,14 @@ check_network:
 .endif
         pla
         sta     ptr1+1
-        pla
-        sta     ptr1
 
 .if (.cpu .bitand ::CPU_ISET_65SC02)
         stz     _sp_is_init
+        stz     ptr1                    ; reset the low byte for ptr1 so the next loop reads from correct address
 .else
         lda     #$00
         sta     _sp_is_init
+        sta     ptr1                    ; reset the low byte for ptr1 so the next loop reads from correct address
 .endif
 
 no_match:
@@ -124,10 +122,8 @@ found_network:
 .if (.cpu .bitand ::CPU_ISET_65SC02)
         plx
         plx
-        plx
 .else
-        tax             ; save the A value, remove 3 values from stack, then restore A
-        pla
+        tax             ; save the A value, remove 2 values from stack, then restore A
         pla
         pla
         txa

sp_status.ROOT

@@ -1 +1 @@
-4.7.4
+4.7.5