|
@@ -42,6 +42,7 @@
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/uaccess.h>
|
|
|
#include <linux/usb.h>
|
|
|
+#include <linux/ktime.h>
|
|
|
|
|
|
#include <media/lirc.h>
|
|
|
#include <media/lirc_dev.h>
|
|
@@ -111,7 +112,7 @@ struct sasem_context {
|
|
|
} tx;
|
|
|
|
|
|
/* for dealing with repeat codes (wish there was a toggle bit!) */
|
|
|
- struct timeval presstime;
|
|
|
+ ktime_t presstime;
|
|
|
char lastcode[8];
|
|
|
int codesaved;
|
|
|
};
|
|
@@ -566,8 +567,8 @@ static void incoming_packet(struct sasem_context *context,
|
|
|
{
|
|
|
int len = urb->actual_length;
|
|
|
unsigned char *buf = urb->transfer_buffer;
|
|
|
- long ms;
|
|
|
- struct timeval tv;
|
|
|
+ u64 ns;
|
|
|
+ ktime_t kt;
|
|
|
|
|
|
if (len != 8) {
|
|
|
dev_warn(&context->dev->dev,
|
|
@@ -584,9 +585,8 @@ static void incoming_packet(struct sasem_context *context,
|
|
|
*/
|
|
|
|
|
|
/* get the time since the last button press */
|
|
|
- do_gettimeofday(&tv);
|
|
|
- ms = (tv.tv_sec - context->presstime.tv_sec) * 1000 +
|
|
|
- (tv.tv_usec - context->presstime.tv_usec) / 1000;
|
|
|
+ kt = ktime_get();
|
|
|
+ ns = ktime_to_ns(ktime_sub(kt, context->presstime));
|
|
|
|
|
|
if (memcmp(buf, "\x08\0\0\0\0\0\0\0", 8) == 0) {
|
|
|
/*
|
|
@@ -600,10 +600,9 @@ static void incoming_packet(struct sasem_context *context,
|
|
|
* in that time and then get a false repeat of the previous
|
|
|
* press but it is long enough for a genuine repeat
|
|
|
*/
|
|
|
- if ((ms < 250) && (context->codesaved != 0)) {
|
|
|
+ if ((ns < 250 * NSEC_PER_MSEC) && (context->codesaved != 0)) {
|
|
|
memcpy(buf, &context->lastcode, 8);
|
|
|
- context->presstime.tv_sec = tv.tv_sec;
|
|
|
- context->presstime.tv_usec = tv.tv_usec;
|
|
|
+ context->presstime = kt;
|
|
|
}
|
|
|
} else {
|
|
|
/* save the current valid code for repeats */
|
|
@@ -613,8 +612,7 @@ static void incoming_packet(struct sasem_context *context,
|
|
|
* just for safety reasons
|
|
|
*/
|
|
|
context->codesaved = 1;
|
|
|
- context->presstime.tv_sec = tv.tv_sec;
|
|
|
- context->presstime.tv_usec = tv.tv_usec;
|
|
|
+ context->presstime = kt;
|
|
|
}
|
|
|
|
|
|
lirc_buffer_write(context->driver->rbuf, buf);
|