This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l-utils: sync with kernel Author: Hans Verkuil <[email protected]> Date: Sun Aug 20 15:05:27 2017 +0200 The CEC_EVENT_PIN_* events were renamed to CEC_EVENT_PIN_CEC_*. Update cec-ctl accordingly. Signed-off-by: Hans Verkuil <[email protected]> include/linux/cec.h | 4 ++-- utils/cec-ctl/cec-ctl.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=fe4d07817bc782543e969b041086e34af2b5018e diff --git a/include/linux/cec.h b/include/linux/cec.h index d87a67b0bb06..4351c3481aea 100644 --- a/include/linux/cec.h +++ b/include/linux/cec.h @@ -408,8 +408,8 @@ struct cec_log_addrs { * didn't empty the message queue in time */ #define CEC_EVENT_LOST_MSGS 2 -#define CEC_EVENT_PIN_LOW 3 -#define CEC_EVENT_PIN_HIGH 4 +#define CEC_EVENT_PIN_CEC_LOW 3 +#define CEC_EVENT_PIN_CEC_HIGH 4 #define CEC_EVENT_FL_INITIAL_STATE (1 << 0) #define CEC_EVENT_FL_DROPPED_EVENTS (1 << 1) diff --git a/utils/cec-ctl/cec-ctl.cpp b/utils/cec-ctl/cec-ctl.cpp index c4c7d11e9747..66a68648d03b 100644 --- a/utils/cec-ctl/cec-ctl.cpp +++ b/utils/cec-ctl/cec-ctl.cpp @@ -1045,10 +1045,10 @@ static void log_unknown_msg(const struct cec_msg *msg) static void log_event(struct cec_event &ev) { - bool is_high = ev.event == CEC_EVENT_PIN_HIGH; + bool is_high = ev.event == CEC_EVENT_PIN_CEC_HIGH; __u16 pa; - if (ev.event != CEC_EVENT_PIN_LOW && ev.event != CEC_EVENT_PIN_HIGH) + if (ev.event != CEC_EVENT_PIN_CEC_LOW && ev.event != CEC_EVENT_PIN_CEC_HIGH) printf("\n"); if (ev.flags & CEC_EVENT_FL_DROPPED_EVENTS) printf("(Note: events were lost)\n"); @@ -1065,8 +1065,8 @@ static void log_event(struct cec_event &ev) case CEC_EVENT_LOST_MSGS: printf("Event: Lost Messages\n"); break; - case CEC_EVENT_PIN_LOW: - case CEC_EVENT_PIN_HIGH: + case CEC_EVENT_PIN_CEC_LOW: + case CEC_EVENT_PIN_CEC_HIGH: if (ev.flags & CEC_EVENT_FL_INITIAL_STATE) printf("Event: CEC Pin %s\n", is_high ? "High" : "Low"); @@ -1402,13 +1402,13 @@ static void monitor(struct node &node, __u32 monitor_time, const char *store_pin if (doioctl(&node, CEC_DQEVENT, &ev)) continue; - if (ev.event == CEC_EVENT_PIN_LOW || - ev.event == CEC_EVENT_PIN_HIGH) + if (ev.event == CEC_EVENT_PIN_CEC_LOW || + ev.event == CEC_EVENT_PIN_CEC_HIGH) pin_event = true; if (pin_event && fstore) { fprintf(fstore, "%llu.%09llu %d\n", ev.ts / 1000000000, ev.ts % 1000000000, - ev.event == CEC_EVENT_PIN_HIGH); + ev.event == CEC_EVENT_PIN_CEC_HIGH); fflush(fstore); } if ((!pin_event || options[OptMonitorPin]) && @@ -1424,13 +1424,13 @@ static void monitor(struct node &node, __u32 monitor_time, const char *store_pin if (ts64 >= eob_ts_max) { struct cec_event ev = { eob_ts, - CEC_EVENT_PIN_HIGH + CEC_EVENT_PIN_CEC_HIGH }; if (fstore) { fprintf(fstore, "%llu.%09llu %d\n", ev.ts / 1000000000, ev.ts % 1000000000, - ev.event == CEC_EVENT_PIN_HIGH); + ev.event == CEC_EVENT_PIN_CEC_HIGH); fflush(fstore); } if (options[OptMonitorPin]) @@ -1505,7 +1505,7 @@ static void analyze(const char *analyze_pin) break; } ev.ts = tv_sec * 1000000000ULL + tv_nsec; - ev.event = high ? CEC_EVENT_PIN_HIGH : CEC_EVENT_PIN_LOW; + ev.event = high ? CEC_EVENT_PIN_CEC_HIGH : CEC_EVENT_PIN_CEC_LOW; log_event(ev); line++; } _______________________________________________ linuxtv-commits mailing list [email protected] https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
