From rusty at rustcorp.com.au Wed Feb 1 03:29:38 2012 From: rusty at rustcorp.com.au (Rusty Russell) Date: Wed, 01 Feb 2012 12:59:38 +1030 Subject: [ivtv-devel] [PATCH 05/16] cx18: fix handling of 'radio' module parameter In-Reply-To: <201201311445.20095.danny.kukawka@bisect.de> References: <1327960820-11867-1-git-send-email-danny.kukawka@bisect.de> <1327960820-11867-6-git-send-email-danny.kukawka@bisect.de> <201201311445.20095.danny.kukawka@bisect.de> Message-ID: <87fwevjnfx.fsf@rustcorp.com.au> On Tue, 31 Jan 2012 14:45:18 +0100, Danny Kukawka wrote: > On Dienstag, 31. Januar 2012, Andy Walls wrote: > Overseen this. But wouldn't be the correct fix in this case to: > a) reverse the part of 90ab5ee94171b3e28de6bb42ee30b527014e0be7 to: > get: > static unsigned radio_c = 1; > > b) change the following line: > module_param_array(radio, bool, &radio_c, 0644); > to: > module_param_array(radio, int, &radio_c, 0644); Yes, sorry, my patch was complete crap here :( If you want people to set it only to 1 or 0, you probably want "bint". Thanks, Rusty. From amwang at redhat.com Fri Feb 10 06:39:39 2012 From: amwang at redhat.com (Cong Wang) Date: Fri, 10 Feb 2012 13:39:39 +0800 Subject: [ivtv-devel] [PATCH 18/60] media: remove the second argument of k[un]map_atomic() In-Reply-To: <1328852421-19678-1-git-send-email-amwang@redhat.com> References: <1328852421-19678-1-git-send-email-amwang@redhat.com> Message-ID: <1328852421-19678-19-git-send-email-amwang@redhat.com> Acked-by: Andy Walls Signed-off-by: Cong Wang --- drivers/media/video/ivtv/ivtv-udma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/ivtv/ivtv-udma.c b/drivers/media/video/ivtv/ivtv-udma.c index 69cc816..7338cb2 100644 --- a/drivers/media/video/ivtv/ivtv-udma.c +++ b/drivers/media/video/ivtv/ivtv-udma.c @@ -57,9 +57,9 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_info if (dma->bouncemap[map_offset] == NULL) return -1; local_irq_save(flags); - src = kmap_atomic(dma->map[map_offset], KM_BOUNCE_READ) + offset; + src = kmap_atomic(dma->map[map_offset]) + offset; memcpy(page_address(dma->bouncemap[map_offset]) + offset, src, len); - kunmap_atomic(src, KM_BOUNCE_READ); + kunmap_atomic(src); local_irq_restore(flags); sg_set_page(&dma->SGlist[map_offset], dma->bouncemap[map_offset], len, offset); } -- 1.7.7.6 From jskinner58 at sbcglobal.net Tue Feb 21 03:06:05 2012 From: jskinner58 at sbcglobal.net (Jim Skinner) Date: Mon, 20 Feb 2012 20:06:05 -0600 Subject: [ivtv-devel] cx18: HVR1600 FM radio driver? Message-ID: <4F42FC0D.80303@sbcglobal.net> I have an HVR1600 version with the FM tuner but have been unable to get FM to work or find much out about getting it to work. I have the analog and digital tuners working (under Ubuntu 11.10). I did find some info that looked promising here: http://www.gossamer-threads.com/lists/ivtv/devel/39819?search_string=cx18%20radio;#39819 but entering the commands that claim to make the radio work did not do the trick. Perhaps I didn't do needed setup before what was shown. I have mythtv but did not have ivtv-radio installed so installed ivtv-utils. ivtv-radio gives some response but gets no signals and outputs only static. What needs to be done to get this working (if that has been figured out yet)? From awalls at md.metrocast.net Tue Feb 21 03:55:58 2012 From: awalls at md.metrocast.net (Andy Walls) Date: Mon, 20 Feb 2012 21:55:58 -0500 Subject: [ivtv-devel] cx18: HVR1600 FM radio driver? In-Reply-To: <4F42FC0D.80303@sbcglobal.net> References: <4F42FC0D.80303@sbcglobal.net> Message-ID: Jim Skinner wrote: >I have an HVR1600 version with the FM tuner but have been unable to get > >FM to work or find much out about getting it to work. I have the >analog >and digital tuners working (under Ubuntu 11.10). I did find some info >that looked promising here: > >http://www.gossamer-threads.com/lists/ivtv/devel/39819?search_string=cx18%20radio;#39819 > >but entering the commands that claim to make the radio work did not do >the trick. Perhaps I didn't do needed setup before what was shown. > >I have mythtv but did not have ivtv-radio installed so installed >ivtv-utils. ivtv-radio gives some response but gets no signals and >outputs only static. > >What needs to be done to get this working (if that has been figured out > >yet)? > > > >_______________________________________________ >ivtv-devel mailing list >ivtv-devel at ivtvdriver.org >http://ivtvdriver.org/mailman/listinfo/ivtv-devel I haven't used FM in about a year. Somthing could have broken with the normal kernel churn. What kernel version are you using (uname -a)? Also what analog tuner model does your HVR1600 have (v4l2-ctl -d /dev/video0 --log-status )? -Andy From santoshprasadnayak at gmail.com Tue Feb 21 11:13:31 2012 From: santoshprasadnayak at gmail.com (santosh nayak) Date: Tue, 21 Feb 2012 15:43:31 +0530 Subject: [ivtv-devel] [PATCH 2/2] Driver: video: Use the macro DMA_BIT_MASK(). Message-ID: <1329819211-8359-1-git-send-email-santoshprasadnayak@gmail.com> From: Santosh Nayak Use the macro DMA_BIT_MASK instead of the constant 0xffffffff. Signed-off-by: Santosh Nayak --- drivers/media/video/cx18/cx18-driver.c | 4 ++-- drivers/media/video/ivtv/ivtv-driver.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 349bd9c..08118e5 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -38,7 +38,7 @@ #include "cx18-ioctl.h" #include "cx18-controls.h" #include "tuner-xc2028.h" - +#include #include /* If you have already X v4l cards, then set this to X. This way @@ -812,7 +812,7 @@ static int cx18_setup_pci(struct cx18 *cx, struct pci_dev *pci_dev, CX18_ERR("Can't enable device %d!\n", cx->instance); return -EIO; } - if (pci_set_dma_mask(pci_dev, 0xffffffff)) { + if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) { CX18_ERR("No suitable DMA available, card %d\n", cx->instance); return -EIO; } diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 107e9e6..d84e5df 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -55,7 +55,7 @@ #include "ivtv-routing.h" #include "ivtv-controls.h" #include "ivtv-gpio.h" - +#include #include #include #include @@ -813,7 +813,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev, IVTV_ERR("Can't enable device!\n"); return -EIO; } - if (pci_set_dma_mask(pdev, 0xffffffff)) { + if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { IVTV_ERR("No suitable DMA available.\n"); return -EIO; } -- 1.7.4.4 From jskinner58 at sbcglobal.net Wed Feb 22 13:11:53 2012 From: jskinner58 at sbcglobal.net (Jim Skinner) Date: Wed, 22 Feb 2012 06:11:53 -0600 Subject: [ivtv-devel] cx18: HVR1600 FM radio driver? Message-ID: <4F44DB89.8030105@sbcglobal.net> Here are outputs requested: unname -a Linux jimmyth 3.0.0-14-generic #23-Ubuntu SMP Mon Nov 21 20:34:47 UTC 2011 i686 athlon i386 GNU/Linux v4l2-ctl -d /dev/video0 --log-status Status Log: [245812.968264] cx18-0: ================= START STATUS CARD #0 ================= [245812.968268] cx18-0: Version: 1.5.0 Card: Hauppauge HVR-1600 [245813.008655] tveeprom 2-0050: Hauppauge model 74541, rev C6B6, serial# 5384514 [245813.008657] tveeprom 2-0050: MAC address is 00:0d:fe:52:29:42 [245813.008659] tveeprom 2-0050: tuner model is Philips FM1236 MK5 (idx 116, type 43) [245813.008661] tveeprom 2-0050: TV standards NTSC(M) (eeprom 0x08) [245813.008663] tveeprom 2-0050: audio processor is CX23418 (idx 38) [245813.008665] tveeprom 2-0050: decoder processor is CX23418 (idx 31) [245813.008666] tveeprom 2-0050: has radio [245813.008671] cx18-0 843: Video signal: not present [245813.008672] cx18-0 843: Detected format: NTSC-M [245813.008674] cx18-0 843: Specified standard: NTSC-M [245813.008675] cx18-0 843: Specified video input: Composite 7 [245813.008676] cx18-0 843: Specified audioclock freq: 48000 Hz [245813.008685] cx18-0 843: Detected audio mode: mono [245813.008687] cx18-0 843: Detected audio standard: no detected audio standard [245813.008688] cx18-0 843: Audio muted: yes [245813.008689] cx18-0 843: Audio microcontroller: running [245813.008691] cx18-0 843: Configured audio standard: automatic detection [245813.008692] cx18-0 843: Configured audio system: BTSC [245813.008693] cx18-0 843: Specified audio input: Tuner (In8) [245813.008694] cx18-0 843: Preferred audio mode: stereo [245813.008703] cx18-0 gpio-reset-ctrl: GPIO: direction 0x00003001, value 0x00003001 [245813.008706] tda9887 3-0043: Data bytes: b=0x14 c=0x30 e=0x44 [245813.008708] tuner 3-0061: Tuner mode: analog TV [245813.008710] tuner 3-0061: Frequency: 723.25 MHz [245813.008711] tuner 3-0061: Standard: 0x0000b000 [245813.010822] cs5345 2-004c: Input: 1 [245813.010823] cs5345 2-004c: Volume: 0 dB [245813.010825] cx18-0: Video Input: Tuner 1 [245813.010826] cx18-0: Audio Input: Tuner 1 [245813.010827] cx18-0: GPIO: direction 0x00003001, value 0x00003001 [245813.010829] cx18-0: Tuner: TV [245813.010830] cx18-0: Stream Type: MPEG-2 Program Stream (grabbed) [245813.010832] cx18-0: Stream VBI Format: No VBI (grabbed) [245813.010834] cx18-0: Audio Sampling Frequency: 48 kHz (grabbed) [245813.010836] cx18-0: Audio Encoding: MPEG-1/2 Layer II (grabbed) [245813.010838] cx18-0: Audio Layer II Bitrate: 224 kbps (grabbed) [245813.010839] cx18-0: Audio Stereo Mode: Stereo [245813.010841] cx18-0: Audio Stereo Mode Extension: Bound 4 (inactive) [245813.010843] cx18-0: Audio Emphasis: No Emphasis [245813.010844] cx18-0: Audio CRC: No CRC [245813.010846] cx18-0: Audio Mute: false [245813.010847] cx18-0: Video Encoding: MPEG-2 [245813.010849] cx18-0: Video Aspect: 4x3 [245813.010850] cx18-0: Video B Frames: 2 [245813.010852] cx18-0: Video GOP Size: 15 [245813.010853] cx18-0: Video GOP Closure: true [245813.010855] cx18-0: Video Bitrate Mode: Variable Bitrate (grabbed) [245813.010857] cx18-0: Video Bitrate: 6000000 (grabbed) [245813.010858] cx18-0: Video Peak Bitrate: 8000000 (grabbed) [245813.010860] cx18-0: Video Temporal Decimation: 0 [245813.010862] cx18-0: Video Mute: false [245813.010863] cx18-0: Video Mute YUV: 32896 [245813.010865] cx18-0: Spatial Filter Mode: Manual [245813.010866] cx18-0: Spatial Filter: 0 [245813.010868] cx18-0: Spatial Luma Filter Type: 1D Horizontal [245813.010870] cx18-0: Spatial Chroma Filter Type: 1D Horizontal [245813.010871] cx18-0: Temporal Filter Mode: Manual [245813.010873] cx18-0: Temporal Filter: 8 [245813.010874] cx18-0: Median Filter Type: Off [245813.010876] cx18-0: Median Luma Filter Minimum: 0 (inactive) [245813.010877] cx18-0: Median Luma Filter Maximum: 255 (inactive) [245813.010879] cx18-0: Median Chroma Filter Minimum: 0 (inactive) [245813.010881] cx18-0: Median Chroma Filter Maximum: 255 (inactive) [245813.010883] cx18-0: Insert Navigation Packets: false [245813.010884] cx18-0: Status flags: 0x00200001 [245813.010887] cx18-0: Stream encoder MPEG: status 0x0000, 0% of 2048 KiB (64 buffers) in use [245813.010889] cx18-0: Stream encoder YUV: status 0x0000, 0% of 2025 KiB (20 buffers) in use [245813.010891] cx18-0: Stream encoder VBI: status 0x0000, 0% of 1015 KiB (20 buffers) in use [245813.010893] cx18-0: Stream encoder PCM audio: status 0x0000, 0% of 1024 KiB (256 buffers) in use [245813.010894] cx18-0: Read MPEG/VBI: 0/0 bytes [245813.010896] cx18-0: ================== END STATUS CARD #0 ================== From danny.kukawka at bisect.de Wed Feb 22 14:24:54 2012 From: danny.kukawka at bisect.de (Danny Kukawka) Date: Wed, 22 Feb 2012 14:24:54 +0100 Subject: [ivtv-devel] [RESEND][PATCH v2 0/2] fix cx18-/ivtv-driver 'radio' module parameter Message-ID: <1329917096-19438-1-git-send-email-danny.kukawka@bisect.de> Updated patch versions to fix the 'radio' module parameter of cx18-driver and ivtv-driver. Please add to 3.3. Danny Kukawka (2): cx18-driver: fix handling of 'radio' module parameter ivtv-driver: fix handling of 'radio' module parameter drivers/media/video/cx18/cx18-driver.c | 4 ++-- drivers/media/video/ivtv/ivtv-driver.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- 1.7.8.3 From danny.kukawka at bisect.de Wed Feb 22 14:24:56 2012 From: danny.kukawka at bisect.de (Danny Kukawka) Date: Wed, 22 Feb 2012 14:24:56 +0100 Subject: [ivtv-devel] [RESEND][PATCH v2 2/2] ivtv-driver: fix handling of 'radio' module parameter In-Reply-To: <1329917096-19438-1-git-send-email-danny.kukawka@bisect.de> References: <1329917096-19438-1-git-send-email-danny.kukawka@bisect.de> Message-ID: <1329917096-19438-3-git-send-email-danny.kukawka@bisect.de> Reverse ivtv-driver part of commit 90ab5ee94171b3e28de6bb42ee30b527014e0be7 and change module_param_array() type from bool to int to fix compiler warning: In function ?__check_radio?: 113:1: warning: return from incompatible pointer type [enabled by default] At top level: 113:1: warning: initialization from incompatible pointer type [enabled by default] 113:1: warning: (near initialization for ?__param_arr_radio.num?) [enabled by default] v2: set radio_c to true instead of 1 since it's bool v3: corrected version, don't change to module_param_named(), change all to int/uint Signed-off-by: Danny Kukawka --- drivers/media/video/ivtv/ivtv-driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 107e9e6..ab6ed116 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -99,7 +99,7 @@ static int i2c_clock_period[IVTV_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1, static unsigned int cardtype_c = 1; static unsigned int tuner_c = 1; -static bool radio_c = 1; +static unsigned int radio_c = 1; static unsigned int i2c_clock_period_c = 1; static char pal[] = "---"; static char secam[] = "--"; @@ -139,7 +139,7 @@ static int tunertype = -1; static int newi2c = -1; module_param_array(tuner, int, &tuner_c, 0644); -module_param_array(radio, bool, &radio_c, 0644); +module_param_array(radio, int, &radio_c, 0644); module_param_array(cardtype, int, &cardtype_c, 0644); module_param_string(pal, pal, sizeof(pal), 0644); module_param_string(secam, secam, sizeof(secam), 0644); -- 1.7.8.3 From danny.kukawka at bisect.de Wed Feb 22 14:24:55 2012 From: danny.kukawka at bisect.de (Danny Kukawka) Date: Wed, 22 Feb 2012 14:24:55 +0100 Subject: [ivtv-devel] [RESEND][PATCH v2 1/2] cx18-driver: fix handling of 'radio' module parameter In-Reply-To: <1329917096-19438-1-git-send-email-danny.kukawka@bisect.de> References: <1329917096-19438-1-git-send-email-danny.kukawka@bisect.de> Message-ID: <1329917096-19438-2-git-send-email-danny.kukawka@bisect.de> Reverse cx18-driver part of commit 90ab5ee94171b3e28de6bb42ee30b527014e0be7 and change module_param_array() type from bool to int to fix compiler warning: In function ?__check_radio?: 113:1: warning: return from incompatible pointer type [enabled by default] At top level: 113:1: warning: initialization from incompatible pointer type [enabled by default] 113:1: warning: (near initialization for ?__param_arr_radio.num?) [enabled by default] v2: corrected version, don't change to module_param_named(), change all to int/uint Signed-off-by: Danny Kukawka --- drivers/media/video/cx18/cx18-driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 349bd9c..9355745 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -75,7 +75,7 @@ static int radio[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; static unsigned cardtype_c = 1; static unsigned tuner_c = 1; -static bool radio_c = 1; +static unsigned radio_c = 1; static char pal[] = "--"; static char secam[] = "--"; static char ntsc[] = "-"; @@ -110,7 +110,7 @@ static int retry_mmio = 1; int cx18_debug; module_param_array(tuner, int, &tuner_c, 0644); -module_param_array(radio, bool, &radio_c, 0644); +module_param_array(radio, int, &radio_c, 0644); module_param_array(cardtype, int, &cardtype_c, 0644); module_param_string(pal, pal, sizeof(pal), 0644); module_param_string(secam, secam, sizeof(secam), 0644); -- 1.7.8.3