From 6e690f7d1153201f2f6e95ce68aa7770f16c26be Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 9 Oct 2024 13:40:20 -0400 Subject: [PATCH] drivers/network: Rename "vmx" to "vmxnet" and clean up glue. --- build/jam/images/definitions/minimum | 2 +- .../kernel/drivers/network/ether/vmx/Jamfile | 2 +- .../kernel/drivers/network/ether/vmx/glue.c | 14 +------------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 54897f4ab0..a534095667 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -332,7 +332,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures sis900 syskonnect via_rhine - vmx + vmxnet vt612x }@ # x86,x86_64,riscv64 diff --git a/src/add-ons/kernel/drivers/network/ether/vmx/Jamfile b/src/add-ons/kernel/drivers/network/ether/vmx/Jamfile index 229ad49320..bc8b097fee 100644 --- a/src/add-ons/kernel/drivers/network/ether/vmx/Jamfile +++ b/src/add-ons/kernel/drivers/network/ether/vmx/Jamfile @@ -11,7 +11,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) dev vmxnet3 ] ; SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 _XOPEN_SOURCE ] ; -KernelAddon vmx : +KernelAddon vmxnet : glue.c if_vmx.c : freebsd_iflib.a libfreebsd_network.a diff --git a/src/add-ons/kernel/drivers/network/ether/vmx/glue.c b/src/add-ons/kernel/drivers/network/ether/vmx/glue.c index cfacede31a..4a9e5b0608 100644 --- a/src/add-ons/kernel/drivers/network/ether/vmx/glue.c +++ b/src/add-ons/kernel/drivers/network/ether/vmx/glue.c @@ -6,21 +6,9 @@ #include -extern driver_t* DRIVER_MODULE_NAME(vmx, pci); +HAIKU_FBSD_DRIVER_GLUE(vmxnet, vmx, pci); -HAIKU_FBSD_DRIVERS_GLUE(vmx); HAIKU_DRIVER_REQUIREMENTS(0); NO_HAIKU_FBSD_MII_DRIVER(); NO_HAIKU_CHECK_DISABLE_INTERRUPTS(); NO_HAIKU_REENABLE_INTERRUPTS(); - - -status_t -__haiku_handle_fbsd_drivers_list(status_t (*handler)(driver_t *[], driver_t *[])) -{ - driver_t *drivers[] = { - DRIVER_MODULE_NAME(vmx, pci), - NULL - }; - return (*handler)(drivers, NULL); -}