Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103787
b: refs/heads/master
c: 5a4f5da
h: refs/heads/master
i:
  103785: 2f49f5c
  103783: 4542e7b
v: v3
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Jul 20, 2008
1 parent ea34d91 commit 049c53a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9b59f6e2f6686016dfea7625e98fbef1e335c61
refs/heads/master: 5a4f5da6552e6c55eff6fbddfee3eab908325c63
16 changes: 12 additions & 4 deletions trunk/drivers/media/video/pvrusb2/pvrusb2-hdw.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,16 @@ MODULE_PARM_DESC(video_std,"specify initial video standard");
module_param_array(tolerance, int, NULL, 0444);
MODULE_PARM_DESC(tolerance,"specify stream error tolerance");

/* US Broadcast channel 7 (175.25 MHz) */
static int default_tv_freq = 175250000L;
/* 104.3 MHz, a usable FM station for my area */
static int default_radio_freq = 104300000L;

module_param_named(tv_freq, default_tv_freq, int, 0444);
MODULE_PARM_DESC(tv_freq, "specify initial television frequency");
module_param_named(radio_freq, default_radio_freq, int, 0444);
MODULE_PARM_DESC(radio_freq, "specify initial radio frequency");

#define PVR2_CTL_WRITE_ENDPOINT 0x01
#define PVR2_CTL_READ_ENDPOINT 0x81

Expand Down Expand Up @@ -1701,10 +1711,8 @@ static void pvr2_hdw_setup_low(struct pvr2_hdw *hdw)
are, but I set them to something usable in the Chicago area just
to make driver testing a little easier. */

/* US Broadcast channel 7 (175.25 MHz) */
hdw->freqValTelevision = 175250000L;
/* 104.3 MHz, a usable FM station for my area */
hdw->freqValRadio = 104300000L;
hdw->freqValTelevision = default_tv_freq;
hdw->freqValRadio = default_radio_freq;

// Do not use pvr2_reset_ctl_endpoints() here. It is not
// thread-safe against the normal pvr2_send_request() mechanism.
Expand Down

0 comments on commit 049c53a

Please sign in to comment.