diff options
| author | Josh Allen <axlecrusher@gmail.com> | 2017-02-13 16:00:19 -0500 |
|---|---|---|
| committer | Josh Allen <axlecrusher@gmail.com> | 2017-02-13 16:00:19 -0500 |
| commit | 7fdfd9fff265d38ae002d8007a02f746f42fd3f2 (patch) | |
| tree | 5fc7e797c66e6d3af40f8c2830c267b399be3765 /src/survive.c | |
| parent | 56a6bbc24962251d223536285aa407c7652c7c46 (diff) | |
| parent | 6c99f7abf29463df723221dcaa8c3fe7c93c3371 (diff) | |
| download | libsurvive-7fdfd9fff265d38ae002d8007a02f746f42fd3f2.tar.gz libsurvive-7fdfd9fff265d38ae002d8007a02f746f42fd3f2.tar.bz2 | |
Merge branch 'master' of github.com:axlecrusher/libsurvive into ootx_decoder_context_cleanup
Diffstat (limited to 'src/survive.c')
| -rw-r--r-- | src/survive.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/survive.c b/src/survive.c index af4d804..ed18da2 100644 --- a/src/survive.c +++ b/src/survive.c @@ -8,7 +8,7 @@ #include <jsmn.h> #include <string.h> #include <zlib.h> -#include "disambiguator.h" + static int jsoneq(const char *json, jsmntok_t *tok, const char *s) { if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start && @@ -147,21 +147,10 @@ struct SurviveContext * survive_init() ctx->headset.ctx = ctx; memcpy( ctx->headset.codename, "HMD", 4 ); -#ifndef USE_OLD_DISAMBIGUATOR - ctx->headset.d = calloc( 1, sizeof( struct disambiguator ) ); -#endif - ctx->watchman[0].ctx = ctx; memcpy( ctx->watchman[0].codename, "WM0", 4 ); -#ifndef USE_OLD_DISAMBIGUATOR - ctx->watchman[0].d = calloc( 1, sizeof( struct disambiguator ) ); -#endif - ctx->watchman[1].ctx = ctx; memcpy( ctx->watchman[1].codename, "WM1", 4 ); -#ifndef USE_OLD_DISAMBIGUATOR - ctx->watchman[1].d = calloc( 1, sizeof( struct disambiguator ) ); -#endif //USB must happen last. if( r = survive_usb_init( ctx ) ) |