Removed stdint.h inclusion. Using the inclusion from avtp/Defines.h

nayakned · SebastianSchildt · commit 753586b01eae · 2025-03-14T18:04:02.000+01:00
Signed-off-by: Naresh Nayak &lt;Naresh.Nayak@de.bosch.com&gt;
diff --git a/include/avtp/Defines.h b/include/avtp/Defines.h
@@ -9,7 +9,7 @@
  *    * Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of COVESA nor the names of its contributors may be 
+ *    * Neither the name of COVESA nor the names of its contributors may be
  *      used to endorse or promote products derived from this software without
  *      specific prior written permission.
  *
@@ -29,14 +29,15 @@
 
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef LINUX_KERNEL1722
 #include <linux/types.h>
 #else
 #include <stdint.h>
 #endif
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /**
  * Max bits that the parser supports for a single data field within a 1722
diff --git a/include/avtp/acf/Can.h b/include/avtp/acf/Can.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-
 #include "avtp/Defines.h"
 #include "avtp/acf/AcfCommon.h"
 
diff --git a/include/avtp/acf/CanBrief.h b/include/avtp/acf/CanBrief.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include "avtp/Defines.h"
 #include "avtp/acf/AcfCommon.h"
 #include "avtp/acf/Can.h"
diff --git a/include/avtp/acf/Gpc.h b/include/avtp/acf/Gpc.h
@@ -9,7 +9,7 @@
  *    * Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of COVESA nor the names of its contributors may be 
+ *    * Neither the name of COVESA nor the names of its contributors may be
  *      used to endorse or promote products derived from this software without
  *      specific prior written permission.
  *
@@ -34,8 +34,6 @@
  */
 #pragma once
 
-#include <stdint.h>
-
 #include "avtp/Defines.h"
 #include "avtp/acf/AcfCommon.h"
 
@@ -58,7 +56,7 @@ typedef enum  {
     AVTP_GPC_FIELD_ACF_MSG_LENGTH,
 
     /* ACF GPC header fields */
-    AVTP_GPC_FIELD_GPC_MSG_ID, 
+    AVTP_GPC_FIELD_GPC_MSG_ID,
 
     /* Count number of fields for bound checks */
     AVTP_GPC_FIELD_MAX
diff --git a/include/avtp/acf/Lin.h b/include/avtp/acf/Lin.h
@@ -34,8 +34,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include "avtp/Defines.h"
 #include "avtp/acf/AcfCommon.h"
 
diff --git a/include/avtp/acf/Most.h b/include/avtp/acf/Most.h
@@ -34,8 +34,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include "avtp/Defines.h"
 #include "avtp/acf/AcfCommon.h"
 
diff --git a/include/avtp/acf/Ntscf.h b/include/avtp/acf/Ntscf.h
@@ -35,12 +35,6 @@
 
 #pragma once
 
-#ifdef LINUX_KERNEL1722
-#include <linux/types.h>
-#else
-#include <stdint.h>
-#endif
-
 #include "avtp/Defines.h"
 
 #ifdef __cplusplus
diff --git a/include/avtp/acf/Sensor.h b/include/avtp/acf/Sensor.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include "avtp/Defines.h"
 #include "avtp/acf/AcfCommon.h"
 
diff --git a/include/avtp/acf/SensorBrief.h b/include/avtp/acf/SensorBrief.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <stdint.h>
-
 #include "avtp/Defines.h"
 #include "avtp/acf/AcfCommon.h"
 
diff --git a/src/avtp/acf/Gpc.c b/src/avtp/acf/Gpc.c
@@ -9,7 +9,7 @@
  *    * Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of COVESA nor the names of its contributors may be 
+ *    * Neither the name of COVESA nor the names of its contributors may be
  *      used to endorse or promote products derived from this software without
  *      specific prior written permission.
  *
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "avtp/acf/Gpc.h"
-#include "avtp/Utils.h" 
+#include "avtp/Utils.h"
 #include "avtp/Defines.h"
 
 #define GET_FIELD(field) \
@@ -46,21 +46,21 @@ static const Avtp_FieldDescriptor_t Avtp_GpcFieldDesc[AVTP_GPC_FIELD_MAX] =
 {
     /* ACF common header fields */
     [AVTP_GPC_FIELD_ACF_MSG_TYPE]       = { .quadlet = 0, .offset =  0, .bits = 7 },
-    [AVTP_GPC_FIELD_ACF_MSG_LENGTH]     = { .quadlet = 0, .offset =  7, .bits = 9 },  
+    [AVTP_GPC_FIELD_ACF_MSG_LENGTH]     = { .quadlet = 0, .offset =  7, .bits = 9 },
     /* ACF GPC header fields */
     [AVTP_GPC_FIELD_GPC_MSG_ID]         = { .quadlet = 0, .offset =  16, .bits = 48 },
 };
 
 void Avtp_Gpc_Init(Avtp_Gpc_t* pdu)
 {
     if(pdu != NULL) {
-        memset(pdu, 0, sizeof(Avtp_Gpc_t));  
+        memset(pdu, 0, sizeof(Avtp_Gpc_t));
         Avtp_Gpc_SetField(pdu, AVTP_GPC_FIELD_ACF_MSG_TYPE, AVTP_ACF_TYPE_GPC);
     }
 }
 
 uint64_t Avtp_Gpc_GetField(Avtp_Gpc_t* pdu, Avtp_GpcFields_t field)
-{    
+{
     return GET_FIELD(field);
 }
 
@@ -80,22 +80,22 @@ uint64_t Avtp_Gpc_GetGpcMsgId(Avtp_Gpc_t* pdu)
 }
 
 void Avtp_Gpc_SetField(Avtp_Gpc_t* pdu, Avtp_GpcFields_t field, uint64_t value)
-{    
+{
     SET_FIELD(field, value);
 }
 
 void Avtp_Gpc_SetAcfMsgType(Avtp_Gpc_t* pdu, uint8_t value)
-{    
+{
     SET_FIELD(AVTP_GPC_FIELD_ACF_MSG_TYPE, value);
 }
 
 void Avtp_Gpc_SetAcfMsgLength(Avtp_Gpc_t* pdu, uint16_t value)
-{    
+{
     SET_FIELD(AVTP_GPC_FIELD_ACF_MSG_LENGTH, value);
 }
 
 void Avtp_Gpc_SetGpcMsgId(Avtp_Gpc_t* pdu, uint64_t value)
-{    
+{
     SET_FIELD(AVTP_GPC_FIELD_GPC_MSG_ID, value);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* * Redistributions in binary form must reproduce the above copyright`
`10`	`10`	`* notice, this list of conditions and the following disclaimer in the`
`11`	`11`	`* documentation and/or other materials provided with the distribution.`
`12`		`- * * Neither the name of COVESA nor the names of its contributors may be`
	`12`	`+ * * Neither the name of COVESA nor the names of its contributors may be`
`13`	`13`	`* used to endorse or promote products derived from this software without`
`14`	`14`	`* specific prior written permission.`
`15`	`15`	`*`
`@@ -31,7 +31,7 @@`
`31`	`31`	`#include <string.h>`
`32`	`32`
`33`	`33`	`#include "avtp/acf/Gpc.h"`
`34`		`-#include "avtp/Utils.h"`
	`34`	`+#include "avtp/Utils.h"`
`35`	`35`	`#include "avtp/Defines.h"`
`36`	`36`
`37`	`37`	`#define GET_FIELD(field) \`
`@@ -46,21 +46,21 @@ static const Avtp_FieldDescriptor_t Avtp_GpcFieldDesc[AVTP_GPC_FIELD_MAX] =`
`46`	`46`	`{`
`47`	`47`	`/* ACF common header fields */`
`48`	`48`	`[AVTP_GPC_FIELD_ACF_MSG_TYPE] = { .quadlet = 0, .offset = 0, .bits = 7 },`
`49`		`- [AVTP_GPC_FIELD_ACF_MSG_LENGTH] = { .quadlet = 0, .offset = 7, .bits = 9 },`
	`49`	`+ [AVTP_GPC_FIELD_ACF_MSG_LENGTH] = { .quadlet = 0, .offset = 7, .bits = 9 },`
`50`	`50`	`/* ACF GPC header fields */`
`51`	`51`	`[AVTP_GPC_FIELD_GPC_MSG_ID] = { .quadlet = 0, .offset = 16, .bits = 48 },`
`52`	`52`	`};`
`53`	`53`
`54`	`54`	`void Avtp_Gpc_Init(Avtp_Gpc_t* pdu)`
`55`	`55`	`{`
`56`	`56`	`if(pdu != NULL) {`
`57`		`- memset(pdu, 0, sizeof(Avtp_Gpc_t));`
	`57`	`+ memset(pdu, 0, sizeof(Avtp_Gpc_t));`
`58`	`58`	`Avtp_Gpc_SetField(pdu, AVTP_GPC_FIELD_ACF_MSG_TYPE, AVTP_ACF_TYPE_GPC);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`uint64_t Avtp_Gpc_GetField(Avtp_Gpc_t* pdu, Avtp_GpcFields_t field)`
`63`		`-{`
	`63`	`+{`
`64`	`64`	`return GET_FIELD(field);`
`65`	`65`	`}`
`66`	`66`
`@@ -80,22 +80,22 @@ uint64_t Avtp_Gpc_GetGpcMsgId(Avtp_Gpc_t* pdu)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`void Avtp_Gpc_SetField(Avtp_Gpc_t* pdu, Avtp_GpcFields_t field, uint64_t value)`
`83`		`-{`
	`83`	`+{`
`84`	`84`	`SET_FIELD(field, value);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`void Avtp_Gpc_SetAcfMsgType(Avtp_Gpc_t* pdu, uint8_t value)`
`88`		`-{`
	`88`	`+{`
`89`	`89`	`SET_FIELD(AVTP_GPC_FIELD_ACF_MSG_TYPE, value);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`void Avtp_Gpc_SetAcfMsgLength(Avtp_Gpc_t* pdu, uint16_t value)`
`93`		`-{`
	`93`	`+{`
`94`	`94`	`SET_FIELD(AVTP_GPC_FIELD_ACF_MSG_LENGTH, value);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`void Avtp_Gpc_SetGpcMsgId(Avtp_Gpc_t* pdu, uint64_t value)`
`98`		`-{`
	`98`	`+{`
`99`	`99`	`SET_FIELD(AVTP_GPC_FIELD_GPC_MSG_ID, value);`
`100`	`100`	`}`
`101`	`101`