d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 5th parameter to pci_read_device specifying the size of the object

Browse Source 
to create.
This commit is contained in:
imp 2002-03-13 16:32:11 +00:00
parent 7918719dc7
commit 93a919ffc1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/pci/pci.c
View File

@ -310,7 +310,7 @@ pci_hdrtypedata(device_t pcib, int b, int s, int f, pcicfgregs *cfg)
/* read configuration header into pcicfgregs structure */
struct pci_devinfo *
pci_read_device(device_t pcib, int b, int s, int f)
pci_read_device(device_t pcib, int b, int s, int f, size_t size)
{
#define REG(n, w) PCIB_READ_CONFIG(pcib, b, s, f, n, w)
pcicfgregs *cfg = NULL;
@ -322,8 +322,7 @@ pci_read_device(device_t pcib, int b, int s, int f)
devlist_entry = NULL;
if (PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVVENDOR, 4) != -1) {
devlist_entry = malloc(sizeof(struct pci_devinfo),
M_DEVBUF, M_WAITOK | M_ZERO);
devlist_entry = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO);
if (devlist_entry == NULL)
return (NULL);
@ -779,8 +778,8 @@ pci_add_children(device_t dev, int busno)
for (s = 0; s <= maxslots; s++) {
int pcifunchigh = 0;
for (f = 0; f <= pcifunchigh; f++) {
struct pci_devinfo *dinfo =
pci_read_device(pcib, busno, s, f);
struct pci_devinfo *dinfo = pci_read_device(pcib,
busno, s, f, sizeof(struct pci_devinfo));
if (dinfo != NULL) {
if (dinfo->cfg.mfdev)
pcifunchigh = PCI_FUNCMAX;

3
sys/dev/pci/pci_private.h
View File

@ -60,7 +60,8 @@ struct resource *pci_alloc_resource(device_t dev, device_t child,
void pci_delete_resource(device_t dev, device_t child,
int type, int rid);
struct resource_list *pci_get_resource_list (device_t dev, device_t child);
struct pci_devinfo *pci_read_device(device_t pcib, int b, int s, int f);
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);