Chris,
Minor fixes for:
CC [M] /root/ivtv/ivtv-0.3.7c-orig/driver/cx25840-audio.o
/root/ivtv/ivtv-0.3.7c-orig/driver/cx25840-audio.c: In function
`cx25840_set_v4l_audio':
/root/ivtv/ivtv-0.3.7c-orig/driver/cx25840-audio.c:309: warning: ISO
C90 forbids mixed declarations and code
CC [M] /root/ivtv/ivtv-0.3.7c-orig/driver/ivtv-osd.o
/root/ivtv/ivtv-0.3.7c-orig/driver/ivtv-osd.c: In function `ivtv_fb_ioctl':
/root/ivtv/ivtv-0.3.7c-orig/driver/ivtv-osd.c:1238: warning:
`verify_area' is deprecated (declared at include/asm/uaccess.h:105)
Cheers,
Wilf.
--
[EMAIL PROTECTED]
diff -BurN ivtv-0.3.7c-orig/driver/cx25840-audio.c ivtv-0.3.7c-clean/driver/cx25840-audio.c
--- ivtv-0.3.7c-orig/driver/cx25840-audio.c 2005-08-10 14:25:44.000000000 +0100
+++ ivtv-0.3.7c-clean/driver/cx25840-audio.c 2005-08-10 15:23:45.000000000 +0100
@@ -298,6 +298,7 @@
{
// First convert the volume to msp3400 values (0-127)
int volume = va->volume >> 9;
+ int balance = va->balance >> 8;
// now scale it up to cx25840 values
// -114dB to -96dB maps to 0
// this should be 19, but in my testing that was 4dB too loud
@@ -305,14 +306,10 @@
volume = 0;
else
volume -= 23;
- volume = 228 - (volume * 2);
- int bass = 48 - (va->bass * 48 / 0xffff);
- int treble = 48 - (va->treble * 48 / 0xffff);
- int balance = va->balance >> 8;
- CX25840_SET_PATH1_VOLUME(volume);
- CX25840_SET_PATH1_EQ_BASS_VOL(bass);
- CX25840_SET_PATH1_EQ_TREBLE_VOL(treble);
+ CX25840_SET_PATH1_VOLUME(228 - (volume * 2));
+ CX25840_SET_PATH1_EQ_BASS_VOL(48 - (va->bass * 48 / 0xffff));
+ CX25840_SET_PATH1_EQ_TREBLE_VOL(48 - (va->treble * 48 / 0xffff));
if (balance > 0x80) {
CX25840_SET_PATH1_BAL_LEFT(0x01);
CX25840_SET_PATH1_BAL_LEVEL(balance & 0x7f);
diff -BurN ivtv-0.3.7c-orig/driver/ivtv-osd.c ivtv-0.3.7c-clean/driver/ivtv-osd.c
--- ivtv-0.3.7c-orig/driver/ivtv-osd.c 2005-08-10 14:11:55.000000000 +0100
+++ ivtv-0.3.7c-clean/driver/ivtv-osd.c 2005-08-10 14:18:03.000000000 +0100
@@ -1234,15 +1234,15 @@
}
/* Check Source */
- if (verify_area
+ if (!access_ok
(VERIFY_READ, (args.source + args.dest_offset),
args.count)) {
IVTV_DEBUG(IVTV_DEBUG_ERR,
- "OSD: Area not verified!!! 0x%08lx\n",
+ "OSD: Invalid userspace pointer!!! 0x%08lx\n",
(unsigned long)args.source);
IVTV_DEBUG(IVTV_DEBUG_ERR,
- "OSD: Verify Area failed for offset 0x%08lx source 0x%08lx count %d\n",
+ "OSD: access_ok() failed for offset 0x%08lx source 0x%08lx count %d\n",
args.dest_offset, (unsigned long)args.source,
args.count);
return -EINVAL;
