updated to latest gammu version

3 files changed, 24 insertions, 6 deletions

diff --git a/gammu/emb/gammu/depend/nokia/dct3.c b/gammu/emb/gammu/depend/nokia/dct3.c
index d4a55da..b9e47ea 100644
--- a/gammu/emb/gammu/depend/nokia/dct3.c
+++ b/gammu/emb/gammu/depend/nokia/dct3.c
@@ -612,6 +612,10 @@ void DCT3GetSecurityCode(int argc, char *argv[])
 {
+#ifdef GSM_ENABLE_NOKIA6110
 	unsigned char req6110[] = {0x00, 0x01, 0x6e,
 				   0x01};	/* Code type */
+#endif
+#if defined(GSM_ENABLE_NOKIA7110) || defined(GSM_ENABLE_NOKIA9210)
 	unsigned char req71_91[] = {N7110_FRAME_HEADER, 0xee,
 				    0x1c};	/* Setting */
+#endif
 
@@ -769,4 +773,6 @@ void DCT3DisplayOutput(int argc, char *argv[])
 static GSM_Reply_Function UserReplyFunctions3[] = {
+#ifdef GSM_ENABLE_NOKIA6110
 	{DCT3_ReplyDisplayOutput,	"\x0D",0x03,0x50,ID_IncomingFrame	},
 	{DCT3_ReplyDisplayOutput,	"\x0D",0x03,0x54,ID_User7	 	},
+#endif
 
diff --git a/gammu/emb/gammu/depend/nokia/dct4.c b/gammu/emb/gammu/depend/nokia/dct4.c
index f4ed305..4bf958d 100644
--- a/gammu/emb/gammu/depend/nokia/dct4.c
+++ b/gammu/emb/gammu/depend/nokia/dct4.c
@@ -37,3 +37,4 @@ GSM_Error CheckDCT4Only()
 	    s.ConnectionType!=GCT_FBUS2DLR3  && s.ConnectionType!=GCT_PHONETBLUE &&
-	    s.ConnectionType!=GCT_IRDAPHONET && s.ConnectionType!=GCT_BLUEPHONET) {
+	    s.ConnectionType!=GCT_IRDAPHONET && s.ConnectionType!=GCT_BLUEPHONET &&
+	    s.ConnectionType!=GCT_FBUS2DKU5) {
 		return ERR_OTHERCONNECTIONREQUIRED;
@@ -887,2 +888,4 @@ void DCT4GetT9(int argc, char *argv[])
 
+#ifdef GSM_ENABLE_NOKIA6510
+
 extern GSM_Error N6510_SetLight(GSM_StateMachine *s, N6510_PHONE_LIGHTS light, bool enable);
@@ -923,2 +926,3 @@ void DCT4SetLight(int argc, char *argv[])
 }
+#endif
 
@@ -1023,2 +1027,4 @@ void DCT4GetADC(int argc, char *argv[])
 
+#ifdef GSM_ENABLE_NOKIA6510
+
 static double 		RadioFreq;
@@ -1176,2 +1182,3 @@ void DCT4TuneRadio(int argc, char *argv[])
 }
+#endif
 
@@ -1315,2 +1322,3 @@ static GSM_Reply_Function UserReplyFunctions4[] = {
 
+#ifdef GSM_ENABLE_NOKIA6510
 	{DCT4_ReplyTuneRadio,		"\x3E",0x03,0x09,ID_User3	},
@@ -1319,2 +1327,3 @@ static GSM_Reply_Function UserReplyFunctions4[] = {
 	{DCT4_ReplyTuneRadio,		"\x3E",0x03,0x16,ID_User3	},
+#endif
 
diff --git a/gammu/emb/gammu/depend/nokia/dct4.h b/gammu/emb/gammu/depend/nokia/dct4.h
index fde5b08..fae809f 100644
--- a/gammu/emb/gammu/depend/nokia/dct4.h
+++ b/gammu/emb/gammu/depend/nokia/dct4.h
@@ -8,5 +8,2 @@ void DCT4SetVibraLevel	   (int argc, char *argv[]);
 void DCT4GetSecurityCode   (int argc, char *argv[]);
-#ifdef DEBUG
-void DCT4ResetSecurityCode (int argc, char *argv[]);
-#endif
 void DCT4GetVoiceRecord	   (int argc, char *argv[]);
@@ -14,3 +11,2 @@ void DCT4Info		   (int argc, char *argv[]);
 void DCT4GetT9		   (int argc, char *argv[]);
-void DCT4SetLight	   (int argc, char *argv[]);
 void DCT4DisplayTest	   (int argc, char *argv[]);
@@ -18,3 +14,2 @@ void DCT4GetADC		   (int argc, char *argv[]);
 void DCT4VibraTest	   (int argc, char *argv[]);
-void DCT4TuneRadio	   (int argc, char *argv[]);
 void DCT4PlaySavedRingtone (int argc, char *argv[]);
@@ -23,2 +18,10 @@ void DCT4GetScreenDump	   (int argc, char *argv[]);
 
+#ifdef DEBUG
+	void DCT4ResetSecurityCode (int argc, char *argv[]);
+#endif
+#ifdef GSM_ENABLE_NOKIA6510
+	void DCT4SetLight	   (int argc, char *argv[]);
+	void DCT4TuneRadio	   (int argc, char *argv[]);
+#endif
+
 /* ------------------- features matrix ------------------------------------- */