Rename wifi_drv to legacy_wifi_drv

Issue #4455.

repos/dde_linux/lib/import/import-legacy_wifi_include.mk

@@ -1,5 +1,5 @@
 WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/wifi
-SRC_DIR          := $(REP_DIR)/src/lib/wifi
+SRC_DIR          := $(REP_DIR)/src/lib/legacy/wifi
 
 # architecture-dependent includes
 ifeq ($(filter-out $(SPECS),x86),)
@@ -24,4 +24,4 @@ INC_DIR += $(ARCH_SRC_INC_DIR)
 INC_DIR += $(WIFI_CONTRIB_DIR)/include \
            $(WIFI_CONTRIB_DIR)/include/uapi \
            $(WIFI_CONTRIB_DIR)/drivers/net/wireless/iwlwifi
-INC_DIR += $(LIB_CACHE_DIR)/wifi_include/include/include/include
+INC_DIR += $(LIB_CACHE_DIR)/legacy_wifi_include/include/include/include

repos/dde_linux/lib/mk/legacy_wifi.inc

@@ -1,4 +1,4 @@
-LIB_DIR          := $(REP_DIR)/src/lib/wifi
+LIB_DIR          := $(REP_DIR)/src/lib/legacy/wifi
 LIB_INC_DIR      := $(LIB_DIR)/include
 
 WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/wifi
@@ -8,10 +8,10 @@ WIFI_DIR         := $(WIFI_CONTRIB_DIR)/net
 SHARED_LIB = yes
 
 #
-# wifi_include *must* be the first library, otherwise the include
+# legacy_wifi_include *must* be the first library, otherwise the include
 # order is wrong
 #
-LIBS  += wifi_include lx_kit_setjmp nic_driver
+LIBS  += legacy_wifi_include lx_kit_setjmp nic_driver
 
 LD_OPT += --version-script=$(LIB_DIR)/symbol.map
 

repos/dde_linux/lib/mk/legacy_wifi_include.mk

@@ -1,7 +1,7 @@
 ifeq ($(called_from_lib_mk),yes)
 
 WIFI_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/lib/wifi
-LX_EMUL_H        := $(REP_DIR)/src/lib/wifi/include/lx_emul.h
+LX_EMUL_H        := $(REP_DIR)/src/lib/legacy/wifi/include/lx_emul.h
 
 #
 # Determine the header files included by the contrib code. For each

repos/dde_linux/lib/mk/spec/x86_32/legacy_wifi.mk

@@ -1,4 +1,4 @@
-include $(REP_DIR)/lib/mk/wifi.inc
+include $(REP_DIR)/lib/mk/legacy_wifi.inc
 
 INC_DIR += $(LIB_INC_DIR)/spec/32bit $(LIB_INC_DIR)/spec/x86_32 $(LIB_INC_DIR)/spec/x86
 

repos/dde_linux/lib/mk/spec/x86_64/legacy_wifi.mk

@@ -1,4 +1,4 @@
-include $(REP_DIR)/lib/mk/wifi.inc
+include $(REP_DIR)/lib/mk/legacy_wifi.inc
 
 INC_DIR += $(LIB_INC_DIR)/spec/64bit $(LIB_INC_DIR)/spec/x86_64 $(LIB_INC_DIR)/spec/x86
 

repos/dde_linux/recipes/pkg/legacy_wifi/archives

@@ -1,6 +1,6 @@
-_/src/wifi_drv
+_/src/legacy_wifi_drv
 _/src/openssl
 _/src/vfs
 _/src/vfs_jitterentropy
 _/src/libc
-_/raw/wifi_firmware
+_/raw/legacy_wifi_firmware

repos/dde_linux/recipes/pkg/legacy_wifi/hash

@@ -0,0 +1 @@
+2022-03-28-c 2f0c23734634d4c90d6c4ed2d08a5873bd3daed1

repos/dde_linux/recipes/pkg/legacy_wifi/runtime

@@ -1,4 +1,4 @@
-<runtime ram="32M" caps="300" binary="wifi_drv">
+<runtime ram="32M" caps="300" binary="legacy_pc_wifi_drv">
 
 	<requires> <rom label="wifi_config"/> </requires>
 
@@ -14,13 +14,13 @@
 
 	<content>
 		<rom label="ld.lib.so"/>
-		<rom label="wifi_drv"/>
+		<rom label="legacy_pc_wifi_drv"/>
 		<rom label="libcrypto.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="vfs_jitterentropy.lib.so"/>
 		<rom label="libssl.lib.so"/>
-		<rom label="wifi.lib.so"/>
+		<rom label="legacy_wifi.lib.so"/>
 		<rom label="wpa_driver_nl80211.lib.so"/>
 		<rom label="wpa_supplicant.lib.so"/>
 		<rom label="vfs.lib.so"/>

repos/dde_linux/recipes/pkg/wifi/hash

@@ -1 +0,0 @@
-2022-02-27 2ab1c844360f182758dbd9d7508e15e8ed02268f

repos/dde_linux/recipes/src/legacy_wifi_drv/content.mk

@@ -1,14 +1,14 @@
-LIB_MK := $(addprefix lib/mk/,libnl.inc libnl_include.mk iwl_firmware.mk wifi.inc \
-                              wifi_include.mk) \
+LIB_MK := $(addprefix lib/mk/,libnl.inc libnl_include.mk iwl_firmware.mk legacy_wifi.inc \
+                              legacy_wifi_include.mk) \
           $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/libnl.mk) \
           $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/lx_kit_setjmp.mk) \
-          $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/wifi.mk) \
+          $(foreach SPEC,x86_32 x86_64,lib/mk/spec/$(SPEC)/legacy_wifi.mk) \
           $(addprefix lib/mk/spec/x86/,wpa_driver_nl80211.mk wpa_supplicant.mk)
 
 PORT_DIR := $(call port_dir,$(REP_DIR)/ports/dde_linux)
 
 MIRROR_FROM_REP_DIR := $(LIB_MK) \
-                       lib/import/import-wifi_include.mk \
+                       lib/import/import-legacy_wifi_include.mk \
                        lib/import/import-libnl_include.mk \
                        lib/import/import-libnl.mk \
                        include/wifi src/include/legacy src/lib/legacy/lx_kit \
@@ -17,7 +17,7 @@ MIRROR_FROM_REP_DIR := $(LIB_MK) \
                                  src/include/spec/$(SPEC)) \
                        $(shell cd $(REP_DIR); find src/drivers/wifi -type f) \
                        $(shell cd $(REP_DIR); find src/lib/libnl -type f) \
-                       $(shell cd $(REP_DIR); find src/lib/wifi -type f) \
+                       $(shell cd $(REP_DIR); find src/lib/legacy/wifi -type f) \
                        $(shell cd $(REP_DIR); find src/lib/wpa_driver_nl80211 -type f) \
                        $(shell cd $(REP_DIR); find src/lib/wpa_supplicant -type f)
 

repos/dde_linux/run/legacy_wifi.run

@@ -203,6 +203,7 @@ append config {
 	</start>
 
 	<start name="wifi_drv" caps="220">
+		<binary name="legacy_pc_wifi_drv"/>
 		<resource name="RAM" quantum="28M"/>
 		<config ld_verbose="yes">
 			<report mac_address="true"/>
@@ -255,8 +256,8 @@ set boot_modules {
 	vfs_jitterentropy.lib.so
 	libc.lib.so vfs.lib.so libcrypto.lib.so libssl.lib.so
 	wpa_driver_nl80211.lib.so wpa_supplicant.lib.so
-	wifi.lib.so
-	wifi_drv
+	legacy_wifi.lib.so
+	legacy_pc_wifi_drv
 	nic_router
 
 	test-lwip_httpsrv

repos/dde_linux/run/nic_router_uplinks.run

@@ -84,7 +84,8 @@ append config {
 	</start>
 
 	<start name="wifi_drv" caps="300" priority="-1">
-		<resource name="RAM" quantum="24M"/>
+		<binary name="legacy_pc_wifi_drv"/>
+		<resource name="RAM" quantum="32M"/>
 		<config ld_verbose="no">
 			<vfs>
 				<dir name="dev"> <log/> <rtc/> <null/>
@@ -390,8 +391,8 @@ append boot_modules { libcrypto.lib.so }
 append boot_modules { libssl.lib.so }
 append boot_modules { wpa_driver_nl80211.lib.so }
 append boot_modules { wpa_supplicant.lib.so }
-append boot_modules { wifi.lib.so }
-append boot_modules { wifi_drv }
+append boot_modules { legacy_wifi.lib.so }
+append boot_modules { legacy_pc_wifi_drv }
 append boot_modules { core }
 append boot_modules { nic_router }
 append boot_modules { ld.lib.so }

repos/dde_linux/src/drivers/wifi/target.mk

@@ -1,13 +1,13 @@
 REQUIRES = x86
 
-TARGET   = wifi_drv
+TARGET  := legacy_pc_wifi_drv
 SRC_CC   = main.cc wpa.cc
-LIBS     = base wifi iwl_firmware
+LIBS     = base legacy_wifi iwl_firmware
 LIBS    += wpa_supplicant libc nic_driver
 LIBS    += libcrypto libssl wpa_driver_nl80211
 
 # needed for firmware.h
-INC_DIR += $(REP_DIR)/src/lib/wifi/include
+INC_DIR += $(REP_DIR)/src/lib/legacy/wifi/include
 INC_DIR += $(PRG_DIR)
 
-CC_CXX_WARN_STRICT =
+CC_CXX_WARN_STRICT :=

repos/gems/src/app/sculpt_manager/runtime/wifi_drv.cc

@@ -19,6 +19,10 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml)
 	                         Cap_quota{200}, Ram_quota{32*1024*1024},
 	                         Priority::NETWORK);
 
+	xml.node("binary", [&] () {
+		xml.attribute("name", "legacy_pc_wifi_drv");
+	});
+
 	xml.node("config", [&] () {
 
 		xml.node("vfs", [&] () {
@@ -54,7 +58,7 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml)
 			xml.node("parent", [&] () {
 				xml.attribute("label", "wifi"); }); });
 
-		gen_parent_rom_route(xml, "wifi_drv");
+		gen_parent_rom_route(xml, "legacy_pc_wifi_drv");
 		gen_parent_rom_route(xml, "ld.lib.so");
 		gen_parent_rom_route(xml, "libcrypto.lib.so");
 		gen_parent_rom_route(xml, "vfs.lib.so");
@@ -62,7 +66,7 @@ void Sculpt::gen_wifi_drv_start_content(Xml_generator &xml)
 		gen_parent_rom_route(xml, "libm.lib.so");
 		gen_parent_rom_route(xml, "vfs_jitterentropy.lib.so");
 		gen_parent_rom_route(xml, "libssl.lib.so");
-		gen_parent_rom_route(xml, "wifi.lib.so");
+		gen_parent_rom_route(xml, "legacy_wifi.lib.so");
 		gen_parent_rom_route(xml, "wpa_driver_nl80211.lib.so");
 		gen_parent_rom_route(xml, "wpa_supplicant.lib.so");
 		gen_parent_rom_route(xml, "iwlwifi-1000-5.ucode");

repos/ports/run/netperf.inc

@@ -155,10 +155,10 @@ append_if $use_usb_driver   packages " [depot_user]/src/platform_drv      "
 append_if $use_wifi_driver  packages " [depot_user]/src/fs_rom            "
 append_if $use_wifi_driver  packages " [depot_user]/src/vfs_import        "
 append_if $use_wifi_driver  packages " [depot_user]/src/report_rom        "
-append_if $use_wifi_driver  packages " [depot_user]/src/wifi_drv          "
+append_if $use_wifi_driver  packages " [depot_user]/src/legacy_wifi_drv   "
 append_if $use_wifi_driver  packages " [depot_user]/src/openssl           "
 append_if $use_wifi_driver  packages " [depot_user]/src/vfs_jitterentropy "
-append_if $use_wifi_driver  packages " [depot_user]/raw/wifi_firmware     "
+append_if $use_wifi_driver  packages " [depot_user]/raw/legacy_wifi_firmware "
 
 import_from_depot $packages
 
@@ -244,7 +244,7 @@ append  config { </wifi_config>
 	</start>
 
 	<start name="nic_drv" caps="300">
-		<binary name="wifi_drv"/>
+		<binary name="legacy_pc_wifi_drv"/>
 		<resource name="RAM" quantum="32M"/>
 		<config>
 			<libc stdout="/dev/null" stderr="/dev/log" rtc="/dev/rtc"/>