[lcd4linux @ 2005-05-08 04:32:43 by reinelt]

CodingStyle added and applied

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@547 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

1 files changed, 162 insertions, 157 deletions

diff --git a/drv_MilfordInstruments.c b/drv_MilfordInstruments.c
index f1cb0e4..c18def3 100644
--- a/drv_MilfordInstruments.c
+++ b/drv_MilfordInstruments.c
@@ -1,4 +1,4 @@
-/* $Id: drv_MilfordInstruments.c,v 1.13 2005/01/18 06:30:23 reinelt Exp $
+/* $Id: drv_MilfordInstruments.c,v 1.14 2005/05/08 04:32:44 reinelt Exp $
  *
  * driver for Milford Instruments 'BPK' piggy-back serial interface board
  * for standard Hitachi 44780 compatible lcd modules.
@@ -27,6 +27,9 @@
  *
  *
  * $Log: drv_MilfordInstruments.c,v $
+ * Revision 1.14  2005/05/08 04:32:44  reinelt
+ * CodingStyle added and applied
+ *
  * Revision 1.13  2005/01/18 06:30:23  reinelt
  * added (C) to all copyright statements
  *
@@ -105,106 +108,108 @@
 #include "drv_generic_serial.h"
 
 
-static char Name[]="MilfordInstruments";
+static char Name[] = "MilfordInstruments";
 
 typedef struct {
-  int type;
-  char *name;
-  int rows;
-  int cols;
+    int type;
+    char *name;
+    int rows;
+    int cols;
 } MODEL;
 
 static MODEL Models[] = {
-  { 216, "MI216",    2, 16 },
-  { 220, "MI220",    2, 20 },
-  { 240, "MI240",    2, 40 },
-  { 420, "MI420",    4, 20 },
-  { -1,  "unknown", -1, -1 },
+    {216, "MI216", 2, 16},
+    {220, "MI220", 2, 20},
+    {240, "MI240", 2, 40},
+    {420, "MI420", 4, 20},
+    {-1, "unknown", -1, -1},
 };
 
-static int  Model;
+static int Model;
 
 
 /****************************************/
 /***  hardware dependant functions    ***/
 /****************************************/
 
-static void drv_MI_clear (void)
+static void drv_MI_clear(void)
 {
-  drv_generic_serial_write ("\376\001", 2);  /* clear screen */
+    drv_generic_serial_write("\376\001", 2);	/* clear screen */
 }
 
 
-static void drv_MI_write (const int row, const int col, const char *data, const int len)
+static void drv_MI_write(const int row, const int col, const char *data, const int len)
 {
-  char cmd[2] = "\376x";
-  int ddbase = 128;
-  if (row & 1) { /* i.e. if row is 1 or 3 */
-    ddbase += 64;
-  }
-  if (row & 2) { /* i.e. if row is 0 or 2. */
-    ddbase += 20;
-  }
-  cmd[1] = (char)(ddbase+col);
-  drv_generic_serial_write(cmd,2);
-
-  drv_generic_serial_write (data, len);
+    char cmd[2] = "\376x";
+    int ddbase = 128;
+    if (row & 1) {		/* i.e. if row is 1 or 3 */
+	ddbase += 64;
+    }
+    if (row & 2) {		/* i.e. if row is 0 or 2. */
+	ddbase += 20;
+    }
+    cmd[1] = (char) (ddbase + col);
+    drv_generic_serial_write(cmd, 2);
+
+    drv_generic_serial_write(data, len);
 }
 
 
-static void drv_MI_defchar (const int ascii, const unsigned char *matrix)
+static void drv_MI_defchar(const int ascii, const unsigned char *matrix)
 {
-  int i;
-  char cmd[10]="\376x";
-
-  if (ascii<8) {
-    cmd[1]=(char)(64+ascii*8);
-    for ( i=0; i<8; i++) {
-      cmd[i+2] = matrix[i] & 0x1f;
-    };
-    drv_generic_serial_write (cmd, 10);
-  }
+    int i;
+    char cmd[10] = "\376x";
+
+    if (ascii < 8) {
+	cmd[1] = (char) (64 + ascii * 8);
+	for (i = 0; i < 8; i++) {
+	    cmd[i + 2] = matrix[i] & 0x1f;
+	};
+	drv_generic_serial_write(cmd, 10);
+    }
 }
 
 
-static int drv_MI_start (const char *section, const int quiet)
+static int drv_MI_start(const char *section, const int quiet)
 {
-  int i;  
-  char *model;
-  
-  model = cfg_get(section, "Model", NULL);
-  if (model == NULL && *model == '\0') {
-    error ("%s: no '%s.Model' entry from %s", Name, section, cfg_source());
-    return -1;
-  }
-  
-  for (i=0; Models[i].type!=0xff; i++) {
-    if (strcasecmp(Models[i].name, model)==0) break;
-  }
-  if (Models[i].type==0xff) {
-    error ("%s: %s.Model '%s' is unknown from %s", Name, section, model, cfg_source());
-    return -1;
-  }
-  Model=i;
-  info ("%s: using model '%s'", Name, Models[Model].name);
-  
-  if (drv_generic_serial_open(section, Name, 0) < 0) return -1;
-  
-  /* initialize global variables */
-  DROWS    = Models[Model].rows;
-  DCOLS    = Models[Model].cols;
-  
-  drv_MI_clear();
-  drv_generic_serial_write ("\376\014", 2);  /* cursor off */
-
-  if (!quiet) {
-    if (drv_generic_text_greet (Models[Model].name, "Milford Instruments")) {
-      sleep (3);
-      drv_MI_clear();
+    int i;
+    char *model;
+
+    model = cfg_get(section, "Model", NULL);
+    if (model == NULL && *model == '\0') {
+	error("%s: no '%s.Model' entry from %s", Name, section, cfg_source());
+	return -1;
+    }
+
+    for (i = 0; Models[i].type != 0xff; i++) {
+	if (strcasecmp(Models[i].name, model) == 0)
+	    break;
     }
-  }
+    if (Models[i].type == 0xff) {
+	error("%s: %s.Model '%s' is unknown from %s", Name, section, model, cfg_source());
+	return -1;
+    }
+    Model = i;
+    info("%s: using model '%s'", Name, Models[Model].name);
+
+    if (drv_generic_serial_open(section, Name, 0) < 0)
+	return -1;
 
-  return 0;
+    /* initialize global variables */
+    DROWS = Models[Model].rows;
+    DCOLS = Models[Model].cols;
+
+    drv_MI_clear();
+    drv_generic_serial_write("\376\014", 2);	/* cursor off */
+
+    if (!quiet) {
+	if (drv_generic_text_greet(Models[Model].name, "Milford Instruments")) {
+	    sleep(3);
+	    drv_MI_clear();
+	}
+    }
+
+    return 0;
 }
 
 
@@ -230,102 +235,102 @@ static int drv_MI_start (const char *section, const int quiet)
 
 
 /* list models */
-int drv_MI_list (void)
+int drv_MI_list(void)
 {
-  int i;
-  
-  for (i = 0; Models[i].type > 0; i++) {
-    printf ("%s ", Models[i].name);
-  }
-  return 0;
+    int i;
+
+    for (i = 0; Models[i].type > 0; i++) {
+	printf("%s ", Models[i].name);
+    }
+    return 0;
 }
 
 
 /* initialize driver & display */
-int drv_MI_init (const char *section, const int quiet)
+int drv_MI_init(const char *section, const int quiet)
 {
-  WIDGET_CLASS wc;
-  int ret;  
-  
-  /* display preferences */
-  XRES  = 5;     /* pixel width of one char  */
-  YRES  = 8;     /* pixel height of one char  */
-  CHARS = 8;     /* number of user-defineable characters */
-  CHAR0 = 0;     /* ASCII of first user-defineable char */
-  GOTO_COST = 4; /* number of bytes a goto command requires */
-  
-  /* real worker functions */
-  drv_generic_text_real_write   = drv_MI_write;
-  drv_generic_text_real_defchar = drv_MI_defchar;
-
-
-  /* start display */
-  if ((ret=drv_MI_start (section, quiet))!=0)
-    return ret;
-  
-  /* initialize generic text driver */
-  if ((ret=drv_generic_text_init(section, Name))!=0)
-    return ret;
-
-  /* initialize generic icon driver */
-  if ((ret=drv_generic_text_icon_init())!=0)
-    return ret;
-  
-  /* initialize generic bar driver */
-  if ((ret=drv_generic_text_bar_init(0))!=0)
-    return ret;
-  
-  /* add fixed chars to the bar driver */
-  drv_generic_text_bar_add_segment (  0,  0,255, 32); /* ASCII  32 = blank */
-  drv_generic_text_bar_add_segment (255,255,255,255); /* ASCII 255 = block */
-  
-  /* register text widget */
-  wc=Widget_Text;
-  wc.draw=drv_generic_text_draw;
-  widget_register(&wc);
-  
-  /* register icon widget */
-  wc=Widget_Icon;
-  wc.draw=drv_generic_text_icon_draw;
-  widget_register(&wc);
-  
-  /* register bar widget */
-  wc=Widget_Bar;
-  wc.draw=drv_generic_text_bar_draw;
-  widget_register(&wc);
-  
-  /* register plugins */
-  /* none at the moment... */
-
-  return 0;
+    WIDGET_CLASS wc;
+    int ret;
+
+    /* display preferences */
+    XRES = 5;			/* pixel width of one char  */
+    YRES = 8;			/* pixel height of one char  */
+    CHARS = 8;			/* number of user-defineable characters */
+    CHAR0 = 0;			/* ASCII of first user-defineable char */
+    GOTO_COST = 4;		/* number of bytes a goto command requires */
+
+    /* real worker functions */
+    drv_generic_text_real_write = drv_MI_write;
+    drv_generic_text_real_defchar = drv_MI_defchar;
+
+
+    /* start display */
+    if ((ret = drv_MI_start(section, quiet)) != 0)
+	return ret;
+
+    /* initialize generic text driver */
+    if ((ret = drv_generic_text_init(section, Name)) != 0)
+	return ret;
+
+    /* initialize generic icon driver */
+    if ((ret = drv_generic_text_icon_init()) != 0)
+	return ret;
+
+    /* initialize generic bar driver */
+    if ((ret = drv_generic_text_bar_init(0)) != 0)
+	return ret;
+
+    /* add fixed chars to the bar driver */
+    drv_generic_text_bar_add_segment(0, 0, 255, 32);	/* ASCII  32 = blank */
+    drv_generic_text_bar_add_segment(255, 255, 255, 255);	/* ASCII 255 = block */
+
+    /* register text widget */
+    wc = Widget_Text;
+    wc.draw = drv_generic_text_draw;
+    widget_register(&wc);
+
+    /* register icon widget */
+    wc = Widget_Icon;
+    wc.draw = drv_generic_text_icon_draw;
+    widget_register(&wc);
+
+    /* register bar widget */
+    wc = Widget_Bar;
+    wc.draw = drv_generic_text_bar_draw;
+    widget_register(&wc);
+
+    /* register plugins */
+    /* none at the moment... */
+
+    return 0;
 }
 
 
 /* close driver & display */
-int drv_MI_quit (const int quiet) {
-
-  info("%s: shutting down.", Name);
-
-  drv_generic_text_quit();
-
-  /* clear display */
-  drv_MI_clear();
-  
-  /* say goodbye... */
-  if (!quiet) {
-    drv_generic_text_greet ("goodbye!", NULL);
-  }
-  
-  drv_generic_serial_close();
-  
-  return (0);
+int drv_MI_quit(const int quiet)
+{
+
+    info("%s: shutting down.", Name);
+
+    drv_generic_text_quit();
+
+    /* clear display */
+    drv_MI_clear();
+
+    /* say goodbye... */
+    if (!quiet) {
+	drv_generic_text_greet("goodbye!", NULL);
+    }
+
+    drv_generic_serial_close();
+
+    return (0);
 }
 
 
 DRIVER drv_MilfordInstruments = {
-  name: Name,
-  list: drv_MI_list,
-  init: drv_MI_init,
-  quit: drv_MI_quit, 
+  name:Name,
+  list:drv_MI_list,
+  init:drv_MI_init,
+  quit:drv_MI_quit,
 };
-