configs: add PRINTF_IS_FULL+64bit, required by new version of monitor

Use full version of pp_printf, it is requried by a new version of monitor. Monitor also requires support of displaying 64bit values Signed-off-by: Adam Wujek <adam.wujek@creotech.pl>

configs: add PRINTF_IS_FULL+64bit, required by new version of monitor
Use full version of pp_printf, it is requried by a new version of monitor. Monitor also requires support of displaying 64bit values Signed-off-by: Adam Wujek <adam.wujek@creotech.pl>
2447af87 · Adam Wujek · 596c75bf · 2447af87 · 2447af87 · 2447af87
Commit 2447af87 authored Jan 31, 2021 by Adam Wujek
10 changed files
--- a/Kconfig
+++ b/Kconfig
@@ -705,12 +705,12 @@ config VLAN_ARRAY_SIZE
 ################# helper configuration items #############
 config PRINTF_XINT
 	boolean
-	default PRINTF_IS_XINT if (DEVELOPER && WR_NODE)
-	default y
+	default PRINTF_IS_XINT

 config PRINTF_FULL
 	boolean
-	default PRINTF_IS_FULL
+	default PRINTF_IS_FULL 
+	default y

 config PRINTF_MINI
 	boolean

--- a/configs/devel_build_test_defconfig
+++ b/configs/devel_build_test_defconfig
@@ -67,8 +67,8 @@ CONFIG_FAKE_TEMPERATURES=y
 CONFIG_LATENCY_PROBE=y
 CONFIG_DEFAULT_PRINT_TASK_TIME_THRESHOLD=0
 CONFIG_VLAN_ARRAY_SIZE=1
-CONFIG_PRINTF_XINT=y
-# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_XINT is not set
+CONFIG_PRINTF_FULL=y
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
 # CONFIG_LLDP is not set
--- a/configs/gsi_defconfig
+++ b/configs/gsi_defconfig
@@ -65,8 +65,8 @@ CONFIG_PRINTF_IS_XINT=y
 CONFIG_LATENCY_PROBE=y
 CONFIG_DEFAULT_PRINT_TASK_TIME_THRESHOLD=0
 CONFIG_VLAN_ARRAY_SIZE=1
-CONFIG_PRINTF_XINT=y
-# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_XINT is not set
+CONFIG_PRINTF_FULL=y
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
 # CONFIG_LLDP is not set
--- a/configs/gsi_pdelay_defconfig
+++ b/configs/gsi_pdelay_defconfig
@@ -65,8 +65,8 @@ CONFIG_PRINTF_IS_XINT=y
 CONFIG_LATENCY_PROBE=y
 CONFIG_DEFAULT_PRINT_TASK_TIME_THRESHOLD=0
 CONFIG_VLAN_ARRAY_SIZE=1
-CONFIG_PRINTF_XINT=y
-# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_XINT is not set
+CONFIG_PRINTF_FULL=y
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
 # CONFIG_LLDP is not set
--- a/configs/sis8300ku_defconfig
+++ b/configs/sis8300ku_defconfig
@@ -83,7 +83,7 @@ CONFIG_ASSERT=y
 # CONFIG_LATENCY_PROBE is not set
 CONFIG_DEFAULT_PRINT_TASK_TIME_THRESHOLD=0
 CONFIG_VLAN_ARRAY_SIZE=1
-CONFIG_PRINTF_XINT=y
-# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_XINT is not set
+CONFIG_PRINTF_FULL=y
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
--- a/configs/spec_defconfig
+++ b/configs/spec_defconfig
@@ -49,7 +49,7 @@ CONFIG_LLDP=y
 #
 # CONFIG_DEVELOPER is not set
 CONFIG_VLAN_ARRAY_SIZE=1
-CONFIG_PRINTF_XINT=y
-# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_XINT is not set
+CONFIG_PRINTF_FULL=y
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
--- a/configs/spec_pdelay_defconfig
+++ b/configs/spec_pdelay_defconfig
@@ -49,7 +49,7 @@ CONFIG_LLDP=y
 #
 # CONFIG_DEVELOPER is not set
 CONFIG_VLAN_ARRAY_SIZE=1
-CONFIG_PRINTF_XINT=y
-# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_XINT is not set
+CONFIG_PRINTF_FULL=y
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
--- a/configs/wrnic_defconfig
+++ b/configs/wrnic_defconfig
@@ -44,7 +44,7 @@ CONFIG_ABSCAL=y
 #
 # CONFIG_DEVELOPER is not set
 CONFIG_VLAN_ARRAY_SIZE=1
-CONFIG_PRINTF_XINT=y
-# CONFIG_PRINTF_FULL is not set
+# CONFIG_PRINTF_XINT is not set
+CONFIG_PRINTF_FULL=y
 # CONFIG_PRINTF_MINI is not set
 # CONFIG_PRINTF_NONE is not set
--- a/monitor/monitor_ppsi.c
+++ b/monitor/monitor_ppsi.c
@@ -27,6 +27,10 @@
 #include "shell.h"
 #include "revision.h"

+#ifndef CONFIG_PRINTF_FULL
+#error ("WRPC monitor requires full version of pp_printf implementation")
+#endif
+
 /* internal "last", exported to shell command */
 uint32_t wrc_stats_last;


--- a/pp_printf/vsprintf-full.c
+++ b/pp_printf/vsprintf-full.c
@@ -18,6 +18,7 @@
 /* BEGIN OF HACKS */
 #include <pp-printf.h>

+#define CONFIG_PRINTF_64BIT
 /* <linux/types.h> -- but if we typedef we get redefined type when hosted */
 #define u8		uint8_t
 #define size_t		unsigned long
@@ -335,11 +336,13 @@ int pp_vsprintf(char *buf, const char *fmt, va_list args)
 			str = string(str, va_arg(args, char *), field_width, precision, flags);
 			continue;

+#if 0
 		case 'p':
 			str = pointer(fmt+1, str,
 					va_arg(args, void *),
 					field_width, precision, flags);
 			continue;
+#endif

 		case 'n':
 			if (qualifier == 'l') {