diff --git a/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile index 59df4673de..454ecde523 100644 --- a/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile @@ -1,7 +1,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network 3com dev mii ; UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; -UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; +UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] + : true ; UsePrivateHeaders net system ; UsePrivateKernelHeaders ; @@ -17,6 +18,7 @@ KernelStaticLibrary 3com_mii.a ; ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) exphy$(SUFOBJ) ukphy$(SUFOBJ) ] - : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ; -Includes [ FGristFiles bmtphy.c exphy.c ukphy.c ] : miidevs.h ; - + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat + freebsd_network ] ; +Includes [ FGristFiles bmtphy.c exphy.c ukphy.c ] + : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile index cbade9f0ef..1cd6d9ad08 100644 --- a/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile @@ -11,8 +11,13 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; KernelStaticLibrary rtl81xx_mii.a : rgephy.c + rlphy.c ; -ObjectHdrs [ FGristFiles rgephy$(SUFOBJ) ] : [ FDirName +SEARCH on [ FGristFiles rlphy.c ] = [ FDirName $(HAIKU_TOP) src add-ons kernel + drivers network rtl8139 dev mii ] ; + +ObjectHdrs [ FGristFiles rgephy$(SUFOBJ) rlphy$(SUFOBJ) ] : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ; -Includes [ FGristFiles rgephy.c ] : miidevs.h ; +Includes [ FGristFiles rgephy.c rlphy.c ] + : miidevs.h ; diff --git a/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c b/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c index e680e877a4..33f1797134 100644 --- a/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c +++ b/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c @@ -14,11 +14,27 @@ #include +extern driver_t *DRIVER_MODULE_NAME(rgephy, miibus); +extern driver_t *DRIVER_MODULE_NAME(rlphy, miibus); + + HAIKU_FBSD_DRIVER_GLUE(rtl81xx, re, pci); -HAIKU_FBSD_MII_DRIVER(rgephy); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE); +driver_t * +__haiku_select_miibus_driver(device_t dev) +{ + driver_t *drivers[] = { + DRIVER_MODULE_NAME(rgephy, miibus), + DRIVER_MODULE_NAME(rlphy, miibus), + NULL + }; + + return __haiku_probe_miibus(dev, drivers); +} + + int HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev) {