[io-console] move RP2040 specific code from app to gem

picoruby · Nov 20, 2023 · cc29aed · cc29aed
1 parent 0c8a999
commit cc29aed
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 166 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,6 @@ include(pico_sdk_import.cmake)
 # project specific configuration from here
 
 add_definitions(
-  -DMRBC_USE_HAL_RP2040
   -DMRBC_REQUIRE_32BIT_ALIGNMENT
   -DMAX_REGS_SIZE=256
   -DMAX_VM_COUNT=255
@@ -59,6 +58,7 @@ add_executable(${PROJECT_NAME}
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-i2c/ports/rp2040/i2c.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-spi/ports/rp2040/spi.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-adc/ports/rp2040/adc.c
+  ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-io-console/ports/rp2040/io-console.c
 )
 
 set(PICORBC ${CMAKE_SOURCE_DIR}/lib/picoruby/bin/picorbc)

diff --git a/include/io_rp2040.h b/include/io_rp2040.h
diff --git a/lib/picoruby b/lib/picoruby
diff --git a/src/hal.c b/src/hal.c
diff --git a/src/io_rp2040.c b/src/io_rp2040.c
diff --git a/src/main.c b/src/main.c
@@ -22,7 +22,6 @@
 #include "../include/sounder.h"
 
 /* ruby */
-#include "../include/io_rp2040.h"
 /* ext */
 #include "../build/mrb/object-ext.c"
 /* tasks */
@@ -98,7 +97,6 @@ main(void)
   board_init();
   /* PicoRuby */
   mrbc_init(memory_pool, MEMORY_SIZE);
-  mrbc_io_rp2040_init();
   prk_init_picoruby();
   /* TinyUSB */
   tusb_init();