X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=contrib%2Fdemo.fleet;h=8f8c514783d8f0033214fcbe2322c760f48e040b;hb=daa7ab3d282553b18a61333a3d122813212939e2;hp=bead521e0513ae5bc012af8110a40db9238416ab;hpb=c38e474e4e480aba0d8a070ee52f608aaf4f4c1d;p=fleet.git

diff --git a/contrib/demo.fleet b/contrib/demo.fleet
index bead521..8f8c514 100644
--- a/contrib/demo.fleet
+++ b/contrib/demo.fleet
@@ -1,38 +1,14 @@
-#include "contrib/demo.ships"
-
-// values and addresses to write
-1: sendto mem.write_addr;
-2: sendto mem.write_addr;
-3: sendto mem.write_addr;
-9: sendto mem.write_data;
-8: sendto mem.write_data;
-7: sendto mem.write_data;
-
-// memory write ports accept the values
-mem.write_addr:  [*] take, deliver;
-mem.write_data:  [*] take, deliver;
-
-// once all three are written, cue the fifo
-mem.write_done:
-  [3] take;
-  ack fifo.out;
-
-// meanwhile, the fifo is sitting on a set of read addresses
-fifo.in: [*] take, deliver;
-1: sendto fifo.in;
-2: sendto fifo.in;
-3: sendto fifo.in;
-1: sendto fifo.in;
-1: sendto fifo.in;
-1: sendto fifo.in;
-
-// when it gets the ack, it issues them all to the memory read unit
-fifo.out:
-  wait;
-  [*] take, sendto mem.read_addr;
-
-// values read from memory go to debug (which accepts them)
-mem.read_addr:   [*] take, deliver;
-mem.read_data:   [*] take, sendto debug.data;
-debug.data:      [*] take, deliver;
+#ship debug    : Debug
+#ship iscratch : Iscratch
+
+BOB:             sendto iscratch.inCBD;
+iscratch.inCBD:  [*] take, deliver;
+debug.in:        [*] take, deliver;
+
+BOB: {
+  12:           sendto debug.in;
+  13:           sendto debug.in;
+  14:           sendto debug.in;
+  BOB:          sendto iscratch.inCBD;
+}