From 7916c1ca0f8e69e541baeff8e79e66e930e8e3ad Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 21 Oct 2021 17:19:58 -0400 Subject: [PATCH] Rename ar81xx to atheros81xx. The other Atheros drivers are "atheros813x" and "atheroswifi", so renaming this one (which is the oldest of the set) to match the other two makes sense. --- build/jam/images/NetBootArchive | 4 ++-- build/jam/images/definitions/minimum | 2 +- src/add-ons/kernel/drivers/network/ether/Jamfile | 2 +- .../drivers/network/ether/{ar81xx => atheros81xx}/Jamfile | 4 ++-- .../network/ether/{ar81xx => atheros81xx}/dev/ale/if_ale.c | 0 .../network/ether/{ar81xx => atheros81xx}/dev/ale/if_alereg.h | 0 .../network/ether/{ar81xx => atheros81xx}/dev/ale/if_alevar.h | 0 .../network/ether/{ar81xx => atheros81xx}/dev/mii/ukphy.c | 0 .../ether/{ar81xx => atheros81xx}/dev/mii/ukphy_subr.c | 0 .../drivers/network/ether/{ar81xx => atheros81xx}/glue.c | 2 +- 10 files changed, 7 insertions(+), 7 deletions(-) rename src/add-ons/kernel/drivers/network/ether/{ar81xx => atheros81xx}/Jamfile (86%) rename src/add-ons/kernel/drivers/network/ether/{ar81xx => atheros81xx}/dev/ale/if_ale.c (100%) rename src/add-ons/kernel/drivers/network/ether/{ar81xx => atheros81xx}/dev/ale/if_alereg.h (100%) rename src/add-ons/kernel/drivers/network/ether/{ar81xx => atheros81xx}/dev/ale/if_alevar.h (100%) rename src/add-ons/kernel/drivers/network/ether/{ar81xx => atheros81xx}/dev/mii/ukphy.c (100%) rename src/add-ons/kernel/drivers/network/ether/{ar81xx => atheros81xx}/dev/mii/ukphy_subr.c (100%) rename src/add-ons/kernel/drivers/network/ether/{ar81xx => atheros81xx}/glue.c (92%) diff --git a/build/jam/images/NetBootArchive b/build/jam/images/NetBootArchive index a4852daa0f..9ab8e78e94 100644 --- a/build/jam/images/NetBootArchive +++ b/build/jam/images/NetBootArchive @@ -8,12 +8,12 @@ SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix ; SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures x86 @{ - 3com atheros813x + 3com atheros813x atheros81xx broadcom440x broadcom570x ipro1000 rtl8139 rtl81xx via_rhine ipro100 nforce marvell_yukon sis900 syskonnect - attansic_l2 ar81xx + attansic_l2 }@ # x86 etherpci pegasus usb_ecm wb840 diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 9b102fdab1..70bef76341 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -189,7 +189,7 @@ SYSTEM_ADD_ONS_DRIVERS_MIDI = ; SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures x86,x86_64 @{ 3com - atheros813x ar81xx attansic_l1 attansic_l2 + atheros813x atheros81xx attansic_l1 attansic_l2 broadcom440x broadcom570x dec21xxx emulex_oce diff --git a/src/add-ons/kernel/drivers/network/ether/Jamfile b/src/add-ons/kernel/drivers/network/ether/Jamfile index 12aa54c90a..fdcdc63ccb 100644 --- a/src/add-ons/kernel/drivers/network/ether/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/Jamfile @@ -11,7 +11,7 @@ HaikuSubInclude wb840 ; # FreeBSD 12 drivers HaikuSubInclude 3com ; -HaikuSubInclude ar81xx ; +HaikuSubInclude atheros81xx ; HaikuSubInclude attansic_l1 ; HaikuSubInclude attansic_l2 ; HaikuSubInclude broadcom440x ; diff --git a/src/add-ons/kernel/drivers/network/ether/ar81xx/Jamfile b/src/add-ons/kernel/drivers/network/ether/atheros81xx/Jamfile similarity index 86% rename from src/add-ons/kernel/drivers/network/ether/ar81xx/Jamfile rename to src/add-ons/kernel/drivers/network/ether/atheros81xx/Jamfile index 64b6406b86..efa1e303e7 100644 --- a/src/add-ons/kernel/drivers/network/ether/ar81xx/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/atheros81xx/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src add-ons kernel drivers network ether ar81xx ; +SubDir HAIKU_TOP src add-ons kernel drivers network ether atheros81xx ; UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ; @@ -12,7 +12,7 @@ UseHeaders [ FDirName $(SUBDIR) ] : true ; SEARCH_SOURCE += [ FDirName $(SUBDIR) dev mii ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) dev ale ] ; -KernelAddon ar81xx : +KernelAddon atheros81xx : glue.c ukphy.c ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_ale.c b/src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/ale/if_ale.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_ale.c rename to src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/ale/if_ale.c diff --git a/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alereg.h b/src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/ale/if_alereg.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alereg.h rename to src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/ale/if_alereg.h diff --git a/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alevar.h b/src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/ale/if_alevar.h similarity index 100% rename from src/add-ons/kernel/drivers/network/ether/ar81xx/dev/ale/if_alevar.h rename to src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/ale/if_alevar.h diff --git a/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy.c b/src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/mii/ukphy.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy.c rename to src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/mii/ukphy.c diff --git a/src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy_subr.c b/src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/mii/ukphy_subr.c similarity index 100% rename from src/add-ons/kernel/drivers/network/ether/ar81xx/dev/mii/ukphy_subr.c rename to src/add-ons/kernel/drivers/network/ether/atheros81xx/dev/mii/ukphy_subr.c diff --git a/src/add-ons/kernel/drivers/network/ether/ar81xx/glue.c b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c similarity index 92% rename from src/add-ons/kernel/drivers/network/ether/ar81xx/glue.c rename to src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c index 0b2679a770..0c34288f60 100644 --- a/src/add-ons/kernel/drivers/network/ether/ar81xx/glue.c +++ b/src/add-ons/kernel/drivers/network/ether/atheros81xx/glue.c @@ -8,7 +8,7 @@ #include -HAIKU_FBSD_DRIVER_GLUE(ar81xx, ale, pci) +HAIKU_FBSD_DRIVER_GLUE(atheros81xx, ale, pci) extern driver_t *DRIVER_MODULE_NAME(ukphy, miibus);