<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15694">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make cuart_fsm_test work (ATR + TPDU)<br><br>Change-Id: I5abfe18a414feac6d66f7e506865dd4cd5af73fe<br>---<br>M ccid/Makefile<br>A ccid/cuart_fsm_test.c<br>2 files changed, 121 insertions(+), 5 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/94/15694/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid/Makefile b/ccid/Makefile</span><br><span>index a0d6952..3ab1045 100644</span><br><span>--- a/ccid/Makefile</span><br><span>+++ b/ccid/Makefile</span><br><span>@@ -1,18 +1,22 @@</span><br><span> CFLAGS=-Wall -g</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS?=-lasan $(shell pkg-config --libs libosmocore)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-all: ccid_functionfs hub_functionfs cuart_test</span><br><span style="color: hsl(120, 100%, 40%);">+all: ccid_functionfs hub_functionfs cuart_test cuart_fsm_test</span><br><span> </span><br><span> ccid_functionfs: ccid_main_functionfs.o logging.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(120, 100%, 40%);">+ $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio</span><br><span> </span><br><span> 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(120, 100%, 40%);">+ $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio</span><br><span> </span><br><span> cuart_test: cuart_test.o cuart.o cuart_driver_tty.o utils_ringbuffer.o</span><br><span style="color: hsl(0, 100%, 40%);">- $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CC) $(CFLAGS) -o $@ $^ $(LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cuart_fsm_test: cuart_fsm_test.o logging.o cuart.o cuart_driver_tty.o utils_ringbuffer.o iso7816_fsm.o</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CC) -o $@ $^ $(LIBS) $(shell pkg-config --libs libosmosim)</span><br><span> </span><br><span> %.o: %.c</span><br><span> $(CC) $(CFLAGS) -o $@ -c $^</span><br><span> </span><br><span> clean:</span><br><span style="color: hsl(0, 100%, 40%);">- rm ccid_functionfs hub_functionfs cuart_test *.o</span><br><span style="color: hsl(120, 100%, 40%);">+ rm ccid_functionfs hub_functionfs cuart_test cuart_fsm_test *.o</span><br><span>diff --git a/ccid/cuart_fsm_test.c b/ccid/cuart_fsm_test.c</span><br><span>new file mode 100644</span><br><span>index 0000000..92f3437</span><br><span>--- /dev/null</span><br><span>+++ b/ccid/cuart_fsm_test.c</span><br><span>@@ -0,0 +1,112 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdio.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <signal.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/application.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/sim/sim.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "logging.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "cuart.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "iso7816_fsm.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct card_uart g_cuart;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum test_state {</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_WAIT_ATR,</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_ATR_DONE,</span><br><span style="color: hsl(120, 100%, 40%);">+ ST_IN_TPDU,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+static enum test_state g_tstate = ST_WAIT_ATR;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void fsm_user_cb(struct osmo_fsm_inst *fi, int event, int cause, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Handle FSM User Event %d: cause=%d, data=%p\n", event, cause, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_ATR_DONE_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ g_tstate = ST_ATR_DONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case ISO7816_E_TPDU_DONE_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("======= TPDU: %s\n", msgb_hexdump(data));</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(data);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_tstate = ST_ATR_DONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void *tall_main_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void signal_handler(int signal)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (signal) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SIGUSR1:</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(tall_main_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int main(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t atr[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_main_ctx = talloc_named_const(NULL, 0, "main");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(tall_main_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_logging2(tall_main_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_log_addr(false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ signal(SIGUSR1, &signal_handler);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = card_uart_open(&g_cuart, "tty", "/dev/ttyUSB5");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("opening UART");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fi = iso7816_fsm_alloc(NULL, LOGL_DEBUG, "SIM0", &g_cuart, fsm_user_cb, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* activate reset, then power up */</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(&g_cuart, CUART_CTL_RST, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(&g_cuart, CUART_CTL_POWER, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, ISO7816_E_POWER_UP_IND, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* activate clock */</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(&g_cuart, CUART_CTL_CLOCK, true);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* wait some time and release reset */</span><br><span style="color: hsl(120, 100%, 40%);">+ usleep(10000);</span><br><span style="color: hsl(120, 100%, 40%);">+ card_uart_ctrl(&g_cuart, CUART_CTL_RST, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, ISO7816_E_RESET_REL_IND, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* process any events in polling mode for initial change */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_select_main(1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *apdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* check if the new state requires us to do something */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (g_tstate) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ST_ATR_DONE:</span><br><span style="color: hsl(120, 100%, 40%);">+ apdu = msgb_alloc(512, "TPDU");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(apdu, 0x00);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(apdu, 0xa4);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(apdu, 0x00);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(apdu, 0x04);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(apdu, 0x02);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(apdu, 0x2f);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(apdu, 0x00);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, ISO7816_E_XCEIVE_TPDU_CMD, apdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_tstate = ST_IN_TPDU;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_select_main(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15694">change 15694</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/+/15694"/><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: I5abfe18a414feac6d66f7e506865dd4cd5af73fe </div>
<div style="display:none"> Gerrit-Change-Number: 15694 </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-MessageType: newchange </div>