X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=host%2Fmain.c;h=9cc492cd38bf4815240e143d98214f43b0f5d933;hb=60707a511ee11a8af5d64fab1cc66ca9895d00bf;hp=58fbcb9e007c91ed72c95c9864e5cf3feaea35e7;hpb=96b9855aaad7a6aabb109b885ce5f81d44a85c1d;p=megadrive.git diff --git a/host/main.c b/host/main.c index 58fbcb9..9cc492c 100644 --- a/host/main.c +++ b/host/main.c @@ -1,3 +1,28 @@ +/* + * TeensyTAS, TAS input player for MegaDrive + * Copyright (c) 2014 notaz + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + #include #include #include @@ -397,6 +422,28 @@ int do_evdev_input(int fd) return memcmp(old_state, fixed_input_state, STATE_BYTES) ? 1 : 0; } +#define MAX_INPUT_BYTES 2 + +// TODO: 6btn +static int tas_data_to_teensy(uint16_t b, uint8_t *data, FILE *logf) +{ + uint8_t t; + + /* SCBA RLDU */ + /* v */ + /* ?0SA 00DU, ?1CB RLDU */ + data[0] = (b & 0x13) | ((b >> 2) & 0x20); + data[1] = (b & 0x0f) | ((b >> 1) & 0x30); + + if (logf != NULL) { + fwrite(&data[0], 1, 1, logf); + t = data[1] | 0x40; // expected TH + fwrite(&t, 1, 1, logf); + } + + return 2; +} + struct gmv_tas { char sig[15]; char ver; @@ -408,13 +455,18 @@ struct gmv_tas { uint8_t data[0][3]; }; -static uint8_t *import_gmv(FILE *f, long size, int *frame_count) +static uint8_t *import_gmv(FILE *f, long size, int *byte_count, FILE *logf) { struct gmv_tas *gmv; + int frame_count; + int count = 0; + uint16_t val; uint8_t *out; int ret; int i; + *byte_count = 0; + if (size < (long)sizeof(*gmv)) { fprintf(stderr, "bad gmv size: %ld\n", size); return NULL; @@ -432,11 +484,11 @@ static uint8_t *import_gmv(FILE *f, long size, int *frame_count) return NULL; } - *frame_count = (size - sizeof(*gmv)) / sizeof(gmv->data[0]); + frame_count = (size - sizeof(*gmv)) / sizeof(gmv->data[0]); /* check the GMV.. */ - if (*frame_count <= 0 || size != sizeof(*gmv) + *frame_count * 3) { - fprintf(stderr, "broken gmv? frames=%d\n", *frame_count); + if (frame_count <= 0 || size != sizeof(*gmv) + frame_count * 3) { + fprintf(stderr, "broken gmv? frames=%d\n", frame_count); return NULL; } @@ -465,16 +517,17 @@ static uint8_t *import_gmv(FILE *f, long size, int *frame_count) gmv->name[39] = 0; printf("loaded GMV: %s\n", gmv->name); printf("%d frames, %u rerecords\n", - *frame_count, gmv->rerecord_count); + frame_count, gmv->rerecord_count); - out = malloc(*frame_count * sizeof(out[0])); + out = malloc(frame_count * MAX_INPUT_BYTES); if (out == NULL) { fprintf(stderr, "OOM?\n"); return NULL; } - for (i = 0; i < *frame_count; i++) { - out[i] = gmv->data[i][0]; + for (i = 0; i < frame_count; i++) { + val = gmv->data[i][0] | ((gmv->data[i][2] & 0x0f) << 8); + count += tas_data_to_teensy(val, out + count, logf); if (gmv->data[i][1] != 0xff || gmv->data[i][2] != 0xff) { @@ -483,10 +536,11 @@ static uint8_t *import_gmv(FILE *f, long size, int *frame_count) } } + *byte_count = count; return out; } -static int do_bkm_char(char c, char expect, uint8_t *val, int bit) +static int do_bkm_char(char c, char expect, uint16_t *val, int bit) { if (c == expect) { *val &= ~(1 << bit); @@ -500,9 +554,11 @@ static int do_bkm_char(char c, char expect, uint8_t *val, int bit) return 1; } -static uint8_t *import_bkm(FILE *f, int *frame_count) +static uint8_t *import_bkm(FILE *f, int *byte_count, FILE *logf) { - uint8_t *out = NULL, val; + uint8_t *out = NULL; + uint16_t val; + int frames = 0; int count = 0; int alloc = 0; int line = 0; @@ -511,7 +567,8 @@ static uint8_t *import_bkm(FILE *f, int *frame_count) char *p; int i; - while ((p = fgets(buf, sizeof(buf), f)) != NULL) { + while ((p = fgets(buf, sizeof(buf), f)) != NULL) + { line++; if (p[0] != '|') continue; @@ -522,7 +579,7 @@ static uint8_t *import_bkm(FILE *f, int *frame_count) goto unhandled_line; p[30] = 0; - if (count >= alloc) { + if (count >= alloc - MAX_INPUT_BYTES) { alloc = alloc * 2 + 64; out = realloc(out, alloc * sizeof(out[0])); if (out == NULL) { @@ -531,7 +588,7 @@ static uint8_t *import_bkm(FILE *f, int *frame_count) } } - val = 0xff; + val = 0xfff; if (strncmp(p, "|.|", 3) != 0) goto unhandled_line; @@ -546,7 +603,8 @@ static uint8_t *import_bkm(FILE *f, int *frame_count) if (strcmp(p, "....|............||") != 0) goto unhandled_line; - out[count++] = val; + count += tas_data_to_teensy(val, out + count, logf); + frames++; continue; unhandled_line: @@ -554,11 +612,100 @@ unhandled_line: return NULL; } - printf("loaded bkm, %d frames\n", count); - *frame_count = count; + printf("loaded bkm, %d frames, %d bytes\n", frames, count); + *byte_count = count; + return out; +} + +static uint8_t *import_raw(FILE *f, int *byte_count, FILE *logf) +{ + uint8_t *out = NULL, val; + int count = 0; + int alloc = 0; + int line = 0; + int first = 1; + char buf[256]; + char *p; + int i; + + while ((p = fgets(buf, sizeof(buf), f)) != NULL) + { + line++; + if (p[0] == '#') + continue; + if (p[0] != 'e') { + printf("skipping: %s", p); + continue; + } + + val = 0; + p++; + for (i = 6; i >= 0; i--, p++) { + if (*p != '0' && *p != '1') + goto bad; + if (*p == '1') + val |= 1 << i; + } + if (*p != ' ') + goto bad; + + if (first && (val & 0x40)) + continue; // XXX.. + first = 0; + + if (count >= alloc) { + alloc = alloc * 2 + 64; + out = realloc(out, alloc * sizeof(out[0])); + if (out == NULL) { + fprintf(stderr, "OOM?\n"); + return NULL; + } + } + + if (logf) + fwrite(&val, 1, 1, logf); + + out[count++] = val & 0x3f; + continue; + +bad: + fprintf(stderr, "bad raw line %d: '%s'\n", line, buf); + return NULL; + } + + printf("loaded raw, %d bytes\n", count); + *byte_count = count; return out; } +static int write_bkm_frame(FILE *f, const uint8_t *data) +{ + /* ?0SA 00DU, ?1CB RLDU */ + static const char ref[] = "UDLRABCSXYZM"; + static const char bits[] = { 0,1,2,3, 12,4,5,13, 16,16,16,16 }; + uint32_t idata[2]; + int p, i; + + if (f == NULL) { + fprintf(stderr, "%s called without outfile\n", __func__); + goto out; + } + + idata[0] = 0x10000 | (data[0] << 8) | data[1]; + idata[1] = ~0; + + fprintf(f, "|.|"); + for (p = 0; p < 2; p++) { + for (i = 0; i < 12; i++) + fprintf(f, "%c", (idata[p] & (1 << bits[i])) ? '.' : ref[i]); + fprintf(f, "|"); + } + fprintf(f, "|\n"); + +out: + return 2; +} + static int submit_urb(int fd, struct usbdevfs_urb *urb, int ep, void *buf, size_t buf_size) { @@ -589,7 +736,7 @@ int main(int argc, char *argv[]) struct teensy_dev dev; struct usbdevfs_urb urb[URB_CNT]; struct usbdevfs_urb *reaped_urb; - int fixed_input_changed; + int fixed_input_changed = 0; int evdev_fds[16]; int evdev_fd_cnt = 0; int evdev_support; @@ -597,17 +744,24 @@ int main(int argc, char *argv[]) int pending_urbs = 0; fd_set rfds, wfds; const char *tasfn = NULL; + const char *outfn = NULL; + const char *logfn = NULL; uint8_t *tas_data = NULL; - int use_readinc = 0; // frame increment on read + int tas_data_size = 0; + int bytes_sent = 0; + int use_vsync = 0; // frame increment on vsync + int no_start_seq = 0; int tas_skip = 0; int enable_sent = 0; + int abort_sent = 0; int frame_count = 0; - int frames_sent = 0; char buf_dbg[64 + 1]; struct tas_pkt pkt_in; struct tas_pkt pkt_out; struct timeval *timeout = NULL; struct timeval tout; + FILE *outf = NULL; + FILE *logf = NULL; int i, ret = -1; int fd; @@ -620,20 +774,31 @@ int main(int argc, char *argv[]) missing_arg(i); tasfn = argv[i]; continue; - case 's': + case 'w': i++; if (argv[i] == NULL) missing_arg(i); - tas_skip = atoi(argv[i]); + outfn = argv[i]; continue; - case 'r': - use_readinc = 1; + case 'l': + i++; + if (argv[i] == NULL) + missing_arg(i); + logfn = argv[i]; + continue; + case 'v': + use_vsync = 1; + continue; + case 'n': + no_start_seq = 1; continue; default: fprintf(stderr, "bad arg: %s\n", argv[i]); return 1; } } + + /* remaining args are evdev filenames */ if (evdev_fd_cnt >= ARRAY_SIZE(evdev_fds)) { fprintf(stderr, "too many evdevs\n"); break; @@ -657,6 +822,15 @@ int main(int argc, char *argv[]) evdev_fds[evdev_fd_cnt++] = fd; } + if (logfn != NULL) { + logf = fopen(logfn, "wb"); + if (logf == NULL) { + fprintf(stderr, "fopen %s: ", logfn); + perror(""); + return 1; + } + } + if (tasfn != NULL) { const char *ext; long size; @@ -684,42 +858,34 @@ int main(int argc, char *argv[]) ext++; if (strcasecmp(ext, "gmv") == 0) - tas_data = import_gmv(f, size, &frame_count); + tas_data = import_gmv(f, size, &tas_data_size, logf); else if (strcasecmp(ext, "bkm") == 0) - tas_data = import_bkm(f, &frame_count); + tas_data = import_bkm(f, &tas_data_size, logf); + else if (strcasecmp(ext, "txt") == 0) + tas_data = import_raw(f, &tas_data_size, logf); else { fprintf(stderr, "unknown movie type: '%s'\n", ext); return 1; } fclose(f); + if (logf != NULL) { + rewind(logf); + logf = NULL; + } + if (tas_data == NULL) { fprintf(stderr, "failed fo parse %s\n", tasfn); return 1; } + } - if (tas_skip != 0) { - if (tas_skip >= frame_count || tas_skip <= -frame_count) { - printf("skip out of range: %d/%d\n", tas_skip, frame_count); - return 1; - } - if (tas_skip > 0) { - frame_count -= tas_skip; - memmove(&tas_data[0], &tas_data[tas_skip], - sizeof(tas_data[0]) * frame_count); - } - else { - tas_data = realloc(tas_data, - (frame_count - tas_skip) * sizeof(tas_data[0])); - if (tas_data == NULL) { - fprintf(stderr, "OOM?\n"); - return 1; - } - memmove(&tas_data[-tas_skip], &tas_data[0], - sizeof(tas_data[0]) * frame_count); - memset(&tas_data[0], 0xff, sizeof(tas_data[0]) * -tas_skip); - frame_count -= tas_skip; - } + if (outfn != NULL) { + outf = fopen(outfn, "w"); + if (outf == NULL) { + fprintf(stderr, "fopen %s: ", outfn); + perror(""); + return 1; } } @@ -728,7 +894,7 @@ int main(int argc, char *argv[]) dev.fd = -1; - while (!g_exit) + while (!g_exit || (pending_urbs & (1 << URB_DATA_OUT))) { if (dev.fd == -1) { ret = find_device(&dev, 0x16C0, 0x0486); @@ -747,7 +913,7 @@ int main(int argc, char *argv[]) wait_device = 0; pending_urbs = 0; enable_sent = 0; - frames_sent = 0; + bytes_sent = 0; /* we wait first, then send commands, but if teensy * is started already, it won't send anything */ @@ -794,7 +960,6 @@ int main(int argc, char *argv[]) timeout = NULL; /* sometihng form stdin? */ - /* something from input devices? */ if (FD_ISSET(STDIN_FILENO, &rfds)) { char c = 0; ret = read(STDIN_FILENO, &c, 1); @@ -810,7 +975,7 @@ int main(int argc, char *argv[]) } } - fixed_input_changed = 0; + /* something from input devices? */ for (i = 0; i < evdev_fd_cnt; i++) { if (FD_ISSET(evdev_fds[i], &rfds)) { fixed_input_changed |= @@ -852,41 +1017,42 @@ int main(int argc, char *argv[]) else if (reaped_urb == &urb[URB_DATA_IN]) { /* some request from teensy */ - int count; - uint8_t b; - switch (pkt_in.type) { case PKT_STREAM_REQ: - printf("req: %d/%d/%d\n", pkt_in.req.frame, - frames_sent, frame_count); - - for (i = 0; i < sizeof(pkt_out.data) / 2; i++) { - pkt_out.data[i * 2 + 0] = 0x33; - pkt_out.data[i * 2 + 1] = 0x3f; - } - if (frames_sent < frame_count) { - pkt_out.type = PKT_STREAM_DATA; - - count = frame_count - frames_sent; - if (count > sizeof(pkt_out.data) / 2) - count = sizeof(pkt_out.data) / 2; - for (i = 0; i < count; i++) { - /* SCBA RLDU */ - b = tas_data[frames_sent]; - - /* ?0SA 00DU, ?1CB RLDU */ - pkt_out.data[i * 2 + 0] = (b & 0x13) | ((b >> 2) & 0x20); - pkt_out.data[i * 2 + 1] = (b & 0x0f) | ((b >> 1) & 0x30); - frames_sent++; - } + printf("req: %d/%d/%d\n", pkt_in.req.frame * 2, + bytes_sent, tas_data_size); + + pkt_out.size = 0; + if (bytes_sent < tas_data_size) { + pkt_out.type = PKT_STREAM_DATA_TO; + + i = tas_data_size - bytes_sent; + if (i > sizeof(pkt_out.data)) + i = sizeof(pkt_out.data); + memcpy(pkt_out.data, tas_data + bytes_sent, i); + bytes_sent += i; + pkt_out.size = i; } - else + else { pkt_out.type = PKT_STREAM_END; + } ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out, &pkt_out, sizeof(pkt_out)); if (ret != 0) - perror("USBDEVFS_SUBMITURB URB_DATA_OUT PKT_STREAM_DATA"); + perror("USBDEVFS_SUBMITURB PKT_STREAM_DATA_TO"); + break; + + case PKT_STREAM_DATA_FROM: + printf("f: %d\n", frame_count); + if (pkt_in.size == 0 || pkt_in.size > sizeof(pkt_out.data)) { + printf("host: got bad DATA_FROM size: %u\n", pkt_in.size); + break; + } + for (i = 0; i < pkt_in.size; ) { + i += write_bkm_frame(outf, pkt_in.data + i); + frame_count++; + } break; default: @@ -902,6 +1068,12 @@ int main(int argc, char *argv[]) /* debug text */ buf_dbg[reaped_urb->actual_length] = 0; printf("%s", buf_dbg); + + // continue receiving debug before sending out stuff + tout.tv_sec = 0; + tout.tv_usec = 1000; + timeout = &tout; + continue; } else { fprintf(stderr, "reaped unknown urb? %p #%zu\n", @@ -914,10 +1086,13 @@ int main(int argc, char *argv[]) // can't do that yet continue; - if (tas_data != NULL && !enable_sent) { + if ((tas_data != NULL || outf != NULL) && !enable_sent) { memset(&pkt_out, 0, sizeof(pkt_out)); pkt_out.type = PKT_STREAM_ENABLE; - pkt_out.start.use_readinc = use_readinc; + pkt_out.enable.stream_to = (tas_data != NULL); + pkt_out.enable.stream_from = (outf != NULL); + pkt_out.enable.use_readinc = !use_vsync; + pkt_out.enable.no_start_seq = no_start_seq; ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out, &pkt_out, sizeof(pkt_out)); @@ -925,8 +1100,10 @@ int main(int argc, char *argv[]) perror("USBDEVFS_SUBMITURB PKT_STREAM_ENABLE"); continue; } + pending_urbs |= 1 << URB_DATA_OUT; enable_sent = 1; - frames_sent = 0; + bytes_sent = 0; + continue; } if (tas_data == NULL && fixed_input_changed) { memset(&pkt_out, 0, sizeof(pkt_out)); @@ -936,12 +1113,27 @@ int main(int argc, char *argv[]) ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out, &pkt_out, sizeof(pkt_out)); if (ret != 0) { - perror("USBDEVFS_SUBMITURB URB_DATA_OUT"); + perror("USBDEVFS_SUBMITURB PKT_FIXED_STATE"); break; } + fixed_input_changed = 0; pending_urbs |= 1 << URB_DATA_OUT; continue; } + if (g_exit && !abort_sent) { + memset(&pkt_out, 0, sizeof(pkt_out)); + pkt_out.type = PKT_STREAM_ABORT; + + ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out, + &pkt_out, sizeof(pkt_out)); + if (ret != 0) { + perror("USBDEVFS_SUBMITURB PKT_STREAM_ABORT"); + break; + } + pending_urbs |= 1 << URB_DATA_OUT; + abort_sent = 1; + continue; + } continue; @@ -952,6 +1144,9 @@ dev_close: enable_echo(1); + if (outf != NULL) + fclose(outf); + if (dev.fd != -1) { /* deal with pending URBs */ if (pending_urbs & (1 << URB_DATA_IN))