Changeset 1740


Ignore:
Timestamp:
Feb 28, 2010, 9:00:40 AM (10 years ago)
Author:
merek
Message:

Revert last changes

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/globals.h

    r1739 r1740  
    699699    int     dvbapi_au;
    700700    char        dvbapi_usr[33];
     701    char        dvbapi_boxtype[20];
    701702    char        dvbapi_priority[64];
    702703    char        dvbapi_ignore[64];
  • trunk/module-dvbapi.c

    r1739 r1740  
    2222
    2323#include "globals.h"
    24 #include "oscam-config.h"
    2524
    2625#define BUFSIZE 512
     
    278277    else
    279278    {
    280 #ifdef TUXBOX
    281         if (cs_hw==CS_HW_DREAM)
    282             ca_offset=0;
    283         else
    284 #endif
     279        if (strcmp(cfg->dvbapi_boxtype, "ufs910")==0 || strcmp(cfg->dvbapi_boxtype, "dbox2")==0)
    285280            ca_offset=1;
    286281
     
    10721067    }
    10731068
     1069    if (cfg->dvbapi_boxtype[0]==0) {
     1070        strncpy(cfg->dvbapi_boxtype, "dreambox", sizeof(cfg->dvbapi_boxtype)-1);
     1071        cs_log("dvbapi: boxtype not set. Assume boxtype=%s.", cfg->dvbapi_boxtype);
     1072    } else
     1073        cs_log("dvbapi: boxtype=%s.", cfg->dvbapi_boxtype);
     1074
    10741075    for (i=0;i<MAX_DEMUX;i++)
    10751076    {
  • trunk/oscam-config.c

    r1739 r1740  
    10601060    if (!strcmp(token, "au")) {
    10611061        cfg->dvbapi_au = atoi(value);
     1062        return;
     1063    }
     1064
     1065    if (!strcmp(token, "boxtype")) {
     1066        cs_strncpy(cfg->dvbapi_boxtype, value, sizeof(cfg->dvbapi_boxtype));
    10621067        return;
    10631068    }
     
    17321737        fprintf_conf(f, CONFVARWIDTH, "enabled", "%d\n", cfg->dvbapi_enabled);
    17331738        fprintf_conf(f, CONFVARWIDTH, "au", "%d\n", cfg->dvbapi_au);
     1739        fprintf_conf(f, CONFVARWIDTH, "boxtype", "%s\n", cfg->dvbapi_boxtype);
    17341740        fprintf_conf(f, CONFVARWIDTH, "user", "%s\n", cfg->dvbapi_usr);
    17351741        fputc((int)'\n', f);
  • trunk/oscam-http.c

    r1739 r1740  
    420420    if (cfg->dvbapi_enabled > 0) tpl_addVar(vars, 0, "ENABLEDCHECKED", "checked");
    421421    if (cfg->dvbapi_au > 0) tpl_addVar(vars, 0, "AUCHECKED", "checked");
     422    tpl_addVar(vars, 0, "BOXTYPE", cfg->dvbapi_boxtype);
    422423    tpl_addVar(vars, 0, "USER", cfg->dvbapi_usr);
    423424
  • trunk/oscam-http.h

    r1739 r1740  
    10251025        <TR><TD>Enabled:</TD><TD><input name=\"enabled\" type=\"checkbox\" value=\"1\" ##ENABLEDCHECKED##>\n\
    10261026        <TR><TD>AU:</TD><TD><input name=\"au\" type=\"checkbox\" value=\"1\" ##AUCHECKED##>\n\
     1027        <TR><TD>Boxtype:</TD><TD><input name=\"boxtype\" type=\"text\" size=\"50\" maxlength=\"50\" value=\"##BOXTYPE##\"></TD></TR>\n\
    10271028        <TR><TD>User:</TD><TD><input name=\"user\" type=\"text\" size=\"20\" maxlength=\"20\" value=\"##USER##\"></TD></TR>\n\
    10281029    <TR><TD colspan=\"2\" align=\"right\"><input type=\"submit\" value=\"OK\">\n</TD></TR>\n\
Note: See TracChangeset for help on using the changeset viewer.