mobile-nixos · Dec 31, 2020 · Jan 2, 2021 · Jan 2, 2021 · Jan 2, 2021 · Jan 2, 2021
diff --git a/boot/error/default.nix b/boot/error/default.nix
@@ -3,20 +3,33 @@
 , mruby
 }:
 
+let
+  inherit (lib) concatMapStringsSep;
+
+  # Select libs we need from the libs folder.
+  libs = concatMapStringsSep " " (name: "${../lib}/${name}") [
+    "hal/reboot_modes.rb"
+    "lvgui/args.rb"
+    "lvgui/fiddlier.rb"
+    "lvgui/lvgl/*.rb"
+    "lvgui/lvgui/*.rb"
+    "lvgui/vtconsole.rb"
+  ];
+in
+
 # mkDerivation will append something like -aarch64-unknown-linux-gnu to the
 # derivation name with cross, which will break the mruby code loading.
 # Since we don't need anything from mkDerivation, really, let's use runCommand.
 runCommand "boot-error.mrb" {
   src = lib.cleanSource ./.;
-  lib = lib.cleanSource ../recovery-menu/lib;
 
   nativeBuildInputs = [
     mruby
   ];
 } ''
   mrbc \
     -o $out \
-    $(find $lib -type f -name '*.rb' | sort) \
+    ${libs} \
     $(find $src/lib -type f -name '*.rb' | sort) \
     $src/main.rb
 ''
diff --git a/boot/error/main.rb b/boot/error/main.rb
@@ -315,7 +315,7 @@ def cleanup_and_exit()
     $ui.set_actions([
       ["Power off", ->() { run("poweroff") }],
       ["Kernel panic", ->() { $exit = true }],
-      *(RebootModes.options),
+      *(Hal::RebootModes.options),
     ])
   end
 ]])

diff --git a/boot/init/default.nix b/boot/init/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, mrbgems
 , mruby
 
 # Additional tasks
@@ -14,6 +13,17 @@ let
     url = "https://raw.githubusercontent.com/ruby/ruby/${ruby_rev}/lib/shellwords.rb";
     sha256 = "197g7qvrrijmajixa2h9c4jw26l36y8ig6qjb5d43qg4qykhqfcx";
   };
+
+  inherit (stdenv.lib) concatMapStringsSep;
+
+  # Select libs we need from the libs folder.
+  libs = concatMapStringsSep " " (name: "${../lib}/${name}") [
+    "00-monkey_patches/*.rb"
+    "hal/recovery.rb"
+    "evdev/*.rb"
+    "init/configuration.rb"
+    "linux/*.rb"
+  ];
 in
 stdenv.mkDerivation {
   pname = "mobile-nixos-init";
@@ -39,8 +49,9 @@ stdenv.mkDerivation {
     }
 
     # This is the "script" that will be loaded.
-    mrbc -o init.mrb \
-      $(find ${../lib} -type f | sort) \
+    mrbc \
+      -o init.mrb \
+      ${libs} \
       $(find lib -type f | sort) \
       $(get_tasks) \
       init.rb

diff --git a/boot/init/lib/monkey_patches/dir.rb → boot/lib/00-monkey_patches/dir.rb b/boot/init/lib/monkey_patches/dir.rb → boot/lib/00-monkey_patches/dir.rb
diff --git a/boot/init/lib/monkey_patches/file.rb → boot/lib/00-monkey_patches/file.rb b/boot/init/lib/monkey_patches/file.rb → boot/lib/00-monkey_patches/file.rb
diff --git a/boot/init/lib/monkey_patches/fileutils.rb → boot/lib/00-monkey_patches/fileutils.rb b/boot/init/lib/monkey_patches/fileutils.rb → boot/lib/00-monkey_patches/fileutils.rb
diff --git a/boot/init/lib/monkey_patches/pp.rb → boot/lib/00-monkey_patches/pp.rb b/boot/init/lib/monkey_patches/pp.rb → boot/lib/00-monkey_patches/pp.rb
diff --git a/boot/lib/evdev.rb → boot/lib/evdev/__init.rb b/boot/lib/evdev.rb → boot/lib/evdev/__init.rb
diff --git a/boot/lib/hal/reboot_modes.rb b/boot/lib/hal/reboot_modes.rb
@@ -0,0 +1,18 @@
+module Hal
+  module RebootModes
+    Android = {
+      "recovery"   => ["Reboot to recovery", ->() { run("reboot recovery") }],
+      "bootloader" => ["Reboot to bootloader", ->() { run("reboot bootloader") }],
+    }
+
+    def self.options()
+      [
+        ["Reboot to system", ->() { run("reboot") }],
+      ] + 
+        Configuration["HAL"]["boot"]["rebootModes"].map do |identifier|
+          const, key = identifier.split(".", 2)
+          const_get(const)[key]
+        end
+    end
+  end
+end
diff --git a/boot/init/lib/configuration.rb → boot/lib/init/configuration.rb b/boot/init/lib/configuration.rb → boot/lib/init/configuration.rb
diff --git a/boot/lib/lvgui/args.rb b/boot/lib/lvgui/args.rb
@@ -0,0 +1,50 @@
+# Extremely minimal and naïve arguments parsing.
+module Args
+  @@parsed = nil
+
+  def self.get(key, default = nil)
+    parse[:values][key] or default
+  end
+
+  def self.unused()
+    parsed[:unused]
+  end
+
+  def self.parse()
+    return @@parsed if @@parsed
+
+    argv = ARGV.dup
+    unused = []
+
+    # Default values.
+    # `nil` means it expects a parameter.
+    # `false` means it's a boolean toggle without parameter.
+    values = {}
+    while argv.length > 0
+      arg = argv.shift
+      if arg.match(/^--help$/)
+        # Assumes the programmer will add it
+        begin
+          print_help
+        rescue
+          $stderr.puts "Sorry, no help defined."
+        end
+        exit 0
+      elsif arg.match(/^--/)
+        key = arg.sub(/^--/, "").gsub("-", "_").to_sym
+        if argv.length > 0 && !argv[0].match(/^--/)
+          values[key] = argv.shift
+        else
+          values[key] = true
+        end
+      else
+        unused << arg
+      end
+    end
+
+    @@parsed = {
+      unused: unused,
+      values: values,
+    }
+  end
+end
diff --git a/boot/lib/lvgui/fiddlier.rb b/boot/lib/lvgui/fiddlier.rb
@@ -0,0 +1,100 @@
+# This module augments Fiddle with useful helpers.
+
+module LVGL
+end
+module LVGL::Fiddlier
+  # Given a +type+, returns the value of the global +name+.
+  def get_global!(type, name)
+    addr = handler.sym(name)
+    raise(Fiddle::DLError, "cannot find symbol #{name}") unless addr
+    s = struct(["#{type} value"])
+    s.new(addr).value
+  end
+
+  # Given a +type+, sets the global +name+ to +new_value+.
+  def set_global!(type, name, new_value)
+    addr = handler.sym(name)
+    raise(Fiddle::DLError, "cannot find symbol #{name}") unless addr
+    s = struct(["#{type} value"])
+    tmp = s.new(addr)
+    tmp.value = new_value
+    tmp.value
+  end
+
+  def get_global_struct!(struct, name)
+    addr = handler.sym(name)
+    raise(Fiddle::DLError, "cannot find symbol for struct #{name}") unless addr
+    struct.new(addr)
+  end
+
+  # Using +set_global!+ and +get_global!+, creates accessors for a global
+  # variable.
+  def global!(type, name)
+    method_name = name.to_sym
+    define_method(method_name) do
+      get_global!(type, name)
+    end
+    module_function method_name
+
+    method_name = "#{name}=".to_sym
+    define_method(method_name) do |value|
+      set_global!(type, name, value)
+    end
+    module_function method_name
+  end
+
+  # TODO: parse `typedef enum {...} name;`
+  def enum!(name, values, type: "int")
+    typedef name.to_s, type.to_s
+    mod = self.const_set(name.to_sym, Module.new)
+    current_value = 0
+    values.each do |data|
+      if data.is_a? Hash
+        name = data.keys.first.to_sym
+        current_value = data.values.first
+      else
+        name = data.to_sym
+      end
+      mod.const_set(name, current_value)
+
+      current_value += 1
+    end
+  end
+
+  # Flattens the given nested struct
+  def flatten_struct!(fields, prefix: nil)
+    fields.map do |field|
+      type = field.first
+      name = [prefix, field.last].compact.join("_")
+
+      if type.is_a? Array then
+        flatten_struct!(type, prefix: name)
+      else
+        [[type.to_sym, name.to_sym]]
+      end
+    end.flatten(1)
+  end
+
+  # Parses nested structs into a flattened Fiddle struct.
+  # XXX: broken because of struct alignment padding / packing
+  #      -> http://www.catb.org/esr/structure-packing/#_padding
+  def struct!(fields)
+    flattened = flatten_struct!(fields).map do |field|
+      type = field.first
+      name = field.last
+      "#{type} #{name}"
+    end
+    struct(flattened)
+  end
+
+  # Define the given +sym+ as a function.
+  # It will auto-wrap the method using a closure.
+  def bound_method!(sym, sig)
+    sym = sym.to_sym
+    module_function sym
+    ctx = self
+    @func_map[sym.to_s] = bind(sig) do |*args|
+      ctx.send(sym, *args)
+    end
+  end
+end
diff --git a/boot/lib/lvgui/lvgl/__init.rb b/boot/lib/lvgui/lvgl/__init.rb
@@ -0,0 +1,2 @@
+module LVGL
+end