diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-01-12 15:54:32 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2012-01-12 15:54:32 +0100 |
| commit | 6af4b27124dff7d53c713a96e45e85d206020f42 (patch) | |
| tree | 17a5b6f5f099e5465367743aa255aea624ab3d75 /usbredirparser | |
| parent | a90bfaf170e9464299d31dd1121a1ef5a81195b0 (diff) | |
usbredirfilter: Adjust usbredirfilter_check prototype
This change allows the data from an usb_redir_interface_info_header
struct to be directly passed to usbredirfilter_check().
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'usbredirparser')
| -rw-r--r-- | usbredirparser/usbredirfilter.c | 11 | ||||
| -rw-r--r-- | usbredirparser/usbredirfilter.h | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/usbredirparser/usbredirfilter.c b/usbredirparser/usbredirfilter.c index 1b0323d..c319caf 100644 --- a/usbredirparser/usbredirfilter.c +++ b/usbredirparser/usbredirfilter.c @@ -137,8 +137,8 @@ char *usbredirfilter_rules_to_string(struct usbredirfilter_rule *rules, } static int usbredirfilter_check1(struct usbredirfilter_rule *rules, - int rules_count, int device_class, int vendor_id, int product_id, - int device_version_bcd, int default_allow) + int rules_count, uint8_t device_class, uint16_t vendor_id, + uint16_t product_id, uint16_t device_version_bcd, int default_allow) { int i; @@ -160,9 +160,10 @@ static int usbredirfilter_check1(struct usbredirfilter_rule *rules, } int usbredirfilter_check(struct usbredirfilter_rule *rules, int rules_count, - int device_class, int device_subclass, int device_protocol, - int *interface_class, int *interface_subclass, int *interface_protocol, - int interface_count, int vendor_id, int product_id, int device_version_bcd, + uint8_t device_class, uint8_t device_subclass, uint8_t device_protocol, + uint8_t *interface_class, uint8_t *interface_subclass, + uint8_t *interface_protocol, int interface_count, + uint16_t vendor_id, uint16_t product_id, uint16_t device_version_bcd, int flags) { int i, rc; diff --git a/usbredirparser/usbredirfilter.h b/usbredirparser/usbredirfilter.h index c9ee8d2..e57a120 100644 --- a/usbredirparser/usbredirfilter.h +++ b/usbredirparser/usbredirfilter.h @@ -22,6 +22,7 @@ #define __USBREDIRFILTER_H #include <stdio.h> +#include <stdint.h> struct usbredirfilter_rule { int device_class; /* 0-255, -1 to match any class */ @@ -105,9 +106,10 @@ enum { usbredirfilter_fl_dont_skip_non_boot_hid = 0x02, }; int usbredirfilter_check(struct usbredirfilter_rule *rules, int rules_count, - int device_class, int device_subclass, int device_protocol, - int *interface_class, int *interface_subclass, int *interface_protocol, - int interface_count, int vendor_id, int product_id, int device_version_bcd, + uint8_t device_class, uint8_t device_subclass, uint8_t device_protocol, + uint8_t *interface_class, uint8_t *interface_subclass, + uint8_t *interface_protocol, int interface_count, + uint16_t vendor_id, uint16_t product_id, uint16_t device_version_bcd, int flags); /* Sanity check the passed in rules |