[cbm][fuji] Refactor where cmd_args data is held and cmd set

Author: markjfisher

commodore/src/fn_fuji/open_close.c

@@ -3,15 +3,14 @@
 #include "fujinet-fuji.h"
 #include "fujinet-fuji-cbm.h"
 
-extern uint8_t cmd_args[2];
-
 // no data to send in this version, it's just the command for immediate actions, no return data. we do query the status though.
 bool open_close(uint8_t cmd)
 {
-	cmd_args[1] = cmd;
 	if (!open_or_write(cmd)) {
+		// the current status is set for us as there was a critical error, so we just return false, and allow client to check the status.
 		return false;
 	}
 
+	// Data transfers etc were fine, but was the result of operation a success?
 	return get_fuji_status(true);
 }

commodore/src/fn_fuji/open_close_data.c

@@ -3,15 +3,11 @@
 #include "fujinet-fuji.h"
 #include "fujinet-fuji-cbm.h"
 
-// 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 };
-
 // this is a command that has no return data, so just push command, its data, and read the status
 bool open_close_data(uint8_t cmd, bool should_close, uint16_t params_size, uint8_t *cmd_params)
 {
 	int bytes_written;
 	bool is_success;
-	cmd_args[1] = cmd;
 
 	if (!open_or_write(cmd)) {
 		return false;
@@ -24,7 +20,6 @@ bool open_close_data(uint8_t cmd, bool should_close, uint16_t params_size, uint8
 
 	// 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.
-	// cbm_close(FUJI_CMD_CHANNEL);
 	is_success = get_fuji_status(should_close);
 
 	if (bytes_written != params_size) {

commodore/src/fn_fuji/open_read_close.c

@@ -3,12 +3,15 @@
 #include "fujinet-fuji.h"
 #include "fujinet-fuji-cbm.h"
 
-extern char cmd_args[2];
+// 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 };
 
 bool open_or_write(uint8_t cmd)
 {
 	int bytes_written;
 	uint8_t err_code = 0;
+
+	cmd_args[1] = cmd;
 	if (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);
@@ -33,7 +36,6 @@ bool open_or_write(uint8_t cmd)
 bool open_read_close(uint8_t cmd, bool should_close, int *bytes_read, uint16_t result_size, uint8_t *result_data)
 {
 	int bytes_written;
-	cmd_args[1] = cmd;
 
 	if (!open_or_write(cmd)) {
 		*bytes_read = 0;

commodore/src/fn_fuji/open_read_close_data.c

@@ -3,15 +3,13 @@
 #include "fujinet-fuji.h"
 #include "fujinet-fuji-cbm.h"
 
-extern char cmd_args[2];
 extern uint8_t __oserror;
 
 // All the things, it has data to write with the command, and reads a value back, and a status
 bool open_read_close_data(uint8_t cmd, bool should_close, int *bytes_read, uint16_t params_size, uint8_t *cmd_params, uint16_t result_size, uint8_t *result_data)
 {
 	int bytes_written;
 	bool is_success;
-	cmd_args[1] = cmd;
 
 	if (!open_or_write(cmd)) {
 		return false;
@@ -29,12 +27,11 @@ bool open_read_close_data(uint8_t cmd, bool should_close, int *bytes_read, uint1
 		*bytes_read = cbm_read(FUJI_CMD_CHANNEL, result_data, result_size);
 	}
 
-	// cbm_close(FUJI_CMD_CHANNEL);
 	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
+		// 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;
 		return false;