sim-card
/
osmo-ccid-firmware
mirror of https://gerrit.osmocom.org/osmo-ccid-firmware
10
0
Fork 0
Code Issues Releases Wiki Activity

rename the global talloc context 

both the host and the firmware build require a global talloc context
with external linkage, so let's agree on one name.

Change-Id: Idced24869863983bfde0c9c438498999717f2042
This commit is contained in:
Eric Wild 2019-12-02 14:11:23 +01:00
parent e84a571c04
commit dd2e82e2b5
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ccid_host/ccid_main_functionfs.c
View File

@ -506,13 +506,13 @@ static const struct ccid_ops c_ops = {
.send_int = ccid_ops_send_int,
};
static void *tall_main_ctx;
void *g_tall_ctx;
static void signal_handler(int signal)
{
switch (signal) {
case SIGUSR1:
talloc_report_full(tall_main_ctx, stderr);
talloc_report_full(g_tall_ctx, stderr);
break;
}
}
@ -523,9 +523,9 @@ int main(int argc, char **argv)
struct ufunc_handle ufh = (struct ufunc_handle) { 0, };
int rc;
tall_main_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs");
msgb_talloc_ctx_init(tall_main_ctx, 0);
osmo_init_logging2(tall_main_ctx, &log_info);
g_tall_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs");
msgb_talloc_ctx_init(g_tall_ctx, 0);
osmo_init_logging2(g_tall_ctx, &log_info);
signal(SIGUSR1, &signal_handler);

10
ccid_host/cuart_fsm_test.c
View File

@ -37,13 +37,13 @@ static void fsm_user_cb(struct osmo_fsm_inst *fi, int event, int cause, void *da
}
}
static void *tall_main_ctx;
static void *g_tall_ctx;
static void signal_handler(int signal)
{
switch (signal) {
case SIGUSR1:
talloc_report_full(tall_main_ctx, stderr);
talloc_report_full(g_tall_ctx, stderr);
break;
}
}
@ -54,9 +54,9 @@ int main(int argc, char **argv)
uint8_t atr[64];
int rc;
tall_main_ctx = talloc_named_const(NULL, 0, "main");
msgb_talloc_ctx_init(tall_main_ctx, 0);
osmo_init_logging2(tall_main_ctx, &log_info);
g_tall_ctx = talloc_named_const(NULL, 0, "main");
msgb_talloc_ctx_init(g_tall_ctx, 0);
osmo_init_logging2(g_tall_ctx, &log_info);
osmo_fsm_log_addr(false);
signal(SIGUSR1, &signal_handler);

10
ccid_host/hub_main_functionfs.c
View File

@ -464,13 +464,13 @@ static const struct log_info log_info = {
.num_cat = ARRAY_SIZE(log_info_cat),
};
static void *tall_main_ctx;
static void *g_tall_ctx;
static void signal_handler(int signal)
{
switch (signal) {
case SIGUSR1:
talloc_report_full(tall_main_ctx, stderr);
talloc_report_full(g_tall_ctx, stderr);
break;
}
}
@ -481,9 +481,9 @@ int main(int argc, char **argv)
struct ufunc_handle ufh = (struct ufunc_handle) { 0, };
int rc;
tall_main_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs");
msgb_talloc_ctx_init(tall_main_ctx, 0);
osmo_init_logging2(tall_main_ctx, &log_info);
g_tall_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs");
msgb_talloc_ctx_init(g_tall_ctx, 0);
osmo_init_logging2(g_tall_ctx, &log_info);
signal(SIGUSR1, &signal_handler);