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. r3150 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
2. r3151 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
3. r3152 - in
trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src
([EMAIL PROTECTED])
4. r3153 - trunk/src/host/splash ([EMAIL PROTECTED])
5. r3154 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: .
libmokoui ([EMAIL PROTECTED])
6. r3155 - trunk/src/target/kernel/patches
([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-10-12 13:12:56 +0200 (Fri, 12 Oct 2007)
New Revision: 3150
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
Log:
* src/moko-dialer-panel.c: (moko_dialer_panel_init):
* src/moko-keypad.c: (on_panel_user_hold):
- Insert digits on "button down"
- Replace primary digit with secondary digit when tap-and-hold occurs
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-12 09:37:38 UTC (rev 3149)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-12 11:12:56 UTC (rev 3150)
@@ -1,3 +1,12 @@
+2007-10-12 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/moko-dialer-panel.c: (moko_dialer_panel_init):
+ * src/moko-keypad.c: (on_panel_user_hold):
+
+ - Insert digits on "button down"
+ - Replace primary digit with secondary digit when tap-and-hold occurs
+
+
2007-10-10 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-panel.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c
2007-10-12 09:37:38 UTC (rev 3149)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-panel.c
2007-10-12 11:12:56 UTC (rev 3150)
@@ -34,6 +34,13 @@
static gint moko_dialer_panel_signals[LAST_SIGNAL] = { 0 };
+
+typedef struct
+{
+ gchar value;
+ MokoDialerPanel *panel;
+} HoldTimeoutData;
+
static void
moko_dialer_panel_class_init (MokoDialerPanelClass * class)
{
@@ -140,97 +147,53 @@
}
static gboolean
-moko_dialer_panel_pressed (MokoDigitButton *button,
- GdkEventButton *event,
- MokoDialerPanel *panel)
+moko_dialer_panel_hold_timeout (HoldTimeoutData *data)
{
-#define TAP_HOLD_TIME 800
- static guint32 last_event = 0;
- gchar value = -1;
+ g_signal_emit (data->panel, moko_dialer_panel_signals[HOLD_SIGNAL], 0,
data->value);
- if (event->type == GDK_BUTTON_PRESS)
- {
- last_event = event->time;
- }
- else if (event->type == GDK_BUTTON_RELEASE)
- {
- guint32 diff = event->time - last_event;
-
- if (diff < TAP_HOLD_TIME)
- {
- /* Normal 'clicked' event */
- value = moko_digit_button_get_left (button);
- g_signal_emit (panel,
- moko_dialer_panel_signals[CLICKED_SIGNAL], 0, value);
- }
- else
- {
- /* Tap-and-hold event */
- value = moko_digit_button_get_right (button);
-
- if (value == -1)
- value = moko_digit_button_get_left (button);
-
- g_signal_emit (panel,
- moko_dialer_panel_signals[CLICKED_SIGNAL], 0, value);
- }
- }
+ g_free (data);
return FALSE;
}
-/*
- * Leave this for when tap-and-hold is implemented at the Gtk-level
- */
-#if 0
static gboolean
-moko_dialer_panel_pressed (MokoDigitButton * button, GdkEventButton * event,
- gpointer data)
+moko_dialer_panel_pressed (MokoDigitButton *button,
+ GdkEventButton *event,
+ MokoDialerPanel *panel)
{
+ static gint hold_timeout_source = 0;
- MokoDialerPanel *moko_dialer_panel;
+ if (event->type == GDK_BUTTON_PRESS)
+ {
+ HoldTimeoutData *timeout_data;
+ gchar value = -1;
-//here! check it tomorrow!
- moko_dialer_panel = (MokoDialerPanel *) data;
+ /* Normal 'clicked' event */
+ value = moko_digit_button_get_left (button);
+ g_signal_emit (panel, moko_dialer_panel_signals[CLICKED_SIGNAL], 0, value);
- gchar value = -1;
-
- if (event->button == 3)
- { //right button
+ /* Set up for a tap-and-hold event */
value = moko_digit_button_get_right (button);
+
+ /* this button doesn't have a "hold" value */
if (value == -1)
- { //button 1-9 pressed with hold , we emit
another signal: HOLD_SIGNAL, with the para of the number
- value = moko_digit_button_get_left (button);
- if (value != -1)
- {
- g_signal_emit (moko_dialer_panel,
- moko_dialer_panel_signals[HOLD_SIGNAL], 0, value);
- }
- }
- else
- { //*, 0, # buttons are right clicked or pressed
with hold
- if (value != -1)
- g_signal_emit (moko_dialer_panel,
- moko_dialer_panel_signals[CLICKED_SIGNAL], 0, value);
+ return FALSE;
- }
+ timeout_data = g_new0 (HoldTimeoutData, 1);
- }
- else if (event->button == 1)
- { //left button
- value = moko_digit_button_get_left (button);
- if (value != -1)
- g_signal_emit (moko_dialer_panel,
- moko_dialer_panel_signals[CLICKED_SIGNAL], 0, value);
+ timeout_data->panel = panel;
+ timeout_data->value = value;
- }
+ hold_timeout_source = g_timeout_add (800, (GSourceFunc)
moko_dialer_panel_hold_timeout, timeout_data);
- /* allow the signal to propagate the event further */
+ }
+ else if (event->type == GDK_BUTTON_RELEASE)
+ {
+ if (hold_timeout_source != 0)
+ g_source_remove (hold_timeout_source);
+ }
return FALSE;
}
-#endif
-
-
GtkWidget *
moko_dialer_panel_new ()
{
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
2007-10-12 09:37:38 UTC (rev 3149)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
2007-10-12 11:12:56 UTC (rev 3150)
@@ -262,7 +262,37 @@
const gchar digit,
MokoKeypad *keypad)
{
- g_debug ("on_panel_user_hold: %c", digit);
+ MokoKeypadPrivate *priv;
+ gchar buf[3];
+ GList *matches = NULL;
+
+ g_return_if_fail (MOKO_IS_KEYPAD (keypad));
+ priv = keypad->priv;
+
+ /* Phones use '#' for PIN 'entered' signal */
+ if (priv->pin_mode && digit == '#')
+ {
+ on_dial_clicked (NULL, keypad);
+ return;
+ }
+
+ /* Create a string to insert into the textview */
+ buf[0] = digit;
+ buf[1] = '\0';
+
+ moko_dialer_textview_delete (MOKO_DIALER_TEXTVIEW (priv->textview));
+ moko_dialer_textview_insert (MOKO_DIALER_TEXTVIEW (priv->textview), buf);
+
+ if (!priv->pin_mode)
+ {
+ /* Some autocomplete stuff */
+ matches = moko_contacts_fuzzy_lookup (moko_contacts_get_default (),
+ moko_dialer_textview_get_input (
+ MOKO_DIALER_TEXTVIEW
(priv->textview),
+ TRUE));
+ moko_tips_set_matches (MOKO_TIPS (priv->tips), matches);
+ g_signal_emit (G_OBJECT (keypad), keypad_signals[DIGIT_PRESSED], 0, digit);
+ }
}
/* GObject functions */
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-12 14:57:47 +0200 (Fri, 12 Oct 2007)
New Revision: 3151
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
Log:
* src/moko-keypad.c: Clear dialer display when delete button held down,
rather than only when held and released
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-12 11:12:56 UTC (rev 3150)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-12 12:57:47 UTC (rev 3151)
@@ -1,5 +1,10 @@
2007-10-12 Thomas Wood <[EMAIL PROTECTED]>
+ * src/moko-keypad.c: Clear dialer display when delete button held down,
+ rather than only when held and released
+
+2007-10-12 Thomas Wood <[EMAIL PROTECTED]>
+
* src/moko-dialer-panel.c: (moko_dialer_panel_init):
* src/moko-keypad.c: (on_panel_user_hold):
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
2007-10-12 11:12:56 UTC (rev 3150)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-keypad.c
2007-10-12 12:57:47 UTC (rev 3151)
@@ -173,40 +173,36 @@
}
static gboolean
+moko_keypad_hold_timeout (MokoDialerTextview *textview)
+{
+ moko_dialer_textview_empty (textview);
+ return FALSE;
+}
+
+static gboolean
on_delete_event (GtkWidget *button, GdkEventButton *event, MokoKeypad *keypad)
{
-#define TAP_HOLD_TIME 800
MokoKeypadPrivate *priv;
MokoDialerTextview *textview;
- static guint32 last_event = 0;
GList *matches;
-
+ static gint hold_timeout_source = 0;
+
g_return_val_if_fail (MOKO_IS_KEYPAD (keypad), FALSE);
priv = keypad->priv;
-
+
textview = MOKO_DIALER_TEXTVIEW (priv->textview);
if (event->type == GDK_BUTTON_PRESS)
{
- last_event = event->time;
+ moko_dialer_textview_delete (textview);
+ hold_timeout_source = g_timeout_add (800, (GSourceFunc)
moko_keypad_hold_timeout, textview);
return FALSE;
}
else if (event->type == GDK_BUTTON_RELEASE)
{
- guint32 diff = event->time - last_event;
-
- if (diff < TAP_HOLD_TIME)
- {
- /* Normal 'clicked' event */
- moko_dialer_textview_delete (textview);
- }
- else
- {
- /* Tap-and-hold event */
- moko_dialer_textview_empty (textview);
- }
+ g_source_remove (hold_timeout_source);
}
-
+
if (!priv->pin_mode)
{
/* Some autocomplete stuff */
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-10-12 18:21:32 +0200 (Fri, 12 Oct 2007)
New Revision: 3152
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
Log:
* src/moko-dialer-textview.c: (moko_dialer_textview_delete): Make sure
the last character is still bold after deleting
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-12 12:57:47 UTC (rev 3151)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
2007-10-12 16:21:32 UTC (rev 3152)
@@ -1,5 +1,10 @@
2007-10-12 Thomas Wood <[EMAIL PROTECTED]>
+ * src/moko-dialer-textview.c: (moko_dialer_textview_delete): Make sure
+ the last character is still bold after deleting
+
+2007-10-12 Thomas Wood <[EMAIL PROTECTED]>
+
* src/moko-keypad.c: Clear dialer display when delete button held down,
rather than only when held and released
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
2007-10-12 12:57:47 UTC (rev 3151)
+++
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer-textview.c
2007-10-12 16:21:32 UTC (rev 3152)
@@ -387,6 +387,9 @@
gtk_text_buffer_get_iter_at_mark (buffer, &insertiter, insertmark);
len = gtk_text_iter_get_offset (&insertiter);
+ /* update colours */
+ moko_dialer_textview_set_color (moko_dialer_textview);
+
return 1;
}
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-10-12 18:29:41 +0200 (Fri, 12 Oct 2007)
New Revision: 3153
Modified:
trunk/src/host/splash/splashimg.pl
Log:
- new option -32 for 32 bpp mode
- new option -pnm to use PNM instead of PNG files
Modified: trunk/src/host/splash/splashimg.pl
===================================================================
--- trunk/src/host/splash/splashimg.pl 2007-10-12 16:21:32 UTC (rev 3152)
+++ trunk/src/host/splash/splashimg.pl 2007-10-12 16:29:41 UTC (rev 3153)
@@ -21,13 +21,31 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
+
+%bpp = 16;
+
+
sub usage
{
- print STDERR "usage: $0 [System_boot.png]\n";
+ print STDERR "usage: $0 [-32] [-pnm] [System_boot.png]\n";
exit(1);
}
+while ($ARGV[0] =~ /^-[^-]/) {
+ if ($ARGV[0] eq "-32") {
+ $bpp = 32;
+ shift @ARGV;
+ }
+ elsif ($ARGV[0] eq "-pnm") {
+ $pnm = 1;
+ shift @ARGV;
+ }
+ else {
+ die "unrecognized option: \"$ARGV[0]\"";
+ }
+}
+
&usage unless $#ARGV < 2;
if ($ARGV[0] eq "") {
$file = "System_boot.png";
@@ -36,7 +54,12 @@
$file = @ARGV[0];
}
-$cmd = "pngtopnm '$file' | ppmtorgb3";
+if ($pnm) {
+ $cmd = "cat '$file' | ppmtorgb3";
+}
+else {
+ $cmd = "pngtopnm '$file' | ppmtorgb3";
+}
system($cmd) && die "system \"$cmd\": $?";
@@ -56,6 +79,12 @@
$r = unpack("C",substr($p{"red"},$i,1));
$g = unpack("C",substr($p{"grn"},$i,1));
$b = unpack("C",substr($p{"blu"},$i,1));
- $v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3);
- print pack("v",$v) || die "print: $!";
+ if ($bpp == 16) {
+ $v = ($r >> 3) << 11 | ($g >> 2) << 5 | ($b >> 3);
+ print pack("v",$v) || die "print: $!";
+ }
+ else {
+ $v = ($r) << 16 | ($g) << 8 | $b;
+ print pack("V",$v) || die "print: $!";
+ }
}
--- End Message ---
--- Begin Message ---
Author: chris
Date: 2007-10-12 19:05:20 +0200 (Fri, 12 Oct 2007)
New Revision: 3154
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
* libmokoui/moko-finger-scroll.c:
(moko_finger_scroll_button_press_cb):
Add fix for when widgets grab X after a click inside MokoFingerScroll
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-12
16:29:41 UTC (rev 3153)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2007-10-12
17:05:20 UTC (rev 3154)
@@ -1,3 +1,9 @@
+2007-10-12 Chris Lord <[EMAIL PROTECTED]>
+
+ * libmokoui/moko-finger-scroll.c:
+ (moko_finger_scroll_button_press_cb):
+ Add fix for when widgets grab X after a click inside MokoFingerScroll
+
2007-10-08 Chris Lord <[EMAIL PROTECTED]>
* libmokoui/moko-finger-scroll.c: (get_ordered_children):
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
---
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-12 16:29:41 UTC (rev 3153)
+++
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
2007-10-12 17:05:20 UTC (rev 3154)
@@ -201,10 +201,16 @@
MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (scroll);
- if ((!priv->enabled) || (priv->clicked) || (event->button != 1) ||
+ if ((!priv->enabled) || (event->button != 1) ||
((event->time == priv->last_time) &&
(event->type == priv->last_type))) return TRUE;
+ if (priv->clicked && priv->child) {
+ /* Widget stole focus on last click, send crossing-out event */
+ synth_crossing (priv->child, 0, 0, event->x_root, event->y_root,
+ event->time, FALSE);
+ }
+
g_get_current_time (&priv->click_start);
priv->last_type = event->type;
priv->last_time = event->time;
--- End Message ---
--- Begin Message ---
Author: laforge
Date: 2007-10-13 03:03:57 +0200 (Sat, 13 Oct 2007)
New Revision: 3155
Modified:
trunk/src/target/kernel/patches/gta02-core.patch
Log:
GTA02: add missing GPIO definitions for GTA02v1 .. GTA02v4
Modified: trunk/src/target/kernel/patches/gta02-core.patch
===================================================================
--- trunk/src/target/kernel/patches/gta02-core.patch 2007-10-12 17:05:20 UTC
(rev 3154)
+++ trunk/src/target/kernel/patches/gta02-core.patch 2007-10-13 01:03:57 UTC
(rev 3155)
@@ -2,7 +2,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,600 @@
+@@ -0,0 +1,614 @@
+/*
+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
+ *
@@ -253,6 +253,8 @@
+ PMU_VRAIL_F_SUSPEND_ON;
+ break;
+ case GTA02v2_SYSTEM_REV:
++ case GTA02v3_SYSTEM_REV:
++ case GTA02v4_SYSTEM_REV:
+ /* we need to keep the 1.8V going since this is the SDRAM
+ * self-refresh voltage */
+ gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].flags =
@@ -346,13 +348,15 @@
+ switch (system_rev) {
+ case GTA02v1_SYSTEM_REV:
+ case GTA02v2_SYSTEM_REV:
++ case GTA02v3_SYSTEM_REV:
++ case GTA02v4_SYSTEM_REV:
+ /* FIXME */
+ break;
+ }
+}
+
+static struct s3c24xx_mci_pdata gta02_mmc_cfg = {
-+ .gpio_detect = GTA02_GPIO_nSD_DETECT,
++ .gpio_detect = GTA02v1_GPIO_nSD_DETECT,
+ .set_power = >a02_mmc_set_power,
+ .ocr_avail = MMC_VDD_32_33,
+};
@@ -521,8 +525,8 @@
+ .flags = IORESOURCE_IRQ,
+ },
+ [2] = {
-+ .start = GTA02_GPIO_3D_RESET,
-+ .end = GTA02_GPIO_3D_RESET,
++ .start = GTA02v1_GPIO_3D_RESET,
++ .end = GTA02v1_GPIO_3D_RESET,
+ },
+};
+
@@ -540,9 +544,9 @@
+ switch (system_rev) {
+ case GTA02v1_SYSTEM_REV:
+ break;
-+ case GTA02v2_SYSTEM_REV:
-+ gta02_glamo_resources[2].start = GTA02v2_GPIO_3D_RESET;
-+ gta02_glamo_resources[2].end = GTA02v2_GPIO_3D_RESET;
++ default:
++ gta02_glamo_resources[2].start = GTA02_GPIO_3D_RESET;
++ gta02_glamo_resources[2].end = GTA02_GPIO_3D_RESET;
+ break;
+ }
+}
@@ -566,6 +570,16 @@
+ s3c_device_nand.dev.platform_data = >a02_nand_info;
+ s3c_device_sdi.dev.platform_data = >a02_mmc_cfg;
+
++ /* Only GTA02v1 has a SD_DETECT GPIO. Since the slot is not
++ * hot-pluggable, this is not required anyway */
++ switch (system_rev) {
++ case GTA02v1_SYSTEM_REV:
++ break;
++ default:
++ gta02_mmc_cfg.gpio_detect = 0;
++ break;
++ }
++
+ INIT_WORK(>a02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
+ s3c24xx_udc_set_platdata(>a02_udc_cfg);
+ set_s3c2410ts_info(>a02_ts_cfg);
@@ -607,7 +621,7 @@
===================================================================
--- /dev/null
+++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/gta02.h
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,94 @@
+#ifndef _GTA02_H
+#define _GTA02_H
+
@@ -617,28 +631,90 @@
+/* Different hardware revisions, passed in ATAG_REVISION by u-boot */
+#define GTA02v1_SYSTEM_REV 0x00000310
+#define GTA02v2_SYSTEM_REV 0x00000320
++#define GTA02v3_SYSTEM_REV 0x00000330
++#define GTA02v4_SYSTEM_REV 0x00000340
+
-+#define GTA02_GPIO_3D_IRQ S3C2410_GPG4
-+#define GTA02_GPIO_3D_RESET S3C2440_GPJ0
-+#define GTA02_GPIO_nSD_DETECT S3C2410_GPF5
-+#define GTA02_GPIO_USB_PULLUP S3C2410_GPB9
++#define GTA02_GPIO_n3DL_GSM S3C2410_GPA13 /* v1 + v2 + v3 only */
++
+#define GTA02_GPIO_VIBRATOR_ON S3C2410_GPB3
-+#define GTA02_GPIO_HOLD_KEY S3C2410_GPF7
-+#define GTA02_GPIO_AUX_KEY S3C2410_GPF6
-+#define GTA02_GPIO_JACK_INSERT S3C2410_GPF4
++#define GTA02v1_GPIO_GPS_PWRON S3C2410_GPB4 /* v1 only */
++#define GTA02_GPIO_MODEM_RST S3C2410_GPB5
+#define GTA02_GPIO_BT_EN S3C2410_GPB6
-+#define GTA02_GPIO_GSENSOR1_CS S3C2410_GPD12
-+#define GTA02_GPIO_GSENSOR2_CS S3C2410_GPD13
++#define GTA02_GPIO_MODEM_ON S3C2410_GPB7
++#define GTA02v1_GPIO_EN_AGPS3V S3C2410_GPB8 /* v1 only */
++#define GTA02_GPIO_EXTINT8 S3C2410_GPB8
++#define GTA02_GPIO_USB_PULLUP S3C2410_GPB9
+
++#define GTA02v1_GPIO_nGPS_RST S3C2410_GPC0 /* v1 only */
++#define GTA02v12_GPIO_PIO3 S3C2410_GPC5 /* v1 + v2 only */
++#define GTA02_GPIO_PIO5 S3C2410_GPC5 /* v3 + v4 only */
++#define GTA02_GPIO_LCD_RESET S3C2410_GPC6 /* v1 + v2 only */
++#define GTA02v12_GPIO_PIO2 S3C2410_GPC7 /* v1 + v2 only */
++#define GTA02v2_nUSB_FLT S3C2410_GPC9 /* v2 only */
++#define GTA02v2_nUSB_OC S3C2410_GPC10 /* v2 only */
++#define GTA02v2_nGSM_OC S3C2410_GPC12 /* v2 only */
++
++#define GTA02v3_GPIO_nG1_CS S3C2410_GPD12 /* v3 + v4 only */
++#define GTA02v3_GPIO_nG2_CS S3C2410_GPD13 /* v3 + v4 only */
++
++#define GTA02_GPIO_nG1_INT S3C2410_GPF0
++#define GTA02_GPIO_IO1 S3C2410_GPF1
++#define GTA02v1_GPIO_nG2_INT S3C2410_GPF2 /* v1 only */
++#define GTA02_GPIO_PIO_2 S3C2410_GPF2 /* v2 + v3 + v4 only */
++#define GTA02_GPIO_JACK_INSERT S3C2410_GPF4
++#define GTA02v1_GPIO_nSD_DETECT S3C2410_GPF5 /* v1 only */
++#define GTA02_GPIO_WLAN_GPIO1 S3C2410_GPF5 /* v2 + v3 + v4 only */
++#define GTA02_GPIO_AUX_KEY S3C2410_GPF6
++#define GTA02_GPIO_HOLD_KEY S3C2410_GPF7
++
++#define GTA02_GPIO_3D_IRQ S3C2410_GPG4
++#define GTA02v1_GPIO_nG1_CS S3C2410_GPG8 /* v1 only */
++#define GTA02v2_GPIO_nG2_INT S3C2410_GPG8 /* v2 + v3 + v4 only */
++#define GTA02v3_GPIO_nUSB_OC S3C2410_GPG9 /* v3 + v4 only */
++#define GTA02v3_GPIO_nUSB_FLT S3C2410_GPG10 /* v3 + v4 only */
++#define GTA02v1_GPIO_nG2_CS S3C2410_GPG11 /* v1 only */
++#define GTA02v3_GPIO_nGSM_OC S3C2410_GPG11 /* v3 + v4 only */
++
++#define GTA02v1_GPIO_3D_RESET S3C2440_GPJ0 /* v1 only */
++#define GTA02v2_GPIO_BAT_ID S3C2440_GPJ0 /* v2 only */
++#define GTA02v1_GPIO_WLAN_GPIO8 S3C2440_GPJ1 /* v1 only */
++#define GTA02_GPIO_AMP_SHUT S3C2440_GPJ1 /* v2 + v3 + v4 only */
++#define GTA02v1_GPIO_WLAN_GPIO10 S3C2440_GPJ2
++#define GTA02_GPIO_HP_IN S3C2440_GPJ2 /* v2 + v3 + v4 only */
++#define GTA02v1_GPIO_KEEPACT S3C2440_GPJ3 /* v1 only */
++#define GTA02_GPIO_INT0 S3C2440_GPJ3 /* v2 + v3 + v4 only */
++#define GTA02_GPIO_nGSM_EN S3C2440_GPJ4
++#define GTA02_GPIO_3D_RESET S3C2440_GPJ5
++#define GTA02v4_GPIO_nDL_GSM S3C2440_GPJ6 /* v4 only */
++#define GTA02_GPIO_WLAN_GPIO0 S3C2440_GPJ7
++#define GTA02v1_GPIO_BAT_ID S3C2440_GPJ8
++#define GTA02_GPIO_KEEPACT S3C2440_GPJ8
++#define GTA02v1_GPIO_AMP_SHUT S3C2440_GPJ9 /* v1 only */
++#define GTA02v2_nG1_CS S3C2440_GPJ9 /* v2 only */
++#define GTA02v1_GPIO_HP_IN S3C2440_GPJ10
++#define GTA02v2_nG2_CS S3C2440_GPJ10 /* v2 only */
++#define GTA02v1_GPIO_INT0 S3C2440_GPJ11 /* v1 only */
++#define GTA02_CHIP_PWD S3C2440_GPJ11 /* v2 + v3 + v4 only */
++#define GTA02v1_GPIO_nGSM_EN S3C2440_GPJ12 /* v1 only */
++#define GTA02_GPIO_nWLAN_RESET S3C2440_GPJ12 /* v2 + v3 + v4 only */
++
++#define GTA02_IRQ_GSENSOR_1 IRQ_EINT0
+#define GTA02_IRQ_MODEM IRQ_EINT1
++#define GTA02v1_IRQ_GSENSOR_2 IRQ_EINT2 /* v1 only */
++#define GTA02_IRQ_PIO_2 IRQ_EINT2 /* v2 + v3 + v4 only */
++#define GTA02_IRQ_nJACK_INSERT IRQ_EINT4
++#define GTA02v1_IRQ_nSD_CD IRQ_EINT5 /* v1 only */
++#define GTA02_IRQ_WLAN_GPIO1 IRQ_EINT5
++#define GTA02_IRQ_AUX IRQ_EINT6
++#define GTA02_IRQ_nHOLD IRQ_EINT7
++#define GTA02v1_IRQ_nSIM_CD IRQ_EINT8 /* v1 only */
++#define GTA02_IRQ_PCF50633 IRQ_EINT9
+#define GTA02_IRQ_3D IRQ_EINT12
-+#define GTA02_IRQ_PCF50633 IRQ_EINT9
-+#define GTA02_IRQ_GSENSOR_1 IRQ_EINT0
-+#define GTA02_IRQ_GSENSOR_2 IRQ_EINT16
++#define GTA02_IRQ_GSENSOR_2 IRQ_EINT16 /* v2 + v3 + v4 only */
++#define GTA02v3_IRQ_nUSB_OC IRQ_EINT17 /* v3 + v4 only */
++#define GTA02v3_IRQ_nUSB_FLT IRQ_EINT18 /* v3 + v4 only */
++#define GTA02v3_IRQ_nGSM_OC IRQ_EINT19 /* v3 + v4 only */
+
-+/* Changes in GTA02v2 */
-+#define GTA02v2_GPIO_3D_RESET S3C2440_GPJ4
-+
+#endif /* _GTA02_H */
Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2440/Kconfig
===================================================================
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
