Changeset d62e807 in rtems


Ignore:
Timestamp:
Dec 2, 2007, 11:35:56 PM (12 years ago)
Author:
Till Straumann <strauman@…>
Branches:
4.10, 4.11, 4.9, master
Children:
7b57da6
Parents:
c10dc13
Message:

2007-12-02 Till Straumann <strauman@…>

  • vmeUniverse/vmeUniverse.c, vmeUniverse/vmeTsi148.c: silenced compiler warnings caused by type changes in byteorder.h (volatile unsigned * -> volatile uint32_t *)
Location:
c/src/lib/libbsp/shared
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/shared/ChangeLog

    rc10dc13 rd62e807  
     12007-12-02      Till Straumann <strauman@slac.stanford.edu>
     2
     3        * vmeUniverse/vmeUniverse.c, vmeUniverse/vmeTsi148.c:
     4        silenced compiler warnings caused by type changes
     5        in byteorder.h (volatile unsigned * -> volatile uint32_t *)
     6
    172007-11-26      Joel Sherrill <joel.sherrill@oarcorp.com>
    28
  • c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c

    rc10dc13 rd62e807  
    5959#include <libcpu/byteorder.h>
    6060
     61#ifndef __INSIDE_RTEMS_BSP__
    6162#define __INSIDE_RTEMS_BSP__
     63#endif
    6264
    6365#include "vmeTsi148.h"
     
    309311#endif
    310312
    311 typedef unsigned int pci_ulong;
     313typedef uint32_t pci_ulong;
    312314
    313315#ifdef __BIG_ENDIAN__
  • c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c

    rc10dc13 rd62e807  
    4949
    5050#include <stdio.h>
     51#include <inttypes.h>
    5152
    5253#if defined(__rtems__)
     54#ifndef __INSIDE_RTEMS_BSP__
    5355#define __INSIDE_RTEMS_BSP__
     56#endif
    5457#endif
    5558
     
    126129 * Should be defined by the BSP.
    127130 */
    128 typedef unsigned int pci_ulong;
     131typedef uint32_t pci_ulong;
    129132
    130133#ifndef BSP_PCI2LOCAL_ADDR
     
    209212        __asm__ __volatile__("stwbrx %1, %0, %2" :: "b"(off),"r"(val),"r"(adrs));
    210213#elif defined(__rtems__)
    211         st_le32((volatile unsigned long*)(((unsigned long)adrs)+off), val);
     214        st_le32((volatile uint32_t *)(((uint32_t)adrs)+off), val);
    212215#else
    213216#error "little endian register writing not implemented"
     
    238241        return rval;
    239242#elif defined(__rtems__)
    240         return ld_le32((volatile unsigned long*)adrs);
     243        return ld_le32((volatile uint32_t*)adrs);
    241244#else
    242245#error "little endian register reading not implemented"
     
    15501553 */
    15511554
    1552 typedef volatile unsigned LERegister1;
     1555typedef volatile uint32_t LERegister1;
    15531556
    15541557typedef struct VmeUniverseDmaListDescRec_ {
     
    15851588};
    15861589
    1587 /* gcc complains even if unsigned and uint32 are the same size :-( */
    1588 
    1589 static inline void ST_LE32(volatile uint32_t *a, uint32_t v)
    1590 {
    1591         st_le32( (volatile unsigned *)a, v);
    1592 }
    1593 
    15941590static void     uni_desc_init  (DmaDescriptor p)
    15951591{
     
    17031699        printf("   DLA: 0x%08x\n", ld_le32(&d->dla));
    17041700        printf("   DVA: 0x%08x\n", ld_le32(&d->dva));
    1705         printf("  DCPP: 0x%08x%s\n", dcpp, (dcpp & UNIV_DCPP_IMG_NULL) ? " (LAST)" : "");
     1701        printf("  DCPP: 0x%08"PRIx32"%s\n", dcpp, (dcpp & UNIV_DCPP_IMG_NULL) ? " (LAST)" : "");
    17061702        printf("   CTL: 0x%08x\n", ld_le32(&d->dctl));
    17071703        printf("   TBC: 0x%08x\n", ld_le32(&d->dtbc));
     
    23722368int                                     i, err = 0;
    23732369int                                     doDisable = 0;
    2374 uint32_t                        size;
     2370size_t                          size;
    23752371unsigned long           msg;
    23762372char *                          irqfmt  = "VME IRQ @vector %3i %s";
Note: See TracChangeset for help on using the changeset viewer.