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. r1794 - in
trunk/src/target/OM-2007/applications/openmoko-contacts: . src
([EMAIL PROTECTED])
2. r1795 - in
trunk/src/target/OM-2007/applications/openmoko-contacts: . src
([EMAIL PROTECTED])
3. r1796 -
trunk/src/target/OM-2007/applications/openmoko-calculator
([EMAIL PROTECTED])
4. r1797 - trunk/oe/conf/distro/include ([EMAIL PROTECTED])
5. r1798 - in trunk/oe/packages/libftdi: . files
([EMAIL PROTECTED])
6. r1799 - trunk/oe/packages/tasks ([EMAIL PROTECTED])
7. r1800 - trunk/src/host/devirginator ([EMAIL PROTECTED])
8. r1801 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
--- Begin Message ---
Author: thomas
Date: 2007-04-18 16:29:38 +0200 (Wed, 18 Apr 2007)
New Revision: 1794
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
Log:
* src/contacts-callbacks-ebook.c: (contacts_changed_cb):
* src/contacts-contact-pane.c: (field_changed),
(contacts_contact_pane_class_init):
* src/contacts-contact-pane.h:
* src/contacts-omoko.c: (fullname_changed_cb),
(create_main_window):
Add a fullname-changed signal to the contact pane widget.
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-04-18 09:18:00 UTC (rev 1793)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-04-18 14:29:38 UTC (rev 1794)
@@ -1,3 +1,13 @@
+2007-04-18 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/contacts-callbacks-ebook.c: (contacts_changed_cb):
+ * src/contacts-contact-pane.c: (field_changed),
+ (contacts_contact_pane_class_init):
+ * src/contacts-contact-pane.h:
+ * src/contacts-omoko.c: (fullname_changed_cb),
+ (create_main_window):
+ Add a fullname-changed signal to the contact pane widget.
+
2007-04-17 Thomas Wood <[EMAIL PROTECTED]>
* src/contacts-contact-pane.c: (choose_photo_cb), (update_ui): Make
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
2007-04-18 09:18:00 UTC (rev 1793)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
2007-04-18 14:29:38 UTC (rev 1794)
@@ -152,13 +152,14 @@
gtk_list_store_set (model, &hash->iter,
CONTACT_CELLPHONE_COL, cell, -1);
/* If contact is currently selected, update display */
+ /*
if (current_contact) {
if (strcmp (e_contact_get_const
(contact, E_CONTACT_UID),
e_contact_get_const
(current_contact, E_CONTACT_UID)) == 0)
contacts_display_summary (contact, data);
- }
+ }*/
/* Check for groups and add them to group list */
contact_groups =
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
2007-04-18 09:18:00 UTC (rev 1793)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
2007-04-18 14:29:38 UTC (rev 1794)
@@ -23,6 +23,7 @@
#include <libebook/e-book.h>
#include "contacts-contact-pane.h"
#include "contacts-utils.h"
+#include "contacts-callbacks-ebook.h"
G_DEFINE_TYPE (ContactsContactPane, contacts_contact_pane, GTK_TYPE_VBOX);
@@ -40,6 +41,13 @@
GtkSizeGroup *size_group; /* used to sizing the labels */
};
+enum {
+ FULLNAME_CHANGED,
+ LAST_SIGNAL
+};
+
+static guint contacts_contact_pane_signals [LAST_SIGNAL];
+
typedef struct {
char *display;
char *vcard;
@@ -204,6 +212,12 @@
}
g_strfreev (values);
+ if (info->vcard_field == EVC_FN)
+ {
+ /* update treeview */
+ g_signal_emit (pane, contacts_contact_pane_signals[FULLNAME_CHANGED], 0,
pane->priv->contact);
+ }
+
pane->priv->dirty = TRUE;
}
@@ -808,6 +822,16 @@
field_quark = g_quark_from_static_string("contact-pane-fieldinfo");
entry_quark = g_quark_from_static_string("contact-pane-entry");
+
+ contacts_contact_pane_signals[FULLNAME_CHANGED] = g_signal_new
(("fullname-changed"),
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ContactsContactPaneClass, fullname_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ E_TYPE_CONTACT);
+
}
static void
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
2007-04-18 09:18:00 UTC (rev 1793)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
2007-04-18 14:29:38 UTC (rev 1794)
@@ -57,6 +57,7 @@
typedef struct {
GtkVBoxClass parent_class;
+ void (* fullname_changed) (ContactsContactPane *self, EContact *contact);
} ContactsContactPaneClass;
GType contacts_contact_pane_get_type (void);
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-04-18 09:18:00 UTC (rev 1793)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-04-18 14:29:38 UTC (rev 1794)
@@ -25,6 +25,7 @@
#include "contacts-ui.h"
#include "contacts-omoko.h"
#include "contacts-groups-editor.h"
+#include "contacts-callbacks-ebook.h"
@@ -33,6 +34,13 @@
/* these are specific to the omoko frontend */
static GtkMenu *filter_menu;
+static void
+fullname_changed_cb (ContactsContactPane *pane, EContact *contact,
ContactsData *data)
+{
+ GList *l = g_list_prepend (NULL, contact);
+ contacts_changed_cb (data->book_view, l, data);
+ g_list_free (l);
+}
GtkWidget *
create_contacts_list (ContactsData *data)
@@ -203,6 +211,9 @@
/*** view mode ****/
ui->contact_pane = contacts_contact_pane_new();
+
+ g_signal_connect (ui->contact_pane, "fullname-changed", (GCallback)
fullname_changed_cb, contacts_data);
+
contacts_contact_pane_set_editable (CONTACTS_CONTACT_PANE
(ui->contact_pane), FALSE);
/* The book view is set later when we get it back */
gtk_notebook_append_page (GTK_NOTEBOOK (ui->main_notebook),
ui->contact_pane, NULL);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-04-18 18:35:55 +0200 (Wed, 18 Apr 2007)
New Revision: 1795
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
Log:
* src/contacts-callbacks-ebook.c: (contacts_changed_cb):
* src/contacts-contact-pane.c: (field_changed),
(contacts_contact_pane_class_init):
* src/contacts-contact-pane.h:
* src/contacts-main.c:
* src/contacts-omoko.c: (create_main_window):
Add a cell-changed signal, and update fullname/mobile column in treeview on
reciveing the new changed signals. Fixes bug 474.
Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-04-18 14:29:38 UTC (rev 1794)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
2007-04-18 16:35:55 UTC (rev 1795)
@@ -4,6 +4,18 @@
* src/contacts-contact-pane.c: (field_changed),
(contacts_contact_pane_class_init):
* src/contacts-contact-pane.h:
+ * src/contacts-main.c:
+ * src/contacts-omoko.c: (create_main_window):
+
+ Add a cell-changed signal, and update fullname/mobile column in
treeview on
+ reciveing the new changed signals. Fixes bug 474.
+
+2007-04-18 Thomas Wood <[EMAIL PROTECTED]>
+
+ * src/contacts-callbacks-ebook.c: (contacts_changed_cb):
+ * src/contacts-contact-pane.c: (field_changed),
+ (contacts_contact_pane_class_init):
+ * src/contacts-contact-pane.h:
* src/contacts-omoko.c: (fullname_changed_cb),
(create_main_window):
Add a fullname-changed signal to the contact pane widget.
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
2007-04-18 14:29:38 UTC (rev 1794)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
2007-04-18 16:35:55 UTC (rev 1795)
@@ -134,7 +134,7 @@
/* TODO: There's some funniness going on here... */
/* Replace contact */
-/* g_object_unref (hash->contact);*/
+ g_object_unref (hash->contact);
hash->contact = g_object_ref (contact);
hash->contacts_data = data;
g_hash_table_steal (data->contacts_table, uid);
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
2007-04-18 14:29:38 UTC (rev 1794)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.c
2007-04-18 16:35:55 UTC (rev 1795)
@@ -43,6 +43,7 @@
enum {
FULLNAME_CHANGED,
+ CELL_CHANGED,
LAST_SIGNAL
};
@@ -214,10 +215,12 @@
if (info->vcard_field == EVC_FN)
{
- /* update treeview */
g_signal_emit (pane, contacts_contact_pane_signals[FULLNAME_CHANGED], 0,
pane->priv->contact);
}
-
+ else if (info->vcard_field == EVC_TEL)
+ {
+ g_signal_emit (pane, contacts_contact_pane_signals[CELL_CHANGED], 0,
pane->priv->contact);
+ }
pane->priv->dirty = TRUE;
}
@@ -823,7 +826,7 @@
entry_quark = g_quark_from_static_string("contact-pane-entry");
- contacts_contact_pane_signals[FULLNAME_CHANGED] = g_signal_new
(("fullname-changed"),
+ contacts_contact_pane_signals[FULLNAME_CHANGED] = g_signal_new
(("fullname-changed"),
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ContactsContactPaneClass, fullname_changed),
@@ -832,6 +835,16 @@
G_TYPE_NONE, 1,
E_TYPE_CONTACT);
+ contacts_contact_pane_signals[CELL_CHANGED] = g_signal_new (("cell-changed"),
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ContactsContactPaneClass, cell_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ E_TYPE_CONTACT);
+
+
}
static void
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
2007-04-18 14:29:38 UTC (rev 1794)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-contact-pane.h
2007-04-18 16:35:55 UTC (rev 1795)
@@ -58,6 +58,7 @@
typedef struct {
GtkVBoxClass parent_class;
void (* fullname_changed) (ContactsContactPane *self, EContact *contact);
+ void (* cell_changed) (ContactsContactPane *self, EContact *contact);
} ContactsContactPaneClass;
GType contacts_contact_pane_get_type (void);
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
2007-04-18 14:29:38 UTC (rev 1794)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
2007-04-18 16:35:55 UTC (rev 1795)
@@ -136,7 +136,6 @@
int
main (int argc, char **argv)
{
- GError *error = NULL;
BaconMessageConnection *mc;
#ifdef HAVE_GCONF
const char *search;
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-04-18 14:29:38 UTC (rev 1794)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
2007-04-18 16:35:55 UTC (rev 1795)
@@ -37,11 +37,44 @@
static void
fullname_changed_cb (ContactsContactPane *pane, EContact *contact,
ContactsData *data)
{
- GList *l = g_list_prepend (NULL, contact);
- contacts_changed_cb (data->book_view, l, data);
- g_list_free (l);
+ EContactListHash *hash;
+ gchar *name = NULL;
+ const gchar *uid;
+
+ uid = e_contact_get_const (contact, E_CONTACT_UID);
+ hash = g_hash_table_lookup (data->contacts_table, uid);
+ name = e_contact_get (contact, E_CONTACT_FULL_NAME);
+
+ if ((!name) || (g_utf8_strlen (name, -1) <= 0))
+ {
+ g_free (name);
+ name = g_strdup (_("Unnamed"));
+ }
+ gtk_list_store_set (data->contacts_liststore, &hash->iter,
CONTACT_NAME_COL, name, -1);
+
+ g_free (name);
}
+static void
+cell_changed_cb (ContactsContactPane *pane, EContact *contact, ContactsData
*data)
+{
+ EContactListHash *hash;
+ gchar *cell = NULL;
+ const gchar *uid;
+
+ uid = e_contact_get_const (contact, E_CONTACT_UID);
+ hash = g_hash_table_lookup (data->contacts_table, uid);
+ cell = e_contact_get (contact, E_CONTACT_PHONE_MOBILE);
+
+ if (!cell)
+ {
+ cell = g_strdup ("");
+ }
+ gtk_list_store_set (data->contacts_liststore, &hash->iter,
CONTACT_CELLPHONE_COL, cell, -1);
+
+ g_free (cell);
+}
+
GtkWidget *
create_contacts_list (ContactsData *data)
{
@@ -213,6 +246,7 @@
ui->contact_pane = contacts_contact_pane_new();
g_signal_connect (ui->contact_pane, "fullname-changed", (GCallback)
fullname_changed_cb, contacts_data);
+ g_signal_connect (ui->contact_pane, "cell-changed", (GCallback)
cell_changed_cb, contacts_data);
contacts_contact_pane_set_editable (CONTACTS_CONTACT_PANE
(ui->contact_pane), FALSE);
/* The book view is set later when we get it back */
--- End Message ---
--- Begin Message ---
Author: ortalo
Date: 2007-04-18 19:43:41 +0200 (Wed, 18 Apr 2007)
New Revision: 1796
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/README
Log:
Test modification
Modified: trunk/src/target/OM-2007/applications/openmoko-calculator/README
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/README
2007-04-18 16:35:55 UTC (rev 1795)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/README
2007-04-18 17:43:41 UTC (rev 1796)
@@ -6,6 +6,6 @@
* Pango markup is used currently to manage font size for the display
of for button labels, maybe styles would be more appropriate.
-Thanks for your attention,
+Thank you for your attention,
Rodolphe <[EMAIL PROTECTED]>
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-18 19:58:24 +0200 (Wed, 18 Apr 2007)
New Revision: 1797
Modified:
trunk/oe/conf/distro/include/openmoko.inc
Log:
oe/openmoko.inc: set PREFERRED_PROVIDER for db[-native]
Modified: trunk/oe/conf/distro/include/openmoko.inc
===================================================================
--- trunk/oe/conf/distro/include/openmoko.inc 2007-04-18 17:43:41 UTC (rev
1796)
+++ trunk/oe/conf/distro/include/openmoko.inc 2007-04-18 17:58:24 UTC (rev
1797)
@@ -52,6 +52,12 @@
require conf/distro/include/sane-srcdates.inc
#
+# Console & Libraries
+#
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+
+#
# Framebuffer & X
#
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
@@ -110,13 +116,6 @@
PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
#
-# O-Hand
-#
-PREFERRED_VERSION_contacts = "0.1"
-PREFERRED_VERSION_dates = "0.1"
-# PREFERRED_VERSION_web = "???"
-
-#
# Development
#
PREFERRED_PROVIDER_qemu-native = "qemu-native"
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-18 19:58:48 +0200 (Wed, 18 Apr 2007)
New Revision: 1798
Added:
trunk/oe/packages/libftdi/files/doxygen-configure.patch
trunk/oe/packages/libftdi/libftdi-native_0.9.bb
trunk/oe/packages/libftdi/libftdi_0.9.bb
Log:
oe/libftdi: add 0.9
Added: trunk/oe/packages/libftdi/files/doxygen-configure.patch
===================================================================
--- trunk/oe/packages/libftdi/files/doxygen-configure.patch 2007-04-18
17:58:24 UTC (rev 1797)
+++ trunk/oe/packages/libftdi/files/doxygen-configure.patch 2007-04-18
17:58:48 UTC (rev 1798)
@@ -0,0 +1,28 @@
+Index: libftdi-0.8/configure.in
+===================================================================
+--- libftdi-0.8.orig/configure.in
++++ libftdi-0.8/configure.in
+@@ -32,9 +32,5 @@
+ AC_MSG_RESULT(yes)
+ fi
+
+-dnl check for doxygen
+-AC_PATH_PROG(DOXYGEN, doxygen)
+-AM_CONDITIONAL(HAVE_DOXYGEN, test -n $DOXYGEN);
+-
+ AC_OUTPUT([libftdi-config],[chmod a+x libftdi-config])
+-AC_OUTPUT(Makefile src/Makefile examples/Makefile doc/Doxyfile doc/Makefile
libftdi.pc)
++AC_OUTPUT(Makefile src/Makefile examples/Makefile libftdi.pc)
+Index: libftdi-0.8/Makefile.am
+===================================================================
+--- libftdi-0.8.orig/Makefile.am
++++ libftdi-0.8/Makefile.am
+@@ -2,7 +2,7 @@
+ # have all needed files, that a GNU package needs
+ AUTOMAKE_OPTIONS = foreign 1.4
+
+-SUBDIRS = src examples doc
++SUBDIRS = src examples
+
+ EXTRA_DIST = libftdi.spec COPYING.LIB README ChangeLog libftdi-config.in
+
Added: trunk/oe/packages/libftdi/libftdi-native_0.9.bb
===================================================================
--- trunk/oe/packages/libftdi/libftdi-native_0.9.bb 2007-04-18 17:58:24 UTC
(rev 1797)
+++ trunk/oe/packages/libftdi/libftdi-native_0.9.bb 2007-04-18 17:58:48 UTC
(rev 1798)
@@ -0,0 +1,5 @@
+require libftdi_${PV}.bb
+
+inherit native
+
+DEPENDS = "libusb-native"
Added: trunk/oe/packages/libftdi/libftdi_0.9.bb
===================================================================
--- trunk/oe/packages/libftdi/libftdi_0.9.bb 2007-04-18 17:58:24 UTC (rev
1797)
+++ trunk/oe/packages/libftdi/libftdi_0.9.bb 2007-04-18 17:58:48 UTC (rev
1798)
@@ -0,0 +1,18 @@
+DESCRIPTION = "libftdi is a library (using libusb) to talk to FTDI's \
+FT232BM, FT245BM and FT2232C type chips including the popular bitbang mode."
+HOMEPAGE = "http://www.intra2net.com/de/produkte/opensource/ftdi";
+LICENSE = "GPL"
+DEPENDS = "libusb"
+
+SRC_URI =
"http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-${PV}.tar.gz \
+ file://doxygen-configure.patch;patch=1 \
+ "
+S = "${WORKDIR}/libftdi-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-docs"
+
+do_stage() {
+ autotools_stage_all
+}
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-18 19:59:24 +0200 (Wed, 18 Apr 2007)
New Revision: 1799
Modified:
trunk/oe/packages/tasks/task-openmoko.bb
Log:
oe/packages: add cvs to task-openmoko-native-sdk
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-04-18 17:58:48 UTC (rev
1798)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-04-18 17:59:24 UTC (rev
1799)
@@ -4,7 +4,7 @@
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r38"
+PR = "r39"
PACKAGES = "\
task-openmoko-linux \
@@ -208,7 +208,7 @@
"
#
-# task-openmoko-sdk-native
+# task-openmoko-native-sdk
#
DESCRIPTION_task-openmoko-native-sdk = "OpenMoko: Native SDK"
RDEPENDS_task-openmoko-native-sdk = "\
@@ -218,6 +218,7 @@
gcc-symlinks \
cpp \
cpp-symlinks \
+ cvs \
libc6-dev \
libgcc-dev \
libgcc-s-dev \
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-04-19 01:03:22 +0200 (Thu, 19 Apr 2007)
New Revision: 1800
Modified:
trunk/src/host/devirginator/setup.sh
Log:
Added command-line option "-c config_file" to load a specific configuration
file.
Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh 2007-04-18 17:59:24 UTC (rev
1799)
+++ trunk/src/host/devirginator/setup.sh 2007-04-18 23:03:22 UTC (rev
1800)
@@ -101,26 +101,31 @@
usage()
{
- echo "usage: $0 [-t] [variable=value ...]" 1>&2
+ echo "usage: $0 [-c config_file] [-t] [variable=value ...]" 1>&2
exit 1
}
tarball=false
+config=config
-for n in "$@"; do
- case "$n" in
+while [ ! -z "$*" ]; do
+ case "$1" in
+ -c) shift
+ [ ! -z "$1" ] || usage
+ config=$1;;
-t) tarball=true;;
- *=*) eval "$n";;
+ *=*) eval "$1";;
*) usage;;
esac
+ shift
done
# --- Read config file --------------------------------------------------------
-. config
+. $config
# --- Post configuration ------------------------------------------------------
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2007-04-19 01:50:06 +0200 (Thu, 19 Apr 2007)
New Revision: 1801
Added:
trunk/src/target/u-boot/patches/mmcinit-power-up.patch
Log:
board/neo1973/neo1973.c (board_late_init): moved MMC power-up to separate
function
cpu/arm920t/s3c24x0/mmc.c (mmc_init): call mmc_power_up and return -ENODEV
immediately if there is no card
Added: trunk/src/target/u-boot/patches/mmcinit-power-up.patch
===================================================================
--- trunk/src/target/u-boot/patches/mmcinit-power-up.patch 2007-04-18
23:03:22 UTC (rev 1800)
+++ trunk/src/target/u-boot/patches/mmcinit-power-up.patch 2007-04-18
23:50:06 UTC (rev 1801)
@@ -0,0 +1,73 @@
+board/neo1973/neo1973.c (board_late_init): moved MMC power-up to separate
+ function
+cpu/arm920t/s3c24x0/mmc.c (mmc_init): call mmc_power_up and return -ENODEV
+ immediately if there is no card
+
+- Werner Almesberger <[EMAIL PROTECTED]>
+
+Index: u-boot/board/neo1973/neo1973.c
+===================================================================
+--- u-boot.orig/board/neo1973/neo1973.c
++++ u-boot/board/neo1973/neo1973.c
+@@ -223,6 +223,19 @@ int board_init (void)
+ return 0;
+ }
+
++int mmc_power_up(void)
++{
++#if defined(CONFIG_ARCH_GTA01B_v4)
++ S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
++
++ /* check if sd card is inserted, and power-up if it is */
++ if (gpio->GPFDAT & (1 << 5))
++ return 0;
++ gpio->GPBDAT &= ~(1 << 2);
++#endif /* !CONFIG_ARCH_GTA01B_v4 */
++ return 1;
++}
++
+ int board_late_init(void)
+ {
+ unsigned char tmp;
+@@ -289,14 +302,8 @@ continue_boot:
+ /* switch on the backlight */
+ neo1973_backlight(1);
+
+-#if defined(CONFIG_ARCH_GTA01B_v4)
+- {
+- /* check if sd card is inserted, and power-up if it is */
+- S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
+- if (!(gpio->GPFDAT & (1 << 5)))
+- gpio->GPBDAT &= ~(1 << 2);
+- }
+-#endif
++ /* check if sd card is inserted, and power-up if it is */
++ mmc_power_up();
+
+ return 0;
+ }
+Index: u-boot/cpu/arm920t/s3c24x0/mmc.c
+===================================================================
+--- u-boot.orig/cpu/arm920t/s3c24x0/mmc.c
++++ u-boot/cpu/arm920t/s3c24x0/mmc.c
+@@ -381,6 +381,11 @@ static void print_sd_cid(const struct sd
+ cid->crc >> 1, cid->crc & 1);
+ }
+
++int __attribute__((weak)) mmc_power_up(void)
++{
++ return 1;
++}
++
+ int mmc_init(int verbose)
+ {
+ int retries, rc = -ENODEV;
+@@ -393,6 +398,8 @@ int mmc_init(int verbose)
+ debug("mmc_init(PCLK=%u)\n", get_PCLK());
+
+ clk_power->CLKCON |= (1 << 9);
++ if (!mmc_power_up())
++ return -ENODEV;
+
+ /* S3C2410 has some bug that prevents reliable operation at higher
speed */
+ //sdi->SDIPRE = 0x3e; /* SDCLK = PCLK/2 / (SDIPRE+1) = 396kHz */
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
