Skip to content

Commit

Permalink
[media] staging/lirc: ioctl portability fixups
Browse files Browse the repository at this point in the history 
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jarod Wilson authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent be1f985 commit a126681
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 50 deletions.
17 changes: 8 additions & 9 deletions drivers/staging/lirc/lirc_it87.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
{
int retval = 0;
unsigned long value = 0;
unsigned int ivalue;
__u32 value = 0;
unsigned long hw_flags;

if (cmd == LIRC_GET_FEATURES)
Expand All @@ -256,24 +255,24 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
case LIRC_GET_FEATURES:
case LIRC_GET_SEND_MODE:
case LIRC_GET_REC_MODE:
retval = put_user(value, (unsigned long *) arg);
retval = put_user(value, (__u32 *) arg);
break;

case LIRC_SET_SEND_MODE:
case LIRC_SET_REC_MODE:
retval = get_user(value, (unsigned long *) arg);
retval = get_user(value, (__u32 *) arg);
break;

case LIRC_SET_SEND_CARRIER:
retval = get_user(ivalue, (unsigned int *) arg);
retval = get_user(value, (__u32 *) arg);
if (retval)
return retval;
ivalue /= 1000;
if (ivalue > IT87_CIR_FREQ_MAX ||
ivalue < IT87_CIR_FREQ_MIN)
value /= 1000;
if (value > IT87_CIR_FREQ_MAX ||
value < IT87_CIR_FREQ_MIN)
return -EINVAL;

it87_freq = ivalue;
it87_freq = value;

spin_lock_irqsave(&hardware_lock, hw_flags);
outb(((inb(io + IT87_CIR_TCR2) & IT87_CIR_TCR2_TXMPW) |
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/lirc/lirc_ite8709.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ struct ite8709_device {
int io;
int irq;
spinlock_t hardware_lock;
unsigned long long acc_pulse;
unsigned long long acc_space;
__u64 acc_pulse;
__u64 acc_space;
char lastbit;
struct timeval last_tv;
struct lirc_driver driver;
Expand Down Expand Up @@ -220,7 +220,7 @@ static void ite8709_set_use_dec(void *data)
}

static void ite8709_add_read_queue(struct ite8709_device *dev, int flag,
unsigned long long val)
__u64 val)
{
int value;

Expand Down
32 changes: 16 additions & 16 deletions drivers/staging/lirc/lirc_parallel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,9 @@ static void irq_handler(void *blah)

if (signal != 0) {
/* ajust value to usecs */
unsigned long long helper;
__u64 helper;

helper = ((unsigned long long) signal)*1000000;
helper = ((__u64) signal)*1000000;
do_div(helper, timer);
signal = (long) helper;

Expand Down Expand Up @@ -404,9 +404,9 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,

/* adjust values from usecs */
for (i = 0; i < count; i++) {
unsigned long long helper;
__u64 helper;

helper = ((unsigned long long) wbuf[i])*timer;
helper = ((__u64) wbuf[i])*timer;
do_div(helper, 1000000);
wbuf[i] = (int) helper;
}
Expand Down Expand Up @@ -464,48 +464,48 @@ static unsigned int lirc_poll(struct file *file, poll_table *wait)
static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
{
int result;
unsigned long features = LIRC_CAN_SET_TRANSMITTER_MASK |
LIRC_CAN_SEND_PULSE | LIRC_CAN_REC_MODE2;
unsigned long mode;
unsigned int ivalue;
__u32 features = LIRC_CAN_SET_TRANSMITTER_MASK |
LIRC_CAN_SEND_PULSE | LIRC_CAN_REC_MODE2;
__u32 mode;
__u32 value;

switch (cmd) {
case LIRC_GET_FEATURES:
result = put_user(features, (unsigned long *) arg);
result = put_user(features, (__u32 *) arg);
if (result)
return result;
break;
case LIRC_GET_SEND_MODE:
result = put_user(LIRC_MODE_PULSE, (unsigned long *) arg);
result = put_user(LIRC_MODE_PULSE, (__u32 *) arg);
if (result)
return result;
break;
case LIRC_GET_REC_MODE:
result = put_user(LIRC_MODE_MODE2, (unsigned long *) arg);
result = put_user(LIRC_MODE_MODE2, (__u32 *) arg);
if (result)
return result;
break;
case LIRC_SET_SEND_MODE:
result = get_user(mode, (unsigned long *) arg);
result = get_user(mode, (__u32 *) arg);
if (result)
return result;
if (mode != LIRC_MODE_PULSE)
return -EINVAL;
break;
case LIRC_SET_REC_MODE:
result = get_user(mode, (unsigned long *) arg);
result = get_user(mode, (__u32 *) arg);
if (result)
return result;
if (mode != LIRC_MODE_MODE2)
return -ENOSYS;
break;
case LIRC_SET_TRANSMITTER_MASK:
result = get_user(ivalue, (unsigned int *) arg);
result = get_user(value, (__u32 *) arg);
if (result)
return result;
if ((ivalue & LIRC_PARALLEL_TRANSMITTER_MASK) != ivalue)
if ((value & LIRC_PARALLEL_TRANSMITTER_MASK) != value)
return LIRC_PARALLEL_MAX_TRANSMITTERS;
tx_mask = ivalue;
tx_mask = value;
break;
default:
return -ENOIOCTLCMD;
Expand Down
21 changes: 10 additions & 11 deletions drivers/staging/lirc/lirc_serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ static unsigned long conv_us_to_clocks;
static int init_timing_params(unsigned int new_duty_cycle,
unsigned int new_freq)
{
unsigned long long loops_per_sec, work;
__u64 loops_per_sec, work;

duty_cycle = new_duty_cycle;
freq = new_freq;
Expand Down Expand Up @@ -987,8 +987,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
{
int result;
unsigned long value;
unsigned int ivalue;
__u32 value;

switch (cmd) {
case LIRC_GET_SEND_MODE:
Expand All @@ -997,7 +996,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)

result = put_user(LIRC_SEND2MODE
(hardware[type].features&LIRC_CAN_SEND_MASK),
(unsigned long *) arg);
(__u32 *) arg);
if (result)
return result;
break;
Expand All @@ -1006,7 +1005,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
if (!(hardware[type].features&LIRC_CAN_SEND_MASK))
return -ENOIOCTLCMD;

result = get_user(value, (unsigned long *) arg);
result = get_user(value, (__u32 *) arg);
if (result)
return result;
/* only LIRC_MODE_PULSE supported */
Expand All @@ -1023,25 +1022,25 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
if (!(hardware[type].features&LIRC_CAN_SET_SEND_DUTY_CYCLE))
return -ENOIOCTLCMD;

result = get_user(ivalue, (unsigned int *) arg);
result = get_user(value, (__u32 *) arg);
if (result)
return result;
if (ivalue <= 0 || ivalue > 100)
if (value <= 0 || value > 100)
return -EINVAL;
return init_timing_params(ivalue, freq);
return init_timing_params(value, freq);
break;

case LIRC_SET_SEND_CARRIER:
dprintk("SET_SEND_CARRIER\n");
if (!(hardware[type].features&LIRC_CAN_SET_SEND_CARRIER))
return -ENOIOCTLCMD;

result = get_user(ivalue, (unsigned int *) arg);
result = get_user(value, (__u32 *) arg);
if (result)
return result;
if (ivalue > 500000 || ivalue < 20000)
if (value > 500000 || value < 20000)
return -EINVAL;
return init_timing_params(duty_cycle, ivalue);
return init_timing_params(duty_cycle, value);
break;

default:
Expand Down
21 changes: 10 additions & 11 deletions drivers/staging/lirc/lirc_sir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,8 @@ static ssize_t lirc_write(struct file *file, const char *buf, size_t n,
static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
{
int retval = 0;
unsigned long value = 0;
__u32 value = 0;
#ifdef LIRC_ON_SA1100
unsigned int ivalue;

if (cmd == LIRC_GET_FEATURES)
value = LIRC_CAN_SEND_PULSE |
Expand All @@ -362,22 +361,22 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
case LIRC_GET_FEATURES:
case LIRC_GET_SEND_MODE:
case LIRC_GET_REC_MODE:
retval = put_user(value, (unsigned long *) arg);
retval = put_user(value, (__u32 *) arg);
break;

case LIRC_SET_SEND_MODE:
case LIRC_SET_REC_MODE:
retval = get_user(value, (unsigned long *) arg);
retval = get_user(value, (__u32 *) arg);
break;
#ifdef LIRC_ON_SA1100
case LIRC_SET_SEND_DUTY_CYCLE:
retval = get_user(ivalue, (unsigned int *) arg);
retval = get_user(value, (__u32 *) arg);
if (retval)
return retval;
if (ivalue <= 0 || ivalue > 100)
if (value <= 0 || value > 100)
return -EINVAL;
/* (ivalue/100)*(1000000/freq) */
duty_cycle = ivalue;
/* (value/100)*(1000000/freq) */
duty_cycle = value;
pulse_width = (unsigned long) duty_cycle*10000/freq;
space_width = (unsigned long) 1000000L/freq-pulse_width;
if (pulse_width >= LIRC_ON_SA1100_TRANSMITTER_LATENCY)
Expand All @@ -386,12 +385,12 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
space_width -= LIRC_ON_SA1100_TRANSMITTER_LATENCY;
break;
case LIRC_SET_SEND_CARRIER:
retval = get_user(ivalue, (unsigned int *) arg);
retval = get_user(value, (__u32 *) arg);
if (retval)
return retval;
if (ivalue > 500000 || ivalue < 20000)
if (value > 500000 || value < 20000)
return -EINVAL;
freq = ivalue;
freq = value;
pulse_width = (unsigned long) duty_cycle*10000/freq;
space_width = (unsigned long) 1000000L/freq-pulse_width;
if (pulse_width >= LIRC_ON_SA1100_TRANSMITTER_LATENCY)
Expand Down

0 comments on commit a126681

Please sign in to comment.