From 5450cae1728da32f4ca2378516ca2f3a6c10fd56 Mon Sep 17 00:00:00 2001 From: Hugo Santos Date: Tue, 6 Nov 2007 16:45:10 +0000 Subject: [PATCH] try to hide the gruesome details from the glue code as much as possible. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22844 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/network/rtl8139/pci/glue.c | 13 +------------ .../freebsd_network/compat/sys/haiku-module.h | 9 +++++++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c b/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c index da97ecbb65..a54f8efc80 100644 --- a/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c +++ b/src/add-ons/kernel/drivers/network/rtl8139/pci/glue.c @@ -3,20 +3,9 @@ #include HAIKU_FBSD_DRIVER_GLUE(rtl8139, rl, pci); +HAIKU_FBSD_MII_DRIVER(rlphy); HAIKU_DRIVER_REQUIREMENTS(0); -extern driver_t *DRIVER_MODULE_NAME(rlphy, miibus); - -driver_t * -__haiku_select_miibus_driver(device_t dev) -{ - driver_t *drivers[] = { - DRIVER_MODULE_NAME(rlphy, miibus) - }; - - return __haiku_probe_miibus(dev, drivers, 1); -} - int HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev) { struct rl_softc *sc = device_get_softc(dev); diff --git a/src/libs/compat/freebsd_network/compat/sys/haiku-module.h b/src/libs/compat/freebsd_network/compat/sys/haiku-module.h index ecbb0ea9c1..50108d3874 100644 --- a/src/libs/compat/freebsd_network/compat/sys/haiku-module.h +++ b/src/libs/compat/freebsd_network/compat/sys/haiku-module.h @@ -89,8 +89,13 @@ driver_t *__haiku_probe_miibus(device_t dev, driver_t *drivers[], int count); #define HAIKU_FBSD_MII_DRIVER(name) \ extern driver_t *DRIVER_MODULE_NAME(name, miibus); \ - HAIKU_FBSD_RETURN_MII_DRIVER( \ - &DRIVER_MODULE_NAME(name, miibus), 1) + driver_t *__haiku_select_miibus_driver(device_t dev) \ + { \ + driver_t *drivers[] = { \ + DRIVER_MODULE_NAME(name, miibus) \ + }; \ + return __haiku_probe_miibus(dev, drivers, 1); \ + } #define NO_HAIKU_FBSD_MII_DRIVER() \ HAIKU_FBSD_RETURN_MII_DRIVER(NULL, 0)