diff options
author | wpaul <wpaul@FreeBSD.org> | 2001-02-21 20:54:22 +0000 |
---|---|---|
committer | wpaul <wpaul@FreeBSD.org> | 2001-02-21 20:54:22 +0000 |
commit | d314c28e74fad228397fe7016c254f0b7863f0d5 (patch) | |
tree | f0ddb6671f9dc8b3b92c6340ff6494e08c374f82 /sys/pci/if_rl.c | |
parent | e9eddbfc4a0506b08f0f036101a6f3d1b152c265 (diff) | |
download | FreeBSD-src-d314c28e74fad228397fe7016c254f0b7863f0d5.zip FreeBSD-src-d314c28e74fad228397fe7016c254f0b7863f0d5.tar.gz |
Big round of minor updates:
- Use pci_get_powerstate()/pci_set_powerstate() in all the other drivers
that need them so we don't have to fiddle with the PCI power management
registers directly.
- Use pci_enable_busmaster()/pci_enable_io() to turn on busmastering and
PIO/memory mapped accesses.
- Add support to the RealTek driver for the D-Link DFE-530TX+ which has
a RealTek 8139 with its own PCI ID. (Submitted by Jason Wright)
- Have the SiS 900/National DP83815 driver be sure to disable PME
mode in sis_reset(). This apparently fixes a problem on some
motherboards where the DP83815 chip fails to receive packets.
(Submitted by Chuck McCrobie <mccrobie@cablespeed.com>)
Diffstat (limited to 'sys/pci/if_rl.c')
-rw-r--r-- | sys/pci/if_rl.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index 100cf5a..90dd737 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -152,6 +152,8 @@ static struct rl_type rl_devs[] = { "Delta Electronics 8139 10/100BaseTX" }, { ADDTRON_VENDORID, ADDTRON_DEVICEID_8139, "Addtron Technolgy 8139 10/100BaseTX" }, + { DLINK_VENDORID, DLINK_DEVICEID_530TXPLUS, + "D-Link DFE-530TX+ 10/100BaseTX" }, { 0, 0, NULL } }; @@ -832,9 +834,9 @@ static int rl_attach(dev) /* * Map control/status registers. */ - command = pci_read_config(dev, PCIR_COMMAND, 4); - command |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); - pci_write_config(dev, PCIR_COMMAND, command, 4); + pci_enable_busmaster(dev); + pci_enable_io(dev, PCIM_CMD_PORTEN); + pci_enable_io(dev, PCIM_CMD_MEMEN); command = pci_read_config(dev, PCIR_COMMAND, 4); #ifdef RL_USEIOSPACE @@ -925,7 +927,7 @@ static int rl_attach(dev) if (rl_did == RT_DEVICEID_8139 || rl_did == ACCTON_DEVICEID_5030 || rl_did == DELTA_DEVICEID_8139 || rl_did == ADDTRON_DEVICEID_8139 || - rl_did == RT_DEVICEID_8138) + rl_did == RT_DEVICEID_8138 || rl_did == DLINK_DEVICEID_530TXPLUS) sc->rl_type = RL_8139; else if (rl_did == RT_DEVICEID_8129) sc->rl_type = RL_8129; |