libusbi.h/darwin: Split recursive struct declarations, for C++ compat

Closes #1461
This commit is contained in:
Sean McBride
2024-01-03 22:03:09 -05:00
committed by Tormod Volden
parent 40c5799881
commit d1e4372464
3 changed files with 16 additions and 12 deletions

View File

@@ -824,11 +824,13 @@ void usbi_signal_transfer_completion(struct usbi_transfer *itransfer);
void usbi_connect_device(struct libusb_device *dev);
void usbi_disconnect_device(struct libusb_device *dev);
struct usbi_event_source_data {
usbi_os_handle_t os_handle;
short poll_events;
};
struct usbi_event_source {
struct usbi_event_source_data {
usbi_os_handle_t os_handle;
short poll_events;
} data;
struct usbi_event_source_data data;
struct list_head list;
};

View File

@@ -125,17 +125,19 @@ struct darwin_device_priv {
struct darwin_cached_device *dev;
};
struct darwin_interface {
usb_interface_t interface;
uint8_t num_endpoints;
CFRunLoopSourceRef cfSource;
uint64_t frames[256];
uint8_t endpoint_addrs[USB_MAXENDPOINTS];
};
struct darwin_device_handle_priv {
bool is_open;
CFRunLoopSourceRef cfSource;
struct darwin_interface {
usb_interface_t interface;
uint8_t num_endpoints;
CFRunLoopSourceRef cfSource;
uint64_t frames[256];
uint8_t endpoint_addrs[USB_MAXENDPOINTS];
} interfaces[USB_MAXINTERFACES];
struct darwin_interface interfaces[USB_MAXINTERFACES];
};
struct darwin_transfer_priv {

View File

@@ -1 +1 @@
#define LIBUSB_NANO 11958
#define LIBUSB_NANO 11959