Changeset 855

Timestamp:

03/03/08 17:52:50 (9 months ago)

Author:

michux

Message:

add new driver (st2205) by Jeroen/Sprite_tm

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• config.h.in (modified) (2 diffs)
• configure.in (modified) (1 diff)
• drivers.m4 (modified) (4 diffs)
• drv.c (modified) (2 diffs)

trunk/Makefile.am

@@ -92 +92 @@
 drv_RouterBoard.c             \
 drv_Sample.c                  \
+drv_st2205.c                  \
 drv_serdisplib.c              \
 drv_SimpleLCD.c               \

trunk/Makefile.in

@@ -287 +287 @@
 drv_RouterBoard.c             \
 drv_Sample.c                  \
+drv_st2205.c                  \
 drv_serdisplib.c              \
 drv_SimpleLCD.c               \
@@ -479 +480 @@
 @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@

trunk/config.h.in

@@ -122 +122 @@
 #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. */
@@ -488 +491 @@
 /* SimpleLCD driver */
 #undef WITH_SIMPLELCD
+
+/* st2205 driver */
+#undef WITH_ST2205
 
 /* T6963 driver */

trunk/configure.in

@@ -78 +78 @@
 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])

trunk/drivers.m4

@@ -37 +37 @@
   [                        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
@@ -84 +84 @@
          ROUTERBOARD="yes"
          SAMPLE="yes"
+         ST2205="yes"
    SERDISPLIB="yes"
          SIMPLELCD="yes"
@@ -177 +178 @@
          SIMPLELCD=$val
          ;;
+      st2205)
+         ST2205=$val
+         ;;
       T6963)
          T6963=$val
@@ -479 +483 @@
    DRIVERS="$DRIVERS drv_SimpleLCD.o"
    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
 

trunk/drv.c

@@ -72 +72 @@
 extern DRIVER drv_RouterBoard;
 extern DRIVER drv_Sample;
+extern DRIVER drv_st2205;
 extern DRIVER drv_serdisplib;
 extern DRIVER drv_SimpleLCD;
@@ -159 +160 @@
 #ifdef WITH_SAMPLE
     &drv_Sample,
+#endif
+#ifdef WITH_ST2205
+    &drv_st2205,
 #endif
 #ifdef WITH_SERDISPLIB