RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

powerpc/shared: Fix warnings

Browse Source
This commit is contained in:
Chris Johns
2021-02-12 15:25:07 -10:00
parent 86f031d401
commit 53abbbd08d
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bsps/powerpc/shared/vme/bspVmeDmaList.c
View File

@@ -47,6 +47,7 @@
* ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03 * ------------------ SLAC Software Notices, Set 4 OTT.002a, 2004 FEB 03
*/ */
#include <inttypes.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@@ -71,7 +72,7 @@ typedef struct VMEDmaListNodeRec_ {
static void static void
lprint(VMEDmaListNode d) lprint(VMEDmaListNode d)
{ {
printf("n 0x%08lx, p: 0x%08lx, n: 0x%08lx d: 0x%08lx\n", printf("n 0x%08" PRIu32", p: 0x%08" PRIu32 ", n: 0x%08" PRIu32 " d: 0x%08" PRIu32 "\n",
(uint32_t)d, (uint32_t)d->p, (uint32_t)d->n, (uint32_t)d->d); (uint32_t)d, (uint32_t)d->p, (uint32_t)d->n, (uint32_t)d->d);
} }
#endif #endif

15
bsps/powerpc/shared/vme/vmeTsi148.c
View File

@@ -46,6 +46,7 @@
*/ */
#include <rtems.h> #include <rtems.h>
#include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <bsp/irq.h> #include <bsp/irq.h>
@@ -2352,8 +2353,10 @@ static uint32_t
vme_attr(uint32_t xfer_mode) vme_attr(uint32_t xfer_mode)
{ {
uint32_t vme_mode; uint32_t vme_mode;
if ( am2omode(xfer_mode, &vme_mode) ) unsigned long ul;
if ( am2omode(xfer_mode, &ul) )
return BSP_VMEDMA_STATUS_UNSUP; return BSP_VMEDMA_STATUS_UNSUP;
vme_mode = (uint32_t) ul;
/* am2omode may set prefetch and other bits */ /* am2omode may set prefetch and other bits */
vme_mode &= TSI_DXAT_OTAT_MSK; vme_mode &= TSI_DXAT_OTAT_MSK;
@@ -2405,11 +2408,11 @@ static void
tsi_desc_dump(DmaDescriptor p) tsi_desc_dump(DmaDescriptor p)
{ {
VmeTsi148DmaListDescriptor d = p; VmeTsi148DmaListDescriptor d = p;
printf(" DSA: 0x%08lx%08lx\n", ld_be32(&d->dsau), ld_be32(&d->dsal)); printf(" DSA: 0x%08" PRIx32 "%08" PRIx32 "\n", ld_be32(&d->dsau), ld_be32(&d->dsal));
printf(" DDA: 0x%08lx%08lx\n", ld_be32(&d->ddau), ld_be32(&d->ddal)); printf(" DDA: 0x%08" PRIx32 "%08" PRIx32 "\n", ld_be32(&d->ddau), ld_be32(&d->ddal));
printf(" NLA: 0x%08lx%08lx\n", ld_be32(&d->dnlau), ld_be32(&d->dnlal)); printf(" NLA: 0x%08" PRIx32 "%08" PRIx32 "\n", ld_be32(&d->dnlau), ld_be32(&d->dnlal));
printf(" SAT: 0x%08lx DAT: 0x%08lx\n", ld_be32(&d->dsat), ld_be32(&d->ddat)); printf(" SAT: 0x%08" PRIx32 " DAT: 0x%08" PRIx32 "\n", ld_be32(&d->dsat), ld_be32(&d->ddat));
printf(" CNT: 0x%08lx\n", ld_be32(&d->dcnt)); printf(" CNT: 0x%08" PRIx32 "\n", ld_be32(&d->dcnt));
} }

8
bsps/powerpc/shared/vme/vmeUniverse.c
View File

@@ -1301,6 +1301,7 @@ static uint32_t
xfer_mode2dctl(uint32_t xfer_mode) xfer_mode2dctl(uint32_t xfer_mode)
{ {
uint32_t dctl; uint32_t dctl;
unsigned long ul;
/* Check requested bus mode */ /* Check requested bus mode */
@@ -1323,8 +1324,9 @@ uint32_t dctl;
return BSP_VMEDMA_STATUS_UNSUP; return BSP_VMEDMA_STATUS_UNSUP;
/* Luckily DCTL bits match MCTL bits so we can use am2mode */ /* Luckily DCTL bits match MCTL bits so we can use am2mode */
if ( am2mode( 1, xfer_mode, &dctl ) ) if ( am2mode( 1, xfer_mode, &ul ) )
return BSP_VMEDMA_STATUS_UNSUP; return BSP_VMEDMA_STATUS_UNSUP;
dctl = (uint32_t) ul;
/* However, the book says that for DMA VAS==5 [which would /* However, the book says that for DMA VAS==5 [which would
* be a CSR access] is reserved. Tests indicate that * be a CSR access] is reserved. Tests indicate that
@@ -1959,7 +1961,7 @@ unsigned long linten;
#else #else
vmeUniverseIntDisable(lvl); vmeUniverseIntDisable(lvl);
#endif #endif
printk("vmeUniverse ISR: error read from STATID register; (level: %i) STATID: 0x%08" PRIx32 " -- DISABLING\n", lvl, status); printk("vmeUniverse ISR: error read from STATID register; (level: %i) STATID: 0x%08lx -- DISABLING\n", lvl, status);
} else if (!(ip=universeHdlTbl[status & UNIV_VIRQ_STATID_MASK])) { } else if (!(ip=universeHdlTbl[status & UNIV_VIRQ_STATID_MASK])) {
#ifdef BSP_PIC_DO_EOI #ifdef BSP_PIC_DO_EOI
linten &= ~msk; linten &= ~msk;
@@ -1967,7 +1969,7 @@ unsigned long linten;
vmeUniverseIntDisable(lvl); vmeUniverseIntDisable(lvl);
#endif #endif
/* TODO: log error message - RTEMS has no logger :-( */ /* TODO: log error message - RTEMS has no logger :-( */
printk("vmeUniverse ISR: no handler installed for this vector; (level: %i) STATID: 0x%08" PRIx32 " -- DISABLING\n", lvl, status); printk("vmeUniverse ISR: no handler installed for this vector; (level: %i) STATID: 0x%08lx -- DISABLING\n", lvl, status);
} else { } else {
/* dispatch handler, it must clear the IRQ at the device */ /* dispatch handler, it must clear the IRQ at the device */
ip->isr(ip->usrData, status&UNIV_VIRQ_STATID_MASK); ip->isr(ip->usrData, status&UNIV_VIRQ_STATID_MASK);