appkeys signature changes

Author: markjfisher

Changelog.md

@@ -2,9 +2,19 @@
 
 ## [Unreleased]
 
-## [4.0.0] - 2024-05-06
+## [4.1.0] - 2024-05-08
+
+### AppKey Redesign
+
+Appkeys have been redesigned for simpler usecases. There is now only "fuji_appkey_read" and "fuji_appkey_write"
+with no need to call open first, this is done for you.
 
-Breaking Changes
+The mode value has been removed, now a read request specifies in its data structure the key size it wants, the default
+being 64 bytes as normal, but now a keysize of 256 is also supported.
+
+Clients must provide a buffer/pointer for the read/write data.
+
+## [4.0.0] - 2024-05-06
 
 - [appkey] Update signature of appkey functions to return bool instead of uint8_t
 - [appkey] Change return values of appkey to indicate SUCCESS status to be consistent with other functions

Makefile

@@ -78,16 +78,12 @@ LIBS += $(wildcard $(TARGETLIST)/$(SRCDIR)/*.lib)
 
 ASFLAGS += \
 	--asm-include-dir common/inc \
-	--asm-include-dir $(TARGETLIST)/$(SRCDIR)/fn_network/inc \
-	--asm-include-dir $(TARGETLIST)/$(SRCDIR)/fn_fuji/inc \
-	--asm-include-dir $(TARGETLIST)/$(SRCDIR)/bus/inc \
+	--asm-include-dir $(TARGETLIST)/$(SRCDIR)/include \
 	--asm-include-dir .
 
 CFLAGS += \
 	--include-dir common/inc \
-	--include-dir $(TARGETLIST)/$(SRCDIR)/fn_network/inc \
-	--include-dir $(TARGETLIST)/$(SRCDIR)/fn_fuji/inc \
-	--include-dir $(TARGETLIST)/$(SRCDIR)/bus/inc \
+	--include-dir $(TARGETLIST)/$(SRCDIR)/include \
 	--include-dir .
 
 # Add -DBUILD_(TARGET) to all args for the current name. This allows some level of cross platform code

apple2/src/fn_fuji/fuji_appkey_open.c

@@ -0,0 +1,43 @@
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+#include "fujinet-fuji.h"
+#include "fujinet-bus-apple2.h"
+
+bool fuji_read_appkey(uint16_t creator_id, uint8_t app_id, uint8_t key_id, uint16_t *count, uint8_t *data, enum AppKeySize keysize)
+{
+	uint8_t mode = 0;
+	uint16_t buffer_size = 64;
+	
+	sp_error = sp_get_fuji_id();
+	if (sp_error <= 0) {
+		return false;
+	}
+
+	if (keysize == SIZE_256) {
+		mode = 3;
+		buffer_size = 256;
+	}
+
+	sp_payload[0] = 6;
+	sp_payload[1] = 0;
+	sp_payload[2] = creator_id & 0xFF;
+	sp_payload[3] = (creator_id >> 8) & 0xFF;
+	sp_payload[4] = app_id;
+	sp_payload[5] = key_id;
+	sp_payload[6] = mode;
+	sp_payload[7] = 0;			// reserved
+	
+	sp_error = sp_control(sp_fuji_id, 0xDC);
+	if (sp_error != 0) return false;
+
+	sp_error = sp_status(sp_fuji_id, 0xDD);
+	if (sp_error == 0) {
+		memset(data, 0, buffer_size);
+		*count = sp_count;
+		if (sp_count > 0 && sp_count <= buffer_size) {
+			memcpy(data, &sp_payload[0], sp_count);
+		}
+	}
+	return sp_error == 0;
+}

apple2/src/fn_fuji/fuji_appkey_open_read.c

@@ -0,0 +1,34 @@
+#include <stdint.h>
+#include <string.h>
+#include "fujinet-fuji.h"
+#include "fujinet-bus-apple2.h"
+
+bool fuji_write_appkey(uint16_t creator_id, uint8_t app_id, uint8_t key_id, uint16_t count, uint8_t *data)
+{
+	sp_error = sp_get_fuji_id();
+	if (sp_error != 0) {
+		return false;
+	}
+
+	sp_payload[0] = 6;
+	sp_payload[1] = 0;
+	sp_payload[2] = creator_id & 0xFF;
+	sp_payload[3] = (creator_id >> 8) & 0xFF;
+	sp_payload[4] = app_id;
+	sp_payload[5] = key_id;
+	sp_payload[6] = 1; 			// WRITE mode
+	sp_payload[7] = 0;			// reserved
+	
+	sp_error = sp_control(sp_fuji_id, 0xDC);
+	if (sp_error != 0) {
+		return false;
+	}
+
+	sp_payload[0] = count & 0xFF;
+	sp_payload[1] = (count << 8) & 0xFF;
+
+	memcpy(&sp_payload[2], data, count);
+
+	sp_error = sp_control(sp_fuji_id, 0xDE);
+	return sp_error == 0;
+}

apple2/src/fn_fuji/fuji_appkey_open_write.c

@@ -16,7 +16,7 @@ bool fuji_copy_file(uint8_t src_slot, uint8_t dst_slot, char *copy_spec)
 
 	sp_payload[2] = src_slot;
 	sp_payload[3] = dst_slot;
-	strcpy(&sp_payload[4], copy_spec);
+	strcpy((char *) &sp_payload[4], copy_spec);
 
 	sp_error = sp_control(sp_fuji_id, 0xD8);
 	return sp_error == 0;