Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added rlphy MII driver back to the rtl81xx driver - originally, I intended to

Browse Source 
change the current MII management, but I ran out of time.
* This should fix bug #6295.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38078 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2010-08-13 09:10:53 +00:00
parent 8ccc01cf2d
commit 7e5d6acf69
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/kernel/drivers/network/3com/dev/mii/Jamfile
View File

@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers network 3com dev mii ; SubDir HAIKU_TOP src add-ons kernel drivers network 3com dev mii ;
UseHeaders [ FDirName $(SUBDIR) .. .. ] : true ; 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 ; UsePrivateHeaders net system ;
UsePrivateKernelHeaders ; UsePrivateKernelHeaders ;
@ -17,6 +18,7 @@ KernelStaticLibrary 3com_mii.a
; ;
ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) exphy$(SUFOBJ) ukphy$(SUFOBJ) ] ObjectHdrs [ FGristFiles bmtphy$(SUFOBJ) exphy$(SUFOBJ) ukphy$(SUFOBJ) ]
: [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat freebsd_network ] ; : [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) libs compat
Includes [ FGristFiles bmtphy.c exphy.c ukphy.c ] : <src!libs!compat!freebsd_network>miidevs.h ; freebsd_network ] ;
Includes [ FGristFiles bmtphy.c exphy.c ukphy.c ]
: <src!libs!compat!freebsd_network>miidevs.h ;

9
src/add-ons/kernel/drivers/network/rtl81xx/dev/mii/Jamfile
View File

@ -11,8 +11,13 @@ SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ;
KernelStaticLibrary rtl81xx_mii.a : KernelStaticLibrary rtl81xx_mii.a :
rgephy.c 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 ] ; $(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 ;

18
src/add-ons/kernel/drivers/network/rtl81xx/pci/glue.c
View File

@ -14,11 +14,27 @@
#include <pci/if_rlreg.h> #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_DRIVER_GLUE(rtl81xx, re, pci);
HAIKU_FBSD_MII_DRIVER(rgephy);
HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_FAST_TASKQUEUE); 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 int
HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev) HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev)
{ {