#16 Lots more refactoring.... doesn't work anymore... work in progress

This commit is contained in:
akuker
2020-08-09 20:11:52 -05:00
parent 484030a622
commit 15f36ecd30
15 changed files with 1578 additions and 1110 deletions

View File

@@ -0,0 +1,689 @@
#include "os.h"
#include "rasctl_command.h"
#include "command_thread.h"
#include "rascsi_mgr.h"
#include "sasihd.h"
#include "scsihd.h"
#include "scsihd_nec.h"
#include "scsihd_apple.h"
#include "scsicd.h"
#include "scsimo.h"
#include "scsi_host_bridge.h"
BOOL Command_Thread::m_running = FALSE;
int Command_Thread::m_monsocket = -1; // Monitor Socket
pthread_t Command_Thread::m_monthread; // Monitor Thread
void Command_Thread::Start(){
m_running = TRUE;
}
void Command_Thread::Stop(){
m_running = FALSE;
}
BOOL Command_Thread::IsRunning(){
return m_running;
}
//---------------------------------------------------------------------------
//
// Initialization
//
//---------------------------------------------------------------------------
BOOL Command_Thread::Init()
{
#ifndef BAREMETAL
struct sockaddr_in server;
int yes;
// Create socket for monitor
m_monsocket = socket(PF_INET, SOCK_STREAM, 0);
memset(&server, 0, sizeof(server));
server.sin_family = PF_INET;
server.sin_port = htons(6868);
server.sin_addr.s_addr = htonl(INADDR_ANY);
// allow address reuse
yes = 1;
if (setsockopt(
m_monsocket, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0){
return FALSE;
}
// Bind
if (bind(m_monsocket, (struct sockaddr *)&server,
sizeof(struct sockaddr_in)) < 0) {
FPRT(stderr, "Error : Already running?\n");
return FALSE;
}
// Create Monitor Thread
pthread_create(&m_monthread, NULL, MonThread, NULL);
#endif // BAREMETAL
return TRUE;
}
void Command_Thread::Close(){
// Close the monitor socket
if (m_monsocket >= 0) {
close(m_monsocket);
}
}
//---------------------------------------------------------------------------
//
// Argument Parsing
//
//---------------------------------------------------------------------------
#ifdef BAREMETAL
BOOL ParseConfig(int argc, char* argv[])
{
FRESULT fr;
FIL fp;
char line[512];
int id;
int un;
int type;
char *argID;
char *argPath;
int len;
char *ext;
// Mount the SD card
fr = f_mount(&fatfs, "", 1);
if (fr != FR_OK) {
FPRT(stderr, "Error : SD card mount failed.\n");
return FALSE;
}
// If there is no setting file, the processing is interrupted
fr = f_open(&fp, "rascsi.ini", FA_READ);
if (fr != FR_OK) {
return FALSE;
}
// Start Decoding
while (TRUE) {
// Get one Line
memset(line, 0x00, sizeof(line));
if (f_gets(line, sizeof(line) -1, &fp) == NULL) {
break;
}
// Delete the CR/LF
len = strlen(line);
while (len > 0) {
if (line[len - 1] != '\r' && line[len - 1] != '\n') {
break;
}
line[len - 1] = '\0';
len--;
}
// Get the ID and Path
argID = &line[0];
argPath = &line[4];
line[3] = '\0';
// Check if the line is an empty string
if (argID[0] == '\0' || argPath[0] == '\0') {
continue;
}
if (strlen(argID) == 3 && xstrncasecmp(argID, "id", 2) == 0) {
// ID or ID Format
// Check that the ID number is valid (0-7)
if (argID[2] < '0' || argID[2] > '7') {
FPRT(stderr,
"Error : Invalid argument(IDn n=0-7) [%c]\n", argID[2]);
goto parse_error;
}
// The ID unit is good
id = argID[2] - '0';
un = 0;
} else if (xstrncasecmp(argID, "hd", 2) == 0) {
// HD or HD format
if (strlen(argID) == 3) {
// Check that the HD number is valid (0-9)
if (argID[2] < '0' || argID[2] > '9') {
FPRT(stderr,
"Error : Invalid argument(HDn n=0-15) [%c]\n", argID[2]);
goto parse_error;
}
// ID was confirmed
id = (argID[2] - '0') / UnitNum;
un = (argID[2] - '0') % UnitNum;
} else if (strlen(argID) == 4) {
// Check that the HD number is valid (10-15)
if (argID[2] != '1' || argID[3] < '0' || argID[3] > '5') {
FPRT(stderr,
"Error : Invalid argument(HDn n=0-15) [%c]\n", argID[2]);
goto parse_error;
}
// The ID unit is good - create the id and unit number
id = ((argID[3] - '0') + 10) / UnitNum;
un = ((argID[3] - '0') + 10) % UnitNum;
argPath++;
} else {
FPRT(stderr,
"Error : Invalid argument(IDn or HDn) [%s]\n", argID);
goto parse_error;
}
} else {
FPRT(stderr,
"Error : Invalid argument(IDn or HDn) [%s]\n", argID);
goto parse_error;
}
// Skip if there is already an active device
if (disk[id * UnitNum + un] &&
!disk[id * UnitNum + un]->IsNULL()) {
continue;
}
// Initialize device type
type = -1;
// Check ethernet and host bridge
if (xstrcasecmp(argPath, "bridge") == 0) {
type = 4;
} else {
// Check the path length
len = strlen(argPath);
if (len < 5) {
FPRT(stderr,
"Error : Invalid argument(File path is short) [%s]\n",
argPath);
goto parse_error;
}
// Does the file have an extension?
if (argPath[len - 4] != '.') {
FPRT(stderr,
"Error : Invalid argument(No extension) [%s]\n", argPath);
goto parse_error;
}
// Figure out what the type is
ext = &argPath[len - 3];
if (xstrcasecmp(ext, "hdf") == 0 ||
xstrcasecmp(ext, "hds") == 0 ||
xstrcasecmp(ext, "hdn") == 0 ||
xstrcasecmp(ext, "hdi") == 0 || xstrcasecmp(ext, "nhd") == 0 ||
xstrcasecmp(ext, "hda") == 0) {
// HD(SASI/SCSI)
type = 0;
} else if (strcasecmp(ext, "mos") == 0) {
// MO
type = 2;
} else if (strcasecmp(ext, "iso") == 0) {
// CD
type = 3;
} else {
// Cannot determine the file type
FPRT(stderr,
"Error : Invalid argument(file type) [%s]\n", ext);
goto parse_error;
}
}
// Execute the command
if (!ExecuteCommand(stderr, id, un, 0, type, argPath)) {
goto parse_error;
}
}
// Close the configuration file
f_close(&fp);
// Display the device list
ListDevice(stdout);
return TRUE;
parse_error:
// Close the configuration file
f_close(&fp);
return FALSE;
}
#else
#endif // BAREMETAL
//---------------------------------------------------------------------------
//
// Monitor Thread
//
//---------------------------------------------------------------------------
void *Command_Thread::MonThread(void *param)
{
#ifndef BAREMETAL
struct sched_param schedparam;
struct sockaddr_in client;
socklen_t len;
int fd;
FILE *fp;
char buf[BUFSIZ];
char *p;
Rasctl_Command *new_command;
// Scheduler Settings
schedparam.sched_priority = 0;
sched_setscheduler(0, SCHED_IDLE, &schedparam);
// Set the affinity to a specific processor core
FixCpu(2);
// Wait for the execution to start
while (!m_running) {
usleep(1);
}
// Setup the monitor socket to receive commands
listen(m_monsocket, 1);
while (1) {
// Wait for connection
memset(&client, 0, sizeof(client));
len = sizeof(client);
fd = accept(m_monsocket, (struct sockaddr*)&client, &len);
if (fd < 0) {
break;
}
// Fetch the command
fp = fdopen(fd, "r+");
p = fgets(buf, BUFSIZ, fp);
// Failed to get the command
if (!p) {
goto next;
}
// Remove the newline character
p[strlen(p) - 1] = 0;
// List all of the devices
if (xstrncasecmp(p, "list", 4) == 0) {
Rascsi_Manager::GetInstance()->ListDevice(fp);
goto next;
}
new_command = Rasctl_Command::DeSerialize((BYTE*)p,BUFSIZ);
// // Wait until we becom idle
// while (m_running) {
// usleep(500 * 1000);
// }
// Execute the command
ExecuteCommand(fp, new_command);
next:
// Release the connection
fclose(fp);
close(fd);
}
#endif // BAREMETAL
return NULL;
}
BOOL ValidateCommand(rasctl_command *cmd){
// BOOL Command_Thread::ParseArgument(int argc, char* argv[])
// {
// int id = -1;
// bool is_sasi = false;
// int max_id = 7;
// int opt;
// while ((opt = getopt(argc, argv, "-IiHhD:d:")) != -1) {
// switch (opt) {
// case 'I':
// case 'i':
// is_sasi = false;
// max_id = 7;
// id = -1;
// continue;
// case 'H':
// case 'h':
// is_sasi = true;
// max_id = 15;
// id = -1;
// continue;
// case 'D':
// case 'd': {
// char* end;
// id = strtol(optarg, &end, 10);
// if ((id < 0) || (max_id < id)) {
// fprintf(stderr, "%s: invalid %s (0-%d)\n",
// optarg, is_sasi ? "HD" : "ID", max_id);
// return false;
// }
// break;
// }
// default:
// return false;
// case 1:
// break;
// }
// if (id < 0) {
// fprintf(stderr, "%s: ID not specified\n", optarg);
// return false;
// } else if (Rascsi_Manager::GetInstance()->m_disk[id] && !Rascsi_Manager::GetInstance()->m_disk[id]->IsNULL()) {
// fprintf(stderr, "%d: duplicate ID\n", id);
// return false;
// }
// char* path = optarg;
// int type = -1;
// if (HasSuffix(path, ".hdf")
// || HasSuffix(path, ".hds")
// || HasSuffix(path, ".hdn")
// || HasSuffix(path, ".hdi")
// || HasSuffix(path, ".hda")
// || HasSuffix(path, ".nhd")) {
// type = 0;
// } else if (HasSuffix(path, ".mos")) {
// type = 2;
// } else if (HasSuffix(path, ".iso")) {
// type = 3;
// } else if (xstrcasecmp(path, "bridge") == 0) {
// type = 4;
// } else {
// // Cannot determine the file type
// fprintf(stderr,
// "%s: unknown file extension\n", path);
// return false;
// }
// int un = 0;
// if (is_sasi) {
// un = id % Rascsi_Manager::UnitNum;
// id /= Rascsi_Manager::UnitNum;
// }
// // Execute the command
// if (!ExecuteCommand(stderr, id, un, 0, type, path)) {
// return false;
// }
// id = -1;
// }
// // Display the device list
// Rascsi_Manager::GetInstance()->ListDevice(stdout);
// return true;
// }
// if (type == 0) {
// // Passed the check
// if (!file) {
// return FALSE;
// }
// // Check that command is at least 5 characters long
// len = strlen(file);
// if (len < 5) {
// return FALSE;
// }
// // Check the extension
// if (file[len - 4] != '.') {
// return FALSE;
// }
// // If the extension is not SASI type, replace with SCSI
// ext = &file[len - 3];
// if (xstrcasecmp(ext, "hdf") != 0) {
// type = 1;
// }
// // Check the Controller Number
// if (cmd->id < 0 || id >= Rascsi_Manager::GetInstance()->CtrlMax) {
// FPRT(fp, "Error : Invalid ID\n");
// return FALSE;
// }
// // Check the Unit Number
// if (cmd->un < 0 || un >= Rascsi_Manager::GetInstance()->UnitNum) {
// FPRT(fp, "Error : Invalid unit number\n");
// return FALSE;
// }
return FALSE;
}
//---------------------------------------------------------------------------
//
// Command Processing
//
//---------------------------------------------------------------------------
BOOL Command_Thread::ExecuteCommand(FILE *fp, Rasctl_Command *incoming_command)
{
Filepath filepath;
BOOL result = FALSE;
switch(incoming_command->cmd){
case rasctl_cmd_shutdown:
result = DoShutdown(fp,incoming_command);
break;
case rasctl_cmd_list:
result = DoList(fp,incoming_command);
break;
case rasctl_cmd_attach:
result = DoAttach(fp,incoming_command);
break;
case rasctl_cmd_insert:
result = DoInsert(fp,incoming_command);
break;
case rasctl_cmd_eject:
result = DoEject(fp,incoming_command);
break;
case rasctl_cmd_protect:
result = DoProtect(fp,incoming_command);
break;
case rasctl_cmd_detach:
result = DoDetach(fp,incoming_command);
break;
default:
printf("UNKNOWN COMMAND RECEIVED\n");
}
if(!result){
fputs("Unknown server error", fp);
}
return result;
}
BOOL Command_Thread::DoShutdown(FILE *fp, Rasctl_Command *incoming_command){return FALSE;}
BOOL Command_Thread::DoList(FILE *fp, Rasctl_Command *incoming_command){return FALSE;}
BOOL Command_Thread::DoAttach(FILE *fp, Rasctl_Command *incoming_command){return FALSE;}
BOOL Command_Thread::DoDetach(FILE *fp, Rasctl_Command *incoming_command){return FALSE;}
BOOL Command_Thread::DoInsert(FILE *fp, Rasctl_Command *incoming_command){return FALSE;}
BOOL Command_Thread::DoEject(FILE *fp, Rasctl_Command *incoming_command){return FALSE;}
BOOL Command_Thread::DoProtect(FILE *fp, Rasctl_Command *incoming_command){return FALSE;}
// BOOL Command_Thread::DoAttach(File *fp, Rasctl_Command *incoming_command){
// // Connect Command
// if (cmd == rasctl_cmd_attach) { // ATTACH
// // Distinguish between SASI and SCSI
// ext = NULL;
// pUnit = NULL;
// }
// // Create a new drive, based upon type
// switch (type) {
// case 0: // HDF
// pUnit = new SASIHD();
// break;
// case 1: // HDS/HDN/HDI/NHD/HDA
// if (ext == NULL) {
// break;
// }
// if (xstrcasecmp(ext, "hdn") == 0 ||
// xstrcasecmp(ext, "hdi") == 0 || xstrcasecmp(ext, "nhd") == 0) {
// pUnit = new SCSIHD_NEC();
// } else if (xstrcasecmp(ext, "hda") == 0) {
// pUnit = new SCSIHD_APPLE();
// } else {
// pUnit = new SCSIHD();
// }
// break;
// case 2: // MO
// pUnit = new SCSIMO();
// break;
// case 3: // CD
// pUnit = new SCSICD();
// break;
// case 4: // BRIDGE
// pUnit = new SCSIBR();
// break;
// default:
// FPRT(fp, "Error : Invalid device type\n");
// return FALSE;
// }
// // drive checks files
// if (type <= 1 || (type <= 3 && xstrcasecmp(file, "-") != 0)) {
// // Set the Path
// filepath.SetPath(file);
// // Open the file path
// if (!pUnit->Open(filepath)) {
// FPRT(fp, "Error : File open error [%s]\n", file);
// delete pUnit;
// return FALSE;
// }
// }
// // Set the cache to write-through
// pUnit->SetCacheWB(FALSE);
// // Replace with the newly created unit
// map[id * Rascsi_Manager::GetInstance()->UnitNum + un] = pUnit;
// // Re-map the controller
// Rascsi_Manager::GetInstance()->MapControler(fp, map);
// return TRUE;
// }
// // Is this a valid command?
// if (cmd > 4) {
// FPRT(fp, "Error : Invalid command\n");
// return FALSE;
// }
// // Does the controller exist?
// if (Rascsi_Manager::GetInstance()->m_ctrl[id] == NULL) {
// FPRT(fp, "Error : No such device\n");
// return FALSE;
// }
// // Does the unit exist?
// pUnit = Rascsi_Manager::GetInstance()->m_disk[id * Rascsi_Manager::GetInstance()->UnitNum + un];
// if (pUnit == NULL) {
// FPRT(fp, "Error : No such device\n");
// return FALSE;
// }
// // Disconnect Command
// if (cmd == 1) { // DETACH
// // Free the existing unit
// map[id * Rascsi_Manager::GetInstance()->UnitNum + un] = NULL;
// // Re-map the controller
// Rascsi_Manager::GetInstance()->MapControler(fp, map);
// return TRUE;
// }
// // Valid only for MO or CD
// if (pUnit->GetID() != MAKEID('S', 'C', 'M', 'O') &&
// pUnit->GetID() != MAKEID('S', 'C', 'C', 'D')) {
// FPRT(fp, "Error : Operation denied(Deveice isn't removable)\n");
// return FALSE;
// }
// switch (cmd) {
// case 2: // INSERT
// // Set the file path
// filepath.SetPath(file);
// // Open the file
// if (!pUnit->Open(filepath)) {
// FPRT(fp, "Error : File open error [%s]\n", file);
// return FALSE;
// }
// break;
// case 3: // EJECT
// pUnit->Eject(TRUE);
// break;
// case 4: // PROTECT
// if (pUnit->GetID() != MAKEID('S', 'C', 'M', 'O')) {
// FPRT(fp, "Error : Operation denied(Deveice isn't MO)\n");
// return FALSE;
// }
// pUnit->WriteP(!pUnit->IsWriteP());
// break;
// default:
// ASSERT(FALSE);
// return FALSE;
// }
// return TRUE;
// }
BOOL Command_Thread::HasSuffix(const char* string, const char* suffix) {
int string_len = strlen(string);
int suffix_len = strlen(suffix);
return (string_len >= suffix_len)
&& (xstrcasecmp(string + (string_len - suffix_len), suffix) == 0);
}