diff options
author | reinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2004-01-30 20:57:56 +0000 |
---|---|---|
committer | reinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2004-01-30 20:57:56 +0000 |
commit | f040b602703f9aa2849384c9116413f9aecf04b4 (patch) | |
tree | 6577cd2c6172763a0223ed7bb933657b1c5b5436 /lcd4linux.c | |
parent | 59a314fd82aefb99aea2e3956248a928f55fa5e4 (diff) | |
download | lcd4linux-f040b602703f9aa2849384c9116413f9aecf04b4.tar.gz |
[lcd4linux @ 2004-01-30 20:57:55 by reinelt]
HD44780 patch from Martin Hejl
dmalloc integrated
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@348 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to '')
-rw-r--r-- | lcd4linux.c | 15 | ||||
-rw-r--r-- | lcd4linux.conf.sample | 13 |
2 files changed, 24 insertions, 4 deletions
diff --git a/lcd4linux.c b/lcd4linux.c index 76d1f55..409895e 100644 --- a/lcd4linux.c +++ b/lcd4linux.c @@ -1,4 +1,4 @@ -/* $Id: lcd4linux.c,v 1.61 2004/01/14 11:33:00 reinelt Exp $ +/* $Id: lcd4linux.c,v 1.62 2004/01/30 20:57:56 reinelt Exp $ * * LCD4Linux * @@ -22,6 +22,10 @@ * * * $Log: lcd4linux.c,v $ + * Revision 1.62 2004/01/30 20:57:56 reinelt + * HD44780 patch from Martin Hejl + * dmalloc integrated + * * Revision 1.61 2004/01/14 11:33:00 reinelt * new plugin 'uname' which does what it's called * text widget nearly finished @@ -313,6 +317,10 @@ #include "layout.h" #include "plugin.h" +#ifdef WITH_DMALLOC +#include <dmalloc.h> +#endif + #define PIDFILE "/var/run/lcd4linux.pid" static char *release="LCD4Linux " VERSION " (c) 2003 Michael Reinelt <reinelt@eunet.at>"; @@ -591,6 +599,7 @@ int main (int argc, char *argv[]) drv_quit(); } pid_exit(PIDFILE); + cfg_exit(); exit (0); } @@ -641,8 +650,10 @@ int main (int argc, char *argv[]) } else { drv_quit(); } + pid_exit(PIDFILE); - + cfg_exit(); + if (got_signal==SIGHUP) { long fd; debug ("restarting..."); diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample index e4117e7..197bf94 100644 --- a/lcd4linux.conf.sample +++ b/lcd4linux.conf.sample @@ -25,6 +25,14 @@ Display CF632 { Speed 19200 } +Display CF633 { + Icons 1 + Driver 'Crystalfontz' + Model '633' + Port '/dev/tts/0' + Speed 19200 +} + Display HD44780-20x4 { Driver 'HD44780' Port '/dev/parports/0' @@ -247,9 +255,10 @@ Layout L16x2 { } #Display 'LK204' -Display 'HD44780-20x4' -#Display 'CF632' +#Display 'HD44780-20x4' #Display 'CF631' +#Display 'CF632' +Display 'CF633' #Layout 'Default' Layout 'L16x2' |