4.1.0 appkey and apple2 changes

Author: markjfisher

Changelog.md

@@ -2,17 +2,28 @@
 
 ## [Unreleased]
 
-## [4.1.0] - 2024-05-08
+## [4.1.0] - 2024-05-12
 
-### AppKey Redesign
+### AppKeys Changes
 
-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.
+Appkeys have been redesigned for simpler usecases.
+Using appkeys now involves first calling `fuji_set_appkey_details` to define the creator, appid, and key size.
 
-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.
+Then you call either "fuji_appkey_read" and "fuji_appkey_write".
+The old "open" phase is done internally by the API and not exposed.
 
-Clients must provide a buffer/pointer for the read/write data.
+Clients must provide a pointer for the read/write data buffer to read from and write to.
+All structs have been removed in preference of calling functions with parameters directly.
+
+There is a paramter for the appkey size, which is a placeholder for future changes to support larger key sizes
+than just 64 bytes.
+
+### [apple2] Asm to C
+
+I've replaced most of the SmartPort asm bus code with C versions.
+
+This makes it way easier to support. The ASM was getting quite tricky to follow, and I wrote the bloody thing.
+The only one that shouldn't change to C is sp_dispatch, as it uses self modifying code techniques.
 
 ## [4.0.0] - 2024-05-06
 

apple2/src/bus/sp_close.c

@@ -0,0 +1,10 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include "fujinet-fuji.h"
+#include "fujinet-bus-apple2.h"
+
+int8_t sp_close(uint8_t dest) {
+	sp_cmdlist[1] = dest;
+	sp_cmdlist[0] = SP_CLOSE_PARAM_COUNT;
+	return sp_dispatch(SP_CMD_CLOSE);
+}

apple2/src/bus/sp_close.s

@@ -0,0 +1,18 @@
+#include <stdint.h>
+#include "fujinet-fuji.h"
+#include "fujinet-bus-apple2.h"
+
+int8_t sp_control(uint8_t dest, uint8_t ctrlcode) {
+	uintptr_t payload_address;
+
+	sp_cmdlist[4] = ctrlcode;
+
+	sp_cmdlist[0] = SP_STATUS_PARAM_COUNT;
+	sp_cmdlist[1] = dest;
+
+	payload_address = (uintptr_t)(&sp_payload[0]);
+	sp_cmdlist[2] = payload_address & 0xFF;
+	sp_cmdlist[3] = (payload_address >> 8) & 0xFF;
+
+	return sp_dispatch(SP_CMD_CONTROL);
+}

apple2/src/bus/sp_control.c

@@ -1,24 +1,39 @@
         .export     _sp_dispatch
 
+        .import     _sp_count
+        .import     _sp_cmdlist
         .import     _sp_dispatch_fn
-        .import     popa
+        .import     _sp_error
 
-; int8_t sp_dispatch(uint8_t cmd, void *cmdlist)
+; KEEP THIS FILE AS ASM AS IT DOES TRICKS WITH DATA AND INDIRECT CALLS TO DISPATCH FUNCTION
+
+; int8_t sp_dispatch(uint8_t cmd)
 ;
 ; returns any error code from the smart port _sp_dispatch function
 .proc _sp_dispatch
-        sta     dispatch_data+1         ; cmdlist low
-        stx     dispatch_data+2         ; cmdlist high
-
-        jsr     popa                    ; cmd
         sta     dispatch_data
-
+        lda     #<_sp_cmdlist
+        sta     dispatch_data+1
+        lda     #>_sp_cmdlist
+        sta     dispatch_data+2
+        
+        ; the SP dispatch alters the return address by 3 bytes to skip the data below.
+        ; it returs with any error codes
         jsr     do_jmp
+
 dispatch_data:
         .byte   $00             ; command
         .byte   $00             ; cmdlist low
         .byte   $00             ; cmdlist high
 
+        ; A is error code. X,Y are the count of bytes
+        sta     _sp_error
+        stx     _sp_count
+        sty     _sp_count+1
+
+        ; convert to a return value
+        ldx     #$00
+        lda     _sp_error
         rts
 
 do_jmp:

apple2/src/bus/sp_control.s

@@ -0,0 +1,26 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include "fujinet-fuji.h"
+#include "fujinet-bus-apple2.h"
+
+uint8_t sp_clock_id = 0;
+
+bool sp_find_clock() {
+    int r = sp_find_device("FN_CLOCK");
+	if (r <= 0) {
+		sp_clock_id = 0;
+		return false;
+	}
+	sp_clock_id = (uint8_t) (r & 0xFF);
+	return true;
+}
+
+uint8_t sp_get_clock_id()
+{
+	if (sp_clock_id != 0) {
+		return sp_clock_id;
+	}
+
+	sp_find_clock();
+	return sp_clock_id;
+}

apple2/src/bus/sp_dispatch.s

@@ -0,0 +1,26 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include "fujinet-fuji.h"
+#include "fujinet-bus-apple2.h"
+
+uint8_t sp_cpm_id = 0;
+
+bool sp_find_cpm() {
+    int r = sp_find_device("CPM");
+	if (r <= 0) {
+		sp_cpm_id = 0;
+		return false;
+	}
+	sp_cpm_id = (uint8_t) (r & 0xFF);
+	return true;
+}
+
+uint8_t sp_get_cpm_id()
+{
+	if (sp_cpm_id != 0) {
+		return sp_cpm_id;
+	}
+
+	sp_find_cpm();
+	return sp_cpm_id;
+}