Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bfb646c authored by Richard Purdie's avatar Richard Purdie Committed by Linus Torvalds
Browse files

[PATCH] LED: Add IDE disk activity LED trigger 



Add an LED trigger for IDE disk activity to the ide-disk driver.

Signed-off-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Acked-by: default avatarBartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 03731fbd

drivers/ide/ide-disk.c

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/mutex.h>

#include <linux/leds.h>



#define _IDE_DISK
@@ -317,6 +318,8 @@ static ide_startstop_t ide_do_rw_disk (ide_drive_t *drive, struct request *rq, s 
		return ide_stopped;

	}



	ledtrig_ide_activity();



	pr_debug("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n",

		 drive->name, rq_data_dir(rq) == READ ? "read" : "writ",

		 (unsigned long long)block, rq->nr_sectors,

drivers/leds/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -66,5 +66,12 @@ config LEDS_TRIGGER_TIMER 
	  This allows LEDs to be controlled by a programmable timer

	  via sysfs. If unsure, say Y.



config LEDS_TRIGGER_IDE_DISK

	bool "LED Timer Trigger"

	depends LEDS_TRIGGERS && BLK_DEV_IDEDISK

	help

	  This allows LEDs to be controlled by IDE disk activity.

	  If unsure, say Y.



endmenu

drivers/leds/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ obj-$(CONFIG_LEDS_TOSA) += leds-tosa.o 


# LED Triggers

obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o

obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o

drivers/leds/ledtrig-ide-disk.c

0 → 100644
+62 −0
Original line number Diff line number Diff line 
/*

 * LED IDE-Disk Activity Trigger

 *

 * Copyright 2006 Openedhand Ltd.

 *

 * Author: Richard Purdie <rpurdie@openedhand.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

 * published by the Free Software Foundation.

 *

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/timer.h>

#include <linux/leds.h>



static void ledtrig_ide_timerfunc(unsigned long data);



DEFINE_LED_TRIGGER(ledtrig_ide);

static DEFINE_TIMER(ledtrig_ide_timer, ledtrig_ide_timerfunc, 0, 0);

static int ide_activity;

static int ide_lastactivity;



void ledtrig_ide_activity(void)

{

	ide_activity++;

	if (!timer_pending(&ledtrig_ide_timer))

		mod_timer(&ledtrig_ide_timer, jiffies + msecs_to_jiffies(10));

}

EXPORT_SYMBOL(ledtrig_ide_activity);



static void ledtrig_ide_timerfunc(unsigned long data)

{

	if (ide_lastactivity != ide_activity) {

		ide_lastactivity = ide_activity;

		led_trigger_event(ledtrig_ide, LED_FULL);

	    	mod_timer(&ledtrig_ide_timer, jiffies + msecs_to_jiffies(10));

	} else {

		led_trigger_event(ledtrig_ide, LED_OFF);

	}

}



static int __init ledtrig_ide_init(void)

{

	led_trigger_register_simple("ide-disk", &ledtrig_ide);

	return 0;

}



static void __exit ledtrig_ide_exit(void)

{

	led_trigger_unregister_simple(ledtrig_ide);

}



module_init(ledtrig_ide_init);

module_exit(ledtrig_ide_exit);



MODULE_AUTHOR("Richard Purdie <rpurdie@openedhand.com>");

MODULE_DESCRIPTION("LED IDE Disk Activity Trigger");

MODULE_LICENSE("GPL");

include/linux/leds.h

+8 −0
Original line number Diff line number Diff line
@@ -100,4 +100,12 @@ extern void led_trigger_event(struct led_trigger *trigger, 
#define led_trigger_event(x, y) do {} while(0)



#endif



/* Trigger specific functions */

#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK

extern void ledtrig_ide_activity(void);

#else

#define ledtrig_ide_activity() do {} while(0)

#endif



#endif		/* __LINUX_LEDS_H_INCLUDED */