From 2c9bdf140680f91d62169bd9b5b045e37a3fc753 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Tue, 9 Jul 2024 21:59:15 +0000
Subject: [PATCH] Update Zephyr MSDK Hal based on MSDK PR:
 https://github.com/analogdevicesinc/msdk/pull/1077

---
 MAX/Libraries/PeriphDrivers/Include/MAX78002/csi2.h | 10 ++++++----
 MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_ai87.c |  6 +++---
 MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.c | 12 ++++++------
 MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.h |  8 ++++----
 MAX/msdk_sha                                        |  2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/MAX/Libraries/PeriphDrivers/Include/MAX78002/csi2.h b/MAX/Libraries/PeriphDrivers/Include/MAX78002/csi2.h
index 5a748095..190e18dd 100644
--- a/MAX/Libraries/PeriphDrivers/Include/MAX78002/csi2.h
+++ b/MAX/Libraries/PeriphDrivers/Include/MAX78002/csi2.h
@@ -330,17 +330,19 @@ int MXC_CSI2_Stop(void);
 
 /**
  * @brief      Capture an image frame using DMA. Same as MXC_CSI2_CaptureFrameDMA.
- * @param      num_data_lanes    Number of data lanes used.
+ * @note       API changed on 7-8-2024 to remove 'num_data_lanes' as an argument.  Set
+ *             'num_lanes' in @ref mxc_csi2_ctrl_cfg_t instead, which is passed to
+ *             @ref MXC_CSI2_Init
  * @return     #E_NO_ERROR if everything is successful.
  */
-int MXC_CSI2_CaptureFrame(int num_data_lanes);
+int MXC_CSI2_CaptureFrame(void);
 
 /**
  * @brief      Capture an image frame using DMA.
  * @param      num_data_lanes    Number of data lanes used.
  * @return     #E_NO_ERROR if everything is successful.
  */
-int MXC_CSI2_CaptureFrameDMA();
+int MXC_CSI2_CaptureFrameDMA(void);
 
 /**
  * @brief      Select Lane Control Source for D0-D4 and C0.
@@ -588,7 +590,7 @@ int MXC_CSI2_PPI_Stop(void);
 
 bool MXC_CSI2_DMA_Frame_Complete(void);
 
-mxc_csi2_capture_stats_t MXC_CSI2_GetCaptureStats();
+mxc_csi2_capture_stats_t MXC_CSI2_GetCaptureStats(void);
 
 /**
  * @brief      Clears the interrupt flags for PPI.
diff --git a/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_ai87.c b/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_ai87.c
index 449ff44f..0acb2722 100644
--- a/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_ai87.c
+++ b/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_ai87.c
@@ -87,12 +87,12 @@ int MXC_CSI2_Stop(void)
     return MXC_CSI2_RevA_Stop((mxc_csi2_reva_regs_t *)MXC_CSI2);
 }
 
-int MXC_CSI2_CaptureFrame(int num_data_lanes)
+int MXC_CSI2_CaptureFrame(void)
 {
-    return MXC_CSI2_RevA_CaptureFrameDMA(num_data_lanes);
+    return MXC_CSI2_RevA_CaptureFrameDMA();
 }
 
-int MXC_CSI2_CaptureFrameDMA()
+int MXC_CSI2_CaptureFrameDMA(void)
 {
     return MXC_CSI2_RevA_CaptureFrameDMA();
 }
diff --git a/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.c b/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.c
index c2e4e534..8b1dae84 100644
--- a/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.c
+++ b/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.c
@@ -106,7 +106,7 @@ void _free_line_buffer(void)
     }
 }
 
-int _init_line_buffer()
+int _init_line_buffer(void)
 {
     _free_line_buffer();
 
@@ -120,7 +120,7 @@ int _init_line_buffer()
     return E_NO_ERROR;
 }
 
-void _swap_line_buffer()
+void _swap_line_buffer(void)
 {
     uint8_t *temp = lb.active;
     lb.active = lb.inactive;
@@ -277,7 +277,7 @@ int MXC_CSI2_RevA_Stop(mxc_csi2_reva_regs_t *csi2)
     return E_NO_ERROR;
 }
 
-int MXC_CSI2_RevA_CaptureFrameDMA()
+int MXC_CSI2_RevA_CaptureFrameDMA(void)
 {
     int i;
     int error;
@@ -417,7 +417,7 @@ void MXC_CSI2_RevA_GetImageDetails(uint32_t *imgLen, uint32_t *w, uint32_t *h)
     *h = csi2_state.req->lines_per_frame;
 }
 
-void MXC_CSI2_RevA_Handler()
+void MXC_CSI2_RevA_Handler(void)
 {
     uint32_t ctrl_flags, vfifo_flags, ppi_flags;
 
@@ -1054,12 +1054,12 @@ bool MXC_CSI2_RevA_DMA_Frame_Complete(void)
     return g_frame_complete;
 }
 
-mxc_csi2_reva_capture_stats_t MXC_CSI2_RevA_DMA_GetCaptureStats()
+mxc_csi2_reva_capture_stats_t MXC_CSI2_RevA_DMA_GetCaptureStats(void)
 {
     return csi2_state.capture_stats;
 }
 
-void MXC_CSI2_RevA_DMA_Handler()
+void MXC_CSI2_RevA_DMA_Handler(void)
 {
     // Clear CTZ Status Flag
     if (MXC_DMA->ch[csi2_state.dma_channel].status & MXC_F_DMA_STATUS_CTZ_IF) {
diff --git a/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.h b/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.h
index e28898fb..3a52369c 100644
--- a/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.h
+++ b/MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.h
@@ -66,7 +66,7 @@ int MXC_CSI2_RevA_Start(mxc_csi2_reva_regs_t *csi2, int num_data_lanes);
 
 int MXC_CSI2_RevA_Stop(mxc_csi2_reva_regs_t *csi2);
 
-int MXC_CSI2_RevA_CaptureFrameDMA();
+int MXC_CSI2_RevA_CaptureFrameDMA(void);
 
 int MXC_CSI2_RevA_SetLaneCtrlSource(mxc_csi2_reva_regs_t *csi2, mxc_csi2_lane_src_t *src);
 
@@ -76,7 +76,7 @@ void MXC_CSI2_RevA_GetImageDetails(uint32_t *imgLen, uint32_t *w, uint32_t *h);
 
 int MXC_CSI2_RevA_Callback(mxc_csi2_req_t *req, int retVal);
 
-void MXC_CSI2_RevA_Handler();
+void MXC_CSI2_RevA_Handler(void);
 
 /********************************/
 /* CSI2 RX Controller Functions */
@@ -159,7 +159,7 @@ int MXC_CSI2_RevA_PPI_Stop(void);
 /* CSI2 DMA - Used for all features */
 /************************************/
 
-mxc_csi2_reva_capture_stats_t MXC_CSI2_RevA_DMA_GetCaptureStats();
+mxc_csi2_reva_capture_stats_t MXC_CSI2_RevA_DMA_GetCaptureStats(void);
 
 bool MXC_CSI2_RevA_DMA_Frame_Complete(void);
 
@@ -171,6 +171,6 @@ int MXC_CSI2_RevA_DMA_GetCurrentLineCnt(void);
 
 int MXC_CSI2_RevA_DMA_GetCurrentFrameEndCnt(void);
 
-void MXC_CSI2_RevA_DMA_Callback();
+void MXC_CSI2_RevA_DMA_Callback(mxc_dma_reva_regs_t *dma, int a, int b);
 
 #endif // LIBRARIES_PERIPHDRIVERS_SOURCE_CSI2_CSI2_REVA_H_
diff --git a/MAX/msdk_sha b/MAX/msdk_sha
index 954120d0..8f4256d9 100644
--- a/MAX/msdk_sha
+++ b/MAX/msdk_sha
@@ -1 +1 @@
-a52a937959e981825eca9e0ba00baf5d7596c15b
+fca56e9cfb1d25169aa64e37c9296d16cfb5b5dd