Commit 5dcb7a67 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] dvb header updates

parent 40ab5e99
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* slot interface types and info */ /* slot interface types and info */
typedef struct ca_slot_info_s { typedef struct ca_slot_info {
int num; /* slot number */ int num; /* slot number */
int type; /* CA interface this slot supports */ int type; /* CA interface this slot supports */
...@@ -43,7 +43,7 @@ typedef struct ca_slot_info_s { ...@@ -43,7 +43,7 @@ typedef struct ca_slot_info_s {
/* descrambler types and info */ /* descrambler types and info */
typedef struct ca_descr_info_s { typedef struct ca_descr_info {
unsigned int num; /* number of available descramblers (keys) */ unsigned int num; /* number of available descramblers (keys) */
unsigned int type; /* type of supported scrambling system */ unsigned int type; /* type of supported scrambling system */
#define CA_ECD 1 #define CA_ECD 1
...@@ -51,29 +51,29 @@ typedef struct ca_descr_info_s { ...@@ -51,29 +51,29 @@ typedef struct ca_descr_info_s {
#define CA_DSS 4 #define CA_DSS 4
} ca_descr_info_t; } ca_descr_info_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_num; /* total number of CA card and module slots */
unsigned int slot_type; /* OR of all supported types */ unsigned int slot_type; /* OR of all supported types */
unsigned int descr_num; /* total number of descrambler slots (keys) */ unsigned int descr_num; /* total number of descrambler slots (keys) */
unsigned int descr_type; /* OR of all supported types */ unsigned int descr_type; /* OR of all supported types */
} ca_cap_t; } ca_caps_t;
/* a message to/from a CI-CAM */ /* a message to/from a CI-CAM */
typedef struct ca_msg_s { typedef struct ca_msg {
unsigned int index; unsigned int index;
unsigned int type; unsigned int type;
unsigned int length; unsigned int length;
unsigned char msg[256]; unsigned char msg[256];
} ca_msg_t; } ca_msg_t;
typedef struct ca_descr_s { typedef struct ca_descr {
unsigned int index; unsigned int index;
unsigned int parity; unsigned int parity;
unsigned char cw[8]; unsigned char cw[8];
} ca_descr_t; } ca_descr_t;
#define CA_RESET _IO('o', 128) #define CA_RESET _IO('o', 128)
#define CA_GET_CAP _IOR('o', 129, ca_cap_t) #define CA_GET_CAP _IOR('o', 129, ca_caps_t)
#define CA_GET_SLOT_INFO _IOR('o', 130, ca_slot_info_t) #define CA_GET_SLOT_INFO _IOR('o', 130, ca_slot_info_t)
#define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t) #define CA_GET_DESCR_INFO _IOR('o', 131, ca_descr_info_t)
#define CA_GET_MSG _IOR('o', 132, ca_msg_t) #define CA_GET_MSG _IOR('o', 132, ca_msg_t)
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
typedef enum { typedef enum {
// All functions return -2 on "not open" // All functions return -2 on "not open"
OSD_Close = 1, // () OSD_Close=1, // ()
// Disables OSD and releases the buffers // Disables OSD and releases the buffers
// returns 0 on success // returns 0 on success
OSD_Open, // (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0)) OSD_Open, // (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0))
...@@ -108,3 +108,4 @@ typedef struct osd_cmd_s { ...@@ -108,3 +108,4 @@ typedef struct osd_cmd_s {
#define OSD_SEND_CMD _IOW('o', 160, osd_cmd_t) #define OSD_SEND_CMD _IOW('o', 160, osd_cmd_t)
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment