From: Robert Lipe <robertlipe@users.noreply.github.com>
Date: Fri, 3 Mar 2023 11:29:23 +0000 (-0600)
Subject: Make Navilink debugging runtime selectable. (#1013)
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~1^2~115
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=36381d1a4a103550a931a60c2dd38649e84b5b95;p=gpsbabel.git

Make Navilink debugging runtime selectable. (#1013)
---

diff --git a/navilink.cc b/navilink.cc
index e258d4e84..d08c50564 100644
--- a/navilink.cc
+++ b/navilink.cc
@@ -234,10 +234,8 @@ navilink_checksum_packet(const unsigned char* packet, unsigned length)
   return checksum & 0x7fff;
 }
 
-#ifdef NAVILINK_DEBUG
-
 static void
-dump_packet(char* prefix, unsigned char* packet, unsigned length)
+dump_packet(const char* prefix, unsigned char* packet, unsigned length)
 {
   unsigned i;
 
@@ -254,8 +252,6 @@ dump_packet(char* prefix, unsigned char* packet, unsigned length)
   fprintf(stderr, "\n");
 }
 
-#endif
-
 static void
 write_packet(unsigned type, const void* payload, unsigned length)
 {
@@ -272,9 +268,9 @@ write_packet(unsigned type, const void* payload, unsigned length)
   packet[length + 7] = 0xb0;
   packet[length + 8] = 0xb3;
 
-#ifdef NAVILINK_DEBUG
-  dump_packet(">>>", packet + 4, length + 1);
-#endif
+  if (global_opts.debug_level >= 2) {
+    dump_packet(">>>", packet + 4, length + 1);
+  }
 
   if (gbser_write(serial_handle, packet, length + 9) != gbser_OK) {
     fatal(MYNAME ": Write error\n");
@@ -326,9 +322,9 @@ read_packet(unsigned type, void* payload,
     fatal(MYNAME ": Read error reading %d byte payload\n", size);
   }
 
-#ifdef NAVILINK_DEBUG
-  dump_packet("<<<", data, size);
-#endif
+  if (global_opts.debug_level >= 2) {
+    dump_packet("<<<", data, size);
+  }
 
   if (data[0] != type) {
     if (handle_nak && data[0] == PID_NAK) {