<p>laforge would like Hoernchen to <strong>review</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15720">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">split ccid into common and host-only code<br><br>Change-Id: I175c4efdafedc1d8953d3fb03f2d622a7a74af3b<br>---<br>D ccid/Makefile<br>R ccid_common/ccid_device.c<br>R ccid_common/ccid_device.h<br>R ccid_common/ccid_proto.c<br>R ccid_common/ccid_proto.h<br>R ccid_host/CCID.patch<br>A ccid_host/Makefile<br>R ccid_host/README.linux-dummy_hcd-ffs<br>R ccid_host/ccid_main_functionfs.c<br>R ccid_host/ccid_slot_sim.c<br>R ccid_host/ccid_slot_sim.h<br>R ccid_host/create_ccid_gadget.sh<br>R ccid_host/hub_create_gadget.sh<br>R ccid_host/hub_main_functionfs.c<br>R ccid_host/hub_remove_gadget.sh<br>R ccid_host/remove_ccid_gadget.sh<br>D sysmoOCTSIM/ccid<br>A sysmoOCTSIM/ccid_common<br>M sysmoOCTSIM/gcc/Makefile<br>19 files changed, 21 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/20/15720/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid/Makefile b/ccid/Makefile</span><br><span>deleted file mode 100644</span><br><span>index 0fadd22..0000000</span><br><span>--- a/ccid/Makefile</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-CFLAGS=-Wall -g</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-ccid_functionfs: ccid_main_functionfs.o ccid_proto.o ccid_device.o ccid_slot_sim.o</span><br><span style="color: hsl(0, 100%, 40%);">-     $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-hub_functionfs: hub_main_functionfs.o</span><br><span style="color: hsl(0, 100%, 40%);">-  $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-%.o: %.c</span><br><span style="color: hsl(0, 100%, 40%);">-       $(CC) $(CFLAGS) -o $@ -c $^</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-clean:</span><br><span style="color: hsl(0, 100%, 40%);">-       rm ccid_functionfs *.o</span><br><span>diff --git a/ccid/ccid_device.c b/ccid_common/ccid_device.c</span><br><span>similarity index 100%</span><br><span>rename from ccid/ccid_device.c</span><br><span>rename to ccid_common/ccid_device.c</span><br><span>diff --git a/ccid/ccid_device.h b/ccid_common/ccid_device.h</span><br><span>similarity index 100%</span><br><span>rename from ccid/ccid_device.h</span><br><span>rename to ccid_common/ccid_device.h</span><br><span>diff --git a/ccid/ccid_proto.c b/ccid_common/ccid_proto.c</span><br><span>similarity index 100%</span><br><span>rename from ccid/ccid_proto.c</span><br><span>rename to ccid_common/ccid_proto.c</span><br><span>diff --git a/ccid/ccid_proto.h b/ccid_common/ccid_proto.h</span><br><span>similarity index 100%</span><br><span>rename from ccid/ccid_proto.h</span><br><span>rename to ccid_common/ccid_proto.h</span><br><span>diff --git a/ccid/CCID.patch b/ccid_host/CCID.patch</span><br><span>similarity index 100%</span><br><span>rename from ccid/CCID.patch</span><br><span>rename to ccid_host/CCID.patch</span><br><span>diff --git a/ccid_host/Makefile b/ccid_host/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..b68bd9d</span><br><span>--- /dev/null</span><br><span>+++ b/ccid_host/Makefile</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+CFLAGS=-Wall -g -I../ccid_common -I.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ccid_functionfs: ccid_main_functionfs.o \</span><br><span style="color: hsl(120, 100%, 40%);">+                ccid_slot_sim.o \</span><br><span style="color: hsl(120, 100%, 40%);">+             ../ccid_common/ccid_proto.o \</span><br><span style="color: hsl(120, 100%, 40%);">+                 ../ccid_common/ccid_device.o</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+hub_functionfs: hub_main_functionfs.o</span><br><span style="color: hsl(120, 100%, 40%);">+    $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+%.o: %.c</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CC) $(CFLAGS) -o $@ -c $^</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+clean:</span><br><span style="color: hsl(120, 100%, 40%);">+ rm ccid_functionfs hub_functionfs *.o</span><br><span>diff --git a/ccid/README.linux-dummy_hcd-ffs b/ccid_host/README.linux-dummy_hcd-ffs</span><br><span>similarity index 100%</span><br><span>rename from ccid/README.linux-dummy_hcd-ffs</span><br><span>rename to ccid_host/README.linux-dummy_hcd-ffs</span><br><span>diff --git a/ccid/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c</span><br><span>similarity index 100%</span><br><span>rename from ccid/ccid_main_functionfs.c</span><br><span>rename to ccid_host/ccid_main_functionfs.c</span><br><span>diff --git a/ccid/ccid_slot_sim.c b/ccid_host/ccid_slot_sim.c</span><br><span>similarity index 100%</span><br><span>rename from ccid/ccid_slot_sim.c</span><br><span>rename to ccid_host/ccid_slot_sim.c</span><br><span>diff --git a/ccid/ccid_slot_sim.h b/ccid_host/ccid_slot_sim.h</span><br><span>similarity index 100%</span><br><span>rename from ccid/ccid_slot_sim.h</span><br><span>rename to ccid_host/ccid_slot_sim.h</span><br><span>diff --git a/ccid/create_ccid_gadget.sh b/ccid_host/create_ccid_gadget.sh</span><br><span>similarity index 100%</span><br><span>rename from ccid/create_ccid_gadget.sh</span><br><span>rename to ccid_host/create_ccid_gadget.sh</span><br><span>diff --git a/ccid/hub_create_gadget.sh b/ccid_host/hub_create_gadget.sh</span><br><span>similarity index 100%</span><br><span>rename from ccid/hub_create_gadget.sh</span><br><span>rename to ccid_host/hub_create_gadget.sh</span><br><span>diff --git a/ccid/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c</span><br><span>similarity index 100%</span><br><span>rename from ccid/hub_main_functionfs.c</span><br><span>rename to ccid_host/hub_main_functionfs.c</span><br><span>diff --git a/ccid/hub_remove_gadget.sh b/ccid_host/hub_remove_gadget.sh</span><br><span>similarity index 100%</span><br><span>rename from ccid/hub_remove_gadget.sh</span><br><span>rename to ccid_host/hub_remove_gadget.sh</span><br><span>diff --git a/ccid/remove_ccid_gadget.sh b/ccid_host/remove_ccid_gadget.sh</span><br><span>similarity index 100%</span><br><span>rename from ccid/remove_ccid_gadget.sh</span><br><span>rename to ccid_host/remove_ccid_gadget.sh</span><br><span>diff --git a/sysmoOCTSIM/ccid b/sysmoOCTSIM/ccid</span><br><span>deleted file mode 120000</span><br><span>index 207f210..0000000</span><br><span>--- a/sysmoOCTSIM/ccid</span><br><span>+++ /dev/null</span><br><span>@@ -1 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-../ccid</span><br><span>\ No newline at end of file</span><br><span>diff --git a/sysmoOCTSIM/ccid_common b/sysmoOCTSIM/ccid_common</span><br><span>new file mode 120000</span><br><span>index 0000000..db3fc02</span><br><span>--- /dev/null</span><br><span>+++ b/sysmoOCTSIM/ccid_common</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+../ccid_common</span><br><span>\ No newline at end of file</span><br><span>diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile</span><br><span>index 025e2dd..83b127f 100644</span><br><span>--- a/sysmoOCTSIM/gcc/Makefile</span><br><span>+++ b/sysmoOCTSIM/gcc/Makefile</span><br><span>@@ -4,7 +4,7 @@</span><br><span> </span><br><span> SYSTEM_PREFIX:=/usr/local/arm-none-eabi</span><br><span> EXTRA_LIBS=$(SYSTEM_PREFIX)/lib/libosmocore.a</span><br><span style="color: hsl(0, 100%, 40%);">-EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_CFLAGS=-I$(SYSTEM_PREFIX)/include -I../../ccid_common</span><br><span> CROSS_COMPILE= arm-none-eabi-</span><br><span> </span><br><span> CFLAGS_CPU=-D__SAME54N19A__ -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16</span><br><span>@@ -49,7 +49,7 @@</span><br><span> INC_DIRS = \</span><br><span>      -I"../" \</span><br><span>  -I"../CMSIS/Core/Include" \</span><br><span style="color: hsl(0, 100%, 40%);">-   -I"../ccid" \</span><br><span style="color: hsl(120, 100%, 40%);">+       -I"../ccid_common" \</span><br><span>       -I"../config" \</span><br><span>    -I"../dma_m2m" \</span><br><span>   -I"../hal/include" \</span><br><span>@@ -81,8 +81,8 @@</span><br><span> # List the object files</span><br><span> OBJS +=  \</span><br><span>  atmel_start.o \</span><br><span style="color: hsl(0, 100%, 40%);">- ccid/ccid_proto.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     ccid/ccid_device.o \</span><br><span style="color: hsl(120, 100%, 40%);">+  ccid_common/ccid_proto.o \</span><br><span style="color: hsl(120, 100%, 40%);">+    ccid_common/ccid_device.o \</span><br><span>  command.o \</span><br><span>  dma_m2m/dma_memory.o \</span><br><span>       driver_init.o \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15720">change 15720</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15720"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I175c4efdafedc1d8953d3fb03f2d622a7a74af3b </div>
<div style="display:none"> Gerrit-Change-Number: 15720 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>