Merge pull request '1.2-dev merge' (#5) from 1.2-dev into main

Reviewed-on: #5

Src/Hyperion-firmware-cct/boot/cct/initdisks

@@ -6,147 +6,31 @@ local native = apis.peripheral
 local peripheral = {}
 local sides = {"top", "bottom", "left", "right", "front", "back"}
 
+function peripheral.getType(name)
+    if native.isPresent(name) then return native.getType(name) end
+    for n = 1, #sides do
+        local side = sides[n]
+        if native.hasType(side, "peripheral_hub") and
+            native.call(side, "isPresentRemote", name) then
+            return native.call(side, "getTypeRemote", name)
+        end
+    end
+    return nil
+end
+
 function peripheral.getNames()
-    local results = {}
+    local names = {}
     for n = 1, #sides do
         local side = sides[n]
-        if native.isPresent(side) then
+        if native.isPresent(side) then table.insert(names, side) end
-            table.insert(results, side)
+        if native.hasType(side, "peripheral_hub") then
-            if native.hasType(side, "peripheral_hub") then
+            local hubSides = native.call(side, "getConnectedSides")
-                local remote = native.call(side, "getNamesRemote")
+            for _, hubSide in ipairs(hubSides) do
-                for _, name in ipairs(remote) do
+                table.insert(names, hubSide)
-                    table.insert(results, name)
-                end
             end
         end
     end
-    return results
+    return names
-end
-
-function peripheral.isPresent(name)
-    if native.isPresent(name) then
-        return true
-    end
-
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
-            return true
-        end
-    end
-    return false
-end
-
-function peripheral.getType(peripheral)
-    if type(peripheral) == "string" then
-        if native.isPresent(peripheral) then
-            return native.getType(peripheral)
-        end
-        for n = 1, #sides do
-            local side = sides[n]
-            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
-                return native.call(side, "getTypeRemote", peripheral)
-            end
-        end
-        return nil
-    else
-        local mt = getmetatable(peripheral)
-        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
-            error("bad argument #1 (table is not a peripheral)", 2)
-        end
-        return table.unpack(mt.types)
-    end
-end
-
-function peripheral.hasType(peripheral, peripheral_type)
-    if type(peripheral) == "string" then
-        if native.isPresent(peripheral) then
-            return native.hasType(peripheral, peripheral_type)
-        end
-        for n = 1, #sides do
-            local side = sides[n]
-            if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", peripheral) then
-                return native.call(side, "hasTypeRemote", peripheral, peripheral_type)
-            end
-        end
-        return nil
-    else
-        local mt = getmetatable(peripheral)
-        if not mt or mt.__name ~= "peripheral" or type(mt.types) ~= "table" then
-            error("bad argument #1 (table is not a peripheral)", 2)
-        end
-        return mt.types[peripheral_type] ~= nil
-    end
-end
-
-function peripheral.getMethods(name)
-    if native.isPresent(name) then
-        return native.getMethods(name)
-    end
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
-            return native.call(side, "getMethodsRemote", name)
-        end
-    end
-    return nil
-end
-
-function peripheral.getName(peripheral)
-    local mt = getmetatable(peripheral)
-    if not mt or mt.__name ~= "peripheral" or type(mt.name) ~= "string" then
-        error("bad argument #1 (table is not a peripheral)", 2)
-    end
-    return mt.name
-end
-
-function peripheral.call(name, method, ...)
-    if native.isPresent(name) then
-        return native.call(name, method, ...)
-    end
-
-    for n = 1, #sides do
-        local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
-            return native.call(side, "callRemote", name, method, ...)
-        end
-    end
-    return nil
-end
-
-function peripheral.wrap(name)
-    local methods = peripheral.getMethods(name)
-    if not methods then
-        return nil
-    end
-
-    local types = { peripheral.getType(name) }
-    for i = 1, #types do types[types[i]] = true end
-    local result = setmetatable({}, {
-        __name = "peripheral",
-        name = name,
-        type = types[1],
-        types = types,
-    })
-    for _, method in ipairs(methods) do
-        result[method] = function(...)
-            return peripheral.call(name, method, ...)
-        end
-    end
-    return result
-end
-
-function peripheral.find(ty, filter)
-    local results = {}
-    for _, name in ipairs(peripheral.getNames()) do
-        if peripheral.hasType(name, ty) then
-            local wrapped = peripheral.wrap(name)
-            if filter == nil or filter(name, wrapped) then
-                table.insert(results, wrapped)
-            end
-        end
-    end
-    return table.unpack(results)
 end
 
 local disks = {}
@@ -246,9 +130,14 @@ local function refresh()
         if not peripheral.getType(id) then disks[id] = nil end
     end
 
-    for _, disk in ipairs({peripheral.find("drive")}) do
+    for _, name in ipairs(peripheral.getNames()) do
-        if disk.isDiskPresent() then
+        if peripheral.getType(name) == "disk" then
-            disks[tostring(disk.getDiskID())]=createDisk("cctdisk"..tostring(disk.getDiskID()), disk.getMountPath(), false, fs)
+            if not disks[name] then
+                local mount = disk.getMountPath(name)
+                if mount then
+                    disks[name] = createDisk(name, mount, false, disk)
+                end
+            end
         end
     end
 end

Src/Hyperion-firmware-cct/lib/modules/CC-Tweaked/25_tty.kmod

@@ -1,5 +1,4 @@
 --:Minify:--
-
 local kernel = ...
 local apis = kernel.apis
 local native = apis.peripheral

Src/Hyperion-firmware-cct/lib/modules/CC-Tweaked/40_redstone.kmod

@@ -0,0 +1,26 @@
+local args={...}
+local kernel=args[1]
+local driver={}
+
+driver.name="CCT Term Module"
+driver.version="0.1.0"
+driver.type="gpio"
+driver.description="CCT redstone Module Kernel Module"
+driver.arch="cct"
+driver.author="HyperionOS Dev Team"
+driver.license="MIT"
+driver.api={}
+
+function driver.load()
+    -- will 
+end
+
+function driver.unload()
+    -- Nothing to unload
+end
+
+function driver.main()
+    -- Nothing to run
+end
+
+-- kernel.drivers.register(driver)

Src/Hyperion-kernel/lib/modules/hyperion/12_procfs.kmod

@@ -132,17 +132,6 @@ function proxy:open(path, mode)
         if type(step[steps[#steps]]) == "function" then
             return step[steps[#steps]]("open", mode)
         end
-    elseif tostring(steps[1])=="self" then
-        local task=kernel.currentTask
-        local step = newtaskproxy(task)
-        for i=2, #steps-1 do
-            local dat = step[steps[i]]
-            if type(dat) ~= "table" then error("ENFILE") end
-            step=dat
-        end
-        if type(step[steps[#steps]]) == "function" then
-            return step[steps[#steps]]("open", mode)
-        end
     else
         for i=1, #steps-1 do
             local dat = step[steps[i]]
@@ -177,21 +166,6 @@ function proxy:type(path, mode)
         if type(step[steps[#steps]]) == "table" then
             return "directory"
         end
-    elseif tostring(steps[1])=="self" then
-        local task=kernel.currentTask
-        if #steps==1 then return "directory" end
-        local step = newtaskproxy(task)
-        for i=2, #steps-1 do
-            local dat = step[steps[i]]
-            if type(dat) ~= "table" then error("ENFILE") end
-            step=dat
-        end
-        if type(step[steps[#steps]]) == "function" then
-            return step[steps[#steps]]("type", mode)
-        end
-        if type(step[steps[#steps]]) == "table" then
-            return "directory"
-        end
     else
         for i=1, #steps-1 do
             local dat = step[steps[i]]
@@ -212,7 +186,7 @@ function proxy:list(path)
     local steps = kernel.vfs.splitPath(path)
     local step = data
     if #steps == 0 then
-        return table.merge(table.keys(data),table.keys(kernel.tasks),{"self"})
+        return table.merge(table.keys(data),table.keys(kernel.tasks))
     end
     if tonumber(steps[1]) then
         local task=kernel.tasks[steps[1]]
@@ -226,18 +200,6 @@ function proxy:list(path)
         if type(step[steps[#steps]]) == "table" then
             return table.keys(step[steps[#steps]])
         end
-    elseif tostring(steps[1])=="self" then
-        local task=kernel.currentTask
-        local step = newtaskproxy(task)
-        if #steps==1 then return table.keys(step) end
-        for i=2, #steps-1 do
-            local dat = step[steps[i]]
-            if type(dat) ~= "table" then error("ENOENT") end
-            step=dat
-        end
-        if type(step[steps[#steps]]) == "table" then
-            return table.keys(step[steps[#steps]])
-        end
     else
         for i=1, #steps-1 do
             local dat = step[steps[i]]