commodore implementation start

Author: markjfisher

.gitignore

@@ -1,61 +1,9 @@
-# Prerequisites
-*.d
-
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Linker output
-*.ilk
-*.map
-*.exp
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
-*.xex
-
-# Debug files
-*.dSYM/
-*.su
-*.idb
-*.pdb
-
-# Kernel Module Compile Results
-*.mod*
-*.cmd
-.tmp_versions/
-modules.order
-Module.symvers
-Mkfile.old
-dkms.conf
-
 # generated files
 dist/
 obj/
 build/
 
 # IDE files
-.vscode/
+.vscode/
+
+Makefile.options

Changelog.md

@@ -2,6 +2,13 @@
 
 ## [Unreleased]
 
+## [4.2.0] - 2024-XX-YY
+
+- Implement commodore fujinet-lib functions
+
+- Add fuji_open_directory2 prototype for applications to send path and
+  filter separately rather than in fixed 256 byte buffer with \0 delimiter. Used by CBM.
+
 ## [4.1.2] - 2024-05-20
 
 Bugfix:

Makefile

@@ -3,7 +3,8 @@
 # - recursive dirs for src
 # - final files go into build/ directory instead of root folder (e.g. lbl, com file etc)
 
-TARGETS := atari apple2 apple2enh c64
+#TARGETS := atari apple2 apple2enh c64
+TARGETS := c64
 PROGRAM := fujinet.lib
 LIBS    :=
 CONFIG  :=
@@ -103,11 +104,36 @@ FN_NW_INC = fujinet-network.inc
 FN_FUJI_HEADER = fujinet-fuji.h
 FN_FUJI_INC = fujinet-fuji.inc
 
+define _listing_
+  CFLAGS += --listing $$(@:.o=.lst)
+  ASFLAGS += --listing $$(@:.o=.lst)
+endef
+
+define _mapfile_
+  LDFLAGS += --mapfile $$@.map
+endef
+
+define _labelfile_
+  LDFLAGS += -Ln $$@.lbl
+endef
+
 .SUFFIXES:
 .PHONY: all clean dist fujinet.lib.$(TARGETLIST)
 
 all: fujinet.lib.$(TARGETLIST)
 
+STATEFILE := Makefile.options
+-include $(DEPENDS)
+-include $(STATEFILE)
+
+ifeq ($(origin _OPTIONS_),file)
+OPTIONS = $(_OPTIONS_)
+$(eval $(OBJECTS): $(STATEFILE))
+endif
+
+# Transform the abstract OPTIONS to the actual cc65 options.
+$(foreach o,$(subst $(COMMA),$(SPACE),$(OPTIONS)),$(eval $(_$o_)))
+
 $(OBJDIR):
 	$(call MKDIR,$@)
 

apple2/src/fn_fuji/fuji_close_directory.c

@@ -2,7 +2,7 @@
 #include "fujinet-fuji.h"
 #include "fujinet-bus-apple2.h"
 
-bool fuji_close_directory(void)
+bool fuji_close_directory()
 {
 	if (sp_get_fuji_id() == 0) {
 		return false;

commodore/src/bus/fuji_cbm_open.s

@@ -0,0 +1,35 @@
+		.export 	_fuji_cbm_open
+
+		.import 	_cbm_k_open
+		.import 	_cbm_k_setlfs
+		.import 	popa
+		.import     ___oserror
+
+        .include    "cbm_kernal.inc"
+        .include    "macros.inc"
+        .include    "zp.inc"
+
+; A replacement for cbm_open that takes parameters for location of the data to send to SETNAM and the size
+; instead of computing it, which allows us to send binary data as part of the NAME field to pass parameters to FN.
+
+; uint8_t __fastcall__ fuji_cbm_open(
+;    uint8_t  lfn,
+;    uint8_t  device,
+;    uint8_t  sec_addr,
+;    uint8_t  len,
+;    uint8_t* name
+; );
+
+_fuji_cbm_open:
+		stx 	tmp1			; save high byte of name address
+		tax						; X = ADDR LOW
+		jsr 	popa			; A = LEN (leaves X alone)
+        ldy     tmp1			; Y = ADDR HIGH
+        jsr     SETNAM
+
+		jsr 	popa			; A = SA
+		jsr 	_cbm_k_setlfs	; Call SETLFS, pops DEV and LFN
+
+		jsr     _cbm_k_open		; Call OPEN
+		sta 	___oserror
+		rts

commodore/src/fn_fuji/fuji_appkey_open_read.c

@@ -1,8 +1,49 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "fujinet-fuji.h"
+#include "fujinet-fuji-cbm.h"
+
+extern uint16_t ak_creator_id;
+extern uint8_t ak_app_id;
+extern enum AppKeySize ak_appkey_size;
 
 bool fuji_read_appkey(uint8_t key_id, uint16_t *count, uint8_t *data)
 {
-	return true;
+	uint8_t mode = 0;
+	uint16_t buffer_size = 64;
+	int bytes_read;
+	uint8_t pl[7];
+
+	if (ak_creator_id == 0) {
+		return false;
+	}
+
+	pl[0] = 0xDC;
+	pl[1] = ak_creator_id & 0xFF;
+	pl[2] = ak_creator_id >> 8;
+	pl[3] = ak_app_id;
+	pl[4] = key_id;
+	pl[5] = mode;
+	pl[6] = 0;
+
+	// send the creator / app / mode values
+	if (fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, sizeof(pl), (uint8_t *) pl) != 0) {
+		return false;
+	}
+	cbm_close(FUJI_CMD_CHANNEL);
+
+	// now do a read of the key
+	pl[0] = 0xDD;
+	if (fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, 1, (uint8_t *) pl) != 0) {
+		return false;
+	}
+
+	bytes_read = cbm_read(FUJI_CMD_CHANNEL, data, buffer_size);
+	if (bytes_read <= 0) {
+		*count = 0;
+	} else {
+		*count = bytes_read;
+	}
+	cbm_close(FUJI_CMD_CHANNEL);
+	return bytes_read > 0;
 }

commodore/src/fn_fuji/fuji_appkey_open_write.c

@@ -1,8 +1,53 @@
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 #include "fujinet-fuji.h"
+#include "fujinet-fuji-cbm.h"
+
+extern uint16_t ak_creator_id;
+extern uint8_t ak_app_id;
+extern enum AppKeySize ak_appkey_size;
 
 bool fuji_write_appkey(uint8_t key_id, uint16_t count, uint8_t *data)
 {
-	return true;
+	uint8_t err = 0;
+	uint8_t mode = 0;
+	uint8_t pl[7];
+	uint8_t *out_data;
+	uint16_t data_size = count + 1; // cmd (1 byte)  + data length
+
+	if (ak_creator_id == 0) {
+		return false;
+	}
+
+	pl[0] = 0xDC;
+	pl[1] = ak_creator_id & 0xFF;
+	pl[2] = ak_creator_id >> 8;
+	pl[3] = ak_app_id;
+	pl[4] = key_id;
+	pl[5] = 0x01; 				// WRITE mode
+	pl[6] = 0;					// reserved
+
+	// send the creator / app / mode values
+	if (fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, sizeof(pl), (uint8_t *) pl) != 0) {
+		return false;
+	}
+	cbm_close(FUJI_CMD_CHANNEL);
+
+	out_data = malloc(data_size);
+	memset(out_data, 0, data_size);
+
+	// now do a write of the key data, on IEC we don't need to send the count, as the write doesn't have to be a fixed size
+	out_data[0] = 0xDE;
+	memcpy(&out_data[1], data, count);
+
+	err = fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, data_size, out_data);
+	free(out_data);
+	if (err == 0) {
+		cbm_close(FUJI_CMD_CHANNEL);
+		return true;
+	}
+	return false;
+
 }

commodore/src/fn_fuji/fuji_close_directory.c

@@ -1,8 +1,16 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "fujinet-fuji.h"
+#include "fujinet-fuji-cbm.h"
 
 bool fuji_close_directory()
 {
+	uint8_t pl[1];
+	pl[0] = 0xF5;
+
+	if (fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, 1, (uint8_t *) pl) != 0) {
+		return false;
+	}
+	cbm_close(FUJI_CMD_CHANNEL);
 	return true;
 }

commodore/src/fn_fuji/fuji_get_scan_result.c

@@ -1,8 +1,21 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "fujinet-fuji.h"
+#include "fujinet-fuji-cbm.h"
 
 bool fuji_get_scan_result(uint8_t n, SSIDInfo *ssid_info)
 {
-	return true;
+	int bytes_read;
+	uint8_t pl[3];
+	pl[0] = 0xFC;
+	pl[1] = n;
+	pl[2] = 0x00;
+
+	if (fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, 3, (uint8_t *) pl) != 0) {
+		return false;
+	}
+
+	bytes_read = cbm_read(FUJI_CMD_CHANNEL, ssid_info, sizeof(SSIDInfo));
+	cbm_close(FUJI_CMD_CHANNEL);
+	return bytes_read > 0;
 }

commodore/src/fn_fuji/fuji_get_ssid.c

@@ -1,8 +1,19 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "fujinet-fuji.h"
+#include "fujinet-fuji-cbm.h"
 
 bool fuji_get_ssid(NetConfig *net_config)
 {
-	return true;
+	int bytes_read;
+	uint8_t pl[1];
+	pl[0] = 0xFE;
+
+	if (fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, 1, (uint8_t *) pl) != 0) {
+		return false;
+	}
+
+	bytes_read = cbm_read(FUJI_CMD_CHANNEL, net_config, sizeof(NetConfig));
+	cbm_close(FUJI_CMD_CHANNEL);
+	return bytes_read > 0;
 }