From 002dfde385403b81973b588cf0af0ae0517bedaa Mon Sep 17 00:00:00 2001
From: Yilin Sun <imi415@imi.moe>
Date: Thu, 9 Mar 2023 18:39:43 +0800
Subject: [PATCH] Renamed devmem gem.

Signed-off-by: Yilin Sun <imi415@imi.moe>
---
 configs/imxrt1052.rb                                  | 8 +++++---
 configs/lpc55s69.rb                                   | 9 +++++----
 mrbgems/{mruby-devmem => machine-devmem}/mrbgem.rake  | 2 +-
 mrbgems/{mruby-devmem => machine-devmem}/src/devmem.c | 4 ++--
 mrbgems/utilities.gembox                              | 2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)
 rename mrbgems/{mruby-devmem => machine-devmem}/mrbgem.rake (60%)
 rename mrbgems/{mruby-devmem => machine-devmem}/src/devmem.c (96%)

diff --git a/configs/imxrt1052.rb b/configs/imxrt1052.rb
index e69733e..44564ef 100644
--- a/configs/imxrt1052.rb
+++ b/configs/imxrt1052.rb
@@ -41,11 +41,13 @@ MRuby::CrossBuild.new("imxrt1052") do |conf|
   conf.disable_cxx_exception
 
   #gems from core
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
+  conf.gem :core => "mruby-compiler"
   conf.gem :core => "mruby-enum-ext"
+  conf.gem :core => "mruby-math"
   conf.gem :core => "mruby-numeric-ext"
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-sprintf"
+  conf.gem :core => "mruby-time"
 
   #light-weight regular expression
   #conf.gem :github => "masamitsu-murase/mruby-hs-regexp", :branch => "master"
diff --git a/configs/lpc55s69.rb b/configs/lpc55s69.rb
index 07f163e..b75e423 100644
--- a/configs/lpc55s69.rb
+++ b/configs/lpc55s69.rb
@@ -43,12 +43,13 @@ MRuby::CrossBuild.new("lpc55s69") do |conf|
 
   #gems from core
   conf.gem :core => "mruby-compiler"
-  conf.gem :core => "mruby-sprintf"
-  conf.gem :core => "mruby-print"
-  conf.gem :core => "mruby-math"
-  conf.gem :core => "mruby-time"
   conf.gem :core => "mruby-enum-ext"
+  conf.gem :core => "mruby-math"
   conf.gem :core => "mruby-numeric-ext"
+  conf.gem :core => "mruby-print"
+  conf.gem :core => "mruby-sprintf"
+  conf.gem :core => "mruby-string-ext"
+  conf.gem :core => "mruby-time"
 
   conf.gembox "../../mrbgems/utilities"
 
diff --git a/mrbgems/mruby-devmem/mrbgem.rake b/mrbgems/machine-devmem/mrbgem.rake
similarity index 60%
rename from mrbgems/mruby-devmem/mrbgem.rake
rename to mrbgems/machine-devmem/mrbgem.rake
index ec10af7..2419a58 100644
--- a/mrbgems/mruby-devmem/mrbgem.rake
+++ b/mrbgems/machine-devmem/mrbgem.rake
@@ -1,4 +1,4 @@
-MRuby::Gem::Specification.new('mruby-devmem') do |spec|
+MRuby::Gem::Specification.new('machine-devmem') do |spec|
   spec.license = 'MIT'
   spec.author  = 'imi415'
   spec.summary = 'Address space R/W access'
diff --git a/mrbgems/mruby-devmem/src/devmem.c b/mrbgems/machine-devmem/src/devmem.c
similarity index 96%
rename from mrbgems/mruby-devmem/src/devmem.c
rename to mrbgems/machine-devmem/src/devmem.c
index b21107e..91be90b 100644
--- a/mrbgems/mruby-devmem/src/devmem.c
+++ b/mrbgems/machine-devmem/src/devmem.c
@@ -79,7 +79,7 @@ static mrb_value mrb_write8(mrb_state *mrb, mrb_value self) {
     return mrb_nil_value();
 }
 
-void mrb_mruby_devmem_gem_init(mrb_state *mrb) {
+void mrb_machine_devmem_gem_init(mrb_state *mrb) {
     struct RClass *class_peekpoke = mrb_define_module(mrb, "Machine");
 
     mrb_define_class_method(mrb, class_peekpoke, "read32", mrb_read32, MRB_ARGS_ARG(1, 0));
@@ -91,6 +91,6 @@ void mrb_mruby_devmem_gem_init(mrb_state *mrb) {
     mrb_define_class_method(mrb, class_peekpoke, "write8", mrb_write8, MRB_ARGS_ARG(2, 0));
 }
 
-void mrb_mruby_devmem_gem_final(mrb_state *mrb) {
+void mrb_machine_devmem_gem_final(mrb_state *mrb) {
     /* Not used */
 }
\ No newline at end of file
diff --git a/mrbgems/utilities.gembox b/mrbgems/utilities.gembox
index ac3415e..59cb29e 100644
--- a/mrbgems/utilities.gembox
+++ b/mrbgems/utilities.gembox
@@ -1,3 +1,3 @@
 MRuby::GemBox.new do |conf|
-    conf.gem :core => "../../mrbgems/mruby-devmem"
+    conf.gem :core => "../../mrbgems/machine-devmem"
 end
\ No newline at end of file