split ccid into common and host-only code

Change-Id: I175c4efdafedc1d8953d3fb03f2d622a7a74af3b
This commit is contained in:
Eric Wild 2019-10-09 13:18:21 +02:00 committed by Harald Welte
parent 860d0069b2
commit d5eaa9f400
18 changed files with 11 additions and 8 deletions

View File

@ -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

View File

@ -1 +0,0 @@
../ccid

1
sysmoOCTSIM/ccid_common Symbolic link
View File

@ -0,0 +1 @@
../ccid_common

View File

@ -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 \