aboutsummaryrefslogtreecommitdiffstats
path: root/drv_LCDLinux.c
diff options
context:
space:
mode:
Diffstat (limited to 'drv_LCDLinux.c')
-rw-r--r--drv_LCDLinux.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drv_LCDLinux.c b/drv_LCDLinux.c
index 0f9f284..7f91094 100644
--- a/drv_LCDLinux.c
+++ b/drv_LCDLinux.c
@@ -1,10 +1,10 @@
-/* $Id: drv_LCDLinux.c 773 2007-02-25 12:39:09Z michael $
- * $URL: https://ssl.bulix.org/svn/lcd4linux/branches/0.10.1/drv_LCDLinux.c $
+/* $Id: drv_LCDLinux.c 975 2009-01-18 11:16:20Z michael $
+ * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drv_LCDLinux.c $
*
* driver for the LCD-Linux HD44780 kernel driver
* http://lcd-linux.sourceforge.net
*
- * Copyright (C) 2005 Michael Reinelt <reinelt@eunet.at>
+ * Copyright (C) 2005 Michael Reinelt <michael@reinelt.co.at>
* Copyright (C) 2005 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
*
* This file is part of LCD4Linux.
@@ -162,7 +162,7 @@ static int drv_LL_start(const char *section, const int quiet)
return -1;
}
info("%s: %dx%d display with %d controllers, flags=0x%02lx:",
- Name, buf.cntr_cols, buf.cntr_rows, buf.num_cntr, buf.flags);
+ Name, buf.cntr_cols, buf.cntr_rows * buf.num_cntr, buf.num_cntr, buf.flags);
info("%s: busy-flag checking %sabled", Name, (buf.flags & HD44780_CHECK_BF) ? "en" : "dis");
info("%s: bus width %d bits", Name, (buf.flags & HD44780_4BITS_BUS) ? 4 : 8);
info("%s: font size %s", Name, (buf.flags & HD44780_5X10_FONT) ? "5x10" : "5x8");
@@ -175,14 +175,14 @@ static int drv_LL_start(const char *section, const int quiet)
commit = 1;
}
- if ((rows > 0 && rows != buf.cntr_rows) || (cols > 0 && cols != buf.cntr_cols)) {
+ if ((rows > 0 && rows != buf.cntr_rows * buf.num_cntr) || (cols > 0 && cols != buf.cntr_cols)) {
info("%s: changing size to %dx%d", Name, cols, rows);
- buf.cntr_rows = rows;
+ buf.cntr_rows = rows / buf.num_cntr;
buf.cntr_cols = cols;
commit = 1;
}
- DROWS = buf.cntr_rows;
+ DROWS = buf.cntr_rows * buf.num_cntr;
DCOLS = buf.cntr_cols;
/* overwrite busy-flag checking from lcd4linux.conf */
@@ -259,7 +259,7 @@ static int drv_LL_start(const char *section, const int quiet)
/* list models */
int drv_LL_list(void)
{
- printf("generic");
+ printf("LCD-Linux HD44780 kernel driver");
return 0;
}
@@ -271,7 +271,7 @@ int drv_LL_init(const char *section, const int quiet)
int asc255bug;
int ret;
- info("%s: %s", Name, "$Rev: 773 $");
+ info("%s: %s", Name, "$Rev: 975 $");
/* display preferences */
XRES = 5; /* pixel width of one char */