Don't enable serial log input by default.

diff --git a/od-win32/serial_win32.cpp b/od-win32/serial_win32.cpp
index 20822e9903e1cf803117f2b6720805df5f426696..2a10eb652fa45f7533c375dc117627828274d50f 100644 (file)
--- a/od-win32/serial_win32.cpp
+++ b/od-win32/serial_win32.cpp
@@ -483,7 +483,7 @@ static void serdatcopy(void)
 
        if (seriallog > 0 || (consoleopen && seriallog < 0)) {
                gotlogwrite = true;
-               if (seriallog_lf && seriallog > 1) {
+               if (seriallog_lf && seriallog > 2) {
                        TCHAR *ts = write_log_get_ts();
                        if (ts)
                                write_logx(_T("%s:"), ts);
@@ -556,7 +556,7 @@ void serial_hsynchandler (void)
                        serial_check_irq();
                }
        }
-       if (seriallog > 0 && !data_in_serdatr && gotlogwrite) {
+       if (seriallog > 1 && !data_in_serdatr && gotlogwrite) {
                int ch = read_log();
                if (ch > 0) {
                        serdatr = ch | 0x100;

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 0db5ee890bcfcbb9d9b7f475ab8bb125b6217fbf..02616fb8e343fa4a448ef4974999a27348a54fef 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -6394,6 +6394,10 @@ static int parseargs(const TCHAR *argx, const TCHAR *np, const TCHAR *np2)
                log_sercon = 2;
                return 1;
        }
+       if (!_tcscmp(arg, _T("serlog3"))) {
+               log_sercon = 3;
+               return 1;
+       }
        if (!_tcscmp(arg, _T("a2065log"))) {
                log_a2065 = 1;
                return 1;

diff --git a/od-win32/writelog.cpp b/od-win32/writelog.cpp
index 5f10f4290ed6bba63862fe73d1078c4975ab5650..0ff3395e1639f30330ae1aee6b150c046fd61d9f 100644 (file)
--- a/od-win32/writelog.cpp
+++ b/od-win32/writelog.cpp
@@ -68,7 +68,6 @@ int console_logging = 0;
 static int debugger_type = -1;
 extern BOOL debuggerinitializing;
 extern int lof_store;
-extern int seriallog;
 static int console_input_linemode = -1;
 int always_flush_log = 0;