From d2aad2c201019065a56046effbe03666e3743512 Mon Sep 17 00:00:00 2001 From: Achala Ram Date: Thu, 31 Aug 2023 13:39:09 +0530 Subject: [PATCH] am64x/am243x: SDFM: Remove sdfm handle null initialization - Remove sdfm handle null initialization in driver file Fixes: PINDSW-6607 Signed-off-by: Achala Ram --- examples/current_sense/icss_sdfm/app_sdfm.c | 6 +++--- examples/current_sense/icss_sdfm/sdfm.c | 2 +- source/current_sense/sdfm/driver/sdfm_drv.c | 6 ++---- source/current_sense/sdfm/include/sdfm_api.h | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/examples/current_sense/icss_sdfm/app_sdfm.c b/examples/current_sense/icss_sdfm/app_sdfm.c index a250d6c..4be6774 100644 --- a/examples/current_sense/icss_sdfm/app_sdfm.c +++ b/examples/current_sense/icss_sdfm/app_sdfm.c @@ -384,11 +384,11 @@ void pruSdfmIrqHandler(void *args) PRUICSS_clearEvent(gPruIcssHandle, PRU_TRIGGER_HOST_SDFM_EVT); /* SDFM Output sample for Channel 0 */ - sdfm_ch0_samples[sdfm_ch0_idx++] = SDFM_getFilterData(0); + sdfm_ch0_samples[sdfm_ch0_idx++] = SDFM_getFilterData(gHPruSdfm, 0); /* SDFM Output sample for Channel 1 */ - sdfm_ch1_samples[sdfm_ch1_idx++] = SDFM_getFilterData(1); + sdfm_ch1_samples[sdfm_ch1_idx++] = SDFM_getFilterData(gHPruSdfm, 1); /* SDFM Output sample for Channel 2 */ - sdfm_ch2_samples[sdfm_ch2_idx++] = SDFM_getFilterData(2); + sdfm_ch2_samples[sdfm_ch2_idx++] = SDFM_getFilterData(gHPruSdfm, 2); if(sdfm_ch0_idx >= MAX_SAMPLES) diff --git a/examples/current_sense/icss_sdfm/sdfm.c b/examples/current_sense/icss_sdfm/sdfm.c index bb05542..6459a5f 100644 --- a/examples/current_sense/icss_sdfm/sdfm.c +++ b/examples/current_sense/icss_sdfm/sdfm.c @@ -243,7 +243,7 @@ int32_t init_sdfm_pru_fw(uint8_t pruId, SdfmPrms *pSdfmPrms, sdfm_handle *pHSdfm /* Enable (global) SDFM */ SDFM_enable(hSdfm); - pHSdfm = &hSdfm; + *pHSdfm = hSdfm; return SDFM_ERR_NERR; } diff --git a/source/current_sense/sdfm/driver/sdfm_drv.c b/source/current_sense/sdfm/driver/sdfm_drv.c index 30bddc9..7c6afa0 100644 --- a/source/current_sense/sdfm/driver/sdfm_drv.c +++ b/source/current_sense/sdfm/driver/sdfm_drv.c @@ -284,11 +284,9 @@ void SDFM_configComparatorGpioPins(sdfm_handle h_sdfm, uint8_t ch,uint32_t gpio_ } /* Get current (or latest) sample for the specified channel */ -uint32_t SDFM_getFilterData(uint8_t ch) +uint32_t SDFM_getFilterData(sdfm_handle h_sdfm, uint8_t ch) { - SDFM *p_sdfm = NULL; - p_sdfm->p_sdfm_interface = (SDFM_Interface *)(PRU_ICSSG_DRAM0_SLV_RAM + 0x0); - return p_sdfm->p_sdfm_interface->curr_out_samp_buf[ch]; + return h_sdfm->p_sdfm_interface->curr_out_samp_buf[ch]; } /*Configure normal current OSR for data filter*/ diff --git a/source/current_sense/sdfm/include/sdfm_api.h b/source/current_sense/sdfm/include/sdfm_api.h index ca35581..ac7435d 100644 --- a/source/current_sense/sdfm/include/sdfm_api.h +++ b/source/current_sense/sdfm/include/sdfm_api.h @@ -268,14 +268,14 @@ void SDFM_configComparatorGpioPins(sdfm_handle h_sdfm, uint8_t ch,uint32_t gpio_ /** * * \brief get sample data from DMEM - * + * \param[in] h_sdfm SDFM handle * \param[in] ch current ch number * * * \retval current sample value * */ -uint32_t SDFM_getFilterData(uint8_t ch); +uint32_t SDFM_getFilterData(sdfm_handle h_sdfm,uint8_t ch); /** * * \brief Configure iep count for normal current sampling