Untested patch for Ir (NOT IrDA!) connections

[gnokii.git] / common / gsm-api.c

diff --git a/common/gsm-api.c b/common/gsm-api.c
index 00f1ee3..620a8a0 100644 (file)
--- a/common/gsm-api.c
+++ b/common/gsm-api.c
@@ -261,9 +261,11 @@ bool CheckModel (GSM_Information InfoToCheck, char *model, GSM_ConnectionType co
   if (strstr(InfoToCheck.MBUSModels, model) != NULL) {
     if (connection==GCT_MBUS) found_match=true;
   }
+#endif /* UCLINUX */
   if (strstr(InfoToCheck.InfraredModels, model) != NULL) {
     if (connection==GCT_Infrared) found_match=true;
   }
+#ifndef UCLINUX
   if (strstr(InfoToCheck.DLR3Models, model) != NULL) {
     if (connection==GCT_DLR3) found_match=true;
   }
@@ -541,8 +543,8 @@ GSM_Error GSM_Initialise(char *model, char *device, char *initlength, GSM_Connec
       if (found_match) {
         switch (connection) {
           case GCT_FBUS    : Protocol = &FBUS_Functions;    break;
-#ifndef UCLINUX
           case GCT_Infrared: Protocol = &FBUS_Functions;    break;
+#ifndef UCLINUX
           case GCT_Tekram  : Protocol = &FBUS_Functions;    break;
           case GCT_DLR3    : Protocol = &FBUS_Functions;    break;
           case GCT_MBUS    : Protocol = &MBUS_Functions;    break;
@@ -691,7 +693,9 @@ GSM_ConnectionType GetConnectionTypeFromString(char *Connection) {
 
 #ifndef UCLINUX
   if (!strcmp(Connection, "irda"))     connection=GCT_Irda;
+#endif /* UCLINUX */
   if (!strcmp(Connection, "infrared")) connection=GCT_Infrared;
+#ifndef UCLINUX
   if (!strcmp(Connection, "mbus"))     connection=GCT_MBUS;
   if (!strcmp(Connection, "dlr3"))     connection=GCT_DLR3;
   if (!strcmp(Connection, "fbus3110")) connection=GCT_FBUS3110;