diff options
| author | michael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2007-01-20 13:52:43 +0000 |
|---|---|---|
| committer | michael <michael@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2007-01-20 13:52:43 +0000 |
| commit | 812fa726f6b3f9f473e60d29d23eaabbf741d3cc (patch) | |
| tree | aa698e74426b93cf8109417b6ae801b9670d3a4a | |
| parent | 38b070776b2e3270e3cf6d353913429e3b11cbc9 (diff) | |
| download | lcd4linux-812fa726f6b3f9f473e60d29d23eaabbf741d3cc.tar.gz | |
GPO cleanup
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@751 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
| -rw-r--r-- | drv_generic_gpio.c | 6 | ||||
| -rw-r--r-- | widget_gpo.c | 3 | ||||
| -rw-r--r-- | widget_gpo.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/drv_generic_gpio.c b/drv_generic_gpio.c index f2d3a60..0bf919f 100644 --- a/drv_generic_gpio.c +++ b/drv_generic_gpio.c @@ -219,8 +219,10 @@ int drv_generic_gpio_get(const int num) int drv_generic_gpio_draw(WIDGET * W) { WIDGET_GPO *gpo = W->data; - int num = gpo->num; - int val = gpo->val; + int num, val; + + num = W->row; + val = P2N(&gpo->expression); if (num < 0 || num >= GPOS) { error("%s: gpio_draw(%d): GPO out of range (0..%d)", Driver, num + 1, GPOS); diff --git a/widget_gpo.c b/widget_gpo.c index 4b92571..3ac7a4e 100644 --- a/widget_gpo.c +++ b/widget_gpo.c @@ -59,9 +59,6 @@ void widget_gpo_update(void *Self) property_eval(&GPO->expression); property_eval(&GPO->update); - GPO->num = W->row; - GPO->val = P2N(&GPO->expression); - /* finally, draw it! */ if (W->class->draw) W->class->draw(W); diff --git a/widget_gpo.h b/widget_gpo.h index 6f8e155..3ee8905 100644 --- a/widget_gpo.h +++ b/widget_gpo.h @@ -33,8 +33,6 @@ typedef struct WIDGET_GPO { PROPERTY expression; /* main GPO expression */ PROPERTY update; /* update interval (msec) */ - int num; /* GPO number */ - int val; /* GPO value */ } WIDGET_GPO; |