Changeset 28950f0b in rtems


Ignore:
Timestamp:
Feb 5, 2015, 1:35:33 PM (4 years ago)
Author:
Daniel Hellstrom <daniel@…>
Branches:
4.11, master
Children:
d77b16d
Parents:
f407c51
git-author:
Daniel Hellstrom <daniel@…> (02/05/15 13:35:33)
git-committer:
Daniel Hellstrom <daniel@…> (04/16/15 23:10:22)
Message:

PCIF: fixed build warnings

Location:
c/src/lib/libbsp/sparc
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/Makefile.am

    rf407c51 r28950f0b  
    4242EXTRA_DIST += shared/include/grpci.h
    4343EXTRA_DIST += shared/include/grpci2.h
     44EXTRA_DIST += shared/include/pcif.h
    4445EXTRA_DIST += shared/pci/grpci.c
    4546EXTRA_DIST += shared/pci/grpci2.c
  • c/src/lib/libbsp/sparc/leon2/Makefile.am

    rf407c51 r28950f0b  
    100100include_HEADERS += ../../sparc/shared/include/grpci.h
    101101include_HEADERS += ../../sparc/shared/include/grpci2.h
     102include_HEADERS += ../../sparc/shared/include/pcif.h
    102103libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
    103104libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
  • c/src/lib/libbsp/sparc/leon2/preinstall.am

    rf407c51 r28950f0b  
    126126PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpci2.h
    127127
     128$(PROJECT_INCLUDE)/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/$(dirstamp)
     129        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pcif.h
     130PREINSTALL_FILES += $(PROJECT_INCLUDE)/pcif.h
     131
    128132$(PROJECT_INCLUDE)/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/$(dirstamp)
    129133        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gr_701.h
  • c/src/lib/libbsp/sparc/leon3/Makefile.am

    rf407c51 r28950f0b  
    109109include_HEADERS += ../../sparc/shared/include/grpci.h
    110110include_HEADERS += ../../sparc/shared/include/grpci2.h
     111include_HEADERS += ../../sparc/shared/include/pcif.h
    111112libbsp_a_SOURCES += ../../sparc/shared/pci/grpci.c
    112113libbsp_a_SOURCES += ../../sparc/shared/pci/grpci2.c
  • c/src/lib/libbsp/sparc/leon3/preinstall.am

    rf407c51 r28950f0b  
    141141        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/grpci2.h
    142142PREINSTALL_FILES += $(PROJECT_INCLUDE)/grpci2.h
     143
     144$(PROJECT_INCLUDE)/pcif.h: ../../sparc/shared/include/pcif.h $(PROJECT_INCLUDE)/$(dirstamp)
     145        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pcif.h
     146PREINSTALL_FILES += $(PROJECT_INCLUDE)/pcif.h
    143147
    144148$(PROJECT_INCLUDE)/gr_701.h: ../../sparc/shared/include/gr_701.h $(PROJECT_INCLUDE)/$(dirstamp)
  • c/src/lib/libbsp/sparc/shared/pci/pcif.c

    rf407c51 r28950f0b  
    2222#include <libcpu/byteorder.h>
    2323#include <libcpu/access.h>
     24#include <rtems/bspIo.h>
    2425#include <pci.h>
    2526#include <pci/cfg.h>
     
    2930#include <ambapp.h>
    3031#include <drvmgr/pci_bus.h>
    31 
    32 #include <pci.h>
    33 #include <rtems/bspIo.h>
    34 #include <string.h>
     32#include <pcif.h>
     33
    3534
    3635/* Configuration options */
     
    154153}
    155154
    156 int pcif_cfg_r32(pci_dev_t dev, int ofs, uint32_t *val)
     155static int pcif_cfg_r32(pci_dev_t dev, int ofs, uint32_t *val)
    157156{
    158157        struct pcif_priv *priv = pcifpriv;
     
    198197        return retval;
    199198}
    200 int pcif_cfg_r16(pci_dev_t dev, int ofs, uint16_t *val)
     199
     200static int pcif_cfg_r16(pci_dev_t dev, int ofs, uint16_t *val)
    201201{
    202202        uint32_t v;
     
    212212}
    213213
    214 int pcif_cfg_r8(pci_dev_t dev, int ofs, uint8_t *val)
     214static int pcif_cfg_r8(pci_dev_t dev, int ofs, uint8_t *val)
    215215{
    216216        uint32_t v;
     
    224224}
    225225
    226 int pcif_cfg_w32(pci_dev_t dev, int ofs, uint32_t val)
     226static int pcif_cfg_w32(pci_dev_t dev, int ofs, uint32_t val)
    227227{
    228228        struct pcif_priv *priv = pcifpriv;
     
    260260}
    261261
    262 int pcif_cfg_w16(pci_dev_t dev, int ofs, uint16_t val)
     262static int pcif_cfg_w16(pci_dev_t dev, int ofs, uint16_t val)
    263263{
    264264        uint32_t v;
     
    277277}
    278278
    279 int pcif_cfg_w8(pci_dev_t dev, int ofs, uint8_t val)
     279static int pcif_cfg_w8(pci_dev_t dev, int ofs, uint8_t val)
    280280{
    281281        uint32_t v;
     
    301301 * 0xff if not assigned.
    302302 */
    303 uint8_t pcif_bus0_irq_map(pci_dev_t dev, int irq_pin)
     303static uint8_t pcif_bus0_irq_map(pci_dev_t dev, int irq_pin)
    304304{
    305305        uint8_t sysIrqNr = 0; /* not assigned */
     
    316316}
    317317
    318 int pcif_translate(uint32_t *address, int type, int dir)
     318static int pcif_translate(uint32_t *address, int type, int dir)
    319319{
    320320        /* No address translation implmented at this point */
     
    351351 *
    352352 */
    353 int pcif_hw_init(struct pcif_priv *priv)
     353static int pcif_hw_init(struct pcif_priv *priv)
    354354{
    355355        struct pcif_regs *regs;
     
    413413 *  -4            Error registering driver to PCI layer
    414414 */
    415 int pcif_init(struct pcif_priv *priv)
     415static int pcif_init(struct pcif_priv *priv)
    416416{
    417417        struct ambapp_apb_info *apb;
Note: See TracChangeset for help on using the changeset viewer.