r1161 - in trunk/src/target/gsm: include/libgsmd src/libgsmd src/util
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Wed Feb 28 12:55:34 CET 2007
Author: laforge
Date: 2007-02-28 12:55:34 +0100 (Wed, 28 Feb 2007)
New Revision: 1161
Removed:
trunk/src/target/gsm/src/libgsmd/libgsmd_device.c
Modified:
trunk/src/target/gsm/include/libgsmd/misc.h
trunk/src/target/gsm/src/libgsmd/Makefile.am
trunk/src/target/gsm/src/util/libgsmd-tool.c
trunk/src/target/gsm/src/util/shell.c
Log:
revert 'bug108' patch from tony guan.
Modified: trunk/src/target/gsm/include/libgsmd/misc.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/misc.h 2007-02-28 11:36:47 UTC (rev 1160)
+++ trunk/src/target/gsm/include/libgsmd/misc.h 2007-02-28 11:55:34 UTC (rev 1161)
@@ -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 at hmw-consulting.de>
@@ -25,19 +25,19 @@
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);
Modified: trunk/src/target/gsm/src/libgsmd/Makefile.am
===================================================================
--- trunk/src/target/gsm/src/libgsmd/Makefile.am 2007-02-28 11:36:47 UTC (rev 1160)
+++ trunk/src/target/gsm/src/libgsmd/Makefile.am 2007-02-28 11:55:34 UTC (rev 1161)
@@ -5,6 +5,6 @@
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
Deleted: trunk/src/target/gsm/src/libgsmd/libgsmd_device.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_device.c 2007-02-28 11:36:47 UTC (rev 1160)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_device.c 2007-02-28 11:55:34 UTC (rev 1161)
@@ -1,59 +0,0 @@
-/* libgsmd phone related functions
- *
- * (C) 2006-2007 by OpenMoko, Inc.
- * Written by Harald Welte <laforge at 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;
-}
Modified: trunk/src/target/gsm/src/util/libgsmd-tool.c
===================================================================
--- trunk/src/target/gsm/src/util/libgsmd-tool.c 2007-02-28 11:36:47 UTC (rev 1160)
+++ trunk/src/target/gsm/src/util/libgsmd-tool.c 2007-02-28 11:55:34 UTC (rev 1161)
@@ -95,14 +95,11 @@
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':
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2007-02-28 11:36:47 UTC (rev 1160)
+++ trunk/src/target/gsm/src/util/shell.c 2007-02-28 11:55:34 UTC (rev 1161)
@@ -48,7 +48,6 @@
"\to\tPower Off\n"
"\tR\tRegister Netowrk\n"
"\tT\tSend DTMF Tone\n"
- "\tI\tDevice Infor\n"
"\tq\tQuit\n"
);
}
@@ -59,7 +58,6 @@
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 @@
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);
}
}
}
}
-
-
More information about the commitlog
mailing list
