From a00dff42cfdf201abe15829baeeb2b6341a0426b Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 12 Dec 2019 06:37:01 +0100 Subject: rtems: Add and use rtems_object_get_local_node() Update #3841. --- bsps/include/shm_driver.h | 2 +- bsps/shared/shmdr/shmdr-dump.c | 2 +- bsps/shared/shmdr/shmdr-init.c | 2 +- bsps/shared/shmdr/shmdr-send.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bsps') diff --git a/bsps/include/shm_driver.h b/bsps/include/shm_driver.h index e357b46e5e..3dca866aa1 100644 --- a/bsps/include/shm_driver.h +++ b/bsps/include/shm_driver.h @@ -239,7 +239,7 @@ extern "C" { /* macros */ #define Shm_Is_master_node() \ - ( SHM_MASTER ==_Configuration_MP_table-> node ) + ( SHM_MASTER == rtems_object_get_local_node() ) #define Shm_Free_envelope( ecb ) \ Shm_Locked_queue_Add( FREE_ENV_CB, (ecb) ) diff --git a/bsps/shared/shmdr/shmdr-dump.c b/bsps/shared/shmdr/shmdr-dump.c index f1be932467..4195f914f1 100644 --- a/bsps/shared/shmdr/shmdr-dump.c +++ b/bsps/shared/shmdr/shmdr-dump.c @@ -41,7 +41,7 @@ Shm_Print_statistics(void) packets_per_second++; printk( "\n\nSHMDR STATISTICS (NODE %" PRId32 ")\n", - Multiprocessing_configuration.node ); + rtems_object_get_local_node() ); printk( "TICKS SINCE BOOT = %" PRId32 "\n", ticks ); printk( "TICKS PER SECOND = %" PRId32 "\n", ticks_per_second ); printk( "ISRs=%" PRId32 "\n", Shm_Interrupt_count ); diff --git a/bsps/shared/shmdr/shmdr-init.c b/bsps/shared/shmdr/shmdr-init.c index 0cf51172ce..c119145191 100644 --- a/bsps/shared/shmdr/shmdr-init.c +++ b/bsps/shared/shmdr/shmdr-init.c @@ -46,7 +46,7 @@ rtems_mpci_entry Shm_Initialization( void ) uint32_t remaining_memory; uint32_t local_node; - local_node = _Configuration_MP_table->node; + local_node = rtems_object_get_local_node(); Shm_Get_configuration( local_node, &Shm_Configuration ); diff --git a/bsps/shared/shmdr/shmdr-send.c b/bsps/shared/shmdr/shmdr-send.c index c3ac7d51c2..b8ee2d4da4 100644 --- a/bsps/shared/shmdr/shmdr-send.c +++ b/bsps/shared/shmdr/shmdr-send.c @@ -46,7 +46,7 @@ rtems_mpci_entry Shm_Send_packet( } else { for( nnum = SHM_FIRST_NODE ; nnum <= SHM_MAXIMUM_NODES ; nnum++ ) - if ( _Configuration_MP_table->node != nnum ) { + if ( rtems_object_get_local_node() != nnum ) { struct pkt_cpy *pkt; tmp_ecb = Shm_Allocate_envelope(); -- cgit v1.2.3