Changeset 801
- Timestamp:
- 12/12/09 10:03:13 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/oscam.c
r794 r801 1119 1119 { 1120 1120 if(client[cs_idx].autoau) 1121 {1122 if(client[cs_idx].ncd_server)1123 1121 { 1124 int r=0; 1125 for(r=0;r<CS_MAXREADER;r++) 1122 if(client[cs_idx].ncd_server) 1126 1123 { 1127 if((reader[r].typ==R_MOUSE || reader[ridx].typ==R_SMART || reader[ridx].typ==R_INTERN || reader[ridx].typ==R_SERIAL) && reader[r].caid[0]==cfg->ncd_ptab.ports[client[cs_idx].port_idx].ftab.filts[0].caid) 1124 int r=0; 1125 for(r=0;r<CS_MAXREADER;r++) 1128 1126 { 1129 client[cs_idx].au=r; 1130 break; 1127 if(reader[r].caid[0]==cfg->ncd_ptab.ports[client[cs_idx].port_idx].ftab.filts[0].caid) 1128 { 1129 client[cs_idx].au=r; 1130 break; 1131 } 1131 1132 } 1133 if(client[cs_idx].au<0) sprintf(t_msg[0], "au(auto)=%d", client[cs_idx].au+1); 1134 else sprintf(t_msg[0], "au(auto)=%s", reader[client[cs_idx].au].label); 1135 } 1136 else 1137 { 1138 sprintf(t_msg[0], "au=auto"); 1139 } 1132 1140 } 1133 if(client[cs_idx].au<0) sprintf(t_msg[0], "au(auto)=%d", client[cs_idx].au+1);1134 else sprintf(t_msg[0], "au(auto)=%s", reader[client[cs_idx].au].label);1135 }1136 else1137 {1138 sprintf(t_msg[0], "au=auto");1139 }1140 }1141 1141 else 1142 1142 { 1143 1143 if(client[cs_idx].au<0) sprintf(t_msg[0], "au=%d", client[cs_idx].au+1); 1144 1144 else sprintf(t_msg[0], "au=%s", reader[client[cs_idx].au].label); 1145 }1146 1145 } 1146 } 1147 1147 } 1148 1148 if(client[cs_idx].ncd_server) … … 1531 1531 if(!client[cs_idx].ncd_server && client[cs_idx].autoau && er->rcEx==0) 1532 1532 { 1533 int typ=reader[er->reader[0]].typ; 1534 if(er->rc!=0) typ=0; 1535 1536 if(client[cs_idx].au>=0 && er->caid!=reader[client[cs_idx].au].caid[0]) 1537 { 1538 client[cs_idx].au=(-1); 1539 } 1540 1541 switch(typ) 1542 { 1543 case R_MOUSE: 1544 client[cs_idx].au=er->reader[0]; 1545 break; 1546 case R_SMART: 1547 client[cs_idx].au=er->reader[0]; 1548 break; 1549 case R_INTERN: 1550 client[cs_idx].au=er->reader[0]; 1551 break; 1552 case R_SERIAL: 1553 client[cs_idx].au=er->reader[0]; 1554 break; 1555 default: 1556 { 1557 if(client[cs_idx].au<0) 1558 { 1559 int r=0; 1560 for(r=0;r<CS_MAXREADER;r++) 1561 { 1562 if((reader[r].typ==R_MOUSE || reader[r].typ==R_SMART || reader[r].typ==R_INTERN || reader[r].typ==R_SERIAL) && er->caid==reader[r].caid[0]) 1563 { 1564 client[cs_idx].au=r; 1565 break; 1566 } 1567 } 1568 if(r==CS_MAXREADER) 1569 { 1570 client[cs_idx].au=(-1); 1571 } 1572 } 1573 } 1574 } 1533 int typ=reader[er->reader[0]].typ; 1534 if(er->rc!=0) typ=0; 1535 1536 if(client[cs_idx].au>=0 && er->caid!=reader[client[cs_idx].au].caid[0]) 1537 { 1538 client[cs_idx].au=(-1); 1539 } 1540 1541 client[cs_idx].au=er->reader[0]; 1542 if(client[cs_idx].au<0) 1543 { 1544 int r=0; 1545 for(r=0;r<CS_MAXREADER;r++) 1546 { 1547 if(er->caid==reader[r].caid[0]) 1548 { 1549 client[cs_idx].au=r; 1550 break; 1551 } 1552 } 1553 if(r==CS_MAXREADER) 1554 { 1555 client[cs_idx].au=(-1); 1556 } 1557 } 1575 1558 } 1576 1559
Note:
See TracChangeset
for help on using the changeset viewer.