DPF driver by Stefan Kuhne 8note that you need libdpf)

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

Author: michael

Makefile.am

@@ -78,6 +78,7 @@ drv_Crystalfontz.c            \
 drv_Curses.c                  \
 drv_Cwlinux.c                 \
 drv_D4D.c                     \
+drv_dpf.c                     \
 drv_EA232graphic.c            \
 drv_EFN.c                     \
 drv_FW8888.c                  \

Makefile.in

@@ -251,7 +251,7 @@ AM_CFLAGS = -D_GNU_SOURCE -Wall -Wextra -fno-strict-aliasing
 ACLOCAL_AMFLAGS = -I m4
 # use this for lots of warnings
 #AM_CFLAGS = -D_GNU_SOURCE -std=c99 -m64 -Wall -W -pedantic -Wno-variadic-macros -fno-strict-aliasing
-lcd4linux_LDFLAGS = 
+lcd4linux_LDFLAGS = "-Wl,--as-needed"
 lcd4linux_LDADD = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
 lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@
 lcd4linux_SOURCES = \
@@ -310,6 +310,7 @@ drv_Crystalfontz.c            \
 drv_Curses.c                  \
 drv_Cwlinux.c                 \
 drv_D4D.c                     \
+drv_dpf.c                     \
 drv_EA232graphic.c            \
 drv_EFN.c                     \
 drv_FW8888.c                  \
@@ -570,6 +571,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_USBLCD.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_WincorNixdorf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_X11.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_dpf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_gpio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_graphic.Po@am__quote@

config.h.in

@@ -67,6 +67,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <libdpf/libdpf.h> header file. */
+#undef HAVE_LIBDPF_LIBDPF_H
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
@@ -492,6 +495,9 @@
 /* Define if using the dmalloc debugging malloc package */
 #undef WITH_DMALLOC
 
+/* DPF driver */
+#undef WITH_DPF
+
 /* Electronic Assembly RS232 graphic driver */
 #undef WITH_EA232graphic
 

configure

@@ -1442,7 +1442,7 @@ Optional Packages:
                           drivers may be excluded with 'all,!<driver>',
                           (try 'all,\!<driver>' if your shell complains...)
                           possible drivers are:
-                          ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D,
+                          ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D, DPF
                           EA232Graphic, EFN, FW8888, G15, GLCD2USB, HD44780, HD44780-I2C,
                           IRLCD, LCD2USB, LCDLinux, LEDMatrix, LCDTerm, LPH7508, LUIse,
                           LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX, MilfordInstruments, MDM166A,
@@ -5690,6 +5690,22 @@ fi
 done
 
 
+# check for libdpf libs
+for ac_header in libdpf/libdpf.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libdpf/libdpf.h" "ac_cv_header_libdpf_libdpf_h" "$ac_includes_default"
+if test "x$ac_cv_header_libdpf_libdpf_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBDPF_LIBDPF_H 1
+_ACEOF
+ has_libdpf="true"
+else
+  has_libdpf="false"
+fi
+
+done
+
+
 # check for vncserver libs
 for ac_header in rfb/rfb.h
 do :
@@ -6261,6 +6277,7 @@ for driver in $drivers; do
          CURSES="yes"
          CWLINUX="yes"
          D4D="yes"
+         DPF="yes"
          EA232graphic="yes"
          EFN="yes"
          FW8888="yes"
@@ -6327,6 +6344,9 @@ for driver in $drivers; do
       D4D)
          D4D=$val
          ;;
+      DPF)
+         DPF=$val
+         ;;
       EA232graphic)
          EA232graphic=$val
          ;;
@@ -6573,6 +6593,20 @@ $as_echo "#define WITH_D4D 1" >>confdefs.h
 
 fi
 
+if test "$DPF" = "yes"; then
+   if test "$has_libdpf" = "true"; then
+      GRAPHIC="yes"
+      DRIVERS="$DRIVERS drv_dpf.o"
+      DRVLIBS="$DRVLIBS -Llibdpf -ldpf -lusb"
+
+$as_echo "#define WITH_DPF 1" >>confdefs.h
+
+   else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdpf.h not found: DPF driver disabled" >&5
+$as_echo "$as_me: WARNING: libdpf.h not found: DPF driver disabled" >&2;}
+   fi
+fi
+
 if test "$EA232graphic" = "yes"; then
    GRAPHIC="yes"
    SERIAL="yes"
@@ -7030,6 +7064,7 @@ $as_echo "$as_me: WARNING: st2205.h not found: st2205 driver disabled" >&2;}
    fi
 fi
 
+
 if test "$T6963" = "yes"; then
    if test "$has_parport" = "true"; then
       GRAPHIC="yes"

configure.in

@@ -84,6 +84,9 @@ AC_CHECK_HEADERS(serdisplib/serdisp.h, [has_serdisplib="true"], [has_serdisplib=
 # check for st2205 libs
 AC_CHECK_HEADERS(st2205.h, [has_st2205="true"], [has_st2205="false"])
 
+# check for libdpf libs
+AC_CHECK_HEADERS(libdpf/libdpf.h, [has_libdpf="true"], [has_libdpf="false"])
+
 # check for vncserver libs
 AC_CHECK_HEADERS(rfb/rfb.h, [has_vncserverlib="true"], [has_vncserverlib="false"])
 

drivers.m4

@@ -32,7 +32,7 @@ AC_ARG_WITH(
   [                        drivers may be excluded with 'all,!<driver>',]
   [                        (try 'all,\!<driver>' if your shell complains...)]
   [                        possible drivers are:]
-  [                        ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D,]
+  [                        ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D, DPF]
   [                        EA232Graphic, EFN, FW8888, G15, GLCD2USB, HD44780, HD44780-I2C,]
   [                        IRLCD, LCD2USB, LCDLinux, LEDMatrix, LCDTerm, LPH7508, LUIse,]
   [                        LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX, MilfordInstruments, MDM166A,]
@@ -67,6 +67,7 @@ for driver in $drivers; do
          CURSES="yes"
          CWLINUX="yes"
          D4D="yes"
+         DPF="yes"
          EA232graphic="yes"
          EFN="yes"
          FW8888="yes"
@@ -133,6 +134,9 @@ for driver in $drivers; do
       D4D)
          D4D=$val
          ;;
+      DPF)
+         DPF=$val
+         ;;
       EA232graphic)
          EA232graphic=$val
          ;;
@@ -361,6 +365,17 @@ if test "$D4D" = "yes"; then
    AC_DEFINE(WITH_D4D,1,[D4D driver])
 fi
 
+if test "$DPF" = "yes"; then
+   if test "$has_libdpf" = "true"; then
+      GRAPHIC="yes"
+      DRIVERS="$DRIVERS drv_dpf.o"
+      DRVLIBS="$DRVLIBS -Llibdpf -ldpf -lusb"
+      AC_DEFINE(WITH_DPF,1,[DPF driver])
+   else
+      AC_MSG_WARN(libdpf.h not found: DPF driver disabled)
+   fi
+fi
+
 if test "$EA232graphic" = "yes"; then
    GRAPHIC="yes"
    SERIAL="yes"
@@ -725,6 +740,7 @@ if test "$ST2205" = "yes"; then
    fi
 fi
 
+
 if test "$T6963" = "yes"; then
    if test "$has_parport" = "true"; then
       GRAPHIC="yes"

drv.c

@@ -54,6 +54,7 @@ extern DRIVER drv_Crystalfontz;
 extern DRIVER drv_Curses;
 extern DRIVER drv_Cwlinux;
 extern DRIVER drv_D4D;
+extern DRIVER drv_DPF;
 extern DRIVER drv_EA232graphic;
 extern DRIVER drv_EFN;
 extern DRIVER drv_FW8888;
@@ -127,6 +128,9 @@ DRIVER *Driver[] = {
 #ifdef WITH_D4D
     &drv_D4D,
 #endif
+#ifdef WITH_DPF
+    &drv_DPF,
+#endif
 #ifdef WITH_EA232graphic
     &drv_EA232graphic,
 #endif