From ca8c99dd8fa54a5cc424b0ea70ad0e5283cb133b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 6 Nov 2008 22:51:31 +0000 Subject: [PATCH] * Renamed broadcom_bcm570x driver to broadcom570x. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28539 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/network/Jamfile | 3 ++- src/add-ons/kernel/drivers/network/broadcom570x/Jamfile | 3 +++ .../network/{broadcom_bcm570x => broadcom570x}/dev/Jamfile | 6 +++--- .../{broadcom_bcm570x => broadcom570x}/dev/bge/Jamfile | 6 +++--- .../{broadcom_bcm570x => broadcom570x}/dev/bge/glue.c | 4 ++-- .../{broadcom_bcm570x => broadcom570x}/dev/bge/if_bge.c | 0 .../{broadcom_bcm570x => broadcom570x}/dev/bge/if_bgereg.h | 0 .../{broadcom_bcm570x => broadcom570x}/dev/mii/Jamfile | 4 ++-- .../{broadcom_bcm570x => broadcom570x}/dev/mii/brgphyreg.h | 0 .../{broadcom_bcm570x => broadcom570x}/dev/mii/miidevs.h | 0 .../{broadcom_bcm570x => broadcom570x}/dev/mii/ukphy.c | 0 .../{broadcom_bcm570x => broadcom570x}/dev/mii/ukphy_subr.c | 0 src/add-ons/kernel/drivers/network/broadcom_bcm570x/Jamfile | 3 --- 13 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 src/add-ons/kernel/drivers/network/broadcom570x/Jamfile rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/Jamfile (53%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/bge/Jamfile (66%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/bge/glue.c (74%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/bge/if_bge.c (100%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/bge/if_bgereg.h (100%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/mii/Jamfile (67%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/mii/brgphyreg.h (100%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/mii/miidevs.h (100%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/{broadcom_bcm570x => broadcom570x}/dev/mii/ukphy_subr.c (100%) delete mode 100644 src/add-ons/kernel/drivers/network/broadcom_bcm570x/Jamfile diff --git a/src/add-ons/kernel/drivers/network/Jamfile b/src/add-ons/kernel/drivers/network/Jamfile index 931884cb91..f474328092 100644 --- a/src/add-ons/kernel/drivers/network/Jamfile +++ b/src/add-ons/kernel/drivers/network/Jamfile @@ -14,8 +14,9 @@ SubInclude HAIKU_TOP src add-ons kernel drivers network wb840 ; # FreeBSD 7 drivers SubInclude HAIKU_TOP src add-ons kernel drivers network 3com ; -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x ; +SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x ; SubInclude HAIKU_TOP src add-ons kernel drivers network ipro100 ; +#SubInclude HAIKU_TOP src add-ons kernel drivers network jmicron ; SubInclude HAIKU_TOP src add-ons kernel drivers network marvell_yukon ; SubInclude HAIKU_TOP src add-ons kernel drivers network nforce ; SubInclude HAIKU_TOP src add-ons kernel drivers network pcnet ; diff --git a/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile new file mode 100644 index 0000000000..9cf71f9a3b --- /dev/null +++ b/src/add-ons/kernel/drivers/network/broadcom570x/Jamfile @@ -0,0 +1,3 @@ +SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x ; + +SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x dev ; diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/Jamfile similarity index 53% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/Jamfile rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/Jamfile index 29f51f6702..0244fc20da 100644 --- a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom570x/dev/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x dev ; +SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev ; -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x dev bge ; -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x dev mii ; +SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x dev bge ; +SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom570x dev mii ; diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile similarity index 66% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/Jamfile rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile index 79833bdf21..e924939372 100644 --- a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x dev bge ; +SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev bge ; SubDirCcFlags -Wall ; @@ -10,9 +10,9 @@ UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : tr SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; -KernelAddon broadcom_bcm570x : +KernelAddon broadcom570x : if_bge.c glue.c - : libfreebsd_network.a broadcom_bcm570x_mii.a + : libfreebsd_network.a broadcom570x_mii.a ; diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/glue.c b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c similarity index 74% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/glue.c rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c index 6d6bbc03d1..f7c447d325 100644 --- a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/glue.c +++ b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/glue.c @@ -1,5 +1,5 @@ /* - * Copyright 2007, Axel Dörfler, axeld@pinc-software.de. All Rights Reserved. + * Copyright 2007-2008, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. */ @@ -7,7 +7,7 @@ #include -HAIKU_FBSD_DRIVER_GLUE(broadcom_bcm570x, bge, pci); +HAIKU_FBSD_DRIVER_GLUE(broadcom570x, bge, pci); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_SWI_TASKQUEUE); diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/if_bge.c b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bge.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/if_bge.c rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bge.c diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/if_bgereg.h b/src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bgereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/bge/if_bgereg.h rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/bge/if_bgereg.h diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/Jamfile b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile similarity index 67% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/Jamfile rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile index 3b641b9328..22a640924d 100644 --- a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/Jamfile +++ b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x dev mii ; +SubDir HAIKU_TOP src add-ons kernel drivers network broadcom570x dev mii ; UsePrivateHeaders kernel net ; @@ -7,7 +7,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : tr SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ] ; -KernelStaticLibrary broadcom_bcm570x_mii.a +KernelStaticLibrary broadcom570x_mii.a : ukphy.c ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/brgphyreg.h b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/brgphyreg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/brgphyreg.h rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/brgphyreg.h diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/miidevs.h b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/miidevs.h similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/miidevs.h rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/miidevs.h diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/broadcom_bcm570x/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/broadcom570x/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/Jamfile b/src/add-ons/kernel/drivers/network/broadcom_bcm570x/Jamfile deleted file mode 100644 index c4cef2d7b1..0000000000 --- a/src/add-ons/kernel/drivers/network/broadcom_bcm570x/Jamfile +++ /dev/null @@ -1,3 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x ; - -SubInclude HAIKU_TOP src add-ons kernel drivers network broadcom_bcm570x dev ;