diff options
author | cnlohr <lohr85@gmail.com> | 2016-12-19 01:06:12 -0500 |
---|---|---|
committer | cnlohr <lohr85@gmail.com> | 2016-12-19 01:06:12 -0500 |
commit | 0d6e2a3d208a3e12f2ff450d2b898616ed158894 (patch) | |
tree | ddcd24496675a13f37d219f948511ca29b637e3c /src/survive.c | |
parent | 1bc9a30ef7235c89b7eaa2fdf013314a91099a3f (diff) | |
download | libsurvive-0d6e2a3d208a3e12f2ff450d2b898616ed158894.tar.gz libsurvive-0d6e2a3d208a3e12f2ff450d2b898616ed158894.tar.bz2 |
Closes #7 - retry the control out message
Diffstat (limited to 'src/survive.c')
-rw-r--r-- | src/survive.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/survive.c b/src/survive.c index 09c9ddb..0705801 100644 --- a/src/survive.c +++ b/src/survive.c @@ -68,10 +68,10 @@ static int ParsePoints( struct SurviveContext * ctx, char * ct0conf, SV_FLOAT ** return 0; } -static int LoadConfig( struct SurviveContext * ctx, struct SurviveObject * so, int devno, int iface ) +static int LoadConfig( struct SurviveContext * ctx, struct SurviveObject * so, int devno, int iface, int extra_magic ) { char * ct0conf = 0; - int len = survive_get_config( &ct0conf, ctx, devno, iface ); + int len = survive_get_config( &ct0conf, ctx, devno, iface, extra_magic ); if( len > 0 ) { @@ -153,7 +153,9 @@ struct SurviveContext * survive_init() } //Next, pull out the config stuff. - if( LoadConfig( ctx, &ctx->headset, 1, 0 ) ) goto fail_gracefully; + if( LoadConfig( ctx, &ctx->headset, 1, 0, 0 ) ) goto fail_gracefully; + if( LoadConfig( ctx, &ctx->watchman[0], 2, 0, 1 ) ) goto fail_gracefully; + if( LoadConfig( ctx, &ctx->watchman[1], 3, 0, 1 ) ) goto fail_gracefully; /* int i; |