Changeset 4abbc567 in rtems


Ignore:
Timestamp:
Oct 9, 2014, 9:40:20 PM (6 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, 5, master
Children:
308bb9b
Parents:
f95f212a
git-author:
Joel Sherrill <joel.sherrill@…> (10/09/14 21:40:20)
git-committer:
Joel Sherrill <joel.sherrill@…> (10/13/14 15:32:38)
Message:

powerpc bootloader: Remove warnings

This code is shared by multiple PowerPC BSPs including all
motorola_powerpc variants.

Location:
c/src/lib/libbsp/powerpc/shared
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h

    rf95f212a r4abbc567  
    11/*
    22 *  bootldr.h -- Include file for bootloader.
    3  *
     3 */
     4
     5/*
    46 *  Copyright (C) 1998, 1999 Gabriel Paubert, paubert@iram.es
    57 *
     
    207209int find_max_mem(struct pci_dev *);
    208210
     211/*
     212 * Prototypes for calls from assembly and across files.
     213 */
     214typedef struct _x86 x86;
     215
     216int em86_trap(x86 *p);
     217void decompress_kernel(int kernel_size, void * zimage_start, int len,
     218                       void * initrd_start, int initrd_len );
     219void boot_udelay(uint32_t _microseconds);
     220void setup_hw(void);
     221void _handler(int vec, ctxt *p);
     222int early_setup(u_long image_size);
     223void mm_init(u_long image_size);
    209224#endif
    210225
  • c/src/lib/libbsp/powerpc/shared/bootloader/em86.c

    rf95f212a r4abbc567  
    11/*
    22 *  em86.c -- Include file for bootloader.
    3  *
     3 */
     4
     5/*
    46 *  Copyright (C) 1998, 1999 Gabriel Paubert, paubert@iram.es
    57 *
     
    133135#endif
    134136
    135 int bios86pci(x86 * p) {
     137static int bios86pci(x86 * p) {
    136138        unsigned reg=ld_le16(&DI);
    137139        reg_type2 tmp;
     
    191193}
    192194
    193 void push2(x86 *p, unsigned value) {
     195static void push2(x86 *p, unsigned value) {
    194196        unsigned char * sbase= p->ssbase;
    195197        unsigned newsp = (ld_le16(&SP)-2)&0xffff;
     
    198200}
    199201
    200 unsigned pop2(x86 *p) {
     202static unsigned pop2(x86 *p) {
    201203        unsigned char * sbase=p->ssbase;
    202204        unsigned oldsp = ld_le16(&SP);
     
    205207}
    206208
    207 int int10h(x86 * p) { /* Process BIOS video interrupt */
     209static int int10h(x86 * p) { /* Process BIOS video interrupt */
    208210        unsigned vector;
    209211        vector=ld_le32((uint32_t *)p->vbase+0x10);
     
    241243}
    242244
    243 int process_softint(x86 * p) {
     245static int process_softint(x86 * p) {
    244246#if 0
    245247        if (p->parm1!=0x10 || AH!=0x0e) {
  • c/src/lib/libbsp/powerpc/shared/bootloader/lib.c

    rf95f212a r4abbc567  
    66 *
    77 *  You've been warned!!!.
    8  *
    9  *  CopyRight (C) 1998, 1999 valette@crf.canon.fr
     8 */
     9
     10/*
     11 *  Copyright (C) 1998, 1999 valette@crf.canon.fr
    1012 *
    1113 *  The license and distribution terms for this file may be
     
    1315 *  http://www.rtems.org/license/LICENSE.
    1416 */
     17
     18
     19/*
     20 * Provide our own prototypes to avoid warnings and risk getting inlined
     21 * conflicts from the normal header files.
     22 */
     23void* memset(void *p, int c, unsigned int n);
     24void* memcpy(void *dst, const void * src, unsigned int n);
     25char* strcat(char * dest, const char * src);
     26int strlen(const char* string);
    1527
    1628void* memset(void *p, int c, unsigned int n)
  • c/src/lib/libbsp/powerpc/shared/bootloader/misc.c

    rf95f212a r4abbc567  
    8787};
    8888
    89 void *zalloc(void *x, unsigned items, unsigned size)
     89static void *zalloc(void *x, unsigned items, unsigned size)
    9090{
    9191        void *p = salloc(items*size);
     
    9797}
    9898
    99 void zfree(void *x, void *addr, unsigned nb)
     99static void zfree(void *x, void *addr, unsigned nb)
    100100{
    101101        sfree(addr);
     
    231231static int ticks_per_ms=0;
    232232
    233 /* this is from rtems_bsp_delay from libcpu */
     233/*
     234 * This is based on rtems_bsp_delay from libcpu
     235 */
    234236void
    235 boot_udelay(uint32_t   _microseconds)
     237boot_udelay(uint32_t _microseconds)
    236238{
    237239   uint32_t   start, ticks, now;
     
    253255        int timer, err;
    254256        u_short default_vga_cmd;
    255         static unsigned int indic;
    256 
    257         indic = 0;
    258257
    259258        res=bd->residual;
  • c/src/lib/libbsp/powerpc/shared/bootloader/mm.c

    rf95f212a r4abbc567  
    130130 * designed to properly handle MMU interrupts to fill the hash table.
    131131 */
    132 
    133132void _handler(int vec, ctxt *p) {
    134133        map *area;
     
    425424 * linux are happy.
    426425 */
    427 void
     426static void
    428427fix_residual( RESIDUAL *res )
    429428{
  • c/src/lib/libbsp/powerpc/shared/bootloader/pci.c

    rf95f212a r4abbc567  
    714714};
    715715
    716 void pci_read_bases(struct pci_dev *dev, unsigned int howmany)
     716static void pci_read_bases(struct pci_dev *dev, unsigned int howmany)
    717717{
    718718   unsigned int reg, nextreg;
     
    799799}
    800800
    801 u_int pci_scan_bus(struct pci_bus *bus)
     801static u_int pci_scan_bus(struct pci_bus *bus)
    802802{
    803803   unsigned int devfn, max;
  • c/src/lib/libbsp/powerpc/shared/console/polled_io.c

    rf95f212a r4abbc567  
    444444#define vidmem ((__io_ptr)(ptr_mem_map->isa_mem_base+0xb8000))
    445445
    446 void vacuum_putc(u_char c) {
     446static void vacuum_putc(u_char c) {
    447447        console_global_data.vacuum_sent++;
    448448}
    449449
    450 int vacuum_getc(void) {
     450static int vacuum_getc(void) {
    451451        return -1;
    452452}
    453453
    454 int vacuum_tstc(void) {
     454static int vacuum_tstc(void) {
    455455        return 0;
    456456}
     
    497497#endif
    498498
    499 void log_putc(const u_char c) {
     499static void log_putc(const u_char c) {
    500500        console_log *l;
    501501        for(l=console_global_data.log; l; l=l->next) {
     
    550550#endif
    551551
    552 void serial_putc(const u_char c)
     552static void serial_putc(const u_char c)
    553553{
    554554        while ((INL_CONSOLE_INB(lsr) & LSR_THRE) == 0) ;
     
    556556}
    557557
    558 int serial_getc(void)
     558static int serial_getc(void)
    559559{
    560560        while ((INL_CONSOLE_INB(lsr) & LSR_DR) == 0) ;
     
    562562}
    563563
    564 int serial_tstc(void)
     564static int serial_tstc(void)
    565565{
    566566        return ((INL_CONSOLE_INB(lsr) & LSR_DR) != 0);
     
    593593}
    594594
    595 void
     595static void
    596596vga_putc(const u_char c)
    597597{
     
    812812}
    813813
    814 int kbd_tstc(void)
     814static int kbd_tstc(void)
    815815{
    816816        return ((kbd_inb(KBD_STATUS_REG) & KBD_STAT_OBF) != 0);
     
    896896        va_start(args, fmt);
    897897        i = k_vsprintf(buf, fmt, args);
     898        (void) i; /* avoid set but not used warning */
    898899        va_end(args);
    899900        my_puts((u_char*)buf);
Note: See TracChangeset for help on using the changeset viewer.