revert 'bug108' patch from tony guan.

git-svn-id: http://svn.openmoko.org/trunk/src/target/gsm@1161 99fdad57-331a-0410-800a-d7fa5415bdb3

5 files changed, 8 insertions, 131 deletions

diff --git a/include/libgsmd/misc.h b/include/libgsmd/misc.h
index c919d72..95e219d 100644
--- a/include/libgsmd/misc.h
+++ b/include/libgsmd/misc.h
@@ -1,5 +1,5 @@
-#ifndef _MISC_LIBGSMD_H
-#define _MISC_LIBGSMD_H
+#ifndef _LIBGSMD_H
+#define _LIBGSMD_H
 
 /* libgsmd.h - Library API for gsmd, the GSM Daemon
  * (C) 2006 by Harald Welte <hwelte@hmw-consulting.de>
@@ -25,19 +25,19 @@ extern int lgsm_get_netreg_state(struct lgsm_handle *lh,
 
 extern int lgsm_netreg_register(struct lgsm_handle *lh, int oper);
 
-typedef enum _lgsm_info_type {
+enum lgsm_info_type {
 	LGSM_INFO_TYPE_NONE		= 0,
 	LGSM_INFO_TYPE_MANUF		= 1,
 	LGSM_INFO_TYPE_MODEL		= 2,
 	LGSM_INFO_TYPE_REVISION		= 3,
 	LGSM_INFO_TYPE_SERIAL		= 4,
 	LGSM_INFO_TYPE_IMSI		= 5,
-}lgsm_info_type;
+};
 
 /* Get some information about the handset */
 extern int lgsm_get_info(struct lgsm_handle *lh,
-			 lgsm_info_type type,
-			 char *ret_string, unsigned int* len);
+			 enum lgsm_info_type type,
+			 char *ret_string, u_int16_t len);
 
 /* Authenticate to SIM Card using specified null-terminated pin */
 extern int lgsm_pin_auth(struct lgsm_handle *lh, const char *pin);
diff --git a/src/libgsmd/Makefile.am b/src/libgsmd/Makefile.am
index e9cd1a0..a1ee710 100644
--- a/src/libgsmd/Makefile.am
+++ b/src/libgsmd/Makefile.am
@@ -5,6 +5,6 @@ AM_CFLAGS = -std=gnu99
 lib_LTLIBRARIES = libgsmd.la
 
 libgsmd_la_LDFLAGS = -Wc,-nostartfiles -version-info $(LIBVERSION)
-libgsmd_la_SOURCES = libgsmd.c libgsmd_input.c libgsmd_voicecall.c libgsmd_passthrough.c libgsmd_event.c libgsmd_phone.c libgsmd_network.c libgsmd_device.c
+libgsmd_la_SOURCES = libgsmd.c libgsmd_input.c libgsmd_voicecall.c libgsmd_passthrough.c libgsmd_event.c libgsmd_phone.c libgsmd_network.c
 
 noinst_HEADERS = lgsm_internals.h
diff --git a/src/libgsmd/libgsmd_device.c b/src/libgsmd/libgsmd_device.c
deleted file mode 100644
index a25dd81..0000000
--- a/src/libgsmd/libgsmd_device.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* libgsmd phone related functions
- *
- * (C) 2006-2007 by OpenMoko, Inc.
- * Written by Harald Welte <laforge@openmoko.org>
- * All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */ 
-
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <libgsmd/libgsmd.h>
-#include <libgsmd/misc.h>
-#include "lgsm_internals.h"
-
-int lgsm_get_info(struct lgsm_handle *lh,
-			 lgsm_info_type type,
-			 char *ret_string, unsigned int* len)
-{
-		switch (type)
-		{
-		case LGSM_INFO_TYPE_MANUF:
-			return lgsm_passthrough(lh,"AT+CGMI",ret_string,len);	
-			break;
-		case LGSM_INFO_TYPE_MODEL:
-			return lgsm_passthrough(lh,"AT+CGMM",ret_string,len);	
-			break;
-		case LGSM_INFO_TYPE_REVISION:
-			return lgsm_passthrough(lh,"AT+CGMR",ret_string,len);	
-			break;
-		case LGSM_INFO_TYPE_SERIAL:
-		       return lgsm_passthrough(lh,"AT+CGSN",ret_string,len);	
-			break;
-		case LGSM_INFO_TYPE_IMSI:
-		       return lgsm_passthrough(lh,"AT+CIMI",ret_string,len);	
-			break;
-		case LGSM_INFO_TYPE_NONE:
-		default:
-			return -EINVAL;
-			
-		}
-			return -EINVAL;	
-}
diff --git a/src/util/libgsmd-tool.c b/src/util/libgsmd-tool.c
index 34bb53c..c48bf8e 100644
--- a/src/util/libgsmd-tool.c
+++ b/src/util/libgsmd-tool.c
@@ -95,14 +95,11 @@ int main(int argc, char **argv)
 	printf("libgsm-tool - (C) 2006 by Harald Welte\n"
 		"This program is Free Software and has ABSOLUTELY NO WARRANTY\n\n");
 
-
 	while (1) {
 		int c, option_index = 0;
 		c = getopt_long(argc, argv, "vVhm:p:", opts, &option_index);
 		if (c == -1)
-			{
 			break;
-			}
 
 		switch (c) {
 		case 'v':
diff --git a/src/util/shell.c b/src/util/shell.c
index c7ccc91..43a0bfe 100644
--- a/src/util/shell.c
+++ b/src/util/shell.c
@@ -48,7 +48,6 @@ static int shell_help(void)
 		"\to\tPower Off\n"
 		"\tR\tRegister Netowrk\n"
 		"\tT\tSend DTMF Tone\n"
-		"\tI\tDevice Infor\n"
 		"\tq\tQuit\n"
 		);
 }
@@ -59,7 +58,6 @@ int shell_main(struct lgsm_handle *lgsmh)
 	char buf[STDIN_BUF_SIZE+1];
 	char rbuf[STDIN_BUF_SIZE+1];
 	int rlen = sizeof(rbuf);
-
 	fd_set readset;
 
 	lgsm_register_handler(lgsmh, GSMD_MSG_PASSTHROUGH, &pt_msghandler);
@@ -138,68 +136,9 @@ int shell_main(struct lgsm_handle *lgsmh)
 					continue;
 				printf("DTMF: %c\n", buf[1]);
 				lgsm_voice_dtmf(lgsmh, buf[1]);
-			} else if (buf[0] == 'I') {
-			//FIXME: sometimes, lgsm_get_info returns directly, and sometimes the result just gets lost.
-				static int infoindex=LGSM_INFO_TYPE_NONE;//information
-				infoindex=infoindex%LGSM_INFO_TYPE_IMSI+1;
-				rlen = sizeof(rbuf);
-				switch(infoindex){
-				case LGSM_INFO_TYPE_MANUF:
-				
-				if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_MANUF,rbuf,&rlen))
-					{
-					printf("manufacturer:%s\n",rbuf);
-					}
-				else
-					printf("manufacturer information error!\n");
-				break;
-
-				case LGSM_INFO_TYPE_MODEL:
-				if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_MODEL,rbuf,&rlen))
-					{
-					printf("model:%s\n",rbuf);
-					}
-				else
-					printf("model error!\n");
-				break;
-
-                            case LGSM_INFO_TYPE_REVISION:
-                    		if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_REVISION,rbuf,&rlen))
-					{
-					printf("revision:%s\n",rbuf);
-					}
-				else
-					printf("revision information error!\n");
-                            break;
-
-                            case LGSM_INFO_TYPE_IMSI:
-				if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_IMSI,rbuf,&rlen))
-					{
-					printf("imei:%s\n",rbuf);
-					}
-				else
-					printf("imei information error!\n");
-				break;
-                            case LGSM_INFO_TYPE_SERIAL:
-				if(lgsm_get_info(lgsmh,LGSM_INFO_TYPE_SERIAL,rbuf,&rlen))
-					{
-					printf("sn:%s\n",rbuf);
-					}
-				else
-					printf("sn information error!\n");
-				break;
-				default:
-					printf("something is wrong!\n");
-				}
-
-
-			
-			} 
-			else {
+			} else {
 				printf("Unknown command `%s'\n", buf);
 			}
 		}
 	}
 }
-
-