X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb%2Fttpci%2Fav7110_ir.c;h=665cdb8a3f718db433aa7c3c12c1b549429d3e53;hb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;hp=eaf3cb2c9b0a796f1d02095bfa6b7d4ad15ea223;hpb=e3f6fb6212a7102bdb56ba38fa1e98fe72950475;p=linux-2.6.git

diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index eaf3cb2c9..665cdb8a3 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -10,8 +10,9 @@
 
 #define UP_TIMEOUT (HZ/4)
 
-/* enable ir debugging by or'ing av7110_debug with 16 */
+/* enable ir debugging by or'ing debug with 16 */
 
+static int ir_initialized;
 static struct input_dev input_dev;
 
 static u32 ir_config;
@@ -19,40 +20,40 @@ static u32 ir_config;
 static u16 key_map [256] = {
 	KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7,
 	KEY_8, KEY_9, KEY_BACK, 0, KEY_POWER, KEY_MUTE, 0, KEY_INFO,
-	KEY_VOLUMEUP, KEY_VOLUMEDOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+	KEY_VOLUMEUP, KEY_VOLUMEDOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	KEY_CHANNELUP, KEY_CHANNELDOWN, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, KEY_TEXT, 0, 0, KEY_TV, 0, 0, 0, 0, 0, KEY_SETUP, 0, 0,
 	0, 0, 0, KEY_SUBTITLE, 0, 0, KEY_LANGUAGE, 0,
-	KEY_RADIO, 0, 0, 0, 0, KEY_EXIT, 0, 0, 
+	KEY_RADIO, 0, 0, 0, 0, KEY_EXIT, 0, 0,
 	KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_OK, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RED, KEY_GREEN, KEY_YELLOW,
-	KEY_BLUE, 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_LIST, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+	KEY_BLUE, 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_LIST, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, KEY_UP, KEY_UP, KEY_DOWN, KEY_DOWN,
-	0, 0, 0, 0, KEY_EPG, 0, 0, 0, 
+	0, 0, 0, 0, KEY_EPG, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_VCR
 };
 
 
-static void av7110_emit_keyup (unsigned long data)
+static void av7110_emit_keyup(unsigned long data)
 {
-	if (!data || !test_bit (data, input_dev.key))
+	if (!data || !test_bit(data, input_dev.key))
 		return;
 
-	input_event (&input_dev, EV_KEY, data, !!0);
+	input_event(&input_dev, EV_KEY, data, !!0);
 }
 
 
 static struct timer_list keyup_timer = { .function = av7110_emit_keyup };
 
 
-static void av7110_emit_key (u32 ircom)
+static void av7110_emit_key(u32 ircom)
 {
 	u8 data;
 	u8 addr;
@@ -72,9 +73,9 @@ static void av7110_emit_key (u32 ircom)
 	}
 
 	keycode = key_map[data];
-	
+
 	dprintk(16, "#########%08x######### addr %i data 0x%02x (keycode %i)\n",
-		 ircom, addr, data, keycode);
+		ircom, addr, data, keycode);
 
 	/* check device address (if selected) */
 	if (ir_config & 0x4000)
@@ -86,41 +87,41 @@ static void av7110_emit_key (u32 ircom)
 		return;
 	}
 
-	if (ir_config & 0x0001) 
+	if (ir_config & 0x0001)
 		new_toggle = 0; /* RCMM */
 	else
 		new_toggle = (ircom & 0x800); /* RC5 */
 
-	if (timer_pending (&keyup_timer)) {
-		del_timer (&keyup_timer);
+	if (timer_pending(&keyup_timer)) {
+		del_timer(&keyup_timer);
 		if (keyup_timer.data != keycode || new_toggle != old_toggle) {
-			input_event (&input_dev, EV_KEY, keyup_timer.data, !!0);
-			input_event (&input_dev, EV_KEY, keycode, !0);
+			input_event(&input_dev, EV_KEY, keyup_timer.data, !!0);
+			input_event(&input_dev, EV_KEY, keycode, !0);
 		} else
-			input_event (&input_dev, EV_KEY, keycode, 2);
+			input_event(&input_dev, EV_KEY, keycode, 2);
 
 	} else
-	input_event (&input_dev, EV_KEY, keycode, !0);
+		input_event(&input_dev, EV_KEY, keycode, !0);
 
 	keyup_timer.expires = jiffies + UP_TIMEOUT;
 	keyup_timer.data = keycode;
 
-	add_timer (&keyup_timer);
+	add_timer(&keyup_timer);
 
 	old_toggle = new_toggle;
 }
 
-static void input_register_keys (void)
+static void input_register_keys(void)
 {
 	int i;
 
-	memset (input_dev.keybit, 0, sizeof(input_dev.keybit));
+	memset(input_dev.keybit, 0, sizeof(input_dev.keybit));
 
-	for (i=0; i<sizeof(key_map)/sizeof(key_map[0]); i++) {
+	for (i = 0; i < sizeof(key_map) / sizeof(key_map[0]); i++) {
 		if (key_map[i] > KEY_MAX)
 			key_map[i] = 0;
 		else if (key_map[i] > KEY_RESERVED)
-			set_bit (key_map[i], input_dev.keybit);
+			set_bit(key_map[i], input_dev.keybit);
 	}
 }
 
@@ -131,77 +132,79 @@ static void input_repeat_key(unsigned long data)
 }
 
 
-static int av7110_ir_write_proc (struct file *file, const char __user *buffer,
-	                  unsigned long count, void *data)
+static int av7110_ir_write_proc(struct file *file, const char __user *buffer,
+				unsigned long count, void *data)
 {
 	char *page;
 	int size = 4 + 256 * sizeof(u16);
 
 	if (count < size)
 		return -EINVAL;
-	
-	page = (char *)vmalloc(size);
+
+	page = (char *) vmalloc(size);
 	if (!page)
 		return -ENOMEM;
-	
+
 	if (copy_from_user(page, buffer, size)) {
 		vfree(page);
 		return -EFAULT;
 	}
 
-	memcpy (&ir_config, page, 4);
-	memcpy (&key_map, page + 4, 256 * sizeof(u16));
-
+	memcpy(&ir_config, page, 4);
+	memcpy(&key_map, page + 4, 256 * sizeof(u16));
 	vfree(page);
-
-	av7110_setup_irc_config (NULL, ir_config);
-
-	input_register_keys ();
-
+	av7110_setup_irc_config(NULL, ir_config);
+	input_register_keys();
 	return count;
 }
 
 
-int __init av7110_ir_init (void)
+int __init av7110_ir_init(void)
 {
 	static struct proc_dir_entry *e;
 
-	init_timer (&keyup_timer);
+	if (ir_initialized)
+		return 0;
+
+	init_timer(&keyup_timer);
 	keyup_timer.data = 0;
 
-        input_dev.name = "DVB on-card IR receiver";
+	input_dev.name = "DVB on-card IR receiver";
 
-        /**
-         *  enable keys
-         */
-        set_bit (EV_KEY, input_dev.evbit);
-        set_bit (EV_REP, input_dev.evbit);
+	/**
+	 *  enable keys
+	 */
+	set_bit(EV_KEY, input_dev.evbit);
+	set_bit(EV_REP, input_dev.evbit);
 
-	input_register_keys ();
+	input_register_keys();
 
 	input_register_device(&input_dev);
 	input_dev.timer.function = input_repeat_key;
 
-	av7110_setup_irc_config (NULL, 0x0001);
-	av7110_register_irc_handler (av7110_emit_key);
-
-	e = create_proc_entry ("av7110_ir", S_IFREG | S_IRUGO | S_IWUSR, NULL);
+	av7110_setup_irc_config(NULL, 0x0001);
+	av7110_register_irc_handler(av7110_emit_key);
 
+	e = create_proc_entry("av7110_ir", S_IFREG | S_IRUGO | S_IWUSR, NULL);
 	if (e) {
 		e->write_proc = av7110_ir_write_proc;
 		e->size = 4 + 256 * sizeof(u16);
 	}
 
+	ir_initialized = 1;
 	return 0;
 }
 
 
-void __exit av7110_ir_exit (void)
+void __exit av7110_ir_exit(void)
 {
+	if (ir_initialized == 0)
+		return;
 	del_timer_sync(&keyup_timer);
-	remove_proc_entry ("av7110_ir", NULL);
-	av7110_unregister_irc_handler (av7110_emit_key);
+	remove_proc_entry("av7110_ir", NULL);
+	av7110_unregister_irc_handler(av7110_emit_key);
 	input_unregister_device(&input_dev);
+	ir_initialized = 0;
 }
 
 //MODULE_AUTHOR("Holger Waechtler <holger@convergence.de>");