[Linux-mips-commits]CVS: linux/drivers/char Config.in,1.34,1.35 buttons.c,1.1,1.2 e105btns.c,1.1,1.2 gpiobtns.c,1.1,1.2

[Leblanc f. <fle...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv14927/drivers/char

Modified Files:
	Config.in buttons.c e105btns.c gpiobtns.c 
Log Message:
Casio e15 support improvement.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Config.in	18 Mar 2002 22:35:50 -0000	1.34
+++ Config.in	23 Apr 2002 13:14:29 -0000	1.35
@@ -93,6 +93,16 @@
      bool '    Enable Touch Panel Interface Unit Support' CONFIG_VRC4173_PIU
    fi
 fi
+if [ "$CONFIG_CPU_VR41XX" = "y" ]; then
+	tristate 'VR touch panel driver support' CONFIG_TOUCH_PANEL y
+	tristate 'VR buttons driver support' CONFIG_BUTTONS y
+	if [ "$CONFIG_BUTTONS" = "y" ]; then
+		tristate ' GPIO buttons support' CONFIG_VR41XX_GPIO_BUTTONS 
+		tristate ' E105 buttons support' CONFIG_VR41XX_E105_BUTTONS 
+		tristate ' Direct power off support' CONFIG_BUTTONS_DIRECT_POWEROFF 
+	fi
+	tristate 'A/D interface support' CONFIG_ADIF
+fi
 if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ZORRO" = "y" ]; then
    tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
 fi

Index: buttons.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/buttons.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- buttons.c	7 Mar 2002 09:15:16 -0000	1.1
+++ buttons.c	23 Apr 2002 13:14:29 -0000	1.2
@@ -5,11 +5,16 @@
  * SMP-safe.  VR41xx CPUs don't support SMP anyway.
  *
  * Copyright (c) 2000 Michael Klar <wyl...@in...>
- * Copyright (c) 2001 François Leblanc <fra...@ce...>
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
+ */
+/*
+ * Changes:
+ * Francois Leblanc <fra...@ce...> Wed, 27 Mar 2002
+ *  - Add print version to follow updates.
+ * 
  */
 
 #include <linux/kernel.h>

Index: e105btns.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/e105btns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- e105btns.c	7 Mar 2002 09:15:16 -0000	1.1
+++ e105btns.c	23 Apr 2002 13:14:29 -0000	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/* 
  * Casio E-10x/50x input button (sub)driver
  *
  * Original driver by Robert Coie, modified and integrated into main VR41xx

Index: gpiobtns.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/gpiobtns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gpiobtns.c	7 Mar 2002 09:15:16 -0000	1.1
+++ gpiobtns.c	23 Apr 2002 13:14:29 -0000	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/* 
  * GPIO button functions for VR41xx button input driver
  *
  * Note that the way this driver does atomic access to buffers is not
@@ -45,12 +44,12 @@
 #endif
 
 struct gpiobtns_device {
-	struct timer_list	btn_timer;
-        btn_mask_t		btn_timer_data;
-	btn_mask_t		btn_state;
-	btn_mask_t		btn_bounce;
-	btn_mask_t		pending_bits;
-	unsigned char		press_low;
+	struct timer_list   btn_timer;
+    btn_mask_t          btn_timer_data;
+	btn_mask_t          btn_state;
+	btn_mask_t          btn_bounce;
+	btn_mask_t          pending_bits;
+	unsigned char       press_low;
 };
 
 #ifdef GPIO_BTN_PRESS_LOW