From 9b2cb53f097545e7f4552aa36542badd3c458464 Mon Sep 17 00:00:00 2001
From: dglaude <dglaude@users.sourceforge.net>
Date: Tue, 3 Jun 2003 23:20:33 +0000
Subject: [PATCH] I will mess with CVS here... diff_ignore could be used to
 ignore some file from a recursive diff. acinclude.m4 and Makefile.am are for
 CwLinux driver.

---
 LCDd.conf                  | 43 ++++++++++++++++++++++++++++++++++++++
 acinclude.m4               | 10 ++++++---
 diff_ignore                | 43 ++++++++++++++++++++++++++++++++++++++
 server/drivers/Makefile.am |  4 +++-
 4 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 diff_ignore

diff --git a/LCDd.conf b/LCDd.conf
index d9e50e6..7cbfbce 100644
--- a/LCDd.conf
+++ b/LCDd.conf
@@ -44,6 +44,7 @@ Driver=curses
 #Driver=hd44780
 #Driver=MtxOrb
 #Driver=CFontz633
+#Driver=CwLnx
 #
 # Tells the server to load the given drivers. Multiple lines can be given.
 # The name of the driver is exactly the same as the name of the driver
@@ -206,6 +207,48 @@ size=20x4
 topleftx=7
 toplefty=7
 
+[CwLnx]
+# Cwlinux driver
+
+# Select the output device to use [/dev/lcd]
+#Device=/dev/ttyS0
+Device=/dev/ttyUSB0
+
+# Select the LCD type (size) [20x4]
+Size=20x4
+
+# Set the communication speed [9600]
+# possible values: 9600, 19200
+Speed=19200
+
+# Reinitialize the LCD's BIOS [no]
+# normally you shouldn't need this
+Reboot=no
+
+# If you have a keypad connected. Keypad layout is currently not
+# configureable from the config file.
+Keypad=yes
+
+# If you have a non standard keypad you can associate any keystrings to keys.
+# There are 6 input key in the CwLnx hardware that generate caracter
+# from 'A' to 'F'.
+#
+# The following it the build in default mapping hardcoded in the driver.
+# You can leave those unchanged if you have a standard keypad.
+# You can change it if you want to report other keystrings or have a non
+# standard keypad.
+
+# KeyMap_A=Up
+# KeyMap_B=Down
+# KeyMap_C=Left
+# KeyMap_D=Right
+# KeyMap_E=Enter
+# KeyMap_F=Escape
+
+# keypad_test_mode permit to test keypad assignement
+# Default value is no
+#keypad_test_mode=yes
+
 
 [glk]
 # Matrix Orbital GLK driver
diff --git a/acinclude.m4 b/acinclude.m4
index 417d609..0cf55a8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,16 +5,16 @@ AC_ARG_ENABLE(drivers,
   	[  --enable-drivers=<list> compile driver for LCDs in <list>.]
 	[                  drivers may be separated with commas.]
   	[                  Possible choices are:]
- 	[                    mtxorb,cfontz,cfontz633,curses,text,lb216,]
+ 	[                    mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,]
  	[                    hd44780,joy,irman,lirc,bayrad,glk,,mtc_s16209x]
  	[                    stv5730,sed1330,sed1520,svga,lcdm001,t6963]
 	[                    lcterm,icp_a106,ms6931]
 	[                  \"all\" compiles all drivers],
   	drivers="$enableval",
-  	drivers=[lcdm001,mtxorb,cfontz,cfontz633,curses,text,lb216,bayrad,glk])
+  	drivers=[lcdm001,mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,bayrad,glk])
 
 if test "$drivers" = "all"; then
-	drivers=[mtxorb,cfontz,cfontz633,curses,text,lb216,mtc_s16209x,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svga,lcdm001,t6963,lcterm,icp_a106,ms6931]
+	drivers=[mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,mtc_s16209x,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svga,lcdm001,t6963,lcterm,icp_a106,ms6931]
 fi
 
   	drivers=`echo $drivers | sed 's/,/ /g'`
@@ -114,6 +114,10 @@ dnl				else
 				AC_DEFINE(CURSES_HAS_WCOLOR_SET)
 			fi
 			;;
+		cwlnx)
+			DRIVERS="$DRIVERS CwLnx${SO}"
+			actdrivers=["$actdrivers cwlnx"]
+			;;
 		text)
 			DRIVERS="$DRIVERS text${SO}"
 			actdrivers=["$actdrivers text"]
diff --git a/diff_ignore b/diff_ignore
new file mode 100644
index 0000000..e8fee87
--- /dev/null
+++ b/diff_ignore
@@ -0,0 +1,43 @@
+#*#
+*.a
+*.bak
+*.gmo
+*.o
+*.so
+*.orig
+*.pot
+*.pox
+*.rej
+*.swp
+*~
+.#*
+.deps
+CVS
+Makefile
+Makefile.in
+POTFILES
+TAGS
+aclocal.m4
+cat-id-tbl.c
+charset.alias
+LCDd
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+core
+install-sh
+libintl.h
+missing
+mkinstalldirs
+ref-add.sed
+ref-del.sed
+stamp-cat-id
+stamp-h
+stamp-h.in
+tags
+undep.sh
diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am
index a53c5ac..8c470be 100644
--- a/server/drivers/Makefile.am
+++ b/server/drivers/Makefile.am
@@ -18,12 +18,14 @@ LDFLAGS += @LDSHARED@
 LIBS =
 
 pkglib_PROGRAMS = @DRIVERS@
-EXTRA_PROGRAMS = bayrad CFontz CFontz633 curses glk hd44780 irman icp_a106 joy lb216 mtc_s16209x lcdm001 lcterm lirc MtxOrb sed1330 sed1520 stv5730 svga t6963 text wirz_sli ms6931
+EXTRA_PROGRAMS = bayrad CFontz CFontz633 curses CwLnx glk hd44780 irman icp_a106 joy lb216 mtc_s16209x lcdm001 lcterm lirc MtxOrb sed1330 sed1520 stv5730 svga t6963 text wirz_sli ms6931
 noinst_LIBRARIES = libLCD.a
 
 CFontz_LDADD =       libLCD.a
 CFontz633_LDADD =    libLCD.a
 curses_LDADD =       @LIBCURSES@
+CwLnx_LDADD =        libLCD.a
+CwLnx_SOURCES =      lcd.h CwLnx.c CwLnx.h report.h
 hd44780_LDADD =      libLCD.a @HD44780_DRIVERS@
 hd44780_DEPENDENCIES = @HD44780_DRIVERS@
 icp_a106_LDADD =     libLCD.a