summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorCeline Buret2011-01-12 17:42:17 +0100
committerCeline Buret2011-01-18 10:24:21 +0100
commitc11e13fde8a57b40e593a868dfa98a829fb1c1de (patch)
tree299da3eb5ad7a296336a2fe31c65879896fc9674 /cleopatre
parent05588cb2a5611a82640a8880d7feb1f05e19948a (diff)
cleo/{mgrd,plcd}: allow several SIGHUP signal receptions, closes #2109
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/application/managerd/src/managerd.c10
-rw-r--r--cleopatre/devkit/plcd/inc/plcd.h2
-rw-r--r--cleopatre/devkit/plcd/src/plcd_main.c6
-rw-r--r--cleopatre/devkit/plcd/src/plcd_stack.c2
4 files changed, 10 insertions, 10 deletions
diff --git a/cleopatre/application/managerd/src/managerd.c b/cleopatre/application/managerd/src/managerd.c
index e0949cd9bd..178a5b76dd 100644
--- a/cleopatre/application/managerd/src/managerd.c
+++ b/cleopatre/application/managerd/src/managerd.c
@@ -34,7 +34,7 @@
/* Global variable indicating if a SIGHUP signal occurred,
* has been caught in managerd signal handler,
* and has now to be processed. */
-libspid_boolean_t is_process_signal_needed;
+uint8_t is_process_signal_needed;
/**
@@ -49,7 +49,7 @@ managerd_signal_handler (int signal_nb)
if (SIGHUP == signal_nb)
{
syslog (LOG_DEBUG, "signal handler: SIGHUP");
- is_process_signal_needed = LIBSPID_TRUE;
+ is_process_signal_needed++;
}
}
@@ -253,7 +253,7 @@ static int managerd_process(struct managerd_ctx *ctx)
{
/* now handle all info file changes (from plcd) */
managerd_process_signal (ctx);
- is_process_signal_needed = LIBSPID_FALSE;
+ is_process_signal_needed--;
}
}
@@ -304,9 +304,9 @@ static int managerd_init(struct managerd_ctx *ctx)
ctx->hpav_info.is_sc = LIBSPID_FALSE;
ctx->hpav_info.is_sc_button = LIBSPID_FALSE;
- /* Initialize to true to set LED-s status
+ /* Initialize to 1 to set LED-s status
* according to current hpav.info contents. */
- is_process_signal_needed = LIBSPID_TRUE;
+ is_process_signal_needed = 1;
/* Register to hpav.info file update */
if (LIBSPID_SUCCESS != libspid_system_file_update_register (getpid(),
diff --git a/cleopatre/devkit/plcd/inc/plcd.h b/cleopatre/devkit/plcd/inc/plcd.h
index 727919d177..de5fee99e2 100644
--- a/cleopatre/devkit/plcd/inc/plcd.h
+++ b/cleopatre/devkit/plcd/inc/plcd.h
@@ -176,6 +176,6 @@ typedef struct
/* Global variable indicating if a SIGHUP signal occurred,
* has been caught in plcd signal handler,
* and has now to be processed. */
-extern libspid_boolean_t is_process_signal_needed;
+extern uint8_t is_process_signal_needed;
#endif /* PLCD_H */
diff --git a/cleopatre/devkit/plcd/src/plcd_main.c b/cleopatre/devkit/plcd/src/plcd_main.c
index 38c8fba1f1..774c11ef83 100644
--- a/cleopatre/devkit/plcd/src/plcd_main.c
+++ b/cleopatre/devkit/plcd/src/plcd_main.c
@@ -34,7 +34,7 @@
static spc300_nvram_t g_nvram;
-libspid_boolean_t is_process_signal_needed = LIBSPID_FALSE;
+uint8_t is_process_signal_needed = 0;
/******************************************************************************/
@@ -73,7 +73,7 @@ plcd_signal_handler (int signal_nb)
if (SIGHUP == signal_nb)
{
syslog (LOG_DEBUG, "signal handler: SIGHUP");
- is_process_signal_needed = LIBSPID_TRUE;
+ is_process_signal_needed++;
}
}
@@ -96,7 +96,7 @@ plcd_init (plcd_ctx_t *ctx)
PLCD_ASSERT (NULL != ctx);
- is_process_signal_needed = LIBSPID_FALSE;
+ is_process_signal_needed = 0;
memset (ctx, 0, sizeof (plcd_ctx_t));
ctx->hpav_info_path = LIBSPID_HPAV_INFO_PATH;
ctx->hpav_conf_path = LIBSPID_HPAV_CONF_PATH;
diff --git a/cleopatre/devkit/plcd/src/plcd_stack.c b/cleopatre/devkit/plcd/src/plcd_stack.c
index 99a333f93c..43436a6d12 100644
--- a/cleopatre/devkit/plcd/src/plcd_stack.c
+++ b/cleopatre/devkit/plcd/src/plcd_stack.c
@@ -213,7 +213,7 @@ plcd_stack_event_dispatch (plcd_ctx_t *ctx)
{
/* now handle all config / info files changes (from spidapp / managerd) */
plcd_process_signal (ctx);
- is_process_signal_needed = LIBSPID_FALSE;
+ is_process_signal_needed--;
}
/* After processing, check if some other actions have to be performed.