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. r4297 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
2. r4298 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
3. r4299 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
4. r4300 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
5. r4301 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
6. r4302 -
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-04-02 14:51:16 +0200 (Wed, 02 Apr 2008)
New Revision: 4297
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
This reduces the time until the splash screen comes up by one second, so
it's now about 3.5s.
uboot-gta02.patch:
- board/neo1973/gta02/gta02.c (POWER_KEY_SECONDS): reduced from 2 to 1 second
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-04-01 22:50:31 UTC
(rev 4296)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-04-02 12:51:16 UTC
(rev 4297)
@@ -139,7 +139,7 @@
+DECLARE_GLOBAL_DATA_PTR;
+
+/* That many seconds the power key needs to be pressed to power up */
-+#define POWER_KEY_SECONDS 2
++#define POWER_KEY_SECONDS 1
+
+#if defined(CONFIG_ARCH_GTA02_v1)
+//#define M_MDIV 0x7f /* Fout = 405.00MHz */
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-02 16:59:47 +0200 (Wed, 02 Apr 2008)
New Revision: 4298
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
* src/sms-notes.c: Connect "Save Contact" button to moko-save-number.
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-02 12:51:16 UTC (rev 4297)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-02 14:59:47 UTC (rev 4298)
@@ -1,3 +1,7 @@
+2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/sms-notes.c: Connect "Save Contact" button to moko-save-number.
+
2008-04-01 Thomas Wood <[EMAIL PROTECTED]>
* src/Makefile.am:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-04-02 12:51:16 UTC (rev 4297)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-04-02 14:59:47 UTC (rev 4298)
@@ -608,7 +608,30 @@
g_slice_free (SmsNoteCountData, data);
}
+
static void
+save_contact_clicked_cb (GtkToolButton *button, SmsData *data)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *author;
+
+ selection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (data->notes_treeview));
+ if ((!selection) ||
+ (!gtk_tree_selection_get_selected (selection, &model, &iter)))
+ return;
+
+ gtk_tree_model_get (model, &iter,
+ JANA_GTK_NOTE_STORE_COL_AUTHOR, &author, -1);
+
+ moko_save_number (author);
+
+ g_free (author);
+}
+
+static void
forward_clicked_cb (GtkToolButton *button, SmsData *data)
{
gchar *body;
@@ -949,6 +972,8 @@
G_CALLBACK (delete_clicked_cb), data);
g_signal_connect (data->delete_all_button, "clicked",
G_CALLBACK (delete_all_clicked_cb), data);
-
+ g_signal_connect (data->save_contact_button, "clicked",
+ G_CALLBACK (save_contact_clicked_cb), data);
+
return vbox;
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-02 17:17:25 +0200 (Wed, 02 Apr 2008)
New Revision: 4299
Added:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am
Log:
2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
* src/Makefile.am:
* src/test-notes.c:
Add a small test program to add notes to the system
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-02 14:59:47 UTC (rev 4298)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-02 15:17:25 UTC (rev 4299)
@@ -1,5 +1,12 @@
2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
+ * src/Makefile.am:
+ * src/test-notes.c:
+
+ Add a small test program to add notes to the system
+
+2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
+
* src/sms-notes.c: Connect "Save Contact" button to moko-save-number.
2008-04-01 Thomas Wood <[EMAIL PROTECTED]>
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am
2008-04-02 14:59:47 UTC (rev 4298)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/Makefile.am
2008-04-02 15:17:25 UTC (rev 4299)
@@ -5,6 +5,11 @@
bin_PROGRAMS=openmoko-messages
+noinst_PROGRAMS=test-notes
+
+test_notes_SOURCES = \
+ test-notes.c
+
openmoko_messages_SOURCES = \
sms.h \
sms-main.c \
Added:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
2008-04-02 14:59:47 UTC (rev 4298)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/test-notes.c
2008-04-02 15:17:25 UTC (rev 4299)
@@ -0,0 +1,45 @@
+/*
+ * test-notes.c: small test application to add notes to the system
+ *
+ * Authored by OpenedHand Ltd <[EMAIL PROTECTED]>
+ *
+ * Copyright (C) 2008 OpenMoko Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; version 2 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser Public License for more details.
+ *
+ */
+
+#include <libjana/jana-note.h>
+#include <libjana-ecal/jana-ecal.h>
+#include <glib/gprintf.h>
+
+int
+main (int argc, char **argv)
+{
+ JanaNote *note;
+ JanaStore *store;
+
+ g_type_init ();
+
+ store = jana_ecal_store_new (JANA_COMPONENT_NOTE);
+ jana_store_open (store);
+
+ note = jana_ecal_note_new ();
+ jana_note_set_author (note, "0123456789");
+ jana_note_set_body (note, "Test Message");
+
+ jana_store_add_component (store, JANA_COMPONENT (note));
+
+ g_printf ("Add a new note:\n\tAuthor: %s\n\t Body: %s\n",
+ jana_note_get_author (note),
+ jana_note_get_body (note));
+
+ return 0;
+}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-04-02 23:06:15 +0200 (Wed, 02 Apr 2008)
New Revision: 4300
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
Log:
2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
* src/sms-contacts.c:
* src/sms-notes.c:
* src/sms-utils.c:
Re-add the New button to the notes pages.
Add a delete all button to the contacts page, to delete all selected
contact's messages
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-02 15:17:25 UTC (rev 4299)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-04-02 21:06:15 UTC (rev 4300)
@@ -1,5 +1,16 @@
2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
+ * src/sms-contacts.c:
+ * src/sms-notes.c:
+ * src/sms-utils.c:
+
+ Re-add the New button to the notes pages.
+
+ Add a delete all button to the contacts page, to delete all selected
+ contact's messages
+
+2008-04-02 Thomas Wood <[EMAIL PROTECTED]>
+
* src/Makefile.am:
* src/test-notes.c:
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2008-04-02 15:17:25 UTC (rev 4299)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
2008-04-02 21:06:15 UTC (rev 4300)
@@ -104,6 +104,12 @@
}
static void
+delete_all_clicked_cb (GtkWidget *button, SmsData *data)
+{
+ sms_delete_selected_contact_messages (data);
+}
+
+static void
dial_clicked_cb (GtkWidget *button, SmsData *data)
{
GList *numbers;
@@ -597,49 +603,36 @@
selection_changed_cb (GtkTreeSelection *selection, SmsData *data)
{
GtkTreeModel *model;
- gboolean sensitive;
+ gboolean selected, has_messages;
GtkTreeIter iter;
gchar *detail;
- if (!gtk_tree_selection_get_selected (selection, &model, &iter)) {
- gtk_widget_set_sensitive (GTK_WIDGET (
- data->delete_button), FALSE);
- return;
+ if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ selected = FALSE;
+ has_messages = FALSE;
}
-
- /* Not the nicest way to know if there are messages, but better than
- * doing multiple look-ups on the hash-tables
- */
- gtk_tree_model_get (model, &iter, COL_DETAIL, &detail, -1);
- if (!detail) {
- sensitive = FALSE;
- } else {
- sensitive = TRUE;
- if (detail[0] == '0') {
- const gchar *next_line = strchr (detail, '\n') + 1;
- if ((!next_line) || (next_line[0] == '0'))
- sensitive = FALSE;
- }
- g_free (detail);
- }
-
- gtk_widget_set_sensitive (GTK_WIDGET (data->delete_button), sensitive);
-}
-
-void
-sms_contacts_update_delete_all (SmsData *data)
-{
-
- if (gtk_notebook_get_current_page (GTK_NOTEBOOK (data->notebook)) ==
- SMS_PAGE_CONTACTS) {
- if (g_hash_table_size (data->note_count) > 0) {
- gtk_widget_set_sensitive (GTK_WIDGET (
- data->delete_all_button), TRUE);
+ else
+ {
+ selected = TRUE;
+ /* Not the nicest way to know if there are messages, but better
than
+ * doing multiple look-ups on the hash-tables
+ */
+ gtk_tree_model_get (model, &iter, COL_DETAIL, &detail, -1);
+ if (!detail) {
+ has_messages = FALSE;
} else {
- gtk_widget_set_sensitive (GTK_WIDGET (
- data->delete_all_button), FALSE);
+ has_messages = TRUE;
+ if (detail[0] == '0') {
+ const gchar *next_line = strchr (detail, '\n')
+ 1;
+ if ((!next_line) || (next_line[0] == '0'))
+ has_messages = FALSE;
+ }
+ g_free (detail);
}
}
+ gtk_widget_set_sensitive (GTK_WIDGET (data->dial_button), selected);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->delete_all_button),
has_messages);
}
GtkWidget *
@@ -800,9 +793,20 @@
data->dial_button = gtk_tool_button_new_from_stock
(MOKO_STOCK_CALL_DIAL);
gtk_tool_item_set_expand (data->dial_button, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->dial_button, -1);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->dial_button), FALSE);
g_signal_connect (data->dial_button, "clicked",
G_CALLBACK (dial_clicked_cb), data);
-
+
+ /* Delete all button */
+ data->delete_all_button = gtk_tool_button_new_from_stock (
+ MOKO_STOCK_FOLDER_DELETE);
+ gtk_tool_item_set_expand (data->delete_all_button, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->delete_all_button, -1);
+ gtk_widget_set_sensitive (GTK_WIDGET (data->delete_all_button), FALSE);
+ g_signal_connect (data->delete_all_button, "clicked",
+ G_CALLBACK (delete_all_clicked_cb), data);
+
+
/* Pack widgets into vbox and return */
vbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), toolbar,
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-04-02 15:17:25 UTC (rev 4299)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
2008-04-02 21:06:15 UTC (rev 4300)
@@ -632,6 +632,36 @@
}
static void
+new_clicked_cb (GtkToolButton *button, SmsData *data)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *author;
+
+ selection = gtk_tree_view_get_selection (
+ GTK_TREE_VIEW (data->notes_treeview));
+ if ((!selection) ||
+ (!gtk_tree_selection_get_selected (selection, &model, &iter)))
+ {
+ /* TODO: find the current selected contact preferred number? */
+ author = g_strdup ("");
+ }
+ else
+ {
+ gtk_tree_model_get (model, &iter,
+ JANA_GTK_NOTE_STORE_COL_AUTHOR, &author, -1);
+ }
+
+ gtk_text_buffer_set_text (gtk_text_view_get_buffer (
+ GTK_TEXT_VIEW (data->sms_textview)), author, -1);
+
+ gtk_notebook_set_current_page (
+ GTK_NOTEBOOK (data->notebook), SMS_PAGE_COMPOSE);
+ g_free (author);
+}
+
+static void
forward_clicked_cb (GtkToolButton *button, SmsData *data)
{
gchar *body;
@@ -709,14 +739,6 @@
}
static void
-delete_all_clicked_cb (GtkToolButton *button, SmsData *data)
-{
- if (hidden) return;
-
- sms_delete_selected_contact_messages (data);
-}
-
-static void
search_toggled_cb (MokoSearchBar *bar, gboolean search_visible, SmsData *data)
{
gtk_tree_model_filter_refilter (
@@ -793,23 +815,6 @@
}
static void
-row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
- SmsData *data)
-{
- gtk_widget_set_sensitive (GTK_WIDGET (data->delete_all_button), TRUE);
-}
-
-static void
-row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, SmsData *data)
-{
- GtkTreeIter iter;
-
- if (!gtk_tree_model_get_iter_first (model, &iter))
- gtk_widget_set_sensitive (GTK_WIDGET (
- data->delete_all_button), FALSE);
-}
-
-static void
selection_changed_cb (GtkTreeSelection *selection, SmsData *data)
{
GtkTreeModel *model;
@@ -836,6 +841,7 @@
GHashTable *colours_hash;
GtkIconTheme *icon_theme;
gint size;
+ GtkToolItem *new_button;
data->author_uid = NULL;
data->author_icon = NULL;
@@ -874,10 +880,6 @@
gtk_tree_model_filter_set_visible_func ((GtkTreeModelFilter *)
data->note_filter, (GtkTreeModelFilterVisibleFunc)
notes_visible_func, data, NULL);
- g_signal_connect (data->note_filter, "row-inserted",
- G_CALLBACK (row_inserted_cb), data);
- g_signal_connect (data->note_filter, "row-deleted",
- G_CALLBACK (row_deleted_cb), data);
/* Create a category-colour hash for the cell renderer */
colours_hash = g_hash_table_new (g_str_hash, g_str_equal);
@@ -900,20 +902,20 @@
/* create toolbar */
toolbar = gtk_toolbar_new ();
-
+
+ /* New button */
+ new_button = gtk_tool_button_new_from_stock (MOKO_STOCK_SMS_NEW);
+ gtk_tool_item_set_expand (new_button, TRUE);
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), new_button, -1);
+ g_signal_connect (new_button, "clicked",
+ G_CALLBACK (new_clicked_cb), data);
+
/* Forward button */
data->forward_button = gtk_tool_button_new_from_stock (
MOKO_STOCK_MAIL_FORWARD);
gtk_tool_item_set_expand (data->forward_button, TRUE);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->forward_button, -1);
- /* Delete all button */
- data->delete_all_button = gtk_tool_button_new_from_stock (
- MOKO_STOCK_FOLDER_DELETE);
- gtk_tool_item_set_expand (data->delete_all_button, TRUE);
- gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->delete_all_button, -1);
- gtk_widget_set_sensitive (GTK_WIDGET (data->delete_all_button), FALSE);
-
/* Delete button */
data->delete_button = gtk_tool_button_new_from_stock (
GTK_STOCK_DELETE);
@@ -970,8 +972,6 @@
G_CALLBACK (forward_clicked_cb), data);
g_signal_connect (data->delete_button, "clicked",
G_CALLBACK (delete_clicked_cb), data);
- g_signal_connect (data->delete_all_button, "clicked",
- G_CALLBACK (delete_all_clicked_cb), data);
g_signal_connect (data->save_contact_button, "clicked",
G_CALLBACK (save_contact_clicked_cb), data);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
2008-04-02 15:17:25 UTC (rev 4299)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
2008-04-02 21:06:15 UTC (rev 4300)
@@ -279,9 +279,6 @@
data->note_count_idle = 0;
- /* Update the delete-all button if we're on the contacts page */
- sms_contacts_update_delete_all (data);
-
/* Change sort column so changing priorities doesn't break iterating
* through the model.
*/
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-04-02 23:14:52 +0200 (Wed, 02 Apr 2008)
New Revision: 4301
Modified:
branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch
Log:
add-lis302dl-gta02-a6-int1-only.patch
A6 uses int1 only and no pullup, adapt according to PCB revision
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
[ Changed to use system_rev, like everyone else. ]
---
arch/arm/mach-s3c2440/mach-gta02.c | 17 +++++++++++++++--
drivers/input/misc/lis302dl.c | 11 ++++++++---
include/linux/lis302dl.h | 1 +
3 files changed, 24 insertions(+), 5 deletions(-)
Modified: branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch 2008-04-02
21:06:15 UTC (rev 4300)
+++ branches/src/target/kernel/2.6.24.x/patches/gta02-acc.patch 2008-04-02
21:14:52 UTC (rev 4301)
@@ -34,7 +34,7 @@
static struct glamo_spigpio_info glamo_spigpio_cfg = {
.pin_clk = GLAMO_GPIO10_OUTPUT,
-@@ -507,16 +510,97 @@
+@@ -507,16 +510,99 @@
/* SPI: Accelerometers attached to SPI of s3c244x */
@@ -117,7 +117,7 @@
-static const struct lis302dl_platform_data lis302_pdata[] = {
+
-+const struct lis302dl_platform_data lis302_pdata[] = {
++struct lis302dl_platform_data lis302_pdata[] = {
{
- .name = "lis302-1 (top)"
+ .name = "lis302-1 (top)",
@@ -125,6 +125,7 @@
+ .pin_clk = S3C2410_GPG7,
+ .pin_mosi = S3C2410_GPG6,
+ .pin_miso = S3C2410_GPG5,
++ .open_drain = 1, /* altered at runtime by PCB rev */
+ .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
}, {
- .name = "lis302-2 (bottom)"
@@ -133,11 +134,12 @@
+ .pin_clk = S3C2410_GPG7,
+ .pin_mosi = S3C2410_GPG6,
+ .pin_miso = S3C2410_GPG5,
++ .open_drain = 1, /* altered at runtime by PCB rev */
+ .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
},
};
-@@ -525,26 +609,75 @@
+@@ -525,26 +611,75 @@
.modalias = "lis302dl",
.platform_data = &lis302_pdata[0],
.irq = GTA02_IRQ_GSENSOR_1,
@@ -219,10 +221,20 @@
};
static struct resource gta02_led_resources[] = {
-@@ -786,10 +919,11 @@
+@@ -786,10 +921,21 @@
{
int rc;
++ switch (system_rev) {
++ case GTA02v6_SYSTEM_REV:
++ /* we need push-pull interrupt from motion sensors */
++ lis302_pdata[0].open_drain = 0;
++ lis302_pdata[1].open_drain = 0;
++ break;
++ default:
++ break;
++ }
++
+ spin_lock_init(&motion_irq_lock);
+
s3c_device_usb.dev.platform_data = >a02_usb_info;
@@ -232,7 +244,7 @@
/* Only GTA02v1 has a SD_DETECT GPIO. Since the slot is not
* hot-pluggable, this is not required anyway */
-@@ -801,6 +935,12 @@
+@@ -801,6 +947,12 @@
break;
}
@@ -245,7 +257,7 @@
INIT_WORK(>a02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
s3c24xx_udc_set_platdata(>a02_udc_cfg);
set_s3c2410ts_info(>a02_ts_cfg);
-@@ -829,6 +969,7 @@
+@@ -829,6 +981,7 @@
break;
}
@@ -580,7 +592,7 @@
}
static int __devinit lis302dl_probe(struct spi_device *spi)
-@@ -433,84 +281,133 @@
+@@ -433,84 +281,138 @@
int rc;
struct lis302dl_info *lis;
u_int8_t wai;
@@ -682,14 +694,19 @@
+ reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x14);
+ reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
+ reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x95);
-
++
+ reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
+ LIS302DL_CTRL1_Yen |
+ LIS302DL_CTRL1_Zen);
+
-+ /* switch interrupt to open collector, active-low */
-+ reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
-+ LIS302DL_CTRL3_IHL);
++ if (pdata->open_drain)
++ /* switch interrupt to open collector, active-low */
++ reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
++ LIS302DL_CTRL3_IHL);
++ else
++ /* push-pull, active-low */
++ reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
++
+ lis302dl_int_mode(spi, 1, LIS302DL_INTMODE_DATA_READY);
+ lis302dl_int_mode(spi, 2, LIS302DL_INTMODE_DATA_READY);
+
@@ -697,7 +714,7 @@
+ reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
+ reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
+ reg_read(lis, LIS302DL_REG_CLICK_SRC);
-+
+
+ dev_info(&spi->dev, "Found %s\n", pdata->name);
+
+ lis->pdata = pdata;
@@ -741,7 +758,7 @@
dev_set_drvdata(&spi->dev, NULL);
kfree(lis);
-@@ -521,6 +418,10 @@
+@@ -521,6 +423,10 @@
static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
{
struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
@@ -752,7 +769,7 @@
/* save registers */
lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
-@@ -561,12 +462,17 @@
+@@ -561,12 +467,17 @@
reg_write(lis, LIS302DL_REG_CTRL1, tmp);
}
@@ -770,7 +787,7 @@
/* restore registers after resume */
reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-@@ -597,6 +503,9 @@
+@@ -597,6 +508,9 @@
reg_write(lis, LIS302DL_REG_CLICK_WINDOW,
lis->regs[LIS302DL_REG_CLICK_WINDOW]);
@@ -847,7 +864,7 @@
===================================================================
--- linux-2.6.24.orig/include/linux/lis302dl.h
+++ linux-2.6.24/include/linux/lis302dl.h
-@@ -2,10 +2,111 @@
+@@ -2,10 +2,112 @@
#define _LINUX_LIS302DL_H
#include <linux/types.h>
@@ -863,6 +880,7 @@
+ unsigned long pin_clk;
+ unsigned long pin_mosi;
+ unsigned long pin_miso;
++ int open_drain;
+ void (*lis302dl_bitbang_read)(struct lis302dl_info *);
+};
+
--- End Message ---
--- Begin Message ---
Author: erin_yueh
Date: 2008-04-03 06:21:21 +0200 (Thu, 03 Apr 2008)
New Revision: 4302
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
Log:
openmoko-panel-bt: update BT power_on and reset path name (Erin Yueh)
Modified:
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
===================================================================
---
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
2008-04-02 21:14:52 UTC (rev 4301)
+++
trunk/src/target/OM-2007.2/panel-plugins/openmoko-panel-bt/src/openmoko-panel-bt.c
2008-04-03 04:21:21 UTC (rev 4302)
@@ -22,8 +22,8 @@
#include <stdlib.h>
#include <stdio.h>
-#define BT_POWERON_FILENAME
"/sys/class/i2c-dev/i2c-0/device/0-0008/gta01-pm-bt.0/power_on"
-#define BT_POWERON_FILENAME2
"/sys/class/i2c-dev/i2c-0/device/0-0008/neo1973-pm-bt.0/power_on"
+#define BT_POWERON_FILENAME
"/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/neo1973-pm-bt.0/power_on"
+#define BT_RESET_FILENAME
"/sys/devices/platform/s3c2440-i2c/i2c-adapter/i2c-0/0-0073/neo1973-pm-bt.0/reset"
typedef struct {
MokoPanelApplet *mokoapplet;
@@ -36,7 +36,6 @@
FILE * f = fopen(BT_POWERON_FILENAME, "r+");
int val;
- if (f == NULL) f = fopen(BT_POWERON_FILENAME2, "r+");
if (f == NULL) return -1;
fscanf(f, "%i", &val);
@@ -49,7 +48,6 @@
{
FILE * f = fopen(BT_POWERON_FILENAME, "w");
- if (f == NULL) f = fopen(BT_POWERON_FILENAME2, "w");
if (f == NULL) return -1;
fprintf(f, "%i\n", val);
@@ -59,6 +57,20 @@
return val;
}
+static int
+reset_bt_power(int val)
+{
+ FILE * f = fopen(BT_RESET_FILENAME, "w");
+
+ if (f == NULL) return -1;
+
+ fprintf(f, "%i\n", val);
+
+ fclose(f);
+
+ return val;
+}
+
static void
mb_panel_update(BtApplet *applet, int state)
{
@@ -76,6 +88,7 @@
NotifyNotification * nn;
ret = set_bt_power(1);
+ ret = reset_bt_power(0);
mb_panel_update(applet, 1);
nn = notify_notification_new ("Bluetooth turned on", NULL, NULL, NULL);
notify_notification_show (nn, NULL);
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
