diff options
author | Reinhard Tartler <siretart@tauware.de> | 2011-08-26 09:24:25 +0200 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2011-08-26 09:24:25 +0200 |
commit | 7c0fb2e980af93923f2071e1af087010962e06bd (patch) | |
tree | 622e5a8f57901f9f6dbccec081766c29cffbf08e /drv_GLCD2USB.c | |
parent | 181cec4348da40331b3e8ab365732c025ec149b2 (diff) | |
download | lcd4linux-7c0fb2e980af93923f2071e1af087010962e06bd.tar.gz |
Import upstream version 0.11.0~svn1158
Diffstat (limited to 'drv_GLCD2USB.c')
-rw-r--r-- | drv_GLCD2USB.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drv_GLCD2USB.c b/drv_GLCD2USB.c index c9f5618..0989b46 100644 --- a/drv_GLCD2USB.c +++ b/drv_GLCD2USB.c @@ -1,4 +1,5 @@ -/* $Id: drv_GLCD2USB.c 1134 2010-11-20 20:22:05Z mzuther $ + +/* $Id: drv_GLCD2USB.c 1144 2011-05-06 18:21:47Z harbaum $ * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drv_GLCD2USB.c $ * * GLCD2USB driver for LCD4Linux @@ -582,7 +583,7 @@ int drv_GLCD2USB_init(const char *section, const __attribute__ ((unused)) { int ret; - info("%s: %s", Name, "$Rev: 1134 $"); + info("%s: %s", Name, "$Rev: 1144 $"); /* real worker functions */ drv_generic_graphic_real_blit = drv_GLCD2USB_blit; @@ -596,6 +597,10 @@ int drv_GLCD2USB_init(const char *section, const __attribute__ ((unused)) if ((ret = drv_generic_graphic_init(section, Name)) != 0) return ret; + /* initialize generic key pad driver */ + if ((ret = drv_generic_keypad_init(section, Name)) != 0) + return ret; + /* register plugins */ AddFunction("LCD::brightness", 1, plugin_brightness); @@ -612,6 +617,8 @@ int drv_GLCD2USB_quit(const __attribute__ ((unused)) info("%s: shutting down.", Name); drv_generic_graphic_quit(); + drv_generic_keypad_quit(); + /* release access to display */ buffer.bytes[0] = GLCD2USB_RID_SET_ALLOC; |