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

* Renamed old ipro1000 driver to beos_ipro1000, as it's still valuable for BeOS R5

Browse Source 
and later (should be moved somewhere else, though).
* Renamed FreeBSD's Intel PRO 1000 driver (known as "em" in BSD) to ipro1000 which
  also puts it on the image, instead of the old one.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23007 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-11-27 16:38:20 +00:00
parent 5845b6ecc5
commit 7f30afa46c
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/add-ons/kernel/drivers/network/ipro1000/Jamfile
View File

@ -8,7 +8,7 @@ SubDirCcFlags -Wall ;
# For ether_driver.h # For ether_driver.h
UsePrivateHeaders net ; UsePrivateHeaders net ;
KernelAddon ipro1000 : KernelAddon beos_ipro1000 :
driver.c driver.c
device.c device.c
if_compat.c if_compat.c
@ -20,33 +20,20 @@ KernelAddon ipro1000 :
util.c util.c
; ;
# Package haiku-ipro1000-cvs : Package haiku-networkingkit-cvs : beos_ipro1000 :
# ipro1000 :
# boot home config add-ons kernel drivers bin ;
# Package haiku-ipro1000-cvs :
# <kernel!drivers!dev!net>ipro1000 :
# boot home config add-ons kernel drivers dev net ;
# Package haiku-ipro1000-cvs :
# ipro1000.settings :
# boot home config settings kernel drivers sample ;
Package haiku-networkingkit-cvs :
ipro1000 :
boot home config add-ons kernel drivers bin ; boot home config add-ons kernel drivers bin ;
PackageDriverSymLink haiku-networkingkit-cvs : net ipro1000 ; PackageDriverSymLink haiku-networkingkit-cvs : net beos_ipro1000 ;
Package haiku-networkingkit-cvs : Package haiku-networkingkit-cvs : ipro1000.settings :
ipro1000.settings :
boot home config settings kernel drivers sample ; boot home config settings kernel drivers sample ;
# Installation # Installation
HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin : HaikuInstall install-networking : /boot/home/config/add-ons/kernel/drivers/bin :
ipro1000 beos_ipro1000
; ;
HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net : HaikuInstallRelSymLink install-networking : /boot/home/config/add-ons/kernel/drivers/dev/net :
<installed>ipro1000 : <installed>beos_ipro1000 :
installed-symlink installed-symlink
; ;

2
src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile
View File

@ -7,7 +7,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : tr
SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 EM_FAST_INTR=1 ] ; SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 EM_FAST_INTR=1 ] ;
KernelAddon e1000 : KernelAddon ipro1000 :
e1000_80003es2lan.c e1000_80003es2lan.c
e1000_82540.c e1000_82540.c
e1000_82541.c e1000_82541.c

2
src/add-ons/kernel/drivers/network/ipro1000/dev/em/glue.c
View File

@ -1,6 +1,6 @@
#include <sys/bus.h> #include <sys/bus.h>
HAIKU_FBSD_DRIVER_GLUE(e1000, em, pci) HAIKU_FBSD_DRIVER_GLUE(ipro1000, em, pci)
NO_HAIKU_CHECK_DISABLE_INTERRUPTS(); NO_HAIKU_CHECK_DISABLE_INTERRUPTS();
NO_HAIKU_REENABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS();