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. r3930 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
2. r3931 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r3932 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
4. r3933 - trunk/src/target/opkg ([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-01-23 01:43:54 +0100 (Wed, 23 Jan 2008)
New Revision: 3930
Modified:
branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
Log:
Whenever our ar6k chip can not be identified, we are trying to unregister
our netdevice although it was never registered.
This patch fixes this bug.
Signed-off-by: Samuel Ortiz <[EMAIL PROTECTED]>
Modified: branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
2008-01-23 00:36:48 UTC (rev 3929)
+++ branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
2008-01-23 00:43:54 UTC (rev 3930)
@@ -79,7 +79,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -0,0 +1,3069 @@
+@@ -0,0 +1,3070 @@
+/*
+ *
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -291,7 +291,7 @@
+static void ar6000_init_control_info(AR_SOFTC_T *ar);
+static int ar6000_data_tx(struct sk_buff *skb, struct net_device *dev);
+
-+static void ar6000_destroy(struct net_device *dev);
++static void ar6000_destroy(struct net_device *dev, unsigned int unregister);
+static void ar6000_detect_error(unsigned long ptr);
+static struct net_device_stats *ar6000_get_stats(struct net_device *dev);
+static struct iw_statistics *ar6000_get_iwstats(struct net_device * dev);
@@ -641,7 +641,7 @@
+ if (ar6000_devices[i] != NULL) {
+ ar6000_netdev = ar6000_devices[i];
+ ar6000_devices[i] = NULL;
-+ ar6000_destroy(ar6000_netdev);
++ ar6000_destroy(ar6000_netdev, 1);
+ }
+ }
+
@@ -924,7 +924,7 @@
+ /* This runs the init function */
+ if (register_netdev(dev)) {
+ AR_DEBUG_PRINTF("ar6000_avail: register_netdev failed\n");
-+ ar6000_destroy(dev);
++ ar6000_destroy(dev, 0);
+ return;
+ }
+
@@ -978,7 +978,7 @@
+ AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
+ /* NULL out it's entry in the global list */
+ ar6000_devices[ar->arDeviceIndex] = NULL;
-+ ar6000_destroy(ar->arNetDev);
++ ar6000_destroy(ar->arNetDev, 1);
+}
+
+/*
@@ -996,7 +996,7 @@
+ * removal since they will anyway not go through.
+ */
+static void
-+ar6000_destroy(struct net_device *dev)
++ar6000_destroy(struct net_device *dev, unsigned int unregister)
+{
+ AR_SOFTC_T *ar;
+
@@ -1086,7 +1086,8 @@
+
+
+ /* Free up the device data structure */
-+ unregister_netdev(dev);
++ if (unregister)
++ unregister_netdev(dev);
+#ifndef free_netdev
+ kfree(dev);
+#else
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-23 01:55:40 +0100 (Wed, 23 Jan 2008)
New Revision: 3931
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
Log:
We have to be more careful about pending SDIO interrupts from the host
side. This patch fixes the iperf bug Nod has been reporting.
Signed-off-by: Samuel Ortiz <[EMAIL PROTECTED]>
[ And does some general housekeeping as well. - Werner ]
gta01-vibrator.patch: global renaming of "gta01" to "neo1973", except for
asm/arch/gta01.h and machine_is_neo1973_gta01
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
2008-01-23 00:43:54 UTC (rev 3930)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
2008-01-23 00:55:40 UTC (rev 3931)
@@ -4,10 +4,10 @@
Signed-off-by: Harald Welte <[EMAIL PROTECTED]>
-Index: linux-2.6.24-rc7/drivers/leds/Kconfig
+Index: linux-2.6.24-rc8/drivers/leds/Kconfig
===================================================================
---- linux-2.6.24-rc7.orig/drivers/leds/Kconfig
-+++ linux-2.6.24-rc7/drivers/leds/Kconfig
+--- linux-2.6.24-rc8.orig/drivers/leds/Kconfig
++++ linux-2.6.24-rc8/drivers/leds/Kconfig
@@ -57,7 +57,7 @@
config LEDS_S3C24XX
@@ -30,10 +30,10 @@
comment "LED Triggers"
config LEDS_TRIGGERS
-Index: linux-2.6.24-rc7/drivers/leds/Makefile
+Index: linux-2.6.24-rc8/drivers/leds/Makefile
===================================================================
---- linux-2.6.24-rc7.orig/drivers/leds/Makefile
-+++ linux-2.6.24-rc7/drivers/leds/Makefile
+--- linux-2.6.24-rc8.orig/drivers/leds/Makefile
++++ linux-2.6.24-rc8/drivers/leds/Makefile
@@ -19,6 +19,7 @@
obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
@@ -42,10 +42,10 @@
# LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
-Index: linux-2.6.24-rc7/drivers/leds/leds-neo1973-vibrator.c
+Index: linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/leds/leds-neo1973-vibrator.c
++++ linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
@@ -0,0 +1,180 @@
+/*
+ * LED driver for the vibrator of the FIC Neo1973 GSM Phone
@@ -74,7 +74,7 @@
+
+#define COUNTER 64
+
-+struct gta01_vib_priv {
++struct neo1973_vib_priv {
+ struct led_classdev cdev;
+ unsigned int gpio;
+ struct mutex mutex;
@@ -82,11 +82,11 @@
+ struct s3c2410_pwm pwm;
+};
+
-+static void gta01vib_vib_set(struct led_classdev *led_cdev,
++static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
+ enum led_brightness value)
+{
-+ struct gta01_vib_priv *vp =
-+ container_of(led_cdev, struct gta01_vib_priv, cdev);
++ struct neo1973_vib_priv *vp =
++ container_of(led_cdev, struct neo1973_vib_priv, cdev);
+
+ /*
+ * value == 255 -> 99% duty cycle (full power)
@@ -106,14 +106,14 @@
+ mutex_unlock(&vp->mutex);
+}
+
-+static struct gta01_vib_priv gta01_vib_led = {
++static struct neo1973_vib_priv neo1973_vib_led = {
+ .cdev = {
+ .name = "neo1973:vibrator",
-+ .brightness_set = gta01vib_vib_set,
++ .brightness_set = neo1973_vib_vib_set,
+ },
+};
+
-+static int gta01vib_init_hw(struct gta01_vib_priv *vp)
++static int neo1973_vib_init_hw(struct neo1973_vib_priv *vp)
+{
+ int rc;
+
@@ -138,26 +138,26 @@
+}
+
+#ifdef CONFIG_PM
-+static int gta01vib_suspend(struct platform_device *dev, pm_message_t state)
++static int neo1973_vib_suspend(struct platform_device *dev, pm_message_t
state)
+{
-+ led_classdev_suspend(>a01_vib_led.cdev);
++ led_classdev_suspend(&neo1973_vib_led.cdev);
+ return 0;
+}
+
-+static int gta01vib_resume(struct platform_device *dev)
++static int neo1973_vib_resume(struct platform_device *dev)
+{
-+ struct gta01_vib_priv *vp = platform_get_drvdata(dev);
++ struct neo1973_vib_priv *vp = platform_get_drvdata(dev);
+
-+ led_classdev_resume(>a01_vib_led.cdev);
++ led_classdev_resume(&neo1973_vib_led.cdev);
+
+ if (vp->has_pwm)
-+ gta01vib_init_hw(vp);
++ neo1973_vib_init_hw(vp);
+
+ return 0;
+}
+#endif /* CONFIG_PM */
+
-+static int __init gta01vib_probe(struct platform_device *pdev)
++static int __init neo1973_vib_probe(struct platform_device *pdev)
+{
+ struct resource *r;
+ int rc;
@@ -169,60 +169,60 @@
+ if (!r || !r->start)
+ return -EIO;
+
-+ gta01_vib_led.gpio = r->start;
++ neo1973_vib_led.gpio = r->start;
+
+ /* TOUT3 */
-+ if (gta01_vib_led.gpio == S3C2410_GPB3) {
-+ rc = gta01vib_init_hw(>a01_vib_led);
++ if (neo1973_vib_led.gpio == S3C2410_GPB3) {
++ rc = neo1973_vib_init_hw(&neo1973_vib_led);
+ if (rc)
+ return rc;
+
-+ s3c2410_pwm_duty_cycle(0, >a01_vib_led.pwm);
-+ s3c2410_gpio_cfgpin(gta01_vib_led.gpio, S3C2410_GPB3_TOUT3);
-+ gta01_vib_led.has_pwm = 1;
++ s3c2410_pwm_duty_cycle(0, &neo1973_vib_led.pwm);
++ s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPB3_TOUT3);
++ neo1973_vib_led.has_pwm = 1;
+ }
+
-+ mutex_init(>a01_vib_led.mutex);
++ mutex_init(&neo1973_vib_led.mutex);
+
-+ return led_classdev_register(&pdev->dev, >a01_vib_led.cdev);
++ return led_classdev_register(&pdev->dev, &neo1973_vib_led.cdev);
+}
+
-+static int gta01vib_remove(struct platform_device *pdev)
++static int neo1973_vib_remove(struct platform_device *pdev)
+{
-+ if (gta01_vib_led.has_pwm)
-+ s3c2410_pwm_disable(>a01_vib_led.pwm);
++ if (neo1973_vib_led.has_pwm)
++ s3c2410_pwm_disable(&neo1973_vib_led.pwm);
+
-+ led_classdev_unregister(>a01_vib_led.cdev);
++ led_classdev_unregister(&neo1973_vib_led.cdev);
+
-+ mutex_destroy(>a01_vib_led.mutex);
++ mutex_destroy(&neo1973_vib_led.mutex);
+
+ return 0;
+}
+
-+static struct platform_driver gta01vib_driver = {
-+ .probe = gta01vib_probe,
-+ .remove = gta01vib_remove,
++static struct platform_driver neo1973_vib_driver = {
++ .probe = neo1973_vib_probe,
++ .remove = neo1973_vib_remove,
+#ifdef CONFIG_PM
-+ .suspend = gta01vib_suspend,
-+ .resume = gta01vib_resume,
++ .suspend = neo1973_vib_suspend,
++ .resume = neo1973_vib_resume,
+#endif
+ .driver = {
+ .name = "neo1973-vibrator",
+ },
+};
+
-+static int __init gta01vib_init(void)
++static int __init neo1973_vib_init(void)
+{
-+ return platform_driver_register(>a01vib_driver);
++ return platform_driver_register(&neo1973_vib_driver);
+}
+
-+static void __exit gta01vib_exit(void)
++static void __exit neo1973_vib_exit(void)
+{
-+ platform_driver_unregister(>a01vib_driver);
++ platform_driver_unregister(&neo1973_vib_driver);
+}
+
-+module_init(gta01vib_init);
-+module_exit(gta01vib_exit);
++module_init(neo1973_vib_init);
++module_exit(neo1973_vib_exit);
+
+MODULE_AUTHOR("Harald Welte <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("FIC Neo1973 vibrator driver");
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-01-23 02:02:50 +0100 (Wed, 23 Jan 2008)
New Revision: 3932
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
Log:
vib-trashes-resume-fix.patch:
The resume stuff for vibrator was broken --> OOPS... I guess it was never
tested on GTA02 yet considering it did not have an active device associated
with the driver until today. Fixed.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
gta01-vibrator.patch:
- drivers/leds/leds-neo1973-vibrator.c (neo1973_vib_resume): resume after
setting up the hardware, not before
- drivers/leds/leds-neo1973-vibrator.c (neo1973_vib_probe): don't forget to
initialize platform data
Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
2008-01-23 00:55:40 UTC (rev 3931)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
2008-01-23 01:02:50 UTC (rev 3932)
@@ -46,7 +46,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.24-rc8/drivers/leds/leds-neo1973-vibrator.c
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,181 @@
+/*
+ * LED driver for the vibrator of the FIC Neo1973 GSM Phone
+ *
@@ -148,11 +148,11 @@
+{
+ struct neo1973_vib_priv *vp = platform_get_drvdata(dev);
+
-+ led_classdev_resume(&neo1973_vib_led.cdev);
-+
+ if (vp->has_pwm)
+ neo1973_vib_init_hw(vp);
+
++ led_classdev_resume(&neo1973_vib_led.cdev);
++
+ return 0;
+}
+#endif /* CONFIG_PM */
@@ -170,6 +170,7 @@
+ return -EIO;
+
+ neo1973_vib_led.gpio = r->start;
++ platform_set_drvdata(pdev, &neo1973_vib_led);
+
+ /* TOUT3 */
+ if (neo1973_vib_led.gpio == S3C2410_GPB3) {
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-01-23 11:49:18 +0100 (Wed, 23 Jan 2008)
New Revision: 3933
Modified:
trunk/src/target/opkg/opkg_download.c
trunk/src/target/opkg/pkg.c
trunk/src/target/opkg/pkg.h
Log:
opkg: fix some compiler warnings
Modified: trunk/src/target/opkg/opkg_download.c
===================================================================
--- trunk/src/target/opkg/opkg_download.c 2008-01-23 01:02:50 UTC (rev
3932)
+++ trunk/src/target/opkg/opkg_download.c 2008-01-23 10:49:18 UTC (rev
3933)
@@ -79,7 +79,6 @@
char *src_basec = strdup(src);
char *src_base = basename(src_basec);
char *tmp_file_location;
- char *cmd;
opkg_message(conf,OPKG_NOTICE,"Downloading %s\n", src);
@@ -245,7 +244,7 @@
if (err)
return err;
pkg->local_filename = strdup(url);
- opkg_message(conf, OPKG_DEBUG2, "Package %s provided by hand
\(%s\).\n", pkg->name,pkg->local_filename);
+ opkg_message(conf, OPKG_DEBUG2, "Package %s provided by hand
(%s).\n", pkg->name,pkg->local_filename);
pkg->provided_by_hand = 1;
} else {
Modified: trunk/src/target/opkg/pkg.c
===================================================================
--- trunk/src/target/opkg/pkg.c 2008-01-23 01:02:50 UTC (rev 3932)
+++ trunk/src/target/opkg/pkg.c 2008-01-23 10:49:18 UTC (rev 3933)
@@ -1529,7 +1529,7 @@
}
}
-pkg_state_flag_t pkg_state_flag_from_str(char *str)
+pkg_state_flag_t pkg_state_flag_from_str(const char *str)
{
int i;
int sf = SF_OK;
@@ -1569,7 +1569,7 @@
return strdup("<STATE_STATUS_UNKNOWN>");
}
-pkg_state_status_t pkg_state_status_from_str(char *str)
+pkg_state_status_t pkg_state_status_from_str(const char *str)
{
int i;
Modified: trunk/src/target/opkg/pkg.h
===================================================================
--- trunk/src/target/opkg/pkg.h 2008-01-23 01:02:50 UTC (rev 3932)
+++ trunk/src/target/opkg/pkg.h 2008-01-23 10:49:18 UTC (rev 3933)
@@ -216,9 +216,9 @@
char *pkg_state_want_to_str(pkg_state_want_t sw);
pkg_state_want_t pkg_state_want_from_str(char *str);
char *pkg_state_flag_to_str(pkg_state_flag_t sf);
-pkg_state_flag_t pkg_state_flag_from_str(char *str);
+pkg_state_flag_t pkg_state_flag_from_str(const char *str);
char *pkg_state_status_to_str(pkg_state_status_t ss);
-pkg_state_status_t pkg_state_status_from_str(char *str);
+pkg_state_status_t pkg_state_status_from_str(const char *str);
int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
