add commodore network implementations

Author: markjfisher

atari/src/fn_fuji/fuji_appkey_open_read.c

@@ -35,7 +35,7 @@ bool fuji_read_appkey(uint8_t key_id, uint16_t *count, uint8_t *data)
 	if (!buffer) return false;
 
 	open_data[0] = ak_creator_id & 0xFF;
-	open_data[1] = (ak_creator_id >> 8) & 0xFF;
+	open_data[1] = ak_creator_id >> 8;
 	open_data[2] = ak_app_id;
 	open_data[3] = key_id;
 	open_data[4] = mode;

commodore/src/fn_fuji/fuji_data.c

@@ -3,4 +3,4 @@
 #include "fujinet-fuji.h"
 
 FNStatus _fuji_status;
-bool is_open = false;
+bool fuji_is_open = false;

commodore/src/fn_fuji/get_fuji_status.c

@@ -4,6 +4,7 @@
 #include "fujinet-fuji.h"
 #include "fujinet-fuji-cbm.h"
 
+// Use 0x, and NOT string literals to avoid CC65 charmap translations. These are bytes not chars.
 uint8_t status_cmd[2] = { 0x01, 0x53 };
 
 // An internal version of fuji_status called at the end of the open_ commands
@@ -18,18 +19,18 @@ bool get_fuji_status(bool should_close)
 	memset(&_fuji_status.raw[0], 0, sizeof(FNStatus));
 
 	// do a status call to find out if anything went wrong. Using the current open channel, so just write our bytes
-	bytes_written = cbm_write(FUJI_CMD_CHANNEL, status_cmd, 2);
+	bytes_written = cbm_write(CBM_CMD_CHANNEL, status_cmd, 2);
 	if (bytes_written != 2) {
 		// always close on an error
-		cbm_close(FUJI_CMD_CHANNEL);
+		cbm_close(CBM_CMD_CHANNEL);
 		status_error(ERROR_STATUS_FAILED_TO_WRITE, 0x53);
 		return false;
 	}
 
-	bytes_read = cbm_read(FUJI_CMD_CHANNEL, &_fuji_status.raw[0], sizeof(FNStatus));
+	bytes_read = cbm_read(CBM_CMD_CHANNEL, &_fuji_status.raw[0], sizeof(FNStatus));
 	if (should_close) {
-		cbm_close(FUJI_CMD_CHANNEL);
-		is_open = false;
+		cbm_close(CBM_CMD_CHANNEL);
+		fuji_is_open = false;
 	}
 
 	// return true if the error is 0 (i.e. no error)

commodore/src/fn_fuji/open_close_data.c

@@ -13,10 +13,10 @@ bool open_close_data(uint8_t cmd, bool should_close, uint16_t params_size, uint8
 		return false;
 	}
 
-	is_open = true;
+	fuji_is_open = true;
 
 	// write the cmd parameters
-	bytes_written = cbm_write(FUJI_CMD_CHANNEL, cmd_params, params_size);
+	bytes_written = cbm_write(CBM_CMD_CHANNEL, cmd_params, params_size);
 
 	// we only use is_success if the write succeeded. We have to get the status either way.
 	// so just store the is_success value and then decide whether to use it or not.
@@ -25,8 +25,8 @@ bool open_close_data(uint8_t cmd, bool should_close, uint16_t params_size, uint8
 	if (bytes_written != params_size) {
 		// write failed, this is an out and out failure. The _fuji_status values will hold error strings etc.
 		// force a close if it wouldn't have happened in the status
-		if (!should_close) cbm_close(FUJI_CMD_CHANNEL);
-		is_open = false;
+		if (!should_close) cbm_close(CBM_CMD_CHANNEL);
+		fuji_is_open = false;
 		return false;
 	}
 

commodore/src/fn_fuji/open_read_close.c

@@ -3,6 +3,7 @@
 #include "fujinet-fuji.h"
 #include "fujinet-fuji-cbm.h"
 
+// Use 0x, and NOT string literals to avoid CC65 charmap translations. These are bytes not chars.
 // All commands are <01><cmd>, we reuse this buffer to send all data, and only have to set 2nd byte
 uint8_t cmd_args[2] = { 0x01, 0x00 };
 
@@ -12,21 +13,21 @@ bool open_or_write(uint8_t cmd)
 	uint8_t err_code = 0;
 
 	cmd_args[1] = cmd;
-	if (is_open) {
+	if (fuji_is_open) {
 		// this is a continuation, so use the existing channel and write the data instead of 
-		bytes_written = cbm_write(FUJI_CMD_CHANNEL, cmd_args, 2);
+		bytes_written = cbm_write(CBM_CMD_CHANNEL, cmd_args, 2);
 		if (bytes_written != 2) {
 			err_code = ERROR_OPEN_WRITE_CMD_FAILED;
 		}
 	} else {
-		if (fuji_cbm_open(FUJI_CMD_CHANNEL, FUJI_CBM_DEV, FUJI_CMD_CHANNEL, 2, cmd_args) != 0) {
+		if (fuji_cbm_open(CBM_CMD_CHANNEL, CBM_DEV_FUJI, CBM_CMD_CHANNEL, 2, cmd_args) != 0) {
 			err_code = ERROR_OPEN_CMD_FAILED;
 		}
 	}
 	if (err_code != 0) {
 		status_error(err_code, cmd);
-		cbm_close(FUJI_CMD_CHANNEL);
-		is_open = false;
+		cbm_close(CBM_CMD_CHANNEL);
+		fuji_is_open = false;
 		return false;
 	}
 	return true;
@@ -42,6 +43,6 @@ bool open_read_close(uint8_t cmd, bool should_close, int *bytes_read, uint16_t r
 		return false;
 	}
 
-	*bytes_read = cbm_read(FUJI_CMD_CHANNEL, result_data, result_size);
+	*bytes_read = cbm_read(CBM_CMD_CHANNEL, result_data, result_size);
 	return get_fuji_status(should_close);
 }

commodore/src/fn_fuji/open_read_close_data.c

@@ -15,25 +15,25 @@ bool open_read_close_data(uint8_t cmd, bool should_close, int *bytes_read, uint1
 		return false;
 	}
 
-	is_open = true;
+	fuji_is_open = true;
 
-	bytes_written = cbm_write(FUJI_CMD_CHANNEL, cmd_params, params_size);
+	bytes_written = cbm_write(CBM_CMD_CHANNEL, cmd_params, params_size);
 	if (bytes_written != params_size) {
 		*bytes_read = 0;
 	}
 
 	if (bytes_written == params_size) {
 		// only do the read if the command data was sent successfully
-		*bytes_read = cbm_read(FUJI_CMD_CHANNEL, result_data, result_size);
+		*bytes_read = cbm_read(CBM_CMD_CHANNEL, result_data, result_size);
 	}
 
 	is_success = get_fuji_status(should_close);
 
 	if (bytes_written != params_size) {
 		// Failure sending command, e.g. wrong parameters sent. status string etc will be in _fuji_status.
 		// Force a close if it wouldn't have happened in the status. We definitely want to close, but if "should_close" was false we need to manually do it here
-		if (!should_close) cbm_close(FUJI_CMD_CHANNEL);
-		is_open = false;
+		if (!should_close) cbm_close(CBM_CMD_CHANNEL);
+		fuji_is_open = false;
 		return false;
 	}
 	return is_success;

commodore/src/fn_fuji/status_error.c

@@ -4,7 +4,8 @@
 #include "fujinet-fuji.h"
 #include "fujinet-fuji-cbm.h"
 
-// 19 bytes, if you change this, change the define
+// 19 bytes, if you change this, change the define.
+// This will translate to PETSCII locally which is fine, as it is not transmit, but simply displayed on host
 char *status_error_message = "status error";
 #define STATUS_ERR_MESSAGE_LENGTH 12
 

commodore/src/fn_network/fn_error.c

@@ -4,5 +4,6 @@
 
 uint8_t fn_error(uint8_t code)
 {
+	// TODO: convert incoming CBM errors to FujiNet network type errors
 	return 0;
 }

commodore/src/fn_network/network_close.c

@@ -1,8 +1,20 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include "fujinet-network.h"
+#include "fujinet-network-cbm.h"
 
 uint8_t network_close(char* devicespec)
 {
-	return 0;
+	uint8_t device_number;
+	const char *after;
+	uint8_t data_channel = getDeviceNumber(devicespec, &after) + CBM_DATA_CHANNEL_0;
+
+	cbm_close(data_channel);
+	network_num_channels_open--;
+
+	// if all open data connections are closed, also close the command channel
+	if (network_num_channels_open == 0) {
+		cbm_close(CBM_CMD_CHANNEL);
+	}
+	return FN_ERR_OK;
 }

commodore/src/fn_network/network_data.c

@@ -0,0 +1,6 @@
+#include <stdbool.h>
+#include <stdint.h>
+#include "fujinet-fuji.h"
+
+// bool network_is_open = false;
+uint8_t network_num_channels_open = 0;