make sleep work

Build/boot/kernel.lua

@@ -33,7 +33,6 @@ function kernel.log(msg, level)
         kernel.currentTask=kernel.kernelTask
         kernel.tty.print(tostring(computer:time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
         kernel.currentTask=kernel.standbyTask
-        
     end
 end
 

Build/lib/modules/Hyperion/00_stdlib.kmod

@@ -1,4 +1,3 @@
-
 function string.hasSuffix(str, suffix)
     return string.sub(str, #suffix+1) == suffix
 end
@@ -195,7 +194,10 @@ end
 
 local oldtype=type
 local oldgetmetatable=getmetatable
-function type(object)
+function type(object, trueType)
+    if trueType then
+        return oldtype(object)
+    end
     if oldtype(object)~="table" then
         return oldtype(object)
     else
@@ -225,7 +227,7 @@ function getmetatable(object)
     end
 end
 
-function isEqual(a, ...)
+function isEqualToAny(a, ...)
     local args={...}
     for i=0, #args do
         if a==args[i] then
@@ -235,6 +237,16 @@ function isEqual(a, ...)
     return false
 end
 
+function isEqualToAll(a, ...)
+    local args={...}
+    for i=0, #args do
+        if a~=args[i] then
+            return false
+        end
+    end
+    return true
+end
+
 function table.keys(t)
     local a = {}
     for n in pairs(t) do table.insert(a, n) end
@@ -256,15 +268,17 @@ function table.indexOf(t, value)
     return -1
 end
 
-syscall = setmetatable({}, {__index = function(self, name)
-    return function(...)
-        local res = table.pack(coroutine.yield("syscall", name, ...))
-        if res[1] then
-            return table.unpack(res, 2, res.n)
-        else
-            error(res[2], 2)
+syscall = setmetatable({}, {
+    __index = function(self, name)
+        return function(...)
+            local res = table.pack(coroutine.yield("syscall", name, ...))
+            if res[1] then
+                return table.unpack(res, 2, res.n)
+            else
+                error(res[2], 2)
+            end
         end
     end
-end})
+})
 
 table.serialize=serialize

Build/lib/modules/Hyperion/12_devfs.kmod

@@ -144,30 +144,6 @@ data["eeprom"] = {
     end
 }
 
-data["stdin"] = {
-    type = "link",
-    read = function(amount)
-        return kernel.currentTask.fd[0].read(amount)
-    end,
-    write = function() error("Permission denied") end
-}
-
-data["stdout"] = {
-    type = "link",
-    read = function() error("Permission denied") end,
-    write = function(data)
-        kernel.currentTask.fd[1].write(data)
-    end
-}
-
-data["stderr"] = {
-    type = "link",
-    read = function() error("Permission denied") end,
-    write = function(data)
-        kernel.currentTask.fd[2] = data
-    end
-}
-
 local keyboard = kernel.newFifo()
 local mouse = kernel.newFifo()
 data["input"] = newDirectory()

Build/sbin/init.lua

@@ -76,7 +76,7 @@ local function serialize(table, seen)
 end
 
 while true do
-    --print(serialize(kernel.tasks))
+    kernel.log(serialize(kernel.tasks))
     kernel.saveLog()
     sleep(1000)
 end

Test/Hyperion-core-v1.0.0/sbin/init.lua

@@ -76,7 +76,7 @@ local function serialize(table, seen)
 end
 
 while true do
-    kernel.log(serialize(kernel.tasks))
+    --kernel.log(serialize(kernel.tasks))
     kernel.saveLog()
     sleep(1000)
 end

Test/Hyperion-firmware-cct-v1.0.0/lib/modules/CC-Tweaked/51_tty.kmod

@@ -36,7 +36,7 @@ end
 
 local function wrapPeripheral(name)
     if native.isPresent(name) then
-        return native.wrap(name)
+        return wrapPeripheral(name)
     end
     for n = 1, #sides do
         local side = sides[n]

Test/Hyperion-kernel-v1.0.0/lib/modules/Hyperion/45_hypervisor.kmod

@@ -53,7 +53,7 @@ end
 
 kernel.syscalls["HPV_spawn"]=sys.spawn
 kernel.syscalls["HPV_sleep"]=sys.sleep
-kernel._G.sleep=function(...)coroutine.yield("HPV_sleep",...)end
+kernel._G.sleep=function(...)coroutine.yield("syscall","HPV_sleep",...)end
 
 local function reapDeadTasks()
     for pid, task in pairs(tasks) do
@@ -161,16 +161,16 @@ function kernel.main()
                     if ret[2]=="syscall" then
                         if kernel.syscalls[ret[3]] then
                             if kernel.config.debugSyscalls then
-                                kernel.log("Task "..task.pid.." invoking syscall: "..ret[3])
+                                kernel.log("Task "..task.pid.." invoking syscall: "..ret[3], "DBUG")
                             end
                             local sysret = {xpcall(kernel.syscalls[ret[3]], debug.traceback, table.unpack(ret, 4))}
                             if kernel.config.debugSyscalls then
                                 if not sysret[1] then
                                     kernel.log("Task "..task.pid.." syscall "..ret[3].." failed: "..tostring(sysret[2]))
                                 else
-                                    kernel.log("Task "..task.pid.." syscall "..ret[3].." completed returning "..tostring(#sysret-1).." values")
+                                    kernel.log("Task "..task.pid.." syscall "..ret[3].." completed returning "..tostring(#sysret-1).." values", "DBUG")
                                     for i=2,#sysret do
-                                        kernel.log("  retval["..tostring(i-1).."] = "..tostring(sysret[i]))
+                                        kernel.log("  retval["..tostring(i-1).."] = "..tostring(sysret[i]), "DBUG")
                                     end
                                 end
                             end