summaryrefslogtreecommitdiff
path: root/sys/dev/usb/usbcdc.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/usbcdc.h')
-rw-r--r--sys/dev/usb/usbcdc.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index a370d642cfe..35242e979c6 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbcdc.h,v 1.2 2000/03/28 19:37:51 aaron Exp $ */
+/* $OpenBSD: usbcdc.h,v 1.3 2000/07/04 11:44:25 fgsch Exp $ */
/* $NetBSD: usbcdc.h,v 1.5 1999/11/18 23:32:32 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.7 1999/11/17 22:33:48 n_hibma Exp $ */
@@ -7,7 +7,7 @@
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (augustss@carlstedt.se) at
+ * by Lennart Augustsson (lennart@augustsson.net) at
* Carlstedt Research & Technology.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ typedef struct {
uByte bDescriptorType;
uByte bDescriptorSubtype;
uWord bcdCDC;
-} usb_cdc_header_descriptor_t;
+} UPACKED usb_cdc_header_descriptor_t;
typedef struct {
uByte bLength;
@@ -68,7 +68,7 @@ typedef struct {
#define USB_CDC_CM_DOES_CM 0x01
#define USB_CDC_CM_OVER_DATA 0x02
uByte bDataInterface;
-} usb_cdc_cm_descriptor_t;
+} UPACKED usb_cdc_cm_descriptor_t;
typedef struct {
uByte bLength;
@@ -79,7 +79,7 @@ typedef struct {
#define USB_CDC_ACM_HAS_LINE 0x02
#define USB_CDC_ACM_HAS_BREAK 0x04
#define USB_CDC_ACM_HAS_NETWORK_CONN 0x08
-} usb_cdc_acm_descriptor_t;
+} UPACKED usb_cdc_acm_descriptor_t;
typedef struct {
uByte bLength;
@@ -87,7 +87,7 @@ typedef struct {
uByte bDescriptorSubtype;
uByte bMasterInterface;
uByte bSlaveInterface[1];
-} usb_cdc_union_descriptor_t;
+} UPACKED usb_cdc_union_descriptor_t;
#define UCDC_SEND_ENCAPSULATED_COMMAND 0x00
#define UCDC_GET_ENCAPSULATED_RESPONSE 0x01
@@ -109,7 +109,7 @@ typedef struct {
uWord wState;
#define UCDC_IDLE_SETTING 0x0001
#define UCDC_DATA_MULTIPLEXED 0x0002
-} usb_cdc_abstract_state_t;
+} UPACKED usb_cdc_abstract_state_t;
#define UCDC_ABSTRACT_STATE_LENGTH 2
typedef struct {
@@ -125,7 +125,7 @@ typedef struct {
#define UCDC_PARITY_MARK 3
#define UCDC_PARITY_SPACE 4
uByte bDataBits;
-} usb_cdc_line_state_t;
+} UPACKED usb_cdc_line_state_t;
#define UCDC_LINE_STATE_LENGTH 7
typedef struct {
@@ -144,7 +144,7 @@ typedef struct {
uWord wIndex;
uWord wLength;
uByte data[16];
-} usb_cdc_notification_t;
+} UPACKED usb_cdc_notification_t;
#define UCDC_NOTIFICATION_LENGTH 8
#endif /* _USBCDC_H_ */