diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-25 03:16:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-25 03:16:12 -0800 |
| commit | 9eb7fd948c161b9002628177cf19da39c66637ea (patch) | |
| tree | 8a1c6b2ba2c8345ad389cf1f57ac0b02a77c68f1 /include/linux/dvb | |
| parent | 40cfa05d8d293abf41e523cc9853c045b2469952 (diff) | |
| parent | f81179746d7249e10148ecd0ace4e1b9f1e49550 (diff) | |
Merge
Diffstat (limited to 'include/linux/dvb')
| -rw-r--r-- | include/linux/dvb/ca.h | 14 | ||||
| -rw-r--r-- | include/linux/dvb/osd.h | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/linux/dvb/ca.h b/include/linux/dvb/ca.h index b7ce90ec3618..a0bdd645c745 100644 --- a/include/linux/dvb/ca.h +++ b/include/linux/dvb/ca.h @@ -26,7 +26,7 @@ /* slot interface types and info */ -typedef struct ca_slot_info_s { +typedef struct ca_slot_info { int num; /* slot number */ int type; /* CA interface this slot supports */ @@ -43,7 +43,7 @@ typedef struct ca_slot_info_s { /* 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 type; /* type of supported scrambling system */ #define CA_ECD 1 @@ -51,29 +51,29 @@ typedef struct ca_descr_info_s { #define CA_DSS 4 } 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_type; /* OR of all supported types */ unsigned int descr_num; /* total number of descrambler slots (keys) */ unsigned int descr_type; /* OR of all supported types */ -} ca_cap_t; +} ca_caps_t; /* a message to/from a CI-CAM */ -typedef struct ca_msg_s { +typedef struct ca_msg { unsigned int index; unsigned int type; unsigned int length; unsigned char msg[256]; } ca_msg_t; -typedef struct ca_descr_s { +typedef struct ca_descr { unsigned int index; unsigned int parity; unsigned char cw[8]; } ca_descr_t; #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_DESCR_INFO _IOR('o', 131, ca_descr_info_t) #define CA_GET_MSG _IOR('o', 132, ca_msg_t) diff --git a/include/linux/dvb/osd.h b/include/linux/dvb/osd.h index 143c8296f895..760ccff6c75c 100644 --- a/include/linux/dvb/osd.h +++ b/include/linux/dvb/osd.h @@ -26,7 +26,7 @@ typedef enum { // All functions return -2 on "not open" - OSD_Close = 1, // () + OSD_Close=1, // () // Disables OSD and releases the buffers // returns 0 on success 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 { #define OSD_SEND_CMD _IOW('o', 160, osd_cmd_t) #endif + |