On Mon, Jul 12, 2021 at 6:51 AM Sebastian Huber
<sebastian.hu...@embedded-brains.de> wrote:
>
> Return RTEMS_INCORRECT_STATE instead of RTEMS_INCORRECT_STATE in case the
Second RTEMS_INCORRECT_STATE should be RTEMS_INTERNAL_ERROR
> interrupt support is not initialized. This is similar to
> rtems_timer_server_fire_after() for example.
>
> Update #3269.
> ---
> bsps/include/bsp/irq-generic.h | 25 +++++++++++
> bsps/shared/irq/irq-generic.c | 60 ++++++++++++++++-----------
> bsps/shared/irq/irq-handler-iterate.c | 51 +++++++----------------
> 3 files changed, 75 insertions(+), 61 deletions(-)
>
> diff --git a/bsps/include/bsp/irq-generic.h b/bsps/include/bsp/irq-generic.h
> index b553ac30bf..9babc4cfb5 100644
> --- a/bsps/include/bsp/irq-generic.h
> +++ b/bsps/include/bsp/irq-generic.h
> @@ -434,6 +434,31 @@ void bsp_interrupt_lock(void);
> /* For internal use only */
> void bsp_interrupt_unlock(void);
>
> +/**
> + * @brief Checks the vector and routine. When the checks were successful,
> the
> + * interrupt support lock will be obtained.
> + *
> + * @param vector is the interrupt vector number to check.
> + *
> + * @param routine is the routine to check.
> + *
> + * @retval ::RTEMS_SUCCESSFUL The requested operation was successful.
> + *
> + * @retval ::RTEMS_INCORRECT_STATE The interrupt support was not initialized.
> + *
> + * @retval ::RTEMS_CALLED_FROM_ISR The function was called from within
> + * interrupt context.
> + *
> + * @retval ::RTEMS_INVALID_ADDRESS The ``routine`` parameter was NULL.
> + *
> + * @retval ::RTEMS_INVALID_ID There was no interrupt vector associated with
> the
> + * number specified by ``vector``.
> + */
> +rtems_status_code bsp_interrupt_check_and_lock(
> + rtems_vector_number vector,
> + rtems_interrupt_handler handler
> +);
> +
> /**
> * @brief This table contains a bit map which indicates if an entry is unique
> * or shared.
> diff --git a/bsps/shared/irq/irq-generic.c b/bsps/shared/irq/irq-generic.c
> index a7e8c1163f..59963182ab 100644
> --- a/bsps/shared/irq/irq-generic.c
> +++ b/bsps/shared/irq/irq-generic.c
> @@ -122,6 +122,32 @@ static inline bool bsp_interrupt_allocate_handler_index(
> #endif
> }
>
> +rtems_status_code bsp_interrupt_check_and_lock(
> + rtems_vector_number vector,
> + rtems_interrupt_handler handler
> +)
> +{
> + if ( !bsp_interrupt_is_initialized() ) {
> + return RTEMS_INCORRECT_STATE;
> + }
> +
> + if ( handler == NULL ) {
> + return RTEMS_INVALID_ADDRESS;
> + }
> +
> + if ( !bsp_interrupt_is_valid_vector( vector ) ) {
> + return RTEMS_INVALID_ID;
> + }
> +
> + if ( rtems_interrupt_is_in_progress() ) {
> + return RTEMS_CALLED_FROM_ISR;
> + }
> +
> + bsp_interrupt_lock();
> +
> + return RTEMS_SUCCESSFUL;
> +}
> +
> void bsp_interrupt_initialize(void)
> {
> rtems_status_code sc = RTEMS_SUCCESSFUL;
> @@ -162,25 +188,18 @@ static rtems_status_code bsp_interrupt_handler_install(
> void *arg
> )
> {
> + rtems_status_code sc;
> rtems_interrupt_level level;
> rtems_vector_number index = 0;
> rtems_interrupt_entry *head = NULL;
> bool enable_vector = false;
> bool replace = RTEMS_INTERRUPT_IS_REPLACE(options);
>
> - /* Check parameters and system state */
> - if (!bsp_interrupt_is_initialized()) {
> - return RTEMS_INTERNAL_ERROR;
> - } else if (!bsp_interrupt_is_valid_vector(vector)) {
> - return RTEMS_INVALID_ID;
> - } else if (handler == NULL) {
> - return RTEMS_INVALID_ADDRESS;
> - } else if (rtems_interrupt_is_in_progress()) {
> - return RTEMS_CALLED_FROM_ISR;
> - }
> + sc = bsp_interrupt_check_and_lock( vector, handler );
>
> - /* Lock */
> - bsp_interrupt_lock();
> + if ( sc != RTEMS_SUCCESSFUL ) {
> + return sc;
> + }
>
> /* Get handler table index */
> index = bsp_interrupt_handler_index(vector);
> @@ -325,6 +344,7 @@ static rtems_status_code bsp_interrupt_handler_remove(
> void *arg
> )
> {
> + rtems_status_code sc;
> rtems_interrupt_level level;
> rtems_vector_number index = 0;
> rtems_interrupt_entry *head = NULL;
> @@ -332,19 +352,11 @@ static rtems_status_code bsp_interrupt_handler_remove(
> rtems_interrupt_entry *previous = NULL;
> rtems_interrupt_entry *match = NULL;
>
> - /* Check parameters and system state */
> - if (!bsp_interrupt_is_initialized()) {
> - return RTEMS_INTERNAL_ERROR;
> - } else if (!bsp_interrupt_is_valid_vector(vector)) {
> - return RTEMS_INVALID_ID;
> - } else if (handler == NULL) {
> - return RTEMS_INVALID_ADDRESS;
> - } else if (rtems_interrupt_is_in_progress()) {
> - return RTEMS_CALLED_FROM_ISR;
> - }
> + sc = bsp_interrupt_check_and_lock( vector, handler );
>
> - /* Lock */
> - bsp_interrupt_lock();
> + if ( sc != RTEMS_SUCCESSFUL ) {
> + return sc;
> + }
>
> /* Get handler table index */
> index = bsp_interrupt_handler_index(vector);
> diff --git a/bsps/shared/irq/irq-handler-iterate.c
> b/bsps/shared/irq/irq-handler-iterate.c
> index 3c642b075e..385cb8db2d 100644
> --- a/bsps/shared/irq/irq-handler-iterate.c
> +++ b/bsps/shared/irq/irq-handler-iterate.c
> @@ -36,39 +36,26 @@
>
> #include <bsp/irq-generic.h>
>
> -/**
> - * @brief Iterates over all installed interrupt handler of a vector.
> - *
> - * @ingroup bsp_interrupt
> - *
> - * @return In addition to the standard status codes this function returns
> - * RTEMS_INTERNAL_ERROR if the BSP interrupt support is not initialized.
> - *
> - * @see rtems_interrupt_handler_iterate().
> - */
> -static rtems_status_code bsp_interrupt_handler_iterate(
> - rtems_vector_number vector,
> +rtems_status_code rtems_interrupt_handler_iterate(
> + rtems_vector_number vector,
> rtems_interrupt_per_handler_routine routine,
> - void *arg
> + void *arg
> )
> {
> - rtems_interrupt_entry *current = NULL;
> - rtems_option options = 0;
> - rtems_vector_number index = 0;
> + rtems_status_code sc;
> + rtems_vector_number index;
> + rtems_option options;
> + rtems_interrupt_entry *current;
>
> - /* Check parameters and system state */
> - if (!bsp_interrupt_is_initialized()) {
> - return RTEMS_INTERNAL_ERROR;
> - } else if (!bsp_interrupt_is_valid_vector(vector)) {
> - return RTEMS_INVALID_ID;
> - } else if (rtems_interrupt_is_in_progress()) {
> - return RTEMS_CALLED_FROM_ISR;
> - }
> + sc = bsp_interrupt_check_and_lock(
> + vector,
> + (rtems_interrupt_handler) routine
> + );
>
> - /* Lock */
> - bsp_interrupt_lock();
> + if ( sc != RTEMS_SUCCESSFUL ) {
> + return sc;
> + }
>
> - /* Interate */
> index = bsp_interrupt_handler_index(vector);
> current = &bsp_interrupt_handler_table [index];
> if (!bsp_interrupt_is_empty_handler_entry(current)) {
> @@ -80,17 +67,7 @@ static rtems_status_code bsp_interrupt_handler_iterate(
> } while (current != NULL);
> }
>
> - /* Unlock */
> bsp_interrupt_unlock();
>
> return RTEMS_SUCCESSFUL;
> }
> -
> -rtems_status_code rtems_interrupt_handler_iterate(
> - rtems_vector_number vector,
> - rtems_interrupt_per_handler_routine routine,
> - void *arg
> -)
> -{
> - return bsp_interrupt_handler_iterate(vector, routine, arg);
> -}
> --
> 2.26.2
>
> _______________________________________________
> devel mailing list
> devel@rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
