Adds tracing IEC alongside 6510

markusC64 · Jun 21, 2020 · 6dd7a3a · 6dd7a3a
1 parent 953ee76
commit 6dd7a3a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/external/u64.sof b/external/u64.sof
diff --git a/software/io/network/data_streamer.cc b/software/io/network/data_streamer.cc
@@ -21,14 +21,14 @@ extern "C" {
 #define CFG_STREAM_DEST3    0xD3
 #define CFG_STREAM_BUSMODE  0xD4
 
-static const char *modes[] = { "6510 Only", "VIC Only", "6510 & VIC", "1541 Only", "6510 & 1541" };
-static const uint8_t modeBytes[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00 };
+static const char *modes[] = { "6510 Only", "VIC Only", "6510 & VIC", "1541 Only", "6510 & 1541", "6510 w/IEC", "6510 & VIC w/IEC" };
+static const uint8_t modeBytes[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x09, 0x0B, 0x00 };
 
 struct t_cfg_definition stream_cfg[] = {
     { CFG_STREAM_DEST0,         CFG_TYPE_STRING, "Stream VIC to",     "%s", NULL,  0, 36, (int)"239.0.1.64:11000" },
     { CFG_STREAM_DEST1,         CFG_TYPE_STRING, "Stream Audio to",   "%s", NULL,  0, 36, (int)"239.0.1.65:11001" },
     { CFG_STREAM_DEST2,         CFG_TYPE_STRING, "Stream Debug to",   "%s", NULL,  0, 36, (int)"239.0.1.66:11002" },
-    { CFG_STREAM_BUSMODE,       CFG_TYPE_ENUM,   "Debug Stream Mode", "%s", modes, 0, 4,  0 },
+    { CFG_STREAM_BUSMODE,       CFG_TYPE_ENUM,   "Debug Stream Mode", "%s", modes, 0, 6,  0 },
     //    { CFG_STREAM_DEST3,         CFG_TYPE_STRING, "Stream IEC to",     "%s", NULL,  0, 36, (int)"239.0.1.67:11003" },
 
     { CFG_TYPE_END,             CFG_TYPE_END,  "",                             "",   NULL,  0,  0, 0 } };

diff --git a/tools/dump_bus_trace.c b/tools/dump_bus_trace.c
@@ -180,7 +180,8 @@ void dump_trace(struct data_entry *entries, int size, int lines, int text_mode,
     //
     // vector_in <= phi2 & dman & exromn & ba & irqn & rom & nmin & rwn & data & addr;
     // const char *labels[8] = { "RWn","NMIn","ROMn", "IRQn","BA","EXROMn","SYNC","PHI2" };
-    const char *labels[8] = { "RWn","NMIn","ROMn", "IRQn","BA","EXROMn","GAMEn","PHI2" };
+    //const char *labels[8] = { "RWn","NMIn","IRQn","BA","ROMn", "EXROMn","GAMEn","PHI2" };
+    const char *labels[8] = { "RWn","NMIn","IRQn","BA","CLOCK", "DATA","ATN","PHI2" };
     const char *drive_labels[8] = { "1541_RWn", "1541_IRQn", "1541_BYTEREADY", "1541_SYNC", "1541_CLOCK", "1541_DATA", "1541_ATN", "nul" };
     const char *vic_regs[47] = { "M0X", "M0Y", "M1X", "M1Y", "M2X", "M2Y", "M3X", "M3Y",
             "M4X", "M4Y", "M5X", "M5Y", "M6X", "M6Y", "M7X", "M7Y",
@@ -239,18 +240,6 @@ void dump_trace(struct data_entry *entries, int size, int lines, int text_mode,
     }
 
     for(i=0;i<size;i++) {
-        d->flags |= 0x40;
-/*
-        if ((d->flags & 0x80) == 0) {
-            if (d->flags & 0x40) {
-                enable = 1;
-                cycle = 16028;
-            } else {
-                cycle ++;
-            }
-            cycle = cycle % 19656;
-        }
-*/
 
         if ((d->flags & 0x80) == 0) {
             cycle ++;