Resync fake.c with atgen.c, fix obvious problems with testsuite.

[Pavel Machek]

Hi!

FYI, This went to CVS:
                                                                Pavel
Index: common/phones/fake.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/common/phones/fake.c,v
retrieving revision 1.12
diff -u -u -r1.12 fake.c
--- common/phones/fake.c        26 Jul 2002 22:01:50 -0000      1.12
+++ common/phones/fake.c        13 Sep 2002 18:41:57 -0000
@@ -93,8 +93,8 @@
 
        if (!data->RawSMS) return GE_INTERNALERROR;
 
-       /* Prepare the message and count the size */
-       req[offset] = 0x00; /* Message Center */
+       /* Do not fill message center so we don't have to emulate that */
+       offset += 0;
 
        req2[offset + 1] = 0x01 | 0x10; /* Validity period in relative format */
        if (data->RawSMS->RejectDuplicates) req2[offset + 1] |= 0x04;
@@ -117,7 +117,8 @@
 
        length = data->RawSMS->UserDataLength + offset + 8;
 
-       fprintf(stdout, "AT+%s=%d\n", cmd, length - 
data->RawSMS->MessageCenter[0] - 1);
+       /* Length in AT mode is the length of the full message minus SMSC field 
length */
+       fprintf(stdout, "AT+%s=%d\n", cmd, length - 1);
 
        bin2hex(req, req2, length);
        req[length * 2] = 0x1a;
Index: testsuite/out.10.oplogo
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/out.10.oplogo,v
retrieving revision 1.2
diff -u -u -r1.2 out.10.oplogo
--- testsuite/out.10.oplogo     6 May 2002 21:31:16 -0000       1.2
+++ testsuite/out.10.oplogo     13 Sep 2002 18:41:57 -0000
@@ -1,4 +1,4 @@
 Sending operator logo.
 AT+???=153
-0051000A00800021436500F5008C0605041582000002F31000480E010000F800000061B0000001FC00000061B0000001AC0000006000000000F80E3E1C6DB0000001741F3F366DB00000032631B36379B00000030631B3637DB0000006073FB3366DB0000006071FB31C65B000000607018000000000000E0F018000000000001F0F8F8000000000001F1F078000000000000FFE000000000000
+0051000A81800021436500F5008C0605041582000002F31000480E010000F800000061B0000001FC00000061B0000001AC0000006000000000F80E3E1C6DB0000001741F3F366DB00000032631B36379B00000030631B3637DB0000006073FB3366DB0000006071FB31C65B000000607018000000000000E0F018000000000001F0F8F8000000000001F1F078000000000000FFE000000000000
 Send succeeded!
Index: testsuite/out.13.emspicture
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/out.13.emspicture,v
retrieving revision 1.2
diff -u -u -r1.2 out.13.emspicture
--- testsuite/out.13.emspicture 21 May 2002 09:05:54 -0000      1.2
+++ testsuite/out.13.emspicture 13 Sep 2002 18:41:57 -0000
@@ -1,4 +1,4 @@
 Sending EMS-compliant Picture Message.
 AT+???=145
-0051000A00604043133000F5008483128100090E07800000000001F0001FE00000000007FC003FF0000000000FFE007FF8000000000CCE007FC0000000000D5600FF00000000000EEE00FC06318C6318CFFE63FC06318C6318CFFE63FF00000000000FFE007FC0000000000EAE007FF8000000000D56003FF0000000000FFE001FE0000000000CE600078000000000084200
+0051000A81604043133000F5008483128100090E07800000000001F0001FE00000000007FC003FF0000000000FFE007FF8000000000CCE007FC0000000000D5600FF00000000000EEE00FC06318C6318CFFE63FC06318C6318CFFE63FF00000000000FFE007FC0000000000EAE007FF8000000000D56003FF0000000000FFE001FE0000000000CE600078000000000084200
 Send succeeded!
Index: testsuite/out.14.oplogo-xpm
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/out.14.oplogo-xpm,v
retrieving revision 1.4
diff -u -u -r1.4 out.14.oplogo-xpm
--- testsuite/out.14.oplogo-xpm 29 May 2002 10:29:57 -0000      1.4
+++ testsuite/out.14.oplogo-xpm 13 Sep 2002 18:41:57 -0000
@@ -1,4 +1,4 @@
 Sending operator logo.
 AT+???=153
-0051000A00800021436500F5008C0605041582000002F31000480E010000F800000061B0000001FC00000061B0000001AC0000006000000000F80E3E1C6DB0000001741F3F366DB00000032631B36379B00000030631B3637DB0000006073FB3366DB0000006071FB31C65B000000607018000000000000E0F018000000000001F0F8F8000000000001F1F078000000000000FFE000000000000
+0051000A81800021436500F5008C0605041582000002F31000480E010000F800000061B0000001FC00000061B0000001AC0000006000000000F80E3E1C6DB0000001741F3F366DB00000032631B36379B00000030631B3637DB0000006073FB3366DB0000006071FB31C65B000000607018000000000000E0F018000000000001F0F8F8000000000001F1F078000000000000FFE000000000000
 Send succeeded!
Index: testsuite/out.17.picture2
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/out.17.picture2,v
retrieving revision 1.3
diff -u -u -r1.3 out.17.picture2
--- testsuite/out.17.picture2   2 Jun 2002 22:16:38 -0000       1.3
+++ testsuite/out.17.picture2   13 Sep 2002 18:41:57 -0000
@@ -1,11 +1,8 @@
 Sending Multipart Message: Picture Message.
-Please enter SMS text. End your input with <cr><control-D>:Sending sms #0
+Please enter SMS text. End your input with <cr><control-D>:AT+???=153
+0051000A81604043133000F5008C0B0504158A00000003CE03013002010000481C010000001400000000000000002A0000000000000001FF000000000000000215800000000000000400C00000000000000406C0000000000000031D8000000000000001F300000000000000001300000000000000000A00000000000000000A00000000000000000A3C000000000000000A4600000000000000
 AT+???=153
-0051000A00604043133000F5008C0B0504158A00000003CE03013002010000481C010000001400000000000000002A0000000000000001FF000000000000000215800000000000000400C00000000000000406C0000000000000031D8000000000000001F300000000000000001300000000000000000A00000000000000000A00000000000000000A3C000000000000000A4600000000000000
-Sending sms #1
-AT+???=153
-0051000A00604043133000F5008C0B0504158A00000003CE03020A83000000000000000B01800000000000000B01800000000000000B00C20000000000000980C30000000000000980C300000000000008C063800000000000084065800000000000100039800000000000100001800000000000788623000000000000A4892300000000000141D07600000000000147F1FC000000000000FFCF
-Sending sms #2
+0051000A81604043133000F5008C0B0504158A00000003CE03020A83000000000000000B01800000000000000B01800000000000000B00C20000000000000980C30000000000000980C300000000000008C063800000000000084065800000000000100039800000000000100001800000000000788623000000000000A4892300000000000141D07600000000000147F1FC000000000000FFCF
 AT+???=93
-0051000A00604043133000F500500B0504158A00000003CE0303F000000000003D41686F6A6B793B206A65737465206A6564656E20696E7665727A6E692062726F6E746F736175722E2E2E202D2D706176656C2030363034333433313033
+0051000A81604043133000F500500B0504158A00000003CE0303F000000000003D41686F6A6B793B206A65737465206A6564656E20696E7665727A6E692062726F6E746F736175722E2E2E202D2D706176656C2030363034333433313033
 Send succeeded!
Index: testsuite/out.2.concatsms
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/out.2.concatsms,v
retrieving revision 1.2
diff -u -u -r1.2 out.2.concatsms
--- testsuite/out.2.concatsms   4 Jun 2002 22:32:23 -0000       1.2
+++ testsuite/out.2.concatsms   13 Sep 2002 18:41:57 -0000
@@ -1,5 +1,3 @@
-Adding concat header
-Please enter SMS text. End your input with <cr><control-D>:Encoding concat 
header
-AT+???=51
+Please enter SMS text. End your input with <cr><control-D>:AT+???=51
 
0051000A81800021436500F50026050003CE0201546869732069732062656767696E696E67206F6620746865206D657373616765
 Send succeeded!
Index: testsuite/test.10.oplogo
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/test.10.oplogo,v
retrieving revision 1.2
diff -u -u -r1.2 test.10.oplogo
--- testsuite/test.10.oplogo    15 Jul 2002 17:29:41 -0000      1.2
+++ testsuite/test.10.oplogo    13 Sep 2002 18:41:59 -0000
@@ -1 +1 @@
-$GNOKII --sendlogo op 0800123456 ../Docs/sample/ringtone/gnokii.nol "203 01"
\ No newline at end of file
+$GNOKII --sendlogo op 0800123456 ../Docs/gnokii.nol "203 01"
\ No newline at end of file
Index: testsuite/test.12.picture
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/test.12.picture,v
retrieving revision 1.6
diff -u -u -r1.6 test.12.picture
--- testsuite/test.12.picture   15 Jul 2002 17:29:41 -0000      1.6
+++ testsuite/test.12.picture   13 Sep 2002 18:41:59 -0000
@@ -1,4 +1,4 @@
 #
 # Well, this test is actually wrong. gnokiiop.xpm is too small to act as 
picture message.
 #
-echo "Ahoj, tohle je mala zprava na testovani telefonu" | $GNOKII --sendlogo 
picture 0604343103 ../Docs/sample/ringtone/gnokiiop.xpm
+echo "Ahoj, tohle je mala zprava na testovani telefonu" | $GNOKII --sendlogo 
picture 0604343103 ../Docs/sample/logo/gnokiiop.xpm
Index: testsuite/test.14.oplogo-xpm
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/test.14.oplogo-xpm,v
retrieving revision 1.4
diff -u -u -r1.4 test.14.oplogo-xpm
--- testsuite/test.14.oplogo-xpm        15 Jul 2002 17:29:41 -0000      1.4
+++ testsuite/test.14.oplogo-xpm        13 Sep 2002 18:41:59 -0000
@@ -1 +1 @@
-$GNOKII --sendlogo op 0800123456 ../Docs/sample/ringtone/gnokiiop.xpm "203 01"
\ No newline at end of file
+$GNOKII --sendlogo op 0800123456 ../Docs/sample/logo/gnokiiop.xpm "203 01"
\ No newline at end of file
Index: testsuite/test.19.emspicture3
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/test.19.emspicture3,v
retrieving revision 1.2
diff -u -u -r1.2 test.19.emspicture3
--- testsuite/test.19.emspicture3       15 Jul 2002 17:29:41 -0000      1.2
+++ testsuite/test.19.emspicture3       13 Sep 2002 18:41:59 -0000
@@ -1,5 +1,6 @@
 #
 # Send pacman to 0604343103
-# 
-$GNOKII --sendsms 0604343103 -p ../Docs/sample/logo/pacman.xpm
+#
+echo Gnokii does not yet understand this syntax; test disabled
+#$GNOKII --sendsms 0604343103 -p ../Docs/sample/logo/pacman.xpm
 
Index: testsuite/test.28.cemsanimation
===================================================================
RCS file: /cvsroot/gnokii/gnokii/testsuite/test.28.cemsanimation,v
retrieving revision 1.1
diff -u -u -r1.1 test.28.cemsanimation
--- testsuite/test.28.cemsanimation     7 Jun 2002 09:21:13 -0000       1.1
+++ testsuite/test.28.cemsanimation     13 Sep 2002 18:41:59 -0000
@@ -1 +1,2 @@
-$GNOKII --sendsms 0604343103 --animation 
"data/anim1.xpm;data/anim2.xpm;data/anim3.xpm;data/anim4.xpm" --concat "2;2;3"
\ No newline at end of file
+echo Gnokii does not yet understand this syntax; test disabled
+#$GNOKII --sendsms 0604343103 --animation 
"data/anim1.xpm;data/anim2.xpm;data/anim3.xpm;data/anim4.xpm" --concat "2;2;3"
\ No newline at end of file

-- 
Worst form of spam? Adding advertisment signatures ala sourceforge.net.
What goes next? Inserting advertisment *into* email?