<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16318">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add the talloc ctx to struct ccid_instance<br><br>We need it anyway, and relying on global vars is ugly. I'd still like to<br>keep them for debug purposes tho.<br><br>Change-Id: I3b73e68d0347d74f68018614613fcc802f3fdfe7<br>---<br>M ccid_common/ccid_device.h<br>M ccid_common/ccid_slot_fsm.c<br>M ccid_host/ccid_main_functionfs.c<br>M sysmoOCTSIM/libosmo_emb.c<br>M sysmoOCTSIM/main.c<br>5 files changed, 9 insertions(+), 7 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/18/16318/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_common/ccid_device.h b/ccid_common/ccid_device.h</span><br><span>index f364f72..d00bc54 100644</span><br><span>--- a/ccid_common/ccid_device.h</span><br><span>+++ b/ccid_common/ccid_device.h</span><br><span>@@ -105,6 +105,7 @@</span><br><span>      /* array of permitted clock frequencies; length: bNumClockSupported */</span><br><span>       const uint32_t *clock_freqs;</span><br><span>         const char *name;</span><br><span style="color: hsl(120, 100%, 40%);">+     void *talloc_ctx;</span><br><span>    /* user-supplied opaque data */</span><br><span>      void *priv;</span><br><span> };</span><br><span>diff --git a/ccid_common/ccid_slot_fsm.c b/ccid_common/ccid_slot_fsm.c</span><br><span>index 3a591d7..29bffa0 100644</span><br><span>--- a/ccid_common/ccid_slot_fsm.c</span><br><span>+++ b/ccid_common/ccid_slot_fsm.c</span><br><span>@@ -323,10 +323,9 @@</span><br><span>    return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern void *g_tall_ctx;</span><br><span> static int iso_fsm_slot_init(struct ccid_slot *cs)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   void *ctx = g_tall_ctx; /* FIXME */</span><br><span style="color: hsl(120, 100%, 40%);">+   void *ctx = cs->ci->talloc_ctx;</span><br><span>        struct iso_fsm_slot *ss = ccid_slot2iso_fsm_slot(cs);</span><br><span>        struct card_uart *cuart = talloc_zero(ctx, struct card_uart);</span><br><span>        char id_buf[16] = "SIM0";</span><br><span>diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c</span><br><span>index 8e95c73..cd53a09 100644</span><br><span>--- a/ccid_host/ccid_main_functionfs.c</span><br><span>+++ b/ccid_host/ccid_main_functionfs.c</span><br><span>@@ -526,6 +526,7 @@</span><br><span>       tall_main_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs");</span><br><span>       msgb_talloc_ctx_init(tall_main_ctx, 0);</span><br><span>      osmo_init_logging2(tall_main_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+     g_ci.talloc_ctx = tall_main_ctx;</span><br><span> </span><br><span>         signal(SIGUSR1, &signal_handler);</span><br><span> </span><br><span>diff --git a/sysmoOCTSIM/libosmo_emb.c b/sysmoOCTSIM/libosmo_emb.c</span><br><span>index 81b29e3..40b7f5f 100644</span><br><span>--- a/sysmoOCTSIM/libosmo_emb.c</span><br><span>+++ b/sysmoOCTSIM/libosmo_emb.c</span><br><span>@@ -145,7 +145,7 @@</span><br><span>     return target;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void libosmo_emb_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+void libosmo_emb_init(void* talloc_ctx)</span><br><span> {</span><br><span>     struct log_target *stderr_target;</span><br><span> </span><br><span>@@ -156,7 +156,7 @@</span><br><span>  msgb_talloc_ctx_init(g_msgb_ctx, 0);</span><br><span> #endif</span><br><span>       /* logging */</span><br><span style="color: hsl(0, 100%, 40%);">-   log_init(&log_info, g_tall_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+  log_init(&log_info, talloc_ctx);</span><br><span> #ifdef ENABLE_DBG_UART7</span><br><span>      stderr_target = log_target_create_stderr_raw();</span><br><span>      log_add_target(stderr_target);</span><br><span>diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c</span><br><span>index 07c5af8..4770868 100644</span><br><span>--- a/sysmoOCTSIM/main.c</span><br><span>+++ b/sysmoOCTSIM/main.c</span><br><span>@@ -325,13 +325,13 @@</span><br><span> </span><br><span> </span><br><span> extern void testmode_init(void);</span><br><span style="color: hsl(0, 100%, 40%);">-extern void libosmo_emb_init(void);</span><br><span style="color: hsl(120, 100%, 40%);">+extern void libosmo_emb_init(void* talloc_ctx);</span><br><span> extern void libosmo_emb_mainloop(void);</span><br><span> </span><br><span> #include "talloc.h"</span><br><span> #include "logging.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *g_tall_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+static void *g_tall_ctx;</span><br><span> </span><br><span> </span><br><span> /* Section 9.6 of SAMD5x/E5x Family Data Sheet */</span><br><span>@@ -491,11 +491,12 @@</span><br><span>    talloc_enable_null_tracking();</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 style="color: hsl(120, 100%, 40%);">+    g_ci.talloc_ctx = g_tall_ctx;</span><br><span> </span><br><span>    //FIXME osmo_emb has a pool?</span><br><span>         msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        libosmo_emb_init();</span><br><span style="color: hsl(120, 100%, 40%);">+   libosmo_emb_init(g_tall_ctx);</span><br><span> </span><br><span>    LOGP(DUSB, LOGL_ERROR, "foobar usb\n");</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16318">change 16318</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/+/16318"/><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: I3b73e68d0347d74f68018614613fcc802f3fdfe7 </div>
<div style="display:none"> Gerrit-Change-Number: 16318 </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>