Skip to content

Commit

Permalink
hal: renesas: ra: Remove static definitions in r_sdhi.c
Browse files Browse the repository at this point in the history 
Remove static definition of some functions to avoid duplicate implementation
in Zephyr SDHC driver, allows extern from Zephyr side

Signed-off-by: Tran Van Quy <quy.tran.pz@renesas.com>
  • Loading branch information
@quytranpzz @KhiemNguyenT
quytranpzz authored and KhiemNguyenT committed Nov 25, 2024
1 parent 6612f47 commit 31f1d1b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 20 deletions.
4 changes: 4 additions & 0 deletions drivers/ra/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,7 @@ Patch List:
* Move the include for cmsis_compiler.h after include for Renesas CMSIS header file
Impacted files:
drivers/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h

* Remove the static definition in SDHI
Impacted files:
drivers/ra/fsp/src/r_sdhi/r_sdhi.c
40 changes: 20 additions & 20 deletions drivers/ra/fsp/src/r_sdhi/r_sdhi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static fsp_err_t r_sdhi_csd_save(sdhi_instance_ctrl_t * const p_ctrl,
uint32_t rca,
sdmmc_priv_csd_reg_t * const p_csd_reg);

static fsp_err_t r_sdhi_read_and_block(sdhi_instance_ctrl_t * const p_ctrl,
fsp_err_t r_sdhi_read_and_block(sdhi_instance_ctrl_t * const p_ctrl,
uint32_t command,
uint32_t argument,
uint32_t byte_count);
Expand All @@ -241,36 +241,36 @@ static void r_sdhi_irq_disable(IRQn_Type irq);

static void r_sdhi_access_irq_process(sdhi_instance_ctrl_t * p_ctrl, sdmmc_callback_args_t * p_args);

static void r_sdhi_command_send_no_wait(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
void r_sdhi_command_send_no_wait(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);

static fsp_err_t r_sdhi_command_send(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
fsp_err_t r_sdhi_command_send(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);

static fsp_err_t r_sdhi_max_clock_rate_set(sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate);
fsp_err_t r_sdhi_max_clock_rate_set(sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate);

static fsp_err_t r_sdhi_wait_for_event(sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout);
fsp_err_t r_sdhi_wait_for_event(sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout);

static fsp_err_t r_sdhi_rca_get(sdhi_instance_ctrl_t * const p_ctrl, uint32_t * p_rca);

static fsp_err_t r_sdhi_hw_cfg(sdhi_instance_ctrl_t * const p_ctrl);
fsp_err_t r_sdhi_hw_cfg(sdhi_instance_ctrl_t * const p_ctrl);

static fsp_err_t r_sdhi_card_identify(sdhi_instance_ctrl_t * const p_ctrl);

static fsp_err_t r_sdhi_bus_cfg(sdhi_instance_ctrl_t * const p_ctrl);

static fsp_err_t r_sdhi_wait_for_device(sdhi_instance_ctrl_t * const p_ctrl);
fsp_err_t r_sdhi_wait_for_device(sdhi_instance_ctrl_t * const p_ctrl);

static void r_sdhi_read_write_common(sdhi_instance_ctrl_t * const p_ctrl,
void r_sdhi_read_write_common(sdhi_instance_ctrl_t * const p_ctrl,
uint32_t sector_count,
uint32_t sector_size,
uint32_t command,
uint32_t argument);

static fsp_err_t r_sdhi_transfer_read(sdhi_instance_ctrl_t * const p_ctrl,
fsp_err_t r_sdhi_transfer_read(sdhi_instance_ctrl_t * const p_ctrl,
uint32_t block_count,
uint32_t bytes,
void * p_data);

static fsp_err_t r_sdhi_transfer_write(sdhi_instance_ctrl_t * const p_ctrl,
fsp_err_t r_sdhi_transfer_write(sdhi_instance_ctrl_t * const p_ctrl,
uint32_t block_count,
uint32_t bytes,
const uint8_t * p_data);
Expand Down Expand Up @@ -1381,7 +1381,7 @@ static void r_sdhi_access_irq_process (sdhi_instance_ctrl_t * p_ctrl, sdmmc_call
* @param[in] command Command to send.
* @param[in] argument Argument to send with the command.
**********************************************************************************************************************/
static void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
{
/* Clear Status */
p_ctrl->p_reg->SD_INFO1 = 0U;
Expand Down Expand Up @@ -1417,7 +1417,7 @@ static void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t
* @retval FSP_ERR_TIMEOUT Device did not respond.
* @retval FSP_ERR_DEVICE_BUSY Device is holding DAT0 low (device is busy) or another operation is ongoing.
**********************************************************************************************************************/
static fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
{
/* Verify the device is not busy. */
r_sdhi_wait_for_device(p_ctrl);
Expand All @@ -1439,7 +1439,7 @@ static fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t co
* @retval FSP_ERR_CARD_INIT_FAILED Timeout setting divider or operation is still too fast at maximum divider
* (unlikely).
**********************************************************************************************************************/
static fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate)
fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate)
{
uint32_t setting = SDHI_PRV_CLK_CTRL_DIV_INVALID;

Expand Down Expand Up @@ -1498,7 +1498,7 @@ static fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint3
* @retval FSP_ERR_CARD_INIT_FAILED Timeout setting divider or operation is still too fast at maximum divider
* (unlikely).
**********************************************************************************************************************/
static fsp_err_t r_sdhi_hw_cfg (sdhi_instance_ctrl_t * const p_ctrl)
fsp_err_t r_sdhi_hw_cfg (sdhi_instance_ctrl_t * const p_ctrl)
{
/* Reset SDHI. */
p_ctrl->p_reg->SOFT_RST = 0x0U;
Expand Down Expand Up @@ -1710,7 +1710,7 @@ static fsp_err_t r_sdhi_bus_cfg (sdhi_instance_ctrl_t * const p_ctrl)
* @param[in] command Command number
* @param[in] argument Argument
**********************************************************************************************************************/
static void r_sdhi_read_write_common (sdhi_instance_ctrl_t * const p_ctrl,
void r_sdhi_read_write_common (sdhi_instance_ctrl_t * const p_ctrl,
uint32_t sector_count,
uint32_t sector_size,
uint32_t command,
Expand Down Expand Up @@ -1988,7 +1988,7 @@ static void r_sdhi_write_protect_get (sdhi_instance_ctrl_t * const p_ctrl)
* @retval FSP_SUCCESS Previous operation is complete, and SDHI is ready for the next operation.
* @retval FSP_ERR_DEVICE_BUSY Device is holding DAT0 low (device is busy) or another operation is ongoing.
**********************************************************************************************************************/
static fsp_err_t r_sdhi_wait_for_device (sdhi_instance_ctrl_t * const p_ctrl)
fsp_err_t r_sdhi_wait_for_device (sdhi_instance_ctrl_t * const p_ctrl)
{
/* Wait for the device to stop holding DAT0 low. */
uint32_t timeout = SDHI_PRV_BUSY_TIMEOUT_US;
Expand Down Expand Up @@ -2134,7 +2134,7 @@ static fsp_err_t r_sdhi_sdio_clock_optimize (sdhi_instance_ctrl_t * const p_ctrl
* @retval FSP_ERR_RESPONSE Device responded with an error.
* @retval FSP_ERR_TIMEOUT Device did not respond.
**********************************************************************************************************************/
static fsp_err_t r_sdhi_wait_for_event (sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout_us)
fsp_err_t r_sdhi_wait_for_event (sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout_us)
{
/* The event status is updated in the access interrupt. Use a local copy of the event status to make sure
* it isn't updated during the loop. */
Expand Down Expand Up @@ -2346,7 +2346,7 @@ static fsp_err_t r_sdhi_csd_extended_get (sdhi_instance_ctrl_t * const p_ctrl, u
* @retval FSP_ERR_RESPONSE Device responded with an error.
* @retval FSP_ERR_TIMEOUT Device did not respond.
**********************************************************************************************************************/
static fsp_err_t r_sdhi_read_and_block (sdhi_instance_ctrl_t * const p_ctrl,
fsp_err_t r_sdhi_read_and_block (sdhi_instance_ctrl_t * const p_ctrl,
uint32_t command,
uint32_t argument,
uint32_t byte_count)
Expand Down Expand Up @@ -2534,7 +2534,7 @@ void r_sdhi_transfer_callback (sdhi_instance_ctrl_t * p_ctrl)
* function calls:
* * @ref transfer_api_t::reconfigure
**********************************************************************************************************************/
static fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
uint32_t block_count,
uint32_t bytes,
void * p_data)
Expand Down Expand Up @@ -2600,7 +2600,7 @@ static fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
* function calls:
* * @ref transfer_api_t::reconfigure
**********************************************************************************************************************/
static fsp_err_t r_sdhi_transfer_write (sdhi_instance_ctrl_t * const p_ctrl,
fsp_err_t r_sdhi_transfer_write (sdhi_instance_ctrl_t * const p_ctrl,
uint32_t block_count,
uint32_t bytes,
const uint8_t * p_data)
Expand Down

0 comments on commit 31f1d1b

Please sign in to comment.