Change in osmo-ccid-firmware[master]: no logging, no memory pool

[Hoernchen]

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16270 )


Change subject: no logging, no memory pool
......................................................................

no logging, no memory pool

Change-Id: Iaf5123ab0340efec7b8e11e689f529f2e95e31ca
---
M sysmoOCTSIM/atmel_start.c
M sysmoOCTSIM/libosmo_emb.c
M sysmoOCTSIM/main.c
3 files changed, 15 insertions(+), 10 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/70/16270/1

diff --git a/sysmoOCTSIM/atmel_start.c b/sysmoOCTSIM/atmel_start.c
index bee1ed2..6670364 100644
--- a/sysmoOCTSIM/atmel_start.c
+++ b/sysmoOCTSIM/atmel_start.c
@@ -14,6 +14,6 @@
 	system_init();
 	dma_memory_init();
 	dma_memory_register_callback(DMA_MEMORY_COMPLETE_CB, M2M_DMA_complete_cb);
-	stdio_redirect_init();
+//	stdio_redirect_init();
 	usb_init();
 }
diff --git a/sysmoOCTSIM/libosmo_emb.c b/sysmoOCTSIM/libosmo_emb.c
index 1914568..a12c490 100644
--- a/sysmoOCTSIM/libosmo_emb.c
+++ b/sysmoOCTSIM/libosmo_emb.c
@@ -41,43 +41,43 @@
 	[DUSB] = {
 		.name = "USB",
 		.description = "USB Transport",
-		.enabled = 1,
+		.enabled = 0,
 		.loglevel = LOGL_NOTICE,
 	},
 	[DCCID] = {
 		.name = "CCID",
 		.description = "USB-CCID Protocol",
-		.enabled = 1,
+		.enabled = 0,
 		.loglevel = LOGL_DEBUG,
 	},
 	[DISO7816] = {
 		.name = "ISO7816",
 		.description = "ISO7816-3 State machines",
-		.enabled = 1,
+		.enabled = 0,
 		.loglevel = LOGL_DEBUG,
 	},
 	[DATR] = {
 		.name = "ATR",
 		.description = "ATR (Answer To Reset) FSM",
-		.enabled = 1,
+		.enabled = 0,
 		.loglevel = LOGL_DEBUG,
 	},
 	[DTPDU] = {
 		.name = "TPDU",
 		.description = "TPDU FSM",
-		.enabled = 1,
+		.enabled = 0,
 		.loglevel = LOGL_DEBUG,
 	},
 	[DPPS] = {
 		.name = "PPS",
 		.description = "PPS (Protocol and Parameter Selection) FSM",
-		.enabled = 1,
+		.enabled = 0,
 		.loglevel = LOGL_DEBUG,
 	},
 	[DCARD] = {
 		.name = "CARD",
 		.description = "Card FSM",
-		.enabled = 1,
+		.enabled = 0,
 		.loglevel = LOGL_DEBUG,
 	},
 };
@@ -150,16 +150,18 @@
 	struct log_target *stderr_target;
 
 	/* msgb */
+#if 0
 	g_msgb_ctx = talloc_pool(g_tall_ctx, 20480);
 	talloc_set_memlimit(g_msgb_ctx, 20480);
 	msgb_talloc_ctx_init(g_msgb_ctx, 0);
-
+#endif
 	/* logging */
 	log_init(&log_info, g_tall_ctx);
+#if 0
 	stderr_target = log_target_create_stderr_raw();
 	log_add_target(stderr_target);
 	log_set_all_filter(stderr_target, 1);
-
+#endif
 	/* timer */
 	SysTick_Config(SystemCoreClock / 1000);
 }
diff --git a/sysmoOCTSIM/main.c b/sysmoOCTSIM/main.c
index 059c99d..0f2409a 100644
--- a/sysmoOCTSIM/main.c
+++ b/sysmoOCTSIM/main.c
@@ -463,6 +463,9 @@
 	g_tall_ctx = talloc_named_const(NULL, 0, "global");
 	printf("g_tall_ctx=%p\r\n", g_tall_ctx);
 
+	//FIXME osmo_emb has a pool?
+	msgb_talloc_ctx_init(g_tall_ctx, 0);
+
 	libosmo_emb_init();
 
 	LOGP(DUSB, LOGL_ERROR, "foobar usb\n");

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16270
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: Iaf5123ab0340efec7b8e11e689f529f2e95e31ca
Gerrit-Change-Number: 16270
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191127/f36eeaff/attachment.htm>