diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-29 12:34:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-29 12:34:43 -0300 |
| commit | bb23e654d39bbfdebbf087f9649d1e0e110c5b20 (patch) | |
| tree | 30898eac94ead8343466ca4714d9871db269595c /linux/drivers/media/dvb/ttpci/av7110_hw.c | |
| parent | f876c2dd29df6aadcb5982273b486a95c2e4b193 (diff) | |
| parent | 61d260e2d3239aec8f44c91e3b971621bafbbd45 (diff) | |
| download | mediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.gz mediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner-refactor-phase-1
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_hw.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_hw.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_hw.c b/linux/drivers/media/dvb/ttpci/av7110_hw.c index a731f0c52..a0d7acd9e 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_hw.c +++ b/linux/drivers/media/dvb/ttpci/av7110_hw.c @@ -978,24 +978,24 @@ static int OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 ble static int OSDSetPalette(struct av7110 *av7110, u32 __user * colors, u8 first, u8 last) { - int i; - int length = last - first + 1; + int i; + int length = last - first + 1; - if (length * 4 > DATA_BUFF3_SIZE) - return -EINVAL; + if (length * 4 > DATA_BUFF3_SIZE) + return -EINVAL; - for (i = 0; i < length; i++) { - u32 color, blend, yuv; + for (i = 0; i < length; i++) { + u32 color, blend, yuv; - if (get_user(color, colors + i)) - return -EFAULT; - blend = (color & 0xF0000000) >> 4; - yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF, + if (get_user(color, colors + i)) + return -EFAULT; + blend = (color & 0xF0000000) >> 4; + yuv = blend ? RGB2YUV(color & 0xFF, (color >> 8) & 0xFF, (color >> 16) & 0xFF) | blend : 0; - yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16); - wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4); - } - return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4, + yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16); + wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i * 4, yuv, 4); + } + return av7110_fw_cmd(av7110, COMTYPE_OSD, Set_Palette, 4, av7110->osdwin, bpp2pal[av7110->osdbpp[av7110->osdwin]], first, last); |