---

yaml --- r: 65872 b: refs/heads/master c: ccbe64c h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 3c682ac · 3c682ac
1 parent eea2783
commit 3c682ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 661c7e44c5cc2828c7acb00cb71d985e129e3641
+refs/heads/master: ccbe64c664f2e3a86430ef63c974e38ac1cd5b93
diff --git a/trunk/drivers/media/video/cx23885/cx23885-reg.h b/trunk/drivers/media/video/cx23885/cx23885-reg.h
@@ -237,6 +237,13 @@ Channel manager Data Structure entry = 20 DWORD
 #define VID_B_INT_MSTAT	0x00040038
 #define VID_B_INT_SSTAT	0x0004003C
 
+#define VID_B_MSK_BAD_PKT (1 << 20)
+#define VID_B_MSK_OPC_ERR (1 << 16)
+#define VID_B_MSK_SYNC    (1 << 12)
+#define VID_B_MSK_OF      (1 <<  8)
+#define VID_B_MSK_RISCI2  (1 <<  4)
+#define VID_B_MSK_RISCI1   1
+
 #define VID_C_MSK_BAD_PKT (1 << 20)
 #define VID_C_MSK_OPC_ERR (1 << 16)
 #define VID_C_MSK_SYNC    (1 << 12)
@@ -344,8 +351,8 @@ Channel manager Data Structure entry = 20 DWORD
 #define VBI_B_DMA		0x00130108
 #define VID_B_GPCNT		0x00130120
 #define VBI_B_GPCNT		0x00130124
-#define VID_B_GPCNT_CTL		0x00130130
-#define VBI_B_GPCNT_CTL		0x00130134
+#define VID_B_GPCNT_CTL		0x00130134
+#define VBI_B_GPCNT_CTL		0x00130138
 #define VID_B_DMA_CTL		0x00130140
 #define VID_B_SRC_SEL		0x00130144
 #define VID_B_LNGTH		0x00130150