|
@@ -109,17 +109,9 @@ static bool iommap;
|
|
static int ioshift;
|
|
static int ioshift;
|
|
static bool softcarrier = true;
|
|
static bool softcarrier = true;
|
|
static bool share_irq;
|
|
static bool share_irq;
|
|
-static bool debug;
|
|
|
|
static int sense = -1; /* -1 = auto, 0 = active high, 1 = active low */
|
|
static int sense = -1; /* -1 = auto, 0 = active high, 1 = active low */
|
|
static bool txsense; /* 0 = active high, 1 = active low */
|
|
static bool txsense; /* 0 = active high, 1 = active low */
|
|
|
|
|
|
-#define dprintk(fmt, args...) \
|
|
|
|
- do { \
|
|
|
|
- if (debug) \
|
|
|
|
- printk(KERN_DEBUG LIRC_DRIVER_NAME ": " \
|
|
|
|
- fmt, ## args); \
|
|
|
|
- } while (0)
|
|
|
|
-
|
|
|
|
/* forward declarations */
|
|
/* forward declarations */
|
|
static long send_pulse_irdeo(unsigned long length);
|
|
static long send_pulse_irdeo(unsigned long length);
|
|
static long send_pulse_homebrew(unsigned long length);
|
|
static long send_pulse_homebrew(unsigned long length);
|
|
@@ -352,10 +344,9 @@ static int init_timing_params(unsigned int new_duty_cycle,
|
|
/* Derive pulse and space from the period */
|
|
/* Derive pulse and space from the period */
|
|
pulse_width = period * duty_cycle / 100;
|
|
pulse_width = period * duty_cycle / 100;
|
|
space_width = period - pulse_width;
|
|
space_width = period - pulse_width;
|
|
- dprintk("in init_timing_params, freq=%d, duty_cycle=%d, "
|
|
|
|
- "clk/jiffy=%ld, pulse=%ld, space=%ld\n",
|
|
|
|
- freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
|
|
|
|
- pulse_width, space_width);
|
|
|
|
|
|
+ pr_debug("in init_timing_params, freq=%d, duty_cycle=%d, clk/jiffy=%ld, pulse=%ld, space=%ld, conv_us_to_clocks=%ld\n",
|
|
|
|
+ freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
|
|
|
|
+ pulse_width, space_width, conv_us_to_clocks);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
#else /* ! USE_RDTSC */
|
|
#else /* ! USE_RDTSC */
|
|
@@ -377,8 +368,8 @@ static int init_timing_params(unsigned int new_duty_cycle,
|
|
period = 256 * 1000000L / freq;
|
|
period = 256 * 1000000L / freq;
|
|
pulse_width = period * duty_cycle / 100;
|
|
pulse_width = period * duty_cycle / 100;
|
|
space_width = period - pulse_width;
|
|
space_width = period - pulse_width;
|
|
- dprintk("in init_timing_params, freq=%d pulse=%ld, space=%ld\n",
|
|
|
|
- freq, pulse_width, space_width);
|
|
|
|
|
|
+ pr_debug("in init_timing_params, freq=%d pulse=%ld, space=%ld\n",
|
|
|
|
+ freq, pulse_width, space_width);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
#endif /* USE_RDTSC */
|
|
#endif /* USE_RDTSC */
|
|
@@ -500,7 +491,7 @@ static void rbwrite(int l)
|
|
{
|
|
{
|
|
if (lirc_buffer_full(&rbuf)) {
|
|
if (lirc_buffer_full(&rbuf)) {
|
|
/* no new signals will be accepted */
|
|
/* no new signals will be accepted */
|
|
- dprintk("Buffer overrun\n");
|
|
|
|
|
|
+ pr_debug("Buffer overrun\n");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
lirc_buffer_write(&rbuf, (void *)&l);
|
|
lirc_buffer_write(&rbuf, (void *)&l);
|
|
@@ -790,7 +781,7 @@ static int lirc_serial_probe(struct platform_device *dev)
|
|
dev_info(&dev->dev, "Manually using active %s receiver\n",
|
|
dev_info(&dev->dev, "Manually using active %s receiver\n",
|
|
sense ? "low" : "high");
|
|
sense ? "low" : "high");
|
|
|
|
|
|
- dprintk("Interrupt %d, port %04x obtained\n", irq, io);
|
|
|
|
|
|
+ dev_dbg(&dev->dev, "Interrupt %d, port %04x obtained\n", irq, io);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -895,7 +886,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
|
|
return -ENOIOCTLCMD;
|
|
return -ENOIOCTLCMD;
|
|
|
|
|
|
case LIRC_SET_SEND_DUTY_CYCLE:
|
|
case LIRC_SET_SEND_DUTY_CYCLE:
|
|
- dprintk("SET_SEND_DUTY_CYCLE\n");
|
|
|
|
|
|
+ pr_debug("SET_SEND_DUTY_CYCLE\n");
|
|
if (!(hardware[type].features&LIRC_CAN_SET_SEND_DUTY_CYCLE))
|
|
if (!(hardware[type].features&LIRC_CAN_SET_SEND_DUTY_CYCLE))
|
|
return -ENOIOCTLCMD;
|
|
return -ENOIOCTLCMD;
|
|
|
|
|
|
@@ -907,7 +898,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
|
|
return init_timing_params(value, freq);
|
|
return init_timing_params(value, freq);
|
|
|
|
|
|
case LIRC_SET_SEND_CARRIER:
|
|
case LIRC_SET_SEND_CARRIER:
|
|
- dprintk("SET_SEND_CARRIER\n");
|
|
|
|
|
|
+ pr_debug("SET_SEND_CARRIER\n");
|
|
if (!(hardware[type].features&LIRC_CAN_SET_SEND_CARRIER))
|
|
if (!(hardware[type].features&LIRC_CAN_SET_SEND_CARRIER))
|
|
return -ENOIOCTLCMD;
|
|
return -ENOIOCTLCMD;
|
|
|
|
|
|
@@ -1102,7 +1093,7 @@ static void __exit lirc_serial_exit_module(void)
|
|
{
|
|
{
|
|
lirc_unregister_driver(driver.minor);
|
|
lirc_unregister_driver(driver.minor);
|
|
lirc_serial_exit();
|
|
lirc_serial_exit();
|
|
- dprintk("cleaned up module\n");
|
|
|
|
|
|
+ pr_debug("cleaned up module\n");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -1153,6 +1144,3 @@ MODULE_PARM_DESC(txsense, "Sense of transmitter circuit"
|
|
|
|
|
|
module_param(softcarrier, bool, S_IRUGO);
|
|
module_param(softcarrier, bool, S_IRUGO);
|
|
MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)");
|
|
MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)");
|
|
-
|
|
|
|
-module_param(debug, bool, S_IRUGO | S_IWUSR);
|
|
|
|
-MODULE_PARM_DESC(debug, "Enable debugging messages");
|
|
|