Changeset bc792bb in rtems


Ignore:
Timestamp:
Oct 16, 2015, 6:26:44 AM (4 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/i386/pc386/include/edid.h

    rf97536d rbc792bb  
    8888    uint8_t VerticalBorder;
    8989    uint8_t Flags;
    90 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_detailed_timing_descriptor;
     90} RTEMS_PACKED EDID_detailed_timing_descriptor;
    9191
    9292EDID_INLINE_ROUTINE uint16_t DTD_horizontal_active (
     
    166166    uint8_t ColorPointWhite_y;
    167167    uint8_t ColorPointWhiteGamma;
    168 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_color_point_data;
     168} RTEMS_PACKED EDID_color_point_data;
    169169
    170170/* Basic Display Parameters */
     
    184184        Version 1.0, December 18, 1996 */
    185185    uint8_t GTFStandard[8];
    186 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_monitor_range_limits;
     186} RTEMS_PACKED EDID_monitor_range_limits;
    187187
    188188#define EDID_DTT_MonitorName                0xFC
     
    226226    uint8_t AspectRatio_AddressableLinesHigh;
    227227    uint8_t VerticalRate_PreferredVerticalRate;
    228 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_CVT_3_byte_code_descriptor;
     228} RTEMS_PACKED EDID_CVT_3_byte_code_descriptor;
    229229typedef struct {
    230230    uint8_t VersionNumber;
    231231    EDID_CVT_3_byte_code_descriptor cvt[4];
    232 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_CVT_timing_codes_3B;
     232} RTEMS_PACKED EDID_CVT_timing_codes_3B;
    233233
    234234EDID_INLINE_ROUTINE uint16_t edid1_CVT_addressable_lines_high (
     
    252252    uint8_t RevisionNumber;
    253253    uint8_t EST_III[12];
    254 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_established_timings_III;
     254} RTEMS_PACKED EDID_established_timings_III;
    255255enum EST_III {
    256256    EST_1152x864_75Hz   = 0,
     
    314314    uint8_t Flag2;
    315315    uint8_t DescriptorData[13];
    316 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_monitor_descriptor;
     316} RTEMS_PACKED EDID_monitor_descriptor;
    317317
    318318union EDID_DTD_MD {
    319319    EDID_detailed_timing_descriptor dtd;
    320320    EDID_monitor_descriptor md;
    321 } RTEMS_COMPILER_PACKED_ATTRIBUTE;
     321} RTEMS_PACKED;
    322322
    323323#define EDID1_STI_ImageAspectRatioOff           0
     
    334334    uint8_t HorizontalActivePixels;
    335335    uint8_t ImageAspectRatio_RefreshRate;
    336 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_standard_timing_identification;
     336} RTEMS_PACKED EDID_standard_timing_identification;
    337337
    338338/* Video Input Definition */
     
    447447    uint8_t ExtensionFlag;
    448448    uint8_t Checksum;
    449 } RTEMS_COMPILER_PACKED_ATTRIBUTE EDID_edid1;
     449} RTEMS_PACKED EDID_edid1;
    450450
    451451EDID_INLINE_ROUTINE uint16_t edid1_RedX (EDID_edid1 *edid) {
  • c/src/lib/libbsp/i386/pc386/include/vbe3.h

    rf97536d rbc792bb  
    180180        protected mode or from real mode. */
    181181    uint16_t selector;
    182 } RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_far_pointer;
     182} RTEMS_PACKED VBE_far_pointer;
    183183
    184184/**
     
    206206    /** Checksum byte for structure. Sum over all structure bytes gives 0. */
    207207    uint8_t   Checksum;
    208 } RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_protected_mode_info_block;
     208} RTEMS_PACKED VBE_protected_mode_info_block;
    209209
    210210/** General VBE signature */
     
    244244    /** Data Area for OEM Strings */
    245245    uint8_t   OemData[256];
    246 } RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_vbe_info_block;
     246} RTEMS_PACKED VBE_vbe_info_block;
    247247
    248248/**
     
    346346    /** remainder of VBE_mode_info_block */
    347347    uint8_t   Reserved3[189];
    348 } RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_mode_info_block;
     348} RTEMS_PACKED VBE_mode_info_block;
    349349
    350350/**
     
    372372    /** remainder of VBE_mode_info_block */
    373373    uint8_t   Reserved[40];
    374 } RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_CRTC_info_block;
     374} RTEMS_PACKED VBE_CRTC_info_block;
    375375
    376376/**
     
    386386    /** DWORD alignment byte (unused) */
    387387    uint8_t   Alignment;
    388 } RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_palette_entry;
     388} RTEMS_PACKED VBE_palette_entry;
    389389
    390390/**
     
    410410    /** Reserved for description strings and future expansion */
    411411    uint8_t   Reserved[221];
    412 } RTEMS_COMPILER_PACKED_ATTRIBUTE VBE_supplemental_vbe_info_block;
     412} RTEMS_PACKED VBE_supplemental_vbe_info_block;
    413413
    414414/* VBE_vbe_info_block Capabilities */
  • c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.c

    rf97536d rbc792bb  
    7171    uint16_t pm_code_selector;
    7272    /* if this struct is to be modified update offset definitions as well */
    73 } RTEMS_COMPILER_PACKED_ATTRIBUTE rm_int_regs_bkp_param;
     73} RTEMS_PACKED rm_int_regs_bkp_param;
    7474
    7575/* offsets to \a pm_bkp_and_param */
     
    114114    /** data segment for real mode */
    115115    uint16_t rm_data_segment;
    116 } RTEMS_COMPILER_PACKED_ATTRIBUTE pm_bkp_and_param;
     116} RTEMS_PACKED pm_bkp_and_param;
    117117
    118118/* addresses where we are going to put Interrupt buffer,
  • c/src/lib/libbsp/i386/shared/realmode_int/realmode_int.h

    rf97536d rbc792bb  
    5252    uint16_t reg_fs;
    5353    uint16_t reg_gs;
    54 } RTEMS_COMPILER_PACKED_ATTRIBUTE i386_realmode_interrupt_registers;
     54} RTEMS_PACKED i386_realmode_interrupt_registers;
    5555
    5656/**
  • c/src/lib/libcpu/i386/cpu.h

    rf97536d rbc792bb  
    261261  unsigned int granularity              : 1;
    262262  unsigned int base_address_31_24       : 8;
    263 } RTEMS_COMPILER_PACKED_ATTRIBUTE segment_descriptors;
     263} RTEMS_PACKED segment_descriptors;
    264264
    265265/*
  • cpukit/score/include/rtems/score/basedefs.h

    rf97536d rbc792bb  
    231231 */
    232232#if defined(__GNUC__)
    233   #define RTEMS_COMPILER_PACKED_ATTRIBUTE __attribute__((packed))
    234 #else
    235   #define RTEMS_COMPILER_PACKED_ATTRIBUTE
    236 #endif
     233  #define RTEMS_PACKED __attribute__((__packed__))
     234#else
     235  #define RTEMS_PACKED
     236#endif
     237
     238/* Provided for backward compatibility */
     239#define RTEMS_COMPILER_PACKED_ATTRIBUTE RTEMS_PACKED
    237240
    238241#if __cplusplus >= 201103L
Note: See TracChangeset for help on using the changeset viewer.