Revision: 107
http://svn.sourceforge.net/mactel-linux/?rev=107&view=rev
Author: nboichat
Date: 2007-04-10 02:50:46 -0700 (Tue, 10 Apr 2007)
Log Message:
-----------
Remove useless debug messages.
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.21/0011-applesmc2.patch
Modified: trunk/kernel/mactel-patches-2.6.21/0011-applesmc2.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.21/0011-applesmc2.patch 2007-04-10
09:50:11 UTC (rev 106)
+++ trunk/kernel/mactel-patches-2.6.21/0011-applesmc2.patch 2007-04-10
09:50:46 UTC (rev 107)
@@ -5,14 +5,14 @@
---
- drivers/hwmon/applesmc.c | 606 +++++++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 540 insertions(+), 66 deletions(-)
+ drivers/hwmon/applesmc.c | 601 +++++++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 535 insertions(+), 66 deletions(-)
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
-index f7b59fc..e86d858 100644
+index f7b59fc..f320f7b 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
-@@ -37,40 +37,71 @@
+@@ -37,40 +37,69 @@
#include <linux/hwmon-sysfs.h>
#include <asm/io.h>
#include <linux/leds.h>
@@ -54,33 +54,18 @@
#define LIGHT_SENSOR_RIGHT_KEY "ALV1" /* r-o length 6 */
-#define BACKLIGHT_KEY "LKSB" /* w-o */
+#define BACKLIGHT_KEY "LKSB" /* w-o length 2 */
-+
-+#define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */
-#define CLAMSHELL_KEY "MSLD" /* r-o length 1 (unused) */
-+#define MOTION_SENSOR_X_KEY "MO_X" /* r-o sp78 (2 bytes) */
-+#define MOTION_SENSOR_Y_KEY "MO_Y" /* r-o sp78 (2 bytes) */
-+#define MOTION_SENSOR_Z_KEY "MO_Z" /* r-o sp78 (2 bytes) */
-+#define MOTION_SENSOR_KEY "MOCN" /* r/w ui16 */
-+
-+/* Interrupt controls. */
-+/* Don't know what these parameters control. */
-+#define MOTION_SENSOR_PARAM_1L "MOLD" /* r/w ui8 */
-+#define MOTION_SENSOR_PARAM_1H "MOHD" /* r/w ui8 */
-+
-+/*
-+ * If the norm of the position (sqrt(MO_X^2+MO_Y^2+MO_Z^2)) is smaller than
-+ * MOLT (free fall), or bigger than MOHT (high acceleration), SMC will trigger
-+ * an interrupt.
-+ */
-+#define MOTION_MIN_NORM "MOLT" /* r/w sp78 (2 bytes) */
-+#define MOTION_MAX_NORM "MOHT" /* r/w sp78 (2 bytes) */
++#define CLAMSHELL_KEY "MSLD" /* r-o ui8 (unused) */
-#define MOTION_SENSOR_X_KEY "MO_X" /* r-o length 2 */
-#define MOTION_SENSOR_Y_KEY "MO_Y" /* r-o length 2 */
-#define MOTION_SENSOR_Z_KEY "MO_Z" /* r-o length 2 */
-#define MOTION_SENSOR_KEY "MOCN" /* r/w length 2 */
-+#define MSDW_KEY "MSDW" /* r/w flag (1 byte) */
++#define MOTION_SENSOR_X_KEY "MO_X" /* r-o sp78 (2 bytes) */
++#define MOTION_SENSOR_Y_KEY "MO_Y" /* r-o sp78 (2 bytes) */
++#define MOTION_SENSOR_Z_KEY "MO_Z" /* r-o sp78 (2 bytes) */
++#define MOTION_SENSOR_KEY "MOCN" /* r/w ui16 */
-#define FANS_COUNT "FNum" /* r-o length 1 */
-#define FANS_MANUAL "FS! " /* r-w length 2 */
@@ -89,6 +74,19 @@
-#define FAN_MAX_SPEED "F0Mx" /* r-o length 2 */
-#define FAN_SAFE_SPEED "F0Sf" /* r-o length 2 */
-#define FAN_TARGET_SPEED "F0Tg" /* r-w length 2 */
++/*
++ * Interrupt controls.
++ * If the norm of the position (sqrt(MO_X^2+MO_Y^2+MO_Z^2)) is smaller than
++ * MOLT (free fall), or bigger than MOHT (high acceleration) for longer than
the
++ * value of MOLD (or MOHD), SMC will trigger an interrupt.
++ */
++#define MOTION_LOW_NORM "MOLT" /* r/w sp78 (2 bytes) */
++#define MOTION_HIGH_NORM "MOHT" /* r/w sp78 (2 bytes) */
++#define MOTION_LOW_NORM_INTERVAL "MOLD" /* r/w ui8 */
++#define MOTION_HIGH_NORM_INTERVAL "MOHD" /* r/w ui8 */
++
++#define MSDW_KEY "MSDW" /* r/w flag (1 byte) */
++
+#define FANS_COUNT "FNum" /* r-o ui8 */
+#define FANS_MANUAL "FS! " /* r-w ui16 */
+#define FAN_ACTUAL_SPEED "F0Ac" /* r-o fpe2 */
@@ -107,7 +105,7 @@
{ "TC0D", "TC0P", NULL }
};
-@@ -122,6 +153,9 @@ static unsigned int applesmc_temperature_set;
+@@ -122,6 +151,9 @@ static unsigned int applesmc_temperature_set;
static struct mutex applesmc_lock;
@@ -117,7 +115,7 @@
/*
* __wait_status - Wait up to 100ms for the status port to get a certain value
* (masked with 0x0f), returning zero if the value is obtained. Callers must
-@@ -152,17 +186,22 @@ static int __wait_status(u8 val)
+@@ -152,17 +184,22 @@ static int __wait_status(u8 val)
*/
static int applesmc_read_key(const char* key, u8* buffer, u8 len)
{
@@ -143,7 +141,7 @@
}
if (debug)
printk(KERN_DEBUG "<%s", key);
-@@ -173,7 +212,7 @@ static int applesmc_read_key(const char* key, u8* buffer,
u8 len)
+@@ -173,7 +210,7 @@ static int applesmc_read_key(const char* key, u8* buffer,
u8 len)
for (i = 0; i < len; i++) {
if (__wait_status(0x05))
@@ -152,7 +150,7 @@
buffer[i] = inb(APPLESMC_DATA_PORT);
if (debug)
printk(KERN_DEBUG "<%x", buffer[i]);
-@@ -181,10 +220,7 @@ static int applesmc_read_key(const char* key, u8* buffer,
u8 len)
+@@ -181,10 +218,7 @@ static int applesmc_read_key(const char* key, u8* buffer,
u8 len)
if (debug)
printk(KERN_DEBUG "\n");
@@ -164,7 +162,7 @@
}
/*
-@@ -194,30 +230,100 @@ out:
+@@ -194,30 +228,100 @@ out:
*/
static int applesmc_write_key(const char* key, u8* buffer, u8 len)
{
@@ -272,7 +270,7 @@
}
/*
-@@ -249,12 +355,79 @@ static int applesmc_read_motion_sensor(int index, s16*
value)
+@@ -249,12 +353,79 @@ static int applesmc_read_motion_sensor(int index, s16*
value)
}
/*
@@ -353,7 +351,7 @@
u8 buffer[2];
if (!applesmc_accelerometer)
-@@ -262,32 +435,76 @@ static int applesmc_device_init(void)
+@@ -262,32 +433,76 @@ static int applesmc_device_init(void)
mutex_lock(&applesmc_lock);
@@ -392,11 +390,11 @@
+ "will not receive interrupts.\n");
+
+ /* Setup interrupt controls. */
-+ buffer[0] = 0x14;
-+ ret1 = applesmc_init_check_key_value(MOTION_SENSOR_PARAM_1L, buffer, 1);
++ buffer[0] = 20; /* 20 msecs */
++ ret1 = applesmc_init_check_key_value(MOTION_LOW_NORM_INTERVAL, buffer,
1);
+
-+ buffer[0] = 0x14;
-+ ret2 = applesmc_init_check_key_value(MOTION_SENSOR_PARAM_1H, buffer, 1);
++ buffer[0] = 20; /* 20 msecs */
++ ret2 = applesmc_init_check_key_value(MOTION_HIGH_NORM_INTERVAL, buffer,
1);
+
+ if (ret1 || ret2) {
+ printk(KERN_WARNING "applesmc: Cannot set motion sensor "
@@ -405,11 +403,11 @@
+
+ buffer[0] = 0x00;
+ buffer[1] = 0x60;
-+ ret1 = applesmc_init_check_key_value(MOTION_MIN_NORM, buffer, 2);
++ ret1 = applesmc_init_check_key_value(MOTION_LOW_NORM, buffer, 2);
+
+ buffer[0] = 0x01;
+ buffer[1] = 0xc0;
-+ ret2 = applesmc_init_check_key_value(MOTION_MAX_NORM, buffer, 2);
++ ret2 = applesmc_init_check_key_value(MOTION_HIGH_NORM, buffer, 2);
+
+ if (ret1 || ret2) {
+ printk(KERN_WARNING "applesmc: Cannot set motion sensor "
@@ -452,7 +450,7 @@
out:
mutex_unlock(&applesmc_lock);
-@@ -332,9 +549,16 @@ static int applesmc_resume(struct platform_device *dev)
+@@ -332,9 +547,16 @@ static int applesmc_resume(struct platform_device *dev)
return applesmc_device_init();
}
@@ -469,7 +467,7 @@
.driver = {
.name = "applesmc",
.owner = THIS_MODULE,
-@@ -587,6 +811,33 @@ out:
+@@ -587,6 +809,33 @@ out:
return count;
}
@@ -503,7 +501,7 @@
static ssize_t applesmc_calibrate_show(struct device *dev,
struct device_attribute *attr, char *sysfsbuf)
{
-@@ -603,6 +854,26 @@ static ssize_t applesmc_calibrate_store(struct device
*dev,
+@@ -603,6 +852,26 @@ static ssize_t applesmc_calibrate_store(struct device
*dev,
return count;
}
@@ -530,7 +528,7 @@
static void applesmc_backlight_set(struct led_classdev *led_cdev,
enum led_brightness value)
{
-@@ -615,6 +886,168 @@ static void applesmc_backlight_set(struct led_classdev
*led_cdev,
+@@ -615,6 +884,165 @@ static void applesmc_backlight_set(struct led_classdev
*led_cdev,
mutex_unlock(&applesmc_lock);
}
@@ -553,12 +551,9 @@
+ if (!ret && key[0]) {
+ applesmc_get_key_info(key, info);
+
-+ printk("Reading %s len %d.\n", key, info[0]);
+ ret2 = applesmc_read_key(key, buffer, info[0]);
-+ printk("Ret %d, buf[0]=%x.\n", ret2, buffer[0]);
+ if (!ret2) {
+ for (i = 0; i < info[0]; i++) {
-+ printk("buffer[%d]=%02x\n", i, buffer[i]);
+ sprintf(outbuffer+(i*2), "%02x", buffer[i]);
+ }
+ outbuffer[info[0]*2] = 0;
@@ -648,65 +643,65 @@
+ return count;
+}
+
-+static ssize_t applesmc_param_1_min_show(struct device *dev,
++static ssize_t applesmc_low_norm_trigger_show(struct device *dev,
+ struct device_attribute *attr, char *sysfsbuf)
+{
-+ return applesmc_param_show(MOTION_SENSOR_PARAM_1L, 1, sysfsbuf);
++ return applesmc_param_show(MOTION_LOW_NORM_INTERVAL, 1, sysfsbuf);
+}
+
-+static ssize_t applesmc_param_1_max_show(struct device *dev,
++static ssize_t applesmc_high_norm_trigger_show(struct device *dev,
+ struct device_attribute *attr, char *sysfsbuf)
+{
-+ return applesmc_param_show(MOTION_SENSOR_PARAM_1H, 1, sysfsbuf);
++ return applesmc_param_show(MOTION_HIGH_NORM_INTERVAL, 1, sysfsbuf);
+}
+
-+static ssize_t applesmc_norm_min_show(struct device *dev,
++static ssize_t applesmc_low_norm_show(struct device *dev,
+ struct device_attribute *attr, char *sysfsbuf)
+{
-+ return applesmc_param_show(MOTION_MIN_NORM, 2, sysfsbuf);
++ return applesmc_param_show(MOTION_LOW_NORM, 2, sysfsbuf);
+}
+
-+static ssize_t applesmc_norm_max_show(struct device *dev,
++static ssize_t applesmc_high_norm_show(struct device *dev,
+ struct device_attribute *attr, char *sysfsbuf)
+{
-+ return applesmc_param_show(MOTION_MAX_NORM, 2, sysfsbuf);
++ return applesmc_param_show(MOTION_HIGH_NORM, 2, sysfsbuf);
+}
+
-+static ssize_t applesmc_param_1_min_store(struct device *dev,
++static ssize_t applesmc_low_norm_trigger_store(struct device *dev,
+ struct device_attribute *attr, const char *sysfsbuf, size_t count)
+{
-+ return applesmc_param_store(MOTION_SENSOR_PARAM_1L, 1, sysfsbuf, count);
++ return applesmc_param_store(MOTION_LOW_NORM_INTERVAL, 1, sysfsbuf,
count);
+}
+
-+static ssize_t applesmc_param_1_max_store(struct device *dev,
++static ssize_t applesmc_high_norm_trigger_store(struct device *dev,
+ struct device_attribute *attr, const char *sysfsbuf, size_t count)
+{
-+ return applesmc_param_store(MOTION_SENSOR_PARAM_1H, 1, sysfsbuf, count);
++ return applesmc_param_store(MOTION_HIGH_NORM_INTERVAL, 1, sysfsbuf,
count);
+}
+
-+static ssize_t applesmc_norm_min_store(struct device *dev,
++static ssize_t applesmc_low_norm_store(struct device *dev,
+ struct device_attribute *attr, const char *sysfsbuf, size_t count)
+{
-+ return applesmc_param_store(MOTION_MIN_NORM, 2, sysfsbuf, count);
++ return applesmc_param_store(MOTION_LOW_NORM, 2, sysfsbuf, count);
+}
+
-+static ssize_t applesmc_norm_max_store(struct device *dev,
++static ssize_t applesmc_high_norm_store(struct device *dev,
+ struct device_attribute *attr, const char *sysfsbuf, size_t count)
+{
-+ return applesmc_param_store(MOTION_MAX_NORM, 2, sysfsbuf, count);
++ return applesmc_param_store(MOTION_HIGH_NORM, 2, sysfsbuf, count);
+}
+
static struct led_classdev applesmc_backlight = {
.name = "smc:kbd_backlight",
.default_trigger = "nand-disk",
-@@ -624,9 +1057,29 @@ static struct led_classdev applesmc_backlight = {
+@@ -624,9 +1052,29 @@ static struct led_classdev applesmc_backlight = {
static DEVICE_ATTR(position, 0444, applesmc_position_show, NULL);
static DEVICE_ATTR(calibrate, 0644,
applesmc_calibrate_show, applesmc_calibrate_store);
-+static DEVICE_ATTR(param_1_min, 0644, applesmc_param_1_min_show,
applesmc_param_1_min_store);
-+static DEVICE_ATTR(param_1_max, 0644, applesmc_param_1_max_show,
applesmc_param_1_max_store);
-+static DEVICE_ATTR(norm_min, 0644, applesmc_norm_min_show,
applesmc_norm_min_store);
-+static DEVICE_ATTR(norm_max, 0644, applesmc_norm_max_show,
applesmc_norm_max_store);
++static DEVICE_ATTR(low_norm_trigger_interval, 0644,
applesmc_low_norm_trigger_show, applesmc_low_norm_trigger_store);
++static DEVICE_ATTR(high_norm_trigger_interval, 0644,
applesmc_high_norm_trigger_show, applesmc_high_norm_trigger_store);
++static DEVICE_ATTR(low_norm_trigger, 0644, applesmc_low_norm_show,
applesmc_low_norm_store);
++static DEVICE_ATTR(high_norm_trigger, 0644, applesmc_high_norm_show,
applesmc_high_norm_store);
static DEVICE_ATTR(light, 0444, applesmc_light_show, NULL);
@@ -716,10 +711,10 @@
+static struct attribute *accelerometer_attributes[] = {
+ &dev_attr_position.attr,
+ &dev_attr_calibrate.attr,
-+ &dev_attr_param_1_min.attr,
-+ &dev_attr_param_1_max.attr,
-+ &dev_attr_norm_min.attr,
-+ &dev_attr_norm_max.attr,
++ &dev_attr_low_norm_trigger.attr,
++ &dev_attr_high_norm_trigger.attr,
++ &dev_attr_low_norm_trigger_interval.attr,
++ &dev_attr_high_norm_trigger_interval.attr,
+ NULL
+};
+
@@ -729,7 +724,7 @@
/*
* Macro defining SENSOR_DEVICE_ATTR for a fan sysfs entries.
* - show actual speed
-@@ -655,6 +1108,9 @@ static SENSOR_DEVICE_ATTR_2(fan##offset##_target_speed,
S_IRUGO | S_IWUSR, \
+@@ -655,6 +1103,9 @@ static SENSOR_DEVICE_ATTR_2(fan##offset##_target_speed,
S_IRUGO | S_IWUSR, \
static SENSOR_DEVICE_ATTR(fan##offset##_manual, S_IRUGO | S_IWUSR, \
applesmc_show_fan_manual, applesmc_store_fan_manual, offset); \
\
@@ -739,7 +734,7 @@
static struct attribute *fan##offset##_attributes[] = { \
&sensor_dev_attr_fan##offset##_actual_speed.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_minimum_speed.dev_attr.attr, \
-@@ -662,6 +1118,7 @@ static struct attribute *fan##offset##_attributes[] = { \
+@@ -662,6 +1113,7 @@ static struct attribute *fan##offset##_attributes[] = { \
&sensor_dev_attr_fan##offset##_safe_speed.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_target_speed.dev_attr.attr, \
&sensor_dev_attr_fan##offset##_manual.dev_attr.attr, \
@@ -747,7 +742,7 @@
NULL \
};
-@@ -694,6 +1151,16 @@ static SENSOR_DEVICE_ATTR(temperature_5, S_IRUGO,
+@@ -694,6 +1146,16 @@ static SENSOR_DEVICE_ATTR(temperature_5, S_IRUGO,
applesmc_show_temperature, NULL, 5);
static SENSOR_DEVICE_ATTR(temperature_6, S_IRUGO,
applesmc_show_temperature, NULL, 6);
@@ -764,7 +759,7 @@
static struct attribute *temperature_attributes[] = {
&sensor_dev_attr_temperature_0.dev_attr.attr,
-@@ -703,6 +1170,11 @@ static struct attribute *temperature_attributes[] = {
+@@ -703,6 +1165,11 @@ static struct attribute *temperature_attributes[] = {
&sensor_dev_attr_temperature_4.dev_attr.attr,
&sensor_dev_attr_temperature_5.dev_attr.attr,
&sensor_dev_attr_temperature_6.dev_attr.attr,
@@ -776,7 +771,7 @@
};
/* Module stuff */
-@@ -734,11 +1206,8 @@ static int applesmc_create_accelerometer(void)
+@@ -734,11 +1201,8 @@ static int applesmc_create_accelerometer(void)
{
int ret;
@@ -790,7 +785,7 @@
if (ret)
goto out;
-@@ -900,6 +1369,11 @@ static int __init applesmc_init(void)
+@@ -900,6 +1364,11 @@ static int __init applesmc_init(void)
goto out_accelerometer;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mactel-linux-devel mailing list
Mactel-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mactel-linux-devel
