Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
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. r3894 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
2. r3895 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory: .
src ([EMAIL PROTECTED])
3. r3896 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
4. r3897 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
5. r3898 -
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory
([EMAIL PROTECTED])
6. r3899 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: .
src/phone-kit ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-01-21 12:29:18 +0100 (Mon, 21 Jan 2008)
New Revision: 3894
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-bt-fixes.patch
Log:
gta02-bt-fixes.patch: removed addition of pcf50633_ena_voltage, since it's
identical to pcf50633_onoff_set.
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-bt-fixes.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-bt-fixes.patch
2008-01-21 10:44:53 UTC (rev 3893)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-bt-fixes.patch
2008-01-21 11:29:18 UTC (rev 3894)
@@ -130,7 +130,7 @@
- s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1);
+ pcf50633_voltage_set(pcf50633_global,
+ PCF50633_REGULATOR_LDO4, 3200);
-+ pcf50633_ena_voltage(pcf50633_global,
++ pcf50633_onoff_set(pcf50633_global,
+ PCF50633_REGULATOR_LDO4, on);
+ vol = pcf50633_voltage_get(pcf50633_global,
+ PCF50633_REGULATOR_LDO4);
@@ -178,7 +178,7 @@
case MACH_TYPE_NEO1973_GTA02:
- /* FIXME: implementation */
+ /* we make sure that the voltage is off */
-+ pcf50633_ena_voltage(pcf50633_global,
++ pcf50633_onoff_set(pcf50633_global,
+ PCF50633_REGULATOR_LDO4, 0);
+ /* we pull reset to low to make sure that the chip doesn't
+ * drain power through the reset line */
@@ -193,74 +193,15 @@
return sysfs_create_group(&pdev->dev.kobj, >a01_bt_attr_group);
}
-Index: linux-2.6.24-rc7/drivers/i2c/chips/pcf50633.c
-===================================================================
---- linux-2.6.24-rc7.orig/drivers/i2c/chips/pcf50633.c
-+++ linux-2.6.24-rc7/drivers/i2c/chips/pcf50633.c
-@@ -319,6 +319,20 @@
- [PCF50633_REGULATOR_HCLDO] = PCF50633_REG_HCLDOOUT,
- };
-
-+static const u_int8_t ena_regulator_registers[__NUM_PCF50633_REGULATORS] = {
-+ [PCF50633_REGULATOR_AUTO] = PCF50633_REG_AUTOENA,
-+ [PCF50633_REGULATOR_DOWN1] = PCF50633_REG_DOWN1ENA,
-+ [PCF50633_REGULATOR_DOWN2] = PCF50633_REG_DOWN2ENA,
-+ [PCF50633_REGULATOR_MEMLDO] = PCF50633_REG_MEMLDOENA,
-+ [PCF50633_REGULATOR_LDO1] = PCF50633_REG_LDO1ENA,
-+ [PCF50633_REGULATOR_LDO2] = PCF50633_REG_LDO2ENA,
-+ [PCF50633_REGULATOR_LDO3] = PCF50633_REG_LDO3ENA,
-+ [PCF50633_REGULATOR_LDO4] = PCF50633_REG_LDO4ENA,
-+ [PCF50633_REGULATOR_LDO5] = PCF50633_REG_LDO5ENA,
-+ [PCF50633_REGULATOR_LDO6] = PCF50633_REG_LDO6ENA,
-+ [PCF50633_REGULATOR_HCLDO] = PCF50633_REG_HCLDOENA,
-+};
-+
- int pcf50633_onoff_set(struct pcf50633_data *pcf,
- enum pcf50633_regulator_id reg, int on)
- {
-@@ -401,6 +415,29 @@
- }
- EXPORT_SYMBOL_GPL(pcf50633_voltage_set);
-
-+int pcf50633_ena_voltage(struct pcf50633_data *pcf,
-+ enum pcf50633_regulator_id reg,
-+ u_int8_t on)
-+{
-+ u_int8_t regnr;
-+
-+ DEBUGP("pcf=%p, reg=%d", pcf, reg);
-+
-+ if(reg >= __NUM_PCF50633_REGULATORS)
-+ return -EINVAL;
-+
-+ regnr = ena_regulator_registers[reg];
-+ BUG_ON(!regnr); /* in case we forgot one */
-+
-+ if (on)
-+ reg_set_bit_mask(pcf, regnr, 0x01, 0x01);
-+ else
-+ reg_set_bit_mask(pcf, regnr, 0x01, 0x00);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_ena_voltage);
-+
- unsigned int pcf50633_voltage_get(struct pcf50633_data *pcf,
- enum pcf50633_regulator_id reg)
- {
Index: linux-2.6.24-rc7/include/linux/pcf50633.h
===================================================================
--- linux-2.6.24-rc7.orig/include/linux/pcf50633.h
+++ linux-2.6.24-rc7/include/linux/pcf50633.h
-@@ -47,6 +47,11 @@
+@@ -46,6 +46,7 @@
+ extern unsigned int
pcf50633_voltage_get(struct pcf50633_data *pcf,
enum pcf50633_regulator_id reg);
- extern int
-+pcf50633_ena_voltage(struct pcf50633_data *pcf,
-+ enum pcf50633_regulator_id reg,
-+ u_int8_t on);
+
-+extern int
+ extern int
pcf50633_onoff_get(struct pcf50633_data *pcf,
enum pcf50633_regulator_id reg);
-
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-21 13:26:09 +0100 (Mon, 21 Jan 2008)
New Revision: 3895
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c
Log:
* src/openmoko-panel-memory.c: (memory_full_cb):
Don't add multiple idles/try to remove non-existant ones
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog
2008-01-21 11:29:18 UTC (rev 3894)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/ChangeLog
2008-01-21 12:26:09 UTC (rev 3895)
@@ -1,3 +1,8 @@
+2008-01-21 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/openmoko-panel-memory.c: (memory_full_cb):
+ Don't add multiple idles/try to remove non-existant ones
+
2008-01-18 Chris Lord <[EMAIL PROTECTED]>
* AUTHORS:
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c
2008-01-21 11:29:18 UTC (rev 3894)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/src/openmoko-panel-memory.c
2008-01-21 12:26:09 UTC (rev 3895)
@@ -46,9 +46,11 @@
if (sim_full || phone_full) {
const gchar *message;
- gtk_widget_show (GTK_WIDGET (data->applet));
- data->blink_idle = g_timeout_add_seconds (1,
- (GSourceFunc)blink_idle, data);
+ if (!data->blink_idle) {
+ gtk_widget_show (GTK_WIDGET (data->applet));
+ data->blink_idle = g_timeout_add_seconds (1,
+ (GSourceFunc)blink_idle, data);
+ }
if (sim_full && phone_full) {
message = "Phone and SIM memory full";
@@ -62,7 +64,10 @@
notify_notification_show (data->notification, NULL);
} else {
- g_source_remove (data->blink_idle);
+ if (data->blink_idle) {
+ g_source_remove (data->blink_idle);
+ data->blink_idle = 0;
+ }
gtk_widget_hide (GTK_WIDGET (data->applet));
notify_notification_close (data->notification, NULL);
}
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-21 13:31:52 +0100 (Mon, 21 Jan 2008)
New Revision: 3896
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
Log:
* src/phone-kit/moko-sms.c: (moko_sms_set_property),
(moko_sms_dispose), (on_error), (sms_store_opened_cb),
(stop_handling_sms), (open_sms_store), (memory_check_idle),
(moko_sms_init):
Add monitoring of free memory on the root filesystem (hopefully)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-21 12:26:09 UTC (rev 3895)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-21 12:31:52 UTC (rev 3896)
@@ -1,3 +1,11 @@
+2008-01-21 Chris Lord <[EMAIL PROTECTED]>
+
+ * src/phone-kit/moko-sms.c: (moko_sms_set_property),
+ (moko_sms_dispose), (on_error), (sms_store_opened_cb),
+ (stop_handling_sms), (open_sms_store), (memory_check_idle),
+ (moko_sms_init):
+ Add monitoring of free memory on the root filesystem (hopefully)
+
2008-01-18 Chris Lord <[EMAIL PROTECTED]>
* src/phone-kit/moko-listener.c: (moko_listener_on_network_number):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-01-21 12:26:09 UTC (rev 3895)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-01-21 12:31:52 UTC (rev 3896)
@@ -19,6 +19,7 @@
*/
#include <string.h>
+#include <sys/vfs.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-bindings.h>
@@ -76,9 +77,14 @@
MokoNotify *notify;
gboolean sim_full;
+ gboolean memory_full;
+
+ guint memory_idle;
};
static void start_handling_sms (MokoSms *sms);
+static void stop_handling_sms (MokoSms *sms);
+static void open_sms_store (MokoSms *sms);
static void
moko_sms_get_property (GObject *object, guint property_id,
@@ -128,7 +134,7 @@
switch (property_id) {
case PROP_NETWORK :
if (priv->network) {
- moko_network_remove_listener (priv->network, MOKO_LISTENER (object));
+ stop_handling_sms (sms);
g_object_unref (priv->network);
}
priv->network = g_value_dup_object (value);
@@ -140,7 +146,7 @@
g_signal_connect (priv->network, "subscriber_number_changed",
G_CALLBACK (subscriber_number_changed_cb), object);*/
/* moko_network_add_listener happens in start_handling_sms */
- if (!priv->handling_sms) start_handling_sms (sms);
+ if ((!priv->sim_full) && (!priv->memory_full)) start_handling_sms (sms);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -156,8 +162,13 @@
sms = MOKO_SMS (object);
priv = sms->priv;
+ if (priv->memory_idle) {
+ g_source_remove (priv->memory_idle);
+ priv->memory_idle = 0;
+ }
+
while (g_source_remove_by_user_data (object)) moko_notify_stop
(priv->notify);
-
+
if (priv->sms_store) {
g_object_unref (priv->sms_store);
priv->sms_store = NULL;
@@ -427,7 +438,7 @@
if (cms == 322) {
priv->sim_full = TRUE;
- g_signal_emit (listener, signals[MEMORY_FULL], 0, TRUE, FALSE);
+ g_signal_emit (listener, signals[MEMORY_FULL], 0, TRUE, priv->memory_full);
}
}
@@ -578,6 +589,8 @@
MokoSmsPrivate *priv = self->priv;
priv->sms_store_open = TRUE;
+ g_debug ("Sms store opened");
+
/* Hook onto added/modified/removed signals for SMS notification */
view = jana_store_get_view (store);
g_signal_connect (view, "added", G_CALLBACK (note_added_cb), self);
@@ -591,6 +604,70 @@
}
static void
+stop_handling_sms (MokoSms *sms)
+{
+ MokoSmsPrivate *priv = sms->priv;
+
+ if (!priv->handling_sms) return;
+
+ g_debug ("Closing sms store");
+
+ moko_network_remove_listener (priv->network, MOKO_LISTENER (sms));
+
+ g_object_unref (priv->sms_store);
+ priv->sms_store = NULL;
+
+ priv->sms_store_open = FALSE;
+ priv->handling_sms = FALSE;
+
+ g_signal_emit (sms, signals[STATUS_CHANGED], 0, PK_SMS_NOTREADY);
+}
+
+static void
+open_sms_store (MokoSms *sms)
+{
+ MokoSmsPrivate *priv = sms->priv;
+
+ if (priv->sms_store) return;
+
+ g_debug ("Opening sms store");
+
+ /* Get the SMS note store */
+ priv->sms_store = jana_ecal_store_new (JANA_COMPONENT_NOTE);
+ g_signal_connect (priv->sms_store, "opened",
+ G_CALLBACK (sms_store_opened_cb), sms);
+ jana_store_open (priv->sms_store);
+}
+
+static gboolean
+memory_check_idle (MokoSms *sms)
+{
+ struct statfs buf;
+
+ MokoSmsPrivate *priv = sms->priv;
+
+ statfs ("/", &buf);
+
+ /* TODO: Is it reasonable to expect 4 megs/100 files free? */
+ if (((buf.f_bfree * buf.f_bsize) < (1024*1024*4)) ||
+ (buf.f_ffree < 100)) {
+ if (!priv->memory_full) {
+ priv->memory_full = TRUE;
+ g_signal_emit (sms, signals[MEMORY_FULL], 0, priv->sim_full, TRUE);
+ if (priv->sms_store) {
+ stop_handling_sms (sms);
+ }
+ }
+ } else if (priv->memory_full) {
+ priv->memory_full = FALSE;
+ g_signal_emit (sms, signals[MEMORY_FULL], 0, priv->sim_full, FALSE);
+ open_sms_store (sms);
+ }
+
+ return TRUE;
+}
+
+static void
moko_sms_init (MokoSms *sms)
{
MokoSmsPrivate *priv;
@@ -602,11 +679,11 @@
NULL);
priv->notify = moko_notify_get_default ();
- /* Get the SMS note store */
- priv->sms_store = jana_ecal_store_new (JANA_COMPONENT_NOTE);
- g_signal_connect (priv->sms_store, "opened",
- G_CALLBACK (sms_store_opened_cb), sms);
- jana_store_open (priv->sms_store);
+ memory_check_idle (sms);
+ if (!priv->memory_full) open_sms_store (sms);
+
+ priv->memory_idle = g_timeout_add_seconds (5, (GSourceFunc)
+ memory_check_idle, sms);
}
MokoSms*
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-21 15:01:42 +0100 (Mon, 21 Jan 2008)
New Revision: 3897
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
Added the GTA02v5 architecture, and cleaned up burgeoning lists of
defined(CONFIG_ARCH_GTA02_vx) by introducing macro CONFIG_GTA02_REVISION
containing the revision number.
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-01-21 12:31:52 UTC
(rev 3896)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-01-21 14:01:42 UTC
(rev 3897)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2329,6 +2329,13 @@
+@@ -2334,6 +2334,14 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -12,7 +12,8 @@
+gta02v1_config \
+gta02v2_config \
+gta02v3_config \
-+gta02v4_config: unconfig
++gta02v4_config \
++gta02v5_config: unconfig
+ @sh board/neo1973/gta02/split_by_variant.sh $@
+
gta01_config \
@@ -92,7 +93,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,457 @@
+@@ -0,0 +1,449 @@
+/*
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -177,7 +178,7 @@
+ * Miscellaneous platform dependent initialisations
+ */
+
-+int board_init (void)
++int board_init(void)
+{
+ S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
+ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
@@ -201,7 +202,7 @@
+ delay (8000);
+
+ /* set up the I/O ports */
-+#if defined(CONFIG_ARCH_GTA02_v1)
++#if CONFIG_GTA02_REVISION == 1
+ gpio->GPACON = 0x007E1FFF;
+ gpio->GPADAT |= (1 << 16); /* Set GPA16 to high (nNAND_WP) */
+
@@ -227,7 +228,7 @@
+ gpio->GPHUP = 0x000007FF;
+
+ gpio->GPJCON = 0x1545541;
-+#elif defined(CONFIG_ARCH_GTA02_v2)
++#elif CONFIG_GTA02_REVISION == 2
+ gpio->GPACON = 0x007E1FFF;
+ gpio->GPADAT |= (1 << 16); /* Set GPA16 to high (nNAND_WP) */
+
@@ -255,7 +256,7 @@
+ gpio->GPJCON = 0x1551544;
+ gpio->GPJUP = 0x1ffff;
+ gpio->GPJDAT |= (1 << 4); /* Set GPJ4 to high (nGSM_EN) */
-+#elif defined(CONFIG_ARCH_GTA02_v3) || defined(CONFIG_ARCH_GTA02_v4)
++#elif CONFIG_GTA02_REVISION >= 3
+ gpio->GPACON = 0x007E5FFF;
+ gpio->GPADAT |= (1 << 16); /* Set GPA16 to high (nNAND_WP) */
+
@@ -417,15 +418,7 @@
+
+u_int32_t get_board_rev(void)
+{
-+#if defined(CONFIG_ARCH_GTA02_v1)
-+ return 0x00000310;
-+#elif defined(CONFIG_ARCH_GTA02_v2)
-+ return 0x00000320;
-+#elif defined(CONFIG_ARCH_GTA02_v3)
-+ return 0x00000330;
-+#elif defined(CONFIG_ARCH_GTA02_v4)
-+ return 0x00000340;
-+#endif
++ return 0x300+0x10*CONFIG_GTA02_REVISION;
+}
+
+void neo1973_poweroff(void)
@@ -617,7 +610,7 @@
===================================================================
--- /dev/null
+++ u-boot/include/configs/neo1973_gta02.h
-@@ -0,0 +1,284 @@
+@@ -0,0 +1,282 @@
+/*
+ * (C) Copyright 2007 OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -743,19 +736,17 @@
+ * Miscellaneous configurable options
+ */
+#define CFG_LONGHELP /* undef to save memory
*/
++
++#define STRINGIFY(s) DO_STRINGIFY(s) /* expand the argument */
++#define DO_STRINGIFY(s) #s /* quote it */
++#define CFG_PROMPT "GTA02v"
STRINGIFY(CONFIG_GTA02_REVISION) " # "
++ /* Monitor Command Prompt */
+#if defined(CONFIG_ARCH_GTA02_v1)
-+#define CFG_PROMPT "GTA02v1 # " /* Monitor Command
Prompt */
+#define CONFIG_S3C2440 1 /* SAMSUNG S3C2440 SoC
*/
-+#elif defined(CONFIG_ARCH_GTA02_v2)
-+#define CFG_PROMPT "GTA02v2 # " /* Monitor Command
Prompt */
++#else
+#define CONFIG_S3C2442 1 /* SAMSUNG S3C2442 SoC
*/
-+#elif defined(CONFIG_ARCH_GTA02_v3)
-+#define CFG_PROMPT "GTA02v3 # " /* Monitor Command
Prompt */
-+#define CONFIG_S3C2442 1 /* SAMSUNG S3C2442 SoC
*/
-+#elif defined(CONFIG_ARCH_GTA02_v4)
-+#define CFG_PROMPT "GTA02v4 # " /* Monitor Command
Prompt */
-+#define CONFIG_S3C2442 1 /* SAMSUNG S3C2442 SoC
*/
+#endif
++
+#define CFG_CBSIZE 256 /* Console I/O Buffer
Size */
+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer
Size */
+#define CFG_MAXARGS 64 /* max number of
command args */
@@ -906,13 +897,13 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/split_by_variant.sh
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,65 @@
+#!/bin/sh
+# ---------------------------------------------------------
+# Set the core module defines according to Core Module
+# ---------------------------------------------------------
+# ---------------------------------------------------------
-+# Set up the GTA03 type define
++# Set up the GTA02 type define
+# ---------------------------------------------------------
+
+CFGINC=${obj}include/config.h
@@ -923,33 +914,45 @@
+then
+ echo "$0:: No parameters - using GTA02Bv1 config"
+ echo "#define CONFIG_ARCH_GTA02_v1" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 1" >> $CFGINC
+ echo "CONFIG_USB_DFU_REVISION=0x0310" > $CFGTMP
+else
+ case "$1" in
+ gta02v1_config)
+ echo "#define CONFIG_ARCH_GTA02_v1" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 1" >> $CFGINC
+ echo "CONFIG_USB_DFU_REVISION=0x0310" > $CFGTMP
+ ;;
+
+ gta02v2_config)
+ echo "#define CONFIG_ARCH_GTA02_v2" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 2" >> $CFGINC
+ echo "CONFIG_USB_DFU_REVISION=0x0320" > $CFGTMP
+ ;;
+
+ gta02v3_config)
+ echo "#define CONFIG_ARCH_GTA02_v3" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 3" >> $CFGINC
+ echo "CONFIG_USB_DFU_REVISION=0x0330" > $CFGTMP
+ ;;
+
+ gta02v4_config)
+ echo "#define CONFIG_ARCH_GTA02_v4" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 4" >> $CFGINC
+ echo "CONFIG_USB_DFU_REVISION=0x0340" > $CFGTMP
+ ;;
+
++ gta02v5_config)
++ echo "#define CONFIG_ARCH_GTA02_v5" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 5" >> $CFGINC
++ echo "CONFIG_USB_DFU_REVISION=0x0350" > $CFGTMP
++ ;;
+
++
+ *)
+ echo "$0:: Unrecognised config - using GTA02v3 config"
+ echo "#define CONFIG_ARCH_GTA02_v3" > $CFGINC
++ echo "#define CONFIG_GTA02_REVISION 3" >> $CFGINC
+ echo "CONFIG_USB_DFU_REVISION=0x0330" > $CFGTMP
+ ;;
+
@@ -1454,14 +1457,13 @@
#define B1_Tah 0x0 /* 0clk */
#define B1_Tacp 0x0
#define B1_PMC 0x0
-@@ -109,16 +109,19 @@
+@@ -109,16 +109,18 @@
#define B6_MT 0x3 /* SDRAM */
#define B6_Trcd 0x1 /* 3clk */
-#if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4)
+#if defined (CONFIG_ARCH_GTA01_v3) || defined(CONFIG_ARCH_GTA01_v4) || \
-+ defined(CONFIG_ARCH_GTA02_v2) || defined(CONFIG_ARCH_GTA02_v3) || \
-+ defined(CONFIG_ARCH_GTA02_v4)
++ CONFIG_GTA02_REVISION >= 2
#define B6_SCAN 0x1 /* 9bit */
+#define B7_SCAN 0x1 /* 9bit */
#elif defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
@@ -1477,7 +1479,7 @@
/* REFRESH parameter */
#define REFEN 0x1 /* Refresh enable */
-@@ -165,6 +168,28 @@
+@@ -165,6 +167,27 @@
str r1, [r0]
#endif
@@ -1491,8 +1493,7 @@
+ ldr r1, [r0, #0xd4] /* GPJDAT */
+ orr r1, r1, #(1 << 3)
+ str r1, [r0, #0xd4]
-+#elif defined(CONFIG_ARCH_GTA02_v2) || defined(CONFIG_ARCH_GTA02_v3) || \
-+ defined(CONFIG_ARCH_GTA02_v4)
++#elif CONFIG_GTA02_REVISION >= 2
+ /* enable KEEPACT(GPJ8) to make sure PMU keeps us alive */
+ ldr r0, =0x56000000 /* GPJ base */
+ ldr r1, [r0, #0xd0] /* GPJCON */
@@ -1506,12 +1507,11 @@
/* everything is fine now */
mov pc, lr
-@@ -182,6 +207,11 @@
+@@ -182,6 +205,10 @@
.word ((B6_MT<<15)+(B6_Trcd<<2)+(B6_SCAN))
.word ((B7_MT<<15)+(B7_Trcd<<2)+(B7_SCAN))
.word ((REFEN<<23)+(TREFMD<<22)+(Trp<<20)+(Trc<<18)+(Tchr<<16)+REFCNT)
-+#if defined(CONFIG_ARCH_GTA02_v2) || defined(CONFIG_ARCH_GTA02_v3) || \
-+ defined(CONFIG_ARCH_GTA02_v4)
++#if CONFIG_GTA02_REVISION >= 2
+ .word 0xb1
+#else
.word 0xb2
@@ -1934,23 +1934,21 @@
void udc_ctrl(enum usbd_event event, int param)
{
-@@ -11,7 +12,9 @@
+@@ -11,7 +12,8 @@
switch (event) {
case UDC_CTRL_PULLUP_ENABLE:
#if defined(CONFIG_ARCH_GTA01_v4) || defined(CONFIG_ARCH_GTA01B_v2) || \
- defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4)
+ defined(CONFIG_ARCH_GTA01B_v3) || defined(CONFIG_ARCH_GTA01B_v4) || \
-+ defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2) || \
-+ defined(CONFIG_ARCH_GTA02_v3) || defined(CONFIG_ARCH_GTA02_v4)
++ defined(CONFIG_GTA02_REVISION)
if (param)
gpio->GPBDAT |= (1 << 9);
else
-@@ -23,6 +26,12 @@
+@@ -23,6 +25,11 @@
defined(CONFIG_ARCH_GTA01B_v2) || defined(CONFIG_ARCH_GTA01B_v3) || \
defined(CONFIG_ARCH_GTA01B_v4)
pcf50606_charge_autofast(param);
-+#elif defined(CONFIG_ARCH_GTA02_v1) || defined(CONFIG_ARCH_GTA02_v2) || \
-+ defined(CONFIG_ARCH_GTA02_v3) || defined(CONFIG_ARCH_GTA02_v4)
++#elif defined(CONFIG_GTA02_REVISION)
+ if (param)
+ pcf50633_usb_maxcurrent(500);
+ else
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-21 15:08:44 +0100 (Mon, 21 Jan 2008)
New Revision: 3898
Added:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/Makefile.am
Log:
Add missing Makefile.am
Added:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/Makefile.am
2008-01-21 14:01:42 UTC (rev 3897)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-memory/Makefile.am
2008-01-21 14:08:44 UTC (rev 3898)
@@ -0,0 +1,2 @@
+SUBDIRS = src
+
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2008-01-21 15:54:59 +0100 (Mon, 21 Jan 2008)
New Revision: 3899
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
Log:
* src/phone-kit/moko-sms.c: (moko_sms_class_init):
Register custom marshaller for MemoryFull signal
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-21 14:08:44 UTC (rev 3898)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2008-01-21 14:54:59 UTC (rev 3899)
@@ -1,5 +1,10 @@
2008-01-21 Chris Lord <[EMAIL PROTECTED]>
+ * src/phone-kit/moko-sms.c: (moko_sms_class_init):
+ Register custom marshaller for MemoryFull signal
+
+2008-01-21 Chris Lord <[EMAIL PROTECTED]>
+
* src/phone-kit/moko-sms.c: (moko_sms_set_property),
(moko_sms_dispose), (on_error), (sms_store_opened_cb),
(stop_handling_sms), (open_sms_store), (memory_check_idle),
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-01-21 14:08:44 UTC (rev 3898)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-sms.c
2008-01-21 14:54:59 UTC (rev 3899)
@@ -248,7 +248,10 @@
G_TYPE_NONE,
2, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
- g_type_class_add_private (obj_class, sizeof (MokoSmsPrivate));
+ g_type_class_add_private (obj_class, sizeof (MokoSmsPrivate));
+ dbus_g_object_register_marshaller (_moko_sms_marshal_VOID__BOOLEAN_BOOLEAN,
+ G_TYPE_NONE, G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN, G_TYPE_INVALID);
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
&dbus_glib_moko_sms_object_info);
}
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
