From 70db86f0c4f6bef05cc596424133a49d4d3f8b0b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 15 Oct 2015 12:42:23 +1000 Subject: [PATCH] hidpp10: make hidpp10_request_command static For commands we support we have the wrapper functions, they're safer to use. Signed-off-by: Peter Hutterer --- src/hidpp10.c | 18 +++++++++++++++++- src/hidpp10.h | 17 ----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/hidpp10.c b/src/hidpp10.c index 2ccf244c..574c497f 100644 --- a/src/hidpp10.c +++ b/src/hidpp10.c @@ -43,6 +43,22 @@ #include "libratbag-util.h" #include "libratbag-hidraw.h" +struct _hidpp10_message { + uint8_t report_id; + uint8_t device_idx; + uint8_t sub_id; + uint8_t address; + union { + uint8_t parameters[3]; + uint8_t string[16]; + }; +} __attribute__((packed)); + +union hidpp10_message { + struct _hidpp10_message msg; + uint8_t data[LONG_MESSAGE_LENGTH]; +}; + #define ERROR_MSG(__hidpp_msg, idx) { \ .msg = { \ .report_id = REPORT_ID_SHORT, \ @@ -86,7 +102,7 @@ const char *device_types[0xFF] = { [0x0A ... 0xFE] = NULL, }; -int +static int hidpp10_request_command(struct hidpp10_device *dev, union hidpp10_message *msg) { union hidpp10_message read_buffer; diff --git a/src/hidpp10.h b/src/hidpp10.h index 41181404..dc096da4 100644 --- a/src/hidpp10.h +++ b/src/hidpp10.h @@ -36,25 +36,8 @@ struct hidpp10_device; -struct _hidpp10_message { - uint8_t report_id; - uint8_t device_idx; - uint8_t sub_id; - uint8_t address; - union { - uint8_t parameters[3]; - uint8_t string[16]; - }; -} __attribute__((packed)); - -union hidpp10_message { - struct _hidpp10_message msg; - uint8_t data[LONG_MESSAGE_LENGTH]; -}; - void hidpp10_device_destroy(struct hidpp10_device *dev); -int hidpp10_request_command(struct hidpp10_device *device, union hidpp10_message *msg); struct hidpp10_device *hidpp10_device_new_from_wpid(const struct hidpp_device *base, uint16_t wpid); struct hidpp10_device *hidpp10_device_new_from_idx(const struct hidpp_device *base,