aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2004-05-29 15:53:28 +0000
committerreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2004-05-29 15:53:28 +0000
commitc17304852de34a6be81d931923dd9e21c637ba95 (patch)
treeee5c124a325130c45b26de74d730892fa81d459d
parent927530dfa14e1d35abd5a564a730f4fcf598a416 (diff)
downloadlcd4linux-c17304852de34a6be81d931923dd9e21c637ba95.tar.gz
[lcd4linux @ 2004-05-29 15:53:28 by reinelt]
M50530: reset parport signals on exit plugin_ppp: ppp() has two parameters, not three lcd4linux.conf.sample: diskstats() corrected git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@445 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r--drv_M50530.c12
-rw-r--r--lcd4linux.conf.sample12
-rw-r--r--plugin_ppp.c10
3 files changed, 25 insertions, 9 deletions
diff --git a/drv_M50530.c b/drv_M50530.c
index e982b7d..a60ad4c 100644
--- a/drv_M50530.c
+++ b/drv_M50530.c
@@ -1,4 +1,4 @@
-/* $Id: drv_M50530.c,v 1.4 2004/05/26 11:37:36 reinelt Exp $
+/* $Id: drv_M50530.c,v 1.5 2004/05/29 15:53:28 reinelt Exp $
*
* new style driver for M50530-based displays
*
@@ -23,6 +23,12 @@
*
*
* $Log: drv_M50530.c,v $
+ * Revision 1.5 2004/05/29 15:53:28 reinelt
+ *
+ * M50530: reset parport signals on exit
+ * plugin_ppp: ppp() has two parameters, not three
+ * lcd4linux.conf.sample: diskstats() corrected
+ *
* Revision 1.4 2004/05/26 11:37:36 reinelt
*
* Curses driver ported.
@@ -342,6 +348,10 @@ int drv_M5_init (char *section)
int drv_M5_quit (void) {
info("%s: shutting down.", Name);
+
+ // clear all signals
+ drv_generic_parport_control (SIGNAL_EX|SIGNAL_IOC1|SIGNAL_IOC2|SIGNAL_GPO, 0);
+
drv_generic_parport_close();
drv_generic_text_quit();
diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index a65cb26..0349364 100644
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -220,10 +220,10 @@ Widget Disk {
class 'Text'
# disk.[rw]blk return blocks, we assume a blocksize of 512
# to get the number in kB/s we would do blk*512/1024, which is blk/2
- #expression (proc_stat::disk('.*', 'rblk', 500)+proc_stat::disk('.*', 'wblk', 500))/2
+ expression (proc_stat::disk('.*', 'rblk', 500)+proc_stat::disk('.*', 'wblk', 500))/2
# with kernel 2.6, disk_io disappeared from /proc/stat but moved to /proc/diskstat
# therefore you have to use another function called 'diskstats':
- expression diskstats('.*', '.*_sectors', 500)
+ #expression diskstats('.*', '.*_sectors', 500)
prefix 'disk'
postfix ' '
width 10
@@ -234,11 +234,11 @@ Widget Disk {
Widget DiskBar {
class 'Bar'
- #expression proc_stat::disk('.*', 'rblk', 500)
- #expression2 proc_stat::disk('.*', 'wblk', 500)
+ expression proc_stat::disk('.*', 'rblk', 500)
+ expression2 proc_stat::disk('.*', 'wblk', 500)
# for kernel 2.6:
- expression diskstats('.*', 'read_sectors', 500)
- expression2 diskstats('.*', 'write_sectors', 500)
+ #expression diskstats('.*', 'read_sectors', 500)
+ #expression2 diskstats('.*', 'write_sectors', 500)
length 14
direction 'E'
update tack
diff --git a/plugin_ppp.c b/plugin_ppp.c
index 44d55ad..be51ff7 100644
--- a/plugin_ppp.c
+++ b/plugin_ppp.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_ppp.c,v 1.4 2004/03/03 04:44:16 reinelt Exp $
+/* $Id: plugin_ppp.c,v 1.5 2004/05/29 15:53:28 reinelt Exp $
*
* plugin for ppp throughput
*
@@ -23,6 +23,12 @@
*
*
* $Log: plugin_ppp.c,v $
+ * Revision 1.5 2004/05/29 15:53:28 reinelt
+ *
+ * M50530: reset parport signals on exit
+ * plugin_ppp: ppp() has two parameters, not three
+ * lcd4linux.conf.sample: diskstats() corrected
+ *
* Revision 1.4 2004/03/03 04:44:16 reinelt
* changes (cosmetics?) to the big patch from Martin
* hash patch un-applied
@@ -136,7 +142,7 @@ static void my_ppp (RESULT *result, RESULT *arg1, RESULT *arg2)
int plugin_init_ppp (void)
{
#ifdef HAVE_NET_IF_PPP_H
- AddFunction ("ppp", 3, my_ppp);
+ AddFunction ("ppp", 2, my_ppp);
#endif
return 0;
}