From 7f30afa46c74a6be294e4731ac6b178eb9852e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 27 Nov 2007 16:38:20 +0000 Subject: [PATCH] * Renamed old ipro1000 driver to beos_ipro1000, as it's still valuable for BeOS R5 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 --- .../kernel/drivers/network/ipro1000/Jamfile | 25 +++++-------------- .../drivers/network/ipro1000/dev/em/Jamfile | 2 +- .../drivers/network/ipro1000/dev/em/glue.c | 2 +- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/ipro1000/Jamfile b/src/add-ons/kernel/drivers/network/ipro1000/Jamfile index a8abd2a679..d6580b8204 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/Jamfile +++ b/src/add-ons/kernel/drivers/network/ipro1000/Jamfile @@ -8,7 +8,7 @@ SubDirCcFlags -Wall ; # For ether_driver.h UsePrivateHeaders net ; -KernelAddon ipro1000 : +KernelAddon beos_ipro1000 : driver.c device.c if_compat.c @@ -20,33 +20,20 @@ KernelAddon ipro1000 : util.c ; -# Package haiku-ipro1000-cvs : -# ipro1000 : -# boot home config add-ons kernel drivers bin ; -# Package haiku-ipro1000-cvs : -# 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 : +Package haiku-networkingkit-cvs : beos_ipro1000 : boot home config add-ons kernel drivers bin ; -PackageDriverSymLink haiku-networkingkit-cvs : net ipro1000 ; -Package haiku-networkingkit-cvs : - ipro1000.settings : +PackageDriverSymLink haiku-networkingkit-cvs : net beos_ipro1000 ; +Package haiku-networkingkit-cvs : ipro1000.settings : boot home config settings kernel drivers sample ; - # Installation 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 : - ipro1000 : + beos_ipro1000 : installed-symlink ; diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile b/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile index 5fc14b4411..0bec07b705 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile +++ b/src/add-ons/kernel/drivers/network/ipro1000/dev/em/Jamfile @@ -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 ] ; -KernelAddon e1000 : +KernelAddon ipro1000 : e1000_80003es2lan.c e1000_82540.c e1000_82541.c diff --git a/src/add-ons/kernel/drivers/network/ipro1000/dev/em/glue.c b/src/add-ons/kernel/drivers/network/ipro1000/dev/em/glue.c index 51ed9b1cf0..bff06809e9 100644 --- a/src/add-ons/kernel/drivers/network/ipro1000/dev/em/glue.c +++ b/src/add-ons/kernel/drivers/network/ipro1000/dev/em/glue.c @@ -1,6 +1,6 @@ #include -HAIKU_FBSD_DRIVER_GLUE(e1000, em, pci) +HAIKU_FBSD_DRIVER_GLUE(ipro1000, em, pci) NO_HAIKU_CHECK_DISABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS();