Ignore:
Timestamp:
Apr 10, 2003, 4:39:52 PM (17 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
ee3afa2
Parents:
0d6849e7
Message:

2003-04-10 Till Straumann <strauman@…>

PR 380/bsps

  • vmeUniverse/vmeUniverse.c, vmeUniverse/vmeUniverse.h: make printk format strings compliant with libcpu/printk. minor fixes and lazy init bugfix.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.c

    r0d6849e7 r2f73363  
    180180#define UNIV_REV(base) (READ_LE(base,2*sizeof(LERegister)) & 0xff)
    181181       
    182 #ifdef __rtems__
     182#if defined(__rtems__) && 0
    183183static int
    184184uprintk(char *fmt, va_list ap)
     
    201201
    202202/* private printing wrapper */
    203 static int
     203static void
    204204uprintf(FILE *f, char *fmt, ...)
    205205{
    206206va_list ap;
    207 int     rval;
    208207        va_start(ap, fmt);
    209208#ifdef __rtems__
     
    214213                 * to a buffer.
    215214                 */
    216                 rval=uprintk(fmt,ap);
     215                vprintk(fmt,ap);
    217216        } else
    218217#endif
    219218        {
    220                 rval=vfprintf(f,fmt,ap);
     219                vfprintf(f,fmt,ap);
    221220        }
    222221        va_end(ap);
    223         return rval;
    224222}
    225223
     
    337335{
    338336#define base vmeUniverse0BaseAddr
    339 volatile LERegister *preg=base;
     337volatile LERegister *preg;
    340338unsigned long   p=port;
    341339unsigned long   mode=0;
     
    372370                return -1;
    373371        }
     372
     373        preg=base;
    374374
    375375        /* find out if we have a rev. II chip */
     
    503503
    504504        if (ismaster) {
    505                 uprintf(f,"%i:    0x%08lx 0x%08lx 0x%08lx ",
     505                uprintf(f,"%d:    0x%08lx 0x%08lx 0x%08lx ",
    506506                        portno,offst,bound-start,start);
    507507        } else {
    508                 uprintf(f,"%i:    0x%08lx 0x%08lx 0x%08lx ",
     508                uprintf(f,"%d:    0x%08lx 0x%08lx 0x%08lx ",
    509509                        portno,start,bound-start,offst);
    510510        }
     
    755755                uprintf(stderr,"unable to find the universe in pci config space\n");
    756756        } else {
    757                 uprintf(stderr,"Universe II PCI-VME bridge detected at 0x%08x, IRQ %i\n",
     757                uprintf(stderr,"Universe II PCI-VME bridge detected at 0x%08x, IRQ %d\n",
    758758                                (unsigned int)vmeUniverse0BaseAddr, vmeUniverse0PciIrqLine);
    759759        }
     
    10741074        /* give them a chance to override buggy PCI info */
    10751075        if (vmeIrqPicLine >= 0) {
    1076                 uprintf(stderr,"Overriding main IRQ line PCI info with %i\n",
     1076                uprintf(stderr,"Overriding main IRQ line PCI info with %d\n",
    10771077                                vmeIrqPicLine);
    10781078                vmeUniverse0PciIrqLine=vmeIrqPicLine;
Note: See TracChangeset for help on using the changeset viewer.