[lcd4linux @ 2004-01-27 06:34:14 by reinelt]

Cwlinux driver portet to NextGeneration (compiles, but not tested!)

7 files changed, 371 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index 07c6ebb..afbcac4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,7 +88,7 @@ EXTRA_lcd4linux_SOURCES= \
 parport.c parport.h \
 BeckmannEgle.c \
 drv_Crystalfontz.c Crystalfontz.c \
-Cwlinux.c \
+drv_Cwlinux.c Cwlinux.c \
 HD44780.c \
 M50530.c \
 T6963.c \
diff --git a/Makefile.in b/Makefile.in
index e9caa48..16a6dc5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,7 @@ lcd4linux_SOURCES =  lcd4linux.c pid.c pid.h hash.c hash.h parser.c parser.h pro
 #fontmap.c fontmap.h \
 #udelay.c udelay.h
 
-EXTRA_lcd4linux_SOURCES =  parport.c parport.h BeckmannEgle.c drv_Crystalfontz.c Crystalfontz.c Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c drv_MatrixOrbital.c MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c SIN.c XWindow.c Text.c
+EXTRA_lcd4linux_SOURCES =  parport.c parport.h BeckmannEgle.c drv_Crystalfontz.c Crystalfontz.c drv_Cwlinux.c Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c drv_MatrixOrbital.c MatrixOrbital.c MilfordInstruments.c PalmPilot.c Raster.c SIN.c XWindow.c Text.c
 
 
 EXTRA_DIST =  lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm curses.m4 AUTHORS CREDITS FAQ NEWS TODO README README.Rows README.Tokens README.Drivers README.Plugins README.KDE Skeleton.c plugin_sample.c
@@ -182,7 +182,7 @@ DEP_FILES =  .deps/BeckmannEgle.P .deps/Crystalfontz.P .deps/Cwlinux.P \
 .deps/MilfordInstruments.P .deps/PalmPilot.P .deps/Raster.P .deps/SIN.P \
 .deps/T6963.P .deps/Text.P .deps/USBLCD.P .deps/XWindow.P .deps/bar.P \
 .deps/battery.P .deps/cfg.P .deps/debug.P .deps/display.P .deps/drv.P \
-.deps/drv_Crystalfontz.P .deps/drv_MatrixOrbital.P \
+.deps/drv_Crystalfontz.P .deps/drv_Cwlinux.P .deps/drv_MatrixOrbital.P \
 .deps/drv_generic_parport.P .deps/drv_generic_serial.P \
 .deps/drv_generic_text.P .deps/dvb.P .deps/evaluator.P .deps/exec.P \
 .deps/expr.P .deps/filter.P .deps/fontmap.P .deps/hash.P .deps/icon.P \
diff --git a/aclocal.m4 b/aclocal.m4
index 9b6a5a4..b62dd68 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,7 +10,7 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
-# lib-prefix.m4 serial 3 (gettext-0.12.2)
+# lib-prefix.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -718,7 +718,7 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
   done
 ])
 
-# lib-ld.m4 serial 2 (gettext-0.12)
+# lib-ld.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -734,11 +734,12 @@ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
@@ -808,11 +809,12 @@ AC_CACHE_VAL(acl_cv_path_LD,
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
     fi
   done
   IFS="$ac_save_ifs"
diff --git a/configure b/configure
index 67ced11..173a308 100755
--- a/configure
+++ b/configure
@@ -20955,8 +20955,8 @@ _ACEOF
 fi
 
 if test "$CWLINUX" = "yes"; then
-#  DRIVERS="$DRIVERS Cwlinux.lo"
-   DRIVERS="$DRIVERS Cwlinux.o"
+#  DRIVERS="$DRIVERS Cwlinux.lo drv_Cwlinux.lo"
+   DRIVERS="$DRIVERS Cwlinux.o drv_Cwlinux.o"
 
 cat >>confdefs.h <<\_ACEOF
 #define WITH_CWLINUX 1
diff --git a/configure.in b/configure.in
index 6031ea2..e0a3b01 100644
--- a/configure.in
+++ b/configure.in
@@ -152,8 +152,8 @@ if test "$CRYSTALFONTZ" = "yes"; then
 fi
 
 if test "$CWLINUX" = "yes"; then
-#  DRIVERS="$DRIVERS Cwlinux.lo"
-   DRIVERS="$DRIVERS Cwlinux.o"
+#  DRIVERS="$DRIVERS Cwlinux.lo drv_Cwlinux.lo"
+   DRIVERS="$DRIVERS Cwlinux.o drv_Cwlinux.o"
    AC_DEFINE(WITH_CWLINUX,1,[junk])
 fi
 
diff --git a/drv.c b/drv.c
index 4a16fca..4016c55 100644
--- a/drv.c
+++ b/drv.c
@@ -1,4 +1,4 @@
-/* $Id: drv.c,v 1.4 2004/01/21 12:36:19 reinelt Exp $
+/* $Id: drv.c,v 1.5 2004/01/27 06:34:14 reinelt Exp $
  *
  * new framework for display drivers
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv.c,v $
+ * Revision 1.5  2004/01/27 06:34:14  reinelt
+ * Cwlinux driver portet to NextGeneration (compiles, but not tested!)
+ *
  * Revision 1.4  2004/01/21 12:36:19  reinelt
  * Crystalfontz NextGeneration driver added
  *
@@ -117,11 +120,9 @@ DRIVER *Driver[] = {
 #ifdef WITH_CRYSTALFONTZ
   &drv_Crystalfontz,
 #endif
-  /* Fixme
-     #ifdef WITH_CWLINUX
-     &Cwlinux,
-     #endif
-  */
+#ifdef WITH_CWLINUX
+  &drv_Cwlinux,
+#endif
 #ifdef WITH_HD44780
   &drv_HD44780,
 #endif
diff --git a/drv_Cwlinux.c b/drv_Cwlinux.c
new file mode 100644
index 0000000..87c43cc
--- /dev/null
+++ b/drv_Cwlinux.c
@@ -0,0 +1,343 @@
+/* $Id: drv_Cwlinux.c,v 1.1 2004/01/27 06:34:14 reinelt Exp $
+ *
+ * new style driver for Cwlinux display modules
+ *
+ * Copyright 1999, 2000 Michael Reinelt <reinelt@eunet.at>
+ * Copyright 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
+ *
+ * This file is part of LCD4Linux.
+ *
+ * LCD4Linux is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * LCD4Linux is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *
+ * $Log: drv_Cwlinux.c,v $
+ * Revision 1.1  2004/01/27 06:34:14  reinelt
+ * Cwlinux driver portet to NextGeneration (compiles, but not tested!)
+ *
+ */
+
+/* 
+ *
+ * exported fuctions:
+ *
+ * struct DRIVER drv_Cwlinux
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "debug.h"
+#include "cfg.h"
+#include "plugin.h"
+#include "widget.h"
+#include "widget_text.h"
+#include "widget_icon.h"
+#include "widget_bar.h"
+#include "drv.h"
+#include "drv_generic_text.h"
+#include "drv_generic_serial.h"
+
+
+static char Name[]="Cwlinux";
+
+static int Model;
+static int Protocol;
+
+// Fixme:
+// static int GPO[8];
+static int GPOS;
+
+
+typedef struct {
+  int type;
+  char *name;
+  int rows;
+  int cols;
+  int xres;
+  int gpos;
+  int protocol;
+} MODEL;
+
+// Fixme: number of gpo's should be verified
+
+static MODEL Models[] = {
+  { 0x01, "CW1602",   2, 16,  5,  0,  1 },
+  { 0x02, "CW12232",  4, 40,  6,  0,  2 },
+  { 0xff, "Unknown", -1, -1, -1, -1, -1 }
+};
+
+
+// ****************************************
+// ***  hardware dependant functions    ***
+// ****************************************
+
+static void drv_CW_goto (int row, int col)
+{
+  char cmd[6]="\376Gxy\375";
+  cmd[2]=(char)col;
+  cmd[3]=(char)row;
+  drv_generic_serial_write(cmd, 5);
+}
+
+
+static void drv_CW1602_defchar (int ascii, char *buffer)
+{
+  int i;
+  char cmd[12]="\376Nn12345678\375";
+
+  cmd[2]=(char)(ascii+1);
+
+  for (i=0; i<8; i++) {
+    cmd[3+i]=buffer[i];
+  }
+  drv_generic_serial_write(cmd,12);
+  usleep(20);  // delay for cw1602 to settle the character defined!
+}
+
+
+static void drv_CW12232_defchar (int ascii, char *buffer)
+{
+  int i, j;
+  char cmd[10]="\376Nn123456\375";
+  
+  cmd[2]=(char)(ascii+1);
+  
+  // The CW12232 uses a vertical bitmap layout,
+  // so we have to 'rotate' the bitmap.
+  
+  for (i=0; i<6;i++) {
+    cmd[3+i]=0;
+    for (j=0; j<8;j++) {
+      if (buffer[j] & (1<<(5-i))) {
+	cmd[3+i]|=(1<<j);
+      }
+    }
+  }
+  drv_generic_serial_write (cmd, 10);
+}
+
+
+static int drv_CW_start (char *section)
+{
+  int i;  
+  char *model;
+  
+  model=cfg_get(section, "Model", NULL);
+  if (model!=NULL && *model!='\0') {
+    for (i=0; Models[i].type!=0xff; i++) {
+      if (strcasecmp(Models[i].name, model)==0) break;
+    }
+    if (Models[i].type==0xff) {
+      error ("%s: %s.Model '%s' is unknown from %s", Name, section, model, cfg_source());
+      return -1;
+    }
+    Model=i;
+    info ("%s: using model '%s'", Name, Models[Model].name);
+  } else {
+    error ("%s: no '%s.Model' entry from %s", Name, section, cfg_source());
+    return -1;
+  }
+  
+  // open serial port
+  if (drv_generic_serial_open(section, Name)<0) return -1;
+
+  // this does not work as I'd expect it...
+#if 0
+  // read firmware version
+  generic_serial_read(buffer,sizeof(buffer));
+  usleep(100000);
+  generic_serial_write ("\3761", 2);
+  usleep(100000);
+  generic_serial_write ("\375", 1);
+  usleep(100000);
+  if (generic_serial_read(buffer,2)!=2) {
+    info ("unable to read firmware version!");
+  }
+  info ("Cwlinux Firmware %d.%d", (int)buffer[0], (int)buffer[1]);
+#endif
+
+  // initialize global variables
+  DROWS    = Models[Model].rows;
+  DCOLS    = Models[Model].cols;
+  XRES     = Models[Model].xres;
+  GPOS     = Models[Model].gpos;
+  Protocol = Models[Model].protocol;
+
+#if 0
+  drv_generic_serial_write("\376X\375",3); // Clear Display
+#else
+  // for some mysterious reason, we have to sleep after 
+  // the command _and_ after the CMD_END...
+  usleep(20);
+  drv_generic_serial_write("\376X",2); // Clear Display
+  usleep(20);
+  drv_generic_serial_write("\375",1);  // Command End
+  usleep(20);
+#endif
+
+  drv_generic_serial_write ("\376D\375", 3); // auto line wrap off
+  drv_generic_serial_write ("\376R\375", 3); // auto scroll off
+  drv_generic_serial_write ("\376K\375", 3); // underline cursor off
+  drv_generic_serial_write ("\376B\375", 3); // backlight on
+
+  return 0;
+}
+
+
+// ****************************************
+// ***            plugins               ***
+// ****************************************
+
+
+static void plugin_backlight (RESULT *result, RESULT *arg1)
+{
+  char cmd[5]="\376A_\375";
+  double backlight;
+  
+  backlight=R2N(arg1);
+  if (backlight<0) backlight=0;
+  if (backlight>8) backlight=8;
+
+  switch ((int)backlight) {
+  case 0:
+    drv_generic_serial_write ("\376F\375", 3); // backlight off
+    break;
+  case 8:
+    drv_generic_serial_write ("\376B\375", 3); // backlight on
+    break;
+  default:
+    cmd[2]=(char)backlight;
+    drv_generic_serial_write (cmd, 4); // backlight level
+    break;
+  }
+
+  SetResult(&result, R_NUMBER, &backlight); 
+}
+
+
+// ****************************************
+// ***        widget callbacks          ***
+// ****************************************
+
+// using drv_generic_text_draw(W)
+// using drv_generic_text_icon_draw(W)
+// using drv_generic_text_bar_draw(W)
+
+
+// ****************************************
+// ***        exported functions        ***
+// ****************************************
+
+
+// list models
+int drv_CW_list (void)
+{
+  int i;
+  
+  for (i=0; Models[i].type!=0xff; i++) {
+    printf ("%s ", Models[i].name);
+  }
+  return 0;
+}
+
+
+// initialize driver & display
+int drv_CW_init (char *section)
+{
+  WIDGET_CLASS wc;
+  int ret;  
+  
+  // display preferences
+  XRES  = 6;      // pixel width of one char 
+  YRES  = 8;      // pixel height of one char 
+  CHARS = 8;      // number of user-defineable characters
+  CHAR0 = 128;    // ASCII of first user-defineable char
+  GOTO_COST = 3;  // number of bytes a goto command requires
+
+  // real worker functions
+  drv_generic_text_real_write   = drv_generic_serial_write;
+  drv_generic_text_real_goto    = drv_CW_goto;
+
+  switch (Protocol) {
+    case 1:
+      drv_generic_text_real_defchar = drv_CW1602_defchar;
+      break;
+    case 2:
+      drv_generic_text_real_defchar = drv_CW12232_defchar;
+      break;
+  }
+  
+  // start display
+  if ((ret=drv_CW_start (section))!=0)
+    return ret;
+  
+  // initialize generic text driver
+  if ((ret=drv_generic_text_init(section, Name))!=0)
+    return ret;
+
+  // initialize generic icon driver
+  if ((ret=drv_generic_text_icon_init())!=0)
+    return ret;
+  
+  // initialize generic bar driver
+  if ((ret=drv_generic_text_bar_init())!=0)
+    return ret;
+  
+  // add fixed chars to the bar driver
+  drv_generic_text_bar_add_segment (0, 0, 255, 32); // ASCII 32 = blank
+  
+  // register text widget
+  wc=Widget_Text;
+  wc.draw=drv_generic_text_draw;
+  widget_register(&wc);
+  
+  // register icon widget
+  wc=Widget_Icon;
+  wc.draw=drv_generic_text_icon_draw;
+  widget_register(&wc);
+  
+  // register bar widget
+  wc=Widget_Bar;
+  wc.draw=drv_generic_text_bar_draw;
+  widget_register(&wc);
+  
+  // register plugins
+  AddFunction ("backlight", 1, plugin_backlight);
+  
+  return 0;
+}
+
+
+// close driver & display
+int drv_CW_quit (void) {
+
+  info("%s: shutting down.", Name);
+  drv_generic_serial_close();
+  drv_generic_text_quit();
+  
+  return (0);
+}
+
+
+DRIVER drv_Cwlinux = {
+  name: Name,
+  list: drv_CW_list,
+  init: drv_CW_init,
+  quit: drv_CW_quit, 
+};
+