Merge pull request #20831 from chrysn-pull-requests/ek-lm4f120x-led-r…

…ust-const-avoidance boards/ek-lm4f120x: Change internal LED macro for C2Rust compatibility
RIOT-OS · Aug 26, 2024 · d7669fa · d7669fa
2 parents 0e7636a + b802a19
commit d7669fa
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 26 deletions.
diff --git a/boards/ek-lm4f120xl/include/board.h b/boards/ek-lm4f120xl/include/board.h
@@ -46,22 +46,26 @@ extern "C" {
 #define LED1_PIN            GPIO_PIN(5, 2)
 #define LED2_PIN            GPIO_PIN(5, 3)
 
-#define LED_PORT            (GPIO_PORTF_DATA_R)
+/**
+ * @brief Port used for `LED0_ON` and similar implementations
+ * @internal
+ * */
+#define LED_PORT()          (GPIO_PORTF_DATA_R)
 #define LED0_MASK           (1 << 7)
 #define LED1_MASK           (1 << 2)
 #define LED2_MASK           (1 << 1)
 
-#define LED0_ON             (LED_PORT |=  LED0_MASK)
-#define LED0_OFF            (LED_PORT &= ~LED0_MASK)
-#define LED0_TOGGLE         (LED_PORT ^=  LED0_MASK)
+#define LED0_ON             (LED_PORT() |=  LED0_MASK)
+#define LED0_OFF            (LED_PORT() &= ~LED0_MASK)
+#define LED0_TOGGLE         (LED_PORT() ^=  LED0_MASK)
 
-#define LED1_ON             (LED_PORT |=  LED1_MASK)
-#define LED1_OFF            (LED_PORT &= ~LED1_MASK)
-#define LED1_TOGGLE         (LED_PORT ^=  LED1_MASK)
+#define LED1_ON             (LED_PORT() |=  LED1_MASK)
+#define LED1_OFF            (LED_PORT() &= ~LED1_MASK)
+#define LED1_TOGGLE         (LED_PORT() ^=  LED1_MASK)
 
-#define LED2_ON             (LED_PORT |=  LED2_MASK)
-#define LED2_OFF            (LED_PORT &= ~LED2_MASK)
-#define LED2_TOGGLE         (LED_PORT ^=  LED2_MASK)
+#define LED2_ON             (LED_PORT() |=  LED2_MASK)
+#define LED2_OFF            (LED_PORT() &= ~LED2_MASK)
+#define LED2_TOGGLE         (LED_PORT() ^=  LED2_MASK)
 /** @} */
 
 /**

diff --git a/examples/rust-gcoap/Makefile b/examples/rust-gcoap/Makefile
@@ -48,8 +48,4 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module
 
 FEATURES_REQUIRED += rust_target
 
-# Currently unknown, something related to the LED_PORT definition that doesn't
-# pass C2Rust's transpilation
-BOARD_BLACKLIST := ek-lm4f120xl
-
 include $(RIOTBASE)/Makefile.include
diff --git a/examples/rust-hello-world/Makefile b/examples/rust-hello-world/Makefile
@@ -21,8 +21,4 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module
 
 FEATURES_REQUIRED += rust_target
 
-# Currently unknown, something related to the LED_PORT definition that doesn't
-# pass C2Rust's transpilation
-BOARD_BLACKLIST := ek-lm4f120xl
-
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/rust_libs/Makefile b/tests/rust_libs/Makefile
@@ -6,8 +6,4 @@ USEMODULE += ztimer_msec
 
 FEATURES_REQUIRED += rust_target
 
-# Currently unknown, something related to the LED_PORT definition that doesn't
-# pass C2Rust's transpilation
-BOARD_BLACKLIST := ek-lm4f120xl
-
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/rust_minimal/Makefile b/tests/rust_minimal/Makefile
@@ -5,8 +5,4 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module
 
 FEATURES_REQUIRED += rust_target
 
-# Currently unknown, something related to the LED_PORT definition that doesn't
-# pass C2Rust's transpilation
-BOARD_BLACKLIST := ek-lm4f120xl
-
 include $(RIOTBASE)/Makefile.include