---

yaml --- r: 366833 b: refs/heads/master c: a7eb931 h: refs/heads/master i: 366831: 16a1341 v: v3
git-mirror · Mar 25, 2013 · 426b5a8 · 426b5a8
1 parent 160a5e0
commit 426b5a8
Show file tree

Hide file tree

Showing 3 changed files with 176 additions and 222 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a2e65d54ebb1284c4d234ec606e4eccab7eb812
+refs/heads/master: a7eb931d635cce7b831f745c903204fb79a4aba0
diff --git a/trunk/drivers/staging/media/solo6x10/solo6x10.h b/trunk/drivers/staging/media/solo6x10/solo6x10.h
@@ -135,6 +135,11 @@ struct solo_p2m_dev {
 
 #define OSD_TEXT_MAX		44
 
+enum solo_enc_types {
+	SOLO_ENC_TYPE_STD,
+	SOLO_ENC_TYPE_EXT,
+};
+
 struct solo_enc_dev {
 	struct solo_dev	*solo_dev;
 	/* V4L2 Items */
@@ -163,8 +168,16 @@ struct solo_enc_dev {
 	unsigned char		jpeg_header[1024];
 	int			jpeg_len;
 
-	/* File handles that are listening for buffers */
-	struct list_head	listeners;
+	u32			fmt;
+	u8			enc_on;
+	enum solo_enc_types	type;
+	struct videobuf_queue	vidq;
+	struct list_head	vidq_active;
+	int			desc_count;
+	int			desc_nelts;
+	struct solo_p2m_desc	*desc_items;
+	dma_addr_t		desc_dma;
+	spinlock_t		av_lock;
 };
 
 /* The SOLO6x10 PCI Device */