split ccid into common and host-only code

Change-Id: I175c4efdafedc1d8953d3fb03f2d622a7a74af3b

18 files changed, 11 insertions, 8 deletions

diff --git a/ccid/ccid_device.c b/ccid_common/ccid_device.c
index 049b1cf..049b1cf 100644
--- a/ccid/ccid_device.c
+++ b/ccid_common/ccid_device.c
diff --git a/ccid/ccid_device.h b/ccid_common/ccid_device.h
index afd4a7a..afd4a7a 100644
--- a/ccid/ccid_device.h
+++ b/ccid_common/ccid_device.h
diff --git a/ccid/ccid_proto.c b/ccid_common/ccid_proto.c
index 9275cf2..9275cf2 100644
--- a/ccid/ccid_proto.c
+++ b/ccid_common/ccid_proto.c
diff --git a/ccid/ccid_proto.h b/ccid_common/ccid_proto.h
index 92878dc..92878dc 100644
--- a/ccid/ccid_proto.h
+++ b/ccid_common/ccid_proto.h
diff --git a/ccid/CCID.patch b/ccid_host/CCID.patch
index 011697a..011697a 100644
--- a/ccid/CCID.patch
+++ b/ccid_host/CCID.patch
diff --git a/ccid/Makefile b/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
index 2b98eff..2b98eff 100644
--- a/ccid/README.linux-dummy_hcd-ffs
+++ b/ccid_host/README.linux-dummy_hcd-ffs
diff --git a/ccid/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c
index 26bb525..26bb525 100644
--- a/ccid/ccid_main_functionfs.c
+++ b/ccid_host/ccid_main_functionfs.c
diff --git a/ccid/ccid_slot_sim.c b/ccid_host/ccid_slot_sim.c
index 1bd514a..1bd514a 100644
--- a/ccid/ccid_slot_sim.c
+++ b/ccid_host/ccid_slot_sim.c
diff --git a/ccid/ccid_slot_sim.h b/ccid_host/ccid_slot_sim.h
index 6217756..6217756 100644
--- a/ccid/ccid_slot_sim.h
+++ b/ccid_host/ccid_slot_sim.h
diff --git a/ccid/create_ccid_gadget.sh b/ccid_host/create_ccid_gadget.sh
index aafb152..aafb152 100755
--- a/ccid/create_ccid_gadget.sh
+++ b/ccid_host/create_ccid_gadget.sh
diff --git a/ccid/hub_create_gadget.sh b/ccid_host/hub_create_gadget.sh
index 3689c9f..3689c9f 100755
--- a/ccid/hub_create_gadget.sh
+++ b/ccid_host/hub_create_gadget.sh
diff --git a/ccid/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c
index c019cde..c019cde 100644
--- a/ccid/hub_main_functionfs.c
+++ b/ccid_host/hub_main_functionfs.c
diff --git a/ccid/hub_remove_gadget.sh b/ccid_host/hub_remove_gadget.sh
index e206d6f..e206d6f 100755
--- a/ccid/hub_remove_gadget.sh
+++ b/ccid_host/hub_remove_gadget.sh
diff --git a/ccid/remove_ccid_gadget.sh b/ccid_host/remove_ccid_gadget.sh
index 3ad0511..3ad0511 100755
--- a/ccid/remove_ccid_gadget.sh
+++ b/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 \