This commit was manufactured by cvs2svn to create tag

[gnokii.git] / gnokii / gnokii.h

diff --git a/gnokii/gnokii.h b/gnokii/gnokii.h
index aa12300..f4feaa1 100644 (file)
--- a/gnokii/gnokii.h
+++ b/gnokii/gnokii.h
@@ -12,8 +12,6 @@
 
 /* Prototypes */
 
 
 /* Prototypes */
 

-#ifndef UCLINUX
-

 int monitormode(int argc, char *argv[]);
 
 #ifdef SECURITY
 int monitormode(int argc, char *argv[]);
 
 #ifdef SECURITY


@@ -25,15 +23,13 @@ int monitormode(int argc, char *argv[]);
 #ifdef DEBUG
   int sniff(int nargc, char *nargv[]);
   int decodefile(int nargc, char *nargv[]); 
 #ifdef DEBUG
   int sniff(int nargc, char *nargv[]);
   int decodefile(int nargc, char *nargv[]); 

+  int getbinringfromfile(int nargc, char *nargv[]); 

 #endif
 
 #endif
 

-#endif /* UCLINUX */
-
-static int getmemory(int argc, char *argv[]);
-static int writephonebook(int argc, char *argv[]);
-static int getspeeddial(char *number);
-static int setspeeddial(char *argv[]);
-#ifndef UCLINUX
+int getmemory(int argc, char *argv[]);
+int writephonebook(int argc, char *argv[]);
+int getspeeddial(char *number);
+int setspeeddial(char *argv[]);

 int getsms(int argc, char *argv[]);
 int renamesmsc(int argc, char *argv[]);
 int deletesms(int argc, char *argv[]);
 int getsms(int argc, char *argv[]);
 int renamesmsc(int argc, char *argv[]);
 int deletesms(int argc, char *argv[]);


@@ -49,17 +45,13 @@ int getdatetime(void);
 int setalarm(char *argv[]);
 int getalarm(void);
 int dialvoice(char *number);
 int setalarm(char *argv[]);
 int getalarm(void);
 int dialvoice(char *number);

-#endif /* UCLINUX */
-static int cancelcall(void);
-#ifndef UCLINUX
+int cancelcall(void);

 int getcalendarnote(int argc, char *argv[]);
 int writecalendarnote(char *argv[]);
 int deletecalendarnote(char *index);
 int getdisplaystatus();
 int netmonitor(char *_mode);
 int getcalendarnote(int argc, char *argv[]);
 int writecalendarnote(char *argv[]);
 int deletecalendarnote(char *index);
 int getdisplaystatus();
 int netmonitor(char *_mode);

-#endif /* UCLINUX */
-static int identify(void);
-#ifndef UCLINUX
+int identify(void);

 int senddtmf(char *String);
 int foogle(char *argv[]);
 int pmon(void);
 int senddtmf(char *String);
 int foogle(char *argv[]);
 int pmon(void);


@@ -68,9 +60,7 @@ int getlogo(int argc, char *argv[]);
 int binringtoneconvert(int argc, char *argv[]);
 int setringtone(int argc, char *argv[]);
 int getringtone(int argc, char *argv[]);
 int binringtoneconvert(int argc, char *argv[]);
 int setringtone(int argc, char *argv[]);
 int getringtone(int argc, char *argv[]);

-#endif /* UCLINUX */
-static int reset(int argc, char *argv[]);
-#ifndef UCLINUX
+int reset(int argc, char *argv[]);

 int getprofile(int argc, char *argv[]);
 int setprofile(int argc, char *argv[]);
 int allringtones();
 int getprofile(int argc, char *argv[]);
 int setprofile(int argc, char *argv[]);
 int allringtones();


@@ -111,7 +101,6 @@ int getsmsstatus(int argc, char *argv[]);
 int divert(int argc, char *argv[]);
 int savephonebookentry(int argc, char *argv[]);
 int sendphonebookentry(int argc, char *argv[]);
 int divert(int argc, char *argv[]);
 int savephonebookentry(int argc, char *argv[]);
 int sendphonebookentry(int argc, char *argv[]);

-#endif /* UCLINUX */

 
 typedef enum {
   OPT_HELP,
 
 typedef enum {
   OPT_HELP,


@@ -197,7 +186,7 @@ typedef enum {
   OPT_DIVERT=146,
   OPT_SENDWAPSETTINGS=147,
   OPT_SETWAPBOOKMARK=148,
   OPT_DIVERT=146,
   OPT_SENDWAPSETTINGS=147,
   OPT_SETWAPBOOKMARK=148,

-  OPT_GNOKIID=149,
+  OPT_GETBINRINGFROMFILE=149

 } opt_index;
 
 struct gnokii_arg_len {
 } opt_index;
 
 struct gnokii_arg_len {


@@ -219,10 +208,8 @@ struct keys_table_position {
   int whatcode;
 };
 
   int whatcode;
 };
 

-#ifndef UCLINUX
-

 /* for --presskeysequence */
 /* for --presskeysequence */

-static struct keys_table_position Keys[] = {
+struct keys_table_position Keys[] = {

 {'m',PHONEKEY_MENU},
 {'M',PHONEKEY_MENU},
 {'n',PHONEKEY_NAMES},
 {'m',PHONEKEY_MENU},
 {'M',PHONEKEY_MENU},
 {'n',PHONEKEY_NAMES},


@@ -254,8 +241,6 @@ static struct keys_table_position Keys[] = {
 {' ',0}
 };
 
 {' ',0}
 };
 

-#endif /* UCLINUX */
-

 /* for NETMONITOR */
 
 //maximal number of screens for --nm_collect
 /* for NETMONITOR */
 
 //maximal number of screens for --nm_collect


@@ -291,5 +276,5 @@ typedef struct {
        unsigned char req_screen[NM_MAX_SCREEN];
 } OUT_INFO_MON;
 
        unsigned char req_screen[NM_MAX_SCREEN];
 } OUT_INFO_MON;
 

-static int semicolon_pipe_substitution( GSM_PhonebookEntry *pentry, unsigned int direction );
-static int str_substch( char *str, const char toric, const char sost );
+int semicolon_pipe_substitution( GSM_PhonebookEntry *pentry, unsigned int direction );
+int str_substch( char *str, const char toric, const char sost );