add new driver (st2205) by Jeroen/Sprite_tm

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@855 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/Makefile.am b/Makefile.am
index 5b84356bbc3fc6c1822b625192e4d6b4d1ec74f3..81d07a97102980e4d8011ae60a83a72c5ed652f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,6 +91,7 @@ drv_Pertelian                 \
 drv_picoLCD.c                 \
 drv_RouterBoard.c             \
 drv_Sample.c                  \
+drv_st2205.c                  \
 drv_serdisplib.c              \
 drv_SimpleLCD.c               \
 drv_T6963.c                   \

diff --git a/Makefile.in b/Makefile.in
index 47b01d28eb8614ff8ea430d9e0e8711abfc015a7..65a95f8f538442f3d1f33e801ebb3c72032afe3e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -286,6 +286,7 @@ drv_Pertelian                 \
 drv_picoLCD.c                 \
 drv_RouterBoard.c             \
 drv_Sample.c                  \
+drv_st2205.c                  \
 drv_serdisplib.c              \
 drv_SimpleLCD.c               \
 drv_T6963.c                   \
@@ -478,6 +479,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_text.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_picoLCD.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_serdisplib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_st2205.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evaluator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout.Po@am__quote@

diff --git a/config.h.in b/config.h.in
index 650b03e878b589e1ee941490cfcf9d67f6c6487e..dcb1e738aa7f4983dd3aa91cafc3aa3c230c726c 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -121,6 +121,9 @@
 /* Define to 1 if you have the `sqrt' function. */
 #undef HAVE_SQRT
 
+/* Define to 1 if you have the <st2205.h> header file. */
+#undef HAVE_ST2205_H
+
 /* Define to 1 if `stat' has the bug that it succeeds when given the
    zero-length file name argument. */
 #undef HAVE_STAT_EMPTY_STRING_BUG
@@ -488,6 +491,9 @@
 /* SimpleLCD driver */
 #undef WITH_SIMPLELCD
 
+/* st2205 driver */
+#undef WITH_ST2205
+
 /* T6963 driver */
 #undef WITH_T6963
 

diff --git a/configure.in b/configure.in
index e3e79e915a119adfc2534b9215da99e7fb776f1a..78ff1e68cf742d27f0dbcdc87d074766e952ec3c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,9 @@ AC_CHECK_HEADERS(luise.h, [has_luise="true"], [has_luise="false"])
 # check for serdisplib
 AC_CHECK_HEADERS(serdisplib/serdisp.h, [has_serdisplib="true"], [has_serdisplib="false"])
 
+# check for st2205 libs
+AC_CHECK_HEADERS(st2205.h, [has_st2205="true"], [has_st2205="false"])
+
 # check for LCD-Linux
 AC_CHECK_HEADERS(linux/lcd-linux.h linux/hd44780.h, [has_lcd_linux="true"], [has_lcd_linux="false"; break])
 

diff --git a/drivers.m4 b/drivers.m4
index e89978f7c0cdd80a71eaa765ae75f39738842594..59d67adb999ec583ddc5488964932c2e928e6ff4 100644 (file)
--- a/drivers.m4
+++ b/drivers.m4
@@ -36,8 +36,8 @@ AC_ARG_WITH(
   [                        G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,]
   [                        LUIse, M50530, MatrixOrbital, MilfordInstruments,]
   [                        Noritake, NULL, PNG, PPM, Pertelian, picoLCD, RouterBoard,]
-  [                        Sample, serdisplib, SimpleLCD, T6963, Trefon, USBLCD,]
-  [                        USBHUB, WincorNixdorf, X11],
+  [                        Sample, serdisplib, SimpleLCD, st2205, T6963, Trefon,]
+  [                        USBLCD, USBHUB, WincorNixdorf, X11],
   drivers=$withval, 
   drivers=all
 )
@@ -83,6 +83,7 @@ for driver in $drivers; do
          PPM="yes"
          ROUTERBOARD="yes"
          SAMPLE="yes"
+         ST2205="yes"
         SERDISPLIB="yes"
          SIMPLELCD="yes"
          T6963="yes"
@@ -176,6 +177,9 @@ for driver in $drivers; do
       SimpleLCD)
          SIMPLELCD=$val
          ;;
+      st2205)
+         ST2205=$val
+         ;;
       T6963)
          T6963=$val
          ;;
@@ -480,6 +484,17 @@ if test "$SIMPLELCD" = "yes"; then
    AC_DEFINE(WITH_SIMPLELCD,1,[SimpleLCD driver])
 fi
 
+if test "$ST2205" = "yes"; then
+   if test "$has_st2205" = "true"; then
+      GRAPHIC="yes"
+      DRIVERS="$DRIVERS drv_st2205.o"
+      DRVLIBS="$DRVLIBS -L/usr/local/lib -lst2205"
+      AC_DEFINE(WITH_ST2205,1,[st2205 driver])
+   else
+      AC_MSG_WARN(st2205.h not found: st2205 driver disabled)
+   fi
+fi
+
 if test "$T6963" = "yes"; then
    GRAPHIC="yes"
    PARPORT="yes"

diff --git a/drv.c b/drv.c
index 31d6aa21c310014ada8556826f8c17a0a1dac058..b8e1344b757397d8de852c53e7db3e0792d1a092 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -71,6 +71,7 @@ extern DRIVER drv_Pertelian;
 extern DRIVER drv_picoLCD;
 extern DRIVER drv_RouterBoard;
 extern DRIVER drv_Sample;
+extern DRIVER drv_st2205;
 extern DRIVER drv_serdisplib;
 extern DRIVER drv_SimpleLCD;
 extern DRIVER drv_T6963;
@@ -159,6 +160,9 @@ DRIVER *Driver[] = {
 #ifdef WITH_SAMPLE
     &drv_Sample,
 #endif
+#ifdef WITH_ST2205
+    &drv_st2205,
+#endif
 #ifdef WITH_SERDISPLIB
     &drv_serdisplib,
 #endif