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. r2108 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
2. r2109 - in
trunk/src/target/OM-2007/applications/openmoko-today: . src
([EMAIL PROTECTED])
3. r2110 - in
trunk/src/target/OM-2007/applications/openmoko-today: . src
([EMAIL PROTECTED])
4. r2111 - trunk/src/target/u-boot/patches
([EMAIL PROTECTED])
5. r2112 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
6. r2113 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: laforge
Date: 2007-05-31 12:39:10 +0200 (Thu, 31 May 2007)
New Revision: 2108
Modified:
trunk/src/target/kernel/patches/gta01-pcf50606.patch
trunk/src/target/kernel/patches/hxd8-core.patch
Log:
* pcf50606: add initial backlight brightness to platform_data
* hxd8: set initial pcf50606 backlight brightness (Matt Hsu)
Modified: trunk/src/target/kernel/patches/gta01-pcf50606.patch
===================================================================
--- trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-05-30
22:27:16 UTC (rev 2107)
+++ trunk/src/target/kernel/patches/gta01-pcf50606.patch 2007-05-31
10:39:10 UTC (rev 2108)
@@ -4,7 +4,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/drivers/i2c/chips/pcf50606.c
-@@ -0,0 +1,1928 @@
+@@ -0,0 +1,1929 @@
+/* Philips PCF50606 Power Management Unit (PMU) driver
+ *
+ * (C) 2006 by OpenMoko, Inc.
@@ -1691,7 +1691,8 @@
+ /* FIXME: are we sure we want default == off? */
+ data->backlight->props.max_brightness = 16;
+ data->backlight->props.power = FB_BLANK_UNBLANK;
-+ data->backlight->props.brightness = 0;
++ data->backlight->props.brightness =
++ data->pdata->init_brightness;
+ backlight_update_status(data->backlight);
+ }
+
@@ -2290,7 +2291,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/include/linux/pcf50606.h
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,104 @@
+#ifndef _LINUX_PCF50606_H
+#define _LINUX_PCF50606_H
+
@@ -2385,6 +2386,9 @@
+ unsigned int r_fix_batt_par;
+ unsigned int r_sense_milli;
+
++ /* backlight related */
++ unsigned int init_brightness;
++
+ struct {
+ u_int8_t mbcc3; /* charger voltage / current */
+ } charger;
Modified: trunk/src/target/kernel/patches/hxd8-core.patch
===================================================================
--- trunk/src/target/kernel/patches/hxd8-core.patch 2007-05-30 22:27:16 UTC
(rev 2107)
+++ trunk/src/target/kernel/patches/hxd8-core.patch 2007-05-31 10:39:10 UTC
(rev 2108)
@@ -29,7 +29,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.21-moko/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,402 @@
+@@ -0,0 +1,403 @@
+/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
+ *
+ * S3C2440 Machine Support for the FIC HXD8
@@ -199,6 +199,7 @@
+ PCF50606_FEAT_PWM_BL |
+ PCF50606_FEAT_BATVOLT,
+ .onkey_seconds_required = 5,
++ .init_brightness = 8,
+ .rails = {
+ [PCF50606_REGULATOR_D1REG] = {
+ .name = "rc_3v3",
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-31 15:44:17 +0200 (Thu, 31 May 2007)
New Revision: 2109
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
Log:
* configure.ac:
* src/today-main.c: (today_infoline_new): Add startup-notification support
Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-05-31 10:39:10 UTC (rev 2108)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-05-31 13:44:17 UTC (rev 2109)
@@ -1,3 +1,8 @@
+2007-05-31 Thomas Wood <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * src/today-main.c: (today_infoline_new): Add startup-notification
support
+
2007-05-30 Thomas Wood <[EMAIL PROTECTED]>
* src/today-main.c: (today_infoline_new),
Modified: trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
2007-05-31 10:39:10 UTC (rev 2108)
+++ trunk/src/target/OM-2007/applications/openmoko-today/configure.ac
2007-05-31 13:44:17 UTC (rev 2109)
@@ -22,6 +22,7 @@
PKG_CHECK_MODULES(TODAY,
openmoko-libs
+ libstartup-notification-1.0
libebook-1.2 >= $LIBEBOOK_VERSION
libecal-1.2 >= $LIBEBOOK_VERSION)
Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
2007-05-31 10:39:10 UTC (rev 2108)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
2007-05-31 13:44:17 UTC (rev 2109)
@@ -24,10 +24,14 @@
#include <string.h>
#include <glib.h>
-#include <glib/gprintf.h>
#include <gtk/gtk.h>
-#include <libmokoui/moko-window.h>
-#include <libmokoui/moko-pixmap-button.h>
+#include <unistd.h>
+#include <libmokoui/moko-ui.h>
+
+#define SN_API_NOT_YET_FROZEN 1
+#include <libsn/sn-launcher.h>
+#include <gdk/gdkx.h>
+
#include "today-events-area.h"
#include "today-utils.h"
#include "xutil.h"
@@ -131,20 +135,42 @@
/**
* callback for luncher buttons
*/
+
void
-today_launcher_clicked_cb (GtkWidget *button, gchar *command)
+today_launcher_clicked_cb (GtkWidget *widget, gchar *command)
{
- GError *error = NULL;
+ /* The following code is a modified version of code from launcher-util.c in
+ * matchbox-desktop-2 and is copyright (C) 2007 OpenedHand Ltd, made
available
+ * under the GNU General Public License.
+ */
+ pid_t child_pid = 0;
+ SnLauncherContext *context;
+ SnDisplay *sn_dpy;
+ Display *display;
+ int screen;
- g_spawn_command_line_async (command, &error);
+ display = gdk_x11_display_get_xdisplay (gtk_widget_get_display (widget));
+ sn_dpy = sn_display_new (display, NULL, NULL);
- if (error)
- {
- LOG_ERROR;
- g_error_free (error);
+ screen = gdk_screen_get_number (gtk_widget_get_screen (widget));
+ context = sn_launcher_context_new (sn_dpy, screen);
+ sn_display_unref (sn_dpy);
+
+ /* sn_launcher_context_set_name (context, data->name); */
+ sn_launcher_context_set_binary_name (context, command);
+ sn_launcher_context_initiate (context, "openmoko-today", command,
CurrentTime);
+ switch ((child_pid = fork ())) {
+ case -1:
+ g_warning ("Fork failed");
+ break;
+ case 0:
+ sn_launcher_context_setup_child_process (context);
+ execlp (command, NULL);
+ g_warning ("Failed to execlp() %s", command);
+ _exit (1);
+ break;
}
-
- /* TODO: should we hide or quit after launching an application? */
+ sn_launcher_context_unref (context);
}
/**
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-05-31 16:25:31 +0200 (Thu, 31 May 2007)
New Revision: 2110
Modified:
trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
Log:
* src/today-main.c: (today_update_date), (today_infoline_new),
(today_launcher_button_new): Run appropriate program when an infoline is
clicked
Modified: trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-05-31 13:44:17 UTC (rev 2109)
+++ trunk/src/target/OM-2007/applications/openmoko-today/ChangeLog
2007-05-31 14:25:31 UTC (rev 2110)
@@ -1,5 +1,11 @@
2007-05-31 Thomas Wood <[EMAIL PROTECTED]>
+ * src/today-main.c: (today_update_date), (today_infoline_new),
+ (today_launcher_button_new): Run appropriate program when an infoline is
+ clicked
+
+2007-05-31 Thomas Wood <[EMAIL PROTECTED]>
+
* configure.ac:
* src/today-main.c: (today_infoline_new): Add startup-notification
support
Modified: trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
2007-05-31 13:44:17 UTC (rev 2109)
+++ trunk/src/target/OM-2007/applications/openmoko-today/src/today-main.c
2007-05-31 14:25:31 UTC (rev 2110)
@@ -42,6 +42,11 @@
#define FREE_ERROR g_error_free (error) ; error = NULL ;
+
+/*** functions ***/
+static void today_launcher_clicked_cb (GtkWidget *widget, gchar *command);
+
+
/*** configuration options ***/
/* default to false, although this might want to be reversed in the future */
static gboolean enable_desktop = FALSE;
@@ -82,6 +87,12 @@
/* information lines */
+static void
+today_infoline_clicked_cb (GtkWidget *widget, GdkEventButton *button, gchar
*data)
+{
+ today_launcher_clicked_cb (widget, data);
+}
+
/**
* today_infoline_new:
* @stock_id: name of the stock icon to use
@@ -103,6 +114,10 @@
gtk_event_box_set_visible_window (GTK_EVENT_BOX (eventbox), FALSE);
gtk_container_set_border_width (GTK_CONTAINER (eventbox), 6);
+ gtk_widget_add_events (eventbox, GDK_BUTTON_PRESS_MASK);
+
+ g_signal_connect (G_OBJECT (eventbox), "button-press-event", (GCallback)
today_infoline_clicked_cb, exec);
+
hbox = gtk_hbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (eventbox), hbox);
@@ -136,7 +151,7 @@
* callback for luncher buttons
*/
-void
+static void
today_launcher_clicked_cb (GtkWidget *widget, gchar *command)
{
/* The following code is a modified version of code from launcher-util.c in
@@ -215,7 +230,7 @@
* Return value: The widget to use as the events area
*
*/
-GtkWidget *
+static GtkWidget *
today_setup_events_area (const gchar *stock_id)
{
GtkWidget *events_area;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-05-31 18:27:18 +0200 (Thu, 31 May 2007)
New Revision: 2111
Modified:
trunk/src/target/u-boot/patches/uboot-hxd8.patch
Log:
Fix NAND chip selection for HXD8
Modified: trunk/src/target/u-boot/patches/uboot-hxd8.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-hxd8.patch 2007-05-31 14:25:31 UTC
(rev 2110)
+++ trunk/src/target/u-boot/patches/uboot-hxd8.patch 2007-05-31 16:27:18 UTC
(rev 2111)
@@ -88,7 +88,7 @@
===================================================================
--- /dev/null
+++ u-boot/board/hxd8/hxd8.c
-@@ -0,0 +1,219 @@
+@@ -0,0 +1,189 @@
+/*
+ * (C) Copyright 2007 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -278,36 +278,6 @@
+char *dynpart_names[] = {
+ "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
+
-+/* 4G Nand flash chip select function */
-+void board_nand_select_device(struct nand_chip *this, int chip)
-+{
-+ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
-+
-+ if (chip == 0)
-+ gpio->GPGDAT &= ~(1 << 1);
-+ else
-+ gpio->GPGDAT |= (1 << 1);
-+
-+ if (chip == 1)
-+ gpio->GPADAT &= ~(1 << 15);
-+ else
-+ gpio->GPADAT |= (1 << 15);
-+
-+ if (chip == 2)
-+ gpio->GPADAT &= ~(1 << 16);
-+ else
-+ gpio->GPADAT |= (1 << 16);
-+
-+ if (chip == 3)
-+ gpio->GPADAT &= ~(1 << 14);
-+ else
-+ gpio->GPADAT |= (1 << 14);
-+
-+ /* UGLY: ew don't have mtd_info pointer, but know that
-+ * s3c24xx hwcontrol function does not use it for CLRNCE */
-+ if (chip == -1)
-+ this->hwcontrol(NULL, NAND_CTL_CLRNCE);
-+}
Index: u-boot/board/hxd8/lowlevel_init.S
===================================================================
--- /dev/null
@@ -488,7 +458,7 @@
===================================================================
--- /dev/null
+++ u-boot/include/configs/hxd8.h
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,277 @@
+/*
+ * (C) Copyright 2007 OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
@@ -701,7 +671,6 @@
+#define CFG_NAND_BASE 0x4e000000
+#define CFG_MAX_NAND_DEVICE NAND_MAX_CHIPS
+#define CFG_NAND_BASE_LIST { CFG_NAND_BASE, CFG_NAND_BASE, CFG_NAND_BASE }
-+#define CFG_NAND_SELECT_DEVICE
+
+#define CONFIG_MMC 1
+#define CFG_MMC_BASE 0xff000000
@@ -1126,12 +1095,12 @@
===================================================================
--- u-boot.orig/cpu/arm920t/s3c24x0/nand.c
+++ u-boot/cpu/arm920t/s3c24x0/nand.c
-@@ -83,6 +83,26 @@
+@@ -83,6 +83,59 @@
#define NFDATA __REGb(NF_BASE + oNFDATA)
#define NFSTAT __REGb(NF_BASE + oNFSTAT)
+#if defined(CONFIG_HXD8)
-+static int hxd8_dev_ready(struct mtd_info *mtd)
++static int hxd8_nand_dev_ready(struct mtd_info *mtd)
+{
+ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+ u_int32_t val = gpio->GPCDAT;
@@ -1149,18 +1118,50 @@
+ return 0;
+ }
+}
++
++/* 4G Nand flash chip select function */
++static void hxd8_nand_select_chip(struct nand_chip *this, int chip)
++{
++ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
++
++ if (chip == 0)
++ gpio->GPGDAT &= ~(1 << 1);
++ else
++ gpio->GPGDAT |= (1 << 1);
++
++ if (chip == 1)
++ gpio->GPADAT &= ~(1 << 15);
++ else
++ gpio->GPADAT |= (1 << 15);
++
++ if (chip == 2)
++ gpio->GPADAT &= ~(1 << 16);
++ else
++ gpio->GPADAT |= (1 << 16);
++
++ if (chip == 3)
++ gpio->GPADAT &= ~(1 << 14);
++ else
++ gpio->GPADAT |= (1 << 14);
++
++ /* UGLY: ew don't have mtd_info pointer, but know that
++ * s3c24xx hwcontrol function does not use it for CLRNCE */
++ if (chip == -1)
++ this->hwcontrol(NULL, NAND_CTL_CLRNCE);
++ else
++ this->hwcontrol(NULL, NAND_CTL_SETNCE);
++}
+#endif
static void s3c2410_hwcontrol(struct mtd_info *mtd, int cmd)
{
-@@ -251,6 +271,12 @@
+@@ -251,6 +304,11 @@
nand->eccmode = NAND_ECC_SOFT;
#endif
+#if defined(CONFIG_HXD8)
-+ //printk("Initial new cs\n");
-+ //nand->select_chip = hxd8_nand_select_chip;
-+ nand->dev_ready = hxd8_dev_ready;
++ nand->dev_ready = hxd8_nand_dev_ready;
++ nand->select_chip = hxd8_nand_select_chip;
+#endif
+
#ifdef CONFIG_S3C2410_NAND_BBT
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-06-01 03:31:09 +0200 (Fri, 01 Jun 2007)
New Revision: 2112
Added:
trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch
Log:
board/qt2410/Makefile: add QT2410-specific lowlevel_foo
Added: trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch
===================================================================
--- trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch 2007-05-31
16:27:18 UTC (rev 2111)
+++ trunk/src/target/u-boot/patches/lowlevel_foo_qt2410.patch 2007-06-01
01:31:09 UTC (rev 2112)
@@ -0,0 +1,38 @@
+Index: u-boot/board/qt2410/Makefile
+===================================================================
+--- u-boot.orig/board/qt2410/Makefile
++++ u-boot/board/qt2410/Makefile
+@@ -28,14 +28,31 @@
+ OBJS := qt2410.o flash.o
+ SOBJS := lowlevel_init.o
+
++.PHONY: all
++
++all: $(LIB) lowevel_foo.bin
++
+ $(LIB): $(OBJS) $(SOBJS)
+ $(AR) crv $@ $(OBJS) $(SOBJS)
+
++lowlevel_foo.o: ../neo1973/common/lowlevel_foo.S
++ $(CC) -c -DTEXT_BASE=0x33F80000 -march=armv4 \
++ -o lowlevel_foo.o ../neo1973/common/lowlevel_foo.S
++
++lowlevel_foo: lowlevel_foo.o lowlevel_init.o \
++ ../neo1973/common/lowlevel_foo.lds
++ $(LD) -T ../neo1973/common/lowlevel_foo.lds -Ttext 0x33f80000 -Bstatic \
++ lowlevel_init.o lowlevel_foo.o -o lowlevel_foo
++
++lowevel_foo.bin: lowlevel_foo
++ $(CROSS_COMPILE)objcopy --gap-fill=0xff -O binary \
++ lowlevel_foo lowlevel_foo.bin
++
+ clean:
+- rm -f $(SOBJS) $(OBJS)
++ rm -f $(SOBJS) $(OBJS) lowlevel_foo lowlevel_foo.o
+
+ distclean: clean
+- rm -f $(LIB) core *.bak .depend
++ rm -f $(LIB) core *.bak .depend lowlevel_foo.bin
+
+ #########################################################################
+
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-06-01 09:47:16 +0200 (Fri, 01 Jun 2007)
New Revision: 2113
Modified:
trunk/src/target/kernel/patches/hxd8-core.patch
Log:
HDX8: increase oversampling shift of TS driver (Johnny Wu)
Modified: trunk/src/target/kernel/patches/hxd8-core.patch
===================================================================
--- trunk/src/target/kernel/patches/hxd8-core.patch 2007-06-01 01:31:09 UTC
(rev 2112)
+++ trunk/src/target/kernel/patches/hxd8-core.patch 2007-06-01 07:47:16 UTC
(rev 2113)
@@ -376,7 +376,7 @@
+static struct s3c2410_ts_mach_info hxd8_ts_cfg = {
+ .delay = 10000,
+ .presc = 49,
-+ .oversampling_shift = 2,
++ .oversampling_shift = 4,
+};
+
+static struct platform_device *hxd8_devices[] __initdata = {
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
