Merge pull request #350 from aabadie/clean_headers

treewide: cleanup header includes
DotBots · Jan 8, 2025 · 1cfacba · 1cfacba
2 parents 9d472fa + d819041
commit 1cfacba
Show file tree

Hide file tree

Showing 107 changed files with 93 additions and 237 deletions.
diff --git a/bsp/lh2.h b/bsp/lh2.h
@@ -15,9 +15,9 @@
  * @}
  */
 
-#include <nrf.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <nrf.h>
 
 #include "gpio.h"
 

diff --git a/bsp/nrf/board.c b/bsp/nrf/board.c
@@ -8,8 +8,7 @@
  *
  * @copyright Inria, 2022
  */
-#include <stdio.h>
-#include <stdlib.h>
+
 #include <nrf.h>
 
 #include "board.h"

diff --git a/bsp/nrf/lh2_default.c b/bsp/nrf/lh2_default.c
@@ -12,7 +12,6 @@
  */
 #include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
 #include <nrf.h>

diff --git a/bsp/nrf/lh2_nrf5340_net.c b/bsp/nrf/lh2_nrf5340_net.c
@@ -20,12 +20,10 @@ void db_lh2_init(db_lh2_t *lh2, const gpio_t *gpio_d, const gpio_t *gpio_e) {
     (void)gpio_e;
 }
 
-void db_lh2_start(db_lh2_t *lh2) {
-    (void)lh2;
+void db_lh2_start(void) {
 }
 
-void db_lh2_stop(db_lh2_t *lh2) {
-    (void)lh2;
+void db_lh2_stop(void) {
 }
 
 void db_lh2_reset(db_lh2_t *lh2) {

diff --git a/bsp/nrf/nvmc.c b/bsp/nrf/nvmc.c
@@ -14,7 +14,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "nrf.h"
+#include <nrf.h>
+
 #include "nvmc.h"
 
 //=========================== defines =========================================

diff --git a/bsp/nrf/partition.c b/bsp/nrf/partition.c
@@ -9,12 +9,10 @@
  * @copyright Inria, 2023
  */
 
-#include <assert.h>
-#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "nrf.h"
+#include <nrf.h>
 #include "nvmc.h"
 #include "partition.h"
 

diff --git a/bsp/nrf/pwm_nrf5340_net.c b/bsp/nrf/pwm_nrf5340_net.c
@@ -9,11 +9,8 @@
  * @copyright Inria, 2022
  */
 
-#include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
-#include <nrf.h>
 
 #include "gpio.h"
 

diff --git a/bsp/nrf/qdec.c b/bsp/nrf/qdec.c
@@ -8,12 +8,11 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
 #include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <stdio.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "gpio.h"
 #include "qdec.h"
 

diff --git a/bsp/nrf/qspi.c b/bsp/nrf/qspi.c
@@ -9,11 +9,9 @@
  * @copyright Inria, 2024-present
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <nrf.h>
 
 #include "clock.h"

diff --git a/bsp/nrf/radio_nrf5340_app.c b/bsp/nrf/radio_nrf5340_app.c
@@ -8,17 +8,13 @@
  *
  * @copyright Inria, 2022
  */
-#include <nrf.h>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
 #include <string.h>
+#include <nrf.h>
 
 #include "clock.h"
 #include "ipc.h"
 #include "radio.h"
-#include "timer_hf.h"
 #include "tz.h"
 
 //=========================== variables ========================================

diff --git a/bsp/nrf/rng.c b/bsp/nrf/rng.c
@@ -8,8 +8,6 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <stdint.h>
 
 #if defined(NRF5340_XXAA) && defined(NRF_APPLICATION)
 #include "rng_nrf5340_app.c"

diff --git a/bsp/nrf/rng_nrf5340_app.c b/bsp/nrf/rng_nrf5340_app.c
@@ -8,9 +8,8 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
 
 #include "ipc.h"
 #include "rng.h"

diff --git a/bsp/nrf/rpm.c b/bsp/nrf/rpm.c
@@ -9,8 +9,6 @@
  * @copyright Inria, 2022
  */
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <nrf.h>
 #include "board_config.h"
 #include "rpm.h"

diff --git a/bsp/nrf/saadc.c b/bsp/nrf/saadc.c
@@ -8,11 +8,11 @@
  *
  * @copyright Inria, 2023
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "saadc.h"
 
 //=========================== defines ==========================================

diff --git a/bsp/nrf/spim.c b/bsp/nrf/spim.c
@@ -9,7 +9,6 @@
  * @copyright Inria, 2024-present
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>

diff --git a/bsp/nrf/timer.c b/bsp/nrf/timer.c
@@ -8,11 +8,12 @@
  *
  * @copyright Inria, 2022
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "clock.h"
 #include "timer.h"
 

diff --git a/bsp/nrf/timer_hf.c b/bsp/nrf/timer_hf.c
@@ -8,11 +8,11 @@
  *
  * @copyright Inria, 2022
  */
-#include <nrf.h>
-#include <nrf_peripherals.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <nrf.h>
+#include <nrf_peripherals.h>
 #include "clock.h"
 #include "timer_hf.h"
 

diff --git a/bsp/nrf/wdt.c b/bsp/nrf/wdt.c
@@ -8,8 +8,9 @@
  *
  * @copyright Inria, 2024
  */
-#include <nrf.h>
+
 #include <stdint.h>
+#include <nrf.h>
 
 #include "wdt.h"
 

diff --git a/bsp/partition.h b/bsp/partition.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <string.h>
 
 #include <nrf.h>
 

diff --git a/bsp/pwm.h b/bsp/pwm.h
@@ -15,8 +15,10 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+
+#include <nrf.h>
+
 #include "gpio.h"
-#include "nrf.h"
 
 //=========================== defines ==========================================
 

diff --git a/bsp/qdec.h b/bsp/qdec.h
@@ -13,8 +13,8 @@
  * @}
  */
 
-#include <nrf.h>
 #include <stdint.h>
+#include <nrf.h>
 #include "gpio.h"
 
 //=========================== defines ==========================================

diff --git a/bsp/saadc.h b/bsp/saadc.h
@@ -13,8 +13,8 @@
  * @}
  */
 
-#include <nrf.h>
 #include <stdint.h>
+#include <nrf.h>
 
 typedef enum {
     DB_SAADC_RESOLUTION_8BIT  = SAADC_RESOLUTION_VAL_8bit,   ///< 8-bit resolution

diff --git a/bsp/timer_hf.h b/bsp/timer_hf.h
@@ -14,8 +14,6 @@
  */
 
 #include <stdint.h>
-#include <nrf.h>
-#include <nrf_peripherals.h>
 
 //=========================== defines ==========================================
 

diff --git a/crypto/ed25519.c b/crypto/ed25519.c
@@ -14,10 +14,10 @@
 
 #include <nrf.h>
 #include "ed25519.h"
-#include "utils.h"
 
 #if defined(USE_CRYPTOCELL)
 #include "nrf_cc310/include/crys_ec_edw_api.h"
+#include "utils.h"
 #else
 #include "soft_edsign.h"
 #endif

diff --git a/crypto/sha256.c b/crypto/sha256.c
@@ -13,9 +13,9 @@
 
 #include <nrf.h>
 #include "sha256.h"
-#include "utils.h"
 
 #if defined(USE_CRYPTOCELL)
+#include "utils.h"
 #include "nrf_cc310/include/crys_hash.h"
 
 static CRYS_HASHUserContext_t _hash_context;

diff --git a/crypto/utils.h b/crypto/utils.h
@@ -13,10 +13,6 @@
  * @}
  */
 
-#include <stdlib.h>
-#include <stdbool.h>
-#include <stdint.h>
-
 #include <nrf.h>
 
 //=========================== defines ==========================================

diff --git a/drv/as5048b.h b/drv/as5048b.h
@@ -14,7 +14,6 @@
  */
 
 #include <stdint.h>
-#include <stdlib.h>
 #include <nrf.h>
 
 /**

diff --git a/drv/as5048b/as5048b.c b/drv/as5048b/as5048b.c
@@ -8,13 +8,11 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <math.h>
 
 // Include BSP packages
 #include "board_config.h"
-#include "gpio.h"
 #include "i2c.h"
 #include "as5048b.h"
 

diff --git a/drv/drv.emProject b/drv/drv.emProject
@@ -102,24 +102,6 @@
     <file file_name="motors/motors.c" />
     <file file_name="motors.h" />
   </project>
-  <project Name="00drv_tdma_client">
-    <configuration
-      Name="Common"
-      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00bsp_rng(bsp);00drv_dotbot_protocol(drv)"
-      project_directory="tdma_client"
-      project_type="Library" />
-    <file file_name="tdma_client.c" />
-    <file file_name="../tdma_client.h" />
-  </project>
-  <project Name="00drv_tdma_server">
-    <configuration
-      Name="Common"
-      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00drv_dotbot_protocol(drv)"
-      project_directory="tdma_server"
-      project_type="Library" />
-    <file file_name="tdma_server.c" />
-    <file file_name="../tdma_server.h" />
-  </project>
   <project Name="00drv_move">
     <configuration
       Name="Common"
@@ -174,6 +156,24 @@
     <file file_name="rgbled_pwm.c" />
     <file file_name="../rgbled_pwm.h" />
   </project>
+  <project Name="00drv_tdma_client">
+    <configuration
+      Name="Common"
+      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00bsp_rng(bsp);00drv_dotbot_protocol(drv)"
+      project_directory="tdma_client"
+      project_type="Library" />
+    <file file_name="tdma_client.c" />
+    <file file_name="../tdma_client.h" />
+  </project>
+  <project Name="00drv_tdma_server">
+    <configuration
+      Name="Common"
+      project_dependencies="00bsp_radio(bsp);00bsp_timer_hf(bsp);00drv_dotbot_protocol(drv)"
+      project_directory="tdma_server"
+      project_type="Library" />
+    <file file_name="tdma_server.c" />
+    <file file_name="../tdma_server.h" />
+  </project>
   <project Name="00drv_upgate">
     <configuration
       Name="Common"

diff --git a/drv/hdlc/hdlc.c b/drv/hdlc/hdlc.c
@@ -11,7 +11,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 #include "hdlc.h"
 
 //=========================== definitions ======================================

diff --git a/drv/ism330.h b/drv/ism330.h
@@ -13,8 +13,6 @@
  * @}
  */
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <nrf.h>
 #include "gpio.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
      */
     #include <stdint.h>
-    #include <string.h>
     #include <nrf.h>
@@ Expand Down @@