From 38386473bbfa8f7a1a218dc83ee35ae95d9471af Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 1 Oct 2009 12:24:10 +0000 Subject: =?UTF-8?q?2009-10-01=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR 1445/BSPs * pci/pci.c: Rename pci_[read|write]_config* functions into BSP_pci_[read|write]_config* and make them static. --- c/src/lib/libbsp/sparc/leon2/ChangeLog | 6 ++++++ c/src/lib/libbsp/sparc/leon2/pci/pci.c | 36 +++++++++++++++++----------------- c/src/lib/libbsp/sparc/leon3/ChangeLog | 6 ++++++ c/src/lib/libbsp/sparc/leon3/pci/pci.c | 36 +++++++++++++++++----------------- 4 files changed, 48 insertions(+), 36 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/sparc/leon2/ChangeLog b/c/src/lib/libbsp/sparc/leon2/ChangeLog index 14de17470a..40811dbea3 100644 --- a/c/src/lib/libbsp/sparc/leon2/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon2/ChangeLog @@ -1,3 +1,9 @@ +2009-10-01 Ralf Corsépius + + PR 1445/BSPs + * pci/pci.c: Rename pci_[read|write]_config* functions into + BSP_pci_[read|write]_config* and make them static. + 2009-09-29 Ralf Corsépius * pci/pci.c: Add prototypes for BusCountPCI(void), init_pci(void). diff --git a/c/src/lib/libbsp/sparc/leon2/pci/pci.c b/c/src/lib/libbsp/sparc/leon2/pci/pci.c index 4d7fe1771a..f328025a0b 100644 --- a/c/src/lib/libbsp/sparc/leon2/pci/pci.c +++ b/c/src/lib/libbsp/sparc/leon2/pci/pci.c @@ -105,8 +105,8 @@ struct pci_res { * AT697 pci controller to be able access all slots */ -int -pci_read_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned int *val) { +static int +BSP_pci_read_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned int *val) { volatile unsigned int data; @@ -136,8 +136,8 @@ pci_read_config_dword(unsigned char bus, unsigned char slot, unsigned char funct } -int -pci_read_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short *val) { +static int +BSP_pci_read_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short *val) { unsigned int v; if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER; @@ -149,8 +149,8 @@ pci_read_config_word(unsigned char bus, unsigned char slot, unsigned char functi } -int -pci_read_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char *val) { +static int +BSP_pci_read_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char *val) { unsigned int v; pci_read_config_dword(bus, slot, function, offset&~3, &v); @@ -161,8 +161,8 @@ pci_read_config_byte(unsigned char bus, unsigned char slot, unsigned char functi } -int -pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned int val) { +static int +BSP_pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned int val) { if (offset & 3) return PCIBIOS_BAD_REGISTER_NUMBER; @@ -187,8 +187,8 @@ pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char func } -int -pci_write_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short val) { +static int +BSP_pci_write_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short val) { unsigned int v; if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER; @@ -201,8 +201,8 @@ pci_write_config_word(unsigned char bus, unsigned char slot, unsigned char funct } -int -pci_write_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char val) { +static int +BSP_pci_write_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char val) { unsigned int v; pci_read_config_dword(bus, slot, function, offset&~3, &v); @@ -215,12 +215,12 @@ pci_write_config_byte(unsigned char bus, unsigned char slot, unsigned char funct const pci_config_access_functions pci_access_functions = { - pci_read_config_byte, - pci_read_config_word, - pci_read_config_dword, - pci_write_config_byte, - pci_write_config_word, - pci_write_config_dword + BSP_pci_read_config_byte, + BSP_pci_read_config_word, + BSP_pci_read_config_dword, + BSP_pci_write_config_byte, + BSP_pci_write_config_word, + BSP_pci_write_config_dword }; pci_config BSP_pci_configuration = { (volatile unsigned char*)PCI_CONFIG_ADDR, diff --git a/c/src/lib/libbsp/sparc/leon3/ChangeLog b/c/src/lib/libbsp/sparc/leon3/ChangeLog index dd4e00b01d..d337b725d1 100644 --- a/c/src/lib/libbsp/sparc/leon3/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon3/ChangeLog @@ -1,3 +1,9 @@ +2009-10-01 Ralf Corsépius + + PR 1445/BSPs + * pci/pci.c: Rename pci_[read|write]_config* functions into + BSP_pci_[read|write]_config* and make them static. + 2009-09-29 Ralf Corsépius * pci/pci.c: Add prototypes for BusCountPCI(void), init_pci(void). diff --git a/c/src/lib/libbsp/sparc/leon3/pci/pci.c b/c/src/lib/libbsp/sparc/leon3/pci/pci.c index da51b6bde5..f41936bb87 100644 --- a/c/src/lib/libbsp/sparc/leon3/pci/pci.c +++ b/c/src/lib/libbsp/sparc/leon3/pci/pci.c @@ -97,8 +97,8 @@ static inline unsigned int flip_dword (unsigned int l) */ -int -pci_read_config_dword( +static int +BSP_pci_read_config_dword( unsigned char bus, unsigned char slot, unsigned char function, @@ -134,8 +134,8 @@ pci_read_config_dword( } -int -pci_read_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short *val) { +static int +BSP_pci_read_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short *val) { unsigned int v; if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER; @@ -147,8 +147,8 @@ pci_read_config_word(unsigned char bus, unsigned char slot, unsigned char functi } -int -pci_read_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char *val) { +static int +BSP_pci_read_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char *val) { unsigned int v; pci_read_config_dword(bus, slot, function, offset&~3, &v); @@ -159,8 +159,8 @@ pci_read_config_byte(unsigned char bus, unsigned char slot, unsigned char functi } -int -pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned int val) { +static int +BSP_pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned int val) { volatile unsigned int *pci_conf; unsigned int value; @@ -185,8 +185,8 @@ pci_write_config_dword(unsigned char bus, unsigned char slot, unsigned char func } -int -pci_write_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short val) { +static int +BSP_pci_write_config_word(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned short val) { unsigned int v; if (offset & 1) return PCIBIOS_BAD_REGISTER_NUMBER; @@ -199,8 +199,8 @@ pci_write_config_word(unsigned char bus, unsigned char slot, unsigned char funct } -int -pci_write_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char val) { +static int +BSP_pci_write_config_byte(unsigned char bus, unsigned char slot, unsigned char function, unsigned char offset, unsigned char val) { unsigned int v; pci_read_config_dword(bus, slot, function, offset&~3, &v); @@ -213,12 +213,12 @@ pci_write_config_byte(unsigned char bus, unsigned char slot, unsigned char funct const pci_config_access_functions pci_access_functions = { - pci_read_config_byte, - pci_read_config_word, - pci_read_config_dword, - pci_write_config_byte, - pci_write_config_word, - pci_write_config_dword + BSP_pci_read_config_byte, + BSP_pci_read_config_word, + BSP_pci_read_config_dword, + BSP_pci_write_config_byte, + BSP_pci_write_config_word, + BSP_pci_write_config_dword }; pci_config BSP_pci_configuration = { (volatile unsigned char*)PCI_CONFIG_ADDR, -- cgit v1.2.3