Update to vectorgrp/XCPlite master xcplib (#36)

* Update to XCPlite V0.9.2

Author: RainerZ

.gitignore

@@ -1,5 +1,6 @@
 
 target
+build
 /Cargo.lock
 
 # Misc

build.rs

@@ -18,7 +18,7 @@ fn main() {
     // Generate C code bindings for xcplib
     if is_posix {
         let bindings = bindgen::Builder::default()
-            .header("xcplib/xcplib.h")
+            .header("xcplib/src/xcplib.h")
             //
             //.clang_args(&["-target", "x86_64-pc-windows-msvc"])
             .clang_arg("-Ixcplib/src")

src/registry/a2l/a2l_reader.rs

@@ -166,18 +166,25 @@ fn get_conversion(conversion: &str, module: &a2lfile::Module, vector_xcp_mode: b
 
 // Get event number from IF_DATA
 fn get_event_id_from_ifdata(if_data_vec: &Vec<a2lfile::IfData>) -> Option<u16> {
-    let mut event_id = None;
     for ifdata in if_data_vec {
         let decoded_ifdata = aml_ifdata::A2mlVector::load_from_ifdata(ifdata).unwrap();
         if let Some(xcp) = decoded_ifdata.xcp {
             if let Some(daq_event) = xcp.daq_event {
                 if let Some(fixed_event_list) = daq_event.fixed_event_list {
-                    event_id = Some(fixed_event_list.event[0].item);
+                    assert!(!fixed_event_list.event.is_empty());
+                    return Some(fixed_event_list.event[0].item);
+                }
+                // @@@@ TODO Improve this workaround to treat the first default event like a fixed event
+                if let Some(event_lists) = daq_event.variable {
+                    if let Some(default_event_list) = event_lists.default_event_list {
+                        assert!(!default_event_list.event.is_empty());
+                        return Some(default_event_list.event[0].item);
+                    }
                 }
             }
         }
     }
-    event_id
+    None
 }
 
 // Always read to A2L address representation
@@ -212,8 +219,13 @@ fn get_mc_address(registry: &Registry, addr: u32, addr_ext: u8, event_id: Option
                 let addr_offset: i32 = addr as i32;
                 McAddress::new_event_rel(event_id, addr_offset)
             }
+            McAddress::XCP_ADDR_EXT_ABS => {
+                let event_id = event_id.unwrap();
+                let addr_offset: i32 = addr as i32;
+                McAddress::new_event_abs(event_id, addr_offset)
+            }
             _ => {
-                warn!("Address extension {} not supported", addr_ext);
+                warn!("Address extension {} not supported in Vector mode", addr_ext);
                 McAddress::new_a2l(addr, addr_ext)
             }
         }

src/registry/mc_address.rs

@@ -101,6 +101,17 @@ impl McAddress {
         }
     }
 
+    pub fn new_event_abs(event_id: u16, addr_offset: i32) -> Self {
+        McAddress {
+            calseg_name: None,
+            event_id: Some(event_id),
+            addr_offset,
+            addr_mode: McAddress::ADDR_MODE_ABS,
+            a2l_addr: 0,
+            a2l_addr_ext: 0,
+        }
+    }
+
     pub fn new_event_rel(event_id: u16, addr_offset: i32) -> Self {
         McAddress {
             calseg_name: None,
@@ -206,6 +217,13 @@ impl McAddress {
         }
     }
 
+    fn get_abs_ext_addr(offset: u32) -> (u8, u32) {
+        let a2l_ext = McAddress::XCP_ADDR_EXT_ABS;
+        #[allow(clippy::cast_sign_loss)]
+        let a2l_addr: u32 = offset;
+        (a2l_ext, a2l_addr)
+    }
+
     fn get_dyn_ext_addr(event_id: u16, offset: i16) -> (u8, u32) {
         let a2l_ext = McAddress::XCP_ADDR_EXT_DYN;
         #[allow(clippy::cast_sign_loss)]
@@ -248,6 +266,10 @@ impl McAddress {
         else if self.addr_mode == McAddress::ADDR_MODE_DYN {
             McAddress::get_dyn_ext_addr(self.event_id.unwrap(), self.addr_offset.try_into().expect("offset too large"))
         }
+        // Absolute addressing with default event
+        else if self.addr_mode == McAddress::ADDR_MODE_ABS {
+            McAddress::get_abs_ext_addr(self.addr_offset.try_into().expect("addr too large"))
+        }
         // Explicit segment relative addressing
         else if self.addr_mode == McAddress::ADDR_MODE_CAL {
             let index = registry