Skip to content

Commit 1858d20

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 1f278ea commit 1858d20

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ static fsp_err_t r_sdhi_csd_save(sdhi_instance_ctrl_t * const p_ctrl,
190190
uint32_t rca,
191191
sdmmc_priv_csd_reg_t * const p_csd_reg);
192192

193-
static fsp_err_t r_sdhi_read_and_block(sdhi_instance_ctrl_t * const p_ctrl,
193+
fsp_err_t r_sdhi_read_and_block(sdhi_instance_ctrl_t * const p_ctrl,
194194
uint32_t command,
195195
uint32_t argument,
196196
uint32_t byte_count);
@@ -210,36 +210,36 @@ static void r_sdhi_irq_disable(IRQn_Type irq);
210210

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

213-
static void r_sdhi_command_send_no_wait(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
213+
void r_sdhi_command_send_no_wait(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
214214

215-
static fsp_err_t r_sdhi_command_send(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
215+
fsp_err_t r_sdhi_command_send(sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument);
216216

217-
static fsp_err_t r_sdhi_max_clock_rate_set(sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate);
217+
fsp_err_t r_sdhi_max_clock_rate_set(sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate);
218218

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

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

223-
static fsp_err_t r_sdhi_hw_cfg(sdhi_instance_ctrl_t * const p_ctrl);
223+
fsp_err_t r_sdhi_hw_cfg(sdhi_instance_ctrl_t * const p_ctrl);
224224

225225
static fsp_err_t r_sdhi_card_identify(sdhi_instance_ctrl_t * const p_ctrl);
226226

227227
static fsp_err_t r_sdhi_bus_cfg(sdhi_instance_ctrl_t * const p_ctrl);
228228

229-
static fsp_err_t r_sdhi_wait_for_device(sdhi_instance_ctrl_t * const p_ctrl);
229+
fsp_err_t r_sdhi_wait_for_device(sdhi_instance_ctrl_t * const p_ctrl);
230230

231-
static void r_sdhi_read_write_common(sdhi_instance_ctrl_t * const p_ctrl,
231+
void r_sdhi_read_write_common(sdhi_instance_ctrl_t * const p_ctrl,
232232
uint32_t sector_count,
233233
uint32_t sector_size,
234234
uint32_t command,
235235
uint32_t argument);
236236

237-
static fsp_err_t r_sdhi_transfer_read(sdhi_instance_ctrl_t * const p_ctrl,
237+
fsp_err_t r_sdhi_transfer_read(sdhi_instance_ctrl_t * const p_ctrl,
238238
uint32_t block_count,
239239
uint32_t bytes,
240240
void * p_data);
241241

242-
static fsp_err_t r_sdhi_transfer_write(sdhi_instance_ctrl_t * const p_ctrl,
242+
fsp_err_t r_sdhi_transfer_write(sdhi_instance_ctrl_t * const p_ctrl,
243243
uint32_t block_count,
244244
uint32_t bytes,
245245
const uint8_t * p_data);
@@ -1124,7 +1124,7 @@ static void r_sdhi_access_irq_process (sdhi_instance_ctrl_t * p_ctrl, sdmmc_call
11241124
* @param[in] command Command to send.
11251125
* @param[in] argument Argument to send with the command.
11261126
**********************************************************************************************************************/
1127-
static void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
1127+
void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
11281128
{
11291129
/* Clear Status */
11301130
p_ctrl->p_reg->SD_INFO1 = 0U;
@@ -1160,7 +1160,7 @@ static void r_sdhi_command_send_no_wait (sdhi_instance_ctrl_t * p_ctrl, uint32_t
11601160
* @retval FSP_ERR_TIMEOUT Device did not respond.
11611161
* @retval FSP_ERR_DEVICE_BUSY Device is holding DAT0 low (device is busy) or another operation is ongoing.
11621162
**********************************************************************************************************************/
1163-
static fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
1163+
fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t command, uint32_t argument)
11641164
{
11651165
/* Verify the device is not busy. */
11661166
r_sdhi_wait_for_device(p_ctrl);
@@ -1182,7 +1182,7 @@ static fsp_err_t r_sdhi_command_send (sdhi_instance_ctrl_t * p_ctrl, uint32_t co
11821182
* @retval FSP_ERR_CARD_INIT_FAILED Timeout setting divider or operation is still too fast at maximum divider
11831183
* (unlikely).
11841184
**********************************************************************************************************************/
1185-
static fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate)
1185+
fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint32_t max_rate)
11861186
{
11871187
uint32_t setting = SDHI_PRV_CLK_CTRL_DIV_INVALID;
11881188

@@ -1241,7 +1241,7 @@ static fsp_err_t r_sdhi_max_clock_rate_set (sdhi_instance_ctrl_t * p_ctrl, uint3
12411241
* @retval FSP_ERR_CARD_INIT_FAILED Timeout setting divider or operation is still too fast at maximum divider
12421242
* (unlikely).
12431243
**********************************************************************************************************************/
1244-
static fsp_err_t r_sdhi_hw_cfg (sdhi_instance_ctrl_t * const p_ctrl)
1244+
fsp_err_t r_sdhi_hw_cfg (sdhi_instance_ctrl_t * const p_ctrl)
12451245
{
12461246
/* Reset SDHI. */
12471247
p_ctrl->p_reg->SOFT_RST = 0x0U;
@@ -1380,7 +1380,7 @@ static fsp_err_t r_sdhi_bus_cfg (sdhi_instance_ctrl_t * const p_ctrl)
13801380
* @param[in] command Command number
13811381
* @param[in] argument Argument
13821382
**********************************************************************************************************************/
1383-
static void r_sdhi_read_write_common (sdhi_instance_ctrl_t * const p_ctrl,
1383+
void r_sdhi_read_write_common (sdhi_instance_ctrl_t * const p_ctrl,
13841384
uint32_t sector_count,
13851385
uint32_t sector_size,
13861386
uint32_t command,
@@ -1554,7 +1554,7 @@ static void r_sdhi_write_protect_get (sdhi_instance_ctrl_t * const p_ctrl)
15541554
* @retval FSP_SUCCESS Previous operation is complete, and SDHI is ready for the next operation.
15551555
* @retval FSP_ERR_DEVICE_BUSY Device is holding DAT0 low (device is busy) or another operation is ongoing.
15561556
**********************************************************************************************************************/
1557-
static fsp_err_t r_sdhi_wait_for_device (sdhi_instance_ctrl_t * const p_ctrl)
1557+
fsp_err_t r_sdhi_wait_for_device (sdhi_instance_ctrl_t * const p_ctrl)
15581558
{
15591559
/* Wait for the device to stop holding DAT0 low. */
15601560
uint32_t timeout = SDHI_PRV_BUSY_TIMEOUT_US;
@@ -1654,7 +1654,7 @@ static fsp_err_t r_sdhi_clock_optimize (sdhi_instance_ctrl_t * const p_ctrl,
16541654
* @retval FSP_ERR_RESPONSE Device responded with an error.
16551655
* @retval FSP_ERR_TIMEOUT Device did not respond.
16561656
**********************************************************************************************************************/
1657-
static fsp_err_t r_sdhi_wait_for_event (sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout_us)
1657+
fsp_err_t r_sdhi_wait_for_event (sdhi_instance_ctrl_t * const p_ctrl, uint32_t bit, uint32_t timeout_us)
16581658
{
16591659
/* The event status is updated in the access interrupt. Use a local copy of the event status to make sure
16601660
* it isn't updated during the loop. */
@@ -1866,7 +1866,7 @@ static fsp_err_t r_sdhi_csd_extended_get (sdhi_instance_ctrl_t * const p_ctrl, u
18661866
* @retval FSP_ERR_RESPONSE Device responded with an error.
18671867
* @retval FSP_ERR_TIMEOUT Device did not respond.
18681868
**********************************************************************************************************************/
1869-
static fsp_err_t r_sdhi_read_and_block (sdhi_instance_ctrl_t * const p_ctrl,
1869+
fsp_err_t r_sdhi_read_and_block (sdhi_instance_ctrl_t * const p_ctrl,
18701870
uint32_t command,
18711871
uint32_t argument,
18721872
uint32_t byte_count)
@@ -2054,7 +2054,7 @@ void r_sdhi_transfer_callback (sdhi_instance_ctrl_t * p_ctrl)
20542054
* function calls:
20552055
* * @ref transfer_api_t::reconfigure
20562056
**********************************************************************************************************************/
2057-
static fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
2057+
fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
20582058
uint32_t block_count,
20592059
uint32_t bytes,
20602060
void * p_data)
@@ -2120,7 +2120,7 @@ static fsp_err_t r_sdhi_transfer_read (sdhi_instance_ctrl_t * const p_ctrl,
21202120
* function calls:
21212121
* * @ref transfer_api_t::reconfigure
21222122
**********************************************************************************************************************/
2123-
static fsp_err_t r_sdhi_transfer_write (sdhi_instance_ctrl_t * const p_ctrl,
2123+
fsp_err_t r_sdhi_transfer_write (sdhi_instance_ctrl_t * const p_ctrl,
21242124
uint32_t block_count,
21252125
uint32_t bytes,
21262126
const uint8_t * p_data)

0 commit comments

Comments
 (0)