From 8f34c27ca5a3e6f45c22e4c917fcd27d02f59063 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Wed, 14 Jun 2023 08:43:10 +0200 Subject: [PATCH] dde_linux: move usb_hid -> usb_hid_legacy issue #4958 --- repos/dde_linux/lib/mk/usb_hid_include.mk | 2 +- .../recipes/src/{usb_hid_drv => legacy_usb_hid_drv}/content.mk | 2 +- repos/dde_linux/recipes/src/legacy_usb_hid_drv/hash | 1 + .../recipes/src/{usb_hid_drv => legacy_usb_hid_drv}/used_apis | 0 repos/dde_linux/recipes/src/usb_hid_drv/hash | 1 - repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/README | 0 .../dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/driver.h | 0 .../dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/dummies.c | 0 .../dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/evdev.cc | 0 .../src/drivers/{usb_hid => usb_hid_legacy}/led_state.h | 0 .../src/drivers/{usb_hid => usb_hid_legacy}/lx_emul.cc | 0 .../dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/lx_emul.h | 0 repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/main.cc | 0 .../dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/target.mk | 2 +- 14 files changed, 4 insertions(+), 4 deletions(-) rename repos/dde_linux/recipes/src/{usb_hid_drv => legacy_usb_hid_drv}/content.mk (98%) create mode 100644 repos/dde_linux/recipes/src/legacy_usb_hid_drv/hash rename repos/dde_linux/recipes/src/{usb_hid_drv => legacy_usb_hid_drv}/used_apis (100%) delete mode 100644 repos/dde_linux/recipes/src/usb_hid_drv/hash rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/README (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/driver.h (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/dummies.c (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/evdev.cc (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/led_state.h (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/lx_emul.cc (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/lx_emul.h (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/main.cc (100%) rename repos/dde_linux/src/drivers/{usb_hid => usb_hid_legacy}/target.mk (97%) diff --git a/repos/dde_linux/lib/mk/usb_hid_include.mk b/repos/dde_linux/lib/mk/usb_hid_include.mk index 61cfbc43f3..fd490f2c71 100644 --- a/repos/dde_linux/lib/mk/usb_hid_include.mk +++ b/repos/dde_linux/lib/mk/usb_hid_include.mk @@ -1,7 +1,7 @@ ifeq ($(called_from_lib_mk),yes) USB_HID_CONTRIB_DIR := $(call select_from_ports,dde_linux)/src/drivers/usb_hid -LX_EMUL_H := $(REP_DIR)/src/drivers/usb_hid/lx_emul.h +LX_EMUL_H := $(REP_DIR)/src/drivers/usb_hid_legacy/lx_emul.h # # Determine the header files included by the contrib code. For each diff --git a/repos/dde_linux/recipes/src/usb_hid_drv/content.mk b/repos/dde_linux/recipes/src/legacy_usb_hid_drv/content.mk similarity index 98% rename from repos/dde_linux/recipes/src/usb_hid_drv/content.mk rename to repos/dde_linux/recipes/src/legacy_usb_hid_drv/content.mk index d26544232c..ea3fa5485d 100644 --- a/repos/dde_linux/recipes/src/usb_hid_drv/content.mk +++ b/repos/dde_linux/recipes/src/legacy_usb_hid_drv/content.mk @@ -9,7 +9,7 @@ MIRROR_FROM_REP_DIR := $(LIB_MK) \ src/include/legacy src/lib/legacy/lx_kit \ src/lib/lx_kit/spec \ $(foreach SPEC,arm arm_64 arm_v6 arm_v7 x86 x86_32 x86_64,src/include/spec/$(SPEC)) \ - $(shell cd $(REP_DIR); find src/drivers/usb_hid -type f) + $(shell cd $(REP_DIR); find src/drivers/usb_hid_legacy -type f) MIRROR_FROM_PORT_DIR := $(shell cd $(PORT_DIR); find src/drivers/usb_hid -type f | grep -v ".git") MIRROR_FROM_PORT_DIR := $(filter-out $(MIRROR_FROM_REP_DIR),$(MIRROR_FROM_PORT_DIR)) diff --git a/repos/dde_linux/recipes/src/legacy_usb_hid_drv/hash b/repos/dde_linux/recipes/src/legacy_usb_hid_drv/hash new file mode 100644 index 0000000000..77cd339c99 --- /dev/null +++ b/repos/dde_linux/recipes/src/legacy_usb_hid_drv/hash @@ -0,0 +1 @@ +2023-08-21 1c6c779b2c30b83d3626ce36efbec0b0b45a05d1 diff --git a/repos/dde_linux/recipes/src/usb_hid_drv/used_apis b/repos/dde_linux/recipes/src/legacy_usb_hid_drv/used_apis similarity index 100% rename from repos/dde_linux/recipes/src/usb_hid_drv/used_apis rename to repos/dde_linux/recipes/src/legacy_usb_hid_drv/used_apis diff --git a/repos/dde_linux/recipes/src/usb_hid_drv/hash b/repos/dde_linux/recipes/src/usb_hid_drv/hash deleted file mode 100644 index 7b1376b843..0000000000 --- a/repos/dde_linux/recipes/src/usb_hid_drv/hash +++ /dev/null @@ -1 +0,0 @@ -2023-08-21 2dd68b87d1c9216ad90299034bfba210c5065cd3 diff --git a/repos/dde_linux/src/drivers/usb_hid/README b/repos/dde_linux/src/drivers/usb_hid_legacy/README similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/README rename to repos/dde_linux/src/drivers/usb_hid_legacy/README diff --git a/repos/dde_linux/src/drivers/usb_hid/driver.h b/repos/dde_linux/src/drivers/usb_hid_legacy/driver.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/driver.h rename to repos/dde_linux/src/drivers/usb_hid_legacy/driver.h diff --git a/repos/dde_linux/src/drivers/usb_hid/dummies.c b/repos/dde_linux/src/drivers/usb_hid_legacy/dummies.c similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/dummies.c rename to repos/dde_linux/src/drivers/usb_hid_legacy/dummies.c diff --git a/repos/dde_linux/src/drivers/usb_hid/evdev.cc b/repos/dde_linux/src/drivers/usb_hid_legacy/evdev.cc similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/evdev.cc rename to repos/dde_linux/src/drivers/usb_hid_legacy/evdev.cc diff --git a/repos/dde_linux/src/drivers/usb_hid/led_state.h b/repos/dde_linux/src/drivers/usb_hid_legacy/led_state.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/led_state.h rename to repos/dde_linux/src/drivers/usb_hid_legacy/led_state.h diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_emul.cc b/repos/dde_linux/src/drivers/usb_hid_legacy/lx_emul.cc similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/lx_emul.cc rename to repos/dde_linux/src/drivers/usb_hid_legacy/lx_emul.cc diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_emul.h b/repos/dde_linux/src/drivers/usb_hid_legacy/lx_emul.h similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/lx_emul.h rename to repos/dde_linux/src/drivers/usb_hid_legacy/lx_emul.h diff --git a/repos/dde_linux/src/drivers/usb_hid/main.cc b/repos/dde_linux/src/drivers/usb_hid_legacy/main.cc similarity index 100% rename from repos/dde_linux/src/drivers/usb_hid/main.cc rename to repos/dde_linux/src/drivers/usb_hid_legacy/main.cc diff --git a/repos/dde_linux/src/drivers/usb_hid/target.mk b/repos/dde_linux/src/drivers/usb_hid_legacy/target.mk similarity index 97% rename from repos/dde_linux/src/drivers/usb_hid/target.mk rename to repos/dde_linux/src/drivers/usb_hid_legacy/target.mk index 379f03ee3d..157943e41d 100644 --- a/repos/dde_linux/src/drivers/usb_hid/target.mk +++ b/repos/dde_linux/src/drivers/usb_hid_legacy/target.mk @@ -1,4 +1,4 @@ -TARGET := usb_hid_drv +TARGET := usb_hid_legacy_drv SRC_C := dummies.c SRC_CC := main.cc lx_emul.cc evdev.cc SRC_CC += printf.cc bug.cc timer.cc scheduler.cc env.cc work.cc