X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fformatwr.c;h=1e4ae0c9c44311c1dd689ff889c8fe742222bc23;hb=24609d658e8c2c7795b8a5f8bef21512c020f1fb;hp=9e85ce862508553cee6f7982633c4bbe010295ef;hpb=0f018838e0d5130255728bbf3aa69e44e4954239;p=bertos.git

diff --git a/mware/formatwr.c b/mware/formatwr.c
index 9e85ce86..1e4ae0c9 100755
--- a/mware/formatwr.c
+++ b/mware/formatwr.c
@@ -53,6 +53,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.15  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.14  2005/03/01 23:26:22  bernie
+ *#* Use shared hextab.
+ *#*
  *#* Revision 1.13  2005/02/18 12:33:25  bernie
  *#* Avoid strlen().
  *#*
@@ -73,10 +79,10 @@
  *#*/
 
 #include "formatwr.h"
-#include "pgm.h"
-//#include <compiler.h> /* progmem macros */
-#include <config.h> /* CONFIG_ macros */
-#include <debug.h> /* ASSERT */
+#include <mware/pgm.h>
+#include <mware/hex.h>
+#include <cfg/config.h> /* CONFIG_ macros */
+#include <cfg/debug.h> /* ASSERT */
 
 #ifndef CONFIG_PRINTF_N_FORMATTER
 	/*! Disable the arcane %n formatter. */
@@ -403,7 +409,7 @@ PGM_FUNC(_formatted_write)(const char * PGM_ATTR format,
 		flags.progmem = false;
 #endif
 		ptr = buf_pointer = &buf[0];
-		hex = "0123456789ABCDEF";
+		hex = HEX_tab;
 
 		/* check for leading '-', '+', ' ','#' or '0' flags  */
 		for (;;)
@@ -575,7 +581,7 @@ NEXT_FLAG:
 					precision++;
 #endif
 			case 'x':
-				hex = "0123456789abcdef";
+				hex = hex_tab;
 			case 'u':
 			case 'p':
 			case 'X':