patch-2.4.4 linux/drivers/char/toshiba.c

• Lines: 108
• Date: Fri Apr 6 10:42:55 2001
• Orig file: v2.4.3/linux/drivers/char/toshiba.c
• Orig date: Wed Sep 27 13:53:56 2000

diff -u --recursive --new-file v2.4.3/linux/drivers/char/toshiba.c linux/drivers/char/toshiba.c
@@ -1,19 +1,24 @@
 /* toshiba.c -- Linux driver for accessing the SMM on Toshiba laptops
  *
- * Copyright (c) 1996-2000  Jonathan A. Buzzard (jonathan@buzzard.org.uk)
+ * Copyright (c) 1996-2001  Jonathan A. Buzzard (jonathan@buzzard.org.uk)
  *
  * Valuable assistance and patches from:
  *     Tom May <tom@you-bastards.com>
  *     Rob Napier <rnapier@employees.org>
  *
  * Fn status port numbers for machine ID's courtesy of
+ *     0xfc02: Scott Eisert <scott.e@sky-eye.com>
+ *     0xfc04: Steve VanDevender <stevev@efn.org>
  *     0xfc08: Garth Berry <garth@itsbruce.net>
+ *     0xfc0a: Egbert Eich <eich@xfree86.org>
+ *     0xfc10: Andrew Lofthouse <Andrew.Lofthouse@robins.af.mil>
  *     0xfc11: Spencer Olson <solson@novell.com>
  *     0xfc13: Claudius Frankewitz <kryp@gmx.de>
  *     0xfc15: Tom May <tom@you-bastards.com>
  *     0xfc17: Dave Konrad <konrad@xenia.it>
  *     0xfc1a: George Betzos <betzos@engr.colostate.edu>
  *     0xfc1d: Arthur Liu <armie@slap.mine.nu>
+ *     0xfcd1: Mr. Dave Konrad <konrad@xenia.it>
  *
  * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
  *
@@ -46,7 +51,7 @@
  *
  */
 
-#define TOSH_VERSION "1.7 22/6/2000"
+#define TOSH_VERSION "1.9 22/3/2001"
 #define TOSH_DEBUG 0
 
 #include <linux/module.h>
@@ -117,27 +122,6 @@
 
 
 /*
- * At some point we need to emulate setting the HDD auto off times for
- * the new laptops. We can do this by calling the ide_ioctl on /dev/hda.
- * The values we need for the various times are
- *
- *    Disabled   0x00
- *    1 minute   0x0c
- *    3 minutes  0x24
- *    5 minutes  0x3c
- *   10 minutes  0x78
- *   15 minutes  0xb4
- *   20 minutes  0xf0
- *   30 minutes  0xf1
- *
- */
-/*static int tosh_emulate_hdd(SMMRegisters *regs)
-{
-	return 0;
-}*/
-
-
-/*
  * For the Portage 610CT and the Tecra 700CS/700CDT emulate the HCI fan function
  */
 static int tosh_emulate_fan(SMMRegisters *regs)
@@ -348,11 +332,12 @@
 static void tosh_set_fn_port(void)
 {
 	switch (tosh_id) {
+		case 0xfc02: case 0xfc04: case 0xfc09: case 0xfc0a: case 0xfc10:
 		case 0xfc11: case 0xfc13: case 0xfc15: case 0xfc1a:
 			tosh_fn = 0x62;
 			break;
-		case 0xfc08: case 0xfc17: case 0xfc1d: case 0xfcd1:
-		case 0xfce0: case 0xfce2:
+		case 0xfc08: case 0xfc17: case 0xfc1d: case 0xfcd1: case 0xfce0:
+		case 0xfce2:
 			tosh_fn = 0x68;
 			break;
 		default:
@@ -472,7 +457,6 @@
 	   0xa0-0xbf we can't. We just have to live dangerously and use the
 	   ports anyway, oh boy! */
 
-
 	/* do we need to emulate the fan? */
 
 	if ((tosh_id==0xfccb) || (tosh_id==0xfccc))
@@ -501,7 +485,9 @@
 	misc_register(&tosh_device);
 
 	/* register the proc entry */
+
 	create_proc_info_entry("toshiba", 0, NULL, tosh_get_info);
+
 	return 0;
 }
 
@@ -514,9 +500,11 @@
 void cleanup_module(void)
 {
 	/* remove the proc entry */
+
 	remove_proc_entry("toshiba", NULL);
 
 	/* unregister the device file */
+
 	misc_deregister(&tosh_device);
 }
 #endif