diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dvb/frontend.h | 6 | ||||
| -rw-r--r-- | include/linux/dvb/net.h | 14 | ||||
| -rw-r--r-- | include/media/saa7146.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146_vv.h | 10 |
4 files changed, 24 insertions, 8 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index 9ffb970cf7d8..51a69e389eae 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h @@ -59,9 +59,9 @@ typedef enum fe_caps { FE_CAN_BANDWIDTH_AUTO = 0x40000, FE_CAN_GUARD_INTERVAL_AUTO = 0x80000, FE_CAN_HIERARCHY_AUTO = 0x100000, - FE_CAN_RECOVER = 0x20000000, - FE_CAN_CLEAN_SETUP = 0x40000000, - FE_CAN_MUTE_TS = 0x80000000 + FE_NEEDS_BENDING = 0x20000000, // frontend requires frequency bending + FE_CAN_RECOVER = 0x40000000, // frontend can recover from a cable unplug automatically + FE_CAN_MUTE_TS = 0x80000000 // frontend can stop spurious TS data output } fe_caps_t; diff --git a/include/linux/dvb/net.h b/include/linux/dvb/net.h index 4b8fa5177d43..c14101491ac9 100644 --- a/include/linux/dvb/net.h +++ b/include/linux/dvb/net.h @@ -30,6 +30,9 @@ struct dvb_net_if { __u16 pid; __u16 if_num; + __u8 feedtype; +#define DVB_NET_FEEDTYPE_MPE 0 /* multi protocol encapsulation */ +#define DVB_NET_FEEDTYPE_ULE 1 /* ultra lightweight encapsulation */ }; @@ -37,5 +40,14 @@ struct dvb_net_if { #define NET_REMOVE_IF _IO('o', 53) #define NET_GET_IF _IOWR('o', 54, struct dvb_net_if) -#endif /*_DVBNET_H_*/ +/* binary compatibility cruft: */ +struct __dvb_net_if_old { + __u16 pid; + __u16 if_num; +}; +#define __NET_ADD_IF_OLD _IOWR('o', 52, struct __dvb_net_if_old) +#define __NET_GET_IF_OLD _IOWR('o', 54, struct __dvb_net_if_old) + + +#endif /*_DVBNET_H_*/ diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 5e9f64e67bc8..e62f03fb4c5d 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -154,7 +154,7 @@ struct saa7146_dev }; /* from saa7146_i2c.c */ -int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate); +int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, unsigned int class, u32 bitrate); int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg msgs[], int num, int retries); /* from saa7146_core.c */ diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 50ab25907eec..60cd29e52f2d 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -44,11 +44,9 @@ struct saa7146_standard int v_offset; /* number of lines of vertical offset before processing */ int v_field; /* number of lines in a field for HPS to process */ - int v_calc; /* number of vertical active lines */ int h_offset; /* horizontal offset of processing window */ int h_pixels; /* number of horizontal pixels to process */ - int h_calc; /* number of horizontal active pixels */ int v_max_out; int h_max_out; @@ -104,6 +102,9 @@ struct saa7146_fh { unsigned int resources; /* resource management for device open */ }; +#define STATUS_OVERLAY 0x01 +#define STATUS_CAPTURE 0x02 + struct saa7146_vv { int vbi_minor; @@ -117,14 +118,17 @@ struct saa7146_vv int video_minor; + int video_status; + struct saa7146_fh *video_fh; + /* video overlay */ struct v4l2_framebuffer ov_fb; struct saa7146_format *ov_fmt; struct saa7146_overlay *ov_data; + struct saa7146_fh *ov_suspend; /* video capture */ struct saa7146_dmaqueue video_q; - struct saa7146_fh *streaming; enum v4l2_field last_field; /* common: fixme? shouldn't this be in saa7146_fh? |