Fixed stripped down datacalls

diff --git a/common/newmodules/n6110.c b/common/newmodules/n6110.c
index 12d572a..fcb8ac9 100644 (file)
--- a/common/newmodules/n6110.c
+++ b/common/newmodules/n6110.c
@@ -41,11 +41,6 @@
    supported by this model of phone. */
 
 
    supported by this model of phone. */
 
 

-
-
-
-
-

 /* Here we initialise model specific functions. */
 GSM_Functions N6110_Functions = {
   N6110_Initialise,
 /* Here we initialise model specific functions. */
 GSM_Functions N6110_Functions = {
   N6110_Initialise,


@@ -136,12 +131,11 @@ GSM_Functions N6110_Functions = {
 #ifndef UCLINUX
   N6110_GetProfile,
   N6110_SetProfile,
 #ifndef UCLINUX
   N6110_GetProfile,
   N6110_SetProfile,

-  N6110_SendRLPFrame,

 #else /* UCLINUX */
   NULL,
   NULL,
 #else /* UCLINUX */
   NULL,
   NULL,

-  NULL,

 #endif /* UCLINUX */
 #endif /* UCLINUX */

+  N6110_SendRLPFrame,

   N6110_CancelCall,
 #ifndef UCLINUX
   N6110_PressKey,
   N6110_CancelCall,
 #ifndef UCLINUX
   N6110_PressKey,


@@ -1898,6 +1892,8 @@ GSM_Error N6110_SetProfile(GSM_Profile *Profile)
   return (GE_NONE);
 }
 
   return (GE_NONE);
 }
 

+#endif /* UCLINUX */
+

 bool N6110_SendRLPFrame(RLP_F96Frame *frame, bool out_dtx)
 {
   u8 req[60] = { 0x00, 0xd9 };
 bool N6110_SendRLPFrame(RLP_F96Frame *frame, bool out_dtx)
 {
   u8 req[60] = { 0x00, 0xd9 };


@@ -1913,6 +1909,8 @@ bool N6110_SendRLPFrame(RLP_F96Frame *frame, bool out_dtx)
   return (Protocol->SendFrame(32, 0xf0, req));
 }
 
   return (Protocol->SendFrame(32, 0xf0, req));
 }
 

+#ifndef UCLINUX
+

 void N6110_ReplyGetCalendarNote(u16 MessageLength, u8 *MessageBuffer, u8 MessageType) {
 
   int i, j;
 void N6110_ReplyGetCalendarNote(u16 MessageLength, u8 *MessageBuffer, u8 MessageType) {
 
   int i, j;


@@ -2582,7 +2580,9 @@ GSM_Error N6110_DialData(char *Number, char type, void (* callpassup)(char c))
                break;
        case 1:
                Protocol->SendMessage(sizeof(req3), 0x01, req3);
                break;
        case 1:
                Protocol->SendMessage(sizeof(req3), 0x01, req3);

+               usleep(1000000);

                Protocol->SendMessage(sizeof(req4), 0x01, req4);
                Protocol->SendMessage(sizeof(req4), 0x01, req4);

+               usleep(1000000);

                req_end = req_end1;
                size = sizeof(req_end1);
                break;
                req_end = req_end1;
                size = sizeof(req_end1);
                break;


@@ -2603,6 +2603,7 @@ GSM_Error N6110_DialData(char *Number, char type, void (* callpassup)(char c))
        memcpy(req + 5 + strlen(Number), req_end, size);
 
        Protocol->SendMessage(5 + size + strlen(Number), 0x01, req);
        memcpy(req + 5 + strlen(Number), req_end, size);
 
        Protocol->SendMessage(5 + size + strlen(Number), 0x01, req);

+       usleep(1000000);

        if (type != 1) Protocol->SendMessage(26, 0x01, req2);
 
        return (GE_NONE);
        if (type != 1) Protocol->SendMessage(26, 0x01, req2);
 
        return (GE_NONE);


@@ -5232,8 +5233,6 @@ static void N6110_Dispatch0x06Message(u16 MessageLength, u8 *MessageBuffer, u8 M
   }
 }
 
   }
 }
 

-#endif /* UCLINUX */
-

 static void N6110_Dispatch0x09Message(u16 MessageLength, u8 *MessageBuffer, u8 MessageType) {
     
   switch (MessageBuffer[3]) {
 static void N6110_Dispatch0x09Message(u16 MessageLength, u8 *MessageBuffer, u8 MessageType) {
     
   switch (MessageBuffer[3]) {


@@ -5259,8 +5258,6 @@ static void N6110_Dispatch0x09Message(u16 MessageLength, u8 *MessageBuffer, u8 M
   }
 }
 
   }
 }
 

-#ifndef UCLINUX
-

 static void N6110_Dispatch0x13Message(u16 MessageLength, u8 *MessageBuffer, u8 MessageType) {
 
   switch(MessageBuffer[3]) {
 static void N6110_Dispatch0x13Message(u16 MessageLength, u8 *MessageBuffer, u8 MessageType) {
 
   switch(MessageBuffer[3]) {


@@ -5646,7 +5643,6 @@ void N6110_DispatchMessage(u16 MessageLength, u8 *MessageBuffer, u8 MessageType)
       default  :N6110_ReplyEnterSecurityCode    (MessageLength,MessageBuffer,MessageType);break;
     }
     break;
       default  :N6110_ReplyEnterSecurityCode    (MessageLength,MessageBuffer,MessageType);break;
     }
     break;

-#endif /* UCLINUX */

 
   /* SIM login */
   case 0x09:
 
   /* SIM login */
   case 0x09:


@@ -5654,7 +5650,6 @@ void N6110_DispatchMessage(u16 MessageLength, u8 *MessageBuffer, u8 MessageType)
     N6110_Dispatch0x09Message(MessageLength, MessageBuffer, MessageType);
     break;
 
     N6110_Dispatch0x09Message(MessageLength, MessageBuffer, MessageType);
     break;
 

-#ifndef UCLINUX

   /* Network info */
   case 0x0a:
     switch (MessageBuffer[3]) {
   /* Network info */
   case 0x0a:
     switch (MessageBuffer[3]) {

diff --git a/include/newmodules/n6110.h b/include/newmodules/n6110.h
index 1557e37..bd5c384 100644 (file)
--- a/include/newmodules/n6110.h
+++ b/include/newmodules/n6110.h
@@ -158,8 +158,8 @@ static GSM_Error N6110_Reset(unsigned char type);
 #ifndef UCLINUX
 static GSM_Error N6110_GetProfile(GSM_Profile *Profile);
 static GSM_Error N6110_SetProfile(GSM_Profile *Profile);
 #ifndef UCLINUX
 static GSM_Error N6110_GetProfile(GSM_Profile *Profile);
 static GSM_Error N6110_SetProfile(GSM_Profile *Profile);

-static bool      N6110_SendRLPFrame(RLP_F96Frame *frame, bool out_dtx);

 #endif /* UCLINUX */
 #endif /* UCLINUX */

+static bool      N6110_SendRLPFrame(RLP_F96Frame *frame, bool out_dtx);

 
 static GSM_Error N6110_CancelCall(void);
 
 
 static GSM_Error N6110_CancelCall(void);