Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ccbe64c664f2e3a86430ef63c974e38ac1cd5b93
Commit:     ccbe64c664f2e3a86430ef63c974e38ac1cd5b93
Parent:     661c7e44c5cc2828c7acb00cb71d985e129e3641
Author:     Michael Krufky <[EMAIL PROTECTED]>
AuthorDate: Sat Sep 8 11:25:37 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:14:28 2007 -0300

    V4L/DVB (6193): cx23885: define Video B Interrupt Status register bit values
    
    - define missing register bit values for VID_B
    - corrected VID/VBI_B_GPCNT_CTL register addresses
    
    Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
    Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/cx23885/cx23885-reg.h |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/cx23885/cx23885-reg.h 
b/drivers/media/video/cx23885/cx23885-reg.h
index 63ab0fb..3f1afbe 100644
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to