Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add host support for CMDR-CBMDOS's seekable read/write files #435

Merged
merged 1 commit into from
Oct 24, 2022
Merged

Add host support for CMDR-CBMDOS's seekable read/write files #435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 51 additions & 16 deletions src/ieee.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ int dirlist_pos = 0;

typedef struct {
char name[80];
bool read;
bool write;
int pos;
int size;
SDL_RWops *f;
} channel_t;

channel_t channels[16];

static void cseek(int channel, uint32_t pos);

static int
create_directory_listing(uint8_t *data)
Expand Down Expand Up @@ -224,7 +224,13 @@ command(char *cmd)
if (!cmd[0]) {
return;
}
printf(" COMMAND \"%s\"\n", cmd);
if (log_ieee) {
if (cmd[0] == 'P') {
printf(" COMMAND \"%c\" [binary parameters suppressed]\n", cmd[0]);
} else {
printf(" COMMAND \"%s\"\n", cmd);
}
}
switch(cmd[0]) {
case 'U':
switch(cmd[1]) {
Expand All @@ -235,6 +241,17 @@ command(char *cmd)
case 'I': // Initialize
clear_error();
return;
case 'P': // Seek
cseek(cmd[1],
((uint8_t)cmd[2])
| ((uint8_t)cmd[3] << 8)
| ((uint8_t)cmd[4] << 16)
| ((uint8_t)cmd[5] << 24));
return;
default:
if (log_ieee) {
printf(" (unsupported command ignored)\n");
}
}
set_error(0x30, 0, 0);
}
Expand All @@ -251,6 +268,7 @@ copen(int channel)

// decode ",P,W"-like suffix to know whether we're writing
bool append = false;
channels[channel].read = true;
channels[channel].write = false;
char *first = strchr(channels[channel].name, ',');
if (first) {
Expand All @@ -262,6 +280,11 @@ copen(int channel)
append = true;
// fallthrough
case 'W':
channels[channel].read = false;
channels[channel].write = true;
break;
case 'M':
channels[channel].read = true;
channels[channel].write = true;
break;
}
Expand All @@ -270,9 +293,12 @@ copen(int channel)
if (channel <= 1) {
// channels 0 and 1 are magic
channels[channel].write = channel;
channels[channel].read = !channel;
}
if (log_ieee) {
printf(" OPEN \"%s\",%d (%c)\n", channels[channel].name, channel, channels[channel].write ? 'W' : 'R');
printf(" OPEN \"%s\",%d (%s%s)\n", channels[channel].name, channel,
channels[channel].read ? "R" : "",
channels[channel].write ? "W" : "");
}

if (!channels[channel].write && channels[channel].name[0] == '$') {
Expand All @@ -281,6 +307,8 @@ copen(int channel)
} else {
if (!strcmp(channels[channel].name, ":*")) {
channels[channel].f = prg_file;
} else if (channels[channel].read && channels[channel].write) {
channels[channel].f = SDL_RWFromFile(channels[channel].name, "rb+");
} else {
channels[channel].f = SDL_RWFromFile(channels[channel].name, channels[channel].write ? "wb" : "rb");
}
Expand All @@ -291,12 +319,7 @@ copen(int channel)
set_error(0x62, 0, 0);
ret = 2; // FNF
} else {
if (!channels[channel].write) {
SDL_RWseek(channels[channel].f, 0, RW_SEEK_END);
channels[channel].size = SDL_RWtell(channels[channel].f);
SDL_RWseek(channels[channel].f, 0, RW_SEEK_SET);
channels[channel].pos = 0;
} else if (append) {
if (append) {
SDL_RWseek(channels[channel].f, 0, RW_SEEK_END);
}
clear_error();
Expand All @@ -318,6 +341,19 @@ cclose(int channel)
}
}

static void
cseek(int channel, uint32_t pos)
{
if (channel == 15) {
set_error(0x30, 0, 0);
return;
}

if (channels[channel].f) {
SDL_RWseek(channels[channel].f, pos, RW_SEEK_SET);
}
}

void
ieee_init()
{
Expand Down Expand Up @@ -374,7 +410,7 @@ ACPTR(uint8_t *a)
clear_error();
}
*a = error[error_pos++];
} else if (!channels[channel].write) {
} else if (channels[channel].read) {
if (channels[channel].name[0] == '$') {
if (dirlist_pos < dirlist_len) {
*a = dirlist[dirlist_pos++];
Expand All @@ -383,11 +419,8 @@ ACPTR(uint8_t *a)
ret = 0x40;
}
} else if (channels[channel].f) {
*a = SDL_ReadU8(channels[channel].f);
if (channels[channel].pos == channels[channel].size - 1) {
if (SDL_RWread(channels[channel].f, a, 1, 1) != 1) {
ret = 0x40;
} else {
channels[channel].pos++;
}
}
} else {
Expand All @@ -413,7 +446,9 @@ CIOUT(uint8_t a)
}
} else {
if (channel == 15) {
if (a == 13) {
// P command takes binary parameters, so we can't terminate
// the command on CR.
if ((a == 13) && (cmd[0] != 'P')) {
cmd[cmdlen] = 0;
command(cmd);
cmdlen = 0;
Expand Down