[oe-commits] org.oe.dev merge of '0ad423d3482b73008fa7b39e78b0dbc3658cbc50'

mickeyl commit oe at amethyst.openembedded.net
Mon Jul 28 22:10:35 UTC 2008


merge of '0ad423d3482b73008fa7b39e78b0dbc3658cbc50'
     and 'a9043ecc52370e4ecf1fd689e40cf12dac122cb9'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 08038475c6d5f1151dce53814c039aa3dbafd42c
ViewMTN: http://monotone.openembedded.org/revision/info/08038475c6d5f1151dce53814c039aa3dbafd42c
Files:
1
packages/freesmartphone/freesmartphone-feed-configs.bb
packages/openmoko2/openmoko-feed-configs.bb
packages/openmoko-3rdparty/epiano_0.3.1.bb
packages/tangogps/files
packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch
packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch
packages/tangogps/tangogps-fso_0.9.2.bb
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/gypsy/gypsy_svn.bb
packages/images/fso-image.bb
packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch
packages/linux/gumstix-kernel-2.6.21/tsc2003.c
packages/linux/gumstix-kernel_2.6.21.bb
packages/linux/gumstix-linux.inc
Diffs:

#
# mt diff -r0ad423d3482b73008fa7b39e78b0dbc3658cbc50 -r08038475c6d5f1151dce53814c039aa3dbafd42c
#
#
#
# delete "packages/freesmartphone/freesmartphone-feed-configs.bb"
# 
# delete "packages/openmoko2/openmoko-feed-configs.bb"
# 
# add_file "packages/openmoko-3rdparty/epiano_0.3.1.bb"
#  content [ca60b7198c1932cdd993f50e53089a1c2ee397a8]
#
============================================================
--- packages/openmoko-3rdparty/epiano_0.3.1.bb	ca60b7198c1932cdd993f50e53089a1c2ee397a8
+++ packages/openmoko-3rdparty/epiano_0.3.1.bb	ca60b7198c1932cdd993f50e53089a1c2ee397a8
@@ -0,0 +1,12 @@
+DESCRIPTION = "A _very_ simple virtual piano written in edje. Will be replaced by something cool soon :)"
+DEPENDS = "ecore evas edje fluidsynth"
+LICENSE = "GPL"
+SECTION = "x11/multimedia"
+PV = "0.3.1"
+PR = "r1"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://gstaedtner.net/projects/epiano/${PN}-${PV}.tar.gz"
+
+FILES_${PN} += "${datadir}"


#
# mt diff -ra9043ecc52370e4ecf1fd689e40cf12dac122cb9 -r08038475c6d5f1151dce53814c039aa3dbafd42c
#
#
#
# add_dir "packages/tangogps/files"
# 
# add_file "packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch"
#  content [45b07e2a1875c6424e684b81b4e8e960467bb47a]
# 
# add_file "packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch"
#  content [0b726fea6b39675efe8f3b61db233741b2b8f8c5]
# 
# add_file "packages/tangogps/tangogps-fso_0.9.2.bb"
#  content [1829b3be52c4104bd5fa0b9abcd36ff3948b5930]
# 
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
#  from [089be2aa36c43d51f94e09db1e42a7291c6b8c1d]
#    to [519709aafcf5d15f5d178fc7e95869b9214bed78]
# 
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [7db81e96548c8bd3dbcb37e96e83695ccaf7a9bc]
#    to [e15c6137cdb52decb3c0d85136658ae85f33ae9d]
# 
# patch "packages/gypsy/gypsy_svn.bb"
#  from [2c21466c36d291378e0b1969c53da221456a3d20]
#    to [44f510e7ce1634f707ccc12a237e279b457d624f]
# 
# patch "packages/images/fso-image.bb"
#  from [0846b765e7589f6a8a71d18695fd72da40666a8f]
#    to [98a9bf4d2bcc9614c6b5f03cdbc6780b167268f7]
# 
# patch "packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch"
#  from [6e0c7c7aa4434946cf8b4cd831750fc911b71a8f]
#    to [59d76958e9386ba776c4d7973ec4f781251714c9]
# 
# patch "packages/linux/gumstix-kernel-2.6.21/tsc2003.c"
#  from [3d88771bf7e195cd7b70a35310b8bdf58b8878fd]
#    to [76927013729a5cacdb43f3e6e0f923085aeda7f6]
# 
# patch "packages/linux/gumstix-kernel_2.6.21.bb"
#  from [1f1a51ddd361d503ab44e816d5c0dee09e9bbff2]
#    to [abcf379ae73f3805d3364fbbf7d4e735d4c887b2]
# 
# patch "packages/linux/gumstix-linux.inc"
#  from [cc9aa9d293625e691bf43518593347e53526502f]
#    to [1832359f059ffffee7e93ddf8254be7269d927a5]
#
============================================================
--- packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch	45b07e2a1875c6424e684b81b4e8e960467bb47a
+++ packages/tangogps/files/0002-Get-GPS-data-via-the-gypsy-interface.patch	45b07e2a1875c6424e684b81b4e8e960467bb47a
@@ -0,0 +1,182 @@
+From aab817f5f2d66f1ef1e710eb6b698865d14b7fc2 Mon Sep 17 00:00:00 2001
+From: Daniel Willmann <daniel at totalueberwachung.de>
+Date: Mon, 21 Jul 2008 04:33:59 +0200
+Subject: [PATCH] Get GPS data via the gypsy interface.
+ Except for the time (which ogpsd doesn't send periodically) the interface
+ is implemented.
+
+---
+ configure.in        |    2 +-
+ src/gps_functions.c |   96 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/gps_functions.h |    3 +-
+ src/init.c          |    6 ++-
+ 4 files changed, 103 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3661a57..cf06033 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,7 +23,7 @@ AM_GLIB_GNU_GETTEXT
+ 
+ AM_PROG_LIBTOOL
+ 
+-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0])
++PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 gypsy])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ 
+diff --git a/src/gps_functions.c b/src/gps_functions.c
+index bafbc18..57646e1 100644
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -4,6 +4,13 @@
+ #  include <config.h>
+ #endif
+ 
++#include <gypsy/gypsy-control.h>
++#include <gypsy/gypsy-device.h>
++#include <gypsy/gypsy-position.h>
++#include <gypsy/gypsy-accuracy.h>
++#include <gypsy/gypsy-course.h>
++#include <gypsy/gypsy-satellite.h>
++
+ #include <glib.h>
+ #include <glib/gprintf.h>
+ 
+@@ -630,3 +637,92 @@ get_gps()
+ 	
+ 
+ }
++
++static void on_fix_status_changed(GypsyDevice *device, GypsyDeviceFixStatus status, void *user_data)
++{
++	gpsdata->fix.mode = status;
++	gpsdata->valid =  status > 1;
++}
++
++static void on_position_changed(GypsyPosition *position, GypsyPositionFields fields_set,
++		int timestamp, double latitude, double longitude, double altitude, void *user_data)
++{
++	if (gpsdata->valid) {
++		gpsdata->fix.latitude = latitude;
++		gpsdata->fix.longitude = longitude;
++		gpsdata->fix.altitude = altitude;
++	}
++}
++
++static void on_accuracy_changed(GypsyAccuracy *accuracy, int fields, double pdop,
++		double hdop, double vdop, void *user_data)
++{
++	gpsdata->hdop = hdop;
++}
++
++static void on_course_changed(GypsyCourse *course, GypsyCourseFields fields_set,
++		int timestamp, double speed, double direction, double climb, void *user_data)
++{
++	gpsdata->fix.speed = speed/3.6;
++	gpsdata->fix.track = direction;
++}
++
++static void on_satellites_changed(GypsySatellite *sat,  GPtrArray *sats, void *user_data)
++{
++	int i;
++
++	gpsdata->satellites_used = 0;
++	gpsdata->satellites_inview = sats->len;
++	for (i = 0; i < sats->len; i++) {
++	    GypsySatelliteDetails *details = sats->pdata[i];
++
++			if (details->in_use) {
++				gpsdata->satellites_used++;
++			}
++	}
++}
++
++// typedef struct {
++//     double time;        /* Time of update, seconds since Unix epoch */
++//     int    mode;        /* Mode of fix */
++//     double latitude;    /* Latitude in degrees (valid if mode >= 2) */
++//     double longitude;   /* Longitude in degrees (valid if mode >= 2) */
++//     double altitude;    /* Altitude in meters (valid if mode == 3) */
++//     double track;       /* Course made good (relative to true north) */
++//     double speed;       /* Speed over ground, meters/sec */
++//     double bearing;	/* in radian */
++// } gps_fix_t;
++// 
++// typedef struct {
++// 	gps_fix_t fix;
++// 	int satellites_used;
++// 	int satellites_inview;
++// 	double hdop;
++// 	gboolean valid;
++// } gps_data_t;
++
++
++#define GYPSY_OBJ_PATH "/org/freedesktop/Gypsy"
++
++int setup_gypsy() {
++	gpsdata = g_new0(gps_data_t,1);
++
++	GypsyControl *gyctrl = gypsy_control_get_default();
++	GypsyDevice *gydevice = gypsy_device_new(GYPSY_OBJ_PATH);
++	GypsyPosition *gypos = gypsy_position_new(GYPSY_OBJ_PATH);
++	GypsyAccuracy *gyacc = gypsy_accuracy_new(GYPSY_OBJ_PATH);
++	GypsyCourse *gycourse = gypsy_course_new(GYPSY_OBJ_PATH);
++	GypsySatellite *gysat = gypsy_satellite_new(GYPSY_OBJ_PATH);
++
++	g_signal_connect(gydevice, "fix-status-changed", G_CALLBACK(on_fix_status_changed), NULL);
++	g_signal_connect(gypos, "position-changed", G_CALLBACK(on_position_changed), NULL);
++	g_signal_connect(gyacc, "accuracy-changed", G_CALLBACK(on_accuracy_changed), NULL);
++	g_signal_connect(gycourse, "course-changed", G_CALLBACK(on_course_changed), NULL);
++	g_signal_connect(gysat, "satellites-changed", G_CALLBACK(on_satellites_changed), NULL);
++
++	gpsdata->fix.mode = gypsy_device_get_fix_status(gydevice, NULL);
++	gpsdata->valid = gpsdata->fix.mode > 1;
++
++	return 1;
++}
++
+diff --git a/src/gps_functions.h b/src/gps_functions.h
+index 1090565..207b39f 100644
+--- a/src/gps_functions.h
++++ b/src/gps_functions.h
+@@ -1,4 +1,5 @@
+-
++int
++setup_gypsy();
+ 
+ void
+ get_gps();
+diff --git a/src/init.c b/src/init.c
+index 46ca583..c557ce4 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -26,7 +26,7 @@
+ #include "wp.h"
+ 
+ FILE *fp = NULL;
+-
++int have_gypsy = 0;
+ 
+ 
+ void
+@@ -197,7 +197,8 @@ cb_gps_timer()
+ 			
+ 	printf("timer called\n");
+ 
+-	get_gps();
++	if (!have_gypsy)
++		get_gps();
+ 	
+ 
+ 	if(gpsdata) 
+@@ -868,5 +869,6 @@ init()
+ 	gtk_label_set_text(GTK_LABEL(widget), "V: " VERSION " (C) Marcus Bauer, GPLv2");
+ #endif
+ 
++	have_gypsy = setup_gypsy();
+ 	timer = g_timeout_add (1000,cb_gps_timer,data);
+ }
+-- 
+1.5.4.5
+
============================================================
--- packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch	0b726fea6b39675efe8f3b61db233741b2b8f8c5
+++ packages/tangogps/files/0003-Try-to-request-the-GPS-resource-from-ousaged.patch	0b726fea6b39675efe8f3b61db233741b2b8f8c5
@@ -0,0 +1,73 @@
+From 2562a173716141cd9ea5c227dfa52f04ce4205f8 Mon Sep 17 00:00:00 2001
+From: Daniel Willmann <daniel at totalueberwachung.de>
+Date: Tue, 22 Jul 2008 00:22:58 +0200
+Subject: [PATCH] Try to request the GPS resource from ousaged
+
+---
+ configure.in        |    2 +-
+ src/gps_functions.c |   22 ++++++++++++++++++++++
+ 2 files changed, 23 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index cf06033..2bc3cf9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -23,7 +23,7 @@ AM_GLIB_GNU_GETTEXT
+ 
+ AM_PROG_LIBTOOL
+ 
+-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 gypsy])
++PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 gdk-2.0 gconf-2.0 dbus-glib-1 gypsy])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+ 
+diff --git a/src/gps_functions.c b/src/gps_functions.c
+index 57646e1..0802e67 100644
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -11,6 +11,7 @@
+ #include <gypsy/gypsy-course.h>
+ #include <gypsy/gypsy-satellite.h>
+ 
++#include <dbus/dbus-glib.h>
+ #include <glib.h>
+ #include <glib/gprintf.h>
+ 
+@@ -705,6 +706,11 @@ static void on_satellites_changed(GypsySatellite *sat,  GPtrArray *sats, void *u
+ #define GYPSY_OBJ_PATH "/org/freedesktop/Gypsy"
+ 
+ int setup_gypsy() {
++	DBusGConnection *connection;
++	DBusGProxy *proxy;
++	GError *error;
++	int result;
++
+ 	gpsdata = g_new0(gps_data_t,1);
+ 
+ 	GypsyControl *gyctrl = gypsy_control_get_default();
+@@ -723,6 +729,22 @@ int setup_gypsy() {
+ 	gpsdata->fix.mode = gypsy_device_get_fix_status(gydevice, NULL);
+ 	gpsdata->valid = gpsdata->fix.mode > 1;
+ 
++  error = NULL;
++  connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++  if (connection == NULL) {
++    g_printerr ("Failed to open connection to bus: %s\n",
++          error->message);
++    g_error_free (error);
++    proxy = NULL;
++  }
++
++  proxy = dbus_g_proxy_new_for_name (connection,
++             "org.freesmartphone.ousaged",
++             "/org/freesmartphone/Usage",
++             "org.freesmartphone.Usage");
++
++	dbus_g_proxy_call (proxy, "RequestResource", &error, G_TYPE_STRING, "GPS", G_TYPE_INVALID, G_TYPE_BOOLEAN, &result, G_TYPE_INVALID);
++
+ 	return 1;
+ }
+ 
+-- 
+1.5.4.5
+
============================================================
--- packages/tangogps/tangogps-fso_0.9.2.bb	1829b3be52c4104bd5fa0b9abcd36ff3948b5930
+++ packages/tangogps/tangogps-fso_0.9.2.bb	1829b3be52c4104bd5fa0b9abcd36ff3948b5930
@@ -0,0 +1,13 @@
+LICENSE = "GPLv2"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DESCRIPTION = "lightweight and fast mapping application"
+DEPENDS = "curl gtk+ gconf gypsy dbus-glib"
+
+inherit autotools
+
+SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz\
+	file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \
+	file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1"
+
+S=${WORKDIR}/tangogps-${PV}
============================================================
--- packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	089be2aa36c43d51f94e09db1e42a7291c6b8c1d
+++ packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	519709aafcf5d15f5d178fc7e95869b9214bed78
@@ -5,6 +5,7 @@ ignoreinput=2,3
 [input]
 # don't read from accellerometers for GTA02
 ignoreinput=2,3
+
 # specify accellerometer type
 accelerometer_type = gta02
 # keys
@@ -13,6 +14,10 @@ report4 = HEADSET,switch,2,0
 report3 = CHARGER,key,356,0
 report4 = HEADSET,switch,2,0
 
+# disable accelerometer since it uses LOADS of CPU resources
+[accelerometer]
+disable = 1
+
 [ogsmd]
 # GTA02 has TI Calypso
 modemtype = ti_calypso
============================================================
--- packages/freesmartphone/frameworkd_git.bb	7db81e96548c8bd3dbcb37e96e83695ccaf7a9bc
+++ packages/freesmartphone/frameworkd_git.bb	e15c6137cdb52decb3c0d85136658ae85f33ae9d
@@ -5,7 +5,7 @@ PV = "0.8.1+gitr${SRCREV}"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.1+gitr${SRCREV}"
-PR = "r11"
+PR = "r12"
 
 inherit distutils update-rc.d
 
============================================================
--- packages/gypsy/gypsy_svn.bb	2c21466c36d291378e0b1969c53da221456a3d20
+++ packages/gypsy/gypsy_svn.bb	44f510e7ce1634f707ccc12a237e279b457d624f
@@ -6,6 +6,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/${
            file://fixups.patch;patch=1;maxrev=107 \
            file://docs-reference-am.patch;patch=1;minrev=134"
 
+PR = "1"
 PV = "0.0+svnr${SRCREV}"
 S = "${WORKDIR}/${PN}"
 
+DEPENDS = "libxslt-native"
============================================================
--- packages/images/fso-image.bb	0846b765e7589f6a8a71d18695fd72da40666a8f
+++ packages/images/fso-image.bb	98a9bf4d2bcc9614c6b5f03cdbc6780b167268f7
@@ -68,7 +68,7 @@ GTK_INSTALL = "\
   openmoko-calculator2 \
   openmoko-terminal2 \
   gpe-scap \
-  tangogps \
+  tangogps-fso \
 "
 
 # FIXME these should rather be part of alsa-state,
============================================================
--- packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch	6e0c7c7aa4434946cf8b4cd831750fc911b71a8f
+++ packages/linux/gumstix-kernel-2.6.21/smc91x-fail-if-no-chip.patch	59d76958e9386ba776c4d7973ec4f781251714c9
@@ -52,7 +52,7 @@
  	
 -proceed:
 +proceed1:
-+  printk(KERN_ERR "%s: found %d smc91x chip(s)\n", __FUNCTION__);
++  printk(KERN_ERR "%s: found %d smc91x chip(s)\n", __FUNCTION__,num_devices);
  	pxa_gpio_mode(GPIO15_nCS_1_MD);
  
  	if(smc91x_devices[1]) pxa_gpio_mode(GPIO_GUMSTIX_ETH1_RST_MD);
============================================================
--- packages/linux/gumstix-kernel-2.6.21/tsc2003.c	3d88771bf7e195cd7b70a35310b8bdf58b8878fd
+++ packages/linux/gumstix-kernel-2.6.21/tsc2003.c	76927013729a5cacdb43f3e6e0f923085aeda7f6
@@ -3,7 +3,8 @@
  *
  *  Copyright (C) 2005 Bill Gatliff <bgat at billgatliff.com>
  *  Changes for 2.6.20 kernel by Nicholas Chen <nchen at cs.umd.edu>
- *  Changes for 2.6.21 kernel by Chris Dollar <chris.dollar at gmail.com>
+ *  Changes to poll for events rather than use penirq by 
+ *  Chris Dollar <chris.dollar at gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -12,7 +13,6 @@
  *  Driver for TI's TSC2003 I2C Touch Screen Controller
  */
 
-//#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -21,10 +21,8 @@
 #include <linux/bcd.h>
 #include <linux/list.h>
 #include <linux/device.h>
-#include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/delay.h>
-#include <asm-arm/arch-pxa/irqs.h>
 
 #define DRIVER_NAME "tsc2003"
 #define TSC2003_CMD(cn,pdn,m) (((cn) << 4) | ((pdn) << 2) | ((m) << 1))
@@ -37,10 +35,10 @@ enum tsc2003_pd {
 I2C_CLIENT_INSMOD_1(tsc2003);
 
 enum tsc2003_pd {
-	PD_POWERDOWN = 0, /* penirq */
-	PD_IREFOFF_ADCON = 1, /* no penirq */
-	PD_IREFON_ADCOFF = 2, /* penirq */
-	PD_IREFON_ADCON = 3, /* no penirq */
+	PD_POWERDOWN = 0,
+	PD_IREFOFF_ADCON = 1,
+	PD_IREFON_ADCOFF = 2,
+	PD_IREFON_ADCON = 3,
 	PD_PENIRQ_ARM = PD_IREFON_ADCOFF,
 	PD_PENIRQ_DISARM = PD_IREFON_ADCON,
 };
@@ -70,14 +68,10 @@ struct tsc2003_data {
 	struct i2c_client client;
 	struct device_driver driver;
 	struct input_dev *idev;
-	struct semaphore sem;
 	struct task_struct *tstask;
 	struct completion tstask_completion;
-	struct completion penirq_completion;
 	enum tsc2003_pd pd;
 	enum tsc2003_m m;
-	int penirq;
-
 	int vbat1;
 	int vbat2;
 	int temp0;
@@ -86,11 +80,12 @@ struct tsc2003_data {
 	int in2;
 };
 
-static int
-		tsc2003_i2c_detect(struct i2c_adapter *adapter, int address, int kind);
+static int tsc2003_i2c_detect(struct i2c_adapter *adapter, int address,
+			      int kind);
 
 static int tsc2003_read(struct tsc2003_data *data, enum tsc2003_cmd cmd,
-		enum tsc2003_pd pd, int *val) {
+			enum tsc2003_pd pd, int *val)
+{
 	char c;
 	char d[2];
 	int ret;
@@ -101,7 +96,8 @@ static int tsc2003_read(struct tsc2003_d
 		goto err;
 
 	udelay(20);
-	ret = i2c_master_recv(&data->client, d, data->m == M_12BIT ? 2 : 1);
+	ret =
+	    i2c_master_recv(&data->client, d, data->m == M_12BIT ? 2 : 1);
 	if (ret <= 0)
 		goto err;
 
@@ -111,70 +107,80 @@ static int tsc2003_read(struct tsc2003_d
 		if (data->m == M_12BIT)
 			*val += (d[1] >> 4);
 	}
-
 #if defined(CONFIG_I2C_DEBUG_CHIP)
 	printk(KERN_ERR "%s: val[%x] = %d\n",
-			__FUNCTION__, cmd, (((int)d[0]) << 8) + d[1]);
+	       __FUNCTION__, cmd, (((int) d[0]) << 8) + d[1]);
 #endif
 
 	return 0;
-	err: if (!ret)
+      err:if (!ret)
 		ret = -ENODEV;
 	return ret;
 }
 
 static inline int tsc2003_read_temp0(struct tsc2003_data *d, enum
-tsc2003_pd pd, int *t) {
+				     tsc2003_pd pd, int *t)
+{
 	return tsc2003_read(d, MEAS_TEMP0, pd, t);
 }
 
 sta%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list