From d5eaa9f400baaf08f09c95fefd5c839d11b755ff Mon Sep 17 00:00:00 2001 From: Eric Wild Date: Wed, 9 Oct 2019 13:18:21 +0200 Subject: [PATCH] split ccid into common and host-only code Change-Id: I175c4efdafedc1d8953d3fb03f2d622a7a74af3b --- {ccid => ccid_common}/ccid_device.c | 0 {ccid => ccid_common}/ccid_device.h | 0 {ccid => ccid_common}/ccid_proto.c | 0 {ccid => ccid_common}/ccid_proto.h | 0 {ccid => ccid_host}/CCID.patch | 0 {ccid => ccid_host}/Makefile | 9 ++++++--- {ccid => ccid_host}/README.linux-dummy_hcd-ffs | 0 {ccid => ccid_host}/ccid_main_functionfs.c | 0 {ccid => ccid_host}/ccid_slot_sim.c | 0 {ccid => ccid_host}/ccid_slot_sim.h | 0 {ccid => ccid_host}/create_ccid_gadget.sh | 0 {ccid => ccid_host}/hub_create_gadget.sh | 0 {ccid => ccid_host}/hub_main_functionfs.c | 0 {ccid => ccid_host}/hub_remove_gadget.sh | 0 {ccid => ccid_host}/remove_ccid_gadget.sh | 0 sysmoOCTSIM/ccid | 1 - sysmoOCTSIM/ccid_common | 1 + sysmoOCTSIM/gcc/Makefile | 8 ++++---- 18 files changed, 11 insertions(+), 8 deletions(-) rename {ccid => ccid_common}/ccid_device.c (100%) rename {ccid => ccid_common}/ccid_device.h (100%) rename {ccid => ccid_common}/ccid_proto.c (100%) rename {ccid => ccid_common}/ccid_proto.h (100%) rename {ccid => ccid_host}/CCID.patch (100%) rename {ccid => ccid_host}/Makefile (50%) rename {ccid => ccid_host}/README.linux-dummy_hcd-ffs (100%) rename {ccid => ccid_host}/ccid_main_functionfs.c (100%) rename {ccid => ccid_host}/ccid_slot_sim.c (100%) rename {ccid => ccid_host}/ccid_slot_sim.h (100%) rename {ccid => ccid_host}/create_ccid_gadget.sh (100%) rename {ccid => ccid_host}/hub_create_gadget.sh (100%) rename {ccid => ccid_host}/hub_main_functionfs.c (100%) rename {ccid => ccid_host}/hub_remove_gadget.sh (100%) rename {ccid => ccid_host}/remove_ccid_gadget.sh (100%) delete mode 120000 sysmoOCTSIM/ccid create mode 120000 sysmoOCTSIM/ccid_common diff --git a/ccid/ccid_device.c b/ccid_common/ccid_device.c similarity index 100% rename from ccid/ccid_device.c rename to ccid_common/ccid_device.c diff --git a/ccid/ccid_device.h b/ccid_common/ccid_device.h similarity index 100% rename from ccid/ccid_device.h rename to ccid_common/ccid_device.h diff --git a/ccid/ccid_proto.c b/ccid_common/ccid_proto.c similarity index 100% rename from ccid/ccid_proto.c rename to ccid_common/ccid_proto.c diff --git a/ccid/ccid_proto.h b/ccid_common/ccid_proto.h similarity index 100% rename from ccid/ccid_proto.h rename to ccid_common/ccid_proto.h diff --git a/ccid/CCID.patch b/ccid_host/CCID.patch similarity index 100% rename from ccid/CCID.patch rename to ccid_host/CCID.patch diff --git a/ccid/Makefile b/ccid_host/Makefile similarity index 50% rename from ccid/Makefile rename to ccid_host/Makefile index 0fadd22..b68bd9d 100644 --- a/ccid/Makefile +++ b/ccid_host/Makefile @@ -1,6 +1,9 @@ -CFLAGS=-Wall -g +CFLAGS=-Wall -g -I../ccid_common -I. -ccid_functionfs: ccid_main_functionfs.o ccid_proto.o ccid_device.o ccid_slot_sim.o +ccid_functionfs: ccid_main_functionfs.o \ + ccid_slot_sim.o \ + ../ccid_common/ccid_proto.o \ + ../ccid_common/ccid_device.o $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio hub_functionfs: hub_main_functionfs.o @@ -10,4 +13,4 @@ hub_functionfs: hub_main_functionfs.o $(CC) $(CFLAGS) -o $@ -c $^ clean: - rm ccid_functionfs *.o + rm ccid_functionfs hub_functionfs *.o diff --git a/ccid/README.linux-dummy_hcd-ffs b/ccid_host/README.linux-dummy_hcd-ffs similarity index 100% rename from ccid/README.linux-dummy_hcd-ffs rename to ccid_host/README.linux-dummy_hcd-ffs diff --git a/ccid/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c similarity index 100% rename from ccid/ccid_main_functionfs.c rename to ccid_host/ccid_main_functionfs.c diff --git a/ccid/ccid_slot_sim.c b/ccid_host/ccid_slot_sim.c similarity index 100% rename from ccid/ccid_slot_sim.c rename to ccid_host/ccid_slot_sim.c diff --git a/ccid/ccid_slot_sim.h b/ccid_host/ccid_slot_sim.h similarity index 100% rename from ccid/ccid_slot_sim.h rename to ccid_host/ccid_slot_sim.h diff --git a/ccid/create_ccid_gadget.sh b/ccid_host/create_ccid_gadget.sh similarity index 100% rename from ccid/create_ccid_gadget.sh rename to ccid_host/create_ccid_gadget.sh diff --git a/ccid/hub_create_gadget.sh b/ccid_host/hub_create_gadget.sh similarity index 100% rename from ccid/hub_create_gadget.sh rename to ccid_host/hub_create_gadget.sh diff --git a/ccid/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c similarity index 100% rename from ccid/hub_main_functionfs.c rename to ccid_host/hub_main_functionfs.c diff --git a/ccid/hub_remove_gadget.sh b/ccid_host/hub_remove_gadget.sh similarity index 100% rename from ccid/hub_remove_gadget.sh rename to ccid_host/hub_remove_gadget.sh diff --git a/ccid/remove_ccid_gadget.sh b/ccid_host/remove_ccid_gadget.sh similarity index 100% rename from ccid/remove_ccid_gadget.sh rename to ccid_host/remove_ccid_gadget.sh diff --git a/sysmoOCTSIM/ccid b/sysmoOCTSIM/ccid deleted file mode 120000 index 207f210..0000000 --- a/sysmoOCTSIM/ccid +++ /dev/null @@ -1 +0,0 @@ -../ccid \ No newline at end of file diff --git a/sysmoOCTSIM/ccid_common b/sysmoOCTSIM/ccid_common new file mode 120000 index 0000000..db3fc02 --- /dev/null +++ b/sysmoOCTSIM/ccid_common @@ -0,0 +1 @@ +../ccid_common \ No newline at end of file diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile index 025e2dd..83b127f 100644 --- a/sysmoOCTSIM/gcc/Makefile +++ b/sysmoOCTSIM/gcc/Makefile @@ -4,7 +4,7 @@ SYSTEM_PREFIX:=/usr/local/arm-none-eabi EXTRA_LIBS=$(SYSTEM_PREFIX)/lib/libosmocore.a -EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid +EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid_common CROSS_COMPILE= arm-none-eabi- CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 @@ -49,7 +49,7 @@ endif INC_DIRS = \ -I"../" \ -I"../CMSIS/Core/Include" \ - -I"../ccid" \ + -I"../ccid_common" \ -I"../config" \ -I"../dma_m2m" \ -I"../hal/include" \ @@ -81,8 +81,8 @@ INC_DIRS = \ # List the object files OBJS += \ atmel_start.o \ - ccid/ccid_proto.o \ - ccid/ccid_device.o \ + ccid_common/ccid_proto.o \ + ccid_common/ccid_device.o \ command.o \ dma_m2m/dma_memory.o \ driver_init.o \