summaryrefslogtreecommitdiff
path: root/firmware/include
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2015-09-28 17:00:51 +0200
committerHarald Welte <laforge@gnumonks.org>2015-09-28 17:02:22 +0200
commit21391e0bdbe676ab766204eaa0eddd46e529c849 (patch)
treea47c5305e5363c4dff8d4dabdc82750dc877a64b /firmware/include
parent5a40e2fed18ed75c7b8d62f52cf4a7c660a8e026 (diff)
convert from u_int*_t to uint*_t
Diffstat (limited to 'firmware/include')
-rw-r--r--firmware/include/openpcd.h10
-rw-r--r--firmware/include/simtrace_usb.h24
-rw-r--r--firmware/include/usb_ch9.h250
-rw-r--r--firmware/include/usb_dfu.h20
-rw-r--r--firmware/include/usb_hid.h14
5 files changed, 159 insertions, 159 deletions
diff --git a/firmware/include/openpcd.h b/firmware/include/openpcd.h
index ea32764..1b3ba1c 100644
--- a/firmware/include/openpcd.h
+++ b/firmware/include/openpcd.h
@@ -6,12 +6,12 @@
#include <sys/types.h>
struct openpcd_hdr {
- u_int8_t cmd; /* command. high nibble: class,
+ uint8_t cmd; /* command. high nibble: class,
* low nibble: cmd */
- u_int8_t flags;
- u_int8_t reg; /* register */
- u_int8_t val; /* value (in case of write *) */
- u_int8_t data[0];
+ uint8_t flags;
+ uint8_t reg; /* register */
+ uint8_t val; /* value (in case of write *) */
+ uint8_t data[0];
} __attribute__ ((packed));
#define OPCD_REV_LEN 16
diff --git a/firmware/include/simtrace_usb.h b/firmware/include/simtrace_usb.h
index 08e4523..f76540e 100644
--- a/firmware/include/simtrace_usb.h
+++ b/firmware/include/simtrace_usb.h
@@ -5,10 +5,10 @@
/* this is kept compatible with OpenPCD protocol */
struct simtrace_hdr {
- u_int8_t cmd;
- u_int8_t flags;
- u_int8_t res[2];
- u_int8_t data[0];
+ uint8_t cmd;
+ uint8_t flags;
+ uint8_t res[2];
+ uint8_t data[0];
} __attribute__ ((packed));
enum simtrace_usb_msgt {
@@ -24,14 +24,14 @@ enum simtrace_usb_msgt {
#define SIMTRACE_FLAG_PPS_FIDI 0x08 /* Fi/Di values in res[2] */
struct simtrace_stats {
- u_int32_t no_rctx;
- u_int32_t rctx_sent;
- u_int32_t rst;
- u_int32_t pps;
- u_int32_t bytes;
- u_int32_t parity_err;
- u_int32_t frame_err;
- u_int32_t overrun;
+ uint32_t no_rctx;
+ uint32_t rctx_sent;
+ uint32_t rst;
+ uint32_t pps;
+ uint32_t bytes;
+ uint32_t parity_err;
+ uint32_t frame_err;
+ uint32_t overrun;
} stats;
#endif /* SIMTRACE_USB_H */
diff --git a/firmware/include/usb_ch9.h b/firmware/include/usb_ch9.h
index 46066f2..725c4a0 100644
--- a/firmware/include/usb_ch9.h
+++ b/firmware/include/usb_ch9.h
@@ -119,11 +119,11 @@
* such requests may be made at any time.
*/
struct usb_ctrlrequest {
- u_int8_t bRequestType;
- u_int8_t bRequest;
- u_int16_t wValue;
- u_int16_t wIndex;
- u_int16_t wLength;
+ uint8_t bRequestType;
+ uint8_t bRequest;
+ uint16_t wValue;
+ uint16_t wIndex;
+ uint16_t wLength;
} __attribute__ ((packed));
/*-------------------------------------------------------------------------*/
@@ -169,8 +169,8 @@ struct usb_ctrlrequest {
/* All standard descriptors have these 2 fields at the beginning */
struct usb_descriptor_header {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
} __attribute__ ((packed));
@@ -178,21 +178,21 @@ struct usb_descriptor_header {
/* USB_DT_DEVICE: Device descriptor */
struct usb_device_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
-
- u_int16_t bcdUSB;
- u_int8_t bDeviceClass;
- u_int8_t bDeviceSubClass;
- u_int8_t bDeviceProtocol;
- u_int8_t bMaxPacketSize0;
- u_int16_t idVendor;
- u_int16_t idProduct;
- u_int16_t bcdDevice;
- u_int8_t iManufacturer;
- u_int8_t iProduct;
- u_int8_t iSerialNumber;
- u_int8_t bNumConfigurations;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+
+ uint16_t bcdUSB;
+ uint8_t bDeviceClass;
+ uint8_t bDeviceSubClass;
+ uint8_t bDeviceProtocol;
+ uint8_t bMaxPacketSize0;
+ uint16_t idVendor;
+ uint16_t idProduct;
+ uint16_t bcdDevice;
+ uint8_t iManufacturer;
+ uint8_t iProduct;
+ uint8_t iSerialNumber;
+ uint8_t bNumConfigurations;
} __attribute__ ((packed));
#define USB_DT_DEVICE_SIZE 18
@@ -231,15 +231,15 @@ struct usb_device_descriptor {
* descriptors.
*/
struct usb_config_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
-
- u_int16_t wTotalLength;
- u_int8_t bNumInterfaces;
- u_int8_t bConfigurationValue;
- u_int8_t iConfiguration;
- u_int8_t bmAttributes;
- u_int8_t bMaxPower;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+
+ uint16_t wTotalLength;
+ uint8_t bNumInterfaces;
+ uint8_t bConfigurationValue;
+ uint8_t iConfiguration;
+ uint8_t bmAttributes;
+ uint8_t bMaxPower;
} __attribute__ ((packed));
#define USB_DT_CONFIG_SIZE 9
@@ -254,10 +254,10 @@ struct usb_config_descriptor {
/* USB_DT_STRING: String descriptor */
struct usb_string_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
- u_int16_t wData[0]; /* UTF-16LE encoded */
+ uint16_t wData[0]; /* UTF-16LE encoded */
} __attribute__ ((packed));
/* note that "string" zero is special, it holds language codes that
@@ -268,16 +268,16 @@ struct usb_string_descriptor {
/* USB_DT_INTERFACE: Interface descriptor */
struct usb_interface_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
-
- u_int8_t bInterfaceNumber;
- u_int8_t bAlternateSetting;
- u_int8_t bNumEndpoints;
- u_int8_t bInterfaceClass;
- u_int8_t bInterfaceSubClass;
- u_int8_t bInterfaceProtocol;
- u_int8_t iInterface;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+
+ uint8_t bInterfaceNumber;
+ uint8_t bAlternateSetting;
+ uint8_t bNumEndpoints;
+ uint8_t bInterfaceClass;
+ uint8_t bInterfaceSubClass;
+ uint8_t bInterfaceProtocol;
+ uint8_t iInterface;
} __attribute__ ((packed));
#define USB_DT_INTERFACE_SIZE 9
@@ -286,13 +286,13 @@ struct usb_interface_descriptor {
/* USB_DT_ENDPOINT: Endpoint descriptor */
struct usb_endpoint_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
- u_int8_t bEndpointAddress;
- u_int8_t bmAttributes;
- u_int16_t wMaxPacketSize;
- u_int8_t bInterval;
+ uint8_t bEndpointAddress;
+ uint8_t bmAttributes;
+ uint16_t wMaxPacketSize;
+ uint8_t bInterval;
} __attribute__ ((packed));
#define USB_DT_ENDPOINT_SIZE 7
@@ -317,16 +317,16 @@ struct usb_endpoint_descriptor {
/* USB_DT_DEVICE_QUALIFIER: Device Qualifier descriptor */
struct usb_qualifier_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
-
- u_int16_t bcdUSB;
- u_int8_t bDeviceClass;
- u_int8_t bDeviceSubClass;
- u_int8_t bDeviceProtocol;
- u_int8_t bMaxPacketSize0;
- u_int8_t bNumConfigurations;
- u_int8_t bRESERVED;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+
+ uint16_t bcdUSB;
+ uint8_t bDeviceClass;
+ uint8_t bDeviceSubClass;
+ uint8_t bDeviceProtocol;
+ uint8_t bMaxPacketSize0;
+ uint8_t bNumConfigurations;
+ uint8_t bRESERVED;
} __attribute__ ((packed));
@@ -334,10 +334,10 @@ struct usb_qualifier_descriptor {
/* USB_DT_OTG (from OTG 1.0a supplement) */
struct usb_otg_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
- u_int8_t bmAttributes; /* support for HNP, SRP, etc */
+ uint8_t bmAttributes; /* support for HNP, SRP, etc */
} __attribute__ ((packed));
/* from usb_otg_descriptor.bmAttributes */
@@ -348,27 +348,27 @@ struct usb_otg_descriptor {
/* USB_DT_DEBUG: for special highspeed devices, replacing serial console */
struct usb_debug_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
/* bulk endpoints with 8 byte maxpacket */
- u_int8_t bDebugInEndpoint;
- u_int8_t bDebugOutEndpoint;
+ uint8_t bDebugInEndpoint;
+ uint8_t bDebugOutEndpoint;
};
/*-------------------------------------------------------------------------*/
/* USB_DT_INTERFACE_ASSOCIATION: groups interfaces */
struct usb_interface_assoc_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
-
- u_int8_t bFirstInterface;
- u_int8_t bInterfaceCount;
- u_int8_t bFunctionClass;
- u_int8_t bFunctionSubClass;
- u_int8_t bFunctionProtocol;
- u_int8_t iFunction;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+
+ uint8_t bFirstInterface;
+ uint8_t bInterfaceCount;
+ uint8_t bFunctionClass;
+ uint8_t bFunctionSubClass;
+ uint8_t bFunctionProtocol;
+ uint8_t iFunction;
} __attribute__ ((packed));
@@ -378,11 +378,11 @@ struct usb_interface_assoc_descriptor {
* encryption types available for setting up a CC/association.
*/
struct usb_security_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
- u_int16_t wTotalLength;
- u_int8_t bNumEncryptionTypes;
+ uint16_t wTotalLength;
+ uint8_t bNumEncryptionTypes;
};
/*-------------------------------------------------------------------------*/
@@ -391,28 +391,28 @@ struct usb_security_descriptor {
* may be retrieved.
*/
struct usb_key_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
- u_int8_t tTKID[3];
- u_int8_t bReserved;
- u_int8_t bKeyData[0];
+ uint8_t tTKID[3];
+ uint8_t bReserved;
+ uint8_t bKeyData[0];
};
/*-------------------------------------------------------------------------*/
/* USB_DT_ENCRYPTION_TYPE: bundled in DT_SECURITY groups */
struct usb_encryption_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
- u_int8_t bEncryptionType;
+ uint8_t bEncryptionType;
#define USB_ENC_TYPE_UNSECURE 0
#define USB_ENC_TYPE_WIRED 1 /* non-wireless mode */
#define USB_ENC_TYPE_CCM_1 2 /* aes128/cbc session */
#define USB_ENC_TYPE_RSA_1 3 /* rsa3072/sha1 auth */
- u_int8_t bEncryptionValue; /* use in SET_ENCRYPTION */
- u_int8_t bAuthKeyIndex;
+ uint8_t bEncryptionValue; /* use in SET_ENCRYPTION */
+ uint8_t bAuthKeyIndex;
};
@@ -420,36 +420,36 @@ struct usb_encryption_descriptor {
/* USB_DT_BOS: group of wireless capabilities */
struct usb_bos_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
- u_int16_t wTotalLength;
- u_int8_t bNumDeviceCaps;
+ uint16_t wTotalLength;
+ uint8_t bNumDeviceCaps;
};
/*-------------------------------------------------------------------------*/
/* USB_DT_DEVICE_CAPABILITY: grouped with BOS */
struct usb_dev_cap_header {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int8_t bDevCapabilityType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint8_t bDevCapabilityType;
};
#define USB_CAP_TYPE_WIRELESS_USB 1
struct usb_wireless_cap_descriptor { /* Ultra Wide Band */
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int8_t bDevCapabilityType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint8_t bDevCapabilityType;
- u_int8_t bmAttributes;
+ uint8_t bmAttributes;
#define USB_WIRELESS_P2P_DRD (1 << 1)
#define USB_WIRELESS_BEACON_MASK (3 << 2)
#define USB_WIRELESS_BEACON_SELF (1 << 2)
#define USB_WIRELESS_BEACON_DIRECTED (2 << 2)
#define USB_WIRELESS_BEACON_NONE (3 << 2)
- u_int16_t wPHYRates; /* bit rates, Mbps */
+ uint16_t wPHYRates; /* bit rates, Mbps */
#define USB_WIRELESS_PHY_53 (1 << 0) /* always set */
#define USB_WIRELESS_PHY_80 (1 << 1)
#define USB_WIRELESS_PHY_107 (1 << 2) /* always set */
@@ -458,10 +458,10 @@ struct usb_wireless_cap_descriptor { /* Ultra Wide Band */
#define USB_WIRELESS_PHY_320 (1 << 5)
#define USB_WIRELESS_PHY_400 (1 << 6)
#define USB_WIRELESS_PHY_480 (1 << 7)
- u_int8_t bmTFITXPowerInfo; /* TFI power levels */
- u_int8_t bmFFITXPowerInfo; /* FFI power levels */
- u_int16_t bmBandGroup;
- u_int8_t bReserved;
+ uint8_t bmTFITXPowerInfo; /* TFI power levels */
+ uint8_t bmFFITXPowerInfo; /* FFI power levels */
+ uint16_t bmBandGroup;
+ uint8_t bReserved;
};
/*-------------------------------------------------------------------------*/
@@ -470,15 +470,15 @@ struct usb_wireless_cap_descriptor { /* Ultra Wide Band */
* each endpoint descriptor for a wireless device
*/
struct usb_wireless_ep_comp_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
-
- u_int8_t bMaxBurst;
- u_int8_t bMaxSequence;
- u_int16_t wMaxStreamDelay;
- u_int16_t wOverTheAirPacketSize;
- u_int8_t bOverTheAirInterval;
- u_int8_t bmCompAttributes;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+
+ uint8_t bMaxBurst;
+ uint8_t bMaxSequence;
+ uint16_t wMaxStreamDelay;
+ uint16_t wOverTheAirPacketSize;
+ uint8_t bOverTheAirInterval;
+ uint8_t bmCompAttributes;
#define USB_ENDPOINT_SWITCH_MASK 0x03 /* in bmCompAttributes */
#define USB_ENDPOINT_SWITCH_NO 0
#define USB_ENDPOINT_SWITCH_SWITCH 1
@@ -492,13 +492,13 @@ struct usb_wireless_ep_comp_descriptor {
* exchanging short lived session keys. The handshake depends on a CC.
*/
struct usb_handshake {
- u_int8_t bMessageNumber;
- u_int8_t bStatus;
- u_int8_t tTKID[3];
- u_int8_t bReserved;
- u_int8_t CDID[16];
- u_int8_t nonce[16];
- u_int8_t MIC[8];
+ uint8_t bMessageNumber;
+ uint8_t bStatus;
+ uint8_t tTKID[3];
+ uint8_t bReserved;
+ uint8_t CDID[16];
+ uint8_t nonce[16];
+ uint8_t MIC[8];
};
/*-------------------------------------------------------------------------*/
@@ -508,9 +508,9 @@ struct usb_handshake {
* wired USB!), and some devices may support CCs with multiple hosts.
*/
struct usb_connection_context {
- u_int8_t CHID[16]; /* persistent host id */
- u_int8_t CDID[16]; /* device id (unique w/in host context) */
- u_int8_t CK[16]; /* connection key */
+ uint8_t CHID[16]; /* persistent host id */
+ uint8_t CDID[16]; /* device id (unique w/in host context) */
+ uint8_t CK[16]; /* connection key */
};
/*-------------------------------------------------------------------------*/
diff --git a/firmware/include/usb_dfu.h b/firmware/include/usb_dfu.h
index 5000edc..14a19d2 100644
--- a/firmware/include/usb_dfu.h
+++ b/firmware/include/usb_dfu.h
@@ -15,16 +15,16 @@
#define USB_DT_DFU 0x21
struct usb_dfu_func_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int8_t bmAttributes;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint8_t bmAttributes;
#define USB_DFU_CAN_DOWNLOAD (1 << 0)
#define USB_DFU_CAN_UPLOAD (1 << 1)
#define USB_DFU_MANIFEST_TOL (1 << 2)
#define USB_DFU_WILL_DETACH (1 << 3)
- u_int16_t wDetachTimeOut;
- u_int16_t wTransferSize;
- u_int16_t bcdDFUVersion;
+ uint16_t wDetachTimeOut;
+ uint16_t wTransferSize;
+ uint16_t bcdDFUVersion;
} __attribute__ ((packed));
#define USB_DT_DFU_SIZE 9
@@ -41,10 +41,10 @@ struct usb_dfu_func_descriptor {
#define USB_REQ_DFU_ABORT 0x06
struct dfu_status {
- u_int8_t bStatus;
- u_int8_t bwPollTimeout[3];
- u_int8_t bState;
- u_int8_t iString;
+ uint8_t bStatus;
+ uint8_t bwPollTimeout[3];
+ uint8_t bState;
+ uint8_t iString;
} __attribute__((packed));
#define DFU_STATUS_OK 0x00
diff --git a/firmware/include/usb_hid.h b/firmware/include/usb_hid.h
index 49f5ab8..a1000c4 100644
--- a/firmware/include/usb_hid.h
+++ b/firmware/include/usb_hid.h
@@ -214,16 +214,16 @@
#define HID_FEATURE_REPORT 2
struct usb_hid_class_descriptor {
- u_int8_t bDescriptorType;
- u_int16_t wDescriptorLength;
+ uint8_t bDescriptorType;
+ uint16_t wDescriptorLength;
} __attribute__ ((packed));
struct usb_hid_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int16_t bcdHID;
- u_int8_t bCountryCode;
- u_int8_t bNumDescriptors;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint16_t bcdHID;
+ uint8_t bCountryCode;
+ uint8_t bNumDescriptors;
struct hid_class_descriptor desc[1];
} __attribute__ ((packed));
personal git repositories of Harald Welte. Your mileage may vary