changeset 2155:df4d007af7e8

* include/usb.h: changed position of __attribute__((packed)) to be compatible with more recent versions of GCC.
author asl
date Thu, 02 Mar 2006 18:40:08 +0000
parents 464189c3749b
children 1cde7dd73fff
files packages/io/usb/common/current/ChangeLog packages/io/usb/common/current/include/usb.h
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/packages/io/usb/common/current/ChangeLog
+++ b/packages/io/usb/common/current/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-23 Thomas Siegmund  <thomas.siegmund@hach-lange.de>
+
+	* include/usb.h: changed position of __attribute__((packed)) to be
+	 compatible with more recent versions of GCC.
+
 2001-01-25  Bart Veer  <bartv@redhat.com>
 
 	* cdl/usb.cdl:
--- a/packages/io/usb/common/current/include/usb.h
+++ b/packages/io/usb/common/current/include/usb.h
@@ -69,7 +69,7 @@ typedef struct usb_devreq {
     unsigned char       index_hi;
     unsigned char       length_lo;
     unsigned char       length_hi;
-} usb_devreq __attribute__((packed));
+} __attribute__((packed)) usb_devreq; 
 
 // Encoding of the request_type    
 #define USB_DEVREQ_DIRECTION_OUT        0
@@ -145,7 +145,7 @@ typedef struct usb_device_descriptor {
     unsigned char       product_str;
     unsigned char       serial_number_str;
     unsigned char       number_configurations;
-} usb_device_descriptor __attribute__((packed));
+} __attribute__((packed)) usb_device_descriptor;
 
 #define USB_DEVICE_DESCRIPTOR_LENGTH             18
 #define USB_DEVICE_DESCRIPTOR_TYPE               USB_DEVREQ_DESCRIPTOR_TYPE_DEVICE
@@ -169,7 +169,7 @@ typedef struct usb_configuration_descrip
     unsigned char       configuration_str;
     unsigned char       attributes;
     unsigned char       max_power;
-} usb_configuration_descriptor __attribute__((packed));
+} __attribute__((packed)) usb_configuration_descriptor;
 
 #define USB_CONFIGURATION_DESCRIPTOR_LENGTH     9
 #define USB_CONFIGURATION_DESCRIPTOR_TYPE       USB_DEVREQ_DESCRIPTOR_TYPE_CONFIGURATION
@@ -187,7 +187,7 @@ typedef struct usb_interface_descriptor 
     unsigned char       interface_subclass;
     unsigned char       interface_protocol;
     unsigned char       interface_str;
-} usb_interface_descriptor __attribute__((packed));        
+} __attribute__((packed)) usb_interface_descriptor;        
 
 #define USB_INTERFACE_DESCRIPTOR_LENGTH          9
 #define USB_INTERFACE_DESCRIPTOR_TYPE            USB_DEVREQ_DESCRIPTOR_TYPE_INTERFACE
@@ -203,7 +203,7 @@ typedef struct usb_endpoint_descriptor {
     unsigned char       max_packet_lo;
     unsigned char       max_packet_hi;
     unsigned char       interval;
-} usb_endpoint_descriptor;
+} __attribute__((packed)) usb_endpoint_descriptor;
 
 #define USB_ENDPOINT_DESCRIPTOR_LENGTH           7
 #define USB_ENDPOINT_DESCRIPTOR_TYPE             USB_DEVREQ_DESCRIPTOR_TYPE_ENDPOINT