Skip to content

hal: renesas: rx: Restore r_bsp_locking inclusion in r_bsp.h #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

hal: renesas: rx: Restore r_bsp_locking inclusion in r_bsp.h #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions drivers/rx/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ Patch List:

* Fix the build warnings in RSPI driver
Impacted files:
drivers/rx/rdp/src/r_rspi_rx/src/r_rspi_rx.c
drivers/rx/rdp/src/r_rspi_rx/src/r_rspi_rx_private.h

* Remove the static definition in RIIC driver
Expand All @@ -62,17 +61,12 @@ Patch List:
* Fix the build warnings in RIIC driver
Impacted files:
drivers/rx/rdp/src/r_riic_rx/src/r_riic_rx.c
drivers/rx/rdp/src/r_riic_rx/src/targets/rx130/r_riic_rx130.c

* Replace the __builtin_rx_xchg with actual implementation
because Zephyr SDK hasn't support it yet
Impacted files:
drivers/rx/rdp/src/r_bsp/mcu/all/r_rx_intrinsic_functions.h

* Fix the build warnings in IWDT driver
Impacted files:
drivers/rx/rdp/src/r_iwdt_rx/src/r_iwdt_rx.c

* Remove the static definition in LVD isr function
Impacted files:
drivers/rx/rdp/src/r_lvd_rx/src/r_lvd_rx_hw.c
Expand Down
1 change: 1 addition & 0 deletions drivers/rx/rdp/src/r_bsp/board/generic_rx130/r_bsp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ INCLUDE APPROPRIATE MCU AND BOARD FILES
#include "mcu/rx130/register_access/iccrx/iodefine.h"
#endif /* defined(__CCRX__), defined(__GNUC__), defined(__ICCRX__) */
#include "mcu/rx130/r_bsp_cpu.h"
#include "mcu/rx130/r_bsp_locking.h"
#include "mcu/rx130/mcu_clocks.h"
#include "mcu/rx130/mcu_info.h"
#include "mcu/rx130/mcu_init.h"
Expand Down
1 change: 0 additions & 1 deletion drivers/rx/rdp/src/r_iwdt_rx/src/r_iwdt_rx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ Includes <System Includes> , "Project Includes"
/* Defines for IWDT support */
#include "r_iwdt_rx_config.h"
#include "r_iwdt_rx_if.h"
#include "r_bsp_locking.h"

/***********************************************************************************************************************
Macro definitions
Expand Down
19 changes: 9 additions & 10 deletions drivers/rx/rdp/src/r_riic_rx/src/targets/rx130/r_riic_rx130.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
***********************************************************************************************************************/
/***********************************************************************************************************************
* File Name : r_riic_rx130.c
* Description : Functions for using RIIC on RX devices.
* Description : Functions for using RIIC on RX devices.
**********************************************************************************************************************/
/**********************************************************************************************************************
* History : DD.MM.YYYY Version Description
* : 31.10.2015 1.80 First Release
* : 04.03.2016 1.90 Changed about the pin definisions.
* : 01.10.2016 2.00 Fixed a program according to the Renesas coding rules.
* : 02.06.2017 2.10 Changed include path becuase changed file structure.
* Changed about the calculation processing for address of PFS, PCR,
* Changed about the calculation processing for address of PFS, PCR,
* PDR and PMR register.
* : 20.05.2019 2.41 Added support for GNUC and ICCRX.
* Fixed coding style.
Expand All @@ -31,7 +31,6 @@
#if defined(BSP_MCU_RX130)

#include "r_riic_rx_private.h"
#include "r_bsp_locking.h"

/***********************************************************************************************************************
Exported global variables (to be accessed by other files)
Expand Down Expand Up @@ -382,14 +381,14 @@ void riic_mcu_power_on (uint8_t channel)
{
#if (1U == RIIC_CFG_CH0_INCLUDED)
case 0x00 :

#if ((R_BSP_VERSION_MAJOR == 5) && (R_BSP_VERSION_MINOR >= 30)) || (R_BSP_VERSION_MAJOR >= 6)
R_BSP_InterruptControl(BSP_INT_SRC_EMPTY, BSP_INT_CMD_FIT_INTERRUPT_DISABLE, &int_ctrl);
#endif

/* Bring module out of stop state. */
MSTP(RIIC0) = 0U;

#if ((R_BSP_VERSION_MAJOR == 5) && (R_BSP_VERSION_MINOR >= 30)) || (R_BSP_VERSION_MAJOR >= 6)
R_BSP_InterruptControl(BSP_INT_SRC_EMPTY, BSP_INT_CMD_FIT_INTERRUPT_ENABLE, &int_ctrl);
#endif
Expand Down Expand Up @@ -427,14 +426,14 @@ void riic_mcu_power_off (uint8_t channel)
{
#if (1U == RIIC_CFG_CH0_INCLUDED)
case 0x00 :

#if ((R_BSP_VERSION_MAJOR == 5) && (R_BSP_VERSION_MINOR >= 30)) || (R_BSP_VERSION_MAJOR >= 6)
R_BSP_InterruptControl(BSP_INT_SRC_EMPTY, BSP_INT_CMD_FIT_INTERRUPT_DISABLE, &int_ctrl);
#endif

/* Put module in stop state. */
MSTP(RIIC0) = 1U;

#if ((R_BSP_VERSION_MAJOR == 5) && (R_BSP_VERSION_MINOR >= 30)) || (R_BSP_VERSION_MAJOR >= 6)
R_BSP_InterruptControl(BSP_INT_SRC_EMPTY, BSP_INT_CMD_FIT_INTERRUPT_ENABLE, &int_ctrl);
#endif
Expand Down Expand Up @@ -696,7 +695,7 @@ double riic_mcu_check_freq (void)
* Function Name: riic0_eei_isr
* Description : Interrupt EEI handler for channel 0.
* Types of interrupt requests transfer error or event generation.
* The event generations are arbitration-lost, NACK detection, timeout detection,
* The event generations are arbitration-lost, NACK detection, timeout detection,
* start condition detection, and stop condition detection.
* Arguments : None
* Return Value : None
Expand Down
37 changes: 18 additions & 19 deletions drivers/rx/rdp/src/r_rspi_rx/src/r_rspi_rx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* File Name : r_rspi_rx.c
* Description : Functions for using RSPI on RX devices.
************************************************************************************************************************
* History : DD.MM.YYYY Version Description
* History : DD.MM.YYYY Version Description
* 25.10.2013 1.00 First Release
* 01.05.2014 1.20 Added support for RX62N. Minor bug fixes.
* 19.01.2014 1.30 Added support for RX113, RX64M, and RX71M
Expand All @@ -22,7 +22,7 @@
* 20.12.2018 2.00 Added double buffer and dmadtc transfer mode.
* Supported RX72T.
* 20.05.2019 2.01 Added support for GNUC and ICCRX.
* Fixed coding style.
* Fixed coding style.
* 20.06.2019 2.02 Supported RX23W.
* 30.07.2019 2.03 Supported RX72M.
* 22.11.2019 2.04 Supported RX72N and RX66N.
Expand All @@ -35,7 +35,7 @@
* Fixed bug. Set the RSPCK auto-stop function enable bit(SPCR2.SCKASE) and update
* functions rspi_sptiX_isr (X = 0, 1, 2) to ensure RSPI can communication normally when it
* is in high speed reception.
* Fixed two warning when the MCU is RX111 etc., the unused function(rspi_spei_grp_isr)
* Fixed two warning when the MCU is RX111 etc., the unused function(rspi_spei_grp_isr)
* and variable(int_ctrl) will be valid.
* Added communication completion interrupt for rx671.
* 31.07.2021 3.02 Supported RX140.
Expand All @@ -46,10 +46,10 @@
* Added idle interrupt for RX671.
* 29.05.2023 3.20 Supported RX23E-B.
* Fixed to comply with GSCE Coding Standards Rev.6.5.0.
* 18.08.2023 3.30 Modified comments of the following API functions: R_RSPI_IntSptiIerClear,
* 18.08.2023 3.30 Modified comments of the following API functions: R_RSPI_IntSptiIerClear,
* R_RSPI_IntSpriIerClear, R_RSPI_DisableSpti, R_RSPI_DisableRSPI.
* 05.10.2023 3.40 Implemented code to clear the SPRF flag at the start of SPI communication.
* Modified the order of disabling the error interrupt and canceling the error
* Modified the order of disabling the error interrupt and canceling the error
* handler registration when disabling interrupts.
* Modified the order of disabling interrupts between SPTI and SPRI
* when disabling interrupts.
Expand All @@ -63,7 +63,6 @@ Includes <System Includes> , "Project Includes"
/* Defines for RSPI support */
#include "platform.h"
#include "r_rspi_rx_if.h"
#include "r_bsp_locking.h"

#if RSPI_CFG_LONGQ_ENABLE == 1
/* Uses LONGQ driver header file. */
Expand Down Expand Up @@ -492,7 +491,7 @@ rspi_err_t R_RSPI_Open(uint8_t channel, // @suppress("6.6a Sour
{
R_BSP_NOP();
}

/* Peripheral Initialized */
g_rspi_handles[channel].rspi_chnl_opened = true;
g_rspi_handles[channel].pcallback = pcallback;
Expand Down Expand Up @@ -1131,7 +1130,7 @@ static rspi_err_t rspi_write_read_common(rspi_handle_t handle,
* @retval RSPI_ERR_NULL_PTR
* A required pointer argument is NULL
* @details Use this function when disabling interrupt from within the callback function generated at DMAC
* transfer-end or an intentional cancellation of transmission.\n
* transfer-end or an intentional cancellation of transmission.\n
* Please call this function after calling R_RSPI_DisableSpti().
* @note Do not use this function during transmission other than an intentional cancellation of transmission.\n
* Doing so could disrupt the transfer.
Expand Down Expand Up @@ -1204,7 +1203,7 @@ rspi_err_t R_RSPI_IntSptiIerClear(rspi_handle_t handle)
* @retval RSPI_ERR_NULL_PTR
* A required pointer argument is NULL
* @details Use this function when disabling interrupt from within the callback function generated at DMAC
* transfer-end or an intentional cancellation of transmission.\n
* transfer-end or an intentional cancellation of transmission.\n
* Please call this function before calling R_RSPI_DisableRSPI().
* @note Do not use this function during transmission other than an intentional cancellation of transmission.\n
* Doing so could disrupt the transfer.
Expand Down Expand Up @@ -1277,7 +1276,7 @@ rspi_err_t R_RSPI_IntSpriIerClear(rspi_handle_t handle)
* @retval RSPI_ERR_NULL_PTR
* A required pointer argument is NULL
* @details Use this function when disabling interrupt from within the callback function generated at DMAC
* transfer-end or an intentional cancellation of transmission.\n
* transfer-end or an intentional cancellation of transmission.\n
* Please call this function before calling R_RSPI_IntSptiIerClear().
* @note Do not use this function during transmission other than an intentional cancellation of transmission.\n
* Doing so could disrupt the transfer.
Expand Down Expand Up @@ -1311,7 +1310,7 @@ rspi_err_t R_RSPI_DisableSpti(rspi_handle_t handle)
* @retval RSPI_ERR_NULL_PTR
* A required pointer argument is NULL
* @details Use this function when disabling the RSPI function from within the callback function generated at DMAC
* transfer-end or an intentional cancellation of transmission.\n
* transfer-end or an intentional cancellation of transmission.\n
* Please call this function after calling R_RSPI_IntSpriIerClear().
* @note Do not use this function during transmission other than an intentional cancellation of transmission.\n
* Doing so could disrupt the transfer.
Expand Down Expand Up @@ -1865,7 +1864,7 @@ static void rspi_interrupts_clear(uint8_t channel)
#if defined BSP_MCU_RX671 || defined BSP_MCU_RX26T
/* Clear any pending communication end interrupts */
IR(RSPI0, SPCI0) = 0;
#endif
#endif
#if !(defined(BSP_MCU_RX64M) || defined(BSP_MCU_RX71M) || defined(BSP_MCU_RX65N)\
|| defined(BSP_MCU_RX66T) || defined(BSP_MCU_RX72T) || defined(BSP_MCU_RX72M)\
|| defined(BSP_MCU_RX72N) || defined(BSP_MCU_RX66N) || defined(BSP_MCU_RX671)\
Expand Down Expand Up @@ -1895,7 +1894,7 @@ static void rspi_interrupts_clear(uint8_t channel)
|| defined(BSP_MCU_RX671))
/* Clear any pending error interrupt */
IR(RSPI1, SPEI1) = 0;
#endif
#endif
if (0 == IR(RSPI1, SPTI1))
{
R_BSP_NOP();
Expand Down Expand Up @@ -2003,7 +2002,7 @@ static void rspi_interrupts_enable(uint8_t channel, bool enabled)
{
R_BSP_NOP();
}

#if defined BSP_MCU_RX64M || defined BSP_MCU_RX71M || defined BSP_MCU_RX65N || defined BSP_MCU_RX66T\
|| defined BSP_MCU_RX72T || defined BSP_MCU_RX72M || defined BSP_MCU_RX72N || defined BSP_MCU_RX66N\
|| defined BSP_MCU_RX671 || defined BSP_MCU_RX660 || defined BSP_MCU_RX26T
Expand Down Expand Up @@ -2097,7 +2096,7 @@ static void rspi_interrupts_enable(uint8_t channel, bool enabled)
{
R_BSP_InterruptRequestEnable(VECT(RSPI1,SPRI1));
R_BSP_InterruptRequestEnable(VECT(RSPI1,SPTI1));
#ifdef BSP_MCU_RX671
#ifdef BSP_MCU_RX671
R_BSP_InterruptRequestEnable(VECT(RSPI1,SPCI1));
#endif
}
Expand Down Expand Up @@ -2875,7 +2874,7 @@ static void rspi_spei_isr_common(uint8_t channel)
/* Clear error source: OVRF flag. */
(*g_rspi_channels[channel]).SPSR.BIT.OVRF = 0;
}

if (status_flags & RSPI_SPSR_MODF)
{
if (status_flags & RSPI_SPSR_UDRF)
Expand All @@ -2899,7 +2898,7 @@ static void rspi_spei_isr_common(uint8_t channel)
(*g_rspi_channels[channel]).SPSR.BIT.MODF = 0;
}
}

if (status_flags & RSPI_SPSR_PERF)
{
if (RSPI_EVT_ERR_UNDEF == event)
Expand Down Expand Up @@ -3014,7 +3013,7 @@ static void rspi_spei_grp_isr(void *pdata)
}
#endif
#endif

#if defined BSP_MCU_RX65N || defined BSP_MCU_RX72M || defined BSP_MCU_RX72N || defined BSP_MCU_RX66N \
|| defined BSP_MCU_RX671
#if RSPI_CFG_USE_CHAN2 == 1
Expand Down Expand Up @@ -3219,7 +3218,7 @@ static void rspi_spii_grp_isr(void *pdata)
}
#endif
#endif

#if defined BSP_MCU_RX65N || defined BSP_MCU_RX72M || defined BSP_MCU_RX72N || defined BSP_MCU_RX66N \
|| defined BSP_MCU_RX671
#if RSPI_CFG_USE_CHAN2 == 1
Expand Down
7 changes: 3 additions & 4 deletions drivers/rx/rdp/src/r_s12ad_rx/src/targets/rx130/r_s12ad_rx130.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Includes <System Includes> , "Project Includes"
/* Includes board and MCU related header files. */
#include <stdio.h>
#include "platform.h"
#include "r_bsp_locking.h"

#if defined (BSP_MCU_RX130)
#include "r_s12ad_rx_config.h"
Expand Down Expand Up @@ -217,9 +216,9 @@ adc_err_t adc_open(uint8_t const unit,

p_regs->ADADS0.WORD = 0;
p_regs->ADADS1.WORD = 0;

p_regs->ADADC.BYTE = 0;

p_regs->ADCER.WORD = 0;
p_regs->ADSTRGR.WORD = 0;

Expand Down Expand Up @@ -266,7 +265,7 @@ adc_err_t adc_open(uint8_t const unit,
p_regs->ADCMPBSR.BYTE = 0; /* target bit clear by read-modify-write */
p_regs->ADBUFEN.BYTE = 0;
p_regs->ADBUFPTR.BYTE = 0;

/* SET MODE RELATED REGISTER FIELDS */
g_dcb.mode = mode;

Expand Down