<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16270">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">no logging, no memory pool<br><br>Change-Id: Iaf5123ab0340efec7b8e11e689f529f2e95e31ca<br>---<br>M sysmoOCTSIM/atmel_start.c<br>M sysmoOCTSIM/libosmo_emb.c<br>M sysmoOCTSIM/main.c<br>3 files changed, 15 insertions(+), 10 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/70/16270/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/atmel_start.c b/sysmoOCTSIM/atmel_start.c</span><br><span>index bee1ed2..6670364 100644</span><br><span>--- a/sysmoOCTSIM/atmel_start.c</span><br><span>+++ b/sysmoOCTSIM/atmel_start.c</span><br><span>@@ -14,6 +14,6 @@</span><br><span> system_init();</span><br><span> dma_memory_init();</span><br><span> dma_memory_register_callback(DMA_MEMORY_COMPLETE_CB, M2M_DMA_complete_cb);</span><br><span style="color: hsl(0, 100%, 40%);">- stdio_redirect_init();</span><br><span style="color: hsl(120, 100%, 40%);">+// stdio_redirect_init();</span><br><span> usb_init();</span><br><span> }</span><br><span>diff --git a/sysmoOCTSIM/libosmo_emb.c b/sysmoOCTSIM/libosmo_emb.c</span><br><span>index 1914568..a12c490 100644</span><br><span>--- a/sysmoOCTSIM/libosmo_emb.c</span><br><span>+++ b/sysmoOCTSIM/libosmo_emb.c</span><br><span>@@ -41,43 +41,43 @@</span><br><span> [DUSB] = {</span><br><span> .name = "USB",</span><br><span> .description = "USB Transport",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span> .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span> [DCCID] = {</span><br><span> .name = "CCID",</span><br><span> .description = "USB-CCID Protocol",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span> [DISO7816] = {</span><br><span> .name = "ISO7816",</span><br><span> .description = "ISO7816-3 State machines",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span> [DATR] = {</span><br><span> .name = "ATR",</span><br><span> .description = "ATR (Answer To Reset) FSM",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span> [DTPDU] = {</span><br><span> .name = "TPDU",</span><br><span> .description = "TPDU FSM",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span> [DPPS] = {</span><br><span> .name = "PPS",</span><br><span> .description = "PPS (Protocol and Parameter Selection) FSM",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span> [DCARD] = {</span><br><span> .name = "CARD",</span><br><span> .description = "Card FSM",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 0,</span><br><span> .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span> };</span><br><span>@@ -150,16 +150,18 @@</span><br><span> struct log_target *stderr_target;</span><br><span> </span><br><span> /* msgb */</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span> g_msgb_ctx = talloc_pool(g_tall_ctx, 20480);</span><br><span> talloc_set_memlimit(g_msgb_ctx, 20480);</span><br><span> msgb_talloc_ctx_init(g_msgb_ctx, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> /* logging */</span><br><span> log_init(&log_info, g_tall_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span> stderr_target = log_target_create_stderr_raw();</span><br><span> log_add_target(stderr_target);</span><br><span> log_set_all_filter(stderr_target, 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> /* timer */</span><br><span> SysTick_Config(SystemCoreClock / 1000);</span><br><span> }</span><br><span>diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c</span><br><span>index 059c99d..0f2409a 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -463,6 +463,9 @@</span><br><span> g_tall_ctx = talloc_named_const(NULL, 0, "global");</span><br><span> printf("g_tall_ctx=%p\r\n", g_tall_ctx);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ //FIXME osmo_emb has a pool?</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> libosmo_emb_init();</span><br><span> </span><br><span> LOGP(DUSB, LOGL_ERROR, "foobar usb\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16270">change 16270</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/+/16270"/><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: Iaf5123ab0340efec7b8e11e689f529f2e95e31ca </div>
<div style="display:none"> Gerrit-Change-Number: 16270 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>