Change in ...osmo-ccid-firmware[master]: split ccid into common and host-only code

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Wed Oct 9 13:04:01 UTC 2019 

Hello Hoernchen,

I'd like you to do a code review. Please visit

    https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15720

to review the following change.


Change subject: split ccid into common and host-only code
......................................................................

split ccid into common and host-only code

Change-Id: I175c4efdafedc1d8953d3fb03f2d622a7a74af3b
---
D ccid/Makefile
R ccid_common/ccid_device.c
R ccid_common/ccid_device.h
R ccid_common/ccid_proto.c
R ccid_common/ccid_proto.h
R ccid_host/CCID.patch
A ccid_host/Makefile
R ccid_host/README.linux-dummy_hcd-ffs
R ccid_host/ccid_main_functionfs.c
R ccid_host/ccid_slot_sim.c
R ccid_host/ccid_slot_sim.h
R ccid_host/create_ccid_gadget.sh
R ccid_host/hub_create_gadget.sh
R ccid_host/hub_main_functionfs.c
R ccid_host/hub_remove_gadget.sh
R ccid_host/remove_ccid_gadget.sh
D sysmoOCTSIM/ccid
A sysmoOCTSIM/ccid_common
M sysmoOCTSIM/gcc/Makefile
19 files changed, 21 insertions(+), 18 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/20/15720/1

diff --git a/ccid/Makefile b/ccid/Makefile
deleted file mode 100644
index 0fadd22..0000000
--- a/ccid/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-CFLAGS=-Wall -g
-
-ccid_functionfs: ccid_main_functionfs.o ccid_proto.o ccid_device.o ccid_slot_sim.o
-	$(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio
-
-hub_functionfs: hub_main_functionfs.o
-	$(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio
-
-%.o: %.c
-	$(CC) $(CFLAGS) -o $@ -c $^
-
-clean:
-	rm ccid_functionfs *.o
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_host/Makefile b/ccid_host/Makefile
new file mode 100644
index 0000000..b68bd9d
--- /dev/null
+++ b/ccid_host/Makefile
@@ -0,0 +1,16 @@
+CFLAGS=-Wall -g -I../ccid_common -I.
+
+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
+	$(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio
+
+%.o: %.c
+	$(CC) $(CFLAGS) -o $@ -c $^
+
+clean:
+	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 @@
 INC_DIRS = \
 	-I"../" \
 	-I"../CMSIS/Core/Include" \
-	-I"../ccid" \
+	-I"../ccid_common" \
 	-I"../config" \
 	-I"../dma_m2m" \
 	-I"../hal/include" \
@@ -81,8 +81,8 @@
 # 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 \

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15720
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I175c4efdafedc1d8953d3fb03f2d622a7a74af3b
Gerrit-Change-Number: 15720
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191009/d343ca18/attachment.htm>

More information about the gerrit-log mailing list