diff --git a/[refs] b/[refs] index 5fdd0200d12c..802c6fd4645c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b680d1b4e7e0c561d1523d5155212705fcbb10a +refs/heads/master: cde291dfd7df3f7202078afcf27e9bb21ea76d0c diff --git a/trunk/Documentation/DocBook/media/dvb/ca.xml b/trunk/Documentation/DocBook/media/dvb/ca.xml index 143ec5bf6bd3..a6cb9522f289 100644 --- a/trunk/Documentation/DocBook/media/dvb/ca.xml +++ b/trunk/Documentation/DocBook/media/dvb/ca.xml @@ -44,7 +44,7 @@ typedef struct ca_descr_info {
ca_caps_t -typedef struct ca_cap_s { +typedef struct ca_caps { unsigned int slot_num; /⋆ total number of CA card and module slots ⋆/ unsigned int slot_type; /⋆ OR of all supported types ⋆/ unsigned int descr_num; /⋆ total number of descrambler slots (keys) ⋆/ @@ -75,7 +75,18 @@ typedef struct ca_descr { unsigned char cw[8]; } ca_descr_t; -
+ + +
+ca-pid + +typedef struct ca_pid { + unsigned int pid; + int index; /⋆ -1 == disable⋆/ +} ca_pid_t; + +
+
CA Function Calls