fix firmware compilation, split ccid into shared/host only codehoernchen/ccidsplit

Change-Id: Icba62a4b1f38448bb6046cce27aa5be9d1407cae

32 files changed, 48 insertions, 34 deletions

diff --git a/ccid/Makefile b/ccid/Makefile
deleted file mode 100644
index 4993550..0000000
--- a/ccid/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-CFLAGS=-Wall -g
-LIBS?=-lasan $(shell pkg-config --libs libosmocore)
-
-all: ccid_functionfs hub_functionfs cuart_test cuart_fsm_test
-
-ccid_functionfs: ccid_main_functionfs.o logging.o ccid_proto.o ccid_device.o \
-		 cuart.o utils_ringbuffer.o cuart_driver_tty.o \
-		 ccid_slot_fsm.o iso7816_fsm.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio
-
-hub_functionfs: hub_main_functionfs.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio
-
-cuart_test: cuart_test.o cuart.o cuart_driver_tty.o utils_ringbuffer.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-cuart_fsm_test: cuart_fsm_test.o logging.o cuart.o cuart_driver_tty.o utils_ringbuffer.o iso7816_fsm.o
-	$(CC) -o $@ $^ $(LIBS) $(shell pkg-config --libs libosmosim)
-
-%.o: %.c
-	$(CC) $(CFLAGS) -o $@ -c $^
-
-clean:
-	rm ccid_functionfs hub_functionfs cuart_test cuart_fsm_test *.o
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 ae3ab5b..ae3ab5b 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_slot_fsm.c b/ccid_common/ccid_slot_fsm.c
index 76279ec..76279ec 100644
--- a/ccid/ccid_slot_fsm.c
+++ b/ccid_common/ccid_slot_fsm.c
diff --git a/ccid/cuart.c b/ccid_common/cuart.c
index 895717a..895717a 100644
--- a/ccid/cuart.c
+++ b/ccid_common/cuart.c
diff --git a/ccid/cuart.h b/ccid_common/cuart.h
index cadd65f..cadd65f 100644
--- a/ccid/cuart.h
+++ b/ccid_common/cuart.h
diff --git a/ccid/cuart_driver_asf4_usart_async.c b/ccid_common/cuart_driver_asf4_usart_async.c
index 299a2df..299a2df 100644
--- a/ccid/cuart_driver_asf4_usart_async.c
+++ b/ccid_common/cuart_driver_asf4_usart_async.c
diff --git a/ccid/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index e173030..e173030 100644
--- a/ccid/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
diff --git a/ccid/iso7816_fsm.h b/ccid_common/iso7816_fsm.h
index 9a6b24e..9a6b24e 100644
--- a/ccid/iso7816_fsm.h
+++ b/ccid_common/iso7816_fsm.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_host/Makefile b/ccid_host/Makefile
new file mode 100644
index 0000000..44d2d1c
--- /dev/null
+++ b/ccid_host/Makefile
@@ -0,0 +1,38 @@
+CFLAGS=-Wall -g -I../ccid_common -I.
+LIBS?=-lasan $(shell pkg-config --libs libosmocore)
+
+all: ccid_functionfs hub_functionfs cuart_test cuart_fsm_test
+
+ccid_functionfs: ccid_main_functionfs.o \
+		 logging.o \
+		 utils_ringbuffer.o \
+		 cuart_driver_tty.o \
+		 ../ccid_common/ccid_proto.o \
+		 ../ccid_common/ccid_device.o \
+		 ../ccid_common/cuart.o \
+		 ../ccid_common/ccid_slot_fsm.o \
+		 ../ccid_common/iso7816_fsm.o
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio
+
+hub_functionfs: hub_main_functionfs.o
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio
+
+cuart_test: cuart_test.o \
+		 cuart_driver_tty.o \
+		 utils_ringbuffer.o \
+		 ../ccid_common/cuart.o 
+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+
+cuart_fsm_test: cuart_fsm_test.o \
+		 logging.o \
+		 cuart_driver_tty.o \
+		 utils_ringbuffer.o \
+		 ../ccid_common/cuart.o \
+		 ../ccid_common/iso7816_fsm.o
+	$(CC) -o $@ $^ $(LIBS) $(shell pkg-config --libs libosmosim)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $^
+
+clean:
+	rm ccid_functionfs hub_functionfs cuart_test cuart_fsm_test *.o ../ccid_common/*.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 d45a936..d45a936 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 dc33114..dc33114 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/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c
index 3695b58..3695b58 100644
--- a/ccid/cuart_driver_tty.c
+++ b/ccid_host/cuart_driver_tty.c
diff --git a/ccid/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c
index 92f3437..92f3437 100644
--- a/ccid/cuart_fsm_test.c
+++ b/ccid_host/cuart_fsm_test.c
diff --git a/ccid/cuart_test.c b/ccid_host/cuart_test.c
index d4d8faf..d4d8faf 100644
--- a/ccid/cuart_test.c
+++ b/ccid_host/cuart_test.c
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/logging.c b/ccid_host/logging.c
index 4e14815..4e14815 100644
--- a/ccid/logging.c
+++ b/ccid_host/logging.c
diff --git a/ccid/logging.h b/ccid_host/logging.h
index 0a2d36a..0a2d36a 100644
--- a/ccid/logging.h
+++ b/ccid_host/logging.h
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/ccid/utils_ringbuffer.c b/ccid_host/utils_ringbuffer.c
index 49c273c..49c273c 100644
--- a/ccid/utils_ringbuffer.c
+++ b/ccid_host/utils_ringbuffer.c
diff --git a/ccid/utils_ringbuffer.h b/ccid_host/utils_ringbuffer.h
index 07043a6..07043a6 100644
--- a/ccid/utils_ringbuffer.h
+++ b/ccid_host/utils_ringbuffer.h
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/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile
index 4d4a915..05d7890 100644
--- a/sysmoOCTSIM/gcc/Makefile
+++ b/sysmoOCTSIM/gcc/Makefile
@@ -2,9 +2,9 @@
 # Manually edited. Do not overwrite with Automatically-generated file.
 ################################################################################
 
-SYSTEM_PREFIX:=/usr/local/arm-none-eabi
+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,11 +81,12 @@ INC_DIRS = \
 # List the object files
 OBJS +=  \
 	atmel_start.o \
-	ccid/ccid_proto.o \
-	ccid/ccid_device.o \
-	ccid/iso7816_fsm.o \
-	ccid/cuart.o \
-	ccid/cuart_driver_asf4_usart_async.o \
+	ccid_common/ccid_proto.o \
+	ccid_common/ccid_device.o \
+	ccid_common/ccid_slot_fsm.o \
+	ccid_common/iso7816_fsm.o \
+	ccid_common/cuart.o \
+	ccid_common/cuart_driver_asf4_usart_async.o \
 	command.o \
 	dma_m2m/dma_memory.o \
 	driver_init.o \
diff --git a/sysmoOCTSIM/logging.h b/sysmoOCTSIM/logging.h
index 487fd0d..896b166 100644
--- a/sysmoOCTSIM/logging.h
+++ b/sysmoOCTSIM/logging.h
@@ -8,6 +8,6 @@ enum {
 	DISO7816,
 	DATR,
 	DTPDU,
-	DPPS
+	DPPS,
 	DCARD,
 };