From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 5 Oct 2009 18:51:53 +0000 (+0000)
Subject: Fix include. Add log.
X-Git-Tag: 2.3.0~51
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=4e554f69f2f6f560ee788833da4304a0d45b853b;hp=bdf012dea686bbbe63e9785d9aa037536a9ec280;p=bertos.git

Fix include. Add log.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3032 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/bertos/net/nmeap/src/nmeap01.c b/bertos/net/nmeap/src/nmeap01.c
index d0e0fcd2..c3912428 100644
--- a/bertos/net/nmeap/src/nmeap01.c
+++ b/bertos/net/nmeap/src/nmeap01.c
@@ -26,29 +26,27 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * see the file COPYING for terms of the licnese
 */
 
-#include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <cfg/debug.h>
+#include <string.h>
 #include <ctype.h>
 
 #include "../inc/nmeap.h"
 
+#include <cfg/debug.h>
+
 #define assert(x)    ASSERT(x)
 
-/*
- * Removed to compile in BeRTOS environment.
- *
- * #include <stdio.h>
- * #include <stdlib.h>
- * #include <string.h>
- * #include <cfg/debug.h>
- * #include <assert.h>
- * #include <ctype.h>
- *
- * #include "nmeap.h"
- *
- */
+#include "cfg/cfg_nmea.h"
+
+#define LOG_LEVEL  NMEA_LOG_LEVEL
+#define LOG_FORMAT NMEA_LOG_FORMAT
+#include <cfg/log.h>
 
+#ifdef _DEBUG
+	#undef NDEBUG
+	#define printf(str,...)  LOG_INFO(str, ## __VA_ARGS__)
+#endif
 
 /* this only works if you are sure you have an upper case hex digit */
 #define HEXTOBIN(ch) ((ch <= '9') ? ch - '0' : ch - ('A' - 10))