Skip to content

Commit 31f1d1b

Browse files
quytranpzzKhiemNguyenT
quytranpzz
authored and
KhiemNguyenT
committed
hal: renesas: ra: Remove static definitions in r_sdhi.c
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 <[email protected]>
1 parent 6612f47 commit 31f1d1b

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

‎drivers/ra/README

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,7 @@ Patch List:
5858
* Move the include for cmsis_compiler.h after include for Renesas CMSIS header file
5959
Impacted files:
6060
drivers/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include/renesas.h
61+
62+
* Remove the static definition in SDHI
63+
Impacted files:
64+
drivers/ra/fsp/src/r_sdhi/r_sdhi.c

‎drivers/ra/fsp/src/r_sdhi/r_sdhi.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static fsp_err_t r_sdhi_csd_save(sdhi_instance_ctrl_t * const p_ctrl,
221221
uint32_t rca,
222222
sdmmc_priv_csd_reg_t * const p_csd_reg);
223223

224-
static fsp_err_t r_sdhi_read_and_block(sdhi_instance_ctrl_t * const p_ctrl,
224+
fsp_err_t r_sdhi_read_and_block(sdhi_instance_ctrl_t * const p_ctrl,
225225
uint32_t command,
226226
uint32_t argument,
227227
uint32_t byte_count);
@@ -241,36 +241,36 @@ static void r_sdhi_irq_disable(IRQn_Type irq);
241241

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

244-
static void r_sdhi_command_send_no_wait(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
244+
void r_sdhi_command_send_no_wait(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
245245

246-
static fsp_err_t r_sdhi_command_send(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
246+
fsp_err_t r_sdhi_command_send(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
247247

248-
static fsp_err_t r_sdhi_max_clock_rate_set(sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate);
248+
fsp_err_t r_sdhi_max_clock_rate_set(sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate);
249249

250-
static fsp_err_t r_sdhi_wait_for_event(sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout);
250+
fsp_err_t r_sdhi_wait_for_event(sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout);
251251

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

254-
static fsp_err_t r_sdhi_hw_cfg(sdhi_instance_ctrl_t * const p_ctrl);
254+
fsp_err_t r_sdhi_hw_cfg(sdhi_instance_ctrl_t * const p_ctrl);
255255

256256
static fsp_err_t r_sdhi_card_identify(sdhi_instance_ctrl_t * const p_ctrl);
257257

258258
static fsp_err_t r_sdhi_bus_cfg(sdhi_instance_ctrl_t * const p_ctrl);
259259

260-
static fsp_err_t r_sdhi_wait_for_device(sdhi_instance_ctrl_t * const p_ctrl);
260+
fsp_err_t r_sdhi_wait_for_device(sdhi_instance_ctrl_t * const p_ctrl);
261261

262-
static void r_sdhi_read_write_common(sdhi_instance_ctrl_t * const p_ctrl,
262+
void r_sdhi_read_write_common(sdhi_instance_ctrl_t * const p_ctrl,
263263
uint32_t sector_count,
264264
uint32_t sector_size,
265265
uint32_t command,
266266
uint32_t argument);
267267

268-
static fsp_err_t r_sdhi_transfer_read(sdhi_instance_ctrl_t * const p_ctrl,
268+
fsp_err_t r_sdhi_transfer_read(sdhi_instance_ctrl_t * const p_ctrl,
269269
uint32_t block_count,
270270
uint32_t bytes,
271271
void * p_data);
272272

273-
static fsp_err_t r_sdhi_transfer_write(sdhi_instance_ctrl_t * const p_ctrl,
273+
fsp_err_t r_sdhi_transfer_write(sdhi_instance_ctrl_t * const p_ctrl,
274274
uint32_t block_count,
275275
uint32_t bytes,
276276
const uint8_t * p_data);
@@ -1381,7 +1381,7 @@ static void r_sdhi_access_irq_process (sdhi_instance_ctrl_t * p_ctrl, sdmmc_call
13811381
* @param[in] command Command to send.
13821382
* @param[in] argument Argument to send with the command.
13831383
**********************************************************************************************************************/
1384-
static void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
1384+
void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
13851385
{
13861386
/* Clear Status */
13871387
p_ctrl->p_reg->SD_INFO1 = 0U;
@@ -1417,7 +1417,7 @@ static void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t
14171417
* @retval FSP_ERR_TIMEOUT Device did not respond.
14181418
* @retval FSP_ERR_DEVICE_BUSY Device is holding DAT0 low (device is busy) or another operation is ongoing.
14191419
**********************************************************************************************************************/
1420-
static fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
1420+
fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
14211421
{
14221422
/* Verify the device is not busy. */
14231423
r_sdhi_wait_for_device(p_ctrl);
@@ -1439,7 +1439,7 @@ static fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t co
14391439
* @retval FSP_ERR_CARD_INIT_FAILED Timeout setting divider or operation is still too fast at maximum divider
14401440
* (unlikely).
14411441
**********************************************************************************************************************/
1442-
static fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate)
1442+
fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate)
14431443
{
14441444
uint32_t setting = SDHI_PRV_CLK_CTRL_DIV_INVALID;
14451445

@@ -1498,7 +1498,7 @@ static fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint3
14981498
* @retval FSP_ERR_CARD_INIT_FAILED Timeout setting divider or operation is still too fast at maximum divider
14991499
* (unlikely).
15001500
**********************************************************************************************************************/
1501-
static fsp_err_t r_sdhi_hw_cfg (sdhi_instance_ctrl_t * const p_ctrl)
1501+
fsp_err_t r_sdhi_hw_cfg (sdhi_instance_ctrl_t * const p_ctrl)
15021502
{
15031503
/* Reset SDHI. */
15041504
p_ctrl->p_reg->SOFT_RST = 0x0U;
@@ -1710,7 +1710,7 @@ static fsp_err_t r_sdhi_bus_cfg (sdhi_instance_ctrl_t * const p_ctrl)
17101710
* @param[in] command Command number
17111711
* @param[in] argument Argument
17121712
**********************************************************************************************************************/
1713-
static void r_sdhi_read_write_common (sdhi_instance_ctrl_t * const p_ctrl,
1713+
void r_sdhi_read_write_common (sdhi_instance_ctrl_t * const p_ctrl,
17141714
uint32_t sector_count,
17151715
uint32_t sector_size,
17161716
uint32_t command,
@@ -1988,7 +1988,7 @@ static void r_sdhi_write_protect_get (sdhi_instance_ctrl_t * const p_ctrl)
19881988
* @retval FSP_SUCCESS Previous operation is complete, and SDHI is ready for the next operation.
19891989
* @retval FSP_ERR_DEVICE_BUSY Device is holding DAT0 low (device is busy) or another operation is ongoing.
19901990
**********************************************************************************************************************/
1991-
static fsp_err_t r_sdhi_wait_for_device (sdhi_instance_ctrl_t * const p_ctrl)
1991+
fsp_err_t r_sdhi_wait_for_device (sdhi_instance_ctrl_t * const p_ctrl)
19921992
{
19931993
/* Wait for the device to stop holding DAT0 low. */
19941994
uint32_t timeout = SDHI_PRV_BUSY_TIMEOUT_US;
@@ -2134,7 +2134,7 @@ static fsp_err_t r_sdhi_sdio_clock_optimize (sdhi_instance_ctrl_t * const p_ctrl
21342134
* @retval FSP_ERR_RESPONSE Device responded with an error.
21352135
* @retval FSP_ERR_TIMEOUT Device did not respond.
21362136
**********************************************************************************************************************/
2137-
static fsp_err_t r_sdhi_wait_for_event (sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout_us)
2137+
fsp_err_t r_sdhi_wait_for_event (sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout_us)
21382138
{
21392139
/* The event status is updated in the access interrupt. Use a local copy of the event status to make sure
21402140
* it isn't updated during the loop. */
@@ -2346,7 +2346,7 @@ static fsp_err_t r_sdhi_csd_extended_get (sdhi_instance_ctrl_t * const p_ctrl, u
23462346
* @retval FSP_ERR_RESPONSE Device responded with an error.
23472347
* @retval FSP_ERR_TIMEOUT Device did not respond.
23482348
**********************************************************************************************************************/
2349-
static fsp_err_t r_sdhi_read_and_block (sdhi_instance_ctrl_t * const p_ctrl,
2349+
fsp_err_t r_sdhi_read_and_block (sdhi_instance_ctrl_t * const p_ctrl,
23502350
uint32_t command,
23512351
uint32_t argument,
23522352
uint32_t byte_count)
@@ -2534,7 +2534,7 @@ void r_sdhi_transfer_callback (sdhi_instance_ctrl_t * p_ctrl)
25342534
* function calls:
25352535
* * @ref transfer_api_t::reconfigure
25362536
**********************************************************************************************************************/
2537-
static fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
2537+
fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
25382538
uint32_t block_count,
25392539
uint32_t bytes,
25402540
void * p_data)
@@ -2600,7 +2600,7 @@ static fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
26002600
* function calls:
26012601
* * @ref transfer_api_t::reconfigure
26022602
**********************************************************************************************************************/
2603-
static fsp_err_t r_sdhi_transfer_write (sdhi_instance_ctrl_t * const p_ctrl,
2603+
fsp_err_t r_sdhi_transfer_write (sdhi_instance_ctrl_t * const p_ctrl,
26042604
uint32_t block_count,
26052605
uint32_t bytes,
26062606
const uint8_t * p_data)

0 commit comments

Comments
 (0)