From 49dd9207d75fb1dd5f8b960cf71be2969f96c45f Mon Sep 17 00:00:00 2001 From: ddouthitt Date: Mon, 1 Oct 2001 21:51:27 +0000 Subject: [PATCH] Added new driver: * lcdm001 (with updates to autoconfig and Makefiles) --- LCDd.conf | 5 +++++ acconfig.h | 2 ++ acinclude.m4 | 10 +++++++--- server/drivers/Makefile.am | 1 + server/drivers/lcd.c | 8 ++++++++ 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/LCDd.conf b/LCDd.conf index 2dd1c0f..1869442 100644 --- a/LCDd.conf +++ b/LCDd.conf @@ -65,6 +65,11 @@ User dgd [joy] +# LCDM001 driver + +[lcdm001] +Arguments -d /dev/lcd + # MatrixOrbital driver [MtxOrb] diff --git a/acconfig.h b/acconfig.h index b4d0ae6..6f5d26d 100644 --- a/acconfig.h +++ b/acconfig.h @@ -48,6 +48,8 @@ #undef MTXORB_DRV +#undef LCDM001_DRV + #undef SED1520_DRV #undef STV5730_DRV diff --git a/acinclude.m4 b/acinclude.m4 index e266421..9b1e84b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -6,15 +6,15 @@ AC_ARG_ENABLE(drivers, [ drivers may be separated with commas.] [ \"all\" compiles all drivers], drivers="$enableval", - drivers=[mtxorb,cfontz,curses,text,lb216,bayrad,glk]) + drivers=[lcdm001,mtxorb,cfontz,curses,text,lb216,bayrad,glk]) if test "$drivers" = "all"; then case "$host" in *-*-*linux*) - drivers=[mtxorb,cfontz,curses,text,lb216,hd44780,joy,irman,lircin,bayrad,glk,stv5730,sed1520,svgalib] + drivers=[lcdm001,mtxorb,cfontz,curses,text,lb216,hd44780,joy,irman,lircin,bayrad,glk,stv5730,sed1520,svgalib] ;; *-*-*solaris*) - drivers=[mtxorb,cfontz,curses,text,lb216,bayrad,glk] + drivers=[lcdm001,mtxorb,cfontz,curses,text,lb216,bayrad,glk] ;; esac AC_MSG_RESULT(all) @@ -25,6 +25,10 @@ fi for driver in $drivers do case "$driver" in + lcdm001) + DRIVERS="$DRIVERS lcdm001.o" + AC_DEFINE(LCDM001_DRV) + ;; mtxorb) DRIVERS="$DRIVERS MtxOrb.o" AC_DEFINE(MTXORB_DRV) diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index c663713..f9fbb44 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am @@ -1,6 +1,7 @@ noinst_LIBRARIES = libLCDdrivers.a libLCDdrivers_a_SOURCES = lcd.c lcd.h lcd_lib.c EXTRA_libLCDdrivers_a_SOURCES = MtxOrb.c MtxOrb.h text.c text.h \ + lcdm001.c lcdm001.h \ curses_drv.c curses_drv.h drv_base.h \ hd44780.c hd44780.h lb216.c lb216.h \ hd44780-4bit.c hd44780-4bit.h \ diff --git a/server/drivers/lcd.c b/server/drivers/lcd.c index d4719b7..6098ce3 100644 --- a/server/drivers/lcd.c +++ b/server/drivers/lcd.c @@ -65,6 +65,10 @@ static char *lcd_drv_getinfo (); * */ +#ifdef LCDM001_DRV +#include "lcdm001.h" +#endif + #ifdef MTXORB_DRV #include "MtxOrb.h" #endif @@ -154,6 +158,10 @@ lcd_logical_driver lcd, *lcd_root = NULL, *lcd_ptr = NULL; // lcd_physical_driver drivers[] = { +#ifdef LCDM001_DRV + {"lcdm001", lcdm001_init,}, + {"LCDM001", lcdm001_init,}, +#endif #ifdef MTXORB_DRV {"MtxOrb", MtxOrb_init,}, {"MatrixOrbital", MtxOrb_init,},