.. | .. |
---|
26 | 26 | const s32 *samples = (const void *)buf; |
---|
27 | 27 | |
---|
28 | 28 | for (i = 0; i < len >> 2; i++) { |
---|
29 | | - DEFINE_IR_RAW_EVENT(ev); |
---|
30 | | - |
---|
31 | | - ev.duration = abs(samples[i]) * 1000; /* Convert to ns */ |
---|
32 | | - ev.pulse = (samples[i] > 0) ? false : true; |
---|
| 29 | + struct ir_raw_event ev = { |
---|
| 30 | + .duration = abs(samples[i]), |
---|
| 31 | + .pulse = (samples[i] > 0) ? false : true |
---|
| 32 | + }; |
---|
33 | 33 | |
---|
34 | 34 | ir_raw_event_store(coredev->ir.dev, &ev); |
---|
35 | 35 | } |
---|
.. | .. |
---|
48 | 48 | return -ENOMEM; |
---|
49 | 49 | |
---|
50 | 50 | coredev->ir.controller = 0; /* Todo: vega/nova SPI number */ |
---|
51 | | - coredev->ir.timeout = IR_DEFAULT_TIMEOUT; |
---|
| 51 | + coredev->ir.timeout = US_TO_NS(IR_DEFAULT_TIMEOUT); |
---|
52 | 52 | pr_debug("IR port %d, timeout %d ms\n", |
---|
53 | 53 | coredev->ir.controller, coredev->ir.timeout); |
---|
54 | 54 | |
---|
55 | 55 | snprintf(coredev->ir.name, sizeof(coredev->ir.name), |
---|
56 | 56 | "SMS IR (%s)", sms_get_board(board_id)->name); |
---|
57 | 57 | |
---|
58 | | - strlcpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys)); |
---|
| 58 | + strscpy(coredev->ir.phys, coredev->devpath, sizeof(coredev->ir.phys)); |
---|
59 | 59 | strlcat(coredev->ir.phys, "/ir0", sizeof(coredev->ir.phys)); |
---|
60 | 60 | |
---|
61 | 61 | dev->device_name = coredev->ir.name; |
---|