From 80aca15c2a73c53f0ae91d31ebc042443738ecfc Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Tue, 5 Nov 2019 14:58:48 +0100 Subject: executor: update the list of raw usb events The number of reported event types changed. --- executor/common_usb.h | 2 -- pkg/csource/generated.go | 2 -- tools/syz-usbgen/keyboard.c | 8 -------- 3 files changed, 12 deletions(-) diff --git a/executor/common_usb.h b/executor/common_usb.h index 7b16f9849..638e8bb85 100644 --- a/executor/common_usb.h +++ b/executor/common_usb.h @@ -77,8 +77,6 @@ static bool parse_usb_descriptor(char* buffer, size_t length, struct usb_device_ enum usb_raw_event_type { USB_RAW_EVENT_INVALID, USB_RAW_EVENT_CONNECT, - USB_RAW_EVENT_DISCONNECT, - USB_RAW_EVENT_SUSPEND, USB_RAW_EVENT_CONTROL, }; diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index bd633e0aa..7931332ad 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -1939,8 +1939,6 @@ static bool parse_usb_descriptor(char* buffer, size_t length, struct usb_device_ enum usb_raw_event_type { USB_RAW_EVENT_INVALID, USB_RAW_EVENT_CONNECT, - USB_RAW_EVENT_DISCONNECT, - USB_RAW_EVENT_SUSPEND, USB_RAW_EVENT_CONTROL, }; diff --git a/tools/syz-usbgen/keyboard.c b/tools/syz-usbgen/keyboard.c index ad2631d54..819d0eff8 100644 --- a/tools/syz-usbgen/keyboard.c +++ b/tools/syz-usbgen/keyboard.c @@ -45,8 +45,6 @@ struct hid_descriptor { enum usb_raw_event_type { USB_RAW_EVENT_INVALID, USB_RAW_EVENT_CONNECT, - USB_RAW_EVENT_DISCONNECT, - USB_RAW_EVENT_SUSPEND, USB_RAW_EVENT_CONTROL, }; @@ -488,12 +486,6 @@ void log_event(struct usb_raw_event *event) { case USB_RAW_EVENT_CONNECT: printf("event: connect, length: %u\n", event->length); break; - case USB_RAW_EVENT_DISCONNECT: - printf("event: disconnect, length: %u\n", event->length); - break; - case USB_RAW_EVENT_SUSPEND: - printf("event: suspend, length: %u\n", event->length); - break; case USB_RAW_EVENT_CONTROL: printf("event: control, length: %u\n", event->length); log_control_request((struct usb_ctrlrequest *)&event->data[0]); -- cgit mrf-deployment