about summary refs log tree commit diff stats
path: root/shell
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-03-28 08:34:44 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-03-28 08:36:03 -0700
commit18ef136b2cfbb3803fa9ff0a91d23fd344d4225b (patch)
tree616cb9ce91ca73d037b64b152fc6f1d6462fea22 /shell
parentcfe4fea124f26d9f3ed919cea123700755440879 (diff)
downloadmu-18ef136b2cfbb3803fa9ff0a91d23fd344d4225b.tar.gz
.
Diffstat (limited to 'shell')
-rw-r--r--shell/main.mu12
1 files changed, 6 insertions, 6 deletions
diff --git a/shell/main.mu b/shell/main.mu
index 87ad0893..1fafa42c 100644
--- a/shell/main.mu
+++ b/shell/main.mu
@@ -1,11 +1,11 @@
 # Experimental Mu shell
 # A Lisp with indent-sensitivity and infix, no macros. Commas are ignored.
 
-fn main screen: (addr screen), keyboard: (addr keyboard) {
+fn main screen: (addr screen), keyboard: (addr keyboard), data-disk: (addr disk) {
   var sandbox-storage: sandbox
   var sandbox/esi: (addr sandbox) <- address sandbox-storage
   initialize-sandbox sandbox
-  load-sandbox-from-secondary-disk sandbox
+  load-sandbox data-disk, sandbox
   var width/eax: int <- copy 0
   var height/ecx: int <- copy 0
   width, height <- screen-size screen
@@ -22,13 +22,13 @@ fn main screen: (addr screen), keyboard: (addr keyboard) {
   }
 }
 
-# Read a null-terminated sequence of keys from secondary disk and load them
-# into sandbox.
-fn load-sandbox-from-secondary-disk _self: (addr sandbox) {
+# Read a null-terminated sequence of keys from disk and load them into
+# sandbox.
+fn load-sandbox data-disk: (addr disk), _self: (addr sandbox) {
   var self/esi: (addr sandbox) <- copy _self
   var s-storage: (stream byte 0x200)
   var s/ebx: (addr stream byte) <- address s-storage
-  load-first-sector-from-primary-bus-secondary-drive s
+  load-sector data-disk, 0/lba, s
   {
     var done?/eax: boolean <- stream-empty? s
     compare done?, 0/false