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

harmonize coding style and messages

Browse Source
This commit is contained in:
marschap
2006-04-08 21:05:51 +00:00
parent 1f0028cb6e
commit 3c52181126
10 changed files with 196 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/hd44780-4bit.c
+16 -16
View File
@@ -111,45 +111,45 @@ hd_init_4bit (Driver *drvthis)
// powerup the lcd now // powerup the lcd now
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
port_out (p->port, 0x03); port_out (p->port, 0x03);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if ( p->delayBus ) hd44780_functions->uPause (p, 1);
/* We'll now send 0x03 a coulpe of times, /* We'll now send 0x03 a coulpe of times,
* which is in fact (FUNCSET | IF_8BIT) >> 4 */ * which is in fact (FUNCSET | IF_8BIT) >> 4 */
port_out (p->port, enableLines | 0x03); port_out (p->port, enableLines | 0x03);
port_out (p->port + 2, ALLEXT ^ OUTMASK); port_out (p->port + 2, ALLEXT ^ OUTMASK);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if ( p->delayBus ) hd44780_functions->uPause (p, 1);
port_out (p->port, 0x03); port_out (p->port, 0x03);
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
hd44780_functions->uPause (p, 15000); hd44780_functions->uPause (p, 15000);
port_out (p->port, enableLines | 0x03); port_out (p->port, enableLines | 0x03);
port_out (p->port + 2, ALLEXT ^ OUTMASK); port_out (p->port + 2, ALLEXT ^ OUTMASK);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if ( p->delayBus ) hd44780_functions->uPause (p, 1);
port_out (p->port, 0x03); port_out (p->port, 0x03);
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
hd44780_functions->uPause (p, 5000); hd44780_functions->uPause (p, 5000);
port_out (p->port, enableLines | 0x03); port_out (p->port, enableLines | 0x03);
port_out (p->port + 2, ALLEXT ^ OUTMASK); port_out (p->port + 2, ALLEXT ^ OUTMASK);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if ( p->delayBus ) hd44780_functions->uPause (p, 1);
port_out (p->port, 0x03); port_out (p->port, 0x03);
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
hd44780_functions->uPause (p, 100); hd44780_functions->uPause (p, 100);
port_out (p->port, enableLines | 0x03); port_out (p->port, enableLines | 0x03);
port_out (p->port + 2, ALLEXT ^ OUTMASK); port_out (p->port + 2, ALLEXT ^ OUTMASK);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if ( p->delayBus ) hd44780_functions->uPause (p, 1);
port_out (p->port, 0x03); port_out (p->port, 0x03);
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
hd44780_functions->uPause (p, 100); hd44780_functions->uPause (p, 100);
// now in 8-bit mode... set 4-bit mode // now in 8-bit mode... set 4-bit mode
port_out (p->port, 0x02); port_out (p->port, 0x02);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if ( p->delayBus ) hd44780_functions->uPause (p, 1);
port_out (p->port, enableLines | 0x02); port_out (p->port, enableLines | 0x02);
port_out (p->port + 2, ALLEXT ^ OUTMASK); port_out (p->port + 2, ALLEXT ^ OUTMASK);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if ( p->delayBus ) hd44780_functions->uPause (p, 1);
port_out (p->port, 0x02); port_out (p->port, 0x02);
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
hd44780_functions->uPause (p, 100); hd44780_functions->uPause (p, 100);
@@ -191,15 +191,15 @@ lcdstat_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigned char
} }
port_out (p->port, portControl | h); port_out (p->port, portControl | h);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port, enableLines | portControl | h); port_out (p->port, enableLines | portControl | h);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port, portControl | h); port_out (p->port, portControl | h);
port_out (p->port, portControl | l); port_out (p->port, portControl | l);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port, enableLines | portControl | l); port_out (p->port, enableLines | portControl | l);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port, portControl | l); port_out (p->port, portControl | l);
} }
@@ -211,15 +211,15 @@ lcdstat_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigned char
} }
port_out (p->port, portControl | h); port_out (p->port, portControl | h);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port + 2, enableLines ^ OUTMASK); port_out (p->port + 2, enableLines ^ OUTMASK);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
port_out (p->port, portControl | l); port_out (p->port, portControl | l);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port + 2, enableLines ^ OUTMASK); port_out (p->port + 2, enableLines ^ OUTMASK);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port + 2, 0 ^ OUTMASK); port_out (p->port + 2, 0 ^ OUTMASK);
} }
} }
@@ -242,7 +242,7 @@ unsigned char lcdstat_HD44780_readkeypad (PrivateData *p, unsigned int YData)
// Can't combine >3 displays with >6 keypad output lines // Can't combine >3 displays with >6 keypad output lines
port_out (p->port + 2, ( ((~YData & 0x03C0) << 6 )) ^ OUTMASK); port_out (p->port + 2, ( ((~YData & 0x03C0) << 6 )) ^ OUTMASK);
} }
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
// Read inputs // Read inputs
readval = ~ port_in (p->port + 1) ^ INMASK; readval = ~ port_in (p->port + 1) ^ INMASK;
server/drivers/hd44780-bwct-usb.c
+3 -3
View File
@@ -141,7 +141,7 @@ hd_init_bwct_usb (Driver *drvthis)
done: done:
if (bwct_usb != NULL) { if (bwct_usb != NULL) {
debug(RPT_DEBUG, "hd_init_bwct_usb: opening device succeeded\n"); debug(RPT_DEBUG, "hd_init_bwct_usb: opening device succeeded");
if (usb_claim_interface(bwct_usb, bwct_usb_i) < 0) { if (usb_claim_interface(bwct_usb, bwct_usb_i) < 0) {
#if defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP) #if defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
@@ -170,9 +170,9 @@ hd_init_bwct_usb (Driver *drvthis)
int res = usb_control_msg(bwct_usb, USB_TYPE_VENDOR, VENDOR_LCD_CONTRAST, int res = usb_control_msg(bwct_usb, USB_TYPE_VENDOR, VENDOR_LCD_CONTRAST,
(contrast * 255) / 1000, bwct_usb_i, NULL, 0, 1000); (contrast * 255) / 1000, bwct_usb_i, NULL, 0, 1000);
if (res < 0) if (res < 0)
report(RPT_WARNING, "hd_init_bwct_usb: setting contrast failed.\n"); report(RPT_WARNING, "hd_init_bwct_usb: setting contrast failed");
} else { } else {
report(RPT_WARNING, "hd_init_bwct_usb: Using default contrast value.\n"); report(RPT_INFO, "hd_init_bwct_usb: Using default contrast value");
} }
return 0; return 0;
server/drivers/hd44780-ext8bit.c
+3 -3
View File
@@ -134,9 +134,9 @@ lcdtime_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigned char
sem_wait (semid); sem_wait (semid);
port_out (p->port + 2, portControl ^ OUTMASK); port_out (p->port + 2, portControl ^ OUTMASK);
port_out (p->port, ch); port_out (p->port, ch);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port + 2, (enableLines|portControl) ^ OUTMASK); port_out (p->port + 2, (enableLines|portControl) ^ OUTMASK);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
port_out (p->port + 2, portControl ^ OUTMASK); port_out (p->port + 2, portControl ^ OUTMASK);
sem_signal (semid); sem_signal (semid);
} }
@@ -163,7 +163,7 @@ unsigned char lcdtime_HD44780_readkeypad (PrivateData *p, unsigned int YData)
// Can't combine >3 displays with >8 keypad output lines // Can't combine >3 displays with >8 keypad output lines
port_out (p->port + 2, ( ((~YData & 0x0100) >> 8) | ((~YData & 0x0200) >> 6)) ^ OUTMASK); port_out (p->port + 2, ( ((~YData & 0x0100) >> 8) | ((~YData & 0x0200) >> 6)) ^ OUTMASK);
} }
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
// Read inputs // Read inputs
readval = ~ port_in (p->port + 1) ^ INMASK; readval = ~ port_in (p->port + 1) ^ INMASK;
server/drivers/hd44780-i2c.c
+65 -53
View File
@@ -89,7 +89,7 @@ i2c_out (PrivateData *p, unsigned char val)
__u8 data[2]; __u8 data[2];
int datalen; int datalen;
static int no_more_errormsgs=0; static int no_more_errormsgs=0;
if(p->port & I2C_PCAX_MASK) { // we have a PCA9554 or similar, that needs a 2-byte command if (p->port & I2C_PCAX_MASK) { // we have a PCA9554 or similar, that needs a 2-byte command
data[0]=1; // command: read/write output port register data[0]=1; // command: read/write output port register
data[1]=val; data[1]=val;
datalen=2; datalen=2;
@@ -120,35 +120,36 @@ hd_init_i2c (Driver *drvthis)
/* READ CONFIG FILE */ /* READ CONFIG FILE */
/* Get serial device to use */ /* Get serial device to use */
strncpy(device, drvthis->config_get_string ( drvthis->name , "device" , 0 , DEFAULT_DEVICE),sizeof(device)); strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, DEFAULT_DEVICE), sizeof(device));
device[sizeof(device)-1]=0; device[sizeof(device)-1] = '\0';
report (RPT_INFO,"HD44780: I2C: Using device '%s' and address %u for a %s", device, (p->port & I2C_ADDR_MASK)?"PCA9554(A)":"PCF8574(A)"); report(RPT_INFO,"HD44780: I2C: Using device '%s' and address %u for a %s",
device, (p->port & I2C_ADDR_MASK) ? "PCA9554(A)" : "PCF8574(A)");
// Open the I2C device // Open the I2C device
p->fd = open(device,O_RDWR); p->fd = open(device, O_RDWR);
if (p->fd<0) { if (p->fd < 0) {
report( RPT_ERR, "HD44780: I2C: open i2c device '%s' failed: %s", device, strerror(errno)); report(RPT_ERR, "HD44780: I2C: open i2c device '%s' failed: %s", device, strerror(errno));
return(-1); return(-1);
} }
// Set I2C address // Set I2C address
if (ioctl(p->fd,I2C_SLAVE, p->port & I2C_ADDR_MASK) < 0) { if (ioctl(p->fd,I2C_SLAVE, p->port & I2C_ADDR_MASK) < 0) {
report( RPT_ERR, "HD44780: I2C: set address to '%i': %s", p->port & I2C_ADDR_MASK, strerror(errno)); report(RPT_ERR, "HD44780: I2C: set address to '%i': %s", p->port & I2C_ADDR_MASK, strerror(errno));
return(-1); return(-1);
} }
if(p->port & I2C_PCAX_MASK) { // we have a PCA9554 or similar, that needs special config if (p->port & I2C_PCAX_MASK) { // we have a PCA9554 or similar, that needs special config
__u8 data[2]; __u8 data[2];
data[0]=2; // command: set polarity inversion data[0] = 2; // command: set polarity inversion
data[1]=0; // -> no polarity inversion data[1] = 0; // -> no polarity inversion
if (write(p->fd,data,2) != 2) { if (write(p->fd,data,2) != 2) {
report( RPT_ERR, "HD44780: I2C: i2c set polarity inversion failed: %s", strerror(errno)); report(RPT_ERR, "HD44780: I2C: i2c set polarity inversion failed: %s", strerror(errno));
} }
data[0]=3; // command: set output direction data[0] = 3; // command: set output direction
data[1]=0; // -> all pins are outputs data[1] = 0; // -> all pins are outputs
if (write(p->fd,data,2) != 2) { if (write(p->fd,data,2) != 2) {
report( RPT_ERR, "HD44780: I2C: i2c set output direction failed: %s", strerror(errno)); report(RPT_ERR, "HD44780: I2C: i2c set output direction failed: %s", strerror(errno));
} }
} }
@@ -160,42 +161,49 @@ hd_init_i2c (Driver *drvthis)
/* We'll now send 0x03 a couple of times, /* We'll now send 0x03 a couple of times,
* which is in fact (FUNCSET | IF_8BIT) >> 4 */ * which is in fact (FUNCSET | IF_8BIT) >> 4 */
i2c_out (p, 0x03); i2c_out (p, 0x03);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if (p->delayBus)
hd44780_functions->uPause(p, 1);
i2c_out (p, enableLines | 0x03); i2c_out(p, enableLines | 0x03);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if (p->delayBus)
i2c_out (p, 0x03); hd44780_functions->uPause(p, 1);
hd44780_functions->uPause (p, 15000); i2c_out(p, 0x03);
hd44780_functions->uPause(p, 15000);
i2c_out (p, enableLines | 0x03); i2c_out(p, enableLines | 0x03);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if (p->delayBus)
i2c_out (p, 0x03); hd44780_functions->uPause(p, 1);
hd44780_functions->uPause (p, 5000); i2c_out(p, 0x03);
hd44780_functions->uPause(p, 5000);
i2c_out (p, enableLines | 0x03); i2c_out(p, enableLines | 0x03);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if (p->delayBus)
i2c_out (p, 0x03); hd44780_functions->uPause(p, 1);
hd44780_functions->uPause (p, 100); i2c_out(p, 0x03);
hd44780_functions->uPause(p, 100);
i2c_out (p, enableLines | 0x03); i2c_out(p, enableLines | 0x03);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if (p->delayBus)
i2c_out (p, 0x03); hd44780_functions->uPause(p, 1);
hd44780_functions->uPause (p, 100); i2c_out(p, 0x03);
hd44780_functions->uPause(p, 100);
// now in 8-bit mode... set 4-bit mode // now in 8-bit mode... set 4-bit mode
i2c_out (p, 0x02); i2c_out(p, 0x02);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if (p->delayBus)
hd44780_functions->uPause(p, 1);
i2c_out (p, enableLines | 0x02); i2c_out(p, enableLines | 0x02);
if( p->delayBus ) hd44780_functions->uPause (p, 1); if (p->delayBus)
i2c_out (p, 0x02); hd44780_functions->uPause(p, 1);
hd44780_functions->uPause (p, 100); i2c_out(p, 0x02);
hd44780_functions->uPause(p, 100);
// Set up two-line, small character (5x8) mode // Set up two-line, small character (5x8) mode
hd44780_functions->senddata (p, 0, RS_INSTR, FUNCSET | IF_4BIT | TWOLINE | SMALLCHAR ); hd44780_functions->senddata(p, 0, RS_INSTR, FUNCSET | IF_4BIT | TWOLINE | SMALLCHAR );
hd44780_functions->uPause (p, 40); hd44780_functions->uPause(p, 40);
common_init (p, IF_4BIT); common_init(p, IF_4BIT);
return 0; return 0;
} }
@@ -217,22 +225,26 @@ i2c_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigned char fla
enableLines = EN; enableLines = EN;
i2c_out (p, portControl | h); i2c_out(p, portControl | h);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if (p->delayBus)
i2c_out (p, enableLines | portControl | h); p->hd44780_functions->uPause(p, 1);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); i2c_out(p, enableLines | portControl | h);
i2c_out (p, portControl | h); if (p->delayBus)
p->hd44780_functions->uPause(p, 1);
i2c_out(p, portControl | h);
i2c_out (p, portControl | l); i2c_out(p, portControl | l);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if (p->delayBus)
i2c_out (p, enableLines | portControl | l); p->hd44780_functions->uPause(p, 1);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); i2c_out(p, enableLines | portControl | l);
i2c_out (p, portControl | l); if (p->delayBus)
p->hd44780_functions->uPause(p, 1);
i2c_out(p, portControl | l);
} }
void i2c_HD44780_backlight (PrivateData *p, unsigned char state) void i2c_HD44780_backlight (PrivateData *p, unsigned char state)
{ {
p->backlight_bit = ((!p->have_backlight||state)?0:BL); p->backlight_bit = ((!p->have_backlight||state) ? 0 : BL);
i2c_out (p, p->backlight_bit); i2c_out(p, p->backlight_bit);
} }
server/drivers/hd44780-lcdserializer.c
+9 -9
View File
@@ -64,14 +64,14 @@ hd_init_lcdserializer (Driver *drvthis)
/* READ CONFIG FILE */ /* READ CONFIG FILE */
/* Get serial device to use */ /* Get serial device to use */
strncpy(device, drvthis->config_get_string ( drvthis->name , "device" , 0 , DEFAULT_DEVICE),sizeof(device)); strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, DEFAULT_DEVICE), sizeof(device));
device[sizeof(device)-1]=0; device[sizeof(device)-1] = '\0';
report (RPT_INFO,"HD44780: LCD Serializer: Using device: %s", device); report(RPT_INFO, "HD44780: LCD Serializer: Using device: %s", device);
// Set up io port correctly, and open it... // Set up io port correctly, and open it...
p->fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY); p->fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY);
if (p->fd == -1) { if (p->fd == -1) {
report(RPT_ERR, "HD44780: LCD Serializer: could not open device %s (%s)\n", device, strerror(errno)); report(RPT_ERR, "HD44780: LCD Serializer: could not open device %s (%s)", device, strerror(errno));
return -1; return -1;
} }
@@ -81,7 +81,7 @@ hd_init_lcdserializer (Driver *drvthis)
/* We use RAW mode */ /* We use RAW mode */
#ifdef HAVE_CFMAKERAW #ifdef HAVE_CFMAKERAW
/* The easy way */ /* The easy way */
cfmakeraw( &portset ); cfmakeraw(&portset);
#else #else
/* The hard way */ /* The hard way */
portset.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP portset.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP
@@ -101,7 +101,7 @@ hd_init_lcdserializer (Driver *drvthis)
p->hd44780_functions->backlight = lcdserializer_HD44780_backlight; p->hd44780_functions->backlight = lcdserializer_HD44780_backlight;
p->hd44780_functions->scankeypad = lcdserializer_HD44780_scankeypad; p->hd44780_functions->scankeypad = lcdserializer_HD44780_scankeypad;
common_init (p, IF_8BIT); common_init(p, IF_8BIT);
return 0; return 0;
} }
@@ -112,11 +112,11 @@ lcdserializer_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigne
static const char instr_byte = LCDSERIALIZER_LCDI; static const char instr_byte = LCDSERIALIZER_LCDI;
if (flags == RS_DATA) { if (flags == RS_DATA) {
write( p->fd, &ch, 1 ); write(p->fd, &ch, 1);
} }
else { else {
write( p->fd, &instr_byte, 1 ); write(p->fd, &instr_byte, 1);
write( p->fd, &ch, 1 ); write(p->fd, &ch, 1);
} }
} }
server/drivers/hd44780-lis2.c
+6 -7
View File
@@ -65,14 +65,15 @@ int hd_init_lis2 (Driver *drvthis)
/* READ CONFIG FILE */ /* READ CONFIG FILE */
/* Get serial device to use */ /* Get serial device to use */
strncpy(device, drvthis->config_get_string ( drvthis->name , "device" , 0 , DEFAULT_DEVICE),sizeof(device)); strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, DEFAULT_DEVICE), sizeof(device));
device[sizeof(device)-1]=0; device[sizeof(device)-1] = '\0';
printf("HD44780: LCD Serializer: Using device: %s", device); report(RPT_INFO, "HD44780: LCD Serializer: Using device: %s", device);
// Set up io port correctly, and open it... // Set up io port correctly, and open it...
p->fd = open(device, O_RDWR | O_NOCTTY); p->fd = open(device, O_RDWR | O_NOCTTY);
if (p->fd == -1) { if (p->fd == -1) {
printf("HD44780: LCD Serializer: could not open device %s (%s)\n", device, strerror(errno)); report(RPT_ERR, "HD44780: LCD Serializer: could not open device %s (%s)",
device, strerror(errno));
return -1; return -1;
} }
@@ -90,13 +91,11 @@ int hd_init_lis2 (Driver *drvthis)
/* Set port speed to 9600 baud */ /* Set port speed to 9600 baud */
cfsetospeed(&portset, B19200); cfsetospeed(&portset, B19200);
cfsetispeed (&portset, B0); cfsetispeed(&portset, B0);
/* Set TCSANOW mode of serial device */ /* Set TCSANOW mode of serial device */
tcsetattr(p->fd, TCSANOW, &portset); tcsetattr(p->fd, TCSANOW, &portset);
p->hd44780_functions->senddata = lis2_HD44780_senddata; p->hd44780_functions->senddata = lis2_HD44780_senddata;
p->hd44780_functions->backlight = lis2_HD44780_backlight; p->hd44780_functions->backlight = lis2_HD44780_backlight;
p->hd44780_functions->scankeypad = lis2_HD44780_scankeypad; p->hd44780_functions->scankeypad = lis2_HD44780_scankeypad;
server/drivers/hd44780-picanlcd.c
+10 -9
View File
@@ -68,14 +68,15 @@ hd_init_picanlcd (Driver *drvthis)
/* READ CONFIG FILE */ /* READ CONFIG FILE */
/* Get serial device to use */ /* Get serial device to use */
strncpy(device, drvthis->config_get_string ( drvthis->name , "device" , 0 , DEFAULT_DEVICE),sizeof(device)); strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, DEFAULT_DEVICE), sizeof(device));
device[sizeof(device)-1]=0; device[sizeof(device)-1] = '\0';
report (RPT_INFO,"HD44780: PIC-an-LCD: Using device: %s", device); report(RPT_INFO,"HD44780: PIC-an-LCD: Using device: %s", device);
// Set up io port correctly, and open it... // Set up io port correctly, and open it...
p->fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY); p->fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY);
if (p->fd == -1) { if (p->fd == -1) {
report(RPT_ERR, "HD44780: PIC-an-LCD: could not open device %s (%s)\n", device, strerror(errno)); report(RPT_ERR, "HD44780: PIC-an-LCD: could not open device %s (%s)",
device, strerror(errno));
return -1; return -1;
} }
@@ -85,7 +86,7 @@ hd_init_picanlcd (Driver *drvthis)
/* We use RAW mode */ /* We use RAW mode */
#ifdef HAVE_CFMAKERAW #ifdef HAVE_CFMAKERAW
/* The easy way */ /* The easy way */
cfmakeraw( &portset ); cfmakeraw(&portset);
#else #else
/* The hard way */ /* The hard way */
portset.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP portset.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP
@@ -119,14 +120,14 @@ picanlcd_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigned cha
if (flags == RS_DATA) { if (flags == RS_DATA) {
// Do we need a DATA indicator byte ? // Do we need a DATA indicator byte ?
if( ch < 32 ) { if (ch < 32) {
write( p->fd, &data_byte, 1 ); write(p->fd, &data_byte, 1);
} }
write( p->fd, &ch, 1 ); write( p->fd, &ch, 1 );
} }
else { else {
write( p->fd, &instr_byte, 1 ); write(p->fd, &instr_byte, 1);
write( p->fd, &ch, 1 ); write(p->fd, &ch, 1);
} }
} }
server/drivers/hd44780-serialLpt.c
+3 -3
View File
@@ -186,7 +186,7 @@ unsigned char lcdserLpt_HD44780_scankeypad (PrivateData *p)
((readval & ACK) / ACK )); /* pin 10 */ ((readval & ACK) / ACK )); /* pin 10 */
if( inputs_zero == 0 ) { if ( inputs_zero == 0 ) {
// No keys were pressed // No keys were pressed
// Restore line status for backlight. // Restore line status for backlight.
@@ -201,7 +201,7 @@ unsigned char lcdserLpt_HD44780_scankeypad (PrivateData *p)
p->hd44780_functions->uPause (p, 1); p->hd44780_functions->uPause (p, 1);
if( !scancode ) { if ( !scancode ) {
// Read input line(s) // Read input line(s)
readval = ~ port_in (p->port + 1) ^ INMASK; readval = ~ port_in (p->port + 1) ^ INMASK;
@@ -212,7 +212,7 @@ unsigned char lcdserLpt_HD44780_scankeypad (PrivateData *p)
((readval & BUSY) / BUSY <<1) | /* pin 11 */ ((readval & BUSY) / BUSY <<1) | /* pin 11 */
((readval & ACK) / ACK )); /* pin 10 */ ((readval & ACK) / ACK )); /* pin 10 */
if( keybits != inputs_zero ) { if ( keybits != inputs_zero ) {
shiftingbit = 1; shiftingbit = 1;
for (shiftcount=0; shiftcount<KEYPAD_MAXX && !scancode; shiftcount++) { for (shiftcount=0; shiftcount<KEYPAD_MAXX && !scancode; shiftcount++) {
if ( (keybits ^ inputs_zero ) & shiftingbit) { if ( (keybits ^ inputs_zero ) & shiftingbit) {
server/drivers/hd44780-winamp.c
+3 -3
View File
@@ -147,12 +147,12 @@ lcdwinamp_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigned ch
// Output the actual data // Output the actual data
port_out (p->port, ch); port_out (p->port, ch);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
// then set EN high // then set EN high
port_out (p->port + 2, (enableLines|portControl) ^ OUTMASK); port_out (p->port + 2, (enableLines|portControl) ^ OUTMASK);
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
// 80 nS setup from valid data to EN low will be met without any delay // 80 nS setup from valid data to EN low will be met without any delay
// unless you are running a REALLY FAST ISA bus (like 75 MHZ!) // unless you are running a REALLY FAST ISA bus (like 75 MHZ!)
@@ -181,7 +181,7 @@ unsigned char lcdwinamp_HD44780_readkeypad (PrivateData *p, unsigned int YData)
// Convert the positive logic to the negative logic on the LPT port // Convert the positive logic to the negative logic on the LPT port
port_out (p->port, ~YData & 0x00FF ); port_out (p->port, ~YData & 0x00FF );
if( p->delayBus ) p->hd44780_functions->uPause (p, 1); if ( p->delayBus ) p->hd44780_functions->uPause (p, 1);
// Read inputs // Read inputs
readval = ~ port_in (p->port + 1) ^ INMASK; readval = ~ port_in (p->port + 1) ^ INMASK;
server/drivers/hd44780.c
+78 -68
View File
@@ -131,10 +131,10 @@ HD44780_init (Driver * drvthis)
PrivateData *p; PrivateData *p;
// Alocate and store private data // Alocate and store private data
p = (PrivateData *) malloc( sizeof( PrivateData) ); p = (PrivateData *) malloc(sizeof(PrivateData));
if( ! p ) if (p == NULL)
return -1; return -1;
if( drvthis->store_private_ptr( drvthis, p ) ) if (drvthis->store_private_ptr( drvthis, p))
return -1; return -1;
// Clear data struct // Clear data struct
@@ -156,10 +156,10 @@ HD44780_init (Driver * drvthis)
p->lastline = drvthis->config_get_bool( drvthis->name, "lastline", 0, 1 ); p->lastline = drvthis->config_get_bool( drvthis->name, "lastline", 0, 1 );
// Get and search for the connection type // Get and search for the connection type
s = drvthis->config_get_string( drvthis->name, "connectiontype", 0, "4bit" ); s = drvthis->config_get_string( drvthis->name, "ConnectionType", 0, "4bit" );
for (i = 0; connectionMapping[i].name != NULL && strcmp (s, connectionMapping[i].name) != 0; i++); for (i = 0; connectionMapping[i].name != NULL && strcmp (s, connectionMapping[i].name) != 0; i++);
if (connectionMapping[i].name == NULL) { if (connectionMapping[i].name == NULL) {
report (RPT_ERR, "HD44780_init: Unknown connection type: %s", s); report(RPT_ERR, "%s: unknown ConnectionType: %s", drvthis->name, s);
return -1; // fatal error return -1; // fatal error
} else { } else {
p->connectiontype_index = i; p->connectiontype_index = i;
@@ -171,44 +171,45 @@ HD44780_init (Driver * drvthis)
// Get and parse vspan only when specified // Get and parse vspan only when specified
s = drvthis->config_get_string( drvthis->name, "vspan", 0, "" ); s = drvthis->config_get_string( drvthis->name, "vspan", 0, "" );
if( s[0] != 0 ) { if ( s[0] != 0 ) {
if (parse_span_list (&(p->spanList), &(p->numLines), &(p->dispVOffset), &(p->numDisplays), &(p->dispSizes), s) == -1) { if (parse_span_list (&(p->spanList), &(p->numLines), &(p->dispVOffset), &(p->numDisplays), &(p->dispSizes), s) == -1) {
report (RPT_ERR, "HD44780_init: invalid vspan value: %s", s ); report(RPT_ERR, "%s: invalid vspan value: %s", drvthis->name, s);
return -1; return -1;
} }
} }
// Get and parse size // Get and parse size
s = drvthis->config_get_string( drvthis->name, "size", 0, "20x4" ); s = drvthis->config_get_string( drvthis->name, "size", 0, "20x4" );
if( sscanf( s, "%dx%d", &(p->width), &(p->height) ) != 2 if ( sscanf( s, "%dx%d", &(p->width), &(p->height) ) != 2
|| (p->width <= 0) || (p->width > LCD_MAX_WIDTH) || (p->width <= 0) || (p->width > LCD_MAX_WIDTH)
|| (p->height <= 0) || (p->height > LCD_MAX_HEIGHT)) { || (p->height <= 0) || (p->height > LCD_MAX_HEIGHT)) {
report (RPT_ERR, "HD44780_init: Cannot read size: %s", s ); report(RPT_ERR, "%s: cannot read Size %s", drvthis->name, s);
} }
// default case for when spans aren't indicated // default case for when spans aren't indicated
// - add a sanity check against p->height ?? // - add a sanity check against p->height ??
if (p->numLines == 0) { if (p->numLines == 0) {
if ((p->spanList = (int *) malloc (sizeof (int) * p->height))) { if ((p->spanList = (int *) malloc(sizeof(int) * p->height))) {
int i; int i;
for (i = 0; i < p->height; ++i) { for (i = 0; i < p->height; ++i) {
p->spanList[i] = 1; p->spanList[i] = 1;
p->numLines = p->height; p->numLines = p->height;
} }
} else } else
report (RPT_ERR, "Error mallocing"); report(RPT_ERR, "%s: error mallocing", drvthis->name);
} }
if (p->numDisplays == 0) { if (p->numDisplays == 0) {
if ((p->dispVOffset = (int *) malloc (sizeof (int))) && (p->dispSizes = (int *) malloc (sizeof (int)))) { if ((p->dispVOffset = (int *) malloc(sizeof(int))) &&
(p->dispSizes = (int *) malloc(sizeof(int)))) {
p->dispVOffset[0] = 0; p->dispVOffset[0] = 0;
p->dispSizes[0] = p->height; p->dispSizes[0] = p->height;
p->numDisplays = 1; p->numDisplays = 1;
} else } else
report (RPT_ERR, "Error mallocing"); report(RPT_ERR, "%s: error mallocing", drvthis->name);
} }
if (timing_init() == -1) { if (timing_init() == -1) {
report(RPT_ERR, "timing_init: failed (%s)\n", strerror(errno)); report(RPT_ERR, "%s: timing_init() failed (%s)", drvthis->name, strerror(errno));
return -1; return -1;
} }
@@ -217,43 +218,47 @@ HD44780_init (Driver * drvthis)
{ {
// Set priority to 1 // Set priority to 1
struct sched_param param; struct sched_param param;
param.sched_priority=1; param.sched_priority = 1;
if (( sched_setscheduler(0, SCHED_RR, &param)) == -1) { if ((sched_setscheduler(0, SCHED_RR, &param)) == -1) {
report (RPT_ERR, "HD44780_init: failed (%s)", strerror (errno)); report(RPT_ERR, "%s: sched_setscheduler() failed (%s)",
drvthis->name, strerror(errno));
return -1; return -1;
} }
} }
#endif #endif
// Allocate framebuffer // Allocate framebuffer
p->framebuf = (unsigned char *) malloc (p->width * p->height); p->framebuf = (unsigned char *) malloc(p->width * p->height);
if (!p->framebuf) { if (p->framebuf == NULL) {
report(RPT_ERR, "%s: unable to allocate framebuffer", drvthis->name);
//HD44780_close(); //HD44780_close();
return -1; return -1;
} }
// Allocate and clear the buffer for incremental updates // Allocate and clear the buffer for incremental updates
p->lcd_contents = (unsigned char *) malloc (p->width * p->height); p->lcd_contents = (unsigned char *) malloc (p->width * p->height);
if (!p->lcd_contents) { if (p->lcd_contents == NULL) {
report(RPT_ERR, "%s: unable to allocate framebuffer backing store", drvthis->name);
return -1; return -1;
} }
memset(p->lcd_contents, 0, p->width * p->height); memset(p->lcd_contents, 0, p->width * p->height);
// Allocate and clear the buffer for defineable characters // Allocate and clear the buffer for defineable characters
p->cc_buf = (unsigned char *) malloc (NUM_CCs * p->cellheight); p->cc_buf = (unsigned char *) malloc(NUM_CCs * p->cellheight);
p->cc_dirty = (unsigned char *) malloc (NUM_CCs); p->cc_dirty = (unsigned char *) malloc(NUM_CCs);
if (!p->cc_buf || !p->cc_dirty) { if (!p->cc_buf || !p->cc_dirty) {
report(RPT_ERR, "%s: error mallocing", drvthis->name);
return -1; return -1;
} }
memset(p->cc_buf, 0, NUM_CCs * p->cellheight); memset(p->cc_buf, 0, NUM_CCs * p->cellheight);
memset(p->cc_dirty, 1, NUM_CCs); /* all custom chars dirty */ memset(p->cc_dirty, 1, NUM_CCs); /* all custom chars dirty */
// Keypad ? // Keypad ?
if ( p->have_keypad ) { if (p->have_keypad) {
int x, y; int x, y;
// Read keymap // Read keymap
for( x=0; x<KEYPAD_MAXX; x++ ) { for ( x=0; x<KEYPAD_MAXX; x++ ) {
char buf[40]; char buf[40];
// First fill with default value // First fill with default value
@@ -264,14 +269,14 @@ HD44780_init (Driver * drvthis)
s = drvthis->config_get_string( drvthis->name, buf, 0, NULL ); s = drvthis->config_get_string( drvthis->name, buf, 0, NULL );
// Was a key specified in the config file ? // Was a key specified in the config file ?
if( s ) { if ( s ) {
p->keyMapDirect[x] = strdup( s ); p->keyMapDirect[x] = strdup( s );
report( RPT_INFO, "HD44780: Direct key %d: \"%s\"", x, s ); report(RPT_INFO, "HD44780: Direct key %d: \"%s\"", x, s );
} }
} }
for( x=0; x<KEYPAD_MAXX; x++ ) { for ( x=0; x<KEYPAD_MAXX; x++ ) {
for( y=0; y<KEYPAD_MAXY; y++ ) { for ( y=0; y<KEYPAD_MAXY; y++ ) {
char buf[40]; char buf[40];
// First fill with default value // First fill with default value
@@ -282,9 +287,9 @@ HD44780_init (Driver * drvthis)
s = drvthis->config_get_string( drvthis->name, buf, 0, NULL ); s = drvthis->config_get_string( drvthis->name, buf, 0, NULL );
// Was a key specified in the config file ? // Was a key specified in the config file ?
if( s ) { if ( s ) {
p->keyMapMatrix[y][x] = strdup( s ); p->keyMapMatrix[y][x] = strdup( s );
report( RPT_INFO, "HD44780: Matrix key %d %d: \"%s\"", x, y, s ); report(RPT_INFO, "HD44780: Matrix key %d %d: \"%s\"", x, y, s );
} }
} }
} }
@@ -293,8 +298,8 @@ HD44780_init (Driver * drvthis)
// Output latch state - init to a non-valid value // Output latch state - init to a non-valid value
p->output_state = 999999; p->output_state = 999999;
if ((p->hd44780_functions = (HD44780_functions *) malloc (sizeof (HD44780_functions))) == NULL) { if ((p->hd44780_functions = (HD44780_functions *) malloc(sizeof(HD44780_functions))) == NULL) {
report (RPT_ERR, "Error mallocing"); report(RPT_ERR, "%s: error mallocing", drvthis->name);
return -1; return -1;
} }
p->hd44780_functions->uPause = uPause; p->hd44780_functions->uPause = uPause;
@@ -309,18 +314,16 @@ HD44780_init (Driver * drvthis)
sprintf (buf, "HD44780 %dx%d", p->width, p->height ); sprintf (buf, "HD44780 %dx%d", p->width, p->height );
HD44780_string (drvthis, 1, 1, buf); HD44780_string (drvthis, 1, 1, buf);
if (usb) { if (usb) {
sprintf (buf, "USB %s%s%s", sprintf(buf, "USB %s%s%s",
(p->have_backlight?" bl":""), (p->have_backlight ? " bl" : ""),
(p->have_keypad?" key":""), (p->have_keypad ? " key" : ""),
(p->have_output?" out":"") (p->have_output ? " out" : ""));
);
} }
else { else {
sprintf (buf, "LPT 0x%x%s%s%s", p->port, sprintf(buf, "LPT 0x%03X%s%s%s", p->port,
(p->have_backlight?" bl":""), (p->have_backlight ? " bl" : ""),
(p->have_keypad?" key":""), (p->have_keypad ? " key" : ""),
(p->have_output?" out":"") (p->have_output ? " out" : ""));
);
} }
HD44780_string (drvthis, 1, 2, buf); HD44780_string (drvthis, 1, 2, buf);
HD44780_flush (drvthis); HD44780_flush (drvthis);
@@ -372,10 +375,16 @@ HD44780_close(Driver *drvthis)
{ {
PrivateData *p = (PrivateData *) drvthis->private_data; PrivateData *p = (PrivateData *) drvthis->private_data;
if(p->framebuf) free( p->framebuf ); if (p != NULL) {
if(p->lcd_contents) free( p->lcd_contents ); if (p->framebuf)
free( p ); free(p->framebuf);
drvthis->store_private_ptr( drvthis, NULL );
if (p->lcd_contents)
free(p->lcd_contents);
free(p);
}
drvthis->store_private_ptr(drvthis, NULL);
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -451,8 +460,8 @@ HD44780_flush (Driver *drvthis)
drawing = 0; drawing = 0;
for (x=0 ; x<wid; x++) { for (x=0 ; x<wid; x++) {
ch = p->framebuf[(y * wid) + x]; ch = p->framebuf[(y * wid) + x];
if( ch != p->lcd_contents[(y*wid)+x] ) { if ( ch != p->lcd_contents[(y*wid)+x] ) {
if( !drawing || x % 8 == 0 ) { // x%8 is for 16x1 displays ! if ( !drawing || x % 8 == 0 ) { // x%8 is for 16x1 displays !
drawing = 1; drawing = 1;
HD44780_position(drvthis,x,y); HD44780_position(drvthis,x,y);
} }
@@ -466,12 +475,12 @@ HD44780_flush (Driver *drvthis)
} }
} }
} }
debug( RPT_DEBUG, "HD44780: flushed %d chars", count ); debug(RPT_DEBUG, "HD44780: flushed %d chars", count );
/* Check which defineable chars we need to update */ /* Check which defineable chars we need to update */
count = 0; count = 0;
for( i = 0; i < NUM_CCs; i ++ ) { for ( i = 0; i < NUM_CCs; i ++ ) {
if( p->cc_dirty[i] ) { if ( p->cc_dirty[i] ) {
/* Tell the HD44780 we will redefine char number i */ /* Tell the HD44780 we will redefine char number i */
p->hd44780_functions->senddata (p, 0, RS_INSTR, SETCHAR | i * 8); p->hd44780_functions->senddata (p, 0, RS_INSTR, SETCHAR | i * 8);
@@ -487,7 +496,7 @@ HD44780_flush (Driver *drvthis)
count ++; count ++;
} }
} }
debug( RPT_DEBUG, "HD44780: flushed %d custom chars's", count ); debug(RPT_DEBUG, "HD44780: flushed %d custom chars's", count );
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -623,14 +632,14 @@ HD44780_init_vbar (Driver *drvthis)
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
}; };
if( p->ccmode == CCMODE_VBAR ) { if ( p->ccmode == CCMODE_VBAR ) {
/* Work already done */ /* Work already done */
return; return;
} }
if( p->ccmode != CCMODE_STANDARD ) { if ( p->ccmode != CCMODE_STANDARD ) {
/* Not supported (yet) */ /* Not supported (yet) */
report( RPT_WARNING, "HD44780_init_vbar: Cannot combine two modes using user defined characters" ); report(RPT_WARNING, "HD44780_init_vbar: Cannot combine two modes using user defined characters" );
return; return;
} }
p->ccmode = CCMODE_VBAR; p->ccmode = CCMODE_VBAR;
@@ -703,14 +712,14 @@ HD44780_init_hbar (Driver *drvthis)
1, 1, 1, 1, 0, 1, 1, 1, 1, 0,
}; };
if( p->ccmode == CCMODE_HBAR ) { if ( p->ccmode == CCMODE_HBAR ) {
/* Work already done */ /* Work already done */
return; return;
} }
if( p->ccmode != CCMODE_STANDARD ) { if ( p->ccmode != CCMODE_STANDARD ) {
/* Not supported (yet) */ /* Not supported (yet) */
report( RPT_WARNING, "HD44780_init_hbar: Cannot combine two modes using user defined characters" ); report(RPT_WARNING, "HD44780_init_hbar: Cannot combine two modes using user defined characters" );
return; return;
} }
p->ccmode = CCMODE_HBAR; p->ccmode = CCMODE_HBAR;
@@ -848,9 +857,9 @@ HD44780_init_num (Driver *drvthis)
if (p->ccmode != CCMODE_BIGNUM) { if (p->ccmode != CCMODE_BIGNUM) {
int i; int i;
if( p->ccmode != CCMODE_STANDARD ) { if ( p->ccmode != CCMODE_STANDARD ) {
/* Not supported (yet) */ /* Not supported (yet) */
report( RPT_WARNING, "HD44780_init_num: Cannot combine two modes using user defined characters" ); report(RPT_WARNING, "HD44780_init_num: Cannot combine two modes using user defined characters" );
return; return;
} }
p->ccmode = CCMODE_BIGNUM; p->ccmode = CCMODE_BIGNUM;
@@ -975,7 +984,7 @@ HD44780_set_char (Driver *drvthis, int n, char *dat)
letter |= (dat[(row * p->cellwidth) + col] > 0) ? 1 : 0; letter |= (dat[(row * p->cellwidth) + col] > 0) ? 1 : 0;
} }
} }
if( p->cc_buf[n*p->cellheight+row] != letter ) { if ( p->cc_buf[n*p->cellheight+row] != letter ) {
p->cc_dirty[n] = 1; /* only mark as dirty if really different */ p->cc_dirty[n] = 1; /* only mark as dirty if really different */
} }
p->cc_buf[n*p->cellheight+row] = letter; p->cc_buf[n*p->cellheight+row] = letter;
@@ -1062,7 +1071,7 @@ HD44780_icon (Driver *drvthis, int x, int y, int icon)
1, 1, 1, 1, 1 }; 1, 1, 1, 1, 1 };
/* Yes I know, this is a VERY BAD implementation */ /* Yes I know, this is a VERY BAD implementation */
switch( icon ) { switch ( icon ) {
case ICON_BLOCK_FILLED: case ICON_BLOCK_FILLED:
HD44780_set_char( drvthis, 6, block_filled ); HD44780_set_char( drvthis, 6, block_filled );
HD44780_chr( drvthis, x, y, 6); HD44780_chr( drvthis, x, y, 6);
@@ -1118,13 +1127,13 @@ HD44780_get_key(Driver *drvthis)
char * keystr = NULL; char * keystr = NULL;
struct timeval curr_time, time_diff; struct timeval curr_time, time_diff;
if( ! p->have_keypad ) return NULL; if ( ! p->have_keypad ) return NULL;
gettimeofday(&curr_time,NULL); gettimeofday(&curr_time,NULL);
scancode = p->hd44780_functions->scankeypad(p); scancode = p->hd44780_functions->scankeypad(p);
if( scancode ) { if ( scancode ) {
if( scancode & 0xF0 ) { if ( scancode & 0xF0 ) {
keystr = p->keyMapMatrix[((scancode&0xF0)>>4)-1][(scancode&0x0F)-1]; keystr = p->keyMapMatrix[((scancode&0xF0)>>4)-1][(scancode&0x0F)-1];
} }
else { else {
@@ -1132,7 +1141,7 @@ HD44780_get_key(Driver *drvthis)
} }
} }
if( keystr != NULL ) { if ( keystr != NULL ) {
if (keystr == p->pressed_key) { if (keystr == p->pressed_key) {
timersub (&curr_time, &(p->pressed_key_time), &time_diff); timersub (&curr_time, &(p->pressed_key_time), &time_diff);
if (((time_diff.tv_usec / 1000 + time_diff.tv_sec * 1000) - KEYPAD_AUTOREPEAT_DELAY) < 1000 * p->pressed_key_repetitions / KEYPAD_AUTOREPEAT_FREQ ) { if (((time_diff.tv_usec / 1000 + time_diff.tv_sec * 1000) - KEYPAD_AUTOREPEAT_DELAY) < 1000 * p->pressed_key_repetitions / KEYPAD_AUTOREPEAT_FREQ ) {
@@ -1147,7 +1156,8 @@ HD44780_get_key(Driver *drvthis)
// It's a new keypress // It's a new keypress
p->pressed_key_time = curr_time; p->pressed_key_time = curr_time;
p->pressed_key_repetitions = 0; p->pressed_key_repetitions = 0;
report( RPT_INFO, "HD44780_get_key: Key pressed: %s (%d,%d)\n", keystr, scancode&0x0F, (scancode&0xF0)>>4 ); report(RPT_INFO, "HD44780_get_key: Key pressed: %s (%d,%d)",
keystr, scancode&0x0F, (scancode&0xF0)>>4 );
} }
} }
@@ -1191,7 +1201,7 @@ unsigned char HD44780_scankeypad(PrivateData *p)
// Now check the matrix // Now check the matrix
// First check with all 1's // First check with all 1's
Ypattern = (1 << KEYPAD_MAXY) - 1; Ypattern = (1 << KEYPAD_MAXY) - 1;
if( p->hd44780_functions->readkeypad (p, Ypattern)) { if ( p->hd44780_functions->readkeypad (p, Ypattern)) {
// Yes, a key on the matrix is pressed // Yes, a key on the matrix is pressed
// OK, now we know a key is pressed. // OK, now we know a key is pressed.