Sync with rust xcp-lite

vectorgrp · Aug 30, 2024 · 155ad41 · 155ad41
1 parent a6dbc77
commit 155ad41
Show file tree

Hide file tree

Showing 27 changed files with 1,364 additions and 1,036 deletions.
diff --git a/CPP_Demo/xcp_cfg.h b/CPP_Demo/xcp_cfg.h
@@ -25,18 +25,32 @@
 // #define XCP_PROTOCOL_LAYER_VERSION 0x0104  // PACKED_MODE, CC_START_STOP_SYNCH prepare
 
 
-
-
-
 /*----------------------------------------------------------------------------*/
-/* Driver features */
+/* Adress, address extension coding */
 
-#define XCP_TRANSPORT_LAYER_TYPE XCP_TRANSPORT_LAYER_ETH // Enable ethernet specific commands
+// Use addr_ext XCP_ADDR_EXT_ABS to indicate absulute addr format (ApplXcpGetBaseAddr()+(uint32_t)addr) 
+#define XCP_ENABLE_ABS_ADDRESSING
+#define XCP_ADDR_EXT_ABS 0x01 // Absolute address format 
 
+// Use addr_ext XCP_ADDR_EXT_DYN to indicate relative addr format (event<<16)|offset 
 #if OPTION_ENABLE_XCP_CLASS
-  #define XCP_ENABLE_DYN_ADDRESSING // Enable addr_ext=1 indicating relative addr format (event<<16)|offset 
+  #define XCP_ENABLE_DYN_ADDRESSING
+  #define XCP_ADDR_EXT_DYN 0x02 // Relative address format
 #endif
 
+// Use addr_ext XCP_ADDR_EXT_APP to indicate application specific addr format and use ApplXcpReadMemory and ApplXcpWriteMemory
+// #define XCP_ENABLE_APP_ADDRESSING
+// #define XCP_ADDR_EXT_APP 0x00 // Address format handled by application
+
+// Internally used address extensions
+// Use addr_ext XCP_ADDR_EXT_A2L to indicate A2L upload memory space
+#define XCP_ADDR_EXT_A2L 0xFD
+// Use addr_ext XCP_ADDR_EXT_PTR to indicate gXcp.MtaPtr is valid 
+#define XCP_ADDR_EXT_PTR 0xFE
+
+// Undefined address extension
+#define XCP_ADDR_EXT_UNDEFINED 0xFF // Undefined address extension
+
 /*----------------------------------------------------------------------------*/
 /* Protocol features */
 

diff --git a/CPP_Demo/xcptl_cfg.h b/CPP_Demo/xcptl_cfg.h
@@ -44,7 +44,9 @@
 
 // CTO size
 // Maximum size of a XCP command
-#define XCPTL_MAX_CTO_SIZE 252 // must be mod 4
+#define XCPTL_MAX_CTO_SIZE (248) 
+// CRO_SHORT_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-8 should be %8==0
+// CRO_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-2
 
 // DAQ transmit queue 
 // Transmit queue size in segments, should at least be able to hold all data produced until the next call to HandleTransmitQueue

diff --git a/C_Demo/main.c b/C_Demo/main.c
@@ -52,7 +52,7 @@ static BOOL createA2L() {
 static BOOL checkKeyboard() {
     if (_kbhit()) {
         switch (_getch()) {
-        case 27:  XcpSendEvent(EVC_SESSION_TERMINATED, NULL, 0);  return FALSE; // Stop on ESC
+        case 27:  XcpSendEvent(PID_EV,EVC_SESSION_TERMINATED, NULL, 0);  return FALSE; // Stop on ESC
 #if OPTION_ENABLE_DBG_PRINTS
         case '+': if (gDebugLevel < 5) gDebugLevel++; printf("\nDebuglevel = %u\n", gDebugLevel); break;
         case '-': if (gDebugLevel > 0) gDebugLevel--; printf("\nDebuglevel = %u\n", gDebugLevel); break;
@@ -91,8 +91,7 @@ int main(int argc, char* argv[]) {
     }
 
     // Terminate task
-    sleepMs(1000);
-    cancel_thread(t2);
+    // @@@@
 
     // Stop the XCP server
     XcpEthServerShutdown();

diff --git a/C_Demo/main.h b/C_Demo/main.h
@@ -1,5 +1,6 @@
 #pragma once
 
+
 /* main.h */
 /*
 | Code released into public domain, no attribution required
@@ -40,12 +41,6 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <math.h>
-
-#ifdef _WIN
-#define M_PI 3.14159265358979323846
-#endif
-#define M_2PI (M_PI*2)
-
 #include <assert.h>
 
 #ifndef _WIN // Linux
@@ -54,35 +49,44 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-
 #include <sys/time.h>
-#include <time.h>
+//#include <time.h>
+
 #include <sys/stat.h>
 #include <pthread.h>
-
-#include <ifaddrs.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
+//#include <ifaddrs.h>
+//#include <fcntl.h>
+//#include <netinet/in.h>
+//#include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 
-#define MAX_PATH 256
-#define BOOL int
-#define FALSE 0
-#define TRUE 1
+//#define MAX_PATH 256
 
 #else // Windows
 
 #include <windows.h>
 #include <time.h>
 #include <conio.h>
 
+#endif
+
+
+#ifdef __cplusplus
+#include <typeinfo>
+#include <thread>
+#include <string>
+#include <vector>
+#endif
+
 #define BOOL int
 #define FALSE 0
 #define TRUE 1
 
+#ifdef _WIN
+#define M_PI 3.14159265358979323846
 #endif
+#define M_2PI (M_PI*2)
 
 #include "main_cfg.h"
 
diff --git a/C_Demo/xcp_cfg.h b/C_Demo/xcp_cfg.h
@@ -21,9 +21,28 @@
 #define XCP_PROTOCOL_LAYER_VERSION 0x0104  // PACKED_MODE, CC_START_STOP_SYNCH prepare
 
 /*----------------------------------------------------------------------------*/
-/* Driver features */
+/* Adress, address extension coding */
 
-// #define XCP_ENABLE_DYN_ADDRESSING // Enable addr_ext=1 indicating relative addr format (event<<16)|offset 
+// Use addr_ext XCP_ADDR_EXT_ABS to indicate absulute addr format (ApplXcpGetBaseAddr()+(uint32_t)addr) 
+#define XCP_ENABLE_ABS_ADDRESSING
+#define XCP_ADDR_EXT_ABS 0x01 // Absolute address format 
+
+// Use addr_ext XCP_ADDR_EXT_DYN to indicate relative addr format (event<<16)|offset 
+// #define XCP_ENABLE_DYN_ADDRESSING
+// #define XCP_ADDR_EXT_DYN 0x02 // Relative address format
+
+// Use addr_ext XCP_ADDR_EXT_APP to indicate application specific addr format and use ApplXcpReadMemory and ApplXcpWriteMemory
+// #define XCP_ENABLE_APP_ADDRESSING
+// #define XCP_ADDR_EXT_APP 0x00 // Address format handled by application
+
+// Internally used address extensions
+// Use addr_ext XCP_ADDR_EXT_A2L to indicate A2L upload memory space
+#define XCP_ADDR_EXT_A2L 0xFD
+// Use addr_ext XCP_ADDR_EXT_PTR to indicate gXcp.MtaPtr is valid 
+#define XCP_ADDR_EXT_PTR 0xFE
+
+// Undefined address extension
+#define XCP_ADDR_EXT_UNDEFINED 0xFF // Undefined address extension
 
 
 /*----------------------------------------------------------------------------*/

diff --git a/C_Demo/xcptl_cfg.h b/C_Demo/xcptl_cfg.h
@@ -44,7 +44,9 @@
 
 // CTO size
 // Maximum size of a XCP command
-#define XCPTL_MAX_CTO_SIZE 252 // must be mod 4
+#define XCPTL_MAX_CTO_SIZE (248) 
+// CRO_SHORT_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-8 should be %8==0
+// CRO_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-2
 
 // DAQ transmit queue 
 // Transmit queue size in segments, should at least be able to hold all data produced until the next call to HandleTransmitQueue

diff --git a/XCPlib/xcpAppl.c b/XCPlib/xcpAppl.c
@@ -133,7 +133,7 @@ uint8_t baseAddrValid = 0;
 
 static int dump_phdr(struct dl_phdr_info* pinfo, size_t size, void* data)
 {
-    // DBG_PRINTF1("name=%s (%d segments)\n", pinfo->dlpi_name, pinfo->dlpi_phnum);
+    // DBG_PRINTF3("name=%s (%d segments)\n", pinfo->dlpi_name, pinfo->dlpi_phnum);
 
     // Application modules has no name
     if (0 == strlen(pinfo->dlpi_name)) {
@@ -151,7 +151,7 @@ uint8_t* ApplXcpGetBaseAddr() {
         dl_iterate_phdr(dump_phdr, NULL);
         assert(baseAddr != NULL);
         baseAddrValid = 1;
-        DBG_PRINTF1("BaseAddr = %lX\n", (uint64_t)baseAddr);
+        DBG_PRINTF3("BaseAddr = %lX\n", (uint64_t)baseAddr);
     }
 
     return baseAddr;
@@ -251,7 +251,7 @@ uint8_t* loadFile(const char* filename, uint32_t* length) {
   uint8_t* fileBuf = NULL; // file content
   uint32_t fileLen = 0; // file length
 
-  DBG_PRINTF1("Load %s\n", filename);
+  DBG_PRINTF3("Load %s\n", filename);
 
 #if defined(_LINUX) // Linux
 

diff --git a/XCPlib/xcptl_cfg.h b/XCPlib/xcptl_cfg.h
@@ -52,8 +52,9 @@
 
 // CTO size
 // Maximum size of a XCP command
-#define XCPTL_MAX_CTO_SIZE 252 // must be mod 4
-
+#define XCPTL_MAX_CTO_SIZE (248) 
+// CRO_SHORT_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-8 should be %8==0
+// CRO_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-2
 
 
 

diff --git a/XCPlite/main.c b/XCPlite/main.c
@@ -104,7 +104,7 @@ int main() {
         if (!XcpEthServerStatus()) { printf("\nXCP Server failed\n");  break; } // Check if the XCP server is running
 
         if (!checkKeyboard()) {
-          XcpSendEvent(EVC_SESSION_TERMINATED, NULL, 0);
+          XcpSendEvent(PID_EV,EVC_SESSION_TERMINATED, NULL, 0);
           break;
         }
     }

diff --git a/XCPlite/main.h b/XCPlite/main.h
@@ -1,5 +1,6 @@
 #pragma once
 
+
 /* main.h */
 /*
 | Code released into public domain, no attribution required
@@ -40,12 +41,6 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <math.h>
-
-#ifdef _WIN
-#define M_PI 3.14159265358979323846
-#endif
-#define M_2PI (M_PI*2)
-
 #include <assert.h>
 
 #ifndef _WIN // Linux
@@ -54,35 +49,44 @@
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
-
 #include <sys/time.h>
-#include <time.h>
+//#include <time.h>
+
 #include <sys/stat.h>
 #include <pthread.h>
-
-#include <ifaddrs.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
+//#include <ifaddrs.h>
+//#include <fcntl.h>
+//#include <netinet/in.h>
+//#include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 
-#define MAX_PATH 256
-#define BOOL int
-#define FALSE 0
-#define TRUE 1
+//#define MAX_PATH 256
 
 #else // Windows
 
 #include <windows.h>
 #include <time.h>
 #include <conio.h>
 
+#endif
+
+
+#ifdef __cplusplus
+#include <typeinfo>
+#include <thread>
+#include <string>
+#include <vector>
+#endif
+
 #define BOOL int
 #define FALSE 0
 #define TRUE 1
 
+#ifdef _WIN
+#define M_PI 3.14159265358979323846
 #endif
+#define M_2PI (M_PI*2)
 
 #include "main_cfg.h"
 
diff --git a/XCPlite/xcp_cfg.h b/XCPlite/xcp_cfg.h
@@ -20,11 +20,30 @@
 //#define XCP_PROTOCOL_LAYER_VERSION 0x0103  // GET_DAQ_CLOCK_MULTICAST, GET_TIME_CORRELATION_PROPERTIES
 #define XCP_PROTOCOL_LAYER_VERSION 0x0104  // PACKED_MODE, CC_START_STOP_SYNCH prepare
 
+
 /*----------------------------------------------------------------------------*/
-/* Driver features */
+/* Adress, address extension coding */
+
+// Use addr_ext XCP_ADDR_EXT_ABS to indicate absulute addr format (ApplXcpGetBaseAddr()+(uint32_t)addr) 
+#define XCP_ENABLE_ABS_ADDRESSING
+#define XCP_ADDR_EXT_ABS 0x01 // Absolute address format 
+
+// Use addr_ext XCP_ADDR_EXT_DYN to indicate relative addr format (event<<16)|offset 
+// #define XCP_ENABLE_DYN_ADDRESSING
+// #define XCP_ADDR_EXT_DYN 0x02 // Relative address format
+
+// Use addr_ext XCP_ADDR_EXT_APP to indicate application specific addr format and use ApplXcpReadMemory and ApplXcpWriteMemory
+// #define XCP_ENABLE_APP_ADDRESSING
+// #define XCP_ADDR_EXT_APP 0x00 // Address format handled by application
 
-// #define XCP_ENABLE_DYN_ADDRESSING // Enable addr_ext=1 indicating relative addr format (event<<16)|offset 
+// Internally used address extensions
+// Use addr_ext XCP_ADDR_EXT_A2L to indicate A2L upload memory space
+#define XCP_ADDR_EXT_A2L 0xFD
+// Use addr_ext XCP_ADDR_EXT_PTR to indicate gXcp.MtaPtr is valid 
+#define XCP_ADDR_EXT_PTR 0xFE
 
+// Undefined address extension
+#define XCP_ADDR_EXT_UNDEFINED 0xFF // Undefined address extension
 
 /*----------------------------------------------------------------------------*/
 /* Protocol features */

diff --git a/XCPlite/xcptl_cfg.h b/XCPlite/xcptl_cfg.h
@@ -52,9 +52,9 @@
 
 // CTO size
 // Maximum size of a XCP command
-#define XCPTL_MAX_CTO_SIZE 252 // must be mod 4
-
-  
+#define XCPTL_MAX_CTO_SIZE (248) 
+// CRO_SHORT_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-8 should be %8==0
+// CRO_DOWNLOAD_MAX_SIZE = XCPTL_MAX_CTO_SIZE-2