Set DTR and RTS when uaeserial.device is opened, set DTR and RTS state after baud...

diff --git a/od-win32/parser.cpp b/od-win32/parser.cpp
index bf476a702fdc8de97759154dd7b714cbd8154697..87aae457cc05147bcab59c05b18f2d21b024882b 100644 (file)
--- a/od-win32/parser.cpp
+++ b/od-win32/parser.cpp
@@ -58,6 +58,8 @@
 #include "xwin.h"
 #include "drawing.h"
 
+#define GSDLLEXPORT __declspec(dllimport)
+
 #include <Ghostscript/iapi.h>
 #include <Ghostscript/ierrors.h>
 
@@ -95,12 +97,12 @@ typedef int (GSDLLAPI* GSAPI_SET_STDIO)(void *instance,
        int (GSDLLCALLPTR stdout_fn)(void *caller_handle, const char *str, int len),
        int (GSDLLCALLPTR stderr_fn)(void *caller_handle, const char *str, int len));
 static GSAPI_SET_STDIO ptr_gsapi_set_stdio;
-typedef int (GSDLLAPI* GSAPI_INIT_WITH_ARGSW)(void *instance, int argc, wchar_t **argv);
-static GSAPI_INIT_WITH_ARGSW ptr_gsapi_init_with_argsW;
-
+typedef int (GSDLLAPI* GSAPI_INIT_WITH_ARGS)(void *instance, int argc, char **argv);
+static GSAPI_INIT_WITH_ARGS ptr_gsapi_init_with_args;
+typedef int (GSDLLAPI* GSAPI_SET_ARG_ENCODING)(void *instance, int encoding);
+static GSAPI_SET_ARG_ENCODING ptr_gsapi_set_arg_encoding;
 typedef int (GSDLLAPI* GSAPI_EXIT)(void *instance);
 static GSAPI_EXIT ptr_gsapi_exit;
-
 typedef int (GSDLLAPI* GSAPI_RUN_STRING_BEGIN)(void *instance, int user_errors, int *pexit_code);
 static GSAPI_RUN_STRING_BEGIN ptr_gsapi_run_string_begin;
 typedef int (GSDLLAPI* GSAPI_RUN_STRING_CONTINUE)(void *instance, const char *str, unsigned int length, int user_errors, int *pexit_code);
@@ -128,39 +130,41 @@ static void freepsbuffers (void)
 
 static int openprinter_ps (void)
 {
-       TCHAR *gsargv[] = {
+       const TCHAR *gsargv[] = {
                _T("-dNOPAUSE"), _T("-dBATCH"), _T("-dNOPAGEPROMPT"), _T("-dNOPROMPT"), _T("-dQUIET"), _T("-dNoCancel"),
                _T("-sDEVICE=mswinpr2"), NULL
        };
        int gsargc, gsargc2, i;
        TCHAR *tmpparms[100];
        TCHAR tmp[MAX_DPATH];
-       TCHAR *gsparms[100];
+       char *gsparms[100];
 
        if (ptr_gsapi_new_instance (&gsinstance, NULL) < 0)
                return 0;
+       ptr_gsapi_set_arg_encoding(gsinstance, GS_ARG_ENCODING_UTF8);
        cmdlineparser (currprefs.ghostscript_parameters, tmpparms, 100 - 10);
 
        gsargc2 = 0;
-       gsparms[gsargc2++] = my_strdup(_T("WinUAE"));
+       gsparms[gsargc2++] = uutf8(_T("WinUAE"));
        for (gsargc = 0; gsargv[gsargc]; gsargc++) {
-               gsparms[gsargc2++] = my_strdup(gsargv[gsargc]);
+               gsparms[gsargc2++] = uutf8(gsargv[gsargc]);
        }
        for (i = 0; tmpparms[i]; i++)
-               gsparms[gsargc2++] = my_strdup(tmpparms[i]);
+               gsparms[gsargc2++] = uutf8(tmpparms[i]);
        if (currprefs.prtname[0]) {
                _stprintf (tmp, _T("-sOutputFile=%%printer%%%s"), currprefs.prtname);
-               gsparms[gsargc2++] = my_strdup(tmp);
+               gsparms[gsargc2++] = uutf8(tmp);
        }
        if (postscript_print_debugging) {
                for (i = 0; i < gsargc2; i++) {
-                       TCHAR *parm = gsparms[i];
+                       TCHAR *parm = utf8u(gsparms[i]);
                        write_log (_T("GSPARM%d: '%s'\n"), i, parm);
                        xfree (parm);
+                       xfree(gsparms[i]);
                }
        }
        __try {
-               int rc = ptr_gsapi_init_with_argsW (gsinstance, gsargc2, gsparms);
+               int rc = ptr_gsapi_init_with_args (gsinstance, gsargc2, gsparms);
                for (i = 0; i < gsargc2; i++) {
                        xfree (gsparms[i]);
                }
@@ -437,10 +441,12 @@ int load_ghostscript (void)
        ptr_gsapi_run_string_begin = (GSAPI_RUN_STRING_BEGIN)GetProcAddress (gsdll, "gsapi_run_string_begin");
        ptr_gsapi_run_string_continue = (GSAPI_RUN_STRING_CONTINUE)GetProcAddress (gsdll, "gsapi_run_string_continue");
        ptr_gsapi_run_string_end = (GSAPI_RUN_STRING_END)GetProcAddress (gsdll, "gsapi_run_string_end");
-       ptr_gsapi_init_with_argsW = (GSAPI_INIT_WITH_ARGSW)GetProcAddress (gsdll, "gsapi_init_with_argsW");
+       ptr_gsapi_set_arg_encoding = (GSAPI_SET_ARG_ENCODING)GetProcAddress(gsdll, "gsapi_set_arg_encoding");
+       ptr_gsapi_init_with_args = (GSAPI_INIT_WITH_ARGS)GetProcAddress(gsdll, "gsapi_init_with_args");
+
        if (!ptr_gsapi_new_instance || !ptr_gsapi_delete_instance || !ptr_gsapi_exit ||
                !ptr_gsapi_run_string_begin || !ptr_gsapi_run_string_continue || !ptr_gsapi_run_string_end ||
-               !ptr_gsapi_init_with_argsW) {
+               !ptr_gsapi_set_arg_encoding || !ptr_gsapi_init_with_args) {
                        unload_ghostscript ();
                        write_log (_T("incompatible %s! (3)\n"), path);
                        return -3;
@@ -623,13 +629,13 @@ int uaeser_setparams (void *vsd, int baud, int rbuffer, int bits, int sbits, int
 
        dcb.fDsrSensitivity = FALSE;
        dcb.fOutxDsrFlow = FALSE;
-       dcb.fDtrControl = DTR_CONTROL_DISABLE;
+       dcb.fDtrControl = DTR_CONTROL_ENABLE;
 
        if (rtscts) {
                dcb.fOutxCtsFlow = TRUE;
                dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
        } else {
-               dcb.fRtsControl = RTS_CONTROL_DISABLE;
+               dcb.fRtsControl = RTS_CONTROL_ENABLE;
                dcb.fOutxCtsFlow = FALSE;
        }
 
@@ -648,9 +654,6 @@ int uaeser_setparams (void *vsd, int baud, int rbuffer, int bits, int sbits, int
        dcb.fNull = FALSE;
        dcb.fAbortOnError = FALSE;
 
-       //dcb.XoffLim = 512;
-       //dcb.XonLim = 2048;
-
        if (!SetCommState (sd->hCom, &dcb)) {
                write_log (_T("uaeserial: SetCommState() failed %d\n"), GetLastError());
                return 5;
@@ -774,11 +777,11 @@ int uaeser_open (void *vsd, void *user, int unit)
        sd->olw.hEvent = sd->evtw;
        sd->olwce.hEvent = sd->evtwce;
        sd->hCom = CreateFile (buf, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
-               FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
+               FILE_FLAG_OVERLAPPED, NULL);
        if (sd->hCom == INVALID_HANDLE_VALUE) {
                _stprintf (buf, _T("\\.\\\\COM%d"), unit);
                sd->hCom = CreateFile (buf, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
-                       FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
+                       FILE_FLAG_OVERLAPPED, NULL);
                if (sd->hCom == INVALID_HANDLE_VALUE) {
                        write_log (_T("UAESER: '%s' failed to open, err=%d\n"), buf, GetLastError());
                        goto end;
@@ -827,6 +830,7 @@ void uaeser_close (void *vsd)
 
 static HANDLE hCom = INVALID_HANDLE_VALUE;
 static DCB dcb;
+static DWORD fDtrControl = DTR_CONTROL_DISABLE, fRtsControl = RTS_CONTROL_DISABLE;
 static HANDLE writeevent, readevent;
 #define SERIAL_WRITE_BUFFER 100
 #define SERIAL_READ_BUFFER 100
@@ -1002,7 +1006,7 @@ int openser (const TCHAR *sername)
                0,
                NULL,
                OPEN_EXISTING,
-               FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
+               FILE_FLAG_OVERLAPPED,
                NULL);
        if (hCom == INVALID_HANDLE_VALUE) {
                write_log (_T("SERIAL: failed to open '%s' err=%d\n"), sername, GetLastError());
@@ -1032,13 +1036,13 @@ int openser (const TCHAR *sername)
 
        dcb.fDsrSensitivity = FALSE;
        dcb.fOutxDsrFlow = FALSE;
-       dcb.fDtrControl = DTR_CONTROL_DISABLE;
+       dcb.fDtrControl = fDtrControl;
 
        if (currprefs.serial_hwctsrts) {
                dcb.fOutxCtsFlow = TRUE;
                dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
        } else {
-               dcb.fRtsControl = RTS_CONTROL_DISABLE;
+               dcb.fRtsControl = fRtsControl;
                dcb.fOutxCtsFlow = FALSE;
        }
 
@@ -1050,9 +1054,6 @@ int openser (const TCHAR *sername)
        dcb.fNull = FALSE;
        dcb.fAbortOnError = FALSE;
 
-       //dcb.XoffLim = 512;
-       //dcb.XonLim = 2048;
-
        if (SetCommState (hCom, &dcb)) {
                write_log (_T("SERIAL: Using %s CTS/RTS=%d\n"), sername, currprefs.serial_hwctsrts);
                return 1;
@@ -1282,14 +1283,19 @@ void getserstat (int *pstatus)
 
 void setserstat (int mask, int onoff)
 {
-       if (!currprefs.use_serial || hCom == INVALID_HANDLE_VALUE)
-               return;
-
-       if (mask & TIOCM_DTR)
-               EscapeCommFunction (hCom, onoff ? SETDTR : CLRDTR);
+       if (mask & TIOCM_DTR) {
+               if (currprefs.use_serial && hCom != INVALID_HANDLE_VALUE) {
+                       EscapeCommFunction(hCom, onoff ? SETDTR : CLRDTR);
+               }
+               fDtrControl = onoff ? DTR_CONTROL_ENABLE : DTR_CONTROL_DISABLE;
+       }
        if (!currprefs.serial_hwctsrts) {
-               if (mask & TIOCM_RTS)
-                       EscapeCommFunction (hCom, onoff ? SETRTS : CLRRTS);
+               if (mask & TIOCM_RTS) {
+                       if (currprefs.use_serial && hCom != INVALID_HANDLE_VALUE) {
+                               EscapeCommFunction(hCom, onoff ? SETRTS : CLRRTS);
+                       }
+                       fRtsControl = onoff ? RTS_CONTROL_ENABLE : RTS_CONTROL_DISABLE;
+               }
        }
 }
 
@@ -1309,14 +1315,17 @@ int setbaud (long baud)
                if (!currprefs.use_serial)
                        return 1;
                if (hCom != INVALID_HANDLE_VALUE)  {
-                       if (GetCommState (hCom, &dcb))  {
-                               dcb.BaudRate = baud;
-                               if (!SetCommState (hCom, &dcb)) {
-                                       write_log (_T("SERIAL: Error setting baud rate %d!\n"), baud);
-                                       return 0;
-                               }
+                       dcb.BaudRate = baud;
+                       if (!currprefs.serial_hwctsrts) {
+                               dcb.fRtsControl = fRtsControl;
                        } else {
-                               write_log (_T("SERIAL: setbaud internal error!\n"));
+                               dcb.fRtsControl = RTS_CONTROL_HANDSHAKE;
+                       }
+                       dcb.fDtrControl = fDtrControl;
+                       write_log(_T("SERIAL: baud rate %d. DTR=%d RTS=%d\n"), baud, dcb.fDtrControl, dcb.fRtsControl);
+                       if (!SetCommState (hCom, &dcb)) {
+                               write_log (_T("SERIAL: Error setting baud rate %d!\n"), baud);
+                               return 0;
                        }
                }
        }

diff --git a/uaeserial.cpp b/uaeserial.cpp
index e9c3bb225a9d0caad70763f11a7ef1d5597f5898..cc6a4b028ba0c55ae06ec1bc24a5b6935dcfc841 100644 (file)
--- a/uaeserial.cpp
+++ b/uaeserial.cpp
@@ -83,7 +83,7 @@ int log_uaeserial = 0;
 #define io_SerFlags    0x4f    /* UBYTE see SerFlags bit definitions below  */
 #define io_Status      0x50    /* UWORD */
 
-#define IOExtSerSize 48
+#define IOExtSerSize 82
 
 /* status of serial port, as follows:
 *                 BIT  ACTIVE  FUNCTION
@@ -438,6 +438,7 @@ void uaeser_signal (void *vdev, int sigmask)
                        case CMD_READ:
                                if (sigmask & 1) {
                                        uae_u8 tmp[RTAREA_TRAP_DATA_EXTRA_SIZE];
+                                       io_done = 1;
                                        while (io_length > 0) {
                                                int size = io_length > sizeof(tmp) ? sizeof(tmp) : io_length;
                                                if (uaeser_read(dev->sysdata, tmp, size)) {
@@ -445,9 +446,12 @@ void uaeser_signal (void *vdev, int sigmask)
                                                        io_actual += size;
                                                        io_data += size;
                                                        io_length -= size;
+                                               } else {
+                                                       if (io_actual == 0)
+                                                               io_done = 0;
+                                                       break;
                                                }
                                        }
-                                       io_done = 1;
                                }
                                break;
                        case CMD_WRITE: