[Pommed-commits] r258 - in trunk/pommed: . mactel pmac
Julien Blache
jblache at alioth.debian.org
Thu Feb 22 00:55:50 CET 2007
Author: jblache
Date: 2007-02-22 00:55:49 +0100 (Thu, 22 Feb 2007)
New Revision: 258
Modified:
trunk/pommed/kbd_backlight.h
trunk/pommed/mactel/kbd_backlight.c
trunk/pommed/pmac/kbd_backlight.c
Log:
Merge kbd_bck_status and kbd_bck_info.
Modified: trunk/pommed/kbd_backlight.h
===================================================================
--- trunk/pommed/kbd_backlight.h 2007-02-21 21:04:44 UTC (rev 257)
+++ trunk/pommed/kbd_backlight.h 2007-02-21 23:55:49 UTC (rev 258)
@@ -27,6 +27,11 @@
{
int level;
int max;
+
+ int auto_on; /* automatic */
+ int off; /* turned off ? */
+ int r_sens; /* right sensor */
+ int l_sens; /* left sensor */
};
extern struct _kbd_bck_info kbd_bck_info;
Modified: trunk/pommed/mactel/kbd_backlight.c
===================================================================
--- trunk/pommed/mactel/kbd_backlight.c 2007-02-21 21:04:44 UTC (rev 257)
+++ trunk/pommed/mactel/kbd_backlight.c 2007-02-21 23:55:49 UTC (rev 258)
@@ -3,7 +3,7 @@
*
* $Id$
*
- * Copyright (C) 2006 Julien BLACHE <jb at jblache.org>
+ * Copyright (C) 2006-2007 Julien BLACHE <jb at jblache.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -40,16 +40,7 @@
struct _kbd_bck_info kbd_bck_info;
-static struct
-{
- int auto_on; /* automatic */
- int off; /* turned off ? */
- int value; /* previous value */
- int r_sens; /* right sensor */
- int l_sens; /* left sensor */
-} kbd_bck_status;
-
int
has_kbd_backlight(void)
{
@@ -101,24 +92,24 @@
curval = kbd_backlight_get();
/* automatic backlight toggle by user */
- if ((val == KBD_BACKLIGHT_OFF) && (kbd_bck_status.auto_on))
+ if ((val == KBD_BACKLIGHT_OFF) && (kbd_bck_info.auto_on))
{
- if (!kbd_bck_status.off)
+ if (!kbd_bck_info.off)
{
- kbd_bck_status.off = 1;
- kbd_bck_status.value = curval;
+ kbd_bck_info.off = 1;
+ kbd_bck_info.level = curval;
}
else
{
- kbd_bck_status.off = 0;
- val = kbd_bck_status.value;
+ kbd_bck_info.off = 0;
+ val = kbd_bck_info.level;
}
}
/* backlight turned on again by user */
if ((val > KBD_BACKLIGHT_OFF)
- && (kbd_bck_status.auto_on) && (kbd_bck_status.off))
- kbd_bck_status.off = 0;
+ && (kbd_bck_info.auto_on) && (kbd_bck_info.off))
+ kbd_bck_info.off = 0;
if (val == curval)
return;
@@ -188,17 +179,15 @@
void
kbd_backlight_init(void)
{
- kbd_bck_status.auto_on = 0;
- kbd_bck_status.off = 0;
+ kbd_bck_info.auto_on = 0;
+ kbd_bck_info.off = 0;
if (!has_kbd_backlight())
{
- kbd_bck_status.value = 0;
- kbd_bck_status.r_sens = 0;
- kbd_bck_status.l_sens = 0;
+ kbd_bck_info.r_sens = 0;
+ kbd_bck_info.l_sens = 0;
kbd_bck_info.level = 0;
- kbd_bck_info.level = 0;
ambient_info.left = 0;
ambient_info.right = 0;
@@ -207,14 +196,13 @@
return;
}
- kbd_bck_status.value = kbd_backlight_get();
- if (kbd_bck_status.value < 0)
- kbd_bck_status.value = 0;
+ kbd_bck_info.level = kbd_backlight_get();
+ if (kbd_bck_info.level < 0)
+ kbd_bck_info.level = 0;
- kbd_bck_info.level = kbd_bck_status.value;
kbd_bck_info.max = KBD_BACKLIGHT_MAX;
- ambient_init(&kbd_bck_status.r_sens, &kbd_bck_status.l_sens);
+ ambient_init(&kbd_bck_info.r_sens, &kbd_bck_info.l_sens);
}
void
@@ -232,7 +220,7 @@
logdebug("Ambient light lower threshold reached\n");
/* backlight turned on automatically, then disabled by user */
- if (kbd_bck_status.auto_on && kbd_bck_status.off)
+ if (kbd_bck_info.auto_on && kbd_bck_info.off)
return;
/* backlight already on */
@@ -240,28 +228,28 @@
return;
/* turn on backlight */
- kbd_bck_status.auto_on = 1;
- kbd_bck_status.off = 0;
+ kbd_bck_info.auto_on = 1;
+ kbd_bck_info.off = 0;
kbd_backlight_set(kbd_cfg.auto_lvl);
}
- else if (kbd_bck_status.auto_on)
+ else if (kbd_bck_info.auto_on)
{
if ((amb_r > kbd_cfg.off_thresh) || (amb_l > kbd_cfg.off_thresh))
{
logdebug("Ambient light upper threshold reached\n");
- kbd_bck_status.auto_on = 0;
- kbd_bck_status.off = 0;
+ kbd_bck_info.auto_on = 0;
+ kbd_bck_info.off = 0;
kbd_backlight_set(KBD_BACKLIGHT_OFF);
}
}
- mbpdbus_send_ambient_light(amb_l, kbd_bck_status.l_sens, amb_r, kbd_bck_status.r_sens);
+ mbpdbus_send_ambient_light(amb_l, kbd_bck_info.l_sens, amb_r, kbd_bck_info.r_sens);
- kbd_bck_status.r_sens = amb_r;
- kbd_bck_status.l_sens = amb_l;
+ kbd_bck_info.r_sens = amb_r;
+ kbd_bck_info.l_sens = amb_l;
}
Modified: trunk/pommed/pmac/kbd_backlight.c
===================================================================
--- trunk/pommed/pmac/kbd_backlight.c 2007-02-21 21:04:44 UTC (rev 257)
+++ trunk/pommed/pmac/kbd_backlight.c 2007-02-21 23:55:49 UTC (rev 258)
@@ -49,16 +49,7 @@
struct _kbd_bck_info kbd_bck_info;
-static struct
-{
- int auto_on; /* automatic */
- int off; /* turned off ? */
- int value; /* previous value */
- int r_sens; /* right sensor */
- int l_sens; /* left sensor */
-} kbd_bck_status;
-
static int lmuaddr; /* i2c bus address */
static char *i2cdev; /* i2c bus device */
@@ -89,26 +80,24 @@
curval = kbd_backlight_get();
/* automatic backlight toggle by user */
- if ((val == KBD_BACKLIGHT_OFF) && (kbd_bck_status.auto_on))
+ if ((val == KBD_BACKLIGHT_OFF) && (kbd_bck_info.auto_on))
{
- if (!kbd_bck_status.off)
+ if (!kbd_bck_info.off)
{
- printf("trouc: status is off\n");
- kbd_bck_status.off = 1;
- kbd_bck_status.value = curval;
+ kbd_bck_info.off = 1;
+ kbd_bck_info.level = curval;
}
else
{
- printf("trouc: status is on\n");
- kbd_bck_status.off = 0;
- val = kbd_bck_status.value;
+ kbd_bck_info.off = 0;
+ val = kbd_bck_info.level;
}
}
/* backlight turned on again by user */
if ((val > KBD_BACKLIGHT_OFF)
- && (kbd_bck_status.auto_on) && (kbd_bck_status.off))
- kbd_bck_status.off = 0;
+ && (kbd_bck_info.auto_on) && (kbd_bck_info.off))
+ kbd_bck_info.off = 0;
if (val == curval)
return;
@@ -184,7 +173,7 @@
newval = val + kbd_cfg.step;
if (newval > KBD_BACKLIGHT_MAX)
- newval = KBD_BACKLIGHT_MAX;
+ newval = KBD_BACKLIGHT_MAX;
logdebug("KBD stepping +%d -> %d\n", kbd_cfg.step, newval);
}
@@ -193,7 +182,7 @@
newval = val - kbd_cfg.step;
if (newval < KBD_BACKLIGHT_OFF)
- newval = KBD_BACKLIGHT_OFF;
+ newval = KBD_BACKLIGHT_OFF;
logdebug("KBD stepping -%d -> %d\n", kbd_cfg.step, newval);
}
@@ -208,8 +197,8 @@
{
int ret;
- kbd_bck_status.auto_on = 0;
- kbd_bck_status.off = 0;
+ kbd_bck_info.auto_on = 0;
+ kbd_bck_info.off = 0;
lmuaddr = kbd_get_lmuaddr();
i2cdev = "/dev/i2c-7";
@@ -221,12 +210,10 @@
lmuaddr = 0;
i2cdev = NULL;
- kbd_bck_status.value = 0;
- kbd_bck_status.r_sens = 0;
- kbd_bck_status.l_sens = 0;
+ kbd_bck_info.r_sens = 0;
+ kbd_bck_info.l_sens = 0;
kbd_bck_info.level = 0;
- kbd_bck_info.level = 0;
ambient_info.left = 0;
ambient_info.right = 0;
@@ -235,15 +222,14 @@
return;
}
- kbd_bck_status.value = kbd_backlight_get();
+ kbd_bck_info.level = kbd_backlight_get();
- if (kbd_bck_status.value < 0)
- kbd_bck_status.value = 0;
+ if (kbd_bck_info.level < 0)
+ kbd_bck_info.level = 0;
- kbd_bck_info.level = kbd_bck_status.value;
kbd_bck_info.max = KBD_BACKLIGHT_MAX;
- ambient_init(&kbd_bck_status.r_sens, &kbd_bck_status.l_sens);
+ ambient_init(&kbd_bck_info.r_sens, &kbd_bck_info.l_sens);
}
void
@@ -261,7 +247,7 @@
logdebug("Ambient light lower threshold reached\n");
/* backlight turned on automatically, then disabled by user */
- if (kbd_bck_status.auto_on && kbd_bck_status.off)
+ if (kbd_bck_info.auto_on && kbd_bck_info.off)
return;
/* backlight already on */
@@ -269,28 +255,28 @@
return;
/* turn on backlight */
- kbd_bck_status.auto_on = 1;
- kbd_bck_status.off = 0;
+ kbd_bck_info.auto_on = 1;
+ kbd_bck_info.off = 0;
kbd_backlight_set(kbd_cfg.auto_lvl);
}
- else if (kbd_bck_status.auto_on)
+ else if (kbd_bck_info.auto_on)
{
if ((amb_r > kbd_cfg.off_thresh) || (amb_l > kbd_cfg.off_thresh))
{
logdebug("Ambient light upper threshold reached\n");
- kbd_bck_status.auto_on = 0;
- kbd_bck_status.off = 0;
+ kbd_bck_info.auto_on = 0;
+ kbd_bck_info.off = 0;
kbd_backlight_set(KBD_BACKLIGHT_OFF);
}
}
- mbpdbus_send_ambient_light(amb_l, kbd_bck_status.l_sens, amb_r, kbd_bck_status.r_sens);
+ mbpdbus_send_ambient_light(amb_l, kbd_bck_info.l_sens, amb_r, kbd_bck_info.r_sens);
- kbd_bck_status.r_sens = amb_r;
- kbd_bck_status.l_sens = amb_l;
+ kbd_bck_info.r_sens = amb_r;
+ kbd_bck_info.l_sens = amb_l;
}
More information about the Pommed-commits
mailing list