gnokii/common/phones nk6100.c,1.153,1.154

[BORBELY Zoltan <address@hidden>]

Update of /cvsroot/gnokii/gnokii/common/phones
In directory subversions:/tmp/cvs-serv4619/common/phones

Modified Files:
        nk6100.c 
Log Message:
datacall cleanup


Index: nk6100.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/phones/nk6100.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** nk6100.c    23 Oct 2003 00:35:01 -0000      1.153
--- nk6100.c    23 Oct 2003 01:13:52 -0000      1.154
***************
*** 2979,2982 ****
--- 2979,2983 ----
        int n;
        gn_data dtemp;
+       gn_error err;
  
        n = strlen(data->call_info->number);
***************
*** 2988,2992 ****
        /*
         * FIXME:
!        * Ugly hack. The phone seems to drop the SendSMS message if the link
         * had been idle too long. -- bozo
         */
--- 2989,2993 ----
        /*
         * FIXME:
!        * Ugly hack. The phone seems to drop the dial message if the link
         * had been idle too long. -- bozo
         */
***************
*** 3029,3033 ****
                pos += ARRAY_LEN(data_nondigital_end);
                if (sm_message_send(pos - req, 0x01, req, state)) return 
GN_ERR_NOTREADY;
!               usleep(10000);
                dprintf("after nondigital1\n");
                if (sm_message_send(ARRAY_LEN(data_nondigital_final), 0x01, 
data_nondigital_final, state)) return GN_ERR_NOTREADY;
--- 3030,3035 ----
                pos += ARRAY_LEN(data_nondigital_end);
                if (sm_message_send(pos - req, 0x01, req, state)) return 
GN_ERR_NOTREADY;
!               if (sm_block_ack(state)) return GN_ERR_NOTREADY;
!               gn_sm_loop(5, state);
                dprintf("after nondigital1\n");
                if (sm_message_send(ARRAY_LEN(data_nondigital_final), 0x01, 
data_nondigital_final, state)) return GN_ERR_NOTREADY;
***************
*** 3038,3045 ****
                dprintf("Digital Data Call\n");
                if (sm_message_send(ARRAY_LEN(data_digital_pred1), 0x01, 
data_digital_pred1, state)) return GN_ERR_NOTREADY;
!               usleep(500000);
                dprintf("after digital1\n");
                if (sm_message_send(ARRAY_LEN(data_digital_pred2), 0x01, 
data_digital_pred2, state)) return GN_ERR_NOTREADY;
!               usleep(500000);
                dprintf("after digital2\n");
                memcpy(pos, data_digital_end, ARRAY_LEN(data_digital_end));
--- 3040,3049 ----
                dprintf("Digital Data Call\n");
                if (sm_message_send(ARRAY_LEN(data_digital_pred1), 0x01, 
data_digital_pred1, state)) return GN_ERR_NOTREADY;
!               if (sm_block_ack(state)) return GN_ERR_NOTREADY;
!               gn_sm_loop(5, state);
                dprintf("after digital1\n");
                if (sm_message_send(ARRAY_LEN(data_digital_pred2), 0x01, 
data_digital_pred2, state)) return GN_ERR_NOTREADY;
!               if (sm_block_ack(state)) return GN_ERR_NOTREADY;
!               gn_sm_loop(5, state);
                dprintf("after digital2\n");
                memcpy(pos, data_digital_end, ARRAY_LEN(data_digital_end));
***************
*** 3054,3058 ****
        }
  
!       return sm_block_no_retry_timeout(0x01, 500, data, state);
  }
  
--- 3058,3064 ----
        }
  
!       err = sm_block_no_retry_timeout(0x01, 500, data, state);
!       gn_sm_loop(5, state);
!       return err;
  }