Skip to content

Commit

Permalink
Update Zephyr MSDK Hal based on MSDK PR: analogdevicesinc/msdk#1077
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user authored and ozersa committed Sep 11, 2024
1 parent d28e2f6 commit 2c9bdf1
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
10 changes: 6 additions & 4 deletions MAX/Libraries/PeriphDrivers/Include/MAX78002/csi2.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_ai87.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
12 changes: 6 additions & 6 deletions MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ void _free_line_buffer(void)
}
}

int _init_line_buffer()
int _init_line_buffer(void)
{
_free_line_buffer();

Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions MAX/Libraries/PeriphDrivers/Source/CSI2/csi2_reva.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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 */
Expand Down Expand Up @@ -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);

Expand All @@ -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_
2 changes: 1 addition & 1 deletion MAX/msdk_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a52a937959e981825eca9e0ba00baf5d7596c15b
fca56e9cfb1d25169aa64e37c9296d16cfb5b5dd

0 comments on commit 2c9bdf1

Please sign in to comment.