Hello community, here is the log from the commit of package lcd4linux checked in at Wed Jun 14 13:36:22 CEST 2006. -------- --- arch/i386/lcd4linux/lcd4linux.changes 2006-03-06 15:31:03.000000000 +0100 +++ lcd4linux/lcd4linux.changes 2006-06-14 12:01:35.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 15 14:14:56 CEST 2006 - tsieden@suse.de + +- updated to most recent cvs version + - several minor bugfixes (drv_LCD2USB.c,drv_LUIse.c) + +------------------------------------------------------------------- +Thu Apr 13 14:38:17 CEST 2006 - tsieden@suse.de + +- updated to most recent cvs version + +------------------------------------------------------------------- Old: ---- lcd4linux-cvs060228.tar.bz2 New: ---- lcd4linux-cvs20060515.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lcd4linux.spec ++++++ --- /var/tmp/diff_new_pack.ROraje/_old 2006-06-14 13:36:07.000000000 +0200 +++ /var/tmp/diff_new_pack.ROraje/_new 2006-06-14 13:36:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package lcd4linux (Version cvs060228) +# spec file for package lcd4linux (Version cvs20060515) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ License: GPL Group: System/Monitoring -Version: cvs060228 -Release: 3 +Version: cvs20060515 +Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: %{name} URL: https://ssl.bulix.org/projects/lcd4linux/ @@ -80,6 +80,11 @@ %attr(755,root,root) %config /etc/init.d/lcd4linux %changelog -n lcd4linux +* Mon May 15 2006 - tsieden@suse.de +- updated to most recent cvs version +- several minor bugfixes (drv_LCD2USB.c,drv_LUIse.c) +* Thu Apr 13 2006 - tsieden@suse.de +- updated to most recent cvs version * Mon Mar 06 2006 - tsieden@suse.de - added serdisplib-devel to BuildRequires in order to enable support for LCDs driven by the serdisplib library ++++++ lcd4linux-cvs060228.tar.bz2 -> lcd4linux-cvs20060515.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lcd4linux/drv_LCD2USB.c new/lcd4linux/drv_LCD2USB.c --- old/lcd4linux/drv_LCD2USB.c 2006-02-22 16:59:39.000000000 +0100 +++ new/lcd4linux/drv_LCD2USB.c 2006-03-18 15:54:36.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: drv_LCD2USB.c,v 1.8 2006/02/22 15:59:39 cmay Exp $ +/* $Id: drv_LCD2USB.c,v 1.9 2006/03/18 14:54:36 harbaum Exp $ * * driver for USB2LCD display interface * see http://www.harbaum.org/till/lcd2usb for schematics @@ -24,6 +24,9 @@ * * * $Log: drv_LCD2USB.c,v $ + * Revision 1.9 2006/03/18 14:54:36 harbaum + * Improved USB error recovery + * * Revision 1.8 2006/02/22 15:59:39 cmay * removed KEYPADSIZE cruft per harbaum's suggestion * @@ -118,6 +121,7 @@ #define LCD_GET_RESERVED1 (LCD_GET | (3<<3)) static char Name[] = "LCD2USB"; +static char *device_id = NULL, *bus_id = NULL; static usb_dev_handle *lcd; static int controllers = 0; @@ -125,7 +129,6 @@ extern int usb_debug; extern int got_signal; - /****************************************/ /*** hardware dependant functions ***/ /****************************************/ @@ -188,20 +191,29 @@ static int drv_L2U_send(int request, int value, int index) { - static int errors = 0; + if (usb_control_msg(lcd, USB_TYPE_VENDOR, request, value, index, NULL, 0, 1000) < 0) { + error("%s: USB request failed! Trying to reconnect device.", Name); - if (errors > 20) - return -1; + usb_release_interface(lcd, 0); + usb_close(lcd); - if (usb_control_msg(lcd, USB_TYPE_VENDOR, request, value, index, NULL, 0, 1000) < 0) { - error("%s: USB request failed!", Name); - if (++errors > 20) { - error("%s: too many USB errors, aborting.", Name); - got_signal = -1; + // try to close and reopen connection + if (drv_L2U_open(bus_id, device_id) < 0) { + error("%s: could not re-detect LCD2USB USB LCD", Name); + got_signal = -1; + return -1; } - return -1; + + // and try to re-send command + if (usb_control_msg(lcd, USB_TYPE_VENDOR, request, value, index, NULL, 0, 1000) < 0) { + error("%s: retried USB request failed, aborting!", Name); + got_signal = -1; + return -1; + } + + info("%s: Device successfully reconnected.", Name); } - errors = 0; + return 0; } @@ -266,7 +278,7 @@ int ver = drv_L2U_get(LCD_GET_FWVER); if (ver != -1) - info("%s: firmware version %d.%d", Name, ver & 0xff, ver >> 8); + info("%s: firmware version %d.%02d", Name, ver & 0xff, ver >> 8); else error("%s: unable to read firmware version", Name); } @@ -484,7 +496,6 @@ { int contrast, brightness; int rows = -1, cols = -1; - char *device_id = NULL, *bus_id = NULL; char *s; s = cfg_get(section, "Size", NULL); @@ -600,7 +611,7 @@ int asc255bug; int ret; - info("%s: %s", Name, "$Revision: 1.8 $"); + info("%s: %s", Name, "$Revision: 1.9 $"); /* display preferences */ XRES = 5; /* pixel width of one char */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lcd4linux/drv_LUIse.c new/lcd4linux/drv_LUIse.c --- old/lcd4linux/drv_LUIse.c 2006-02-08 05:55:05.000000000 +0100 +++ new/lcd4linux/drv_LUIse.c 2006-03-10 19:06:52.000000000 +0100 @@ -1,4 +1,4 @@ -/* $Id: drv_LUIse.c,v 1.4 2006/02/08 04:55:05 reinelt Exp $ +/* $Id: drv_LUIse.c,v 1.5 2006/03/10 18:06:52 tooly-bln Exp $ * * LUIse lcd4linux driver * @@ -23,6 +23,9 @@ * * * $Log: drv_LUIse.c,v $ + * Revision 1.5 2006/03/10 18:06:52 tooly-bln + * replace drv_generic_graphic_FB with drv_generic_graphic_black + * * Revision 1.4 2006/02/08 04:55:05 reinelt * moved widget registration to drv_generic_graphic * @@ -95,11 +98,11 @@ for (r = row; r < row + height; r++) { for (c = col; c < col + width; c++) { - if (drv_generic_graphic_FB[r * LCOLS + c]) { + if (drv_generic_graphic_black(r,c)) { LUI_SetPixel(devNum, 0, c, r, 1); } else { LUI_SetPixel(devNum, 0, c, r, 0); - } + } } } } @@ -283,7 +286,7 @@ { int ret; - info("%s: %s", Name, "$Revision: 1.4 $"); + info("%s: %s", Name, "$Revision: 1.5 $"); /* real worker functions */ drv_generic_graphic_real_blit = drv_LUIse_blit; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lcd4linux/drv_generic_text.c new/lcd4linux/drv_generic_text.c --- old/lcd4linux/drv_generic_text.c 2006-02-27 09:12:34.000000000 +0100 +++ new/lcd4linux/drv_generic_text.c 2006-03-29 10:57:58.000000000 +0200 @@ -1,4 +1,4 @@ -/* $Id: drv_generic_text.c,v 1.34 2006/02/27 08:12:34 reinelt Exp $ +/* $Id: drv_generic_text.c,v 1.35 2006/03/29 08:57:58 reinelt Exp $ * * generic driver helper for text-based displays * @@ -23,6 +23,9 @@ * * * $Log: drv_generic_text.c,v $ + * Revision 1.35 2006/03/29 08:57:58 reinelt + * vertical bar patch from Manuel Lausch + * * Revision 1.34 2006/02/27 08:12:34 reinelt * use serdisplib's full color support * @@ -694,13 +697,13 @@ BarFB[row * LCOLS + col - 1].style = STYLE_LAST; break; - case DIR_SOUTH: + case DIR_NORTH: max = len * YRES; val1 = max - val1; val2 = max - val2; rev = 1; - case DIR_NORTH: + case DIR_SOUTH: while (len > 0 && row < LROWS) { BarFB[row * LCOLS + col].dir = dir; BarFB[row * LCOLS + col].segment = -1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lcd4linux/lcd4linux.conf.sample new/lcd4linux/lcd4linux.conf.sample --- old/lcd4linux/lcd4linux.conf.sample 2006-02-27 08:53:52.000000000 +0100 +++ new/lcd4linux/lcd4linux.conf.sample 2006-03-29 10:57:58.000000000 +0200 @@ -345,6 +345,13 @@ Model 'LPH7508' } +Display ctinclud { + Driver 'serdisplib' + Port 'USB:0x07c0/0x1501' + Model 'CTINCLUD' + Options '' +} + Display XWindow { Driver 'X11' Size '120x32' @@ -403,7 +410,7 @@ expression '*** '.uname('sysname').' '.uname('release').' ***' width 20 align 'M' - speed 100 + speed 50 update tick } @@ -1031,7 +1038,7 @@ #Display 'M50530-24x8' #Display 'LCDTerm' #Display 'SimpleLCD' -#Display 'BA63' +Display 'BA63' #Display 'CT20x4' #Display 'T6963-240x64' #Display 'XWindow' @@ -1041,11 +1048,12 @@ #Display 'Trefon' #Display 'LCD2USB' #Display 'LPH7508-serdisplib' -Display 'LPH7508' +#Display 'LPH7508' +#Display 'ctinclud' -#Layout 'Default' +Layout 'Default' #Layout 'TestLayer' -Layout 'TestImage' +#Layout 'TestImage' #Layout 'L8x2' #Layout 'L16x1' #Layout 'L16x2' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org