- coding style harmonization

- check onsistency between Size & vSpan

server/drivers/hd44780-drivers.h

@@ -17,17 +17,18 @@
 # include "hd44780-serialLpt.h"
 # include "hd44780-winamp.h"
 #endif
+#include "hd44780-serial.h"
+#include "hd44780-lis2.h"
 #ifdef HAVE_LIBUSB
 # include "hd44780-bwct-usb.h"
 # include "hd44780-lcd2usb.h"
 #endif
-#include "hd44780-serial.h"
-#include "hd44780-lis2.h"
 #ifdef HAVE_I2C
 # include "hd44780-i2c.h"
 #endif
 // add new connection type header files here
 
+
 static const ConnectionMapping connectionMapping[] = {
 	// connectionType enumerator
 	// string to identify connection on command line

server/drivers/hd44780-lis2.c

@@ -157,29 +157,25 @@ int rowNum = 0;
 void lis2_HD44780_senddata(PrivateData *p, unsigned char displayID, unsigned char flags, unsigned char ch)
 {
 	if (flags == RS_DATA) {
-		if (mode == SETCHAR)
-		{
+		if (mode == SETCHAR) {
 			writeChar(p->fd, 0);
 			writeChar(p->fd, 171);
 			writeChar(p->fd, charNum);
 			writeChar(p->fd, rowNum);
 			writeChar(p->fd, ch);
-			rowNum = rowNum + 1;
-			if (rowNum==p->cellheight)
-			{
+			rowNum++;
+			if (rowNum == p->cellheight) {
 				mode = 0;
 				rowNum = 0;
 			}
 		}
-		else
-		{
-			if (ch<7) ch=ch+1;
+		else {
+			if (ch < 7) ch++;
 			write(p->fd, &ch, 1);
 		}
 	}
 	else {
-		if ((ch & POSITION)!=0)		
-		{
+		if ((ch & POSITION) != 0) {
 			int x = 0;
 			int y = 0;
 			int pos = 0;
@@ -201,8 +197,7 @@ void lis2_HD44780_senddata (PrivateData *p, unsigned char displayID, unsigned ch
 			writeChar(p->fd, 167);
 
 		}
-		else if ((ch & SETCHAR)!=0)		
-		{
+		else if ((ch & SETCHAR) != 0) {
 			mode = SETCHAR;
 			charNum = ((ch & ~SETCHAR)/8) + 1;
 			if (charNum == 8) charNum = 7;
@@ -223,5 +218,3 @@ unsigned char lis2_HD44780_scankeypad (PrivateData *p)
 }
 
 
-
-

server/drivers/hd44780.c

@@ -204,7 +204,6 @@ HD44780_init (Driver *drvthis)
 	}
 
 	// default case for when spans aren't indicated
-	// - add a sanity check against p->height ??
 	if (p->numLines == 0) {
 		if ((p->spanList = (int *) calloc(sizeof(int), p->height)) != NULL) {
 			int i;
@@ -215,6 +214,11 @@ HD44780_init (Driver *drvthis)
 		} else
 			report(RPT_ERR, "%s: error allocing", drvthis->name);
 	}
+	else {
+	  // sanity check against p->height
+	  if (p->numLines != p->height)
+	    report(RPT_ERR, "%s: height in Size does not match vSpan", drvthis->name);
+	}
 	if (p->numDisplays == 0) {
 		if (((p->dispVOffset = (int *) calloc(1, sizeof(int))) != NULL) &&
 	            ((p->dispSizes = (int *) calloc(1, sizeof(int))) != NULL)) {