iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (3194): Revert one 64-bit fix and improved other 64-bit fixes

Browse Source 
- Reverted objectionable fix in saa7146_hlp.c
- Merged in improved dvb 64-bit fixes from Peter Beutner.

Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
This commit is contained in:
Peter Beutner 2006-01-09 15:32:43 -02:00 committed by Mauro Carvalho Chehab
parent d8e6acf2ec
commit 400b7083fb
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/common/saa7146_hlp.c
View File

@ -562,7 +562,7 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int
int b_depth = vv->ov_fmt->depth; int b_depth = vv->ov_fmt->depth;
int b_bpl = vv->ov_fb.fmt.bytesperline; int b_bpl = vv->ov_fb.fmt.bytesperline;
u32 base = (u32)(unsigned long)vv->ov_fb.base; u32 base = (u32)vv->ov_fb.base;
struct saa7146_video_dma vdma1; struct saa7146_video_dma vdma1;

6
drivers/media/dvb/dvb-core/dvb_frontend.c
View File

@ -104,7 +104,7 @@ struct dvb_frontend_private {
unsigned int exit; unsigned int exit;
unsigned int wakeup; unsigned int wakeup;
fe_status_t status; fe_status_t status;
unsigned int tune_mode_flags; unsigned long tune_mode_flags;
unsigned int delay; unsigned int delay;
/* swzigzag values */ /* swzigzag values */
@ -808,13 +808,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
* initialization, so parg is 8 bits and does not * initialization, so parg is 8 bits and does not
* include the initialization or start bit * include the initialization or start bit
*/ */
unsigned int cmd = ((unsigned long) parg) << 1; unsigned long cmd = ((unsigned long) parg) << 1;
struct timeval nexttime; struct timeval nexttime;
struct timeval tv[10]; struct timeval tv[10];
int i; int i;
u8 last = 1; u8 last = 1;
if (dvb_frontend_debug) if (dvb_frontend_debug)
printk("%s switch command: 0x%04x\n", __FUNCTION__, cmd); printk("%s switch command: 0x%04lx\n", __FUNCTION__, cmd);
do_gettimeofday(&nexttime); do_gettimeofday(&nexttime);
if (dvb_frontend_debug) if (dvb_frontend_debug)
memcpy(&tv[0], &nexttime, sizeof(struct timeval)); memcpy(&tv[0], &nexttime, sizeof(struct timeval));

4
drivers/media/dvb/dvb-core/dvb_frontend.h
View File

@ -83,8 +83,8 @@ struct dvb_frontend_ops {
int (*diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd); int (*diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd);
int (*set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone); int (*set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);
int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage); int (*set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, int arg); int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, long arg);
int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned int cmd); int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable); int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
}; };

2
drivers/media/dvb/dvb-core/dvb_net.c
View File

@ -1222,7 +1222,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype)
return if_num; return if_num;
} }
static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned int num) static int dvb_net_remove_if(struct dvb_net *dvbnet, unsigned long num)
{ {
struct net_device *net = dvbnet->device[num]; struct net_device *net = dvbnet->device[num];
struct dvb_net_priv *priv; struct dvb_net_priv *priv;

4
drivers/media/dvb/frontends/stv0299.c
View File

@ -394,7 +394,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
}; };
} }
static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd) static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long cmd)
{ {
struct stv0299_state* state = fe->demodulator_priv; struct stv0299_state* state = fe->demodulator_priv;
u8 reg0x08; u8 reg0x08;
@ -414,7 +414,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
cmd = cmd << 1; cmd = cmd << 1;
if (debug_legacy_dish_switch) if (debug_legacy_dish_switch)
printk ("%s switch command: 0x%04x\n",__FUNCTION__, cmd); printk ("%s switch command: 0x%04lx\n",__FUNCTION__, cmd);
do_gettimeofday (&nexttime); do_gettimeofday (&nexttime);
if (debug_legacy_dish_switch) if (debug_legacy_dish_switch)

2
drivers/media/dvb/ttpci/av7110.c
View File

@ -2215,7 +2215,7 @@ static int av7110_fe_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t volta
return ret; return ret;
} }
static int av7110_fe_dishnetwork_send_legacy_command(struct dvb_frontend* fe, unsigned int cmd) static int av7110_fe_dishnetwork_send_legacy_command(struct dvb_frontend* fe, unsigned long cmd)
{ {
struct av7110* av7110 = fe->dvb->priv; struct av7110* av7110 = fe->dvb->priv;

2
drivers/media/dvb/ttpci/av7110.h
View File

@ -262,7 +262,7 @@ struct av7110 {
int (*fe_diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd); int (*fe_diseqc_send_burst)(struct dvb_frontend* fe, fe_sec_mini_cmd_t minicmd);
int (*fe_set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone); int (*fe_set_tone)(struct dvb_frontend* fe, fe_sec_tone_mode_t tone);
int (*fe_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage); int (*fe_set_voltage)(struct dvb_frontend* fe, fe_sec_voltage_t voltage);
int (*fe_dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned int cmd); int (*fe_dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
int (*fe_set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); int (*fe_set_frontend)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
}; };

2
drivers/media/dvb/ttpci/budget.c
View File

@ -212,7 +212,7 @@ static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
return 0; return 0;
} }
static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, int arg) static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, long arg)
{ {
struct budget* budget = (struct budget*) fe->dvb->priv; struct budget* budget = (struct budget*) fe->dvb->priv;
u8 buf; u8 buf;