upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use rman_get_device rather than rle->resl->r_dev.

Browse source 
make pci_hdrtypedata and pci_read_extcap accessible (but maybe in the end
   we'll make them private again).
This commit is contained in:
Warner Losh 2003-02-16 02:02:44 +00:00
parent 03cf2fba38
commit 594b5aeb67
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/dev/pci/pci.c
View file

@ -65,9 +65,6 @@ static int pci_maptype(unsigned mapreg);
static int pci_mapsize(unsigned testval);
static int pci_maprange(unsigned mapreg);
static void pci_fixancient(pcicfgregs *cfg);
static void pci_hdrtypedata(device_t pcib, int b, int s, int f,
pcicfgregs *cfg);
static void pci_read_extcap(device_t pcib, pcicfgregs *cfg);
static int pci_porten(device_t pcib, int b, int s, int f);
static int pci_memen(device_t pcib, int b, int s, int f);
@ -294,7 +291,7 @@ pci_fixancient(pcicfgregs *cfg)
/* extract header type specific config data */
static void
void
pci_hdrtypedata(device_t pcib, int b, int s, int f, pcicfgregs *cfg)
{
#define REG(n, w) PCIB_READ_CONFIG(pcib, b, s, f, n, w)
@ -392,7 +389,7 @@ pci_read_device(device_t pcib, int b, int s, int f, size_t size)
#undef REG
}
static void
void
pci_read_extcap(device_t pcib, pcicfgregs *cfg)
{
#define REG(n, w) PCIB_READ_CONFIG(pcib, cfg->bus, cfg->slot, cfg->func, n, w)
@ -451,7 +448,6 @@ pci_freecfg(struct pci_devinfo *dinfo)
devlist_head = &pci_devq;
/* XXX this hasn't been tested */
STAILQ_REMOVE(devlist_head, dinfo, pci_devinfo, pci_links);
free(dinfo, M_DEVBUF);
@ -1337,7 +1333,7 @@ pci_delete_resource(device_t dev, device_t child, int type, int rid)
rle = resource_list_find(rl, type, rid);
if (rle) {
if (rle->res) {
if (rle->res->r_dev != dev ||
if (rman_get_device(rle->res) != dev ||
rman_get_flags(rle->res) & RF_ACTIVE) {
device_printf(dev, "delete_resource: "
"Resource still owned by child, oops. "

4
sys/dev/pci/pci_private.h
View file

@ -68,5 +68,7 @@ struct pci_devinfo *pci_read_device(device_t pcib, int b, int s, int f,
size_t size);
void pci_print_verbose(struct pci_devinfo *dinfo);
int pci_freecfg(struct pci_devinfo *dinfo);
void pci_hdrtypedata(device_t pcib, int b, int s, int f,
pcicfgregs *cfg);
void pci_read_extcap(device_t pcib, pcicfgregs *cfg);
#endif /* _PCI_PRIVATE_H_ */