* Fix CMake PATH parser for Windows to handle parent folder paths correctly.

The build system encountered an error during compilation of the Esp32c3 (RISC-V) module on Windows. The issue was traced to incorrect handling of "/../" (parent folder path) in folder addresses within the "always-run-cargo.dummy-baee278.bat" file used by CMake. This fix resolves the issue, enabling successful compilation.

Signed-off-by: Coskun Ergan <[email protected]>

Author: coskunergan

CMakeLists.txt

@@ -60,7 +60,24 @@ endfunction()
 
 function(get_include_dirs target dirs)
   get_target_property(include_dirs ${target} INTERFACE_INCLUDE_DIRECTORIES)
+  get_target_property(nostdinc_include ${target} nostdinc_include)
+
+  if(nostdinc_include)
+    if(NOT include_dirs)
+      set(include_dirs "")
+    endif()
+    list(APPEND include_dirs "${nostdinc_include}")
+  endif()
+
+  # normalize this path "/../"
   if(include_dirs)
+    set(normalized_dirs "")
+    foreach(dir IN LISTS include_dirs)
+      file(TO_CMAKE_PATH "${dir}" normalized_dir)
+      file(REAL_PATH "${normalized_dir}" resolved_dir BASE_DIRECTORY "${CMAKE_SOURCE_DIR}")
+      list(APPEND normalized_dirs "${resolved_dir}")
+    endforeach()
+    string(REPLACE ";" " " include_dirs "${normalized_dirs}")
     set(${dirs} "${include_dirs}" PARENT_SCOPE)
   else()
     set(${dirs} "" PARENT_SCOPE)

dt-rust.yaml

@@ -37,6 +37,8 @@
         - "nordic,nrf51-flash-controller"
         - "raspberrypi,pico-flash-controller"
         - "zephyr,sim-flash"
+        - "espressif,esp32-flash-controller"
+        - "st,stm32-flash-controller"
       level: 0
   actions:
     - !Instance

zephyr-sys/build.rs

@@ -76,7 +76,7 @@ fn main() -> Result<()> {
         .derive_copy(false)
         .allowlist_function("k_.*")
         .allowlist_function("gpio_.*")
-		.allowlist_function("auxdisplay_.*")
+        .allowlist_function("eeprom_.*")
         .allowlist_function("flash_.*")
         .allowlist_function("zr_.*")
         .allowlist_item("GPIO_.*")

zephyr-sys/wrapper.h

@@ -42,7 +42,7 @@ extern int errno;
 #include <zephyr/logging/log.h>
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/drivers/flash.h>
-#include <zephyr/drivers/auxdisplay.h>
+#include <zephyr/drivers/eeprom.h>
 #include <zephyr/irq.h>
 
 /*

zephyr/src/device/gpio.rs

@@ -31,8 +31,8 @@ mod async_io {
     use embassy_sync::waitqueue::AtomicWaker;
     use zephyr_sys::{
         device, gpio_add_callback, gpio_callback, gpio_init_callback, gpio_pin_interrupt_configure,
-        gpio_pin_interrupt_configure_dt, gpio_port_pins_t, GPIO_INT_EDGE_FALLING, GPIO_INT_EDGE_RISING, 
-        ZR_GPIO_INT_MODE_DISABLE_ONLY,
+        gpio_pin_interrupt_configure_dt, gpio_port_pins_t, GPIO_INT_EDGE_FALLING,
+        GPIO_INT_EDGE_RISING, ZR_GPIO_INT_MODE_DISABLE_ONLY,
     };
 
     use crate::sync::atomic::{AtomicBool, AtomicU32};
@@ -212,15 +212,17 @@ mod async_io {
             self.pin.data.register(self.pin.pin.pin, cx.waker());
 
             let mode = match self.level {
-                0 => GPIO_INT_EDGE_FALLING/*GPIO_INT_LEVEL_LOW*/,
-                1 => GPIO_INT_EDGE_RISING/*GPIO_INT_LEVEL_HIGH*/,
+                0 => GPIO_INT_EDGE_FALLING,
+                1 => GPIO_INT_EDGE_RISING,
                 _ => unreachable!(),
             };
 
             unsafe {
                 gpio_pin_interrupt_configure_dt(&self.pin.pin, mode);
 
-                if self.level == zephyr_sys::gpio_pin_get_raw(self.pin.pin.port,self.pin.pin.pin) as u8 {
+                if self.level
+                    == zephyr_sys::gpio_pin_get_raw(self.pin.pin.port, self.pin.pin.pin) as u8
+                {
                     let cb = self.pin.data.callback.get();
                     GpioStatic::callback_handler(self.pin.pin.port, cb, 1 << self.pin.pin.pin);
                 }