Changeset 442 for branches/merlin
- Timestamp:
- 09/21/09 23:49:25 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/csctapi/pps.c
r441 r442 102 102 pps->parameters.f = atr_f_table[(params[2] >> 4)]; 103 103 pps->parameters.d = atr_d_table[(params[2] & 0x0F)]; 104 if(pps->parameters.d==0) 105 { 106 // we need to attempt PTS, if it fails we need to set pps->parameters.d to 1 as 0 is not a valid value 107 pps->parameters.d=ATR_DEFAULT_D; 108 } 104 109 } 105 110 … … 128 133 ATR_GetParameter(atr, ATR_PARAMETER_D, &(pps->parameters.d)); 129 134 ATR_GetParameter(atr, ATR_PARAMETER_F, &(pps->parameters.f)); 135 if(pps->parameters.d==0) 136 { 137 // we need to attempt PTS, if it fails we need to set pps->parameters.d to 1 as 0 is not a valid value 138 pps->parameters.d=ATR_DEFAULT_D; 139 } 140 130 141 #ifdef DEBUG_PROTOCOL 131 142 printf("pps->parameters.n %f\n",pps->parameters.n); … … 133 144 printf("pps->parameters.f %f\n",pps->parameters.f); 134 145 #endif 135 136 // for some unknown reason (for now): 137 // ATR_GetParameter(atr, ATR_PARAMETER_D, &(pps->parameters.d)); 138 // set pps->parameters.d to 0 on viaccess 139 // this totaly breaks on OS X 140 // so for now we're commenting the PPS_InitICC call. 141 //ret = PPS_InitICC(pps); 142 143 //if (ret != PPS_OK) 144 // return ret; 146 ret = PPS_InitICC(pps); 147 148 if (ret != PPS_OK) 149 return ret; 145 150 #endif 146 151 }
Note:
See TracChangeset
for help on using the changeset viewer.