From d973f52833e0e3cec5406aa9cdf606a463d85c46 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 11 Dec 2019 18:45:13 +0100 Subject: executor: update raw gadget interface --- executor/common_usb.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'executor') diff --git a/executor/common_usb.h b/executor/common_usb.h index d036128de..687baf095 100644 --- a/executor/common_usb.h +++ b/executor/common_usb.h @@ -76,10 +76,12 @@ static bool parse_usb_descriptor(char* buffer, size_t length, struct usb_device_ return true; } +#define UDC_NAME_LENGTH_MAX 128 + struct usb_raw_init { - __u64 speed; - const __u8* driver_name; - const __u8* device_name; + __u8 driver_name[UDC_NAME_LENGTH_MAX]; + __u8 device_name[UDC_NAME_LENGTH_MAX]; + __u8 speed; }; enum usb_raw_event_type { @@ -121,9 +123,9 @@ static int usb_raw_open() static int usb_raw_init(int fd, uint32 speed, const char* driver, const char* device) { struct usb_raw_init arg; + strncpy((char*)&arg.driver_name[0], driver, sizeof(arg.driver_name)); + strncpy((char*)&arg.device_name[0], device, sizeof(arg.device_name)); arg.speed = speed; - arg.driver_name = (const __u8*)driver; - arg.device_name = (const __u8*)device; return ioctl(fd, USB_RAW_IOCTL_INIT, &arg); } -- cgit mrf-deployment