tools/upload: send data as string hex to avoid control characters

So far, I've been using this tool on remotes that had no control
character handling, but it doesn't work on a TRS-80 4P remote.

Much slower, but at least it works.

Later, I'll try to put some order in this so that we use the fast
lane when possible.
This commit is contained in:
Virgil Dupras 2020-12-16 16:52:54 -05:00
parent f0087cd48e
commit 40b41d296c
2 changed files with 24 additions and 16 deletions

View File

@ -13,6 +13,7 @@
void mread(int fd, char *s, int count) void mread(int fd, char *s, int count)
{ {
while (count) { while (count) {
BREATHE;
while (read(fd, s, 1) == 0) { while (read(fd, s, 1) == 0) {
BREATHE; BREATHE;
} }

View File

@ -41,32 +41,39 @@ int main(int argc, char **argv)
return 1; return 1;
} }
char s[0x40]; char s[0x40];
sendcmdp(fd, ": K KEY DUP EMIT ;");
// P: parse digit. We assume '0-9' or 'a-f' range and return a 0-15 value.
sendcmdp(fd, ": P DUP '0' '9' =><= IF '0' ELSE 0x57 THEN - ;");
// R: receive hex pairs. we receive values in hex pairs, re-emit them upon
// reception, and then write them to memory.
sprintf(s, sprintf(s,
": _ 0x%04x 0x%04x DO KEY DUP .x I C! LOOP ; _", ": R %d %d DO K P 16 * K P OR I C! LOOP ; R",
memptr+bytecount, memptr); memptr+bytecount, memptr);
sendcmd(fd, s); sendcmd(fd, s);
int returncode = 0; int returncode = 0;
while (fread(s, 1, 1, fp)) { while (fread(s, 1, 1, fp)) {
putc('.', stderr); unsigned char c1, c2;
fflush(stderr); c1 = s[0];
unsigned char c = s[0]; sprintf(s, "%02x", c1);
write(fd, &c, 1); for (int i=0; i<2; i++) {
c1 = s[i];
write(fd, &c1, 1);
usleep(1000); // let it breathe usleep(1000); // let it breathe
mread(fd, s, 2); // read hex pair mread(fd, &c2, 1); // read ping back
s[2] = 0; // null terminate if (c1 != c2) {
unsigned char c2 = strtol(s, NULL, 16);
if (c != c2) {
// mismatch! // mismatch!
unsigned int pos = ftell(fp); unsigned int pos = ftell(fp);
fprintf(stderr, "Mismatch at byte %d! %d != %d.\n", pos, c, c2); fprintf(stderr, "Mismatch at byte %d! %d != %d.\n", pos, c1, c2);
// we don't exit now because we need to "consume" our whole program. // we don't exit now because we need to "consume" our whole program.
returncode = 1; returncode = 1;
} }
usleep(1000); // let it breathe }
putc('.', stderr);
fflush(stderr);
} }
readprompt(fd); readprompt(fd);
sendcmdp(fd, "FORGET _"); sendcmdp(fd, "FORGET K");
fprintf(stderr, "Done!\n"); fprintf(stderr, "Done!\n");
fclose(fp); fclose(fp);
if (fd > 0) { if (fd > 0) {