mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a potential bug by allowing Set Mode to continue after a non fatal error (Eric Pooch)

Browse Source
This commit is contained in:
marschap
2008-10-09 19:46:54 +00:00
parent 08bb4b24b8
commit ef89a572b0
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/hd44780-uss720.c
+2 -5
View File
@@ -17,7 +17,6 @@
* *
* Applicable Data Sheets: * Applicable Data Sheets:
* - http://digilander.libero.it/demarchidaniele/qcamvc/uss-720.pdf * - http://digilander.libero.it/demarchidaniele/qcamvc/uss-720.pdf
* - http://www.beyondlogic.org/parlcd/parlcd.htm
* *
* Wiring is same as winamp connection. * Wiring is same as winamp connection.
* Uncomment //#define USS720_MAC_USB_LCD_KIT_WIRING 1 below to use a * Uncomment //#define USS720_MAC_USB_LCD_KIT_WIRING 1 below to use a
@@ -330,7 +329,6 @@ uss720_set_1284_mode(usb_dev_handle *usbHandle, unsigned int mode)
int res = 0; int res = 0;
res = uss720_get_1284_register(usbHandle, 3, &regByte); res = uss720_get_1284_register(usbHandle, 3, &regByte);
if (res) return res;
regByte &= ~0x01; regByte &= ~0x01;
@@ -338,10 +336,9 @@ uss720_set_1284_mode(usb_dev_handle *usbHandle, unsigned int mode)
if (res) return res; if (res) return res;
res = uss720_get_1284_register(usbHandle, 2, &regByte); res = uss720_get_1284_register(usbHandle, 2, &regByte);
if (res) return res;
regByte &= ~(mode<<5); // Mask off the mode bits 7-5. regByte &= ~(mode<<5); /* Mask off the mode bits 7-5. */
regByte |= (mode<<5); // Set the mode bits 7-5. regByte |= (mode<<5); /* Set the mode bits 7-5. */
return uss720_set_1284_register(usbHandle, 6, regByte); return uss720_set_1284_register(usbHandle, 6, regByte);
} }