Compare commits

...

2 Commits

Author SHA1 Message Date
20kdc 85869aa80d sys-init fix (hopefully) (presync)
This wasn't properly committed & pushed, fixed that now. Hopefully it doesn't destroy everything.
2021-04-26 18:08:00 +01:00
20kdc 6fc56b4d64 Get OCVM to kinda work for development 2021-04-12 17:22:02 +01:00
5 changed files with 34 additions and 3 deletions

3
.gitignore vendored
View File

@ -20,6 +20,9 @@ repobuild/*/*/
repobuild/*/*/*
laboratory/ocemu.cfg
laboratory/bios.lua
laboratory/data
laboratory/log
laboratory/*/
laboratory/*/*
laboratory/*/*/

View File

@ -32,7 +32,7 @@ return {
},
["neo-init"] = {
desc = "KittenOS NEO / sys-init (startup)",
v = 10,
v = 11,
deps = {
"neo",
"neo-icecap",

View File

@ -16,7 +16,7 @@ neo.requestAccess("s.h._kosneo_syslog")
-- gpuG/performDisclaim are GPU management, while screen is used for prioritization
local gpuG, performDisclaim, screen = nil
local scrW, scrH
local scrW, scrH = 1, 1
local nssInst
local console = {}
@ -272,6 +272,7 @@ local function finalPrompt()
if sig[1] == "x.neo.sys.screens" then
-- We need to reinit screens no matter what.
retrieveNssMonitor(screen)
active = false
end
if sig[1] == "h.key_down" then
if sig[2] ~= lastKeyboard then
@ -280,7 +281,7 @@ local function finalPrompt()
if nScreen and nScreen ~= screen then
neo.emergency("new primary:", nScreen)
retrieveNssMonitor(nScreen, screen)
basicDraw()
active = false
end
end
if sig[4] == 15 then

17
laboratory/client.cfg Normal file
View File

@ -0,0 +1,17 @@
{
["components"]={
{"screen","67c66973-51ff-4aec-29cd-baabf2fbe346",},
{"gpu","9b7fe47d-77d0-1623-0dc5-126752e3f2c7",44800,},
{"eeprom","94a9cc26-347e-cc46-7faf-0c131bb7d8b7",4096,256,"EEPROM",},
{"computer","36bc34ad-8c4a-d19a-10e3-0162c6f3295a",1.04858e+06,},
{"filesystem","tmpfs",true,"tmpfs",},
{"filesystem","c1-sda",},
{"filesystem","c1-sdb",},
{"keyboard","dd142450-613c-435d-6049-743b27434cc1","67c66973-51ff-4aec-29cd-baabf2fbe346",},
{"modem","460ae893-9aa9-f10d-6bb0-462199da7376",56000,8192,8,},
{"internet","ef97c750-d30a-ad33-5321-6e7a64ba3baa",true,true,},
{"data","c5243e5f-cd2f-6c39-dfb2-5a788dcdef7c",["tier"]=1,},
{"sandbox","ece7b9ba-1625-f3f6-d74d-6e641a5de07f",},
},
["system"]={["allowBytecode"]=false,["allowGC"]=false,["maxTcpConnections"]=4,["timeout"]=math.huge,},
}

10
laboratory/locvm.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
# Copyright (C) 2018-2021 by KittenOS NEO contributors
#
# Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
# THIS SOFTWARE.
ocvm .