aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--drv_Crystalfontz.c25
-rw-r--r--drv_LCD2USB.c8
-rw-r--r--drv_generic_keypad.c11
-rw-r--r--drv_generic_keypad.h7
4 files changed, 26 insertions, 25 deletions
diff --git a/drv_Crystalfontz.c b/drv_Crystalfontz.c
index 6ea812c..c8e4706 100644
--- a/drv_Crystalfontz.c
+++ b/drv_Crystalfontz.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Crystalfontz.c,v 1.41 2006/02/21 15:52:30 cmay Exp $
+/* $Id: drv_Crystalfontz.c,v 1.42 2006/02/22 15:59:39 cmay Exp $
*
* new style driver for Crystalfontz display modules
*
@@ -23,6 +23,9 @@
*
*
* $Log: drv_Crystalfontz.c,v $
+ * Revision 1.42 2006/02/22 15:59:39 cmay
+ * removed KEYPADSIZE cruft per harbaum's suggestion
+ *
* Revision 1.41 2006/02/21 15:52:30 cmay
* added back CF635 GPO counts in model struct lost after last merge
*
@@ -252,7 +255,6 @@ typedef struct {
int gpos;
int protocol;
int payload;
- int keypadsize;
} MODEL;
/* Fixme #1: number of GPI's & GPO's should be verified */
@@ -260,14 +262,14 @@ typedef struct {
/* Fixme #3: number of keys on the keypad should be verified */
static MODEL Models[] = {
- {626, "626", 2, 16, 0, 0, 1, 0, 0},
- {631, "631", 2, 20, 0, 0, 3, 22, 4},
- {632, "632", 2, 16, 0, 0, 1, 0, 0},
- {633, "633", 2, 16, 4, 4, 2, 18, 6},
- {634, "634", 4, 20, 0, 0, 1, 0, 0},
- {635, "635", 4, 20, 4, 12, 3, 22, 6},
- {636, "636", 2, 16, 0, 0, 1, 0, 0},
- {-1, "Unknown", -1, -1, 0, 0, 0, 0, 0}
+ {626, "626", 2, 16, 0, 0, 1, 0},
+ {631, "631", 2, 20, 0, 0, 3, 22},
+ {632, "632", 2, 16, 0, 0, 1, 0},
+ {633, "633", 2, 16, 4, 4, 2, 18},
+ {634, "634", 4, 20, 0, 0, 1, 0},
+ {635, "635", 4, 20, 4, 12, 3, 22},
+ {636, "636", 2, 16, 0, 0, 1, 0},
+ {-1, "Unknown", -1, -1, 0, 0, 0, 0}
};
@@ -988,7 +990,6 @@ static int drv_CF_start(const char *section)
GPOS = Models[Model].gpos;
Protocol = Models[Model].protocol;
Payload = Models[Model].payload;
- KEYPADSIZE = Models[Model].keypadsize;
switch (Protocol) {
@@ -1111,7 +1112,7 @@ int drv_CF_init(const char *section, const int quiet)
WIDGET_CLASS wc;
int ret;
- info("%s: %s", Name, "$Revision: 1.41 $");
+ info("%s: %s", Name, "$Revision: 1.42 $");
/* start display */
if ((ret = drv_CF_start(section)) != 0) {
diff --git a/drv_LCD2USB.c b/drv_LCD2USB.c
index c535a96..aa864fe 100644
--- a/drv_LCD2USB.c
+++ b/drv_LCD2USB.c
@@ -1,4 +1,4 @@
-/* $Id: drv_LCD2USB.c,v 1.7 2006/02/21 21:43:03 harbaum Exp $
+/* $Id: drv_LCD2USB.c,v 1.8 2006/02/22 15:59:39 cmay Exp $
*
* driver for USB2LCD display interface
* see http://www.harbaum.org/till/lcd2usb for schematics
@@ -24,6 +24,9 @@
*
*
* $Log: drv_LCD2USB.c,v $
+ * Revision 1.8 2006/02/22 15:59:39 cmay
+ * removed KEYPADSIZE cruft per harbaum's suggestion
+ *
* Revision 1.7 2006/02/21 21:43:03 harbaum
* Keypad support for LCD2USB
*
@@ -497,7 +500,6 @@ static int drv_L2U_start(const char *section, const int quiet)
DROWS = rows;
DCOLS = cols;
- KEYPADSIZE = L2U_BUTTONS;
/* bus id and device id are strings and not just intergers, since */
/* the windows port of libusb treats them as strings. And this way */
@@ -598,7 +600,7 @@ int drv_L2U_init(const char *section, const int quiet)
int asc255bug;
int ret;
- info("%s: %s", Name, "$Revision: 1.7 $");
+ info("%s: %s", Name, "$Revision: 1.8 $");
/* display preferences */
XRES = 5; /* pixel width of one char */
diff --git a/drv_generic_keypad.c b/drv_generic_keypad.c
index 3a02b14..5b4f2b1 100644
--- a/drv_generic_keypad.c
+++ b/drv_generic_keypad.c
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_keypad.c,v 1.2 2006/02/21 15:55:59 cmay Exp $
+/* $Id: drv_generic_keypad.c,v 1.3 2006/02/22 15:59:39 cmay Exp $
*
* generic driver helper for keypads
*
@@ -23,6 +23,9 @@
*
*
* $Log: drv_generic_keypad.c,v $
+ * Revision 1.3 2006/02/22 15:59:39 cmay
+ * removed KEYPADSIZE cruft per harbaum's suggestion
+ *
* Revision 1.2 2006/02/21 15:55:59 cmay
* removed new update function for keypad, consolidated it with draw
*
@@ -40,13 +43,9 @@
#include "drv_generic_keypad.h"
-#define MAX_KEYPADSIZE 32
-
static char *Section = NULL;
static char *Driver = NULL;
-int KEYPADSIZE = 0;
-
int (*drv_generic_keypad_real_press) () = NULL;
int drv_generic_keypad_init(const char *section, const char *driver)
@@ -56,8 +55,6 @@ int drv_generic_keypad_init(const char *section, const char *driver)
Section = (char *) section;
Driver = (char *) driver;
- info("%s: using KEYPADSIZE %d", Driver, KEYPADSIZE);
-
/* register keypad widget */
wc = Widget_Keypad;
widget_register(&wc);
diff --git a/drv_generic_keypad.h b/drv_generic_keypad.h
index 98365c6..6145d5e 100644
--- a/drv_generic_keypad.h
+++ b/drv_generic_keypad.h
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_keypad.h,v 1.2 2006/02/21 15:55:59 cmay Exp $
+/* $Id: drv_generic_keypad.h,v 1.3 2006/02/22 15:59:39 cmay Exp $
*
* generic driver helper for keypads
*
@@ -20,6 +20,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log: drv_generic_keypad.h,v $
+ * Revision 1.3 2006/02/22 15:59:39 cmay
+ * removed KEYPADSIZE cruft per harbaum's suggestion
+ *
* Revision 1.2 2006/02/21 15:55:59 cmay
* removed new update function for keypad, consolidated it with draw
*
@@ -34,8 +37,6 @@
#include "widget.h"
-extern int KEYPADSIZE; /* number of keys on the pad */
-
/* these functinos must be implemented by the real driver */
extern int (*drv_generic_keypad_real_press) (const int num);