Author: axeld Date: 2010-08-13 11:10:53 +0200 (Fri, 13 Aug 2010) New Revision: 38078 Changeset: http://dev.haiku-os.org/changeset/38078 Ticket: http://dev.haiku-os.org/ticket/6295 Modified: haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c Log: * Added rlphy MII driver back to the rtl81xx driver - originally, I intended to change the current MII management, but I ran out of time. * This should fix bug #6295. Modified: haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile =================================================================== --- haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile 2010-08-13 08:02:40 UTC (rev 38077) +++ haiku/trunk/src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile 2010-08-13 09:10:53 UTC (rev 38078) @@ -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 @@ ; 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 ] : <src!libs!compat!freebsd_network>miidevs.h ; - + : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat + freebsd_network ] ; +Includes [ FGristFiles bmtphy.c exphy.c ukphy.c ] + : <src!libs!compat!freebsd_network>miidevs.h ; Modified: haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile =================================================================== --- haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile 2010-08-13 08:02:40 UTC (rev 38077) +++ haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile 2010-08-13 09:10:53 UTC (rev 38078) @@ -11,8 +11,13 @@ 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 ] : <src!libs!compat!freebsd_network>miidevs.h ; +Includes [ FGristFiles rgephy.c rlphy.c ] + : <src!libs!compat!freebsd_network>miidevs.h ; Modified: haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c =================================================================== --- haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c 2010-08-13 08:02:40 UTC (rev 38077) +++ haiku/trunk/src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c 2010-08-13 09:10:53 UTC (rev 38078) @@ -14,11 +14,27 @@ #include <pci/if_rlreg.h> +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) {