Changeset 0d5e41a in rtems

Timestamp:

12/01/22 07:55:24 (4 months ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

master

Children:

c46fbb9

Parents:

71d1acd

git-author:

Sebastian Huber <sebastian.huber@…> (12/01/22 07:55:24)

git-committer:

Sebastian Huber <sebastian.huber@…> (12/02/22 09:25:44)

Message:

bsps/irq: Add bsp_interrupt_get_dispatch_table_slot()

Update #4769.

Location:

bsps

Files:

• include/bsp/irq-generic.h (modified) (1 diff)
• shared/irq/irq-entry-remove.c (modified) (1 diff)
• shared/irq/irq-generic.c (modified) (5 diffs)
• shared/irq/irq-handler-iterate.c (modified) (1 diff)

bsps/include/bsp/irq-generic.h

@@ -664 +664 @@
 }
 
+/**
+ * @brief Gets a reference to the interrupt handler table slot associated with
+ *   the index.
+ *
+ * @return Returns a reference to the interrupt handler table slot associated
+ *   with the index.
+ */
+rtems_interrupt_entry **bsp_interrupt_get_dispatch_table_slot(
+  rtems_vector_number index
+);
+
 #ifdef __cplusplus
 }

bsps/shared/irq/irq-entry-remove.c

@@ -48 +48 @@
 
   index = bsp_interrupt_dispatch_index( vector );
-  first = bsp_interrupt_dispatch_table[ index ];
+  first = *bsp_interrupt_get_dispatch_table_slot( index );
   entry_next = entry->next;
 

bsps/shared/irq/irq-generic.c

@@ -50 +50 @@
 bsp_interrupt_dispatch_table[ BSP_INTERRUPT_DISPATCH_TABLE_SIZE ];
 
+RTEMS_WEAK rtems_interrupt_entry **bsp_interrupt_get_dispatch_table_slot(
+  rtems_vector_number index
+)
+{
+  return &bsp_interrupt_dispatch_table[ index ];
+}
+
 /* The last entry indicates if everything is initialized */
 uint8_t bsp_interrupt_handler_unique_table
@@ -92 +99 @@
    * to carry out an atomic read-modify-write operation.
    */
-  ptr = (Atomic_Uintptr *) &bsp_interrupt_dispatch_table[
+  ptr = (Atomic_Uintptr *) bsp_interrupt_get_dispatch_table_slot(
     bsp_interrupt_dispatch_index( vector )
-  ];
+  );
   first = (rtems_interrupt_entry *)
     _Atomic_Fetch_add_uintptr( ptr, 0, ATOMIC_ORDER_ACQUIRE );
@@ -144 +151 @@
   bsp_interrupt_assert( bsp_interrupt_is_valid_vector( vector ) );
   index = bsp_interrupt_dispatch_index( vector );
-  *previous_next = &bsp_interrupt_dispatch_table[ index ];
-  entry = bsp_interrupt_dispatch_table[ index ];
+  *previous_next = bsp_interrupt_get_dispatch_table_slot( index );
+  entry = **previous_next;
 
   while ( entry != NULL ) {
@@ -188 +195 @@
 #endif
   bsp_interrupt_entry_store_release(
-    &bsp_interrupt_dispatch_table[ index ],
+    bsp_interrupt_get_dispatch_table_slot( index ),
     entry
   );
@@ -221 +228 @@
 
   index = bsp_interrupt_dispatch_index( vector );
-  first = bsp_interrupt_dispatch_table[ index ];
+  first = *bsp_interrupt_get_dispatch_table_slot( index );
 
   if ( first == NULL ) {

bsps/shared/irq/irq-handler-iterate.c

@@ -58 +58 @@
 
   index = bsp_interrupt_dispatch_index( vector );
+  entry = *bsp_interrupt_get_dispatch_table_slot( index );
   options = bsp_interrupt_is_handler_unique( index ) ?
     RTEMS_INTERRUPT_UNIQUE : RTEMS_INTERRUPT_SHARED;
-  entry = bsp_interrupt_dispatch_table[ index ];
 
   while ( entry != NULL ) {