On Wed, 2007-05-09 at 20:42 +0900, kogiidena wrote:
> >As far as I can tell, the existing timer trigger can do everything the
> >blink trigger can (and more besides).
> I want to blink LED in the initial state.
Are you after to set that per LED or would some standard configurable
default for all LEDs work?
> Because that of "the existing timer trigger" was impossible, I made "BLINK".
>
> I thought about another solution.
> Can the change that sets an initial value to delay_on and delay_off be added?
That would be the preferred solution.
> The matter of "Bitshift" is reserved until this case is solved.
>
> kogiidena
> ---
> diff -urpN OLD/include/linux/leds.h NEW/include/linux/leds.h
> --- OLD/include/linux/leds.h 2007-05-07 12:12:15.000000000 +0900
> +++ NEW/include/linux/leds.h 2007-05-09 19:17:01.000000000 +0900
> @@ -14,6 +14,7 @@
>
> #include <linux/list.h>
> #include <linux/spinlock.h>
> +#include <linux/timer.h>
>
> struct device;
> struct class_device;
> @@ -41,6 +42,7 @@ struct led_classdev {
> struct class_device *class_dev;
> struct list_head node; /* LED Device list */
> char *default_trigger; /* Trigger to use */
> + void *default_trigger_data; /* Trigger to use */
>
> #ifdef CONFIG_LEDS_TRIGGERS
> /* Protects the trigger data below */
> @@ -110,6 +112,14 @@ extern void ledtrig_ide_activity(void);
> #define ledtrig_ide_activity() do {} while(0)
> #endif
>
> +#ifdef CONFIG_LEDS_TRIGGER_TIMER
> +struct timer_trig_data {
> + unsigned long delay_on; /* milliseconds on */
> + unsigned long delay_off; /* milliseconds off */
> + struct timer_list timer;
> +};
> +#endif
> +
> /* For the leds-gpio driver */
> struct gpio_led {
> const char *name;
> diff -urpN OLD/drivers/leds/ledtrig-timer.c NEW/drivers/leds/ledtrig-timer.c
> --- OLD/drivers/leds/ledtrig-timer.c 2007-04-28 06:49:26.000000000 +0900
> +++ NEW/drivers/leds/ledtrig-timer.c 2007-05-09 19:12:35.000000000 +0900
> @@ -24,12 +24,6 @@
> #include <linux/leds.h>
> #include "leds.h"
>
> -struct timer_trig_data {
> - unsigned long delay_on; /* milliseconds on */
> - unsigned long delay_off; /* milliseconds off */
> - struct timer_list timer;
> -};
> -
> static void led_timer_function(unsigned long data)
> {
> struct led_classdev *led_cdev = (struct led_classdev *) data;
> @@ -124,6 +118,7 @@ static CLASS_DEVICE_ATTR(delay_off, 0644
> static void timer_trig_activate(struct led_classdev *led_cdev)
> {
> struct timer_trig_data *timer_data;
> + struct timer_trig_data *def_trig_data = led_cdev->default_trigger_data;
> int rc;
>
> timer_data = kzalloc(sizeof(struct timer_trig_data), GFP_KERNEL);
> @@ -143,6 +138,11 @@ static void timer_trig_activate(struct l
> &class_device_attr_delay_off);
> if (rc) goto err_out_delayon;
>
> + if (def_trig_data){
> + timer_data->delay_on = def_trig_data->delay_on;
> + timer_data->delay_off = def_trig_data->delay_off;
> + mod_timer(&timer_data->timer, jiffies + 1);
> + }
> return;
>
> err_out_delayon:
The approach is probably a good idea but you'll have to split struct
timer_list timer from the data structure.
Also, if default_trigger wasn't the timer trigger you have a nice oops
waiting to happen.
Regards,
Richard
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
