summaryrefslogtreecommitdiff
path: root/cleopatre/application/managerd/src/managerd.c
diff options
context:
space:
mode:
authorCeline Buret2011-10-25 16:18:39 +0200
committerCeline Buret2011-11-04 17:51:12 +0100
commitf10f8db3e02e6255fb2f449641a560171960d9a5 (patch)
tree45854156b41c053a8f4928e0c7d631b8d33febd4 /cleopatre/application/managerd/src/managerd.c
parent2902b134b41464c8466e650fad8d55d3671be882 (diff)
cleo/{app,devkit,linux}: set pid-s of plcd & managerd at init, closes #2465
Managerd and plcd register their pid to plcdrv during initialization. This avoids to send an empty mme at boot.
Diffstat (limited to 'cleopatre/application/managerd/src/managerd.c')
-rw-r--r--cleopatre/application/managerd/src/managerd.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/cleopatre/application/managerd/src/managerd.c b/cleopatre/application/managerd/src/managerd.c
index 12dda3a488..abc6e6f68b 100644
--- a/cleopatre/application/managerd/src/managerd.c
+++ b/cleopatre/application/managerd/src/managerd.c
@@ -263,16 +263,28 @@ static int managerd_init(struct managerd_ctx *ctx)
return -1;
//Initialize mme part
- if(0 > mme_nl_init(ctx))
+ if (0 > mme_nl_init (ctx))
+ {
+ bridge_uninit (ctx);
return -1;
+ }
//Initialize simple connect part (open "/dev/gpio")
- if(0 > simple_connect_init(ctx))
+ if (0 > simple_connect_init (ctx))
+ {
+ bridge_uninit (ctx);
+ mme_nl_uninit (ctx);
return -1;
+ }
/* Initialize led part (need "/dev/gpio") */
if (0 > led_init (ctx))
+ {
+ bridge_uninit (ctx);
+ mme_nl_uninit (ctx);
+ simple_connect_uninit (ctx);
return -1;
+ }
/* Set default values of hpav.info file into managerd context */
strcpy (ctx->hpav_info.status, LIBSPID_HPAV_INFO_VALUE_STATUS_UNASSOCIATED);
@@ -290,7 +302,11 @@ static int managerd_init(struct managerd_ctx *ctx)
LIBSPID_HPAV_INFO_PATH, managerd_signal_handler))
{
syslog (LOG_WARNING, "libspid system file update register failed");
- return -1;
+ bridge_uninit (ctx);
+ mme_nl_uninit (ctx);
+ led_uninit (ctx);
+ simple_connect_uninit (ctx);
+ return -1;
}
return 0;