From d5e7603d551a31836bf0c59db259ddc3593a1aa7 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Wed, 6 Jul 2016 13:26:20 +0300 Subject: [PATCH] Remove extra serial_link subdirectory --- quantum/serial_link/README.md | 2 +- .../{serial_link => }/protocol/byte_stuffer.c | 0 .../{serial_link => }/protocol/byte_stuffer.h | 0 .../{serial_link => }/protocol/frame_router.c | 0 .../{serial_link => }/protocol/frame_router.h | 0 .../protocol/frame_validator.c | 0 .../protocol/frame_validator.h | 0 .../{serial_link => }/protocol/physical.h | 0 .../{serial_link => }/protocol/transport.c | 0 .../{serial_link => }/protocol/transport.h | 0 .../protocol/triple_buffered_object.c | 0 .../protocol/triple_buffered_object.h | 0 quantum/serial_link/serial_link.mk | 27 --------------- quantum/serial_link/serial_link_tests.mk | 34 ------------------- .../{serial_link => }/system/serial_link.c | 0 .../{serial_link => }/system/serial_link.h | 0 .../{serial_link => }/tests/Makefile | 0 .../tests/byte_stuffer_tests.c | 0 .../tests/frame_router_tests.c | 0 .../tests/frame_validator_tests.c | 0 .../{serial_link => }/tests/transport_tests.c | 0 .../tests/triple_buffered_object_tests.c | 0 22 files changed, 1 insertion(+), 62 deletions(-) rename quantum/serial_link/{serial_link => }/protocol/byte_stuffer.c (100%) rename quantum/serial_link/{serial_link => }/protocol/byte_stuffer.h (100%) rename quantum/serial_link/{serial_link => }/protocol/frame_router.c (100%) rename quantum/serial_link/{serial_link => }/protocol/frame_router.h (100%) rename quantum/serial_link/{serial_link => }/protocol/frame_validator.c (100%) rename quantum/serial_link/{serial_link => }/protocol/frame_validator.h (100%) rename quantum/serial_link/{serial_link => }/protocol/physical.h (100%) rename quantum/serial_link/{serial_link => }/protocol/transport.c (100%) rename quantum/serial_link/{serial_link => }/protocol/transport.h (100%) rename quantum/serial_link/{serial_link => }/protocol/triple_buffered_object.c (100%) rename quantum/serial_link/{serial_link => }/protocol/triple_buffered_object.h (100%) delete mode 100644 quantum/serial_link/serial_link.mk delete mode 100644 quantum/serial_link/serial_link_tests.mk rename quantum/serial_link/{serial_link => }/system/serial_link.c (100%) rename quantum/serial_link/{serial_link => }/system/serial_link.h (100%) rename quantum/serial_link/{serial_link => }/tests/Makefile (100%) rename quantum/serial_link/{serial_link => }/tests/byte_stuffer_tests.c (100%) rename quantum/serial_link/{serial_link => }/tests/frame_router_tests.c (100%) rename quantum/serial_link/{serial_link => }/tests/frame_validator_tests.c (100%) rename quantum/serial_link/{serial_link => }/tests/transport_tests.c (100%) rename quantum/serial_link/{serial_link => }/tests/triple_buffered_object_tests.c (100%) diff --git a/quantum/serial_link/README.md b/quantum/serial_link/README.md index 94af9125ce..e8490e290d 100644 --- a/quantum/serial_link/README.md +++ b/quantum/serial_link/README.md @@ -1 +1 @@ -# tmk_serial_link \ No newline at end of file +# qmk_serial_link \ No newline at end of file diff --git a/quantum/serial_link/serial_link/protocol/byte_stuffer.c b/quantum/serial_link/protocol/byte_stuffer.c similarity index 100% rename from quantum/serial_link/serial_link/protocol/byte_stuffer.c rename to quantum/serial_link/protocol/byte_stuffer.c diff --git a/quantum/serial_link/serial_link/protocol/byte_stuffer.h b/quantum/serial_link/protocol/byte_stuffer.h similarity index 100% rename from quantum/serial_link/serial_link/protocol/byte_stuffer.h rename to quantum/serial_link/protocol/byte_stuffer.h diff --git a/quantum/serial_link/serial_link/protocol/frame_router.c b/quantum/serial_link/protocol/frame_router.c similarity index 100% rename from quantum/serial_link/serial_link/protocol/frame_router.c rename to quantum/serial_link/protocol/frame_router.c diff --git a/quantum/serial_link/serial_link/protocol/frame_router.h b/quantum/serial_link/protocol/frame_router.h similarity index 100% rename from quantum/serial_link/serial_link/protocol/frame_router.h rename to quantum/serial_link/protocol/frame_router.h diff --git a/quantum/serial_link/serial_link/protocol/frame_validator.c b/quantum/serial_link/protocol/frame_validator.c similarity index 100% rename from quantum/serial_link/serial_link/protocol/frame_validator.c rename to quantum/serial_link/protocol/frame_validator.c diff --git a/quantum/serial_link/serial_link/protocol/frame_validator.h b/quantum/serial_link/protocol/frame_validator.h similarity index 100% rename from quantum/serial_link/serial_link/protocol/frame_validator.h rename to quantum/serial_link/protocol/frame_validator.h diff --git a/quantum/serial_link/serial_link/protocol/physical.h b/quantum/serial_link/protocol/physical.h similarity index 100% rename from quantum/serial_link/serial_link/protocol/physical.h rename to quantum/serial_link/protocol/physical.h diff --git a/quantum/serial_link/serial_link/protocol/transport.c b/quantum/serial_link/protocol/transport.c similarity index 100% rename from quantum/serial_link/serial_link/protocol/transport.c rename to quantum/serial_link/protocol/transport.c diff --git a/quantum/serial_link/serial_link/protocol/transport.h b/quantum/serial_link/protocol/transport.h similarity index 100% rename from quantum/serial_link/serial_link/protocol/transport.h rename to quantum/serial_link/protocol/transport.h diff --git a/quantum/serial_link/serial_link/protocol/triple_buffered_object.c b/quantum/serial_link/protocol/triple_buffered_object.c similarity index 100% rename from quantum/serial_link/serial_link/protocol/triple_buffered_object.c rename to quantum/serial_link/protocol/triple_buffered_object.c diff --git a/quantum/serial_link/serial_link/protocol/triple_buffered_object.h b/quantum/serial_link/protocol/triple_buffered_object.h similarity index 100% rename from quantum/serial_link/serial_link/protocol/triple_buffered_object.h rename to quantum/serial_link/protocol/triple_buffered_object.h diff --git a/quantum/serial_link/serial_link.mk b/quantum/serial_link/serial_link.mk deleted file mode 100644 index e164cc5ff3..0000000000 --- a/quantum/serial_link/serial_link.mk +++ /dev/null @@ -1,27 +0,0 @@ -# The MIT License (MIT) -# -# Copyright (c) 2016 Fred Sundvik -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -UINCDIR += $(SERIAL_DIR) -SRC += $(wildcard $(SERIAL_DIR)/serial_link/protocol/*.c) -SRC += $(wildcard $(SERIAL_DIR)/serial_link/system/*.c) -SRC += serial_link_hal.c -OPT_DEFS += -DUSE_SERIAL_LINK diff --git a/quantum/serial_link/serial_link_tests.mk b/quantum/serial_link/serial_link_tests.mk deleted file mode 100644 index e292f582a9..0000000000 --- a/quantum/serial_link/serial_link_tests.mk +++ /dev/null @@ -1,34 +0,0 @@ -# The MIT License (MIT) -# -# Copyright (c) 2016 Fred Sundvik -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. - -CGREEN_LIB = $(BUILDDIR)/cgreen/build-c/src/libcgreen.a - -CGREEN_DIR = "$(CURDIR)/$(SERIAL_DIR)/cgreen/cgreen" -CGREEN_BUILD_DIR = "$(CURDIR)/$(BUILDDIR)/cgreen" -export CGREEN_DIR -export CGREEN_BUILD_DIR -$(CGREEN_LIB): - @make -C $(SERIAL_DIR)/cgreen - -.PHONY serialtest: -serialtest : $(CGREEN_LIB) - @make -C $(SERIAL_DIR)/serial_link/tests BUILDDIR=../../../$(BUILDDIR) \ No newline at end of file diff --git a/quantum/serial_link/serial_link/system/serial_link.c b/quantum/serial_link/system/serial_link.c similarity index 100% rename from quantum/serial_link/serial_link/system/serial_link.c rename to quantum/serial_link/system/serial_link.c diff --git a/quantum/serial_link/serial_link/system/serial_link.h b/quantum/serial_link/system/serial_link.h similarity index 100% rename from quantum/serial_link/serial_link/system/serial_link.h rename to quantum/serial_link/system/serial_link.h diff --git a/quantum/serial_link/serial_link/tests/Makefile b/quantum/serial_link/tests/Makefile similarity index 100% rename from quantum/serial_link/serial_link/tests/Makefile rename to quantum/serial_link/tests/Makefile diff --git a/quantum/serial_link/serial_link/tests/byte_stuffer_tests.c b/quantum/serial_link/tests/byte_stuffer_tests.c similarity index 100% rename from quantum/serial_link/serial_link/tests/byte_stuffer_tests.c rename to quantum/serial_link/tests/byte_stuffer_tests.c diff --git a/quantum/serial_link/serial_link/tests/frame_router_tests.c b/quantum/serial_link/tests/frame_router_tests.c similarity index 100% rename from quantum/serial_link/serial_link/tests/frame_router_tests.c rename to quantum/serial_link/tests/frame_router_tests.c diff --git a/quantum/serial_link/serial_link/tests/frame_validator_tests.c b/quantum/serial_link/tests/frame_validator_tests.c similarity index 100% rename from quantum/serial_link/serial_link/tests/frame_validator_tests.c rename to quantum/serial_link/tests/frame_validator_tests.c diff --git a/quantum/serial_link/serial_link/tests/transport_tests.c b/quantum/serial_link/tests/transport_tests.c similarity index 100% rename from quantum/serial_link/serial_link/tests/transport_tests.c rename to quantum/serial_link/tests/transport_tests.c diff --git a/quantum/serial_link/serial_link/tests/triple_buffered_object_tests.c b/quantum/serial_link/tests/triple_buffered_object_tests.c similarity index 100% rename from quantum/serial_link/serial_link/tests/triple_buffered_object_tests.c rename to quantum/serial_link/tests/triple_buffered_object_tests.c