From 160b6b09dcae146f1ae1ca91c0d3699c2e5d6fd0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 4 Mar 2005 21:49:38 +0000 Subject: 2005-03-04 Joel Sherrill * libchip/network/dec21140.c, libchip/network/if_fxp.c: Make PCI initialize function part of the unified PCI API as pci_initialize(). --- c/src/ChangeLog | 5 +++++ c/src/libchip/network/dec21140.c | 6 +++--- c/src/libchip/network/if_fxp.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 9f426d2564..ca7b0f3dc3 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,8 @@ +2005-03-04 Joel Sherrill + + * libchip/network/dec21140.c, libchip/network/if_fxp.c: Make PCI + initialize function part of the unified PCI API as pci_initialize(). + 2005-02-16 Ralf Corsepius * aclocal/ppc.m4; Dynamically switch between {old|new} exceptions diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c index 6a061b0461..69fc0cbf1c 100644 --- a/c/src/libchip/network/dec21140.c +++ b/c/src/libchip/network/dec21140.c @@ -1038,15 +1038,15 @@ rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach) return 0; } + if (pci_initialize() != PCIB_ERR_SUCCESS) + rtems_panic("Unable to initialize PCI"); + #if defined(__i386__) /* * First, find a DEC board */ - if (pcib_init() == PCIB_ERR_NOTPRESENT) - rtems_panic("PCI BIOS not found !!"); - /* * Try to find the network card on the PCI bus. Probe for a DEC 21140 * card first. If not found probe the bus for a DEC/Intel 21143 card. diff --git a/c/src/libchip/network/if_fxp.c b/c/src/libchip/network/if_fxp.c index 83e808018a..a08ab3e25d 100644 --- a/c/src/libchip/network/if_fxp.c +++ b/c/src/libchip/network/if_fxp.c @@ -449,7 +449,7 @@ rtems_fxp_attach(struct rtems_bsdnet_ifconfig *config, int attaching) /* * init PCI Bios interface... */ - i = pcib_init(); + i = pci_initialize(); DBGLVL_PRINTK(2,"fxp_attach: pcib_init returned %d\n",i); if (i != PCIB_ERR_SUCCESS) { device_printf(dev, "could not initialize pci bios interface\n"); -- cgit v1.2.3