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. r3180 - in
trunk/src/target/OM-2007.2/applications/openmoko-today2: . src
([EMAIL PROTECTED])
2. r3181 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
3. r3182 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r3183 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
5. r3184 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
6. r3185 - in
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm: .
src ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-10-15 18:44:45 +0200 (Mon, 15 Oct 2007)
New Revision: 3180
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
Log:
* src/today-main.c: (today_dial_button_clicked_cb): Don't use -s
argument for the dialer shortcut button
Modified: trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-10-15 16:44:08 UTC (rev 3179)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/ChangeLog
2007-10-15 16:44:45 UTC (rev 3180)
@@ -1,3 +1,8 @@
+2007-10-15 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/today-main.c: (today_dial_button_clicked_cb): Don't use -s
+ argument for the dialer shortcut button
+
2007-10-09 Chris Lord <[EMAIL PROTECTED]>
* src/today-task-manager.c: (today_task_manager_page_create):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
2007-10-15 16:44:08 UTC (rev 3179)
+++ trunk/src/target/OM-2007.2/applications/openmoko-today2/src/today-main.c
2007-10-15 16:44:45 UTC (rev 3180)
@@ -36,7 +36,7 @@
today_dial_button_clicked_cb (GtkToolButton *button, TodayData *data)
{
launcher_start (data->window, today_get_launcher ((const gchar *[])
- {"openmoko-dialer", "-s", NULL }, TRUE, TRUE));
+ {"openmoko-dialer", NULL }, TRUE, TRUE));
}
static void
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-15 18:44:47 +0200 (Mon, 15 Oct 2007)
New Revision: 3181
Added:
trunk/src/target/kernel/patches/gta02-leds.patch
Modified:
trunk/src/target/kernel/patches/gta02-core.patch
trunk/src/target/kernel/patches/series
Log:
Add GTA02 LED driver as well as required platform devices/resources
Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch 2007-10-15 16:44:45 UTC
(rev 3180)
+++ trunk/src/target/kernel/patches/gta02-core.patch 2007-10-15 16:44:47 UTC
(rev 3181)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,614 @@
+@@ -0,0 +1,636 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -440,16 +440,37 @@
+ .board_info = gta02_spi_board_info,
+};
+
-+static struct resource gta02_led_resources[] = {
++static struct resource gta01_led_resources[] = {
+ [0] = {
+ .start = GTA02_GPIO_VIBRATOR_ON,
+ .end = GTA02_GPIO_VIBRATOR_ON,
+ },
-+ /* FIXME */
+};
+
++static struct platform_device gta01_led_dev = {
++ .name = "gta01-led",
++ .num_resources = ARRAY_SIZE(gta01_led_resources),
++ .resource = gta01_led_resources,
++};
++
++static struct resource gta02_led_resources[] = {
++ {
++ .name = "gta02-power:color",
++ .start = GTA02_GPIO_PWR_LED,
++ .end = GTA02_GPIO_PWR_LED,
++ }, {
++ .name = "gta02-aux:foo",
++ .start = GTA02_GPIO_AUX_LED1,
++ .end = GTA02_GPIO_AUX_LED1,
++ }, {
++ .name = "gta02-aux:bar",
++ .start = GTA02_GPIO_AUX_LED2,
++ .end = GTA02_GPIO_AUX_LED2,
++ },
++};
++
+struct platform_device gta02_led_dev = {
-+ .name = "gta01-led",
++ .name = "gta02-led",
+ .num_resources = ARRAY_SIZE(gta02_led_resources),
+ .resource = gta02_led_resources,
+};
@@ -589,6 +610,7 @@
+
+ mangle_pmu_pdata_by_system_rev();
+ platform_device_register(>a02_pmu_dev);
++ platform_device_register(>a01_led_dev);
+ platform_device_register(>a02_led_dev);
+
+ mangle_glamo_res_by_system_rev();
@@ -621,7 +643,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta02.h
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,97 @@
+#ifndef _GTA02_H
+#define _GTA02_H
+
@@ -636,6 +658,9 @@
+
+#define GTA02_GPIO_n3DL_GSM S3C2410_GPA13 /* v1 + v2 + v3 only */
+
++#define GTA02_GPIO_AUX_LED1 S3C2410_GPB0
++#define GTA02_GPIO_AUX_LED2 S3C2410_GPB1
++#define GTA02_GPIO_PWR_LED S3C2410_GPB2
+#define GTA02_GPIO_VIBRATOR_ON S3C2410_GPB3
+#define GTA02v1_GPIO_GPS_PWRON S3C2410_GPB4 /* v1 only */
+#define GTA02_GPIO_MODEM_RST S3C2410_GPB5
@@ -980,7 +1005,7 @@
===================================================================
--- linux-2.6.22.5-moko.orig/drivers/leds/leds-gta01.c
+++ linux-2.6.22.5-moko/drivers/leds/leds-gta01.c
-@@ -107,7 +107,7 @@
+@@ -111,7 +110,7 @@
struct gta01_vib_priv *vp;
struct resource *r;
@@ -993,7 +1018,7 @@
===================================================================
--- linux-2.6.22.5-moko.orig/sound/soc/s3c24xx/neo1973_wm8753.c
+++ linux-2.6.22.5-moko/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -638,6 +638,12 @@
+@@ -670,6 +670,12 @@
{
int ret;
@@ -1006,7 +1031,7 @@
neo1973_snd_device = platform_device_alloc("soc-audio", -1);
if (!neo1973_snd_device)
return -ENOMEM;
-@@ -666,5 +672,5 @@
+@@ -698,5 +704,5 @@
/* Module information */
MODULE_AUTHOR("Graeme Gregory, [EMAIL PROTECTED], www.wolfsonmicro.com");
Added: trunk/src/target/kernel/patches/gta02-leds.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-leds.patch 2007-10-15 16:44:45 UTC
(rev 3180)
+++ trunk/src/target/kernel/patches/gta02-leds.patch 2007-10-15 16:44:47 UTC
(rev 3181)
@@ -0,0 +1,249 @@
+Index: linux-2.6.22.5-moko/drivers/leds/Kconfig
+===================================================================
+--- linux-2.6.22.5-moko.orig/drivers/leds/Kconfig
++++ linux-2.6.22.5-moko/drivers/leds/Kconfig
+@@ -101,6 +101,12 @@
+ help
+ This option enables support for the Vibrator on the FIC Neo1973.
+
++config LEDS_GTA02
++ tristate "LED Support for the FIC Neo1973 (GTA02)"
++ depends on LEDS_CLASS && MACH_NEO1973_GTA02
++ help
++ This option enables support for the LEDs on the FIC Neo1973.
++
+ comment "LED Triggers"
+
+ config LEDS_TRIGGERS
+Index: linux-2.6.22.5-moko/drivers/leds/Makefile
+===================================================================
+--- linux-2.6.22.5-moko.orig/drivers/leds/Makefile
++++ linux-2.6.22.5-moko/drivers/leds/Makefile
+@@ -17,6 +17,7 @@
+ obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
+ obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o
+ obj-$(CONFIG_LEDS_GTA01) += leds-gta01.o
++obj-$(CONFIG_LEDS_GTA02) += leds-gta02.o
+
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
+Index: linux-2.6.22.5-moko/drivers/leds/leds-gta02.c
+===================================================================
+--- /dev/null
++++ linux-2.6.22.5-moko/drivers/leds/leds-gta02.c
+@@ -0,0 +1,215 @@
++/*
++ * LED driver for the FIC GTA02 (Neo1973) GSM Phone
++ *
++ * (C) 2006-2007 by OpenMoko, Inc.
++ * Author: Harald Welte <[EMAIL PROTECTED]>
++ * All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/leds.h>
++#include <asm/hardware.h>
++#include <asm/mach-types.h>
++#include <asm/arch/pwm.h>
++#include <asm/arch/gta02.h>
++
++#define MAX_LEDS 3
++#define COUNTER 256
++
++struct gta02_led_priv
++{
++ struct mutex mutex;
++ struct led_classdev cdev;
++ struct s3c2410_pwm pwm;
++ unsigned int gpio;
++ unsigned int has_pwm;
++};
++
++struct gta02_led_bundle
++{
++ int num_leds;
++ struct gta02_led_priv led[MAX_LEDS];
++};
++
++static inline struct gta02_led_priv *to_priv(struct led_classdev *led_cdev)
++{
++ return container_of(led_cdev, struct gta02_led_priv, cdev);
++}
++
++static inline struct gta02_led_bundle *to_bundle(struct led_classdev
*led_cdev)
++{
++ return dev_get_drvdata(led_cdev->class_dev->dev);
++}
++
++static void gta02led_set(struct led_classdev *led_cdev,
++ enum led_brightness value)
++{
++ struct gta02_led_priv *lp = to_priv(led_cdev);
++
++ /*
++ * value == 255 -> 99% duty cycle (full power)
++ * value == 128 -> 50% duty cycle (medium power)
++ * value == 0 -> 0% duty cycle (zero power)
++ */
++ mutex_lock(&lp->mutex);
++ if (lp->has_pwm) {
++ s3c2410_pwm_duty_cycle(value, &lp->pwm);
++ } else {
++ if (value)
++ s3c2410_gpio_setpin(lp->gpio, 1);
++ else
++ s3c2410_gpio_setpin(lp->gpio, 0);
++ }
++ mutex_unlock(&lp->mutex);
++}
++
++#ifdef CONFIG_PM
++static int gta02led_suspend(struct platform_device *pdev, pm_message_t state)
++{
++ struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
++ int i;
++
++ for (i = 0; i < bundle->num_leds; i++)
++ led_classdev_suspend(&bundle->led[i].cdev);
++
++ return 0;
++}
++
++static int gta02led_resume(struct platform_device *pdev)
++{
++ struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
++ int i;
++
++ for (i = 0; i < bundle->num_leds; i++)
++ led_classdev_resume(&bundle->led[i].cdev);
++
++ return 0;
++}
++#endif
++
++static int __init gta02led_probe(struct platform_device *pdev)
++{
++ int i, rc;
++ struct gta02_led_bundle *bundle;
++
++ if (!machine_is_neo1973_gta02())
++ return -EIO;
++
++ bundle = kzalloc(sizeof(struct gta02_led_bundle), GFP_KERNEL);
++ if (!bundle)
++ return -ENOMEM;
++ platform_set_drvdata(pdev, bundle);
++
++ for (i = 0; i < pdev->num_resources; i++) {
++ struct gta02_led_priv *lp;
++ struct resource *r;
++
++ if (i >= MAX_LEDS)
++ break;
++
++ r = platform_get_resource(pdev, 0, i);
++ if (!r || !r->start || !r->name)
++ continue;
++
++ lp = &bundle->led[i];
++
++ lp->gpio = r->start;
++ lp->cdev.name = r->name;
++ lp->cdev.brightness_set = gta02led_set;
++
++ switch (lp->gpio) {
++ case S3C2410_GPB0:
++ lp->has_pwm = 1;
++ lp->pwm.timerid = PWM0;
++ s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB0_TOUT0);
++ break;
++ case S3C2410_GPB1:
++ lp->has_pwm = 1;
++ lp->pwm.timerid = PWM1;
++ s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB1_TOUT1);
++ break;
++ case S3C2410_GPB2:
++ lp->has_pwm = 1;
++ lp->pwm.timerid = PWM2;
++ s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB2_TOUT2);
++ break;
++ case S3C2410_GPB3:
++ lp->has_pwm = 1;
++ lp->pwm.timerid = PWM3;
++ s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB3_TOUT3);
++ break;
++ default:
++ break;
++ }
++
++ if (lp->has_pwm) {
++ lp->pwm.prescaler = 0;
++ lp->pwm.divider = S3C2410_TCFG1_MUX3_DIV8;
++ lp->pwm.counter = COUNTER;
++ lp->pwm.comparer = COUNTER;
++ s3c2410_pwm_enable(&lp->pwm);
++ s3c2410_pwm_start(&lp->pwm);
++ }
++
++ mutex_init(&lp->mutex);
++ rc = led_classdev_register(&pdev->dev, &lp->cdev);
++ }
++
++ return 0;
++}
++
++static int gta02led_remove(struct platform_device *pdev)
++{
++ struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
++ int i;
++
++ for (i = 0; i < bundle->num_leds; i++) {
++ struct gta02_led_priv *lp = &bundle->led[i];
++ if (lp->has_pwm)
++ s3c2410_pwm_disable(&lp->pwm);
++
++ led_classdev_unregister(&lp->cdev);
++ mutex_destroy(&lp->mutex);
++ }
++
++ platform_set_drvdata(pdev, NULL);
++ kfree(bundle);
++
++ return 0;
++}
++
++static struct platform_driver gta02led_driver = {
++ .probe = gta02led_probe,
++ .remove = gta02led_remove,
++#ifdef CONFIG_PM
++ .suspend = gta02led_suspend,
++ .resume = gta02led_resume,
++#endif
++ .driver = {
++ .name = "gta02-led",
++ },
++};
++
++static int __init gta02led_init(void)
++{
++ return platform_driver_register(>a02led_driver);
++}
++
++static void __exit gta02led_exit(void)
++{
++ platform_driver_unregister(>a02led_driver);
++}
++
++module_init(gta02led_init);
++module_exit(gta02led_exit);
++
++MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
++MODULE_DESCRIPTION("FIC GTA02 LED driver");
++MODULE_LICENSE("GPL");
Modified: trunk/src/target/kernel/patches/series
===================================================================
--- trunk/src/target/kernel/patches/series 2007-10-15 16:44:45 UTC (rev
3180)
+++ trunk/src/target/kernel/patches/series 2007-10-15 16:44:47 UTC (rev
3181)
@@ -48,3 +48,4 @@
s3c2442b-cpuid.patch
gta02-core.patch
lis302dl.patch
+gta02-leds.patch
--- End Message ---
--- Begin Message ---
Author: alphaone
Date: 2007-10-16 10:11:04 +0200 (Tue, 16 Oct 2007)
New Revision: 3182
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
Log:
* src/moko-sound.{c,h}: Add GSM speaker out sound profile
* src/moko-dialer.c: (on_talking_speaker_toggle):
* src/moko-talking.c: (on_speaker_toggled):
Speaker button now toggles the GSM speaker out profile
(requires recent alsa-state package)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-16 08:11:04 UTC (rev 3182)
@@ -1,3 +1,12 @@
+2007-10-16 Daniel Willmann <[EMAIL PROTECTED]>
+
+ * src/moko-sound.{c,h}: Add GSM speaker out sound profile
+
+ * src/moko-dialer.c:
(on_talking_speaker_toggle):
+ * src/moko-talking.c: (on_speaker_toggled):
+ Speaker button now toggles the GSM speaker out
profile
+ (requires recent alsa-state package)
+
2007-10-15 Thomas Wood <[EMAIL PROTECTED]>
Based on patch by: Roman Moravcik <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
2007-10-16 08:11:04 UTC (rev 3182)
@@ -37,6 +37,7 @@
#include "moko-keypad.h"
#include "moko-notify.h"
#include "moko-talking.h"
+#include "moko-sound.h"
G_DEFINE_TYPE (MokoDialer, moko_dialer, G_TYPE_OBJECT)
@@ -438,6 +439,15 @@
MokoDialer *dialer)
{
/* Toggle speaker phone */
+ static int on_speaker = FALSE;
+
+ if (on_speaker)
+ moko_sound_profile_set(SOUND_PROFILE_GSM_HANDSET);
+ else
+ moko_sound_profile_set(SOUND_PROFILE_GSM_SPEAKER_OUT);
+
+ on_speaker = !on_speaker;
+
g_debug ("Speaker toggled");
}
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.c
2007-10-16 08:11:04 UTC (rev 3182)
@@ -24,7 +24,8 @@
char *sound_profile_filenames[] = { "/etc/gsmhandset.state",
"/etc/gsmheadset.state",
- "/etc/stereoout.state" };
+ "/etc/gsmspeakerout.state",
+ "/etc/stereoout.state"};
void moko_sound_profile_set(int profile) {
char command[100];
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-sound.h
2007-10-16 08:11:04 UTC (rev 3182)
@@ -22,6 +22,7 @@
enum { SOUND_PROFILE_GSM_HANDSET,
SOUND_PROFILE_GSM_HEADSET,
+SOUND_PROFILE_GSM_SPEAKER_OUT,
SOUND_PROFILE_STEREO_OUT };
void moko_sound_profile_set(int profile);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-10-15 16:44:47 UTC (rev 3181)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-talking.c
2007-10-16 08:11:04 UTC (rev 3182)
@@ -286,8 +286,8 @@
static void
on_speaker_toggled (GtkToggleToolButton *toggle, MokoTalking *talking)
{
- /*g_signal_emit (G_OBJECT (talking), talking_signals[CANCEL_CALL],
- 0, gtk_toggle_tool_button_get_active (toggle));*/
+ g_signal_emit (G_OBJECT (talking), talking_signals[SPEAKER_TOGGLE],
+ 0, gtk_toggle_tool_button_get_active (toggle));
}
/* GObject functions */
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-16 10:35:32 +0200 (Tue, 16 Oct 2007)
New Revision: 3183
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
add gta02 charger state reading from u-boot
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-16 08:11:04 UTC
(rev 3182)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2007-10-16 08:35:32 UTC
(rev 3183)
@@ -4,7 +4,7 @@
===================================================================
--- u-boot.orig/Makefile
+++ u-boot/Makefile
-@@ -2180,6 +2180,13 @@
+@@ -2181,6 +2181,13 @@
sbc2410x_config: unconfig
@$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -91,7 +91,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/neo1973/gta02/gta02.c
-@@ -0,0 +1,431 @@
+@@ -0,0 +1,432 @@
+/*
+ * (C) 2006-2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -515,13 +515,14 @@
+const char *neo1973_get_charge_status(void)
+{
+ /* FIXME */
-+ return "unknown";
++ return pcf50633_charger_state(void);
+}
+
+int neo1973_set_charge_mode(enum neo1973_charger_cmd cmd)
+{
+ /* FIXME */
-+ return 0;
++ puts("not implemented yet\n");
++ return -1;
+}
Index: u-boot/board/neo1973/gta02/u-boot.lds
===================================================================
@@ -937,7 +938,7 @@
===================================================================
--- /dev/null
+++ u-boot/include/pcf50633.h
-@@ -0,0 +1,235 @@
+@@ -0,0 +1,237 @@
+#ifndef _PCF50633_H
+#define _PCF50633_H
+
@@ -1171,13 +1172,15 @@
+void pcf50633_init(void);
+void pcf50633_usb_maxcurrent(unsigned int ma);
+
++const char *pcf50633_charger_state(void);
++
+#endif /* _PCF50633_H */
+
Index: u-boot/drivers/pcf50633.c
===================================================================
--- /dev/null
+++ u-boot/drivers/pcf50633.c
-@@ -0,0 +1,192 @@
+@@ -0,0 +1,218 @@
+#include <common.h>
+
+#ifdef CONFIG_DRIVER_PCF50633
@@ -1319,6 +1322,32 @@
+ return pcf50633_reg_set_bit_mask(PCF50633_REG_MBCC7, 0x03, val);
+}
+
++static const char *charger_states = {
++ [0] = "play_only",
++ [1] = "usb_precharge",
++ [2] = "usb_precharge_wait",
++ [3] = "usb_fast_charge",
++ [4] = "usb_fast_charge_wait",
++ [5] = "usb_suspend",
++ [6] = "adapter_precharge",
++ [7] = "adapter_precharge_wait",
++ [8] = "adapter_fast_charge",
++ [9] = "adapter_fast_charge_wait",
++ [10] = "battery_full",
++ [11] = "halt",
++};
++
++const char *pcf50633_charger_state(void)
++{
++ u_int8_t val = pcf50633_reg_read(PCF50633_REG_MBCS2);
++
++ val &= 0x0f;
++ if (val > 11)
++ return "error";
++
++ return charger_states[val];
++}
++
+#if defined(CONFIG_RTC_PCF50633) && defined(CONFIG_CMD_DATE)
+
+#include <rtc.h>
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-16 10:38:08 +0200 (Tue, 16 Oct 2007)
New Revision: 3184
Modified:
trunk/src/target/u-boot/patches/neo1973-gsmver.patch
Log:
don't try to find double-quotes in GSM version, not all gsm firmware versions
have those
Modified: trunk/src/target/u-boot/patches/neo1973-gsmver.patch
===================================================================
--- trunk/src/target/u-boot/patches/neo1973-gsmver.patch 2007-10-16
08:35:32 UTC (rev 3183)
+++ trunk/src/target/u-boot/patches/neo1973-gsmver.patch 2007-10-16
08:38:08 UTC (rev 3184)
@@ -8,8 +8,8 @@
Index: u-boot/board/neo1973/common/cmd_neo1973.c
===================================================================
---- u-boot.orig/board/neo1973/common/cmd_neo1973.c 2007-09-05
00:27:05.000000000 +0800
-+++ u-boot/board/neo1973/common/cmd_neo1973.c 2007-09-05 00:45:45.000000000
+0800
+--- u-boot.orig/board/neo1973/common/cmd_neo1973.c
++++ u-boot/board/neo1973/common/cmd_neo1973.c
@@ -77,8 +77,10 @@
goto out_help;
if (!strcmp(argv[2], "on"))
@@ -33,9 +33,9 @@
);
Index: u-boot/board/neo1973/common/gsmver.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/common/gsmver.c 2007-09-05 00:49:46.000000000
+0800
-@@ -0,0 +1,83 @@
+--- /dev/null
++++ u-boot/board/neo1973/common/gsmver.c
+@@ -0,0 +1,80 @@
+/*
+ * (C) Copyright 2007 OpenMoko, Inc.
+ * Written by Jim Huang <[EMAIL PROTECTED]>
@@ -95,18 +95,15 @@
+ puts("GSM firmware version: ");
+
+ /* read from serial and display version information */
-+ while (string_end_count < 2) {
++ while (1) {
+ if (dev->tstc()) {
+ i = dev->getc();
++ putc(i);
+ /* FIXME: should we just dump straightforward
+ * version string such as "moko1" or "moko4"?
+ */
-+ if (i == '"') {
-+ string_end_count++;
++ if (i == '\n' || i == '\r')
+ continue;
-+ }
-+ if (string_end_count)
-+ putc(i);
+ }
+ }
+ putc('\n');
@@ -121,8 +118,8 @@
+}
Index: u-boot/board/neo1973/gta01/Makefile
===================================================================
---- u-boot.orig/board/neo1973/gta01/Makefile 2007-09-05 00:42:18.000000000
+0800
-+++ u-boot/board/neo1973/gta01/Makefile 2007-09-05 00:42:34.000000000
+0800
+--- u-boot.orig/board/neo1973/gta01/Makefile
++++ u-boot/board/neo1973/gta01/Makefile
@@ -25,7 +25,7 @@
LIB = lib$(BOARD).a
@@ -134,8 +131,8 @@
.PHONY: all
Index: u-boot/board/neo1973/gta02/Makefile
===================================================================
---- u-boot.orig/board/neo1973/gta02/Makefile 2007-09-05 00:42:37.000000000
+0800
-+++ u-boot/board/neo1973/gta02/Makefile 2007-09-05 00:42:44.000000000
+0800
+--- u-boot.orig/board/neo1973/gta02/Makefile
++++ u-boot/board/neo1973/gta02/Makefile
@@ -25,7 +25,7 @@
LIB = lib$(BOARD).a
--- End Message ---
--- Begin Message ---
Author: alphaone
Date: 2007-10-16 10:38:21 +0200 (Tue, 16 Oct 2007)
New Revision: 3185
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
Log:
* src/openmoko-panel-gsm.c: (gsm_applet_network_registration_cb):
Only show the "Connected to network" notification if the phone was not
previously connected to the network
Modified: trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
2007-10-16 08:38:08 UTC (rev 3184)
+++ trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/ChangeLog
2007-10-16 08:38:21 UTC (rev 3185)
@@ -1,3 +1,9 @@
+2007-10-16 Daniel Willmann <[EMAIL PROTECTED]>
+
+ * src/openmoko-panel-gsm.c: (gsm_applet_network_registration_cb):
+ Only show the "Connected to network" notification if the phone was not
+ previously connected to the network
+
2007-10-02 Thomas Wood <[EMAIL PROTECTED]>
* configure.ac:
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-10-16 08:38:08 UTC (rev 3184)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-10-16 08:38:21 UTC (rev 3185)
@@ -82,9 +82,15 @@
int cell)
{
NotifyNotification* nn;
+ static MokoGsmdConnectionNetregType prev_type =
MOKO_GSMD_CONNECTION_NETREG_NONE;
- nn = notify_notification_new ("Connected to Network", NULL, NULL, NULL);
- notify_notification_show (nn, NULL);
+ if ((type == MOKO_GSMD_CONNECTION_NETREG_HOME) || (type ==
MOKO_GSMD_CONNECTION_NETREG_ROAMING) &&
+ ((prev_type != MOKO_GSMD_CONNECTION_NETREG_HOME)&&(prev_type !=
MOKO_GSMD_CONNECTION_NETREG_ROAMING)))
+ {
+ nn = notify_notification_new ("Connected to Network", NULL, NULL, NULL);
+ notify_notification_show (nn, NULL);
+ }
+ prev_type = type;
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
