From 311e9be0377a6d1b18192edad7edc1cd5593def3 Mon Sep 17 00:00:00 2001 From: Florian RICHER Date: Sat, 1 Mar 2025 18:01:07 +0100 Subject: [PATCH] Merge c and rust modules --- {lang_c/09_gpio_led_rpi3 => 01_basic_module}/Makefile | 5 ++++- .../basic_module_in_c.c | 0 .../basic_module_in_rust.rs | 0 {lang_c/01_basic_module => 02_module_params}/Makefile | 0 .../test_module.c | 0 .../02_module_params => 03_character_device}/Makefile | 0 .../README.md | 0 .../test_module.c | 0 .../Makefile | 0 .../test_module.c | 0 .../04_process_monitor => 05_packet_filter}/Makefile | 0 .../test_module.c | 0 .../05_packet_filter => 06_virtual_led_basic}/Makefile | 0 .../test_module.c | 0 .../Makefile | 0 .../test_module.c | 0 .../Makefile | 0 .../test_module.c | 0 {lang_c/08_gpio_pin_rpi3 => 09_gpio_led_rpi3}/Makefile | 0 .../test_module.c | 0 lang_rust/01_basic_module/Makefile | 10 ---------- 21 files changed, 4 insertions(+), 11 deletions(-) rename {lang_c/09_gpio_led_rpi3 => 01_basic_module}/Makefile (57%) rename lang_c/01_basic_module/test_module.c => 01_basic_module/basic_module_in_c.c (100%) rename lang_rust/01_basic_module/test_module.rs => 01_basic_module/basic_module_in_rust.rs (100%) rename {lang_c/01_basic_module => 02_module_params}/Makefile (100%) rename {lang_c/02_module_params => 02_module_params}/test_module.c (100%) rename {lang_c/02_module_params => 03_character_device}/Makefile (100%) rename {lang_c/03_character_device => 03_character_device}/README.md (100%) rename {lang_c/03_character_device => 03_character_device}/test_module.c (100%) rename {lang_c/03_character_device => 04_process_monitor}/Makefile (100%) rename {lang_c/04_process_monitor => 04_process_monitor}/test_module.c (100%) rename {lang_c/04_process_monitor => 05_packet_filter}/Makefile (100%) rename {lang_c/05_packet_filter => 05_packet_filter}/test_module.c (100%) rename {lang_c/05_packet_filter => 06_virtual_led_basic}/Makefile (100%) rename {lang_c/06_virtual_led_basic => 06_virtual_led_basic}/test_module.c (100%) rename {lang_c/06_virtual_led_basic => 07_virtual_leds_more_complex}/Makefile (100%) rename {lang_c/07_virtual_leds_more_complex => 07_virtual_leds_more_complex}/test_module.c (100%) rename {lang_c/07_virtual_leds_more_complex => 08_gpio_pin_rpi3}/Makefile (100%) rename {lang_c/08_gpio_pin_rpi3 => 08_gpio_pin_rpi3}/test_module.c (100%) rename {lang_c/08_gpio_pin_rpi3 => 09_gpio_led_rpi3}/Makefile (100%) rename {lang_c/09_gpio_led_rpi3 => 09_gpio_led_rpi3}/test_module.c (100%) delete mode 100644 lang_rust/01_basic_module/Makefile diff --git a/lang_c/09_gpio_led_rpi3/Makefile b/01_basic_module/Makefile similarity index 57% rename from lang_c/09_gpio_led_rpi3/Makefile rename to 01_basic_module/Makefile index b909b3c..faf4a40 100644 --- a/lang_c/09_gpio_led_rpi3/Makefile +++ b/01_basic_module/Makefile @@ -1,4 +1,7 @@ -obj-m += test_module.o +MODULE_NAME = basic_module + +obj-m += $(MODULE_NAME)_in_c.o +obj-m += $(MODULE_NAME)_in_rust.o all: make -C $(LINUX_MODULES_FOLDER)/build M=$(PWD) modules diff --git a/lang_c/01_basic_module/test_module.c b/01_basic_module/basic_module_in_c.c similarity index 100% rename from lang_c/01_basic_module/test_module.c rename to 01_basic_module/basic_module_in_c.c diff --git a/lang_rust/01_basic_module/test_module.rs b/01_basic_module/basic_module_in_rust.rs similarity index 100% rename from lang_rust/01_basic_module/test_module.rs rename to 01_basic_module/basic_module_in_rust.rs diff --git a/lang_c/01_basic_module/Makefile b/02_module_params/Makefile similarity index 100% rename from lang_c/01_basic_module/Makefile rename to 02_module_params/Makefile diff --git a/lang_c/02_module_params/test_module.c b/02_module_params/test_module.c similarity index 100% rename from lang_c/02_module_params/test_module.c rename to 02_module_params/test_module.c diff --git a/lang_c/02_module_params/Makefile b/03_character_device/Makefile similarity index 100% rename from lang_c/02_module_params/Makefile rename to 03_character_device/Makefile diff --git a/lang_c/03_character_device/README.md b/03_character_device/README.md similarity index 100% rename from lang_c/03_character_device/README.md rename to 03_character_device/README.md diff --git a/lang_c/03_character_device/test_module.c b/03_character_device/test_module.c similarity index 100% rename from lang_c/03_character_device/test_module.c rename to 03_character_device/test_module.c diff --git a/lang_c/03_character_device/Makefile b/04_process_monitor/Makefile similarity index 100% rename from lang_c/03_character_device/Makefile rename to 04_process_monitor/Makefile diff --git a/lang_c/04_process_monitor/test_module.c b/04_process_monitor/test_module.c similarity index 100% rename from lang_c/04_process_monitor/test_module.c rename to 04_process_monitor/test_module.c diff --git a/lang_c/04_process_monitor/Makefile b/05_packet_filter/Makefile similarity index 100% rename from lang_c/04_process_monitor/Makefile rename to 05_packet_filter/Makefile diff --git a/lang_c/05_packet_filter/test_module.c b/05_packet_filter/test_module.c similarity index 100% rename from lang_c/05_packet_filter/test_module.c rename to 05_packet_filter/test_module.c diff --git a/lang_c/05_packet_filter/Makefile b/06_virtual_led_basic/Makefile similarity index 100% rename from lang_c/05_packet_filter/Makefile rename to 06_virtual_led_basic/Makefile diff --git a/lang_c/06_virtual_led_basic/test_module.c b/06_virtual_led_basic/test_module.c similarity index 100% rename from lang_c/06_virtual_led_basic/test_module.c rename to 06_virtual_led_basic/test_module.c diff --git a/lang_c/06_virtual_led_basic/Makefile b/07_virtual_leds_more_complex/Makefile similarity index 100% rename from lang_c/06_virtual_led_basic/Makefile rename to 07_virtual_leds_more_complex/Makefile diff --git a/lang_c/07_virtual_leds_more_complex/test_module.c b/07_virtual_leds_more_complex/test_module.c similarity index 100% rename from lang_c/07_virtual_leds_more_complex/test_module.c rename to 07_virtual_leds_more_complex/test_module.c diff --git a/lang_c/07_virtual_leds_more_complex/Makefile b/08_gpio_pin_rpi3/Makefile similarity index 100% rename from lang_c/07_virtual_leds_more_complex/Makefile rename to 08_gpio_pin_rpi3/Makefile diff --git a/lang_c/08_gpio_pin_rpi3/test_module.c b/08_gpio_pin_rpi3/test_module.c similarity index 100% rename from lang_c/08_gpio_pin_rpi3/test_module.c rename to 08_gpio_pin_rpi3/test_module.c diff --git a/lang_c/08_gpio_pin_rpi3/Makefile b/09_gpio_led_rpi3/Makefile similarity index 100% rename from lang_c/08_gpio_pin_rpi3/Makefile rename to 09_gpio_led_rpi3/Makefile diff --git a/lang_c/09_gpio_led_rpi3/test_module.c b/09_gpio_led_rpi3/test_module.c similarity index 100% rename from lang_c/09_gpio_led_rpi3/test_module.c rename to 09_gpio_led_rpi3/test_module.c diff --git a/lang_rust/01_basic_module/Makefile b/lang_rust/01_basic_module/Makefile deleted file mode 100644 index 34a1b03..0000000 --- a/lang_rust/01_basic_module/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -obj-m += test_module.o - -all: - make -C $(LINUX_MODULES_FOLDER)/build M=$(PWD) modules - -clean: - make -C $(LINUX_MODULES_FOLDER)/build M=$(PWD) clean - -rust-analyzer: - make -C $(LINUX_MODULES_FOLDER)/build M=$(PWD) rust-analyzer