This is an automated email from the ASF dual-hosted git repository. pkarashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 4e24ef23f414896400a972f7f8a3a524bd16eb36 Author: Xiang Xiao <[email protected]> AuthorDate: Sun Dec 4 16:12:02 2022 +0800 arch/sim: Move host files to the correct location Signed-off-by: Xiang Xiao <[email protected]> --- arch/sim/src/Makefile | 4 ++-- arch/sim/src/sim/{ => posix}/sim_alsa.c | 2 +- arch/sim/src/sim/{ => posix}/vpnkit/sim_negotiate.c | 2 +- arch/sim/src/sim/{ => posix}/vpnkit/sim_protocol.c | 2 +- arch/sim/src/sim/{ => posix}/vpnkit/sim_protocol.h | 2 +- arch/sim/src/sim/{posix => win}/sim_wpcap.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index 55694003c8..fe4f705d1b 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -94,7 +94,7 @@ ifeq ($(CONFIG_HOST_MACOS),y) HOSTCFLAGS += -Wno-deprecated-declarations endif -HOSTSRCS = sim_hostirq.c sim_hostmemory.c sim_hosttime.c sim_hostuart.c sim_hostmisc.c +HOSTSRCS = sim_hostirq.c sim_hostmemory.c sim_hostmisc.c sim_hosttime.c sim_hostuart.c STDLIBS += -lpthread ifeq ($(CONFIG_HOST_MACOS),y) ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y) @@ -172,7 +172,7 @@ endif # CONFIG_WINDOWS_CYGWIN != y else ifeq ($(CONFIG_SIM_NETDEV_VPNKIT),y) CSRCS += sim_netdriver.c HOSTSRCS += sim_vpnkit.c - VPATH += :sim/vpnkit + VPATH += :sim/posix/vpnkit HOSTSRCS += sim_protocol.c sim_negotiate.c endif diff --git a/arch/sim/src/sim/sim_alsa.c b/arch/sim/src/sim/posix/sim_alsa.c similarity index 99% rename from arch/sim/src/sim/sim_alsa.c rename to arch/sim/src/sim/posix/sim_alsa.c index c4bf5018c5..f1c3392d82 100644 --- a/arch/sim/src/sim/sim_alsa.c +++ b/arch/sim/src/sim/posix/sim_alsa.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/sim_alsa.c + * arch/sim/src/sim/posix/sim_alsa.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/vpnkit/sim_negotiate.c b/arch/sim/src/sim/posix/vpnkit/sim_negotiate.c similarity index 98% rename from arch/sim/src/sim/vpnkit/sim_negotiate.c rename to arch/sim/src/sim/posix/vpnkit/sim_negotiate.c index 4421ec06a0..bbf27433e2 100644 --- a/arch/sim/src/sim/vpnkit/sim_negotiate.c +++ b/arch/sim/src/sim/posix/vpnkit/sim_negotiate.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/vpnkit/sim_negotiate.c + * arch/sim/src/sim/posix/vpnkit/sim_negotiate.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/vpnkit/sim_protocol.c b/arch/sim/src/sim/posix/vpnkit/sim_protocol.c similarity index 99% rename from arch/sim/src/sim/vpnkit/sim_protocol.c rename to arch/sim/src/sim/posix/vpnkit/sim_protocol.c index dd078b2036..8567f046ee 100644 --- a/arch/sim/src/sim/vpnkit/sim_protocol.c +++ b/arch/sim/src/sim/posix/vpnkit/sim_protocol.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/vpnkit/sim_protocol.c + * arch/sim/src/sim/posix/vpnkit/sim_protocol.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/vpnkit/sim_protocol.h b/arch/sim/src/sim/posix/vpnkit/sim_protocol.h similarity index 99% rename from arch/sim/src/sim/vpnkit/sim_protocol.h rename to arch/sim/src/sim/posix/vpnkit/sim_protocol.h index 9d1450e606..4647fea19a 100644 --- a/arch/sim/src/sim/vpnkit/sim_protocol.h +++ b/arch/sim/src/sim/posix/vpnkit/sim_protocol.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/vpnkit/sim_protocol.h + * arch/sim/src/sim/posix/vpnkit/sim_protocol.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/posix/sim_wpcap.c b/arch/sim/src/sim/win/sim_wpcap.c similarity index 99% rename from arch/sim/src/sim/posix/sim_wpcap.c rename to arch/sim/src/sim/win/sim_wpcap.c index f701af8787..5f224389d1 100644 --- a/arch/sim/src/sim/posix/sim_wpcap.c +++ b/arch/sim/src/sim/win/sim_wpcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/posix/sim_wpcap.c + * arch/sim/src/sim/win/sim_wpcap.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with
