X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=megaed-sv%2Fmain.c;h=7c0955fed7ac4b3f9030eee49ef9413981a7ec18;hb=df43aeea93272c120d348dde8226ed52efa74fc1;hp=ef421bde57e132c2b7d69c1255e21215ecb9c3d0;hpb=ab6ed3c49797791b2cfd90f4f636e7489355d02b;p=megadrive.git diff --git a/megaed-sv/main.c b/megaed-sv/main.c index ef421bd..7c0955f 100644 --- a/megaed-sv/main.c +++ b/megaed-sv/main.c @@ -7,6 +7,7 @@ #define noinline __attribute__((noinline)) #include "edos.h" +#include "asmtools.h" #define GFX_DATA_PORT 0xC00000 #define GFX_CTRL_PORT 0xC00004 @@ -23,6 +24,12 @@ #define APLANE (TILE_MEM_END + 0x1000) #define BPLANE (TILE_MEM_END + 0x3000) +#define read8(a) \ + *((volatile u8 *) (a)) +#define read16(a) \ + *((volatile u16 *) (a)) +#define read32(a) \ + *((volatile u32 *) (a)) #define write16(a, d) \ *((volatile u16 *) (a)) = (d) #define write32(a, d) \ @@ -81,9 +88,6 @@ static void printf_line(int x, const char *buf) u32 addr; int i; - if (printf_ypos >= CSCREEN_H) { - } - VDP_drawTextML(buf, APLANE, x, printf_ypos++ & (PLANE_H - 1)); if (printf_ypos >= CSCREEN_H) { @@ -100,23 +104,33 @@ static void printf_line(int x, const char *buf) } } +#define PRINTF_LEN 40 + static noinline int printf(const char *fmt, ...) { + static const char hexchars[] = "0123456789abcdef"; static int printf_xpos; - char buf[40+11]; + char c, buf[PRINTF_LEN + 11 + 1]; + const char *s; va_list ap; int ival; + u32 uval; int d = 0; - int i; + int i, j; va_start(ap, fmt); for (d = 0; *fmt; ) { - buf[d] = *fmt++; - if (buf[d] != '%') { - if (buf[d] == '\n') { + int prefix0 = 0; + int fwidth = 0; + + c = *fmt++; + if (d < PRINTF_LEN) + buf[d] = c; + + if (c != '%') { + if (c == '\n') { buf[d] = 0; - if (d != 0) - printf_line(printf_xpos, buf); + printf_line(printf_xpos, buf); d = 0; printf_xpos = 0; continue; @@ -124,6 +138,18 @@ static noinline int printf(const char *fmt, ...) d++; continue; } + if (d >= PRINTF_LEN) + continue; + + if (*fmt == '0') { + prefix0 = 1; + fmt++; + } + + while ('1' <= *fmt && *fmt <= '9') { + fwidth = fwidth * 10 + *fmt - '0'; + fmt++; + } switch (*fmt++) { case '%': @@ -145,12 +171,25 @@ static noinline int printf(const char *fmt, ...) } buf[d++] = '0' + ival; break; + case 'x': + uval = va_arg(ap, int); + while (fwidth > 0 && uval < (1 << (fwidth - 1) * 4)) { + buf[d++] = prefix0 ? '0' : ' '; + fwidth--; + } + for (j = 1; j < 8 && uval >= (1 << j * 4); j++) + ; + for (j--; j >= 0; j--) + buf[d++] = hexchars[(uval >> j * 4) & 0x0f]; + break; case 's': - // s = va_arg(ap, char *); + s = va_arg(ap, char *); + while (*s && d < PRINTF_LEN) + buf[d++] = *s++; + break; default: // don't handle, for now d++; - buf[d++] = *fmt++; va_arg(ap, void *); break; } @@ -181,10 +220,132 @@ void vbl(void) { } +static int usb_read_while_ready(OsRoutine *ed, + void *buf_, int maxlen) +{ + u8 *buf = buf_; + int r = 0; + + while (ed->usbRdReady() && r < maxlen) + buf[r++] = ed->usbReadByte(); + + return r; +} + +/* + * TH = 1 : ?1CBRLDU 3-button pad return value (not read) + * TH = 0 : ?0SA00DU 3-button pad return value + * TH = 1 : ?1CBRLDU 3-button pad return value + * TH = 0 : ?0SA0000 D3-0 are forced to '0' + * TH = 1 : ?1CBMXYZ Extra buttons returned in D3-0 + * TH = 0 : ?0SA1111 D3-0 are forced to '1' + */ +static void test_joy_latency(int *min_out, int *max_out) +{ + u8 rbuf[8 * 6]; + int min = 8; + int max = 0; + int i, v, b, e; + + for (i = 0; i < 64; i++) { + read_joy_responses(rbuf); + + for (b = 0; b < 8 * 4; b++) { + v = b & 7; + e = (b & 0x08) ? 0x0c : 0; + if ((rbuf[b] & 0x0c) == e) { + if (v < min) + min = v; + } + else if (v > max) + max = v; + } + } + + /* print out the last test */ + for (b = 0; b < 8 * 5; b++) { + printf(" %02x", rbuf[b]); + if ((b & 7) == 7) + printf("\n"); + } + printf("\n"); + + *min_out = min; + *max_out = max; +} + +static int do_test(OsRoutine *ed, u8 b3) +{ + int min = 0, max = 0; + + switch (b3) + { + case 'j': + test_joy_latency(&min, &max); + printf("latency: %d - %d\n\n", min, max); + return 0; + default: + break; + } + + return -1; +} + +#define MTYPE_OS 0 +#define MTYPE_MD 1 +#define MTYPE_SSF 2 +#define MTYPE_CD 3 +#define MTYPE_SMS 4 +#define MTYPE_10M 5 +#define MTYPE_32X 6 + +static int do_run(OsRoutine *ed, u8 b3) +{ + u8 mapper = 0; + + switch (b3) + { + case 's': + mapper = MTYPE_SMS | (7 << 4); + break; + case 'm': + mapper = MTYPE_MD; + break; + case 'o': + mapper = MTYPE_OS; + break; + case 'c': + mapper = MTYPE_CD; + break; + case '3': + mapper = MTYPE_32X; + break; + case 'M': + mapper = MTYPE_10M; + break; + default: + return -1; + } + + while (read32(GFX_CTRL_PORT) & 2) + ; + ed->VDP_setReg(VDP_MODE1, 0x04); + ed->VDP_setReg(VDP_MODE2, 0x44); + + ed->usbWriteByte('k'); + + run_game(mapper); + /* should not get here.. */ + + return -1; +} + int main() { OsRoutine *ed; - int i, j = 0; + u8 buf[16]; + int len; + int i, d, ret; ed = (OsRoutine *) *(u32 *)0x1A0; ed->memInitDmaCode(); @@ -205,16 +366,74 @@ int main() /* note: relying on ED menu's font setup here.. */ - // VDP_drawTextML("hello", APLANE, 0, 0); - printf("hello1"); - printf(" hello2\n"); - printf("hello3\n"); + printf("version: %02x\n", read8(0xa10001)); + printf("ED os/fw: %x/%x\n\n", ed->osGetOsVersion(), + ed->osGetFirmVersion()); for (;;) { - for (i = 0; i < 30; i++) + if (!ed->usbRdReady()) { asm volatile("stop #0x2000"); + continue; + } + + buf[0] = ed->usbReadByte(); + if (buf[0] == ' ') + continue; + if (buf[0] != '*') { + d = 1; + goto bad_input; + } + + /* note: OS uses Twofgsr */ + buf[1] = ed->usbReadByte(); + switch (buf[1]) { + case 'T': + ed->usbWriteByte('k'); + break; + case 'g': + len = ed->usbReadByte() * 128; + printf("loading %d bytes.. ", len * 512); + ed->usbWriteByte('k'); + ed->usbReadDma((void *)0x200000, len); + ed->usbWriteByte('d'); + printf("done\n"); + break; + case 'r': + buf[2] = ed->usbReadByte(); + ret = do_run(ed, buf[2]); + if (ret != 0) { + d = 3; + goto bad_input; + } + printf("run returned??\n"); + break; + + /* custom */ + case 't': + buf[2] = ed->usbReadByte(); + ret = do_test(ed, buf[2]); + if (ret != 0) { + d = 3; + goto bad_input; + } + ed->usbWriteByte('k'); + break; + default: + d = 2; + goto bad_input; + } + + continue; + +bad_input: + ret = usb_read_while_ready(ed, buf + d, sizeof(buf) - d); + buf[d + ret] = 0; + printf("bad cmd: %s\n", buf); + /* consume all remaining data */ + while (ed->usbRdReady()) + usb_read_while_ready(ed, buf, sizeof(buf)); - printf("hello %d\n", j++); + ed->usbWriteByte('b'); } return 0;