xcplib A2L generation improvements (#30)

* wrapper.h renamed to xcplib.h
* Calibration segments with typedef instances
* Bugfixes
* A2L generator requires min max for all parameters
* Auto groups
* A2lSetSegmentAddrMode
* A2lCreateLinearConversion
* c_demo shared axis tested with CANape 24 release candidate

Author: RainerZ

.vscode/settings.json

@@ -1,7 +1,26 @@
 {
     "files.associations": {
         "stdatomic.h": "c",
-        "malloc.h": "c"
+        "malloc.h": "c",
+        "xcpethserver.h": "c",
+        "xcplite.h": "c",
+        "xcpqueue.h": "c",
+        "xcp_cfg.h": "c",
+        "stdlib.h": "c",
+        "xcpethtl.h": "c",
+        "a2l.h": "c",
+        "stdint.h": "c",
+        "platform.h": "c",
+        "stdbool.h": "c",
+        "xcplib.h": "c",
+        "istream": "c",
+        "locale": "c",
+        "tuple": "c",
+        "variant": "c",
+        "ios": "c",
+        "limits": "c",
+        "ratio": "c",
+        "algorithm": "c"
     },
     "cSpell.words": [
         "ampl",

build.rs

@@ -18,7 +18,7 @@ fn main() {
     // Generate C code bindings for xcplib
     if is_posix {
         let bindings = bindgen::Builder::default()
-            .header("xcplib/wrapper.h")
+            .header("xcplib/xcplib.h")
             //
             //.clang_args(&["-target", "x86_64-pc-windows-msvc"])
             .clang_arg("-Ixcplib/src")
@@ -29,9 +29,8 @@ fn main() {
             // Protocol layer
             .allowlist_function("XcpInit")
             .allowlist_function("XcpDisconnect")
-            // Transport layer
-            .allowlist_function("XcpEthTlGetInfo")
             // Server
+            .allowlist_function("XcpEthServerGetInfo")
             .allowlist_function("XcpEthServerInit")
             .allowlist_function("XcpEthServerShutdown")
             .allowlist_function("XcpEthServerStatus")
@@ -64,6 +63,7 @@ fn main() {
         .file("xcplib/src/xcpEthTl.c")
         .file("xcplib/src/xcpEthServer.c");
     if is_posix {
+        //builder.define("_POSIX_C_SOURCE", "200112L");
         builder.flag("-std=c11");
         if is_release {
             builder.flag("-O2");
@@ -74,8 +74,7 @@ fn main() {
     builder.compile("xcplib");
 
     // Tell cargo to invalidate the built crate whenever any of these files changed.
-    println!("cargo:rerun-if-changed=xcplib/c_test.c");
-    println!("cargo:rerun-if-changed=xcplib/wrapper.h");
+    println!("cargo:rerun-if-changed=xcplib/xcplib.h");
     println!("cargo:rerun-if-changed=xcplib/src/main_cfg.h");
     println!("cargo:rerun-if-changed=xcplib/src/xcptl_cfg.h");
     println!("cargo:rerun-if-changed=xcplib/src/xcp_cfg.h");

src/xcp/mod.rs

@@ -451,7 +451,7 @@ impl Xcp {
             if addr == [0, 0, 0, 0] {
                 unsafe {
                     // @@@@ UNSAFE - C library call
-                    xcplib::XcpEthTlGetInfo(std::ptr::null_mut(), std::ptr::null_mut(), &mut addr[0] as *mut u8, std::ptr::null_mut());
+                    xcplib::XcpEthServerGetInfo(std::ptr::null_mut(), std::ptr::null_mut(), &mut addr[0] as *mut u8, std::ptr::null_mut());
                 }
             }
             let mut reg = registry::get_lock();

src/xcp/xcplib.rs

@@ -1,44 +1,45 @@
 /* automatically generated by rust-bindgen 0.71.1 */
 
 unsafe extern "C" {
-    #[doc = " Initialize the XCP on Ethernet server instance.\n @pre User has called XcpInit.\n @param address Address to bind to.\n @param port Port to bind to.\n @param use_tcp Use TCP if true, otherwise UDP.\n @param measurement_queue Optional external memory to place the measurement queue.\n Pass NULL if server should allocate it.\n @param measurement_queue_size Measurement queue size in bytes. Includes the bytes occupied by the queue header.\n @return True on success, otherwise false."]
+    #[doc = " Initialize the XCP on Ethernet server singleton.\n @pre User has called XcpInit.\n @param address Address to bind to.\n @param port Port to bind to.\n @param use_tcp Use TCP if true, otherwise UDP.\n @param measurement_queue_size Measurement queue size in bytes. Includes the bytes occupied by the queue header and some space needed for alignment.\n @return true on success, otherwise false."]
     pub fn XcpEthServerInit(address: *const u8, port: u16, use_tcp: bool, measurement_queue_size: u32) -> bool;
 }
 unsafe extern "C" {
-    #[doc = " Shutdown the XCP on Ethernet server instance."]
+    #[doc = " Shutdown the XCP on Ethernet server."]
     pub fn XcpEthServerShutdown() -> bool;
 }
 unsafe extern "C" {
-    #[doc = " Get the XCP on Ethernet server instance status.\n @return True if the server is running, otherwise false."]
+    #[doc = " Get the XCP on Ethernet server instance status.\n @return true if the server is running, otherwise false."]
     pub fn XcpEthServerStatus() -> bool;
 }
 unsafe extern "C" {
-    pub fn XcpEthTlGetInfo(isTCP: *mut bool, mac: *mut u8, addr: *mut u8, port: *mut u16);
+    #[doc = " Get information about the XCP on Ethernet server instance address.\n @pre The server instance is running.\n @param out_is_tcp Optional out parameter to query if TCP or UDP is used.\n True if TCP, otherwise UDP.\n Pass NULL if not required.\n @param out_mac Optional out parameter to query the MAC address of the interface used in the server instance.\n Pass NULL if not required.\n @param out_address Optional out parameter to query the IP address used in the server instance.\n Pass NULL if not required.\n @param out_port Optional out parameter to query the port address used in the server instance.\n Pass NULL if not required."]
+    pub fn XcpEthServerGetInfo(out_is_tcp: *mut bool, out_mac: *mut u8, out_address: *mut u8, out_port: *mut u16);
 }
+pub type tXcpEventId = u16;
 unsafe extern "C" {
-    pub fn XcpInit();
+    pub fn XcpEventExt(event: tXcpEventId, base: *const u8) -> u8;
 }
 unsafe extern "C" {
-    pub fn XcpSetEpk(epk: *const ::std::os::raw::c_char);
+    pub fn XcpSetLogLevel(level: u8);
 }
 unsafe extern "C" {
-    pub fn XcpDisconnect();
+    pub fn XcpInit();
 }
-pub type tXcpEventId = u16;
 unsafe extern "C" {
-    pub fn XcpEventExt(event: tXcpEventId, base: *const u8) -> u8;
+    pub fn ApplXcpSetA2lName(name: *const ::std::os::raw::c_char);
 }
 unsafe extern "C" {
-    pub fn XcpEvent(event: tXcpEventId);
+    pub fn XcpSetEpk(epk: *const ::std::os::raw::c_char);
 }
 unsafe extern "C" {
-    pub fn XcpSendTerminateSessionEvent();
+    pub fn XcpDisconnect();
 }
 unsafe extern "C" {
-    pub fn XcpPrint(str_: *const ::std::os::raw::c_char);
+    pub fn XcpSendTerminateSessionEvent();
 }
 unsafe extern "C" {
-    pub fn XcpSetLogLevel(level: u8);
+    pub fn XcpPrint(str_: *const ::std::os::raw::c_char);
 }
 unsafe extern "C" {
     pub fn ApplXcpGetClock64() -> u64;
@@ -59,6 +60,3 @@ unsafe extern "C" {
         cb_flush: ::std::option::Option<unsafe extern "C" fn() -> u8>,
     );
 }
-unsafe extern "C" {
-    pub fn ApplXcpSetA2lName(name: *const ::std::os::raw::c_char);
-}