RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Remove duplicate white lines.

Browse Source
This commit is contained in:
Ralf Corsepius
2004-04-21 16:01:48 +00:00
parent 6128a4aa5e
commit f05b2ac0bc
403 changed files with 33 additions and 2026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
c/src/lib/libbsp/powerpc/shared/bootloader/pci.c
View File

@@ -15,7 +15,6 @@
* $Id$
*/
#include <sys/types.h>
#include <rtems/bspIo.h>
#include <libcpu/spr.h>
@@ -27,16 +26,13 @@
#include <string.h>
typedef unsigned int u32;
/*
#define DEBUG
#define PCI_DEBUG
*/
/* Used to reorganize PCI space on stupid machines which spread resources
* across a wide address space. This is bad when P2P bridges are present
* or when it limits the mappings that a resource hog like a PCI<->VME
@@ -166,19 +162,15 @@ static struct blacklist_entry blacklist[] = {
{0xffff, 0, 0, 0}
};
/* This function filters resources and then inserts them into a list of
* configurable pci resources.
*/
#define AREA(r) \
(((r->type&PCI_BASE_ADDRESS_SPACE)==PCI_BASE_ADDRESS_SPACE_IO) ? PCI_AREA_IO :\
((r->type&PCI_BASE_ADDRESS_MEM_PREFETCH) ? PCI_AREA_PREFETCHABLE :\
PCI_AREA_MEMORY))
static int insert_before(pci_resource *e, pci_resource *t) {
if (e->dev->bus->number != t->dev->bus->number)
return e->dev->bus->number > t->dev->bus->number;
@@ -186,10 +178,6 @@ static int insert_before(pci_resource *e, pci_resource *t) {
return (e->size > t->size);
}
static void insert_resource(pci_resource *r) {
struct blacklist_entry *b;
pci_resource *p;
@@ -280,10 +268,6 @@ static void insert_resource(pci_resource *r) {
}
}
/* This version only works for bus 0. I don't have any P2P bridges to test
* a more sophisticated version which has therefore not been implemented.
* Prefetchable memory is not yet handled correctly either.
@@ -323,11 +307,6 @@ static u_long find_range(u_char bus, u_char type,
return total;
}
static inline void init_free_area(pci_area_head *h, u_long start,
u_long end, u_int mask, int high) {
pci_area *p;
@@ -342,11 +321,6 @@ static inline void init_free_area(pci_area_head *h, u_long start,
h->high = high;
}
static void insert_area(pci_area_head *h, pci_area *p) {
pci_area *q = h->head;
if (!p) return;
@@ -371,10 +345,6 @@ static void insert_area(pci_area_head *h, pci_area *p) {
}
}
static
void remove_area(pci_area_head *h, pci_area *p)
{
@@ -390,11 +360,6 @@ void remove_area(pci_area_head *h, pci_area *p)
if (q) q->next=p->next;
}
static pci_area * alloc_area(pci_area_head *h, struct pci_bus *bus,
u_long required, u_long mask, u_int flags) {
pci_area *p;
@@ -460,10 +425,6 @@ static pci_area * alloc_area(pci_area_head *h, struct pci_bus *bus,
return new;
}
static inline
void alloc_space(pci_area *p, pci_resource *r)
{
@@ -476,10 +437,6 @@ void alloc_space(pci_area *p, pci_resource *r)
}
}
static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h)
{
pci_resource *first, *past, *r;
@@ -500,12 +457,6 @@ static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h)
}
}
#define BUS0_IO_START 0x10000
#define BUS0_IO_END 0x1ffff
#define BUS0_MEM_START 0x1000000
@@ -516,10 +467,6 @@ static void reconfigure_bus_space(u_char bus, u_char type, pci_area_head *h)
#define BUSREST_MEM_START 0xb000000
#define BUSREST_MEM_END 0x10000000
static void reconfigure_pci(void) {
pci_resource *r;
struct pci_dev *dev;
@@ -535,7 +482,6 @@ static void reconfigure_pci(void) {
init_free_area(&pci->io, BUS0_IO_START, BUS0_IO_END, 0xfff, 0);
init_free_area(&pci->mem, BUS0_MEM_START, BUS0_MEM_END, 0xfffff, 0);
/* First reconfigure the I/O space, this will be more
* complex when there is more than 1 bus. And 64 bits
* devices are another kind of problems.
@@ -586,11 +532,6 @@ 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) {
@@ -660,7 +601,6 @@ static const struct pci_config_access_functions indirect_functions = {
indirect_pci_write_config_dword
};
static int
direct_pci_read_config_byte(unsigned char bus, unsigned char dev_fn,
unsigned char offset, unsigned char *val) {
@@ -750,11 +690,6 @@ static const struct pci_config_access_functions direct_functions = {
direct_pci_write_config_dword
};
void pci_read_bases(struct pci_dev *dev, unsigned int howmany)
{
unsigned int reg, nextreg;
@@ -821,13 +756,6 @@ 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;
@@ -1018,15 +946,6 @@ u_int pci_scan_bus(struct pci_bus *bus)
return max;
}
#if 0
void
@@ -1043,11 +962,6 @@ pci_fixup(void)
}
}
static void print_pci_info()
{
pci_resource *r;
@@ -1102,17 +1016,6 @@ static void print_pci_info()
#endif
static struct _addr_start
{
uint32_t start_pcimem;
@@ -1120,10 +1023,6 @@ static struct _addr_start
uint32_t start_prefetch;
} astart;
static pci_resource *enum_device_resources( struct pci_dev *pdev, int i )
{
pci_resource *r;
@@ -1138,21 +1037,12 @@ static pci_resource *enum_device_resources( struct pci_dev *pdev, int i )
return r;
}
static void recursive_bus_reconfigure( struct pci_bus *pbus )
{
struct pci_dev *pdev;
struct pci_bus *childbus;
int isroot = 0;
if( !pbus )
{
/* start with the root bus */
@@ -1164,13 +1054,11 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
isroot = -1;
}
#define WRITE_BRIDGE_IO
#define WRITE_BRIDGE_MEM
#define WRITE_BRIDGE_PF
#define WRITE_BRIDGE_ENABLE
/*
** Run thru the p2p bridges on this bus and recurse into subordinate busses
*/
@@ -1198,8 +1086,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
childbus->subordinate );
#endif
/*
**use the current values & the saved ones to figure out
** the address spaces for the bridge
@@ -1230,9 +1116,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
pcibios_write_config_byte(pdev->bus->number, pdev->devfn, PCI_IO_LIMIT, limit8 );
#endif
if( addrhold.start_pcimem == astart.start_pcimem )
{
limit16 = 0;
@@ -1252,8 +1135,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
pcibios_write_config_word(pdev->bus->number, pdev->devfn, PCI_MEMORY_LIMIT, limit16 );
#endif
if( astart.start_prefetch == addrhold.start_prefetch )
{
limit16 = 0;
@@ -1289,11 +1170,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
}
}
if( !isroot )
{
#ifdef PCI_DEBUG
@@ -1370,15 +1246,6 @@ static void recursive_bus_reconfigure( struct pci_bus *pbus )
}
void pci_init(void)
{
PPC_DEVICE *hostbridge;
@@ -1439,5 +1306,4 @@ void pci_init(void)
print_pci_resources("Allocated PCI resources:\n");
}
/* eof */