emm reassembly: add subsys to emm_reass structure

diff --git a/src/descrambler/cclient.c b/src/descrambler/cclient.c
index bb2ddda2dc7d5e401fe302b44e0657667432f545..7fba84fcba7ffbc5a84ed5098d94dbaa543fb92d 100644 (file)
--- a/src/descrambler/cclient.c
+++ b/src/descrambler/cclient.c
@@ -131,7 +131,7 @@ cc_new_card(cclient_t *cc, uint16_t caid, uint32_t cardid, uint8_t *ua,
 
   if (pcard == NULL) {
     pcard = calloc(1, sizeof(cc_card_data_t));
-    emm_reass_init(&pcard->cs_ra, caid);
+    emm_reass_init(&pcard->cs_ra, cc->cc_subsys, caid);
     pcard->cs_id = cardid;
     allocated = 1;
   }

diff --git a/src/descrambler/emm_reass.c b/src/descrambler/emm_reass.c
index cd730ccb64522209343fb1fcb942473e9f1cd080..00d48a028b545f1825aee0fb624bf0d2954530b3 100644 (file)
--- a/src/descrambler/emm_reass.c
+++ b/src/descrambler/emm_reass.c
@@ -335,7 +335,7 @@ emm_viaccess
 
       crc = tvh_crc32(ass2, len, 0xffffffff);
       if (!emm_cache_lookup(ra, crc)) {
-        tvhdebug(LS_CWC,
+        tvhdebug(ra->subsys,
                 "Send EMM "
                 "%02x.%02x.%02x.%02x.%02x.%02x.%02x.%02x"
                 "...%02x.%02x.%02x.%02x",
@@ -452,7 +452,7 @@ emm_streamguard
   if (len < 1)
     return;
 
-  tvhinfo(LS_CWC, "emm_streamguard streamguard card data emm get,here lots of works todo...");
+  tvhinfo(ra->subsys, "emm_streamguard streamguard card data emm get,here lots of works todo...");
 
   if (data[0] == 0x87) {
     match = len >= 7 && memcmp(&data[3], &ra->ua[4], 4) == 0;
@@ -592,16 +592,17 @@ void
 emm_filter(emm_reass_t *ra, const uint8_t *data, int len, void *mux,
            emm_send_t send, void *aux)
 {
-  tvhtrace(LS_CWC, "emm filter : %s - len %d mux %p", caid2name(ra->caid), len, mux);
-  tvhlog_hexdump(LS_CWC, data, len);
+  tvhtrace(ra->subsys, "emm filter : %s - len %d mux %p", caid2name(ra->caid), len, mux);
+  tvhlog_hexdump(ra->subsys, data, len);
   if (ra->do_emm)
     ra->do_emm(ra, data, len, mux, send, aux);
 }
 
 void
-emm_reass_init(emm_reass_t *ra, uint16_t caid)
+emm_reass_init(emm_reass_t *ra, int subsys, uint16_t caid)
 {
   memset(ra, 0, sizeof(*ra));
+  ra->subsys = subsys;
   ra->caid = caid;
   ra->type = detect_card_type(caid);
   switch (ra->type) {

diff --git a/src/descrambler/emm_reass.h b/src/descrambler/emm_reass.h
index 0dad333e580c67fa6fc62d2d386734019caa7d0c..5a5e92a300a5fd79764de55ce15cae4b0abe0b5a 100644 (file)
--- a/src/descrambler/emm_reass.h
+++ b/src/descrambler/emm_reass.h
@@ -44,6 +44,8 @@ typedef void (*emm_send_t)
   (void *aux, const uint8_t *radata, int ralen, void *mux);
 
 struct emm_reass {
+  int subsys;
+
   uint16_t caid;
   card_type_t type;
 
@@ -70,7 +72,7 @@ struct emm_reass {
 void emm_filter(emm_reass_t *ra, const uint8_t *data, int len,
                 void *mux, emm_send_t send, void *aux);
 emm_provider_t *emm_find_provider(emm_reass_t *ra, uint32_t provid);
-void emm_reass_init(emm_reass_t *ra, uint16_t caid);
+void emm_reass_init(emm_reass_t *ra, int subsys, uint16_t caid);
 void emm_reass_done(emm_reass_t *ra);
 
 #endif /* __TVH_EMM_REASS_H__ */