diff options
-rw-r--r-- | linux/Documentation/video4linux/not-in-cx2388x-datasheet.txt | 4 | ||||
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 4 | ||||
-rw-r--r-- | v4l/ChangeLog | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/not-in-cx2388x-datasheet.txt b/linux/Documentation/video4linux/not-in-cx2388x-datasheet.txt index 96b638b5b..77f99f8aa 100644 --- a/linux/Documentation/video4linux/not-in-cx2388x-datasheet.txt +++ b/linux/Documentation/video4linux/not-in-cx2388x-datasheet.txt @@ -34,4 +34,8 @@ MO_OUTPUT_FORMAT (0x310164) 2: HACTEXT 1: HSFMT +0x47 is the sync byte for MPEG-2 transport stream packets. +Datasheet incorrectly states to use 47 decimal. 188 is the length. +All DVB compliant frontends output packets with this start code. + ================================================================================= diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index ba594fe42..e525bb959 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.29 2005/07/04 19:35:05 mkrufky Exp $ + * $Id: cx88-mpeg.c,v 1.30 2005/07/05 19:44:40 mkrufky Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -73,7 +73,7 @@ static int cx8802_start_dma(struct cx8802_dev *dev, cx_write(TS_GEN_CNTRL, 0x0040 | dev->ts_gen_cntrl); udelay(100); cx_write(MO_PINMUX_IO, 0x00); - cx_write(TS_HW_SOP_CNTRL,47<<16|188<<4|0x00); + cx_write(TS_HW_SOP_CNTRL,0x47<<16|188<<4|0x01); if ((core->board == CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q) || (core->board == CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T)) { cx_write(TS_SOP_STAT, 0<<16 | 0<<14 | 1<<13 | 0<<12); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 0e4891f69..a5b9b37a8 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-07-05 15:32 mkrufky + * cx88-mpeg.c, doc/not-in-cx2388x-datasheet.txt: + + - Correct sync byte for MPEG-2 transport stream packets. + All DVB compliant frontends output packets with this start code. + Thanks to Johannes Stezenbach and Mac Michaels. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-05 21:36 nshmyrev * bttv-driver.c, saa7134-cards.c, tuner-core.c, tea5767.c: * tuner-simple.c, saa7134-core.c, cx88-core.c: |