summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/ttpci/av7110.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.h')
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110.h36
1 files changed, 21 insertions, 15 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h
index bea411146..b9d2fc995 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.h
+++ b/linux/drivers/media/dvb/ttpci/av7110.h
@@ -277,6 +277,7 @@ typedef enum {
#define DATA_STREAMING 0x0a
#define DATA_CI_GET 0x0b
#define DATA_CI_PUT 0x0c
+#define DATA_MPEG_VIDEO_EVENT 0x0d
#define DATA_PES_RECORD 0x10
#define DATA_PES_PLAY 0x11
@@ -446,6 +447,19 @@ typedef struct p2t_s {
struct dvb_demux_feed *feed;
} p2t_t;
+/* video MPEG decoder events: */
+/* (code copied from dvb_frontend.c, should maybe be factored out...) */
+#define MAX_VIDEO_EVENT 8
+struct dvb_video_events {
+ struct video_event events[MAX_VIDEO_EVENT];
+ int eventw;
+ int eventr;
+ int overflow;
+ wait_queue_head_t wait_queue;
+ struct semaphore sem;
+};
+
+
/* place to store all the necessary device information */
typedef struct av7110_s {
@@ -584,6 +598,9 @@ typedef struct av7110_s {
struct dvb_device *ca_dev;
struct dvb_device *osd_dev;
+ struct dvb_video_events video_events;
+ video_size_t video_size;
+
int dsp_dev;
u32 ir_config;
@@ -626,26 +643,15 @@ typedef struct av7110_s {
#define Reserved (DPRAM_BASE + 0x1E00)
#define Reserved_SIZE 0x1C0
-#define DEBUG_WINDOW (DPRAM_BASE + 0x1FC0)
-#define DBG_LOOP_CNT (DEBUG_WINDOW + 0x00)
-#define DBG_SEC_CNT (DEBUG_WINDOW + 0x02)
-#define DBG_AVRP_BUFF (DEBUG_WINDOW + 0x04)
-#define DBG_AVRP_PEAK (DEBUG_WINDOW + 0x06)
-#define DBG_MSG_CNT (DEBUG_WINDOW + 0x08)
-#define DBG_CODE_REG (DEBUG_WINDOW + 0x0a)
-#define DBG_TTX_Q (DEBUG_WINDOW + 0x0c)
-#define DBG_AUD_EN (DEBUG_WINDOW + 0x0e)
-#define DBG_WRONG_COM (DEBUG_WINDOW + 0x10)
-#define DBG_ARR_OVFL (DEBUG_WINDOW + 0x12)
-#define DBG_BUFF_OVFL (DEBUG_WINDOW + 0x14)
-#define DBG_OVFL_CNT (DEBUG_WINDOW + 0x16)
-#define DBG_SEC_OVFL (DEBUG_WINDOW + 0x18)
-
#define STATUS_BASE (DPRAM_BASE + 0x1FC0)
#define STATUS_SCR (STATUS_BASE + 0x00)
#define STATUS_MODES (STATUS_BASE + 0x04)
#define STATUS_LOOPS (STATUS_BASE + 0x08)
+#define STATUS_MPEG_WIDTH (STATUS_BASE + 0x0C)
+/* ((aspect_ratio & 0xf) << 12) | (height & 0xfff) */
+#define STATUS_MPEG_HEIGHT_AR (STATUS_BASE + 0x0E)
+
#define RX_TYPE (DPRAM_BASE + 0x1FE8)
#define RX_LEN (DPRAM_BASE + 0x1FEA)
#define TX_TYPE (DPRAM_BASE + 0x1FEC)