mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

- Use PCIR_BAR macro rather than hardcoding 0x10.

Browse Source 
- Use pci_enable_busmaster() rather than doing it by hand.
- Remove duplicate if_free().
This commit is contained in:
John Baldwin 2005-09-29 14:56:30 +00:00
parent 20c5ba3685
commit f73c6b9d92
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=150712
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/en/if_en_pci.c
View File

@ -98,7 +98,7 @@ static void adp_get_macaddr(struct en_pci_softc *);
* address of config base memory address register in PCI config space
* (this is card specific)
*/
#define PCI_CBMA 0x10
#define PCI_CBMA PCIR_BAR(0)
/*
* tonga (pci bridge). ENI cards only!
@ -193,7 +193,6 @@ en_pci_attach(device_t dev)
{
struct en_softc *sc;
struct en_pci_softc *scp;
u_long val;
int rid, error = 0;
sc = device_get_softc(dev);
@ -211,9 +210,7 @@ en_pci_attach(device_t dev)
/*
* Enable bus mastering.
*/
val = pci_read_config(dev, PCIR_COMMAND, 2);
val |= (PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN);
pci_write_config(dev, PCIR_COMMAND, val, 2);
pci_enable_busmaster(dev);
/*
* Map control/status registers.
@ -284,7 +281,6 @@ en_pci_attach(device_t dev)
if (error) {
en_reset(sc);
atm_ifdetach(sc->ifp);
if_free(sc->ifp);
device_printf(dev, "could not setup irq\n");
bus_release_resource(dev, SYS_RES_IRQ, 0, scp->irq);
bus_release_resource(dev, SYS_RES_MEMORY, PCI_CBMA, scp->res);