Changeset 604
- Timestamp:
- 12/02/09 08:11:32 (14 years ago)
- Location:
- branches/cccam-test
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/cccam-test/globals.h
r571 r604 268 268 int (*recv)(); 269 269 void (*send_dcw)(); 270 void (*cleanup)(); 270 271 int c_multi; 271 272 int (*c_recv_chk)(); -
branches/cccam-test/module-cccam.c
r596 r604 169 169 170 170 #define SWAPC(X, Y) do { char p; p = *X; *X = *Y; *Y = p; } while(0) 171 #define B16(X) ( (X)[0] << 8 | (X)[1] )172 #define B24(X) ( (X)[0] << 16 | (X)[1] << 8 | (X)[2] )173 #define B32(X) ( (X)[0] << 24 | (X)[1] << 16 | (X)[2] << 8 | (X)[3] )174 #define B64(X) ( (X)[0] << 56 | (X)[1] << 48 | (X)[2] << 40 | (X)[3] << 32 | (X)[4] << 24 | (X)[5] << 16 | (X)[6] << 8 | (X)[7] )175 171 #define X_FREE(X) do { if (X) { free(X); X = NULL; } } while(0) 176 172 … … 295 291 296 292 uint32 cur_card = cc->cur_card->id; 297 uint32 node_id_1 = B32(cc->node_id);298 uint32 node_id_2 = B32(cc->node_id + 4);293 uint32 node_id_1 = b2i(4, cc->node_id); 294 uint32 node_id_2 = b2i(4, cc->node_id + 4); 299 295 uint32 tmp; 300 296 int i; … … 537 533 char *prov = llist_itr_init(card->provs, &pitr); 538 534 while (prov && !s) { 539 if ( B24(prov) == er->prid) { // provid matches535 if (b2i(3, prov) == er->prid) { // provid matches 540 536 if ((h < 0) || (card->hop < h)) { // card is closer 541 537 cc->cur_card = card; … … 598 594 break; 599 595 case MSG_NEW_CARD: 600 if ( B16(buf+12) == reader[ridx].ctab.caid[0]) { // only add cards with relevant caid (for now)596 if (b2i(2, buf+12) == reader[ridx].ctab.caid[0]) { // only add cards with relevant caid (for now) 601 597 int i; 602 598 struct cc_card *card = malloc(sizeof(struct cc_card)); … … 606 602 card->provs = llist_create(); 607 603 card->badsids = llist_create(); 608 card->id = B32(buf+4);609 card->caid = B16(buf+12);604 card->id = b2i(4, buf+4); 605 card->caid = b2i(2, buf+12); 610 606 card->hop = buf[14]; 611 607 memcpy(card->key, buf+16, 8); … … 618 614 619 615 memcpy(prov, buf+25+(7*i), 3); 620 cs_debug(" prov %d, %06x", i+1, B24(prov));616 cs_debug(" prov %d, %06x", i+1, b2i(3, prov)); 621 617 622 618 llist_append(card->provs, prov); … … 634 630 card = llist_itr_init(cc->cards, &itr); 635 631 while (card) { 636 if (card->id == B32(buf+4)) {632 if (card->id == b2i(4, buf+4)) { 637 633 cs_debug("cccam: card %08x removed, caid %04x", card->id, card->caid); 638 634 -
branches/cccam-test/oscam-config.c
r587 r604 1095 1095 if (!strcmp(value, "gbox")) { rdr->typ=R_GBOX; return; } 1096 1096 if (!strcmp(value, "cccam")) { rdr->typ=R_CCCAM; return; } 1097 if (!strcmp(value, "radegast")) { rdr->typ=R_RADEGAST; return; } 1097 1098 if (!strcmp(value, "newcamd") || 1098 1099 !strcmp(value, "newcamd525")) {rdr->typ=R_NEWCAMD; -
branches/cccam-test/oscam-simples.c
r587 r604 152 152 } 153 153 return(rc); 154 } 155 156 char *btoa(char *asc, uchar *bin, int l) 157 { 158 int i;//, n1, n2, rc; 159 static char buf[33]; 160 if (!asc) 161 asc=buf; 162 for (i=0; i<l; i++) 163 sprintf(asc+(i<<1), "%02X", bin[i]); 164 return(asc); 154 165 } 155 166
Note:
See TracChangeset
for help on using the changeset viewer.