|
@@ -52,7 +52,7 @@
|
|
|
#define RNDIS_PRODUCT_NUM 0xa4a2 /* Ethernet/RNDIS Gadget */
|
|
|
|
|
|
enum usbstring_idx {
|
|
|
- STRING_MANUFACTURER = 1,
|
|
|
+ STRING_MANUFACTURER = 1,
|
|
|
STRING_PRODUCT,
|
|
|
STRING_ETHADDR,
|
|
|
STRING_DATA,
|
|
@@ -64,39 +64,39 @@ enum usbstring_idx {
|
|
|
STRING_SERIALNUMBER,
|
|
|
};
|
|
|
|
|
|
-#define DEV_CONFIG_VALUE 1 /* CDC or a subset */
|
|
|
-#define DEV_RNDIS_CONFIG_VALUE 2 /* RNDIS; optional */
|
|
|
+#define DEV_CONFIG_VALUE 1 /* CDC or a subset */
|
|
|
+#define DEV_RNDIS_CONFIG_VALUE 2 /* RNDIS; optional */
|
|
|
|
|
|
-#define USB_CDC_SUBCLASS_ACM 0x02
|
|
|
-#define USB_CDC_SUBCLASS_ETHERNET 0x06
|
|
|
+#define USB_CDC_SUBCLASS_ACM 0x02
|
|
|
+#define USB_CDC_SUBCLASS_ETHERNET 0x06
|
|
|
|
|
|
-#define USB_CDC_PROTO_NONE 0
|
|
|
-#define USB_CDC_ACM_PROTO_VENDOR 0xff
|
|
|
+#define USB_CDC_PROTO_NONE 0
|
|
|
+#define USB_CDC_ACM_PROTO_VENDOR 0xff
|
|
|
|
|
|
-#define USB_CDC_HEADER_TYPE 0x00 /* header_desc */
|
|
|
-#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01 /* call_mgmt_descriptor */
|
|
|
-#define USB_CDC_ACM_TYPE 0x02 /* acm_descriptor */
|
|
|
-#define USB_CDC_UNION_TYPE 0x06 /* union_desc */
|
|
|
-#define USB_CDC_ETHERNET_TYPE 0x0f /* ether_desc */
|
|
|
+#define USB_CDC_HEADER_TYPE 0x00 /* header_desc */
|
|
|
+#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01 /* call_mgmt_descriptor */
|
|
|
+#define USB_CDC_ACM_TYPE 0x02 /* acm_descriptor */
|
|
|
+#define USB_CDC_UNION_TYPE 0x06 /* union_desc */
|
|
|
+#define USB_CDC_ETHERNET_TYPE 0x0f /* ether_desc */
|
|
|
|
|
|
-#define USB_CDC_SEND_ENCAPSULATED_COMMAND 0x00
|
|
|
-#define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01
|
|
|
-#define USB_CDC_REQ_SET_LINE_CODING 0x20
|
|
|
-#define USB_CDC_REQ_GET_LINE_CODING 0x21
|
|
|
-#define USB_CDC_REQ_SET_CONTROL_LINE_STATE 0x22
|
|
|
-#define USB_CDC_REQ_SEND_BREAK 0x23
|
|
|
-#define USB_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40
|
|
|
-#define USB_CDC_SET_ETHERNET_PM_PATTERN_FILTER 0x41
|
|
|
-#define USB_CDC_GET_ETHERNET_PM_PATTERN_FILTER 0x42
|
|
|
-#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43
|
|
|
-#define USB_CDC_GET_ETHERNET_STATISTIC 0x44
|
|
|
+#define USB_CDC_SEND_ENCAPSULATED_COMMAND 0x00
|
|
|
+#define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01
|
|
|
+#define USB_CDC_REQ_SET_LINE_CODING 0x20
|
|
|
+#define USB_CDC_REQ_GET_LINE_CODING 0x21
|
|
|
+#define USB_CDC_REQ_SET_CONTROL_LINE_STATE 0x22
|
|
|
+#define USB_CDC_REQ_SEND_BREAK 0x23
|
|
|
+#define USB_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40
|
|
|
+#define USB_CDC_SET_ETHERNET_PM_PATTERN_FILTER 0x41
|
|
|
+#define USB_CDC_GET_ETHERNET_PM_PATTERN_FILTER 0x42
|
|
|
+#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43
|
|
|
+#define USB_CDC_GET_ETHERNET_STATISTIC 0x44
|
|
|
|
|
|
-#define USB_CDC_NETWORK_CONNECTION 0x00
|
|
|
+#define USB_CDC_NETWORK_CONNECTION 0x00
|
|
|
|
|
|
-#define LOG2_STATUS_INTERVAL_MSEC 5 /* 1 << 5 == 32 msec */
|
|
|
-#define STATUS_BYTECOUNT 16 /* 8 byte header + data */
|
|
|
+#define LOG2_STATUS_INTERVAL_MSEC 5 /* 1 << 5 == 32 msec */
|
|
|
+#define STATUS_BYTECOUNT 16 /* 8 byte header + data */
|
|
|
|
|
|
-#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */
|
|
|
+#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */
|
|
|
|
|
|
static const USBDescStrings usb_net_stringtable = {
|
|
|
[STRING_MANUFACTURER] = "QEMU",
|
|
@@ -306,57 +306,57 @@ static const USBDesc desc_net = {
|
|
|
/*
|
|
|
* RNDIS Definitions - in theory not specific to USB.
|
|
|
*/
|
|
|
-#define RNDIS_MAXIMUM_FRAME_SIZE 1518
|
|
|
-#define RNDIS_MAX_TOTAL_SIZE 1558
|
|
|
+#define RNDIS_MAXIMUM_FRAME_SIZE 1518
|
|
|
+#define RNDIS_MAX_TOTAL_SIZE 1558
|
|
|
|
|
|
/* Remote NDIS Versions */
|
|
|
-#define RNDIS_MAJOR_VERSION 1
|
|
|
-#define RNDIS_MINOR_VERSION 0
|
|
|
+#define RNDIS_MAJOR_VERSION 1
|
|
|
+#define RNDIS_MINOR_VERSION 0
|
|
|
|
|
|
/* Status Values */
|
|
|
-#define RNDIS_STATUS_SUCCESS 0x00000000U /* Success */
|
|
|
-#define RNDIS_STATUS_FAILURE 0xc0000001U /* Unspecified error */
|
|
|
-#define RNDIS_STATUS_INVALID_DATA 0xc0010015U /* Invalid data */
|
|
|
-#define RNDIS_STATUS_NOT_SUPPORTED 0xc00000bbU /* Unsupported request */
|
|
|
-#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000bU /* Device connected */
|
|
|
-#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000cU /* Device disconnected */
|
|
|
+#define RNDIS_STATUS_SUCCESS 0x00000000U /* Success */
|
|
|
+#define RNDIS_STATUS_FAILURE 0xc0000001U /* Unspecified error */
|
|
|
+#define RNDIS_STATUS_INVALID_DATA 0xc0010015U /* Invalid data */
|
|
|
+#define RNDIS_STATUS_NOT_SUPPORTED 0xc00000bbU /* Unsupported request */
|
|
|
+#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000bU /* Device connected */
|
|
|
+#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000cU /* Device disconnected */
|
|
|
|
|
|
/* Message Set for Connectionless (802.3) Devices */
|
|
|
enum {
|
|
|
- RNDIS_PACKET_MSG = 1,
|
|
|
- RNDIS_INITIALIZE_MSG = 2, /* Initialize device */
|
|
|
- RNDIS_HALT_MSG = 3,
|
|
|
- RNDIS_QUERY_MSG = 4,
|
|
|
- RNDIS_SET_MSG = 5,
|
|
|
- RNDIS_RESET_MSG = 6,
|
|
|
- RNDIS_INDICATE_STATUS_MSG = 7,
|
|
|
- RNDIS_KEEPALIVE_MSG = 8,
|
|
|
+ RNDIS_PACKET_MSG = 1,
|
|
|
+ RNDIS_INITIALIZE_MSG = 2, /* Initialize device */
|
|
|
+ RNDIS_HALT_MSG = 3,
|
|
|
+ RNDIS_QUERY_MSG = 4,
|
|
|
+ RNDIS_SET_MSG = 5,
|
|
|
+ RNDIS_RESET_MSG = 6,
|
|
|
+ RNDIS_INDICATE_STATUS_MSG = 7,
|
|
|
+ RNDIS_KEEPALIVE_MSG = 8,
|
|
|
};
|
|
|
|
|
|
/* Message completion */
|
|
|
enum {
|
|
|
- RNDIS_INITIALIZE_CMPLT = 0x80000002U,
|
|
|
- RNDIS_QUERY_CMPLT = 0x80000004U,
|
|
|
- RNDIS_SET_CMPLT = 0x80000005U,
|
|
|
- RNDIS_RESET_CMPLT = 0x80000006U,
|
|
|
- RNDIS_KEEPALIVE_CMPLT = 0x80000008U,
|
|
|
+ RNDIS_INITIALIZE_CMPLT = 0x80000002U,
|
|
|
+ RNDIS_QUERY_CMPLT = 0x80000004U,
|
|
|
+ RNDIS_SET_CMPLT = 0x80000005U,
|
|
|
+ RNDIS_RESET_CMPLT = 0x80000006U,
|
|
|
+ RNDIS_KEEPALIVE_CMPLT = 0x80000008U,
|
|
|
};
|
|
|
|
|
|
/* Device Flags */
|
|
|
enum {
|
|
|
- RNDIS_DF_CONNECTIONLESS = 1,
|
|
|
- RNDIS_DF_CONNECTIONORIENTED = 2,
|
|
|
+ RNDIS_DF_CONNECTIONLESS = 1,
|
|
|
+ RNDIS_DF_CONNECTIONORIENTED = 2,
|
|
|
};
|
|
|
|
|
|
-#define RNDIS_MEDIUM_802_3 0x00000000U
|
|
|
+#define RNDIS_MEDIUM_802_3 0x00000000U
|
|
|
|
|
|
/* from drivers/net/sk98lin/h/skgepnmi.h */
|
|
|
-#define OID_PNP_CAPABILITIES 0xfd010100
|
|
|
-#define OID_PNP_SET_POWER 0xfd010101
|
|
|
-#define OID_PNP_QUERY_POWER 0xfd010102
|
|
|
-#define OID_PNP_ADD_WAKE_UP_PATTERN 0xfd010103
|
|
|
-#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xfd010104
|
|
|
-#define OID_PNP_ENABLE_WAKE_UP 0xfd010106
|
|
|
+#define OID_PNP_CAPABILITIES 0xfd010100
|
|
|
+#define OID_PNP_SET_POWER 0xfd010101
|
|
|
+#define OID_PNP_QUERY_POWER 0xfd010102
|
|
|
+#define OID_PNP_ADD_WAKE_UP_PATTERN 0xfd010103
|
|
|
+#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xfd010104
|
|
|
+#define OID_PNP_ENABLE_WAKE_UP 0xfd010106
|
|
|
|
|
|
typedef uint32_t le32;
|
|
|
|
|
@@ -494,88 +494,88 @@ enum rndis_state
|
|
|
/* from ndis.h */
|
|
|
enum ndis_oid {
|
|
|
/* Required Object IDs (OIDs) */
|
|
|
- OID_GEN_SUPPORTED_LIST = 0x00010101,
|
|
|
- OID_GEN_HARDWARE_STATUS = 0x00010102,
|
|
|
- OID_GEN_MEDIA_SUPPORTED = 0x00010103,
|
|
|
- OID_GEN_MEDIA_IN_USE = 0x00010104,
|
|
|
- OID_GEN_MAXIMUM_LOOKAHEAD = 0x00010105,
|
|
|
- OID_GEN_MAXIMUM_FRAME_SIZE = 0x00010106,
|
|
|
- OID_GEN_LINK_SPEED = 0x00010107,
|
|
|
- OID_GEN_TRANSMIT_BUFFER_SPACE = 0x00010108,
|
|
|
- OID_GEN_RECEIVE_BUFFER_SPACE = 0x00010109,
|
|
|
- OID_GEN_TRANSMIT_BLOCK_SIZE = 0x0001010a,
|
|
|
- OID_GEN_RECEIVE_BLOCK_SIZE = 0x0001010b,
|
|
|
- OID_GEN_VENDOR_ID = 0x0001010c,
|
|
|
- OID_GEN_VENDOR_DESCRIPTION = 0x0001010d,
|
|
|
- OID_GEN_CURRENT_PACKET_FILTER = 0x0001010e,
|
|
|
- OID_GEN_CURRENT_LOOKAHEAD = 0x0001010f,
|
|
|
- OID_GEN_DRIVER_VERSION = 0x00010110,
|
|
|
- OID_GEN_MAXIMUM_TOTAL_SIZE = 0x00010111,
|
|
|
- OID_GEN_PROTOCOL_OPTIONS = 0x00010112,
|
|
|
- OID_GEN_MAC_OPTIONS = 0x00010113,
|
|
|
- OID_GEN_MEDIA_CONNECT_STATUS = 0x00010114,
|
|
|
- OID_GEN_MAXIMUM_SEND_PACKETS = 0x00010115,
|
|
|
- OID_GEN_VENDOR_DRIVER_VERSION = 0x00010116,
|
|
|
- OID_GEN_SUPPORTED_GUIDS = 0x00010117,
|
|
|
- OID_GEN_NETWORK_LAYER_ADDRESSES = 0x00010118,
|
|
|
- OID_GEN_TRANSPORT_HEADER_OFFSET = 0x00010119,
|
|
|
- OID_GEN_MACHINE_NAME = 0x0001021a,
|
|
|
- OID_GEN_RNDIS_CONFIG_PARAMETER = 0x0001021b,
|
|
|
- OID_GEN_VLAN_ID = 0x0001021c,
|
|
|
+ OID_GEN_SUPPORTED_LIST = 0x00010101,
|
|
|
+ OID_GEN_HARDWARE_STATUS = 0x00010102,
|
|
|
+ OID_GEN_MEDIA_SUPPORTED = 0x00010103,
|
|
|
+ OID_GEN_MEDIA_IN_USE = 0x00010104,
|
|
|
+ OID_GEN_MAXIMUM_LOOKAHEAD = 0x00010105,
|
|
|
+ OID_GEN_MAXIMUM_FRAME_SIZE = 0x00010106,
|
|
|
+ OID_GEN_LINK_SPEED = 0x00010107,
|
|
|
+ OID_GEN_TRANSMIT_BUFFER_SPACE = 0x00010108,
|
|
|
+ OID_GEN_RECEIVE_BUFFER_SPACE = 0x00010109,
|
|
|
+ OID_GEN_TRANSMIT_BLOCK_SIZE = 0x0001010a,
|
|
|
+ OID_GEN_RECEIVE_BLOCK_SIZE = 0x0001010b,
|
|
|
+ OID_GEN_VENDOR_ID = 0x0001010c,
|
|
|
+ OID_GEN_VENDOR_DESCRIPTION = 0x0001010d,
|
|
|
+ OID_GEN_CURRENT_PACKET_FILTER = 0x0001010e,
|
|
|
+ OID_GEN_CURRENT_LOOKAHEAD = 0x0001010f,
|
|
|
+ OID_GEN_DRIVER_VERSION = 0x00010110,
|
|
|
+ OID_GEN_MAXIMUM_TOTAL_SIZE = 0x00010111,
|
|
|
+ OID_GEN_PROTOCOL_OPTIONS = 0x00010112,
|
|
|
+ OID_GEN_MAC_OPTIONS = 0x00010113,
|
|
|
+ OID_GEN_MEDIA_CONNECT_STATUS = 0x00010114,
|
|
|
+ OID_GEN_MAXIMUM_SEND_PACKETS = 0x00010115,
|
|
|
+ OID_GEN_VENDOR_DRIVER_VERSION = 0x00010116,
|
|
|
+ OID_GEN_SUPPORTED_GUIDS = 0x00010117,
|
|
|
+ OID_GEN_NETWORK_LAYER_ADDRESSES = 0x00010118,
|
|
|
+ OID_GEN_TRANSPORT_HEADER_OFFSET = 0x00010119,
|
|
|
+ OID_GEN_MACHINE_NAME = 0x0001021a,
|
|
|
+ OID_GEN_RNDIS_CONFIG_PARAMETER = 0x0001021b,
|
|
|
+ OID_GEN_VLAN_ID = 0x0001021c,
|
|
|
|
|
|
/* Optional OIDs */
|
|
|
- OID_GEN_MEDIA_CAPABILITIES = 0x00010201,
|
|
|
- OID_GEN_PHYSICAL_MEDIUM = 0x00010202,
|
|
|
+ OID_GEN_MEDIA_CAPABILITIES = 0x00010201,
|
|
|
+ OID_GEN_PHYSICAL_MEDIUM = 0x00010202,
|
|
|
|
|
|
/* Required statistics OIDs */
|
|
|
- OID_GEN_XMIT_OK = 0x00020101,
|
|
|
- OID_GEN_RCV_OK = 0x00020102,
|
|
|
- OID_GEN_XMIT_ERROR = 0x00020103,
|
|
|
- OID_GEN_RCV_ERROR = 0x00020104,
|
|
|
- OID_GEN_RCV_NO_BUFFER = 0x00020105,
|
|
|
+ OID_GEN_XMIT_OK = 0x00020101,
|
|
|
+ OID_GEN_RCV_OK = 0x00020102,
|
|
|
+ OID_GEN_XMIT_ERROR = 0x00020103,
|
|
|
+ OID_GEN_RCV_ERROR = 0x00020104,
|
|
|
+ OID_GEN_RCV_NO_BUFFER = 0x00020105,
|
|
|
|
|
|
/* Optional statistics OIDs */
|
|
|
- OID_GEN_DIRECTED_BYTES_XMIT = 0x00020201,
|
|
|
- OID_GEN_DIRECTED_FRAMES_XMIT = 0x00020202,
|
|
|
- OID_GEN_MULTICAST_BYTES_XMIT = 0x00020203,
|
|
|
- OID_GEN_MULTICAST_FRAMES_XMIT = 0x00020204,
|
|
|
- OID_GEN_BROADCAST_BYTES_XMIT = 0x00020205,
|
|
|
- OID_GEN_BROADCAST_FRAMES_XMIT = 0x00020206,
|
|
|
- OID_GEN_DIRECTED_BYTES_RCV = 0x00020207,
|
|
|
- OID_GEN_DIRECTED_FRAMES_RCV = 0x00020208,
|
|
|
- OID_GEN_MULTICAST_BYTES_RCV = 0x00020209,
|
|
|
- OID_GEN_MULTICAST_FRAMES_RCV = 0x0002020a,
|
|
|
- OID_GEN_BROADCAST_BYTES_RCV = 0x0002020b,
|
|
|
- OID_GEN_BROADCAST_FRAMES_RCV = 0x0002020c,
|
|
|
- OID_GEN_RCV_CRC_ERROR = 0x0002020d,
|
|
|
- OID_GEN_TRANSMIT_QUEUE_LENGTH = 0x0002020e,
|
|
|
- OID_GEN_GET_TIME_CAPS = 0x0002020f,
|
|
|
- OID_GEN_GET_NETCARD_TIME = 0x00020210,
|
|
|
- OID_GEN_NETCARD_LOAD = 0x00020211,
|
|
|
- OID_GEN_DEVICE_PROFILE = 0x00020212,
|
|
|
- OID_GEN_INIT_TIME_MS = 0x00020213,
|
|
|
- OID_GEN_RESET_COUNTS = 0x00020214,
|
|
|
- OID_GEN_MEDIA_SENSE_COUNTS = 0x00020215,
|
|
|
- OID_GEN_FRIENDLY_NAME = 0x00020216,
|
|
|
- OID_GEN_MINIPORT_INFO = 0x00020217,
|
|
|
- OID_GEN_RESET_VERIFY_PARAMETERS = 0x00020218,
|
|
|
+ OID_GEN_DIRECTED_BYTES_XMIT = 0x00020201,
|
|
|
+ OID_GEN_DIRECTED_FRAMES_XMIT = 0x00020202,
|
|
|
+ OID_GEN_MULTICAST_BYTES_XMIT = 0x00020203,
|
|
|
+ OID_GEN_MULTICAST_FRAMES_XMIT = 0x00020204,
|
|
|
+ OID_GEN_BROADCAST_BYTES_XMIT = 0x00020205,
|
|
|
+ OID_GEN_BROADCAST_FRAMES_XMIT = 0x00020206,
|
|
|
+ OID_GEN_DIRECTED_BYTES_RCV = 0x00020207,
|
|
|
+ OID_GEN_DIRECTED_FRAMES_RCV = 0x00020208,
|
|
|
+ OID_GEN_MULTICAST_BYTES_RCV = 0x00020209,
|
|
|
+ OID_GEN_MULTICAST_FRAMES_RCV = 0x0002020a,
|
|
|
+ OID_GEN_BROADCAST_BYTES_RCV = 0x0002020b,
|
|
|
+ OID_GEN_BROADCAST_FRAMES_RCV = 0x0002020c,
|
|
|
+ OID_GEN_RCV_CRC_ERROR = 0x0002020d,
|
|
|
+ OID_GEN_TRANSMIT_QUEUE_LENGTH = 0x0002020e,
|
|
|
+ OID_GEN_GET_TIME_CAPS = 0x0002020f,
|
|
|
+ OID_GEN_GET_NETCARD_TIME = 0x00020210,
|
|
|
+ OID_GEN_NETCARD_LOAD = 0x00020211,
|
|
|
+ OID_GEN_DEVICE_PROFILE = 0x00020212,
|
|
|
+ OID_GEN_INIT_TIME_MS = 0x00020213,
|
|
|
+ OID_GEN_RESET_COUNTS = 0x00020214,
|
|
|
+ OID_GEN_MEDIA_SENSE_COUNTS = 0x00020215,
|
|
|
+ OID_GEN_FRIENDLY_NAME = 0x00020216,
|
|
|
+ OID_GEN_MINIPORT_INFO = 0x00020217,
|
|
|
+ OID_GEN_RESET_VERIFY_PARAMETERS = 0x00020218,
|
|
|
|
|
|
/* IEEE 802.3 (Ethernet) OIDs */
|
|
|
- OID_802_3_PERMANENT_ADDRESS = 0x01010101,
|
|
|
- OID_802_3_CURRENT_ADDRESS = 0x01010102,
|
|
|
- OID_802_3_MULTICAST_LIST = 0x01010103,
|
|
|
- OID_802_3_MAXIMUM_LIST_SIZE = 0x01010104,
|
|
|
- OID_802_3_MAC_OPTIONS = 0x01010105,
|
|
|
- OID_802_3_RCV_ERROR_ALIGNMENT = 0x01020101,
|
|
|
- OID_802_3_XMIT_ONE_COLLISION = 0x01020102,
|
|
|
- OID_802_3_XMIT_MORE_COLLISIONS = 0x01020103,
|
|
|
- OID_802_3_XMIT_DEFERRED = 0x01020201,
|
|
|
- OID_802_3_XMIT_MAX_COLLISIONS = 0x01020202,
|
|
|
- OID_802_3_RCV_OVERRUN = 0x01020203,
|
|
|
- OID_802_3_XMIT_UNDERRUN = 0x01020204,
|
|
|
- OID_802_3_XMIT_HEARTBEAT_FAILURE = 0x01020205,
|
|
|
- OID_802_3_XMIT_TIMES_CRS_LOST = 0x01020206,
|
|
|
- OID_802_3_XMIT_LATE_COLLISIONS = 0x01020207,
|
|
|
+ OID_802_3_PERMANENT_ADDRESS = 0x01010101,
|
|
|
+ OID_802_3_CURRENT_ADDRESS = 0x01010102,
|
|
|
+ OID_802_3_MULTICAST_LIST = 0x01010103,
|
|
|
+ OID_802_3_MAXIMUM_LIST_SIZE = 0x01010104,
|
|
|
+ OID_802_3_MAC_OPTIONS = 0x01010105,
|
|
|
+ OID_802_3_RCV_ERROR_ALIGNMENT = 0x01020101,
|
|
|
+ OID_802_3_XMIT_ONE_COLLISION = 0x01020102,
|
|
|
+ OID_802_3_XMIT_MORE_COLLISIONS = 0x01020103,
|
|
|
+ OID_802_3_XMIT_DEFERRED = 0x01020201,
|
|
|
+ OID_802_3_XMIT_MAX_COLLISIONS = 0x01020202,
|
|
|
+ OID_802_3_RCV_OVERRUN = 0x01020203,
|
|
|
+ OID_802_3_XMIT_UNDERRUN = 0x01020204,
|
|
|
+ OID_802_3_XMIT_HEARTBEAT_FAILURE = 0x01020205,
|
|
|
+ OID_802_3_XMIT_TIMES_CRS_LOST = 0x01020206,
|
|
|
+ OID_802_3_XMIT_LATE_COLLISIONS = 0x01020207,
|
|
|
};
|
|
|
|
|
|
static const uint32_t oid_supported_list[] =
|
|
@@ -618,13 +618,13 @@ static const uint32_t oid_supported_list[] =
|
|
|
OID_802_3_XMIT_MORE_COLLISIONS,
|
|
|
};
|
|
|
|
|
|
-#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA (1 << 0)
|
|
|
-#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED (1 << 1)
|
|
|
-#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND (1 << 2)
|
|
|
-#define NDIS_MAC_OPTION_NO_LOOPBACK (1 << 3)
|
|
|
-#define NDIS_MAC_OPTION_FULL_DUPLEX (1 << 4)
|
|
|
-#define NDIS_MAC_OPTION_EOTX_INDICATION (1 << 5)
|
|
|
-#define NDIS_MAC_OPTION_8021P_PRIORITY (1 << 6)
|
|
|
+#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA (1 << 0)
|
|
|
+#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED (1 << 1)
|
|
|
+#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND (1 << 2)
|
|
|
+#define NDIS_MAC_OPTION_NO_LOOPBACK (1 << 3)
|
|
|
+#define NDIS_MAC_OPTION_FULL_DUPLEX (1 << 4)
|
|
|
+#define NDIS_MAC_OPTION_EOTX_INDICATION (1 << 5)
|
|
|
+#define NDIS_MAC_OPTION_8021P_PRIORITY (1 << 6)
|
|
|
|
|
|
struct rndis_response {
|
|
|
QTAILQ_ENTRY(rndis_response) entries;
|
|
@@ -1375,12 +1375,12 @@ static void usb_net_realize(USBDevice *dev, Error **errp)
|
|
|
s->rndis_state = RNDIS_UNINITIALIZED;
|
|
|
QTAILQ_INIT(&s->rndis_resp);
|
|
|
|
|
|
- s->medium = 0; /* NDIS_MEDIUM_802_3 */
|
|
|
+ s->medium = 0; /* NDIS_MEDIUM_802_3 */
|
|
|
s->speed = 1000000; /* 100MBps, in 100Bps units */
|
|
|
- s->media_state = 0; /* NDIS_MEDIA_STATE_CONNECTED */;
|
|
|
+ s->media_state = 0; /* NDIS_MEDIA_STATE_CONNECTED */;
|
|
|
s->filter = 0;
|
|
|
s->vendorid = 0x1234;
|
|
|
- s->connection = 1; /* Connected */
|
|
|
+ s->connection = 1; /* Connected */
|
|
|
s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
|
|
|
s->bulk_in = usb_ep_get(dev, USB_TOKEN_IN, 2);
|
|
|
|