From 3dec67f9f130bdf6ae12e76f5373c47463002041 Mon Sep 17 00:00:00 2001 From: marschap Date: Sun, 11 Nov 2007 14:18:04 +0000 Subject: [PATCH] shuttleVFD driver: fix VendorID, support newer models (Miska Sulander) --- ChangeLog | 1 + docs/lcdproc-user/drivers/shuttleVFD.docbook | 2 +- server/drivers/shuttleVFD.c | 2 +- server/drivers/shuttleVFD.h | 6 ++++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e08b597..ec0a492 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ v.0.5dev (ongoing development) + hd44780 driver: reporting in ConnectionType functions (Thomas Jarosch) * clean up build system (T. Jarosch, with tests/fixes by M. Dolze) + hd44780 driver: new ConnectionType ftdi (Thomas Jarosch) + * shuttleVFD driver: fix VendorID, support newer models (Miska Sulander) v.0.5.2 * fix switching on/off the Load screen in lcdproc client using the menu diff --git a/docs/lcdproc-user/drivers/shuttleVFD.docbook b/docs/lcdproc-user/drivers/shuttleVFD.docbook index 6833dc1..2d9944b 100644 --- a/docs/lcdproc-user/drivers/shuttleVFD.docbook +++ b/docs/lcdproc-user/drivers/shuttleVFD.docbook @@ -7,7 +7,7 @@ The shuttleVFD drivers works with Shuttle Computer Group VFDs. These VFDs are found on various Shuttle XPC models. A partial list include Shuttle M1000, -Shuttle M2000, and Shuttle G5 3300m. +Shuttle M2000, Shuttle G5 3300m and Shuttle SG33G5M. diff --git a/server/drivers/shuttleVFD.c b/server/drivers/shuttleVFD.c index 4756a2e..44a4715 100644 --- a/server/drivers/shuttleVFD.c +++ b/server/drivers/shuttleVFD.c @@ -129,7 +129,7 @@ MODULE_EXPORT int shuttleVFD_init(Driver *drvthis) { struct usb_device *dev; for (dev = bus->devices; dev != NULL; dev = dev->next) { if (dev->descriptor.idVendor == SHUTTLE_VFD_VENDOR_ID && - dev->descriptor.idProduct == SHUTTLE_VFD_PRODUCT_ID) { + (dev->descriptor.idProduct == SHUTTLE_VFD_PRODUCT_ID1 || dev->descriptor.idProduct == SHUTTLE_VFD_PRODUCT_ID2)) { p->dev = usb_open(dev); } } diff --git a/server/drivers/shuttleVFD.h b/server/drivers/shuttleVFD.h index 8d20957..c2d44f1 100644 --- a/server/drivers/shuttleVFD.h +++ b/server/drivers/shuttleVFD.h @@ -56,8 +56,10 @@ MODULE_EXPORT int shuttleVFD_cellheight(Driver *drvthis); #define SHUTTLE_VFD_CELLHEIGHT 8 // VFD USB properties -#define SHUTTLE_VFD_VENDOR_ID 0x1308 -#define SHUTTLE_VFD_PRODUCT_ID 0x0003 +#define SHUTTLE_VFD_VENDOR_ID 0x051c +#define SHUTTLE_VFD_PRODUCT_ID1 0x0003 +// IR-receiver included in this model +#define SHUTTLE_VFD_PRODUCT_ID2 0x0005 #define SHUTTLE_VFD_INTERFACE_NUM 1 // VFD USB control message