diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-06-17 13:24:47 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-06-17 13:24:47 +0000 |
commit | 169480b36a109cce45846a95e29f4120ad6a0375 (patch) | |
tree | 10b70f9008f1e081721036363804352d3ed23749 /c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c | |
parent | Fix formatting. (diff) | |
download | rtems-169480b36a109cce45846a95e29f4120ad6a0375.tar.bz2 |
2011-04-10 Kate Feng <feng@bnl.gov>
PR 1786/bsps
* Makefile.am: Add support for Altivec.
* startup/bspstart.c, Makefile.am: Use shared/startup/zerobss.c instead.
* make/custom/mvme5500.cfg: Change CPU_CFLAGS to
"-mcpu=7450 -mtune=7450 -Dmpc7455"
* irq/BSP_irq.c, pci/detect_host_bridge.c, pci.c, pcifinddevice.c:
Remove warnings.
* vme/VMEConfig.h, include/bsp.h: use VME shared IRQ handlers.
* network/if_100MHz/GT64260eth.c: Recycle the Rx mbuf if there
is any Rx error.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c index d9df14101b..56f97f8618 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c +++ b/c/src/lib/libbsp/powerpc/mvme5500/pci/pci.c @@ -108,7 +108,7 @@ unsigned char offset, uint8_t *val) BSP_pci[n].config_data,pciConfigPack(bus,dev,func,offset)); #endif - out_be32(BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); + out_be32((volatile unsigned int *) BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); *val = in_8(BSP_pci[n].pci_config_data + (offset&3)); return PCIBIOS_SUCCESSFUL; } @@ -129,8 +129,8 @@ unsigned char func, unsigned char offset, uint16_t *val) printk("addr %x, data %x, pack %x \n", config_addr, config_data,pciConfigPack(bus,dev,func,offset)); #endif - out_be32(BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); - *val = in_le16(BSP_pci[n].pci_config_data + (offset&2)); + out_be32((volatile unsigned int *) BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); + *val = in_le16((volatile unsigned short *) (BSP_pci[n].pci_config_data + (offset&2))); return PCIBIOS_SUCCESSFUL; } @@ -147,8 +147,8 @@ unsigned char func, unsigned char offset, uint32_t *val) *val = 0xffffffff; if ((offset&3)|| (offset & ~0xff)) return PCIBIOS_BAD_REGISTER_NUMBER; - out_be32(BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); - *val = in_le32(BSP_pci[n].pci_config_data); + out_be32((volatile unsigned int *)BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); + *val = in_le32((volatile unsigned int *)BSP_pci[n].pci_config_data); return PCIBIOS_SUCCESSFUL; } @@ -163,8 +163,8 @@ static int indirect_pci_write_config_byte(unsigned char bus, unsigned char dev,u if (offset & ~0xff) return PCIBIOS_BAD_REGISTER_NUMBER; - out_be32(BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); - out_8(BSP_pci[n].pci_config_data + (offset&3), val); + out_be32((volatile unsigned int *)BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); + out_8((volatile unsigned char *) (BSP_pci[n].pci_config_data + (offset&3)), val); return PCIBIOS_SUCCESSFUL; } @@ -179,8 +179,8 @@ static int indirect_pci_write_config_word(unsigned char bus, unsigned char dev,u if ((offset&1)|| (offset & ~0xff)) return PCIBIOS_BAD_REGISTER_NUMBER; - out_be32(BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); - out_le16(BSP_pci[n].pci_config_data + (offset&3), val); + out_be32((volatile unsigned int *)BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); + out_le16((volatile unsigned short *)(BSP_pci[n].pci_config_data + (offset&3)), val); return PCIBIOS_SUCCESSFUL; } @@ -195,8 +195,8 @@ static int indirect_pci_write_config_dword(unsigned char bus,unsigned char dev,u if ((offset&3)|| (offset & ~0xff)) return PCIBIOS_BAD_REGISTER_NUMBER; - out_be32(BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); - out_le32(BSP_pci[n].pci_config_data, val); + out_be32((volatile unsigned int *)BSP_pci[n].pci_config_addr, pciConfigPack(bus,dev,func,offset)); + out_le32((volatile unsigned int *)BSP_pci[n].pci_config_data, val); return PCIBIOS_SUCCESSFUL; } |