# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1346512504 18000
# Node ID d9d86f6018e833da1a1a3aaed95a3c309cd79da1
# Parent 6e9368c371d59d49c4d766a03bc4eb1938a8d1eb
cleanup.
diff -r 6e9368c371d5 -r d9d86f6018e8 clojure/com/aurellem/run/adv_choreo.clj
--- a/clojure/com/aurellem/run/adv_choreo.clj Sat Sep 01 10:11:18 2012 -0500
+++ b/clojure/com/aurellem/run/adv_choreo.clj Sat Sep 01 10:15:04 2012 -0500
@@ -43,9 +43,8 @@
(display-image-kernel
base-address
- ;;pinkie-pie-mark
- test-image-color
-
+ pinkie-pie-mark
+ ;;test-image-color
)
@@ -74,14 +73,7 @@
(concat
image-program ;; image program falls through to music program
-
- (infinite-loop)
- ;;music-program
-
- )))
-
-
-
+ music-program)))
(def glyphs
"The sixteen 8x8 glyphs which make up the \"terminal\" font."
@@ -301,7 +293,6 @@
(+ (count init)
(count header)
start-address))
- ;;(- (count (program-data 0)) 100))
state-machine-start-address
(+ start-address (count init) (count header) (count glyph-display))
@@ -315,8 +306,6 @@
(+ (count init) start-address)))])]
(concat init header glyph-display state-machine return-to-header)))
-
-
(defn-memo begin-glyph-bootstrap
([] (begin-glyph-bootstrap (launch-main-bootstrap-program)))
([script]
@@ -334,9 +323,7 @@
relocated-bootstrap-start
(concat glyph-init glyph-program))
(transfer-control relocated-bootstrap-start)
- (do-nothing 1)
-
- ))))
+ (do-nothing 1)))))
(defn write-all-program-data
([] (write-all-program-data (begin-glyph-bootstrap)))
@@ -350,9 +337,7 @@
([script]
(->> script
(transfer-control main-program-base-address)
- ;;(do-nothing 1800)
- (do-nothing 50)
- )))
+ (do-nothing 1800))))
;; possible screen writing programs