diff options
| author | Michael Brown <mcb30@ipxe.org> | 2015-04-22 11:05:19 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2015-04-22 11:05:19 +0100 |
| commit | 2154af0077b9257f63e433ba1f07a84f9ce546eb (patch) | |
| tree | 6c79f78e21d10589354956babc3e4d30e38e54f1 /src/drivers/net/rtl818x/rtl8180.c | |
| parent | eda1c58358d64e339cdfd4b983a9de9ec01e83db (diff) | |
| download | ipxe-2154af0077b9257f63e433ba1f07a84f9ce546eb.tar.gz | |
[rtl818x] Obviate RTL_ROM() hack
Reported-by: Robin Smidsrød <robin@smidsrod.no>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net/rtl818x/rtl8180.c')
| -rw-r--r-- | src/drivers/net/rtl818x/rtl8180.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/drivers/net/rtl818x/rtl8180.c b/src/drivers/net/rtl818x/rtl8180.c index 0c7d0775f..5f97480fa 100644 --- a/src/drivers/net/rtl818x/rtl8180.c +++ b/src/drivers/net/rtl818x/rtl8180.c @@ -3,16 +3,23 @@ FILE_LICENCE(GPL2_OR_LATER); #include <ipxe/pci.h> +#include "rtl818x.h" -PROVIDE_REQUIRING_SYMBOL(); -REQUIRE_OBJECT(rtl818x); -REQUIRE_OBJECT(rtl8180_grf5101); -REQUIRE_OBJECT(rtl8180_max2820); -REQUIRE_OBJECT(rtl8180_sa2400); - -static struct pci_device_id rtl8180_nics[] __unused = { +static struct pci_device_id rtl8180_nics[] = { PCI_ROM(0x10ec, 0x8180, "rtl8180", "Realtek 8180", 0), PCI_ROM(0x1799, 0x6001, "f5d6001", "Belkin F5D6001", 0), PCI_ROM(0x1799, 0x6020, "f5d6020", "Belkin F5D6020", 0), PCI_ROM(0x1186, 0x3300, "dwl510", "D-Link DWL-510", 0), }; + +struct pci_driver rtl8180_driver __pci_driver = { + .ids = rtl8180_nics, + .id_count = sizeof(rtl8180_nics) / sizeof(rtl8180_nics[0]), + .probe = rtl818x_probe, + .remove = rtl818x_remove, +}; + +REQUIRING_SYMBOL(rtl8180_driver); +REQUIRE_OBJECT(rtl8180_grf5101); +REQUIRE_OBJECT(rtl8180_max2820); +REQUIRE_OBJECT(rtl8180_sa2400); |