4.1.1 [apple2] Fix critical bug in sp_read causing it to do open instead

Author: markjfisher

Changelog.md

@@ -2,9 +2,17 @@
 
 ## [Unreleased]
 
+## [4.1.1] - 2024-05-14
+
 - Enhance build to produce target specific versions of the library, e.g. apple2enh from apple2 src.
   The appkey application was failing in apple2enh without the specific version of the library.
 
+- [apple2] convert network_open src from asm to c
+
+Bugfix:
+
+- [apple] sp_read was incorrectly calling sp_open :scream:
+
 ## [4.1.0] - 2024-05-12
 
 ### AppKeys Changes

apple2/src/bus/sp_read.c

@@ -15,5 +15,5 @@ int8_t sp_read(uint8_t dest, uint16_t len) {
 	sp_cmdlist[2] = payload_address & 0xFF;
 	sp_cmdlist[3] = (payload_address >> 8) & 0xFF;
 
-	return sp_dispatch(SP_CMD_OPEN);
+	return sp_dispatch(SP_CMD_READ);
 }

apple2/src/fn_network/network_open.c

@@ -0,0 +1,35 @@
+#include <stdint.h>
+#include <string.h>
+#include "fujinet-network.h"
+#include "fujinet-bus-apple2.h"
+
+uint8_t network_open(char* devicespec, uint8_t mode, uint8_t trans) {
+	uint8_t nw_device;
+	uint16_t slen;
+	uint16_t payload_len;
+
+	// clear any errors
+	fn_error(0);
+
+	if (sp_is_init == 0) {
+        nw_device = sp_init();
+        if (nw_device == 0) {
+            return fn_error(SP_ERR_IO_ERROR);
+        }
+    }
+
+	if (sp_open(sp_network) != 0) {
+		return fn_error(SP_ERR_IO_ERROR);
+	}
+
+	sp_clr_payload();
+	slen = strlen(devicespec);
+	payload_len = slen + 3;  // 2 for extra control bytes, 1 for NUL string terminator
+	sp_payload[0] = payload_len & 0xFF;
+	sp_payload[1] = (payload_len >> 8) & 0xFF;
+	sp_payload[2] = mode;
+	sp_payload[3] = trans;
+
+	strncpy(&sp_payload[4], devicespec, slen);
+	return sp_control(sp_network, 'O');
+}

apple2/src/fn_network/network_open.s

@@ -82,6 +82,7 @@ void sp_clr_payload();
 int8_t sp_status(uint8_t dest, uint8_t statcode);
 int8_t sp_control(uint8_t dest, uint8_t ctrlcode);
 int8_t sp_read(uint8_t dest, uint16_t len);
+int8_t sp_open(uint8_t dest);
 
 // initilises the dispatch funciton and returns the network device id if found, else returns 0.
 uint8_t sp_init();

apple2/src/include/fujinet-bus-apple2.h

@@ -33,7 +33,12 @@ extern uint16_t fn_bytes_read;
  */
 extern uint8_t fn_device_error;
 
+/**
+ * Convert device specific error in code to FujiNet Network library error, agnostic of device.
+ * Library code calls this when it encounters an error to return value applications should use.
+ */
 uint8_t fn_error(uint8_t code);
+
 /*
  * Network status values. These are set during network_read. You can capture your own using network_status.
  * bw      : bytes waiting

fujinet-network.h

@@ -1 +1 @@
-4.1.0
+4.1.1