aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2001-03-01 22:33:50 +0000
committerreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2001-03-01 22:33:50 +0000
commit46133e712097beaa243ac68c319603796f78526e (patch)
treed9948dd1c6ea242aa86a36b4eca9cbd4919f283d
parent4e1dbe89f4ef1f6c8086991e68c1566aae22c467 (diff)
downloadlcd4linux-46133e712097beaa243ac68c319603796f78526e.tar.gz
[lcd4linux @ 2001-03-01 22:33:50 by reinelt]
renamed Raster_flush() to PPM_flush() git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@92 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r--Raster.c19
-rw-r--r--lcd4linux.conf.sample23
-rw-r--r--udelay.c7
3 files changed, 30 insertions, 19 deletions
diff --git a/Raster.c b/Raster.c
index eeb9aea..a475e94 100644
--- a/Raster.c
+++ b/Raster.c
@@ -1,4 +1,4 @@
-/* $Id: Raster.c,v 1.13 2001/03/01 15:11:30 ltoetsch Exp $
+/* $Id: Raster.c,v 1.14 2001/03/01 22:33:50 reinelt Exp $
*
* driver for raster formats
*
@@ -20,6 +20,10 @@
*
*
* $Log: Raster.c,v $
+ * Revision 1.14 2001/03/01 22:33:50 reinelt
+ *
+ * renamed Raster_flush() to PPM_flush()
+ *
* Revision 1.13 2001/03/01 15:11:30 ltoetsch
* added PNG,Webinterface
*
@@ -98,7 +102,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#ifdef WITH_PNG
-#include <gd.h>
+#include <gd/gd.h>
#endif
#include "debug.h"
@@ -123,7 +127,8 @@ static unsigned int background=0;
extern char* output;
-int Raster_flush (void)
+#ifdef WITH_PPM
+int PPM_flush (void)
{
static int seq=0;
static unsigned char *bitbuf=NULL;
@@ -214,10 +219,10 @@ int Raster_flush (void)
return 0;
}
-
+#endif
#ifdef WITH_PNG
-int Png_flush (void)
+int PNG_flush (void)
{
static int seq=0;
int xsize, ysize, row, col;
@@ -364,10 +369,10 @@ int Raster_bar (int type, int row, int col, int max, int len1, int len2)
LCD Raster[] = {
#ifdef WITH_PPM
- { "PPM",0,0,0,0,BARS,0,Raster_init,Raster_clear,Raster_put,Raster_bar,NULL,Raster_flush },
+ { "PPM",0,0,0,0,BARS,0,Raster_init,Raster_clear,Raster_put,Raster_bar,NULL,PPM_flush },
#endif
#ifdef WITH_PNG
- { "PNG",0,0,0,0,BARS,0,Raster_init,Raster_clear,Raster_put,Raster_bar,NULL,Png_flush },
+ { "PNG",0,0,0,0,BARS,0,Raster_init,Raster_clear,Raster_put,Raster_bar,NULL,PNG_flush },
#endif
{ NULL }
};
diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index f4166b4..07c1b11 100644
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -1,12 +1,12 @@
-Display LCD2041
-Port /dev/ttyS2
-Speed 19200
-Contrast 160
+#Display LCD2041
+#Port /dev/ttyS2
+#Speed 19200
+#Contrast 160
-#Display HD44780
-#Port 0x378
-#Size 16x2
-#Delay 398
+Display HD44780
+Port 0x378
+Size 24x2
+Delay 503
#Display BLC100x
#Port /dev/ttyS2
@@ -44,11 +44,14 @@ Contrast 160
#Display SIN
#Port /dev/tty9
-Row1 "Disk%dm $R10dr+dw"
-Row2 "Net %nm $R10nr+nw"
+Row1 "Disk%dm $R14dr+dw"
+Row2 "Net %nm $R14nr+nw"
Row3 "%s1 %s2 %s3"
Row4 "%hc %ht %e1"
+#Row1 "abcdefghijklmnopqrstuvwxyz"
+#Row2 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
#Row1 "*** %o %v ***"
#Row2 "%p CPU %r MB RAM"
#Row3 "Busy %cb%% $r10cs+cb"
diff --git a/udelay.c b/udelay.c
index 7b0aa34..2c7d308 100644
--- a/udelay.c
+++ b/udelay.c
@@ -1,4 +1,4 @@
-/* $Id: udelay.c,v 1.2 2000/07/31 10:43:44 reinelt Exp $
+/* $Id: udelay.c,v 1.3 2001/03/01 22:33:50 reinelt Exp $
*
* short delays
*
@@ -20,6 +20,10 @@
*
*
* $Log: udelay.c,v $
+ * Revision 1.3 2001/03/01 22:33:50 reinelt
+ *
+ * renamed Raster_flush() to PPM_flush()
+ *
* Revision 1.2 2000/07/31 10:43:44 reinelt
*
* some changes to support kernel-2.4 (different layout of various files in /proc)
@@ -55,7 +59,6 @@
#include <stdio.h>
#include <time.h>
-#include "debug.h"
#include "udelay.h"
unsigned long loops_per_usec;