diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-02-25 10:42:04 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-02-25 15:34:06 +0100 |
commit | 8a640bf817eab7b556ae17d3fde10c189287eb68 (patch) | |
tree | f2a6ec5af710feef5818c7351bf1f7d8d0b19c1d /bsps/powerpc | |
parent | cpukit/libblock: Clean up before license change (diff) | |
download | rtems-8a640bf817eab7b556ae17d3fde10c189287eb68.tar.bz2 |
bsps/powerpc: Do no use Newlib internals
The struct _reent::__sdidinit member was renamed in a recent Newlib.
Diffstat (limited to 'bsps/powerpc')
-rw-r--r-- | bsps/powerpc/shared/mmu/e500-mmu.c | 3 | ||||
-rw-r--r-- | bsps/powerpc/shared/vme/vmeTsi148.c | 3 | ||||
-rw-r--r-- | bsps/powerpc/shared/vme/vmeUniverse.c | 3 | ||||
-rw-r--r-- | bsps/powerpc/virtex4/start/mmu.c | 3 | ||||
-rw-r--r-- | bsps/powerpc/virtex5/start/mmu.c | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/bsps/powerpc/shared/mmu/e500-mmu.c b/bsps/powerpc/shared/mmu/e500-mmu.c index ee69172e46..3f62a293e6 100644 --- a/bsps/powerpc/shared/mmu/e500-mmu.c +++ b/bsps/powerpc/shared/mmu/e500-mmu.c @@ -71,6 +71,7 @@ */ #include <rtems.h> #include <rtems/bspIo.h> +#include <rtems/score/sysstate.h> #include <inttypes.h> #include <stdio.h> @@ -125,7 +126,7 @@ myprintf(FILE *f, char *fmt, ...) va_list ap; va_start(ap, fmt); - if (!f || !_impure_ptr->__sdidinit) { + if (!f || !_System_state_Is_up(_System_state_Get())) { /* * Might be called at an early stage when * stdio is not yet initialized. diff --git a/bsps/powerpc/shared/vme/vmeTsi148.c b/bsps/powerpc/shared/vme/vmeTsi148.c index 3cb3f94e75..78b939717c 100644 --- a/bsps/powerpc/shared/vme/vmeTsi148.c +++ b/bsps/powerpc/shared/vme/vmeTsi148.c @@ -54,6 +54,7 @@ #include <rtems/bspIo.h> /* printk */ #include <rtems/error.h> /* printk */ #include <rtems/pci.h> +#include <rtems/score/sysstate.h> #include <bsp.h> #include <libcpu/byteorder.h> @@ -416,7 +417,7 @@ uprintf(FILE *f, char *fmt, ...) { va_list ap; va_start(ap, fmt); - if (!f || !_impure_ptr->__sdidinit) { + if (!f || !_System_state_Is_up(_System_state_Get())) { /* Might be called at an early stage when * to a buffer. */ diff --git a/bsps/powerpc/shared/vme/vmeUniverse.c b/bsps/powerpc/shared/vme/vmeUniverse.c index 18fe61f7c4..d0cd8e95e3 100644 --- a/bsps/powerpc/shared/vme/vmeUniverse.c +++ b/bsps/powerpc/shared/vme/vmeUniverse.c @@ -103,6 +103,7 @@ #include <rtems/bspIo.h> /* printk */ #include <rtems/error.h> #include <rtems/pci.h> +#include <rtems/score/sysstate.h> #include <bsp.h> #include <libcpu/byteorder.h> @@ -297,7 +298,7 @@ uprintf(FILE *f, char *fmt, ...) va_list ap; va_start(ap, fmt); #ifdef __rtems__ - if (!f || !_impure_ptr->__sdidinit) { + if (!f || !_System_state_Is_up(_System_state_Get())) { /* Might be called at an early stage when * stdio is not yet initialized. * There is no vprintk, hence we must assemble diff --git a/bsps/powerpc/virtex4/start/mmu.c b/bsps/powerpc/virtex4/start/mmu.c index e96619796b..906ac700f8 100644 --- a/bsps/powerpc/virtex4/start/mmu.c +++ b/bsps/powerpc/virtex4/start/mmu.c @@ -66,6 +66,7 @@ #include <rtems.h> #include <rtems/bspIo.h> #include <rtems/powerpc/powerpc.h> +#include <rtems/score/sysstate.h> #include <inttypes.h> #include <stdio.h> @@ -92,7 +93,7 @@ myprintf(FILE *f, char *fmt, ...) va_list ap; va_start(ap, fmt); - if (!f || !_impure_ptr->__sdidinit) { + if (!f || !_System_state_Is_up(_System_state_Get())) { /* Might be called at an early stage when stdio is not yet initialized. */ vprintk(fmt,ap); } else { diff --git a/bsps/powerpc/virtex5/start/mmu.c b/bsps/powerpc/virtex5/start/mmu.c index 874c57ee6f..e9bbd77264 100644 --- a/bsps/powerpc/virtex5/start/mmu.c +++ b/bsps/powerpc/virtex5/start/mmu.c @@ -66,6 +66,7 @@ #include <rtems.h> #include <rtems/bspIo.h> #include <rtems/powerpc/powerpc.h> +#include <rtems/score/sysstate.h> #include <inttypes.h> #include <stdio.h> @@ -92,7 +93,7 @@ myprintf(FILE *f, char *fmt, ...) va_list ap; va_start(ap, fmt); - if (!f || !_impure_ptr->__sdidinit) { + if (!f || !_System_state_Is_up(_System_state_Get())) { /* Might be called at an early stage when stdio is not yet initialized. */ vprintk(fmt,ap); } else { |