i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move USB CDC Ethernet descriptor to shared header

Browse Source 
Use the same structure in usb_ecm and listusb

Change-Id: I8d33b434560bb18bb2f6247090d1580c267adab2
Reviewed-on: https://review.haiku-os.org/c/haiku/+/11046
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
PulkoMandy
2026-06-01 08:00:34 +00:00
committed by Adrien Destugues
parent 30cb44085c
commit 96037d5af2
5 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/drivers/usb/USB_cdc.h
+13 -2
View File
@@ -16,7 +16,7 @@ enum { // Communication Interface Subclasses
USB_CDC_COMMUNICATION_INTERFACE_TCM_SUBCLASS, // Telephone Control Model
USB_CDC_COMMUNICATION_INTERFACE_MCCM_SUBCLASS, // Multi-Channel Control Model
USB_CDC_COMMUNICATION_INTERFACE_CAPICM_SUBCLASS, // CAPI Control Model
USB_CDC_COMMUNICATION_INTERFACE_ENCM_SUBCLASS, // Ethernet Networking Control Model
USB_CDC_COMMUNICATION_INTERFACE_ECM_SUBCLASS, // Ethernet Control Model
USB_CDC_COMMUNICATION_INTERFACE_ATMNCM_SUBCLASS // ATM Networking Control Model
};
@@ -35,7 +35,8 @@ enum { // Functional Descriptors Subtypes
USB_CDC_HEADER_FUNCTIONAL_DESCRIPTOR = 0x00,
USB_CDC_CM_FUNCTIONAL_DESCRIPTOR,
USB_CDC_ACM_FUNCTIONAL_DESCRIPTOR,
USB_CDC_UNION_FUNCTIONAL_DESCRIPTOR = 0x06
USB_CDC_UNION_FUNCTIONAL_DESCRIPTOR = 0x06,
USB_CDC_ETHERNET_FUNCTIONAL_DESCRIPTOR = 0x0f
};
typedef struct usb_cdc_header_function_descriptor {
@@ -80,6 +81,16 @@ typedef struct usb_cdc_union_functional_descriptor {
uint8 slave_interfaces[1];
} _PACKED usb_cdc_union_functional_descriptor;
typedef struct usb_cdc_ethernet_functional_descriptor {
uint8 length;
uint8 descriptor_type;
uint8 descriptor_subtype; // USB_CDC_ETHERNET_FUNCTIONAL_DESCRIPTOR
uint8 mac_address_index;
uint32 ethernet_statistics;
uint16 max_segment_size;
uint16 num_multi_cast_filters;
uint8 num_wakeup_pattern_filters;
} _PACKED usb_cdc_ethernet_functional_descriptor;
enum { // Management Element Requests (p62)
USB_CDC_SEND_ENCAPSULATED_COMMAND = 0x00,