diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-03-31 01:14:39 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-03-31 01:14:39 +0000 |
commit | 18a3bbeb0d65988ba573db007661692a8fc7a774 (patch) | |
tree | cdd010ac37b2db3fdd29c5ef1f885b75c95c0baa /c/src/lib/libbsp/powerpc/shared/bootloader | |
parent | 2007-03-31 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-18a3bbeb0d65988ba573db007661692a8fc7a774.tar.bz2 |
Use stdint.h fixed-size types.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/shared/bootloader')
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h | 25 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/em86.c | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/pci.c | 32 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/pci.h | 12 |
4 files changed, 40 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h index 43c082df84..2144a285e9 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/bootldr.h @@ -19,6 +19,7 @@ #define _PPC_BOOTLDR_H #ifndef ASM +#include <stdint.h> #include <bsp/residual.h> #include <bsp/consoleIo.h> #include "pci.h" @@ -78,77 +79,77 @@ register boot_data *bd __asm__("r13"); extern inline int pcibios_read_config_byte(u_char bus, u_char dev_fn, - u_char where, u_char * val) { + u_char where, uint8_t *val) { return bd->pci_functions->read_config_byte(bus, dev_fn, where, val); } extern inline int pcibios_read_config_word(u_char bus, u_char dev_fn, - u_char where, u_short * val) { + u_char where, uint16_t *val) { return bd->pci_functions->read_config_word(bus, dev_fn, where, val); } extern inline int pcibios_read_config_dword(u_char bus, u_char dev_fn, - u_char where, u_int * val) { + u_char where, uint32_t *val) { return bd->pci_functions->read_config_dword(bus, dev_fn, where, val); } extern inline int pcibios_write_config_byte(u_char bus, u_char dev_fn, - u_char where, u_char val) { + u_char where, uint8_t val) { return bd->pci_functions->write_config_byte(bus, dev_fn, where, val); } extern inline int pcibios_write_config_word(u_char bus, u_char dev_fn, - u_char where, u_short val) { + u_char where, uint16_t val) { return bd->pci_functions->write_config_word(bus, dev_fn, where, val); } extern inline int pcibios_write_config_dword(u_char bus, u_char dev_fn, - u_char where, u_int val) { + u_char where, uint32_t val) { return bd->pci_functions->write_config_dword(bus, dev_fn, where, val); } extern inline int -pci_bootloader_read_config_byte(struct pci_dev *dev, u_char where, u_char * val) { +pci_bootloader_read_config_byte(struct pci_dev *dev, u_char where, uint8_t *val) { return bd->pci_functions->read_config_byte(dev->bus->number, dev->devfn, where, val); } extern inline int -pci_bootloader_read_config_word(struct pci_dev *dev, u_char where, u_short * val) { +pci_bootloader_read_config_word(struct pci_dev *dev, u_char where, uint16_t *val) { return bd->pci_functions->read_config_word(dev->bus->number, dev->devfn, where, val); } extern inline int -pci_bootloader_read_config_dword(struct pci_dev *dev, u_char where, u_int * val) { +pci_bootloader_read_config_dword(struct pci_dev *dev, u_char where, uint32_t *val) { return bd->pci_functions->read_config_dword(dev->bus->number, dev->devfn, where, val); } extern inline int -pci_bootloader_write_config_byte(struct pci_dev *dev, u_char where, u_char val) { +pci_bootloader_write_config_byte(struct pci_dev *dev, u_char where, uint8_t val) { return bd->pci_functions->write_config_byte(dev->bus->number, dev->devfn, where, val); } extern inline int -pci_bootloader_write_config_word(struct pci_dev *dev, u_char where, u_short val) { +pci_bootloader_write_config_word(struct pci_dev *dev, u_char where, uint16_t val) { return bd->pci_functions->write_config_word(dev->bus->number, dev->devfn, where, val); } extern inline int -pci_bootloader_write_config_dword(struct pci_dev *dev, u_char where, u_int val) { +pci_bootloader_write_config_dword(struct pci_dev *dev, u_char where, uint32_t val) { return bd->pci_functions->write_config_dword(dev->bus->number, dev->devfn, where, val); diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c index d88bcfa3b9..a7584ea294 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/em86.c @@ -45,8 +45,8 @@ typedef union _reg_type1 { } reg_type1; typedef union _reg_type2 { - unsigned e; - unsigned short x; + uint32_t e; + uint16_t x; } reg_type2; typedef struct _x86 { @@ -492,7 +492,8 @@ void em86_main(struct pci_dev *dev){ u_short signature; u_char length; volatile u_int *src; - u_int *dst, left, saved_rom; + u_int *dst, left; + uint32_t saved_rom; #if defined(MONITOR_IO) && !defined(__BOOT__) #define IOMASK 0xff #else diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c index 6913a1befa..7b508ce0f6 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.c @@ -542,7 +542,7 @@ static void reconfigure_pci(void) { static int indirect_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned char *val) { + unsigned char offset, uint8_t *val) { out_be32(pci->config_addr, 0x80|(bus<<8)|(dev_fn<<16)|((offset&~3)<<24)); *val=in_8(pci->config_data + (offset&3)); @@ -551,7 +551,7 @@ indirect_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, static int indirect_pci_read_config_word(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned short *val) { + unsigned char offset, uint16_t *val) { *val = 0xffff; if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER; out_be32(pci->config_addr, @@ -562,7 +562,7 @@ indirect_pci_read_config_word(unsigned char bus, unsigned char dev_fn, static int indirect_pci_read_config_dword(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned int *val) { + unsigned char offset, uint32_t *val) { *val = 0xffffffff; if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER; out_be32(pci->config_addr, @@ -573,7 +573,7 @@ indirect_pci_read_config_dword(unsigned char bus, unsigned char dev_fn, static int indirect_pci_write_config_byte(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned char val) { + unsigned char offset, uint8_t val) { out_be32(pci->config_addr, 0x80|(bus<<8)|(dev_fn<<16)|((offset&~3)<<24)); out_8(pci->config_data + (offset&3), val); @@ -582,7 +582,7 @@ indirect_pci_write_config_byte(unsigned char bus, unsigned char dev_fn, static int indirect_pci_write_config_word(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned short val) { + unsigned char offset, uint16_t val) { if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER; out_be32(pci->config_addr, 0x80|(bus<<8)|(dev_fn<<16)|((offset&~3)<<24)); @@ -592,7 +592,7 @@ indirect_pci_write_config_word(unsigned char bus, unsigned char dev_fn, static int indirect_pci_write_config_dword(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned int val) { + unsigned char offset, uint32_t val) { if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER; out_be32(pci->config_addr, 0x80|(bus<<8)|(dev_fn<<16)|(offset<<24)); @@ -611,7 +611,7 @@ static const struct pci_bootloader_config_access_functions indirect_functions = static int direct_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned char *val) { + unsigned char offset, uint8_t *val) { if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) { *val=0xff; return PCIBIOS_DEVICE_NOT_FOUND; @@ -623,7 +623,7 @@ direct_pci_read_config_byte(unsigned char bus, unsigned char dev_fn, static int direct_pci_read_config_word(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned short *val) { + unsigned char offset, uint16_t *val) { *val = 0xffff; if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER; if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) { @@ -637,7 +637,7 @@ direct_pci_read_config_word(unsigned char bus, unsigned char dev_fn, static int direct_pci_read_config_dword(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned int *val) { + unsigned char offset, uint32_t *val) { *val = 0xffffffff; if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER; if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) { @@ -651,7 +651,7 @@ direct_pci_read_config_dword(unsigned char bus, unsigned char dev_fn, static int direct_pci_write_config_byte(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned char val) { + unsigned char offset, uint8_t val) { if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) { return PCIBIOS_DEVICE_NOT_FOUND; } @@ -663,7 +663,7 @@ direct_pci_write_config_byte(unsigned char bus, unsigned char dev_fn, static int direct_pci_write_config_word(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned short val) { + unsigned char offset, uint16_t val) { if (offset&1) return PCIBIOS_BAD_REGISTER_NUMBER; if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) { return PCIBIOS_DEVICE_NOT_FOUND; @@ -677,7 +677,7 @@ direct_pci_write_config_word(unsigned char bus, unsigned char dev_fn, static int direct_pci_write_config_dword(unsigned char bus, unsigned char dev_fn, - unsigned char offset, unsigned int val) { + unsigned char offset, uint32_t val) { if (offset&3) return PCIBIOS_BAD_REGISTER_NUMBER; if (bus != 0 || (1<<PCI_SLOT(dev_fn) & 0xff8007fe)) { return PCIBIOS_DEVICE_NOT_FOUND; @@ -785,7 +785,9 @@ void pci_read_bases(struct pci_dev *dev, unsigned int howmany) u_int pci_scan_bus(struct pci_bus *bus) { - unsigned int devfn, l, max, class; + unsigned int devfn, max; + uint32_t class; + uint32_t l; unsigned char irq, hdr_type, is_multi = 0; struct pci_dev *dev, **bus_last; struct pci_bus *child; @@ -891,7 +893,7 @@ u_int pci_scan_bus(struct pci_bus *bus) * If it's a bridge, scan the bus behind it. */ if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { - unsigned int buses; + uint32_t buses; unsigned int devfn = dev->devfn; unsigned short cr; @@ -1321,7 +1323,7 @@ void pci_init(void) } } else { /* Let us try by experimentation at our own risk! */ - u_int id0; + uint32_t id0; bd->pci_functions = &direct_functions; /* On all direct bridges I know the host bridge itself * appears as device 0 function 0. diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h index fec2976f18..33a276f4b0 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/pci.h @@ -23,17 +23,17 @@ /* Functions used to access pci configuration space */ struct pci_bootloader_config_access_functions { int (*read_config_byte)(unsigned char, unsigned char, - unsigned char, unsigned char *); + unsigned char, uint8_t *); int (*read_config_word)(unsigned char, unsigned char, - unsigned char, unsigned short *); + unsigned char, uint16_t *); int (*read_config_dword)(unsigned char, unsigned char, - unsigned char, unsigned int *); + unsigned char, uint32_t *); int (*write_config_byte)(unsigned char, unsigned char, - unsigned char, unsigned char); + unsigned char, uint8_t); int (*write_config_word)(unsigned char, unsigned char, - unsigned char, unsigned short); + unsigned char, uint16_t); int (*write_config_dword)(unsigned char, unsigned char, - unsigned char, unsigned int); + unsigned char, uint32_t); }; /* |