diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-02 11:51:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-02 11:51:22 -0300 |
| commit | b08105ee409c139e15147eda1c7bc67f026dd06d (patch) | |
| tree | 52f9bc75932965b93a8bdbfb53cc7ea768a82041 /linux/drivers/media/video | |
| parent | 46ee402349d8c3d0fdecf27e2618ac5f93c1becf (diff) | |
| parent | 9a911497132a384b61c15b4e58b9a4f71eda4470 (diff) | |
| download | mediapointer-dvb-s2-b08105ee409c139e15147eda1c7bc67f026dd06d.tar.gz mediapointer-dvb-s2-b08105ee409c139e15147eda1c7bc67f026dd06d.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/cx88-mpeg
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400-kthreads.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/video-buf.c | 7 |
4 files changed, 11 insertions, 3 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 4e8831f88..1105e4257 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -977,6 +977,8 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) state->has_virtual_dolby_surround = msp_revision == 'G' && msp_prod_lo == 1; /* Has Virtual Dolby Surround & Dolby Pro Logic: only in msp34x2 */ state->has_dolby_pro_logic = msp_revision == 'G' && msp_prod_lo == 2; + /* The msp343xG supports BTSC only and cannot do Automatic Standard Detection. */ + state->force_btsc = msp_family == 3 && msp_revision == 'G' && msp_prod_hi == 3; state->opmode = opmode; if (state->opmode == OPMODE_AUTO) { diff --git a/linux/drivers/media/video/msp3400-driver.h b/linux/drivers/media/video/msp3400-driver.h index 33eac394d..a783277ab 100644 --- a/linux/drivers/media/video/msp3400-driver.h +++ b/linux/drivers/media/video/msp3400-driver.h @@ -64,6 +64,7 @@ struct msp_state { u8 has_sound_processing; u8 has_virtual_dolby_surround; u8 has_dolby_pro_logic; + u8 force_btsc; int radio; int opmode; diff --git a/linux/drivers/media/video/msp3400-kthreads.c b/linux/drivers/media/video/msp3400-kthreads.c index 78dd43490..053ebec73 100644 --- a/linux/drivers/media/video/msp3400-kthreads.c +++ b/linux/drivers/media/video/msp3400-kthreads.c @@ -999,9 +999,9 @@ int msp34xxg_thread(void *data) /* setup the chip*/ msp34xxg_reset(client); - state->std = state->radio ? 0x40 : msp_standard; + state->std = state->radio ? 0x40 : + (state->force_btsc && msp_standard == 1) ? 32 : msp_standard; /* start autodetect */ - msp_write_dem(client, 0x20, state->std); if (state->std != 1) goto unmute; diff --git a/linux/drivers/media/video/video-buf.c b/linux/drivers/media/video/video-buf.c index 05532ee28..f1e7f298b 100644 --- a/linux/drivers/media/video/video-buf.c +++ b/linux/drivers/media/video/video-buf.c @@ -366,7 +366,12 @@ videobuf_iolock(struct videobuf_queue* q, struct videobuf_buffer *vb, if (NULL == fbuf) return -EINVAL; /* FIXME: need sanity checks for vb->boff */ - bus = (dma_addr_t)fbuf->base + vb->boff; + /* + * Using a double cast to avoid compiler warnings when + * building for PAE. Compiler doesn't like direct casting + * of a 32 bit ptr to 64 bit integer. + */ + bus = (dma_addr_t)(unsigned long)fbuf->base + vb->boff; pages = PAGE_ALIGN(vb->size) >> PAGE_SHIFT; err = videobuf_dma_init_overlay(&vb->dma,PCI_DMA_FROMDEVICE, bus, pages); |