diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-09 22:21:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-09 22:21:16 -0300 |
| commit | 1f45410eb6cd8758691c7782269b3813c5131e39 (patch) | |
| tree | 267d5c66e8e58ed48822e7fba64b3a9f98e4fdfa /linux/drivers/media/video/cx18/cx18-vbi.c | |
| parent | 53cbcc79992f562a58926c0aeef0f0f710a69d89 (diff) | |
| parent | b3e737a176ce96bee38fb7d0ee5cf6def9da8ad1 (diff) | |
| download | mediapointer-dvb-s2-1f45410eb6cd8758691c7782269b3813c5131e39.tar.gz mediapointer-dvb-s2-1f45410eb6cd8758691c7782269b3813c5131e39.tar.bz2 | |
merge: http://udev.netup.ru/hg/v4l-dvb-netup
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-vbi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-vbi.c b/linux/drivers/media/video/cx18/cx18-vbi.c index a81fe2e98..355737bff 100644 --- a/linux/drivers/media/video/cx18/cx18-vbi.c +++ b/linux/drivers/media/video/cx18/cx18-vbi.c @@ -169,7 +169,7 @@ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf, int streamtype) { u8 *p = (u8 *) buf->buf; - u32 *q = (u32 *) buf->buf; + __be32 *q = (__be32 *) buf->buf; u32 size = buf->bytesused; u32 pts; int lines; @@ -178,8 +178,9 @@ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf, return; /* - * The CX23418 sends us data that is 32 bit LE swapped, but we want - * the raw VBI bytes in the order they were in the raster line + * The CX23418 sends us data that is 32 bit little-endian swapped, + * but we want the raw VBI bytes in the order they were in the raster + * line. This has a side effect of making the 12 byte header big endian */ cx18_buf_swap(buf); @@ -218,7 +219,7 @@ void cx18_process_vbi_data(struct cx18 *cx, struct cx18_buffer *buf, /* Sliced VBI data with data insertion */ - pts = (be32_to_cpu(q[0] == 0x3fffffff)) ? be32_to_cpu(q[2]) : 0; + pts = (be32_to_cpu(q[0]) == 0x3fffffff) ? be32_to_cpu(q[2]) : 0; /* * For calls to compress_sliced_buf(), ensure there are an integral |