Add special comments needed for source-code amalgamation.

christoph2 · Feb 18, 2022 · 64ecf49 · 64ecf49
1 parent 3033b6d
commit 64ecf49
Show file tree

Hide file tree

Showing 25 changed files with 58 additions and 8 deletions.
diff --git a/flsemu/common.c b/flsemu/common.c
@@ -27,7 +27,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "flsemu.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 /*
 **  Local Defines.

diff --git a/flsemu/flsemu.h b/flsemu/flsemu.h
@@ -31,7 +31,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 #else
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 #endif
 
 

diff --git a/flsemu/posix/flsemu.c b/flsemu/posix/flsemu.c
@@ -36,9 +36,9 @@
 #include <string.h>
 #include <unistd.h>
 
-
-#include <flsemu.h>
-#include <flsemu.h>
+/*!!! START-INCLUDE-SECTION !!!*/
+#include "flsemu.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #define handle_error(msg) do { perror(msg); exit(EXIT_FAILURE); } while (0)
 #define FLSEMU_ERASED_VALUE (0xff) /**< Value of an erased Flash/EEPROM cell. */

diff --git a/flsemu/win/flsemu.c b/flsemu/win/flsemu.c
@@ -26,8 +26,11 @@
 #include <assert.h>
 #include <string.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "flsemu.h"
 #include "xcp_hw.h"
+/*!!! END-INCLUDE-SECTION !!!*/
+
 
 #define _WIN32_WINNT    0x601
 #include <Windows.h>

diff --git a/inc/xcp.h b/inc/xcp.h
@@ -28,9 +28,11 @@
 
 #include <assert.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp_types.h"
 #include "xcp_macros.h"
 #include "xcp_util.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #define XCP_PROTOCOL_VERSION_MAJOR       (1)
 #define XCP_PROTOCOL_VERSION_RELEASE     (0)

diff --git a/inc/xcp_ow.h b/inc/xcp_ow.h
@@ -27,7 +27,10 @@
 #define XCP_OW_H_INCLUDED
 
 #include <Windows.h>
+
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 /*
 **  Global Types.

diff --git a/inc/xcp_terminal.h b/inc/xcp_terminal.h
@@ -26,7 +26,9 @@
 #if !defined(__TERMINAL_H)
 #define __TERMINAL_H
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 
 #endif /* __TERMINAL_H */
diff --git a/inc/xcp_util.h b/inc/xcp_util.h
@@ -34,8 +34,9 @@ extern "C"
 #endif  /* __cplusplus */
 #endif /* XCP_EXTERN_C_GUARDS */
 
-
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp_types.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 void XcpUtl_MemCopy(void * dst, void const * src, uint32_t len);
 void XcpUtl_MemSet(void * dest, uint8_t fill_char, uint32_t len);

diff --git a/src/hw/arduino/hw.cpp b/src/hw/arduino/hw.cpp
@@ -26,7 +26,9 @@
 #include <Arduino.h>
 #include <stdint.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #if 0
 typedef struct tagHwStateType {

diff --git a/src/hw/linux/hw.c b/src/hw/linux/hw.c
@@ -37,8 +37,10 @@
 #include <time.h>
 #include <unistd.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 /*
 **  Local Types.

diff --git a/src/hw/options.c b/src/hw/options.c
@@ -25,7 +25,9 @@
 
 #include <stdlib.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #if defined(_WIN32)
 

diff --git a/src/hw/terminal.c b/src/hw/terminal.c
@@ -26,10 +26,12 @@
 #include <ctype.h>
 #include <pthread.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
 #include "xcp_terminal.h"
 #include "flsemu.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #if defined(_WIN32)
     #include <windows.h>

diff --git a/src/hw/threads.c b/src/hw/threads.c
@@ -38,9 +38,11 @@
     #include <stdatomic.h>
 #endif /* __STDC_NO_ATOMICS__ */
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
 #include "xcp_threads.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #define XCP_THREAD  (0)
 #define UI_THREAD   (1)

diff --git a/src/hw/win/hw.c b/src/hw/win/hw.c
@@ -34,8 +34,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 /*
 **  Local Types.

diff --git a/src/tl/bt/winbt.c b/src/tl/bt/winbt.c
@@ -23,9 +23,11 @@
  * s. FLOSS-EXCEPTION.txt
  */
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
 #include "xcp_eth.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #include <stdio.h>
 #include <stdint.h>

diff --git a/src/tl/can/kvaser.c b/src/tl/can/kvaser.c
@@ -23,9 +23,11 @@
  * s. FLOSS-EXCEPTION.txt
  */
 
-
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "Xcp.h"
 #include "Xcp_hw.h"
+/*!!! END-INCLUDE-SECTION !!!*/
+
 #include "canlib.h"
 
 #include <stdio.h>

diff --git a/src/tl/can/linux_socket_can.c b/src/tl/can/linux_socket_can.c
@@ -43,8 +43,10 @@
 #include <unistd.h>
 
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 
 #define err_abort(code,text) do { \

diff --git a/src/tl/eth/common.c b/src/tl/eth/common.c
@@ -30,9 +30,11 @@
  */
 
 #include <stdlib.h>
-
+
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
-#include "xcp_eth.h"
+#include "xcp_eth.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 
 void XcpHw_ErrorMsg(char * const function, int errorCode);

diff --git a/src/tl/eth/linuxeth.c b/src/tl/eth/linuxeth.c
@@ -23,9 +23,11 @@
  * s. FLOSS-EXCEPTION.txt
  */
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
 #include "xcp_eth.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 
 socklen_t addrSize = sizeof(struct sockaddr_storage);

diff --git a/src/tl/eth/wineth.c b/src/tl/eth/wineth.c
@@ -27,10 +27,12 @@
 #include <stdlib.h>
 #include <memory.h>
 
-
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
 #include "xcp_eth.h"
+/*!!! END-INCLUDE-SECTION !!!*/
+
 
 #define DEFAULT_FAMILY     PF_UNSPEC // Accept either IPv4 or IPv6
 #define DEFAULT_SOCKTYPE   SOCK_STREAM //

diff --git a/src/tl/sxi/xcp_tl.c b/src/tl/sxi/xcp_tl.c
@@ -27,8 +27,10 @@
 #include "Arduino.h"
 #endif
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_util.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 
 #define XCP_SXI_MAKEWORD(buf, offs)  ((*((buf) + (offs))) | (( *((buf) + (offs) + 1) << 8)))

diff --git a/src/xcp.c b/src/xcp.c
@@ -23,8 +23,11 @@
  * s. FLOSS-EXCEPTION.txt
  */
 
+
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_hw.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 /*
 ** Private Options.

diff --git a/src/xcp_checksum.c b/src/xcp_checksum.c
@@ -31,7 +31,9 @@
  * expressed or implied by its publication or distribution.
  **********************************************************************/
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 
 /*

diff --git a/src/xcp_daq.c b/src/xcp_daq.c
@@ -27,8 +27,10 @@
 #include <stdio.h>
 #endif /* _WIN32 */
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp.h"
 #include "xcp_util.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 
 /*

diff --git a/src/xcp_util.c b/src/xcp_util.c
@@ -24,8 +24,10 @@
  */
 
 
+/*!!! START-INCLUDE-SECTION !!!*/
 #include "xcp_util.h"
 #include "xcp_macros.h"
+/*!!! END-INCLUDE-SECTION !!!*/
 
 #if defined(_MSC_VER)
 #include <stdio.h>