Changeset 1114
- Timestamp:
- 01/07/10 17:34:02 (14 years ago)
- Location:
- branches/smartreader
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/smartreader/Distribution/doc/man/oscam.conf.5
r1092 r1114 347 347 .RE 348 348 .PP 349 \fBboxtype\fP = \fB ufs910\fP|\fBdreambox\fP349 \fBboxtype\fP = \fBdbox2\fP|\fBdreambox\fP|\fBufs910\fP 350 350 .RS 3n 351 351 set boxtype, default:dreambox -
branches/smartreader/Distribution/doc/txt/oscam.conf.txt
r1092 r1114 249 249 1 = enable AU, default:0 250 250 251 boxtype = ufs910|dreambox251 boxtype = dbox2|dreambox|ufs910 252 252 set boxtype, default:dreambox 253 253 -
branches/smartreader/csctapi/pps.c
r1072 r1114 187 187 ATR_GetProtocolType(atr,1,&(pps->parameters.t)); //get protocol from TD1 188 188 bool NeedsPTS = ((pps->parameters.t != 14) && (numprottype > 1 || (atr->ib[0][ATR_INTERFACE_BYTE_TA].present == TRUE && atr->ib[0][ATR_INTERFACE_BYTE_TA].value != 0x11) || pps->parameters.n == 255)); //needs PTS according to ISO 7816 , SCI gets stuck on our PTS 189 if (NeedsPTS && (pps->icc->ifd->io->com != RTYP_SCI)) {189 if (NeedsPTS) { 190 190 // PTSS PTS0 PTS1 PTS2 PTS3 PCK 191 191 // PTSS PTS0 PTS1 PCK … … 215 215 } 216 216 217 //FIXME Currently InitICC sets baudrate to 9600 for all T14 cards, which is the old behaviour... 217 //FIXME Currently InitICC sets baudrate to 9600 for all T14 cards, which is the old behaviour...; for SCI TA1 is obeyed... 218 218 if (!PPS_success) {//last PPS not succesfull 219 219 BYTE TA1; … … 229 229 protocol_selected = 1; 230 230 231 if (NeedsPTS) { //FIXME we MUST discover PTS routine for Dreambox reader, now all cards in DBreaders which need PTS come here!!!231 if (NeedsPTS) { 232 232 if ((pps->parameters.d == 32) || (pps->parameters.d == 12) || (pps->parameters.d == 20)) 233 233 pps->parameters.d = 0; //behave conform "old" atr_d_table; viaccess cards that fail PTS need this … … 235 235 /////Here all non-ISO behaviour 236 236 /////End all non-ISO behaviour 237 if (pps->icc->ifd->io->com == RTYP_SCI) {238 //// Here all fixes that are needed until PTS routine for Dreambox is found239 //// End all fixes that are needed until PTS routine for Dreambox is found240 }241 237 242 238 cs_debug("No PTS %s, selected protocol 1: T%i, F=%.0f, D=%.6f, N=%.0f\n", NeedsPTS?"happened":"needed", pps->parameters.t, (double) atr_f_table[pps->parameters.FI], pps->parameters.d, pps->parameters.n); … … 248 244 if (!F) { 249 245 pps->parameters.FI = ATR_DEFAULT_FI; 250 cs_log("Warning: F=0 is invalid, forcing F =%.0f",F);246 cs_log("Warning: F=0 is invalid, forcing FI=%d", pps->parameters.FI); 251 247 } 252 248 if (!pps->parameters.d) { … … 397 393 398 394 params.T = pps->parameters.t; 399 400 395 params.fs = atr_fs_table[pps->parameters.FI] / 1000000; 401 ulong oldfs = params.fs;402 if (pps->icc->ifd->io->mhz == 600)403 params.fs = 5;404 405 if (oldfs != params.fs)406 cs_log("Forcing params.fs from %lu mhz to %lu mhz", oldfs, params.fs);407 408 396 double F = (double) atr_f_table[pps->parameters.FI]; 409 397 params.ETU = F / pps->parameters.d; … … 424 412 return PPS_ICC_ERROR; 425 413 426 if (ioctl(pps->icc->ifd->io->fd, IOCTL_SET_ATR_READY)<0)427 return IFD_TOWITOKO_IO_ERROR;428 414 } 429 415 #endif -
branches/smartreader/module-dvbapi.c
r1092 r1114 106 106 else 107 107 { 108 if (strcmp(cfg->dvbapi_boxtype, "ufs910")==0 )108 if (strcmp(cfg->dvbapi_boxtype, "ufs910")==0 || strcmp(cfg->dvbapi_boxtype, "dbox2")==0) 109 109 ca_offset=1; 110 110
Note:
See TracChangeset
for help on using the changeset viewer.