Changeset bc792bb in rtems

Timestamp:

10/16/15 06:26:44 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

69be1a22

Parents:

f97536d

git-author:

Sebastian Huber <sebastian.huber@…> (10/16/15 06:26:44)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/26/15 08:13:19)

Message:

basdefs.h: Add and use RTEMS_PACKED

Files:

• c/src/lib/libbsp/i386/pc386/include/edid.h (modified) (8 diffs)
• c/src/lib/libbsp/i386/pc386/include/vbe3.h (modified) (7 diffs)
• c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.c (modified) (2 diffs)
• c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h (modified) (1 diff)
• c/src/lib/libcpu/i386/cpu.h (modified) (1 diff)
• cpukit/score/include/rtems/score/basedefs.h (modified) (1 diff)

c/src/lib/libbsp/i386/pc386/include/edid.h

@@ -88 +88 @@
     uint8_t VerticalBorder;
     uint8_t Flags;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_detailed_timing_descriptor;
+} RTEMS_PACKED EDID_detailed_timing_descriptor;
 
 EDID_INLINE_ROUTINE uint16_t DTD_horizontal_active (
@@ -166 +166 @@
     uint8_t ColorPointWhite_y;
     uint8_t ColorPointWhiteGamma;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_color_point_data;
+} RTEMS_PACKED EDID_color_point_data;
 
 /* Basic Display Parameters */
@@ -184 +184 @@
         Version 1.0, December 18, 1996 */
     uint8_t GTFStandard[8];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_monitor_range_limits;
+} RTEMS_PACKED EDID_monitor_range_limits;
 
 #define EDID_DTT_MonitorName                0xFC
@@ -226 +226 @@
     uint8_t AspectRatio_AddressableLinesHigh;
     uint8_t VerticalRate_PreferredVerticalRate;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_CVT_3_byte_code_descriptor;
+} RTEMS_PACKED EDID_CVT_3_byte_code_descriptor;
 typedef struct {
     uint8_t VersionNumber;
     EDID_CVT_3_byte_code_descriptor cvt[4];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_CVT_timing_codes_3B;
+} RTEMS_PACKED EDID_CVT_timing_codes_3B;
 
 EDID_INLINE_ROUTINE uint16_t edid1_CVT_addressable_lines_high (
@@ -252 +252 @@
     uint8_t RevisionNumber;
     uint8_t EST_III[12];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_established_timings_III;
+} RTEMS_PACKED EDID_established_timings_III;
 enum EST_III {
     EST_1152x864_75Hz   = 0,
@@ -314 +314 @@
     uint8_t Flag2;
     uint8_t DescriptorData[13];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_monitor_descriptor;
+} RTEMS_PACKED EDID_monitor_descriptor;
 
 union EDID_DTD_MD {
     EDID_detailed_timing_descriptor dtd;
     EDID_monitor_descriptor md;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE;
+} RTEMS_PACKED;
 
 #define EDID1_STI_ImageAspectRatioOff           0
@@ -334 +334 @@
     uint8_t HorizontalActivePixels;
     uint8_t ImageAspectRatio_RefreshRate;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_standard_timing_identification;
+} RTEMS_PACKED EDID_standard_timing_identification;
 
 /* Video Input Definition */
@@ -447 +447 @@
     uint8_t ExtensionFlag;
     uint8_t Checksum;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_edid1;
+} RTEMS_PACKED EDID_edid1;
 
 EDID_INLINE_ROUTINE uint16_t edid1_RedX (EDID_edid1 *edid) {

c/src/lib/libbsp/i386/pc386/include/vbe3.h

@@ -180 +180 @@
         protected mode or from real mode. */
     uint16_t selector;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_far_pointer;
+} RTEMS_PACKED VBE_far_pointer;
 
 /**
@@ -206 +206 @@
     /** Checksum byte for structure. Sum over all structure bytes gives 0. */
     uint8_t   Checksum;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_protected_mode_info_block;
+} RTEMS_PACKED VBE_protected_mode_info_block;
 
 /** General VBE signature */
@@ -244 +244 @@
     /** Data Area for OEM Strings */
     uint8_t   OemData[256];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_vbe_info_block;
+} RTEMS_PACKED VBE_vbe_info_block;
 
 /**
@@ -346 +346 @@
     /** remainder of VBE_mode_info_block */
     uint8_t   Reserved3[189];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_mode_info_block;
+} RTEMS_PACKED VBE_mode_info_block;
 
 /**
@@ -372 +372 @@
     /** remainder of VBE_mode_info_block */
     uint8_t   Reserved[40];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_CRTC_info_block;
+} RTEMS_PACKED VBE_CRTC_info_block;
 
 /**
@@ -386 +386 @@
     /** DWORD alignment byte (unused) */
     uint8_t   Alignment;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_palette_entry;
+} RTEMS_PACKED VBE_palette_entry;
 
 /**
@@ -410 +410 @@
     /** Reserved for description strings and future expansion */
     uint8_t   Reserved[221];
-} RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_supplemental_vbe_info_block;
+} RTEMS_PACKED VBE_supplemental_vbe_info_block;
 
 /* VBE_vbe_info_block Capabilities */

c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.c

@@ -71 +71 @@
     uint16_t pm_code_selector;
     /* if this struct is to be modified update offset definitions as well */
-} RTEMS_COMPILER_PACKED_ATTRIBUTE rm_int_regs_bkp_param;
+} RTEMS_PACKED rm_int_regs_bkp_param;
 
 /* offsets to \a pm_bkp_and_param */
@@ -114 +114 @@
     /** data segment for real mode */
     uint16_t rm_data_segment;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE pm_bkp_and_param;
+} RTEMS_PACKED pm_bkp_and_param;
 
 /* addresses where we are going to put Interrupt buffer,

c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h

@@ -52 +52 @@
     uint16_t reg_fs;
     uint16_t reg_gs;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE i386_realmode_interrupt_registers;
+} RTEMS_PACKED i386_realmode_interrupt_registers;
 
 /**

c/src/lib/libcpu/i386/cpu.h

@@ -261 +261 @@
   unsigned int granularity              : 1;
   unsigned int base_address_31_24       : 8;
-} RTEMS_COMPILER_PACKED_ATTRIBUTE segment_descriptors;
+} RTEMS_PACKED segment_descriptors;
 
 /*

cpukit/score/include/rtems/score/basedefs.h

@@ -231 +231 @@
  */
 #if defined(__GNUC__)
-  #define RTEMS_COMPILER_PACKED_ATTRIBUTE __attribute__((packed))
-#else
-  #define RTEMS_COMPILER_PACKED_ATTRIBUTE
-#endif
+  #define RTEMS_PACKED __attribute__((__packed__))
+#else
+  #define RTEMS_PACKED
+#endif
+
+/* Provided for backward compatibility */
+#define RTEMS_COMPILER_PACKED_ATTRIBUTE RTEMS_PACKED
 
 #if __cplusplus >= 201103L