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. r3496 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
2. r3497 - in trunk/src/target/gsm/src: gsmd libgsmd
([EMAIL PROTECTED])
3. r3498 - trunk/src/target/gsm/src/util ([EMAIL PROTECTED])
4. r3499 - trunk/src/host/qemu-neo1973/openmoko
([EMAIL PROTECTED])
5. r3500 - trunk/src/host/qemu-neo1973 ([EMAIL PROTECTED])
--- Begin Message ---
Author: chris
Date: 2007-11-23 19:22:13 +0100 (Fri, 23 Nov 2007)
New Revision: 3496
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
Log:
* src/sms-compose.c: (send_clicked_cb):
Don't try to get selected contact to send a message, unnecessary
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-11-23 18:14:31 UTC (rev 3495)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2007-11-23 18:22:13 UTC (rev 3496)
@@ -1,3 +1,8 @@
+2007-11-23 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/sms-compose.c: (send_clicked_cb):
+ Don't try to get selected contact to send a message, unnecessary
+
2007-11-22 Chris Lord <[EMAIL PROTECTED]>
* src/sms-compose.c: (send_clicked_cb):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
2007-11-23 18:14:31 UTC (rev 3495)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
2007-11-23 18:22:13 UTC (rev 3496)
@@ -145,14 +145,10 @@
GtkTextIter start, end;
GtkTextBuffer *buffer;
const gchar *number;
- EContact *contact;
gchar *message;
if (hidden) return;
- /* TODO: Spawn an error dialog or something */
- if (!(contact = sms_get_selected_contact (data))) return;
-
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
data->new_button), FALSE);
@@ -192,8 +188,6 @@
} else {
/* TODO: Error dialog for empty number */
}
-
- g_object_unref (contact);
}
GtkWidget *
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-23 21:17:13 +0100 (Fri, 23 Nov 2007)
New Revision: 3497
Modified:
trunk/src/target/gsm/src/gsmd/machine_gta01.c
trunk/src/target/gsm/src/libgsmd/libgsmd_modem.c
trunk/src/target/gsm/src/libgsmd/libgsmd_phonebook.c
trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c
trunk/src/target/gsm/src/libgsmd/libgsmd_sms.c
Log:
gsmd: add missing license headers
Modified: trunk/src/target/gsm/src/gsmd/machine_gta01.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/machine_gta01.c 2007-11-23 18:22:13 UTC
(rev 3496)
+++ trunk/src/target/gsm/src/gsmd/machine_gta01.c 2007-11-23 20:17:13 UTC
(rev 3497)
@@ -1,3 +1,22 @@
+/* gta01 machine plugin
+ *
+ * (C) 2007 by OpenMoko, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_modem.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_modem.c 2007-11-23 18:22:13 UTC
(rev 3496)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_modem.c 2007-11-23 20:17:13 UTC
(rev 3497)
@@ -1,3 +1,23 @@
+/* libgsmd modem functions
+ *
+ * (C) 2006-2007 by OpenMoko, Inc.
+ *
+ * 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>
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_phonebook.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_phonebook.c 2007-11-23
18:22:13 UTC (rev 3496)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_phonebook.c 2007-11-23
20:17:13 UTC (rev 3497)
@@ -1,3 +1,25 @@
+/* libgsmd phonebook
+ *
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Written by Harald Welte <[EMAIL PROTECTED]>
+ * 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>
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c 2007-11-23 18:22:13 UTC
(rev 3496)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_pin.c 2007-11-23 20:17:13 UTC
(rev 3497)
@@ -1,3 +1,25 @@
+/* libgsmd pin support
+ *
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Written by Harald Welte <[EMAIL PROTECTED]>
+ * 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 <string.h>
#include <stdio.h>
Modified: trunk/src/target/gsm/src/libgsmd/libgsmd_sms.c
===================================================================
--- trunk/src/target/gsm/src/libgsmd/libgsmd_sms.c 2007-11-23 18:22:13 UTC
(rev 3496)
+++ trunk/src/target/gsm/src/libgsmd/libgsmd_sms.c 2007-11-23 20:17:13 UTC
(rev 3497)
@@ -1,3 +1,23 @@
+/* libgsmd sms support
+ *
+ * (C) 2007 by OpenMoko, Inc.
+ *
+ * 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>
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-11-23 21:30:33 +0100 (Fri, 23 Nov 2007)
New Revision: 3498
Modified:
trunk/src/target/gsm/src/util/event.c
trunk/src/target/gsm/src/util/libgsmd-tool.c
trunk/src/target/gsm/src/util/shell.c
Log:
gsmd: fix typos and indentation
Modified: trunk/src/target/gsm/src/util/event.c
===================================================================
--- trunk/src/target/gsm/src/util/event.c 2007-11-23 20:17:13 UTC (rev
3497)
+++ trunk/src/target/gsm/src/util/event.c 2007-11-23 20:30:33 UTC (rev
3498)
@@ -238,7 +238,7 @@
if(aux->u.cme_err.number)
printf("cme error: %u\n", aux->u.cme_err.number);
else if(aux->u.cms_err.number)
- printf("cme error: %u\n", aux->u.cms_err.number);
+ printf("cms error: %u\n", aux->u.cms_err.number);
return 0;
}
Modified: trunk/src/target/gsm/src/util/libgsmd-tool.c
===================================================================
--- trunk/src/target/gsm/src/util/libgsmd-tool.c 2007-11-23 20:17:13 UTC
(rev 3497)
+++ trunk/src/target/gsm/src/util/libgsmd-tool.c 2007-11-23 20:30:33 UTC
(rev 3498)
@@ -94,7 +94,7 @@
char *pin = NULL;
int rc, i, mode, shellwait = 0;
- printf("libgsm-tool - (C) 2006 by Harald Welte\n"
+ printf("libgsm-tool - (C) 2006-2007 by Harald Welte and OpenMoko,
Inc.\n"
"This program is Free Software and has ABSOLUTELY NO
WARRANTY\n\n");
while (1) {
Modified: trunk/src/target/gsm/src/util/shell.c
===================================================================
--- trunk/src/target/gsm/src/util/shell.c 2007-11-23 20:17:13 UTC (rev
3497)
+++ trunk/src/target/gsm/src/util/shell.c 2007-11-23 20:30:33 UTC (rev
3498)
@@ -354,17 +354,17 @@
printf( "\tA\tAnswer incoming call\n"
"\tD\tDial outgoing number\n"
"\tH\tHangup call\n"
- "\tO\tPower On\n"
- "\to\tPower Off\n"
+ "\tO\tAntenna Power On\n"
+ "\to\tAntenna Power Off\n"
"\tM\tModem Power On\n"
"\tm\tModem Power Off\n"
"\tr\tRegister to network\n"
"\tR\tRegister to given operator (R=number)\n"
"\tU\tUnregister from netowrk\n"
"\tP\tPrint current operator\n"
- "\tL\tDetect available operators\n"
+ "\tL\tList available operators\n"
"\tQ\tRead signal quality\n"
- "\tS\tSleep (S[=second], default 5)\n"
+ "\tS\tSleep (S[=second], default 5)\n"
"\tT\tSend DTMF Tone\n"
"\tn\tPrint subscriber numbers\n"
"\tpd\tPB Delete (pb=index)\n"
@@ -426,7 +426,7 @@
* on to the library */
rc = read(gsm_fd, buf, sizeof(buf));
if (rc <= 0) {
- printf("ERROR reding from gsm_fd\n");
+ printf("ERROR reading from gsm_fd\n");
break;
}
rc = lgsm_handle_packet(lgsmh, buf, rc);
@@ -495,14 +495,14 @@
pending_responses ++;
} 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] == '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;
@@ -610,18 +610,16 @@
strncpy(sms.addr, fcomma+1, lcomma-fcomma-1);
sms.addr[lcomma-fcomma-1] = '\0';
/* todo define \" to allow " in text */
- if (lcomma[1]=='"' &&
- !strchr(lcomma+2, '"')) {
- /* read until closing '"' */
- rc = fscanf(stdin, "%[^\"]\"",
- lcomma+strlen(lcomma));
- if (rc == EOF) {
- printf("EOF\n");
- return -1;
- }
- /* remove brackets */
- lcomma++;
- lcomma[strlen(lcomma)] = '\0';
+ if (lcomma[1]=='"' && !strchr(lcomma+2, '"')) {
+ /* read until closing '"' */
+ rc = fscanf(stdin, "%[^\"]\"",
lcomma+strlen(lcomma));
+ if (rc == EOF) {
+ printf("EOF\n");
+ return -1;
+ }
+ /* remove brackets */
+ lcomma++;
+ lcomma[strlen(lcomma)] = '\0';
}
printf("Send SMS\n");
packing_7bit_character(lcomma+1, &sms);
@@ -677,12 +675,12 @@
printf("Get imsi\n");
lgsm_get_imsi(lgsmh);
pending_responses ++;
- } else if (!strncmp(buf, "M", 1)) {
- printf("Modem Power On\n");
- lgsm_modem_power(lgsmh, 1);
- } else if (!strncmp(buf, "m", 1)) {
- printf("Modem Power Off\n");
- lgsm_modem_power(lgsmh, 0);
+ } else if (!strncmp(buf, "M", 1)) {
+ printf("Modem Power On\n");
+ lgsm_modem_power(lgsmh, 1);
+ } else if (!strncmp(buf, "m", 1)) {
+ printf("Modem Power Off\n");
+ lgsm_modem_power(lgsmh, 0);
} else {
printf("Unknown command `%s'\n", buf);
}
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-11-23 23:27:37 +0100 (Fri, 23 Nov 2007)
New Revision: 3499
Modified:
trunk/src/host/qemu-neo1973/openmoko/env
Log:
Ensure every SIGALRM causes a cpu_loop_exit().
Take back the forcing of clocksource, the dynticks should now be functional.
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2007-11-23 20:30:33 UTC (rev
3498)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2007-11-23 22:27:37 UTC (rev
3499)
@@ -4,7 +4,7 @@
script_dir_relative=openmoko
script_dir="$src_dir/$script_dir_relative"
uboot_symlink="$src_dir/u-boot.bin"
-qemu_relative="arm-softmmu/qemu-system-arm -M neo -m 130 -clock unix"
+qemu_relative="arm-softmmu/qemu-system-arm -M neo -m 130"
qemu="$src_dir/$qemu_relative"
flash_base=openmoko-flash.base
flash_image=openmoko-flash.image
--- End Message ---
--- Begin Message ---
Author: andrew
Date: 2007-11-23 23:31:57 +0100 (Fri, 23 Nov 2007)
New Revision: 3500
Modified:
trunk/src/host/qemu-neo1973/cpu-all.h
trunk/src/host/qemu-neo1973/cpu-exec.c
trunk/src/host/qemu-neo1973/exec.c
trunk/src/host/qemu-neo1973/vl.c
Log:
Changes missing from previous commit due to svn vs. git mutual hate.
Modified: trunk/src/host/qemu-neo1973/cpu-all.h
===================================================================
--- trunk/src/host/qemu-neo1973/cpu-all.h 2007-11-23 22:27:37 UTC (rev
3499)
+++ trunk/src/host/qemu-neo1973/cpu-all.h 2007-11-23 22:31:57 UTC (rev
3500)
@@ -706,6 +706,7 @@
__attribute__ ((__noreturn__));
extern CPUState *first_cpu;
extern CPUState *cpu_single_env;
+extern int env_pending_request;
extern int code_copy_enabled;
#define CPU_INTERRUPT_EXIT 0x01 /* wants exit from main loop */
Modified: trunk/src/host/qemu-neo1973/cpu-exec.c
===================================================================
--- trunk/src/host/qemu-neo1973/cpu-exec.c 2007-11-23 22:27:37 UTC (rev
3499)
+++ trunk/src/host/qemu-neo1973/cpu-exec.c 2007-11-23 22:31:57 UTC (rev
3500)
@@ -258,6 +258,11 @@
cpu_single_env = env1;
+ if (env_pending_request) {
+ cpu_interrupt(env1, env_pending_request);
+ env_pending_request = 0;
+ }
+
/* first we save global registers */
#define SAVE_HOST_REGS 1
#include "hostregs_helper.h"
Modified: trunk/src/host/qemu-neo1973/exec.c
===================================================================
--- trunk/src/host/qemu-neo1973/exec.c 2007-11-23 22:27:37 UTC (rev 3499)
+++ trunk/src/host/qemu-neo1973/exec.c 2007-11-23 22:31:57 UTC (rev 3500)
@@ -96,6 +96,7 @@
/* current CPU in the current thread. It is only valid inside
cpu_exec() */
CPUState *cpu_single_env;
+int env_pending_request;
typedef struct PageDesc {
/* list of TBs intersecting this ram page */
@@ -1194,6 +1195,12 @@
TranslationBlock *tb;
static int interrupt_lock;
+ /* cause an interrupt in the first cpu that tries to start running */
+ if (!env) {
+ env_pending_request |= mask;
+ return;
+ }
+
env->interrupt_request |= mask;
/* if the cpu is currently executing code, we must unlink it and
all the potentially executing TB */
Modified: trunk/src/host/qemu-neo1973/vl.c
===================================================================
--- trunk/src/host/qemu-neo1973/vl.c 2007-11-23 22:27:37 UTC (rev 3499)
+++ trunk/src/host/qemu-neo1973/vl.c 2007-11-23 22:31:57 UTC (rev 3500)
@@ -1184,15 +1184,14 @@
SetEvent(data->host_alarm);
#endif
CPUState *env = cpu_single_env;
- if (env) {
- /* stop the currently executing cpu because a timer occured */
- cpu_interrupt(env, CPU_INTERRUPT_EXIT);
+
+ /* stop the currently executing cpu because a timer occured */
+ cpu_interrupt(env, CPU_INTERRUPT_EXIT);
#ifdef USE_KQEMU
- if (env->kqemu_enabled) {
- kqemu_cpu_interrupt(env);
- }
-#endif
+ if (env && env->kqemu_enabled) {
+ kqemu_cpu_interrupt(env);
}
+#endif
}
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
