diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 15:02:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 15:02:33 -0300 |
| commit | 43d5f85ed4007de0d8af992666a6cf4c09c7ce20 (patch) | |
| tree | 8ff55ababfe9cb82bd26a77b8f92fae35735f6f1 /linux/drivers/media/video/cx18/cx18-av-core.c | |
| parent | 88778479f1fa5916aa079b9c17929716ebc182a6 (diff) | |
| parent | ddfa2bbea3cb3a9f980e360f49a80643998cd4e0 (diff) | |
| download | mediapointer-dvb-s2-43d5f85ed4007de0d8af992666a6cf4c09c7ce20.tar.gz mediapointer-dvb-s2-43d5f85ed4007de0d8af992666a6cf4c09c7ce20.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-mmio-fixes
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-av-core.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-av-core.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-av-core.c b/linux/drivers/media/video/cx18/cx18-av-core.c index d8626e354..73f5141a4 100644 --- a/linux/drivers/media/video/cx18/cx18-av-core.c +++ b/linux/drivers/media/video/cx18/cx18-av-core.c @@ -42,6 +42,12 @@ int cx18_av_write4(struct cx18 *cx, u16 addr, u32 value) return 0; } +int cx18_av_write4_noretry(struct cx18 *cx, u16 addr, u32 value) +{ + cx18_write_reg_noretry(cx, value, 0xc40000 + addr); + return 0; +} + u8 cx18_av_read(struct cx18 *cx, u16 addr) { u32 x = cx18_read_reg(cx, 0xc40000 + (addr & ~3)); @@ -55,6 +61,11 @@ u32 cx18_av_read4(struct cx18 *cx, u16 addr) return cx18_read_reg(cx, 0xc40000 + addr); } +u32 cx18_av_read4_noretry(struct cx18 *cx, u16 addr) +{ + return cx18_read_reg_noretry(cx, 0xc40000 + addr); +} + int cx18_av_and_or(struct cx18 *cx, u16 addr, unsigned and_mask, u8 or_value) { |