From 0493e5c8f8f109ce424864b90a9340e471f2d808 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 20 Apr 2016 08:26:40 +0200 Subject: [PATCH] neutrinoyparser: try to fix nevis build Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1 BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f764fe6c5413ae70db548eee63fb16bb3f196373 Author: vanhofen Date: 2016-04-20 (Wed, 20 Apr 2016) Origin message was: ------------------ - neutrinoyparser: try to fix nevis build Todo: BOXMODEL_NEVIS should be renamed to HAVE_COOLSTREAM_HD1 BOXMODEL_APOLLO should be renamed to HAVE_COOLSTREAM_HD2 --- src/nhttpd/tuxboxapi/neutrinoyparser.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp index 8b020c626..5066e5698 100644 --- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp @@ -832,6 +832,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) if( boxname == "Armas ") boxname += "TripleDragon"; break; +#ifdef BOXMODEL_NEVIS case 6: boxname += "HD1"; break; @@ -843,12 +844,14 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) if (CFEManager::getInstance()->getFrontendCount() > 1) boxname += " Twin"; break; - case 9: - boxname += "Tank"; - break; case 10: boxname += "Zee"; break; +#endif +#ifdef BOXMODEL_APOLLO + case 9: + boxname += "Tank"; + break; case 11: boxname += "Trinity"; if (cs_get_chip_type() != 33904 /*0x8470*/) @@ -863,7 +866,7 @@ std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) case 14: boxname += "Trinity Duo"; break; - +#endif default: char buffer[10]; snprintf(buffer, sizeof(buffer), "%u\n", system_rev); @@ -884,12 +887,15 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string) switch(system_rev) { +#ifdef BOXMODEL_NEVIS case 6: case 7: case 8: case 10: boxmodel = "Nevis"; break; +#endif +#ifdef BOXMODEL_APOLLO case 9: boxmodel = "Apollo"; break; @@ -904,6 +910,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string) case 14: boxmodel = "Kronos"; break; +#endif default: break; }