Untested attempt to get rid of SIGIO pain

[gnokii.git] / common / data / virtmodem.c

diff --git a/common/data/virtmodem.c b/common/data/virtmodem.c
index bcedc7e..169b117 100644 (file)
--- a/common/data/virtmodem.c
+++ b/common/data/virtmodem.c
@@ -107,11 +107,16 @@ bool VM_Initialise(char *model,char *port, char *initlength, GSM_ConnectionType
                return (false);
        }
 
                return (false);
        }
 

+#ifndef UCLINUX

        /* Create and start thread, */
        return VM_ThreadLoop();
        /* Create and start thread, */
        return VM_ThreadLoop();

+#else
+       return true;
+#endif

 }
 
 static void    VM_CharHandler(void);
 }
 
 static void    VM_CharHandler(void);

+extern GSM_Error N6110_SendStatusRequest(void);

 
 bool VM_ThreadLoop(void)
 {
 
 bool VM_ThreadLoop(void)
 {


@@ -131,13 +136,18 @@ bool VM_ThreadLoop(void)
 
                FD_ZERO(&readfds);
                FD_SET(PtyRDFD,&readfds);
 
                FD_ZERO(&readfds);
                FD_SET(PtyRDFD,&readfds);

-               timeout.tv_sec=0;
-               timeout.tv_usec=500*1000;
+               FD_SET(device_portfd,&readfds);
+               timeout.tv_sec=2;
+               timeout.tv_usec=0;/*500*1000;*/

 
 

-               res = select(PtyRDFD+1,&readfds,NULL/*writefds*/,NULL/*exceptfds*/,&timeout);
+               res = select((device_portfd > PtyRDFD ? device_portfd : PtyRDFD)+1,
+                               &readfds,NULL/*writefds*/,NULL/*exceptfds*/,&timeout);

 
                switch (res) {
                        case 0: /* Timeout */
 
                switch (res) {
                        case 0: /* Timeout */

+#if 0
+                               N6110_SendStatusRequest();
+#endif

                                break;
 
                        case -1:
                                break;
 
                        case -1:


@@ -147,9 +157,12 @@ bool VM_ThreadLoop(void)
                                return (false);
 
                        default:
                                return (false);
 
                        default:

-                         if (FD_ISSET(PtyRDFD,&readfds)) {
+                         if (FD_ISSET(PtyRDFD,&readfds))

                            VM_CharHandler();
                            VM_CharHandler();

-                         } else usleep(500); /* Probably the file has been closed */
+                         if (FD_ISSET(device_portfd,&readfds))
+                           SigHandler(0);
+                         if (!FD_ISSET(PtyRDFD,&readfds) && !FD_ISSET(device_portfd,&readfds))
+                           usleep(500); /* Probably the file has been closed */

                          break;
                }
          }
                          break;
                }
          }


@@ -335,8 +348,11 @@ static int VM_GetMasterPty(char **name) {
    /* search for an unused pty */
    for (i=0; i<16 && master <= 0; i++) {
       for (j=0; j<16 && master <= 0; j++) {
    /* search for an unused pty */
    for (i=0; i<16 && master <= 0; i++) {
       for (j=0; j<16 && master <= 0; j++) {

-         (*name)[8] = "pqrstuvwxyzPQRST"[i];
-         (*name)[9] = "0123456789abcdef"[j];
+static const char *ptyp8="pqrstuvwxyzPQRST";
+static const char *ptyp9="0123456789abcdef";
+
+         (*name)[8] = ptyp8[i];
+         (*name)[9] = ptyp9[j];

          /* open the master pty */
          if ((master = open(*name, O_RDWR | O_NOCTTY | O_NONBLOCK )) < 0) {
             if (errno == ENOENT) {
          /* open the master pty */
          if ((master = open(*name, O_RDWR | O_NOCTTY | O_NONBLOCK )) < 0) {
             if (errno == ENOENT) {