Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r3389 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/common ([EMAIL PROTECTED])
2. r3390 - trunk/src/target/gsm/src/gsmd ([EMAIL PROTECTED])
3. r3391 - trunk/src/target/gsm/src/gsmd ([EMAIL PROTECTED])
4. r3392 - trunk/src/target/gsm/src/gsmd ([EMAIL PROTECTED])
5. r3393 - trunk/src/target/gsm/src/util ([EMAIL PROTECTED])
6. r3394 - in trunk/src/target/gsm: include/libgsmd src/gsmd
src/util ([EMAIL PROTECTED])
7. r3395 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/common ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-11-12 10:31:54 +0100 (Mon, 12 Nov 2007)
New Revision: 3389
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
Log:
Patch by: Milko Krachounov <[EMAIL PROTECTED]>
* src/common/moko-dialer-panel.c: (moko_dialer_panel_hold_timeout),
(moko_dialer_panel_pressed): Automatically free the allocated data
structure when the timeout source is
destroyed
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-10 18:09:39 UTC (rev 3388)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-12 09:31:54 UTC (rev 3389)
@@ -1,3 +1,12 @@
+2007-11-12 Thomas Wood <[EMAIL PROTECTED]>
+
+ Patch by: Milko Krachounov <[EMAIL PROTECTED]>
+
+ * src/common/moko-dialer-panel.c: (moko_dialer_panel_hold_timeout),
+ (moko_dialer_panel_pressed): Automatically free the allocated data
+ structure when the timeout source is
+ destroyed
+
2007-11-05 Thomas Wood <[EMAIL PROTECTED]>
* src/phone-kit/moko-dialer.c: (moko_dialer_dial),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
2007-11-10 18:09:39 UTC (rev 3388)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-panel.c
2007-11-12 09:31:54 UTC (rev 3389)
@@ -154,7 +154,6 @@
{
g_signal_emit (data->panel, moko_dialer_panel_signals[HOLD_SIGNAL], 0,
data->value);
- g_free (data);
return FALSE;
}
@@ -186,7 +185,7 @@
timeout_data->panel = panel;
timeout_data->value = value;
- hold_timeout_source = g_timeout_add (800, (GSourceFunc)
moko_dialer_panel_hold_timeout, timeout_data);
+ hold_timeout_source = g_timeout_add_full (G_PRIORITY_DEFAULT, 800,
(GSourceFunc) moko_dialer_panel_hold_timeout, timeout_data, (GDestroyNotify)
g_free);
}
else if (event->type == GDK_BUTTON_RELEASE)
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2007-11-12 10:38:04 +0100 (Mon, 12 Nov 2007)
New Revision: 3390
Modified:
trunk/src/target/gsm/src/gsmd/atcmd.c
trunk/src/target/gsm/src/gsmd/unsolicited.c
Log:
keeping track of current registration state internally in gsmd. Without this
the"gsmd->dev_state.registered" variable had bogus values. (Andrew)
Modified: trunk/src/target/gsm/src/gsmd/atcmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/atcmd.c 2007-11-12 09:31:54 UTC (rev
3389)
+++ trunk/src/target/gsm/src/gsmd/atcmd.c 2007-11-12 09:38:04 UTC (rev
3390)
@@ -668,7 +668,7 @@
}
llist_add(&cmd->list, &g->pending_atcmds);
- return atcmd_done(g, cur, "OK");
+ return atcmd_done(g, cur, "ERROR");
}
void atcmd_drain(int fd)
Modified: trunk/src/target/gsm/src/gsmd/unsolicited.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/unsolicited.c 2007-11-12 09:31:54 UTC (rev
3389)
+++ trunk/src/target/gsm/src/gsmd/unsolicited.c 2007-11-12 09:38:04 UTC (rev
3390)
@@ -145,9 +145,31 @@
struct gsmd *gsmd)
{
const char *comma = strchr(param, ',');
- struct gsmd_ucmd *ucmd = usock_build_event(GSMD_MSG_EVENT,
GSMD_EVT_NETREG,
- sizeof(struct gsmd_evt_auxdata));
+ struct gsmd_ucmd *ucmd;
struct gsmd_evt_auxdata *aux;
+ int prev_registered = gsmd->dev_state.registered;
+ int state;
+ char *end;
+
+ state = strtol(param, &end, 10);
+ if (!(end > param)) {
+ gsmd_log(GSMD_ERROR, "Bad +CREG format, not updating state\n");
+ return -EINVAL;
+ }
+
+ /* Update our knowledge about our state */
+ gsmd->dev_state.registered =
+ (state == GSMD_NETREG_REG_HOME ||
+ state == GSMD_NETREG_REG_ROAMING);
+
+ /* Intialise things that depend on network registration */
+ if (gsmd->dev_state.registered && !prev_registered) {
+ sms_cb_network_init(gsmd);
+ }
+
+ /* Notify clients */
+ ucmd = usock_build_event(GSMD_MSG_EVENT, GSMD_EVT_NETREG,
+ sizeof(struct gsmd_evt_auxdata));
if (!ucmd)
return -ENOMEM;
aux = (struct gsmd_evt_auxdata *) ucmd->buf;
@@ -163,13 +185,8 @@
} else
aux->u.netreg.lac = aux->u.netreg.ci = 0;
- /* Intialise things that depend on network registration */
- if (aux->u.netreg.state == GSMD_NETREG_REG_HOME ||
- aux->u.netreg.state == GSMD_NETREG_REG_ROAMING) {
- sms_cb_network_init(gsmd);
- }
+ return usock_evt_send(gsmd, ucmd, GSMD_EVT_NETREG);
- return usock_evt_send(gsmd, ucmd, GSMD_EVT_NETREG);
}
/* Chapter 7.11, call waiting */
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2007-11-12 10:39:37 +0100 (Mon, 12 Nov 2007)
New Revision: 3391
Modified:
trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
gsmd: Adding hang up control(Andrew & Tick)
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2007-11-12 09:38:04 UTC (rev
3390)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2007-11-12 09:39:37 UTC (rev
3391)
@@ -184,11 +184,10 @@
/* configure message format as PDU mode*/
/* FIXME: TEXT mode support!! */
rc |= gsmd_simplecmd(gsmd, "AT+CMGF=0");
-#if 0
- /* Select TE character set */
- rc |= gsmd_simplecmd(gsmd, "AT+CSCS=\"UCS2\"");
-#endif
+ /* ATH disconnects voice calls */
+ rc |= gsmd_simplecmd(gsmd, "AT+CVHU=0");
+
sms_cb_init(gsmd);
if (gsmd->vendorpl && gsmd->vendorpl->initsettings)
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2007-11-12 10:41:03 +0100 (Mon, 12 Nov 2007)
New Revision: 3392
Modified:
trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
gsmd: return some meaningful value from set_baudrate (Andrew & Tick)
Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c 2007-11-12 09:39:37 UTC (rev
3391)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c 2007-11-12 09:41:03 UTC (rev
3392)
@@ -277,23 +277,26 @@
return -EINVAL;
i = tcgetattr(fd, &ti);
- if (i < 0)
- return i;
+ if (i < 0) {
+ return -errno;
+ }
i = cfsetispeed(&ti, B0);
- if (i < 0)
- return i;
+ if (i < 0) {
+ return -errno;
+ }
i = cfsetospeed(&ti, bd);
- if (i < 0)
- return i;
+ if (i < 0) {
+ return -errno;
+ }
if (hwflow)
ti.c_cflag |= CRTSCTS;
else
ti.c_cflag &= ~CRTSCTS;
- return tcsetattr(fd, 0, &ti);
+ return tcsetattr(fd, 0, &ti) ? -errno : 0;
}
static int gsmd_initialize(struct gsmd *g)
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2007-11-12 10:41:54 +0100 (Mon, 12 Nov 2007)
New Revision: 3393
Modified:
trunk/src/target/gsm/src/util/shell.c
Log:
gsmd: adding sleep mode into libgsmd-tool shell mode(Tick)
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2007-11-12 09:41:03 UTC (rev
3392)
+++ trunk/src/target/gsm/src/util/shell.c 2007-11-12 09:41:54 UTC (rev
3393)
@@ -346,6 +346,7 @@
"\tP\tPrint current operator\n"
"\tL\tDetect available operators\n"
"\tQ\tRead signal quality\n"
+ "\tS\tSleep (S[=second], default 5)\n"
"\tT\tSend DTMF Tone\n"
"\tn\tPrint subscriber numbers\n"
"\tpd\tPB Delete (pb=index)\n"
@@ -473,6 +474,14 @@
lgsm_signal_quality(lgsmh);
} else if (!strcmp(buf, "q")) {
exit(0);
+ } else if (buf[0] == 'S' ) {
+ if(!strchr(buf,'=') ||
atoi((strchr(buf,'=')+1)) < 0) {
+ printf("Sleep 5 secs\n");
+ sleep(5);
+ }else {
+ printf("Sleep %d
secs\n",atoi(strchr(buf,'=')+1));
+ sleep(atoi(strchr(buf,'=')+1));
+ }
} else if (buf[0] == 'T') {
if (strlen(buf) < 2)
continue;
--- End Message ---
--- Begin Message ---
Author: tick
Date: 2007-11-12 10:42:38 +0100 (Mon, 12 Nov 2007)
New Revision: 3394
Modified:
trunk/src/target/gsm/include/libgsmd/phonebook.h
trunk/src/target/gsm/src/gsmd/usock.c
trunk/src/target/gsm/src/gsmd/vendor_ti.c
trunk/src/target/gsm/src/gsmd/vendor_tihtc.c
trunk/src/target/gsm/src/util/atcmd.c
Log:
gsmd: cleaning some dummy codes (Tick)
Modified: trunk/src/target/gsm/include/libgsmd/phonebook.h
===================================================================
--- trunk/src/target/gsm/include/libgsmd/phonebook.h 2007-11-12 09:41:54 UTC
(rev 3393)
+++ trunk/src/target/gsm/include/libgsmd/phonebook.h 2007-11-12 09:42:38 UTC
(rev 3394)
@@ -49,19 +49,6 @@
char findtext[LGSM_PB_TEXT_MAXLEN+1];
};
-#if 0
-/* Get a bitmask of supported phonebook types */
-extern int lgsm_pb_get_types(struct lgsm_handle *lh, u_int32 *typemask);
-
-/* Get a range of supported indexes in given phonebook type, Chapter 8.12 */
-extern int lgsm_pb_get_range(struct lgsm_handle *lh,
- enum lgsm_pbook_type type,
- u_int32_t *from, u_int32_t *to,
- u_int32_t *nlength, *u_int32_t tlength);
-
-#define LGSM_PB_TEXT_MAXLEN 31
-#endif
-
struct lgsm_pb_entry {
struct lgsm_pb_entry *next;
enum lgsm_pbook_type type;
Modified: trunk/src/target/gsm/src/gsmd/usock.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/usock.c 2007-11-12 09:41:54 UTC (rev
3393)
+++ trunk/src/target/gsm/src/gsmd/usock.c 2007-11-12 09:42:38 UTC (rev
3394)
@@ -671,374 +671,6 @@
return atcmd_submit(gu->gsmd, cmd);
}
-#if 0
-static int sms_list_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- struct gsmd_user *gu = ctx;
- struct gsmd_ucmd *ucmd;
- struct gsmd_sms_list msg;
- int i, idx, stat, len, cr;
- u_int8_t pdu[180];
-
- if (cmd->ret && cmd->ret != -255)
- return 0;
-
- /* FIXME: TEXT mode */
- if (
- sscanf(resp, "+CMGL: %i,%i,,%i\n%n",
- &idx, &stat, &len, &cr) < 3 &&
- sscanf(resp, "+CMGL: %i,%i,\"%*[^\"]\",%i\n%n",
- &idx, &stat, &len, &cr) < 3)
- return -EINVAL;
- if (len > 164)
- return -EINVAL;
-
- msg.index = idx;
- msg.stat = stat;
- msg.is_last = (cmd->ret == 0);
- for (i = 0; resp[cr] >= '0' && resp[cr + 1] >= '0' && i < 180; i ++) {
- if (sscanf(resp + cr, "%2hhX", &pdu[i]) < 1) {
- gsmd_log(GSMD_DEBUG, "malformed input (%i)\n", i);
- return -EINVAL;
- }
- cr += 2;
- }
- if (sms_pdu_to_msg(&msg, pdu, len, i)) {
- gsmd_log(GSMD_DEBUG, "malformed PDU\n");
- return -EINVAL;
- }
-
- ucmd = gsmd_ucmd_fill(sizeof(msg), GSMD_MSG_SMS,
- GSMD_SMS_LIST, cmd->id);
- if (!ucmd)
- return -ENOMEM;
- memcpy(ucmd->buf, &msg, sizeof(msg));
-
- usock_cmd_enqueue(ucmd, gu);
-
- return 0;
-}
-
-static int sms_read_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- struct gsmd_user *gu = ctx;
- struct gsmd_ucmd *ucmd;
- struct gsmd_sms_list msg;
- int i, stat, len, cr;
- u_int8_t pdu[180];
-
- if (cmd->ret)
- return 0;
-
- /* FIXME: TEXT mode */
- if (
- sscanf(resp, "+CMGR: %i,,%i\n%n",
- &stat, &len, &cr) < 2 &&
- sscanf(resp, "+CMGR: %i,%*i,%i\n%n",
- &stat, &len, &cr) < 2)
- return -EINVAL;
- if (len > 164)
- return -EINVAL;
-
- msg.index = 0;
- msg.stat = stat;
- msg.is_last = 1;
- for (i = 0; resp[cr] >= '0' && resp[cr + 1] >= '0' && i < 180; i ++) {
- if (sscanf(resp + cr, "%2hhX", &pdu[i]) < 1) {
- gsmd_log(GSMD_DEBUG, "malformed input (%i)\n", i);
- return -EINVAL;
- }
- cr += 2;
- }
- if (sms_pdu_to_msg(&msg, pdu, len, i)) {
- gsmd_log(GSMD_DEBUG, "malformed PDU\n");
- return -EINVAL;
- }
-
- ucmd = gsmd_ucmd_fill(sizeof(msg), GSMD_MSG_SMS,
- GSMD_SMS_READ, cmd->id);
- if (!ucmd)
- return -ENOMEM;
- memcpy(ucmd->buf, &msg, sizeof(msg));
-
- usock_cmd_enqueue(ucmd, gu);
-
- return 0;
-}
-
-static int sms_send_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- struct gsmd_user *gu = ctx;
- struct gsmd_ucmd *ucmd;
- int msgref;
-
- if (cmd->ret == 0 || cmd->ret == -255) {
- if (sscanf(resp, "+CMGS: %i", &msgref) < 1)
- return -EINVAL;
- } else
- msgref = -cmd->ret;
-
- ucmd = gsmd_ucmd_fill(sizeof(int), GSMD_MSG_SMS,
- GSMD_SMS_SEND, cmd->id);
- if (!ucmd)
- return -ENOMEM;
- *(int *) ucmd->buf = msgref;
-
- usock_cmd_enqueue(ucmd, gu);
-
- return 0;
-}
-
-static int sms_write_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- struct gsmd_user *gu = ctx;
- struct gsmd_ucmd *ucmd;
- int result;
-
- if (cmd->ret == 0) {
- if (sscanf(resp, "+CMGW: %i", &result) < 1)
- return -EINVAL;
- } else
- result = -cmd->ret;
-
- ucmd = gsmd_ucmd_fill(sizeof(int), GSMD_MSG_SMS,
- GSMD_SMS_WRITE, cmd->id);
- if (!ucmd)
- return -ENOMEM;
- *(int *) ucmd->buf = result;
-
- usock_cmd_enqueue(ucmd, gu);
-
- return 0;
-}
-
-static int sms_delete_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- struct gsmd_user *gu = ctx;
- struct gsmd_ucmd *ucmd;
- int *result;
-
- ucmd = gsmd_ucmd_fill(sizeof(int), GSMD_MSG_SMS,
- GSMD_SMS_DELETE, cmd->id);
- if (!ucmd)
- return -ENOMEM;
-
- result = (int *) ucmd->buf;
- *result = cmd->ret;
-
- usock_cmd_enqueue(ucmd, gu);
-
- return 0;
-}
-
-static int usock_cpms_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- struct gsmd_user *gu = ctx;
- struct gsmd_ucmd *ucmd = ucmd_alloc(sizeof(struct gsmd_sms_storage));
- struct gsmd_sms_storage *gss = (typeof(gss)) ucmd->buf;
- char buf[3][3];
-
- DEBUGP("entering(cmd=%p, gu=%p)\n", cmd, gu);
-
- if (!ucmd)
- return -ENOMEM;
-
- ucmd->hdr.version = GSMD_PROTO_VERSION;
- ucmd->hdr.msg_type = GSMD_MSG_SMS;
- ucmd->hdr.msg_subtype = GSMD_SMS_GET_MSG_STORAGE;
- ucmd->hdr.len = sizeof(struct gsmd_sms_storage);
- ucmd->hdr.id = cmd->id;
-
- if (sscanf(resp, "+CPMS: \"%2[A-Z]\",%hi,%hi,"
- "\"%2[A-Z]\",%hi,%hi,\"%2[A-Z]\",%hi,%hi",
- buf[0], &gss->mem[0].used, &gss->mem[0].total,
- buf[1], &gss->mem[1].used, &gss->mem[1].total,
- buf[2], &gss->mem[2].used, &gss->mem[2].total)
- < 9) {
- talloc_free(ucmd);
- return -EINVAL;
- }
-
- gss->mem[0].memtype = parse_memtype(buf[0]);
- gss->mem[1].memtype = parse_memtype(buf[1]);
- gss->mem[2].memtype = parse_memtype(buf[2]);
-
- usock_cmd_enqueue(ucmd, gu);
-
- return 0;
-}
-
-static int usock_get_smsc_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
-{
- struct gsmd_user *gu = ctx;
- struct gsmd_ucmd *ucmd;
- struct gsmd_addr *ga;
-
- ucmd = gsmd_ucmd_fill(sizeof(struct gsmd_addr), GSMD_MSG_SMS,
- GSMD_SMS_GET_SERVICE_CENTRE, cmd->id);
- if (!ucmd)
- return -ENOMEM;
-
- ga = (struct gsmd_addr *) ucmd->buf;
- if (sscanf(resp, "+CSCA: \"%31[^\"]\",%hhi",
- ga->number, &ga->type) < 2) {
- talloc_free(ucmd);
- return -EINVAL;
- }
-
- usock_cmd_enqueue(ucmd, gu);
- return 0;
-}
-
-static const char *gsmd_cmgl_stat[] = {
- "REC UNREAD", "REC READ", "STO UNSENT", "STO SENT", "ALL",
-};
-
-static int usock_rcv_sms(struct gsmd_user *gu, struct gsmd_msg_hdr *gph,
- int len)
-{
- /* FIXME: TEXT mode support!! */
- struct gsmd_atcmd *cmd = NULL;
- struct gsmd_sms_delete *gsd;
- struct gsmd_sms_submit *gss;
- struct gsmd_sms_write *gsw;
- struct gsmd_addr *ga;
- enum ts0705_mem_type *storage;
- int *stat, *index;
- int atcmd_len;
- char buf[1024];
-
- switch (gph->msg_subtype) {
- case GSMD_SMS_LIST:
- if(len < sizeof(*gph) + sizeof(int))
- return -EINVAL;
- stat = (int *) ((void *)gph + sizeof(*gph));
- if (*stat < 0 || *stat > 4)
- return -EINVAL;
-
- if (gu->gsmd->flags & GSMD_FLAG_SMS_FMT_TEXT)
- atcmd_len = sprintf(buf, "AT+CMGL=\"%s\"",
- gsmd_cmgl_stat[*stat]);
- else
- atcmd_len = sprintf(buf, "AT+CMGL=%i", *stat);
-
- cmd = atcmd_fill(buf, atcmd_len + 1,
- &sms_list_cb, gu, gph->id);
- break;
-
- case GSMD_SMS_READ:
- if(len < sizeof(*gph) + sizeof(int))
- return -EINVAL;
- index = (int *) ((void *)gph + sizeof(*gph));
-
- atcmd_len = sprintf(buf, "AT+CMGR=%i", *index);
-
- cmd = atcmd_fill(buf, atcmd_len + 1,
- &sms_read_cb, gu, gph->id);
- break;
-
- case GSMD_SMS_SEND:
- if (len < sizeof(*gph) + sizeof(*gss))
- return -EINVAL;
- gss = (struct gsmd_sms_submit *) ((void *) gph + sizeof(*gph));
-
- if (gu->gsmd->flags & GSMD_FLAG_SMS_FMT_TEXT) {
- atcmd_len = sprintf(buf, "AT+CMGS=\"%s\"\n%.*s",
- gss->addr.number,
- gss->payload.length,
- gss->payload.data); /* FIXME */
- } else {
- atcmd_len = sprintf(buf, "AT+CMGS=%i\n",
- sms_pdu_make_smssubmit(NULL, gss) - 1);
- atcmd_len += sms_pdu_make_smssubmit(buf + atcmd_len,
- gss) * 2;
- }
- buf[atcmd_len ++] = 26; /* ^Z ends the message */
- buf[atcmd_len ++] = 0;
-
- cmd = atcmd_fill(buf, atcmd_len, &sms_send_cb, gu, gph->id);
- break;
-
- case GSMD_SMS_WRITE:
- if (len < sizeof(*gph) + sizeof(*gsw))
- return -EINVAL;
- gsw = (struct gsmd_sms_write *) ((void *) gph + sizeof(*gph));
- if (gsw->stat > 4)
- return -EINVAL;
-
- if (gu->gsmd->flags & GSMD_FLAG_SMS_FMT_TEXT) {
- atcmd_len = sprintf(buf, "AT+CMGW=\"%s\"\n%.*s",
- gsw->sms.addr.number,
- gsw->sms.payload.length,
- gsw->sms.payload.data); /* FIXME */
- } else {
- atcmd_len = sprintf(buf, "AT+CMGW=%i,%i\n",
- sms_pdu_make_smssubmit(NULL,
- &gsw->sms) - 1, gsw->stat);
- atcmd_len += sms_pdu_make_smssubmit(buf + atcmd_len,
- &gsw->sms) * 2;
- }
- buf[atcmd_len ++] = 26; /* ^Z ends the message */
- buf[atcmd_len ++] = 0;
-
- cmd = atcmd_fill(buf, atcmd_len, &sms_write_cb, gu, gph->id);
- break;
-
- case GSMD_SMS_DELETE:
- if(len < sizeof(*gph) + sizeof(*gsd))
- return -EINVAL;
- gsd = (struct gsmd_sms_delete *) ((void *)gph + sizeof(*gph));
-
- atcmd_len = sprintf(buf, "AT+CMGD=%d,%d",
- gsd->index, gsd->delflg);
-
- cmd = atcmd_fill(buf, atcmd_len + 1,
- &sms_delete_cb, gu, gph->id);
- break;
-
- case GSMD_SMS_GET_MSG_STORAGE:
- cmd = atcmd_fill("AT+CPMS?", 8 + 1, usock_cpms_cb, gu, 0);
- break;
-
- case GSMD_SMS_SET_MSG_STORAGE:
- if (len < sizeof(*gph) + 3 * sizeof(enum ts0705_mem_type))
- return -EINVAL;
- storage = (enum ts0705_mem_type *)
- ((void *) gph + sizeof(*gph));
- atcmd_len = sprintf(buf, "AT+CPMS=\"%s\",\"%s\",\"%s\"",
- ts0705_memtype_name[storage[0]],
- ts0705_memtype_name[storage[1]],
- ts0705_memtype_name[storage[2]]);
- cmd = atcmd_fill(buf, atcmd_len + 1,
- &null_cmd_cb, gu, gph->id);
- break;
-
- case GSMD_SMS_GET_SERVICE_CENTRE:
- cmd = atcmd_fill("AT+CSCA?", 8 + 1, &usock_get_smsc_cb, gu, 0);
- break;
-
- case GSMD_SMS_SET_SERVICE_CENTRE:
- if (len < sizeof(*gph) + sizeof(struct gsmd_addr))
- return -EINVAL;
- ga = (struct gsmd_addr *) ((void *) gph + sizeof(*gph));
- atcmd_len = sprintf(buf, "AT+CSCA=\"%s\",%i",
- ga->number, ga->type);
- cmd = atcmd_fill(buf, atcmd_len + 1,
- &null_cmd_cb, gu, gph->id);
- break;
-
- default:
- return -EINVAL;
- }
-
- if (!cmd)
- return -ENOMEM;
-
- gsmd_log(GSMD_DEBUG, "%s\n", cmd ? cmd->buf : 0);
- return atcmd_submit(gu->gsmd, cmd);
-}
-#endif
-
static int phonebook_find_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp)
{
struct gsmd_user *gu = ctx;
Modified: trunk/src/target/gsm/src/gsmd/vendor_ti.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/vendor_ti.c 2007-11-12 09:41:54 UTC (rev
3393)
+++ trunk/src/target/gsm/src/gsmd/vendor_ti.c 2007-11-12 09:42:38 UTC (rev
3394)
@@ -37,36 +37,7 @@
#include <gsmd/vendorplugin.h>
#include <gsmd/unsolicited.h>
-#if 0
-#include "vendorplugin.h"
-static int
-ti_getopt(struct gsmd *gh, int optname, void *optval, int *optlen)
-{
- switch (optname) {
- case GSMD_OPT_CIPHER_IND:
- /* FIXME: send AT%CPRI=? */
- break;
- default:
- return -EINVAL;
- }
-}
-
-static int
-ti_setopt(struct gsmd *gh, int optname, const void *optval, int optlen)
-{
- switch (optname) {
- case GSMD_OPT_CIPHER_IND:
- /* FIXME: send AT%CPRI= */
- break;
- default:
- return -EINVAL;
- }
-}
-
-#endif
-
-
static int csq_parse(char *buf, int len, const char *param,
struct gsmd *gsmd)
{
Modified: trunk/src/target/gsm/src/gsmd/vendor_tihtc.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/vendor_tihtc.c 2007-11-12 09:41:54 UTC
(rev 3393)
+++ trunk/src/target/gsm/src/gsmd/vendor_tihtc.c 2007-11-12 09:42:38 UTC
(rev 3394)
@@ -52,37 +52,6 @@
return atcmd_submit(gsmd, cmd);
}
-
-#if 0
-#include "vendorplugin.h"
-
-static int
-ti_getopt(struct gsmd *gh, int optname, void *optval, int *optlen)
-{
- switch (optname) {
- case GSMD_OPT_CIPHER_IND:
- /* FIXME: send AT%CPRI=? */
- break;
- default:
- return -EINVAL;
- }
-}
-
-static int
-ti_setopt(struct gsmd *gh, int optname, const void *optval, int optlen)
-{
- switch (optname) {
- case GSMD_OPT_CIPHER_IND:
- /* FIXME: send AT%CPRI= */
- break;
- default:
- return -EINVAL;
- }
-}
-
-#endif
-
-
static int htccsq_parse(char *buf, int len, const char *param,
struct gsmd *gsmd)
{
Modified: trunk/src/target/gsm/src/util/atcmd.c
===================================================================
--- trunk/src/target/gsm/src/util/atcmd.c 2007-11-12 09:41:54 UTC (rev
3393)
+++ trunk/src/target/gsm/src/util/atcmd.c 2007-11-12 09:42:38 UTC (rev
3394)
@@ -47,12 +47,10 @@
lgsm_register_handler(lgsmh, GSMD_MSG_PASSTHROUGH, &pt_msghandler);
-#if 1
fcntl(0, F_SETFD, O_NONBLOCK);
fcntl(1, F_SETFD, O_NONBLOCK);
fcntl(2, F_SETFD, O_NONBLOCK);
fcntl(lgsm_fd(lgsmh), F_SETFD, O_NONBLOCK);
-#endif
FD_ZERO(&readset);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-11-12 11:58:20 +0100 (Mon, 12 Nov 2007)
New Revision: 3395
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.h
Log:
* src/common/moko-dialer-textview.c: (moko_dialer_textview_init),
(moko_dialer_textview_set_color):
* src/common/moko-dialer-textview.h:
Remove cursor indicator and always add/remove characters from the end of
the dialer display. Closes bug 940.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-12 09:42:38 UTC (rev 3394)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-11-12 10:58:20 UTC (rev 3395)
@@ -1,11 +1,19 @@
2007-11-12 Thomas Wood <[EMAIL PROTECTED]>
+ * src/common/moko-dialer-textview.c: (moko_dialer_textview_init),
+ (moko_dialer_textview_set_color):
+ * src/common/moko-dialer-textview.h:
+
+ Remove cursor indicator and always add/remove characters from the end of
+ the dialer display. Closes bug 940.
+
+2007-11-12 Thomas Wood <[EMAIL PROTECTED]>
+
Patch by: Milko Krachounov <[EMAIL PROTECTED]>
* src/common/moko-dialer-panel.c: (moko_dialer_panel_hold_timeout),
(moko_dialer_panel_pressed): Automatically free the allocated data
- structure when the timeout source is
- destroyed
+ structure when the timeout source is destroyed. Closes bug 1004.
2007-11-05 Thomas Wood <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c
2007-11-12 09:42:38 UTC (rev 3394)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.c
2007-11-12 10:58:20 UTC (rev 3395)
@@ -99,8 +99,8 @@
buffer = gtk_text_view_get_buffer (textview);
moko_dialer_textview->font_desc_textview = NULL;
moko_dialer_textview->tag_for_inputed = NULL;
- moko_dialer_textview->tag_for_cursor = NULL;
- moko_dialer_textview->tag_for_autofilled = NULL;
+// moko_dialer_textview->tag_for_cursor = NULL;
+// moko_dialer_textview->tag_for_autofilled = NULL;
GTK_WIDGET_UNSET_FLAGS (textview, GTK_CAN_FOCUS);
gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
@@ -127,9 +127,7 @@
/* save it to the structure for later usage. */
moko_dialer_textview->font_desc_textview = font_desc_textview;
}
- moko_dialer_textview->tag_for_cursor =
- gtk_text_buffer_create_tag (buffer, "tag_cursor", "weight",
- "PANGO_WEIGHT_BOLD", NULL);
+
moko_dialer_textview->sensed = FALSE;
@@ -163,7 +161,7 @@
{
GtkTextBuffer *buffer;
- GtkTextIter start, cursoriter_1, cursoriter;
+ GtkTextIter start, cursoriter;
GtkTextIter end;
gint small = 10, medium = 10, large = 10;
@@ -191,30 +189,6 @@
if (text && (strlen (text) < 1))
return;
- gint cur = gtk_text_iter_get_offset (&cursoriter);
-
- if (cur > 0)
- {
- gtk_text_buffer_remove_all_tags (buffer, &start, &end);
-
- gtk_text_buffer_get_iter_at_offset (buffer, &cursoriter_1, cur - 1);
-// gtk_text_buffer_apply_tag (buffer,
-// moko_dialer_textview->tag_for_inputed,
-// &start, &cursoriter);
-// gtk_text_buffer_apply_tag (buffer,
-// moko_dialer_textview->tag_for_autofilled,
-// &cursoriter, &end);
- gtk_text_buffer_apply_tag (buffer, moko_dialer_textview->tag_for_cursor,
- &cursoriter_1, &cursoriter);
-
- }
- else
- { // cur==0
-// gtk_text_buffer_apply_tag (buffer,
-// moko_dialer_textview->tag_for_autofilled,
-// &cursoriter, &end);
- }
-
/* get font sizes */
gtk_widget_style_get (GTK_WIDGET (moko_dialer_textview), "small_font",
&small, NULL);
gtk_widget_style_get (GTK_WIDGET (moko_dialer_textview), "medium_font",
&medium, NULL);
@@ -321,8 +295,7 @@
len = gtk_text_buffer_get_char_count (buffer);
- gtk_text_buffer_insert_at_cursor (buffer, number,
- g_utf8_strlen (number, -1));
+ gtk_text_buffer_insert (buffer, &end, number, -1);
len = len + g_utf8_strlen (number, -1);
/* reget the cursor iter. */
@@ -413,8 +386,11 @@
}
else
{
- // no selection, then just perform backspace.
- gtk_text_buffer_backspace (buffer, &insertiter, TRUE, TRUE);
+ /* no selection, then just perform backspace. */
+ GtkTextIter enditer;
+
+ gtk_text_buffer_get_end_iter (buffer, &enditer);
+ gtk_text_buffer_backspace (buffer, &enditer, TRUE, TRUE);
}
//now we get the inputed string length.
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.h
2007-11-12 09:42:38 UTC (rev 3394)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/common/moko-dialer-textview.h
2007-11-12 10:58:20 UTC (rev 3395)
@@ -45,8 +45,8 @@
GtkTextView textview; /* the main widget */
PangoFontDescription *font_desc_textview; /* the font description of
this textview */
GtkTextTag *tag_for_inputed; /* the formating tag for the digits user
already inputed */
- GtkTextTag *tag_for_cursor; /* the formatting tag for the right digit
user just inputed. */
- GtkTextTag *tag_for_autofilled; /* the formatting tag for the autofilled
digits if any. */
+ // GtkTextTag *tag_for_cursor; /* the formatting tag for the right digit
user just inputed. */
+ // GtkTextTag *tag_for_autofilled; /* the formatting tag for the autofilled
digits if any. */
gboolean sensed;
};
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
