fix pipeline errors

Author: ckrenslehner

_typos.toml

@@ -1,6 +1,6 @@
 [files]
 extend-exclude = [
     "stm32cubeprogrammer-sys/include",
-    "stm32cubeprogrammer-sys/src/bindings_unix.rs",
+    "stm32cubeprogrammer-sys/src/bindings_linux.rs",
     "stm32cubeprogrammer-sys/src/bindings_windows.rs",
 ]

stm32cubeprogrammer-sys/include/CubeProgrammer_API_Undocumented.h

@@ -6,33 +6,34 @@
 #pragma once
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <stdint.h>
 #include "DeviceDataStructure.h"
 
 #if (defined WIN32 || defined _WIN32 || defined WINCE)
-# define CP_EXPORTS __declspec(dllexport)
+#define CP_EXPORTS __declspec(dllexport)
 #else
-# define CP_EXPORTS
+#define CP_EXPORTS
 #endif
 
 /**
  * \brief Write a core register.
- * \param register : The register to write.
+ * \param reg : The register to write.
  * \param data     : The data to write.
  * \return 0 if the writing operation correctly finished, otherwise an error occurred.
  */
-int writeCoreRegister(unsigned int register, unsigned int data);
+int writeCoreRegister(unsigned int reg, unsigned int data);
 
 /**
  * \brief Read a core register.
- * \param register : The register to read.
+ * \param reg : The register to read.
  * \param data     : The data read.
  * \return 0 if the reading operation correctly finished, otherwise an error occurred.
  */
-int readCoreRegister(unsigned int register, unsigned int *data);
+int readCoreRegister(unsigned int reg, unsigned int *data);
 
 #ifdef __cplusplus
 }

stm32cubeprogrammer-sys/justfile

@@ -1,12 +1,3 @@
-# Nushell needs to be installeds
-set shell := ["nu", "-c"]
-
-shebang := if os() == 'windows' {
-  'nu.exe'
-} else {
-  '/usr/bin/env nu'
-}
-
 bindgen_header := "include/wrapper.h"
 
 bindings_windows := "src/bindings_windows.rs"
@@ -16,12 +7,6 @@ bindings_linux := "src/bindings_linux.rs"
 target_linux := "x86_64-unknown-linux-gnu"
 
 
-target := if os() == 'windows' {
-  x86_64-pc-windows-msvc
-} else {
-  x86_64-unknown-linux-gnu
-}
-
 # Generate bindings for the CubeProgrammer API dynamic library
 # Both the `x86_64-pc-windows-msvc` and `x86_64-unknown-linux-gnu` targets are need to be installed to run this command
 generate-bindings:

stm32cubeprogrammer-sys/src/bindings_linux.rs

@@ -1202,6 +1202,20 @@ pub struct CubeProgrammer_API {
         ) -> ::std::os::raw::c_int,
         ::libloading::Error,
     >,
+    pub writeCoreRegister: Result<
+        unsafe extern "C" fn(
+            reg: ::std::os::raw::c_uint,
+            data: ::std::os::raw::c_uint,
+        ) -> ::std::os::raw::c_int,
+        ::libloading::Error,
+    >,
+    pub readCoreRegister: Result<
+        unsafe extern "C" fn(
+            reg: ::std::os::raw::c_uint,
+            data: *mut ::std::os::raw::c_uint,
+        ) -> ::std::os::raw::c_int,
+        ::libloading::Error,
+    >,
 }
 impl CubeProgrammer_API {
     pub unsafe fn new<P>(path: P) -> Result<Self, ::libloading::Error>
@@ -1286,6 +1300,8 @@ impl CubeProgrammer_API {
         let getHsmVersion = __library.get(b"getHsmVersion\0").map(|sym| *sym);
         let getHsmType = __library.get(b"getHsmType\0").map(|sym| *sym);
         let getHsmLicense = __library.get(b"getHsmLicense\0").map(|sym| *sym);
+        let writeCoreRegister = __library.get(b"writeCoreRegister\0").map(|sym| *sym);
+        let readCoreRegister = __library.get(b"readCoreRegister\0").map(|sym| *sym);
         Ok(CubeProgrammer_API {
             __library,
             getStLinkList,
@@ -1354,6 +1370,8 @@ impl CubeProgrammer_API {
             getHsmVersion,
             getHsmType,
             getHsmLicense,
+            writeCoreRegister,
+            readCoreRegister,
         })
     }
     #[doc = " \\brief This routine allows to get ST-LINK conneted probe(s).\n \\param stLinkList  : Filled with the connected ST-LINK list and its default configurations.\n \\param shared      : Enable shared mode allowing connection of two or more instances to the same ST-LINK probe.\n \\return Number of the ST-LINK probes already exists.\n \\warning The Share option is useful only with ST-LINK Server.\n \\note  At the end of usage, #deleteInterfaceList must have been called."]
@@ -2000,4 +2018,26 @@ impl CubeProgrammer_API {
             .as_ref()
             .expect("Expected function, got error."))(hsmSlotId, outLicensePath)
     }
+    #[doc = " \\brief Write a core register.\n \\param reg : The register to write.\n \\param data     : The data to write.\n \\return 0 if the writing operation correctly finished, otherwise an error occurred."]
+    pub unsafe fn writeCoreRegister(
+        &self,
+        reg: ::std::os::raw::c_uint,
+        data: ::std::os::raw::c_uint,
+    ) -> ::std::os::raw::c_int {
+        (self
+            .writeCoreRegister
+            .as_ref()
+            .expect("Expected function, got error."))(reg, data)
+    }
+    #[doc = " \\brief Read a core register.\n \\param reg : The register to read.\n \\param data     : The data read.\n \\return 0 if the reading operation correctly finished, otherwise an error occurred."]
+    pub unsafe fn readCoreRegister(
+        &self,
+        reg: ::std::os::raw::c_uint,
+        data: *mut ::std::os::raw::c_uint,
+    ) -> ::std::os::raw::c_int {
+        (self
+            .readCoreRegister
+            .as_ref()
+            .expect("Expected function, got error."))(reg, data)
+    }
 }

stm32cubeprogrammer-sys/src/bindings_windows.rs

@@ -1242,14 +1242,14 @@ pub struct CubeProgrammer_API {
     >,
     pub writeCoreRegister: Result<
         unsafe extern "C" fn(
-            arg1: ::std::os::raw::c_uint,
+            reg: ::std::os::raw::c_uint,
             data: ::std::os::raw::c_uint,
         ) -> ::std::os::raw::c_int,
         ::libloading::Error,
     >,
     pub readCoreRegister: Result<
         unsafe extern "C" fn(
-            arg1: ::std::os::raw::c_uint,
+            reg: ::std::os::raw::c_uint,
             data: *mut ::std::os::raw::c_uint,
         ) -> ::std::os::raw::c_int,
         ::libloading::Error,
@@ -2092,26 +2092,26 @@ impl CubeProgrammer_API {
             .as_ref()
             .expect("Expected function, got error."))(hsmSlotId, outLicensePath)
     }
-    #[doc = " \\brief Write a core register.\n \\param register : The register to write.\n \\param data     : The data to write.\n \\return 0 if the writing operation correctly finished, otherwise an error occurred."]
+    #[doc = " \\brief Write a core register.\n \\param reg : The register to write.\n \\param data     : The data to write.\n \\return 0 if the writing operation correctly finished, otherwise an error occurred."]
     pub unsafe fn writeCoreRegister(
         &self,
-        arg1: ::std::os::raw::c_uint,
+        reg: ::std::os::raw::c_uint,
         data: ::std::os::raw::c_uint,
     ) -> ::std::os::raw::c_int {
         (self
             .writeCoreRegister
             .as_ref()
-            .expect("Expected function, got error."))(arg1, data)
+            .expect("Expected function, got error."))(reg, data)
     }
-    #[doc = " \\brief Read a core register.\n \\param register : The register to read.\n \\param data     : The data read.\n \\return 0 if the reading operation correctly finished, otherwise an error occurred."]
+    #[doc = " \\brief Read a core register.\n \\param reg : The register to read.\n \\param data     : The data read.\n \\return 0 if the reading operation correctly finished, otherwise an error occurred."]
     pub unsafe fn readCoreRegister(
         &self,
-        arg1: ::std::os::raw::c_uint,
+        reg: ::std::os::raw::c_uint,
         data: *mut ::std::os::raw::c_uint,
     ) -> ::std::os::raw::c_int {
         (self
             .readCoreRegister
             .as_ref()
-            .expect("Expected function, got error."))(arg1, data)
+            .expect("Expected function, got error."))(reg, data)
     }
 }

stm32cubeprogrammer/src/cube_programmer.rs

@@ -735,7 +735,11 @@ impl ConnectedProgrammer<'_> {
     }
 
     /// Write [`crate::api_types::CoreRegister`]
-    pub fn write_core_register(&self, register: crate::api_types::CoreRegister, value: u32) -> CubeProgrammerResult<()> {
+    pub fn write_core_register(
+        &self,
+        register: crate::api_types::CoreRegister,
+        value: u32,
+    ) -> CubeProgrammerResult<()> {
         self.check_connection()?;
 
         api_types::ReturnCode::<0>::from(unsafe {
@@ -745,7 +749,10 @@ impl ConnectedProgrammer<'_> {
     }
 
     /// Read [`crate::api_types::CoreRegister`]
-    pub fn read_core_register(&self, register: crate::api_types::CoreRegister) -> CubeProgrammerResult<u32> {
+    pub fn read_core_register(
+        &self,
+        register: crate::api_types::CoreRegister,
+    ) -> CubeProgrammerResult<u32> {
         self.check_connection()?;
 
         let mut value = 0;

stm32cubeprogrammer/src/lib.rs

@@ -28,9 +28,9 @@
 //!     .expect("Failed to connect to target");
 //!
 //! println!("Target information: {}", connected.target_information());
-//! 
+//!
 //! connected.write_core_register(CoreRegister::R0, 0x12345678).expect("Failed to write core register");
-//! 
+//!
 //! let r0 = connected.read_core_register(CoreRegister::R0).expect("Failed to read core register");
 //! println!("R0: 0x{:08X}", r0);
 //!
@@ -95,7 +95,7 @@ pub mod api_log;
 pub use api_log::{LogMessageType, Verbosity};
 
 pub mod api_types;
-pub use api_types::{fus, probe, TargetInformation, CoreRegister};
+pub use api_types::{fus, probe, CoreRegister, TargetInformation};
 
 pub mod display;
 pub use display::DisplayCallback;