summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/alpha/include/pc/vesa.h20
-rw-r--r--sys/amd64/amd64/bios.c2
-rw-r--r--sys/amd64/include/pc/bios.h12
-rw-r--r--sys/boot/i386/libi386/biosmem.c2
-rw-r--r--sys/boot/i386/libi386/biospnp.c46
-rw-r--r--sys/boot/i386/libi386/pxe.h4
-rw-r--r--sys/boot/pc98/libpc98/biosmem.c2
-rw-r--r--sys/cam/scsi/scsi_low.h4
-rw-r--r--sys/dev/aac/aacreg.h82
-rw-r--r--sys/dev/amr/amrreg.h24
-rw-r--r--sys/dev/an/if_aironet_ieee.h2
-rw-r--r--sys/dev/an/if_anreg.h2
-rw-r--r--sys/dev/ata/ata-raid.h10
-rw-r--r--sys/dev/ata/atapi-all.h4
-rw-r--r--sys/dev/ata/atapi-cd.h2
-rw-r--r--sys/dev/ciss/cissreg.h56
-rw-r--r--sys/dev/fb/splash_bmp.c48
-rw-r--r--sys/dev/ida/idareg.h6
-rw-r--r--sys/dev/mlx/mlxreg.h32
-rw-r--r--sys/dev/mly/mlyreg.h86
-rw-r--r--sys/dev/pst/pst-iop.h50
-rw-r--r--sys/dev/twe/twereg.h28
-rw-r--r--sys/fs/udf/ecma167-udf.h48
-rw-r--r--sys/i386/bios/mca_machdep.c2
-rw-r--r--sys/i386/i386/bios.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_xenix.c2
-rw-r--r--sys/i386/include/pc/bios.h12
-rw-r--r--sys/i386/include/pc/vesa.h20
-rw-r--r--sys/i386/isa/mca_machdep.c2
-rw-r--r--sys/ia64/include/pc/vesa.h20
-rw-r--r--sys/modules/splash/bmp/splash_bmp.c48
-rw-r--r--sys/netgraph/ng_pppoe.c4
-rw-r--r--sys/netgraph/ng_pppoe.h6
-rw-r--r--sys/netncp/ncp.h20
-rw-r--r--sys/netncp/ncp_file.h2
-rw-r--r--sys/netncp/ncp_ncp.h6
-rw-r--r--sys/pc98/pc98/wd_cd.h2
-rw-r--r--sys/pc98/pc98/wst.c2
38 files changed, 361 insertions, 361 deletions
diff --git a/sys/alpha/include/pc/vesa.h b/sys/alpha/include/pc/vesa.h
index 96f027e..c2c2b16 100644
--- a/sys/alpha/include/pc/vesa.h
+++ b/sys/alpha/include/pc/vesa.h
@@ -36,20 +36,20 @@
struct vesa_info
{
/* mandatory fields */
- u_int8_t v_sig[4] __attribute__ ((packed)); /* VESA */
- u_int16_t v_version __attribute__ ((packed)); /* ver in BCD */
- u_int32_t v_oemstr __attribute__ ((packed)); /* OEM string */
- u_int32_t v_flags __attribute__ ((packed)); /* flags */
+ u_int8_t v_sig[4] __packed; /* VESA */
+ u_int16_t v_version __packed; /* ver in BCD */
+ u_int32_t v_oemstr __packed; /* OEM string */
+ u_int32_t v_flags __packed; /* flags */
#define V_DAC8 (1<<0)
#define V_NONVGA (1<<1)
#define V_SNOW (1<<2)
- u_int32_t v_modetable __attribute__ ((packed)); /* modes */
- u_int16_t v_memsize __attribute__ ((packed)); /* in 64K */
+ u_int32_t v_modetable __packed; /* modes */
+ u_int16_t v_memsize __packed; /* in 64K */
/* 2.0 */
- u_int16_t v_revision __attribute__ ((packed)); /* software rev */
- u_int32_t v_venderstr __attribute__ ((packed)); /* vender */
- u_int32_t v_prodstr __attribute__ ((packed)); /* product name */
- u_int32_t v_revstr __attribute__ ((packed)); /* product rev */
+ u_int16_t v_revision __packed; /* software rev */
+ u_int32_t v_venderstr __packed; /* vender */
+ u_int32_t v_prodstr __packed; /* product name */
+ u_int32_t v_revstr __packed; /* product rev */
};
struct vesa_mode
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index d45edc7..747a3a1 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -493,7 +493,7 @@ struct pnp_sysdev
#define PNPATTR_CONFIG(a) (((a) >> 7) & 0x3)
/* device-specific data comes here */
u_int8_t devdata[0];
-} __attribute__ ((packed));
+} __packed;
/* We have to cluster arguments within a 64k range for the bios16 call */
struct pnp_sysdevargs
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index cdf7c94..fe1f703 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -83,7 +83,7 @@ struct PnPBIOS_table
u_int32_t oemdevid; /* motherboard EISA ID */
u_int16_t rmbiosseg; /* real-mode BIOS segment */
u_int32_t pmdataseg; /* protected-mode data segment */
-} __attribute__ ((packed));
+} __packed;
/*
@@ -243,13 +243,13 @@ struct PIR_header
u_int32_t ph_miniport;
u_int8_t ph_res[11];
u_int8_t ph_checksum;
-} __attribute__ ((packed));
+} __packed;
struct PIR_intpin
{
u_int8_t link;
u_int16_t irqs;
-} __attribute__ ((packed));
+} __packed;
struct PIR_entry
{
@@ -259,13 +259,13 @@ struct PIR_entry
struct PIR_intpin pe_intpin[4];
u_int8_t pe_slot;
u_int8_t pe_res3;
-} __attribute__ ((packed));
+} __packed;
struct PIR_table
{
struct PIR_header pt_header;
struct PIR_entry pt_entry[0];
-} __attribute__ ((packed));
+} __packed;
/*
* Int 15:E820 'SMAP' structure
@@ -277,4 +277,4 @@ struct bios_smap {
u_int64_t base;
u_int64_t length;
u_int32_t type;
-} __attribute__ ((packed));
+} __packed;
diff --git a/sys/boot/i386/libi386/biosmem.c b/sys/boot/i386/libi386/biosmem.c
index 7614e84..7184452 100644
--- a/sys/boot/i386/libi386/biosmem.c
+++ b/sys/boot/i386/libi386/biosmem.c
@@ -42,7 +42,7 @@ struct smap {
u_int64_t base;
u_int64_t length;
u_int32_t type;
-} __attribute__ ((packed));
+} __packed;
static struct smap smap;
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index 66ef1a5..1bf5a22 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/sys/boot/i386/libi386/biospnp.c
@@ -48,37 +48,37 @@ struct pnphandler biospnphandler =
struct pnp_ICstructure
{
- u_int8_t pnp_signature[4] __attribute__ ((packed));
- u_int8_t pnp_version __attribute__ ((packed));
- u_int8_t pnp_length __attribute__ ((packed));
- u_int16_t pnp_BIOScontrol __attribute__ ((packed));
- u_int8_t pnp_checksum __attribute__ ((packed));
- u_int32_t pnp_eventflag __attribute__ ((packed));
- u_int16_t pnp_rmip __attribute__ ((packed));
- u_int16_t pnp_rmcs __attribute__ ((packed));
- u_int16_t pnp_pmip __attribute__ ((packed));
- u_int32_t pnp_pmcs __attribute__ ((packed));
- u_int8_t pnp_OEMdev[4] __attribute__ ((packed));
- u_int16_t pnp_rmds __attribute__ ((packed));
- u_int32_t pnp_pmds __attribute__ ((packed));
+ u_int8_t pnp_signature[4] __packed;
+ u_int8_t pnp_version __packed;
+ u_int8_t pnp_length __packed;
+ u_int16_t pnp_BIOScontrol __packed;
+ u_int8_t pnp_checksum __packed;
+ u_int32_t pnp_eventflag __packed;
+ u_int16_t pnp_rmip __packed;
+ u_int16_t pnp_rmcs __packed;
+ u_int16_t pnp_pmip __packed;
+ u_int32_t pnp_pmcs __packed;
+ u_int8_t pnp_OEMdev[4] __packed;
+ u_int16_t pnp_rmds __packed;
+ u_int32_t pnp_pmds __packed;
};
struct pnp_devNode
{
- u_int16_t dn_size __attribute__ ((packed));
- u_int8_t dn_handle __attribute__ ((packed));
- u_int8_t dn_id[4] __attribute__ ((packed));
- u_int8_t dn_type[3] __attribute__ ((packed));
- u_int16_t dn_attrib __attribute__ ((packed));
- u_int8_t dn_data[1] __attribute__ ((packed));
+ u_int16_t dn_size __packed;
+ u_int8_t dn_handle __packed;
+ u_int8_t dn_id[4] __packed;
+ u_int8_t dn_type[3] __packed;
+ u_int16_t dn_attrib __packed;
+ u_int8_t dn_data[1] __packed;
};
struct pnp_isaConfiguration
{
- u_int8_t ic_revision __attribute__ ((packed));
- u_int8_t ic_nCSN __attribute__ ((packed));
- u_int16_t ic_rdport __attribute__ ((packed));
- u_int16_t ic_reserved __attribute__ ((packed));
+ u_int8_t ic_revision __packed;
+ u_int8_t ic_nCSN __packed;
+ u_int16_t ic_rdport __packed;
+ u_int16_t ic_reserved __packed;
};
static struct pnp_ICstructure *pnp_Icheck = NULL;
diff --git a/sys/boot/i386/libi386/pxe.h b/sys/boot/i386/libi386/pxe.h
index 3c9f2ff..f1f22aa 100644
--- a/sys/boot/i386/libi386/pxe.h
+++ b/sys/boot/i386/libi386/pxe.h
@@ -44,11 +44,11 @@
* out why PXE was mis-reading structures I was passing it (at least
* from my point of view)
*
- * Solution: use gcc's '__attribute__ ((packed))' to correctly align
+ * Solution: use gcc's '__packed' to correctly align
* structures passed into PXE
* Question: does this really work for PXE's expected ABI?
*/
-#define PACKED __attribute__ ((packed))
+#define PACKED __packed
#define S_SIZE(s) s, sizeof(s) - 1
diff --git a/sys/boot/pc98/libpc98/biosmem.c b/sys/boot/pc98/libpc98/biosmem.c
index d111755..b68714d 100644
--- a/sys/boot/pc98/libpc98/biosmem.c
+++ b/sys/boot/pc98/libpc98/biosmem.c
@@ -43,7 +43,7 @@ struct smap {
u_int64_t base;
u_int64_t length;
u_int32_t type;
-} __attribute__ ((packed));
+} __packed;
static struct smap smap;
#endif
diff --git a/sys/cam/scsi/scsi_low.h b/sys/cam/scsi/scsi_low.h
index 31229a7..34d66a2 100644
--- a/sys/cam/scsi/scsi_low.h
+++ b/sys/cam/scsi/scsi_low.h
@@ -361,7 +361,7 @@ struct lun_info {
u_int8_t sd_len;
u_int8_t sd_sp2[2];
u_int8_t sd_support;
- } __attribute__((packed)) li_inq;
+ } __packed li_inq;
/* modeq buffer */
struct scsi_low_mode_sense_data {
@@ -373,7 +373,7 @@ struct lun_info {
u_int8_t cmp_qc;
u_int8_t cmp_eca;
u_int8_t cmp_spare[3];
- } __attribute__((packed)) sms_cmp;
+ } __packed sms_cmp;
} li_sms;
};
diff --git a/sys/dev/aac/aacreg.h b/sys/dev/aac/aacreg.h
index 17c85b8..cf2c13f 100644
--- a/sys/dev/aac/aacreg.h
+++ b/sys/dev/aac/aacreg.h
@@ -84,7 +84,7 @@
struct aac_queue_entry {
u_int32_t aq_fib_size; /* FIB size in bytes */
u_int32_t aq_fib_addr; /* receiver-space address of the FIB */
-} __attribute__ ((packed));
+} __packed;
#define AAC_PRODUCER_INDEX 0
#define AAC_CONSUMER_INDEX 1
@@ -106,7 +106,7 @@ struct aac_queue_table {
struct aac_queue_entry qt_HostHighRespQueue[AAC_HOST_HIGH_RESP_ENTRIES];
struct aac_queue_entry qt_AdapNormRespQueue[AAC_ADAP_NORM_RESP_ENTRIES];
struct aac_queue_entry qt_AdapHighRespQueue[AAC_ADAP_HIGH_RESP_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
/*
* Queue names
@@ -130,7 +130,7 @@ struct aac_queue_table {
struct aac_fib_list_entry {
struct fib_list_entry *Flink;
struct fib_list_entry *Blink;
-} __attribute__ ((packed));
+} __packed;
/*
* FIB (FSA Interface Block?); this is the datastructure passed between the host
@@ -153,14 +153,14 @@ struct aac_fib_header {
} _s;
struct aac_fib_list_entry FibLinks;
} _u;
-} __attribute__ ((packed));
+} __packed;
#define AAC_FIB_DATASIZE (512 - sizeof(struct aac_fib_header))
struct aac_fib {
struct aac_fib_header Header;
u_int8_t data[AAC_FIB_DATASIZE];
-} __attribute__ ((packed));
+} __packed;
/*
* FIB commands
@@ -282,7 +282,7 @@ struct aac_adapter_init {
u_int32_t PrintfBufferSize;
u_int32_t HostPhysMemPages;
u_int32_t HostElapsedSeconds;
-} __attribute__ ((packed));
+} __packed;
/*
* Shared data types
@@ -337,12 +337,12 @@ typedef enum {
struct aac_sg_entry {
u_int32_t SgAddress;
u_int32_t SgByteCount;
-} __attribute__ ((packed));
+} __packed;
struct aac_sg_table {
u_int32_t SgCount;
struct aac_sg_entry SgEntry[0];
-} __attribute__ ((packed));
+} __packed;
/*
* Host-side scatter/gather list for 64-bit commands.
@@ -352,7 +352,7 @@ struct aac_sg_table64 {
u_int8_t SgSectorsPerPage;
u_int16_t SgByteOffset;
u_int64_t SgEntry[0];
-} __attribute__ ((packed));
+} __packed;
/*
* Container creation data
@@ -368,7 +368,7 @@ struct aac_container_creation {
u_int32_t Minute:6; /* 0-59 */
u_int32_t Second:6; /* 0-59 */
u_int64_t ViaAdapterSerialNumber;
-} __attribute__ ((packed));
+} __packed;
/*
* Revision number handling
@@ -397,7 +397,7 @@ struct FsaRevision {
u_int32_t ul;
} external;
u_int32_t buildNumber;
-} __attribute__ ((packed));
+} __packed;
/*
* Adapter Information
@@ -512,7 +512,7 @@ struct aac_adapter_info {
u_int32_t SupportedOptions; /* supported features of this
* controller */
AAC_OemFlavor OemVariant;
-} __attribute__ ((packed));
+} __packed;
/*
* Monitor/Kernel interface.
@@ -594,7 +594,7 @@ struct aac_nvramdevinfo {
u_int32_t NV_NDirty; /* count of dirty NVRAM buffers */
u_int32_t NV_NActive; /* count of NVRAM buffers being
* written */
-} __attribute__ ((packed));
+} __packed;
struct aac_nvraminfo {
AAC_NVSTATUS NV_Status; /* nvram subsystem status */
@@ -614,7 +614,7 @@ struct aac_nvraminfo {
u_int32_t NV_BattNeedsReconditioning; /* boolean */
u_int32_t NV_TotalSize; /* size of all non-volatile
* memories in bytes */
-} __attribute__ ((packed));
+} __packed;
/*
* Data types relating to adapter-initiated FIBs
@@ -675,7 +675,7 @@ typedef enum {
struct aac_AifContainers {
u_int32_t src; /* from/master */
u_int32_t dst; /* to/slave */
-} __attribute__ ((packed));
+} __packed;
union aac_AifJobClient {
struct aac_AifContainers container; /* For Container and
@@ -691,7 +691,7 @@ struct aac_AifJobDesc {
AAC_AifJobType type; /* Operation that is being
* performed */
union aac_AifJobClient client; /* Details */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifJobProgressReport {
struct aac_AifJobDesc jd;
@@ -700,7 +700,7 @@ struct aac_AifJobProgressReport {
u_int32_t currentTick;
u_int32_t jobSpecificData1;
u_int32_t jobSpecificData2;
-} __attribute__ ((packed));
+} __packed;
/*
* Event Notification
@@ -736,46 +736,46 @@ typedef enum {
struct aac_AifEnsGeneric {
char text[132]; /* Generic text */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEnsDeviceFailure {
u_int32_t deviceHandle; /* SCSI device handle */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEnsMirrorFailover {
u_int32_t container; /* Container with failed element */
u_int32_t failedSlice; /* Old slice which failed */
u_int32_t creatingSlice; /* New slice used for auto-create */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEnsContainerChange {
u_int32_t container[2]; /* container that changed, -1 if no
* container */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEnsContainerEvent {
u_int32_t container; /* container number */
u_int32_t eventType; /* event type */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEnsEnclosureEvent {
u_int32_t empID; /* enclosure management proc number */
u_int32_t unitID; /* unitId, fan id, power supply id,
* slot id, tempsensor id. */
u_int32_t eventType; /* event type */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEnsBatteryEvent {
AAC_NVBATT_TRANSITION transition_type; /* eg from low to ok */
AAC_NVBATTSTATUS current_state; /* current batt state */
AAC_NVBATTSTATUS prior_state; /* prev batt state */
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEnsDiskSetEvent {
u_int32_t eventType;
u_int64_t DsNum;
u_int64_t CreatorId;
-} __attribute__ ((packed));
+} __packed;
typedef enum {
CLUSTER_NULL_EVENT = 0,
@@ -789,7 +789,7 @@ typedef enum {
struct aac_AifEnsClusterEvent {
AAC_ClusterAifEvent eventType;
-} __attribute__ ((packed));
+} __packed;
struct aac_AifEventNotify {
AAC_AifEventNotifyType type;
@@ -805,7 +805,7 @@ struct aac_AifEventNotify {
/* struct aac_AifEnsSMARTEvent ES;*/
struct aac_AifEnsClusterEvent ECLE;
} data;
-} __attribute__ ((packed));
+} __packed;
/*
* Adapter Initiated FIB command structures. Start with the adapter
@@ -842,7 +842,7 @@ struct aac_aif_command {
struct aac_AifJobProgressReport PR[1]; /* Progress report */
u_int8_t AR[AAC_AIF_REPORT_MAX_SIZE];
} data;
-} __attribute__ ((packed));
+} __packed;
/*
* Filesystem commands/data
@@ -978,20 +978,20 @@ struct aac_mntobj {
u_int32_t pad[8];
} ObjExtension;
u_int32_t AlterEgoId;
-} __attribute__ ((packed));
+} __packed;
struct aac_mntinfo {
AAC_VMCommand Command;
AAC_FType MntType;
u_int32_t MntCount;
-} __attribute__ ((packed));
+} __packed;
struct aac_mntinforesp {
AAC_FSAStatus Status;
AAC_FType MntType;
u_int32_t MntRespCount;
struct aac_mntobj MntTable[1];
-} __attribute__ ((packed));
+} __packed;
/*
* Container shutdown command.
@@ -999,7 +999,7 @@ struct aac_mntinforesp {
struct aac_closecommand {
u_int32_t Command;
u_int32_t ContainerId;
-} __attribute__ ((packed));
+} __packed;
/*
* Container Config Command
@@ -1009,13 +1009,13 @@ struct aac_ctcfg {
AAC_VMCommand Command;
u_int32_t cmd;
u_int32_t param;
-} __attribute__ ((packed));
+} __packed;
struct aac_ctcfg_resp {
AAC_FSAStatus Status;
u_int32_t resp;
u_int32_t param;
-} __attribute__ ((packed));
+} __packed;
/*
* 'Ioctl' commads
@@ -1033,7 +1033,7 @@ struct aac_getbusinf {
u_int32_t TargetsPerBus;
u_int8_t InitiatorBusId[AAC_SCSI_MAX_PORTS];
u_int8_t BusValid[AAC_SCSI_MAX_PORTS];
-} __attribute__ ((packed));
+} __packed;
struct aac_vmioctl {
AAC_VMCommand Command;
@@ -1042,7 +1042,7 @@ struct aac_vmioctl {
u_int32_t ObjId;
u_int32_t IoctlCmd;
u_int32_t IoctlBuf[1]; /* Placeholder? */
-} __attribute__ ((packed));
+} __packed;
struct aac_vmi_businf_resp {
AAC_FSAStatus Status;
@@ -1051,7 +1051,7 @@ struct aac_vmi_businf_resp {
u_int32_t ObjId;
u_int32_t IoctlCmd;
struct aac_getbusinf BusInf;
-} __attribute__ ((packed));
+} __packed;
#define AAC_BTL_TO_HANDLE(b, t, l) \
(((b & 0x3f) << 7) | ((l & 0x7) << 4) | (t & 0xf))
@@ -1130,12 +1130,12 @@ struct aac_blockread {
u_int32_t BlockNumber;
u_int32_t ByteCount;
struct aac_sg_table SgMap; /* variable size */
-} __attribute__ ((packed));
+} __packed;
struct aac_blockread_response {
AAC_FSAStatus Status;
u_int32_t ByteCount;
-} __attribute__ ((packed));
+} __packed;
struct aac_blockwrite {
AAC_VMCommand Command; /* not FSACommand! */
@@ -1144,13 +1144,13 @@ struct aac_blockwrite {
u_int32_t ByteCount;
AAC_CacheLevel Stable;
struct aac_sg_table SgMap; /* variable size */
-} __attribute__ ((packed));
+} __packed;
struct aac_blockwrite_response {
AAC_FSAStatus Status;
u_int32_t ByteCount;
AAC_CommitLevel Committed;
-} __attribute__ ((packed));
+} __packed;
/*
* Container shutdown command.
diff --git a/sys/dev/amr/amrreg.h b/sys/dev/amr/amrreg.h
index e2f786e..61fb501 100644
--- a/sys/dev/amr/amrreg.h
+++ b/sys/dev/amr/amrreg.h
@@ -168,7 +168,7 @@ struct amr_adapter_info
u_int8_t aa_inserteddrive;
u_int8_t aa_batterystatus;
u_int8_t res1;
-} __attribute__ ((packed));
+} __packed;
/*
* Logical Drive info structure
@@ -180,7 +180,7 @@ struct amr_logdrive_info
u_int32_t al_size[AMR_8LD_MAXDRIVES];
u_int8_t al_properties[AMR_8LD_MAXDRIVES];
u_int8_t al_state[AMR_8LD_MAXDRIVES];
-} __attribute__ ((packed));
+} __packed;
/*
* Physical Drive info structure
@@ -189,7 +189,7 @@ struct amr_physdrive_info
{
u_int8_t ap_state[AMR_8LD_MAXPHYSDRIVES]; /* low nibble current state, high nibble previous state */
u_int8_t ap_predictivefailure;
-} __attribute__ ((packed));
+} __packed;
/*
* Enquiry response structure for AMR_CMD_ENQUIRY, AMR_CMD_EXT_ENQUIRY and
@@ -216,7 +216,7 @@ struct amr_enquiry
#define AMR_SIG_T7 0xfff80007
#define AMR_SIG_490 0xfff70008
u_int8_t res2[844]; /* X */
-} __attribute__ ((packed));
+} __packed;
/********************************************************************************
@@ -254,7 +254,7 @@ struct amr_prodinfo
u_int16_t ap_subsystem; /* subsystem identifier */
u_int16_t ap_subvendor; /* subsystem vendor ID */
u_int8_t ap_numnotifyctr; /* number of notify counters */
-} __attribute__((packed));
+} __packed;
/*
* Notify structure
@@ -319,7 +319,7 @@ struct amr_notify
u_int8_t an_fcloopstate0;
u_int8_t an_fcloopstate1;
u_int8_t res4;
-} __attribute__((packed));
+} __packed;
/*
* Enquiry3 structure
@@ -346,7 +346,7 @@ struct amr_enquiry3
u_int8_t ae_targxfer[80]; /* physical drive transfer rates */
u_int8_t res1[263]; /* pad to 1024 bytes */
-} __attribute__ ((packed));
+} __packed;
/********************************************************************************
@@ -374,13 +374,13 @@ struct amr_mailbox
u_int8_t mb_poll;
u_int8_t mb_ack;
u_int8_t res2[16];
-} __attribute__ ((packed));
+} __packed;
struct amr_mailbox64
{
u_int32_t mb64_segment; /* for 64-bit controllers */
struct amr_mailbox mb;
-} __attribute__ ((packed));
+} __packed;
struct amr_mailbox_ioctl
{
@@ -399,13 +399,13 @@ struct amr_mailbox_ioctl
u_int8_t mb_poll;
u_int8_t mb_ack;
u_int8_t res4[16];
-} __attribute__ ((packed));
+} __packed;
struct amr_sgentry
{
u_int32_t sg_addr;
u_int32_t sg_count;
-} __attribute__ ((packed));
+} __packed;
struct amr_passthrough
{
@@ -426,7 +426,7 @@ struct amr_passthrough
u_int8_t ap_scsi_status;
u_int32_t ap_data_transfer_address;
u_int32_t ap_data_transfer_length;
-} __attribute__ ((packed));
+} __packed;
#ifdef _KERNEL
/********************************************************************************
diff --git a/sys/dev/an/if_aironet_ieee.h b/sys/dev/an/if_aironet_ieee.h
index 2e110f2..cc0e8a2 100644
--- a/sys/dev/an/if_aironet_ieee.h
+++ b/sys/dev/an/if_aironet_ieee.h
@@ -592,7 +592,7 @@ struct an_rxframe {
u_int16_t an_seq_ctl; /* 0x2A */
u_int8_t an_addr4[6]; /* 0x2C */
u_int8_t an_gaplen; /* 0x32 */
-} __attribute__((packed));
+} __packed;
/* Do not modify this unless you are modifying LEAP itself */
diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h
index 70350ee..a1e1aa2 100644
--- a/sys/dev/an/if_anreg.h
+++ b/sys/dev/an/if_anreg.h
@@ -242,7 +242,7 @@ struct an_txframe {
u_int16_t an_seq_ctl; /* 0x2A */
u_int8_t an_addr4[6]; /* 0x2C */
u_int8_t an_gaplen; /* 0x32 */
-} __attribute__((packed));
+} __packed;
struct an_rxframe_802_3 {
u_int16_t an_rx_802_3_status; /* 0x34 */
diff --git a/sys/dev/ata/ata-raid.h b/sys/dev/ata/ata-raid.h
index 755b147..5853ead 100644
--- a/sys/dev/ata/ata-raid.h
+++ b/sys/dev/ata/ata-raid.h
@@ -145,7 +145,7 @@ struct highpoint_raid_conf {
u_int8_t dummy_2;
u_int8_t name_2[15];
int8_t filler3[8];
-} __attribute__((packed));
+} __packed;
#define PR_LBA(adp) \
@@ -180,7 +180,7 @@ struct promise_raid_conf {
u_int8_t disk_number;
u_int8_t channel;
u_int8_t device;
- u_int64_t magic_0 __attribute__((packed));
+ u_int64_t magic_0 __packed;
u_int32_t disk_offset; /* 0x210 */
u_int32_t disk_sectors;
u_int32_t rebuild_lba;
@@ -209,18 +209,18 @@ struct promise_raid_conf {
u_int16_t cylinders;
u_int8_t heads;
u_int8_t sectors;
- int64_t magic_1 __attribute__((packed));
+ int64_t magic_1 __packed;
struct { /* 0x240 */
u_int8_t flags;
u_int8_t dummy_0;
u_int8_t channel;
u_int8_t device;
- u_int64_t magic_0 __attribute__((packed));
+ u_int64_t magic_0 __packed;
} disk[8];
} raid;
int32_t filler2[346];
u_int32_t checksum;
-} __attribute__((packed));
+} __packed;
int ata_raiddisk_probe(struct ad_softc *);
int ata_raiddisk_attach(struct ad_softc *);
diff --git a/sys/dev/ata/atapi-all.h b/sys/dev/ata/atapi-all.h
index af91564..f545625 100644
--- a/sys/dev/ata/atapi-all.h
+++ b/sys/dev/ata/atapi-all.h
@@ -131,10 +131,10 @@ struct atapi_reqsense {
u_int8_t eom :1; /* end of medium */
u_int8_t filemark :1; /* filemark */
/* cmd information */
- u_int32_t cmd_info __attribute__((packed));
+ u_int32_t cmd_info __packed;
u_int8_t sense_length; /* additional sense len (n-7) */
/* additional cmd spec info */
- u_int32_t cmd_specific_info __attribute__((packed));
+ u_int32_t cmd_specific_info __packed;
u_int8_t asc; /* additional sense code */
u_int8_t ascq; /* additional sense code qual */
u_int8_t replaceable_unit_code; /* replaceable unit code */
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index cdd5dc8..9a5da7b 100644
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
@@ -341,7 +341,7 @@ struct write_param {
u_int8_t vendor_specific_byte1;
u_int8_t vendor_specific_byte2;
u_int8_t vendor_specific_byte3;
-} __attribute__((packed));
+} __packed;
/* CDROM Read Track Information structure */
struct acd_track_info {
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index d9a4419..2e5e71e 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.h
@@ -68,7 +68,7 @@ struct ciss_header
#define CISS_HDR_HOST_TAG_ERROR (1<<1)
u_int32_t host_tag_zeroes; /* tag is 64 bits, but interface only supports 32 */
union ciss_device_address address;
-} __attribute__ ((packed));
+} __packed;
struct ciss_cdb
{
@@ -89,13 +89,13 @@ struct ciss_cdb
u_int16_t timeout; /* seconds */
#define CISS_CDB_BUFFER_SIZE 16
u_int8_t cdb[CISS_CDB_BUFFER_SIZE];
-} __attribute__ ((packed));
+} __packed;
struct ciss_error_info_pointer
{
u_int64_t error_info_address; /* points to ciss_error_info structure */
u_int32_t error_info_length;
-} __attribute__ ((packed));
+} __packed;
struct ciss_error_info
{
@@ -131,16 +131,16 @@ struct ciss_error_info
u_int8_t res1[3];
u_int8_t type;
u_int32_t error_info;
- } common_info __attribute__ ((packed));
+ } common_info __packed;
struct {
u_int8_t res1[2];
u_int8_t offense_size;
u_int8_t offense_offset;
u_int32_t offense_value;
- } invalid_command __attribute__ ((packed));
+ } invalid_command __packed;
} additional_error_info;
u_int8_t sense_info[0];
-} __attribute__ ((packed));
+} __packed;
struct ciss_sg_entry
{
@@ -149,7 +149,7 @@ struct ciss_sg_entry
u_int32_t length;
u_int32_t :31;
u_int32_t extension:1; /* address points to another s/g chain */
-} __attribute__ ((packed));
+} __packed;
struct ciss_command
{
@@ -157,7 +157,7 @@ struct ciss_command
struct ciss_cdb cdb;
struct ciss_error_info_pointer error_info;
struct ciss_sg_entry sg[0];
-} __attribute__ ((packed));
+} __packed;
#define CISS_OPCODE_REPORT_LOGICAL_LUNS 0xc2
#define CISS_OPCODE_REPORT_PHYSICAL_LUNS 0xc3
@@ -167,7 +167,7 @@ struct ciss_lun_report
u_int32_t list_size; /* big-endian */
u_int32_t :32;
union ciss_device_address lun[0];
-} __attribute__ ((packed));
+} __packed;
struct ciss_report_cdb
{
@@ -176,7 +176,7 @@ struct ciss_report_cdb
u_int32_t length; /* big-endian */
u_int8_t :8;
u_int8_t control;
-} __attribute__ ((packed));
+} __packed;
/*
* Note that it's not clear whether we have to set the detail field to
@@ -210,7 +210,7 @@ struct ciss_message_cdb
u_int16_t :16;
u_int32_t abort_tag; /* XXX endianness? */
u_int8_t reserved[8];
-} __attribute__ ((packed));
+} __packed;
/*
* CISS vendor-specific commands/messages.
@@ -240,7 +240,7 @@ struct ciss_notify_cdb
u_int32_t length; /* must be 512, little-endian */
#define CISS_NOTIFY_DATA_SIZE 512
u_int8_t control;
-} __attribute__ ((packed));
+} __packed;
#define CISS_NOTIFY_NOTIFIER 0
#define CISS_NOTIFY_NOTIFIER_STATUS 0
@@ -289,19 +289,19 @@ struct ciss_notify_drive
u_int8_t spare_drive_flag;
u_int8_t big_physical_drive_number;
u_int8_t enclosure_bay_number;
-} __attribute__ ((packed));
+} __packed;
struct ciss_notify_locator
{
u_int16_t port;
u_int16_t id;
u_int16_t box;
-} __attribute__ ((packed));
+} __packed;
struct ciss_notify_redundant_controller
{
u_int16_t slot;
-} __attribute__ ((packed));
+} __packed;
struct ciss_notify_logical_status
{
@@ -309,7 +309,7 @@ struct ciss_notify_logical_status
u_int8_t previous_state;
u_int8_t new_state;
u_int8_t spare_state;
-} __attribute__ ((packed));
+} __packed;
struct ciss_notify_rebuild_aborted
{
@@ -318,7 +318,7 @@ struct ciss_notify_rebuild_aborted
u_int8_t error_drive;
u_int8_t big_replacement_drive;
u_int8_t big_error_drive;
-} __attribute__ ((packed));
+} __packed;
struct ciss_notify_io_error
{
@@ -329,12 +329,12 @@ struct ciss_notify_io_error
u_int8_t failure_bus;
u_int8_t failure_drive;
u_int64_t big_lba;
-} __attribute__ ((packed));
+} __packed;
struct ciss_notify_consistency_completed
{
u_int16_t logical_drive;
-} __attribute__ ((packed));
+} __packed;
struct ciss_notify
{
@@ -361,7 +361,7 @@ struct ciss_notify
u_int16_t pre_power_up_time;
union ciss_device_address device;
/* XXX pads to 512 bytes */
-} __attribute__ ((packed));
+} __packed;
/*
* CISS config table, which describes the controller's
@@ -397,7 +397,7 @@ struct ciss_config_table
#define CISS_DRIVER_HOST_IS_ALPHA (1<<4)
char server_name[16];
u_int32_t heartbeat;
-} __attribute__ ((packed));
+} __packed;
/*
* In a flagrant violation of what CISS seems to be meant to be about,
@@ -463,7 +463,7 @@ struct ciss_bmic_cdb {
u_int8_t bmic_opcode;
u_int16_t size; /* big-endian */
u_int8_t res2;
-} __attribute__ ((packed));
+} __packed;
/*
* BMIC command command/return structures.
@@ -484,7 +484,7 @@ struct ciss_bmic_id_ldrive {
u_int32_t logical_drive_identifier;
char logical_drive_label[64];
#endif
-} __attribute__ ((packed));
+} __packed;
/* CISS_BMIC_ID_LSTATUS */
struct ciss_bmic_id_lstatus {
@@ -529,7 +529,7 @@ struct ciss_bmic_id_lstatus {
u_int8_t spare_to_replace_map[CISS_BIG_MAP_ENTRIES];
u_int8_t replaced_marked_ok_map[CISS_BIG_MAP_ENTRIES / 8];
u_int8_t drive_rebuilding;
-} __attribute__ ((packed));
+} __packed;
/* CISS_BMIC_ID_CTLR */
struct ciss_bmic_id_table {
@@ -558,7 +558,7 @@ struct ciss_bmic_id_table {
u_int8_t big_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
u_int8_t big_external_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
u_int8_t big_non_disk_map[CISS_BIG_MAP_ENTRIES / 8];
-} __attribute__ ((packed));
+} __packed;
/* CISS_BMIC_ID_PDRIVE */
struct ciss_bmic_id_pdrive {
@@ -596,7 +596,7 @@ struct ciss_bmic_id_pdrive {
char connector[2];
u_int8_t res5;
u_int8_t bay;
-} __attribute__ ((packed));
+} __packed;
/* CISS_BMIC_BLINK_PDRIVE */
/* CISS_BMIC_SENSE_BLINK_PDRIVE */
@@ -607,7 +607,7 @@ struct ciss_bmic_blink_pdrive {
#define CISS_BMIC_BLINK_ALL 1
#define CISS_BMIC_BLINK_TIMED 2
u_int8_t res2[248];
-} __attribute__ ((packed));
+} __packed;
/* CISS_BMIC_FLUSH_CACHE */
struct ciss_bmic_flush_cache {
@@ -615,7 +615,7 @@ struct ciss_bmic_flush_cache {
#define CISS_BMIC_FLUSH_AND_ENABLE 0
#define CISS_BMIC_FLUSH_AND_DISABLE 1
u_int8_t res1[510];
-} __attribute__ ((packed));
+} __packed;
#ifdef _KERNEL
/*
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index 95fc421..4db9cb6 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.c
@@ -178,43 +178,43 @@ bmp_splash(video_adapter_t *adp, int on)
*/
typedef struct tagBITMAPFILEHEADER { /* bmfh */
- u_short bfType __attribute__ ((packed));
- int bfSize __attribute__ ((packed));
- u_short bfReserved1 __attribute__ ((packed));
- u_short bfReserved2 __attribute__ ((packed));
- int bfOffBits __attribute__ ((packed));
+ u_short bfType __packed;
+ int bfSize __packed;
+ u_short bfReserved1 __packed;
+ u_short bfReserved2 __packed;
+ int bfOffBits __packed;
} BITMAPFILEHEADER;
typedef struct tagBITMAPINFOHEADER { /* bmih */
- int biSize __attribute__ ((packed));
- int biWidth __attribute__ ((packed));
- int biHeight __attribute__ ((packed));
- short biPlanes __attribute__ ((packed));
- short biBitCount __attribute__ ((packed));
- int biCompression __attribute__ ((packed));
- int biSizeImage __attribute__ ((packed));
- int biXPelsPerMeter __attribute__ ((packed));
- int biYPelsPerMeter __attribute__ ((packed));
- int biClrUsed __attribute__ ((packed));
- int biClrImportant __attribute__ ((packed));
+ int biSize __packed;
+ int biWidth __packed;
+ int biHeight __packed;
+ short biPlanes __packed;
+ short biBitCount __packed;
+ int biCompression __packed;
+ int biSizeImage __packed;
+ int biXPelsPerMeter __packed;
+ int biYPelsPerMeter __packed;
+ int biClrUsed __packed;
+ int biClrImportant __packed;
} BITMAPINFOHEADER;
typedef struct tagRGBQUAD { /* rgbq */
- u_char rgbBlue __attribute__ ((packed));
- u_char rgbGreen __attribute__ ((packed));
- u_char rgbRed __attribute__ ((packed));
- u_char rgbReserved __attribute__ ((packed));
+ u_char rgbBlue __packed;
+ u_char rgbGreen __packed;
+ u_char rgbRed __packed;
+ u_char rgbReserved __packed;
} RGBQUAD;
typedef struct tagBITMAPINFO { /* bmi */
- BITMAPINFOHEADER bmiHeader __attribute__ ((packed));
- RGBQUAD bmiColors[256] __attribute__ ((packed));
+ BITMAPINFOHEADER bmiHeader __packed;
+ RGBQUAD bmiColors[256] __packed;
} BITMAPINFO;
typedef struct tagBITMAPF
{
- BITMAPFILEHEADER bmfh __attribute__ ((packed));
- BITMAPINFO bmfi __attribute__ ((packed));
+ BITMAPFILEHEADER bmfh __packed;
+ BITMAPINFO bmfi __packed;
} BITMAPF;
#define BI_RGB 0
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index c07ff76..e06e4d4 100644
--- a/sys/dev/ida/idareg.h
+++ b/sys/dev/ida/idareg.h
@@ -123,13 +123,13 @@ struct ida_drive_info {
u_int8_t nsectors;
u_int8_t checksum;
u_int8_t mirror;
-} __attribute__ ((packed));
+} __packed;
struct ida_controller_info {
u_int8_t num_drvs;
u_int32_t signature;
u_int8_t firm_rev[4];
-} __attribute__ ((packed));
+} __packed;
struct ida_drive_status {
@@ -155,4 +155,4 @@ struct ida_drive_status {
u_int8_t big_spare_repl_map[128];
u_int16_t big_repl_ok_map[8];
u_int8_t big_rebuilding;
-} __attribute__ ((packed));
+} __packed;
diff --git a/sys/dev/mlx/mlxreg.h b/sys/dev/mlx/mlxreg.h
index 382a2fd..fef77df 100644
--- a/sys/dev/mlx/mlxreg.h
+++ b/sys/dev/mlx/mlxreg.h
@@ -199,7 +199,7 @@ struct mlx_sgentry
{
u_int32_t sg_addr;
u_int32_t sg_count;
-} __attribute__ ((packed));
+} __packed;
/*
* Command result buffers, as placed in system memory by the controller.
@@ -229,8 +229,8 @@ struct mlx_enquiry_old /* MLX_CMD_ENQUIRY_OLD */
{
u_int8_t dd_targ;
u_int8_t dd_chan;
- } __attribute__ ((packed)) me_dead[20];
-} __attribute__ ((packed));
+ } __packed me_dead[20];
+} __packed;
struct mlx_enquiry /* MLX_CMD_ENQUIRY */
{
@@ -260,8 +260,8 @@ struct mlx_enquiry /* MLX_CMD_ENQUIRY */
{
u_int8_t dd_targ;
u_int8_t dd_chan;
- } __attribute__ ((packed)) me_dead[20];
-} __attribute__ ((packed));
+ } __packed me_dead[20];
+} __packed;
struct mlx_enquiry2 /* MLX_CMD_ENQUIRY2 */
{
@@ -311,7 +311,7 @@ struct mlx_enquiry2 /* MLX_CMD_ENQUIRY2 */
u_int8_t res10;
u_int32_t me_firmware_features;
u_int8_t res11[8];
-} __attribute__ ((packed));
+} __packed;
struct mlx_enq_sys_drive /* MLX_CMD_ENQSYSDRIVE returns an array of 32 of these */
{
@@ -319,7 +319,7 @@ struct mlx_enq_sys_drive /* MLX_CMD_ENQSYSDRIVE returns an array of 32 of these
u_int8_t sd_state;
u_int8_t sd_raidlevel;
u_int16_t res1;
-} __attribute__ ((packed));
+} __packed;
struct mlx_eventlog_entry /* MLX_CMD_LOGOP/MLX_LOGOP_GET */
{
@@ -344,7 +344,7 @@ struct mlx_eventlog_entry /* MLX_CMD_LOGOP/MLX_LOGOP_GET */
u_int8_t el_asc;
u_int8_t el_asq;
u_int8_t res3[12];
-} __attribute__ ((packed));
+} __packed;
#define MLX_LOGOP_GET 0x00 /* operation codes for MLX_CMD_LOGOP */
#define MLX_LOGMSG_SENSE 0x00 /* log message contents codes */
@@ -354,7 +354,7 @@ struct mlx_rebuild_stat /* MLX_CMD_REBUILDSTAT */
u_int32_t rb_drive;
u_int32_t rb_size;
u_int32_t rb_remaining;
-} __attribute__ ((packed));
+} __packed;
struct mlx_config2
{
@@ -395,14 +395,14 @@ struct mlx_config2
u_int8_t cf_delay_between_spinups;
u_int8_t cf_res3;
u_int16_t cf_checksum;
-} __attribute__ ((packed));
+} __packed;
struct mlx_sys_drv_span
{
u_int32_t sp_start_lba;
u_int32_t sp_nblks;
u_int8_t sp_arm[8];
-} __attribute__ ((packed));
+} __packed;
struct mlx_sys_drv
{
@@ -423,7 +423,7 @@ struct mlx_sys_drv
u_int8_t sd_init_state;
#define MLX_SYS_DRV_INITTED 0x81;
struct mlx_sys_drv_span sd_span[4];
-} __attribute__ ((packed));
+} __packed;
struct mlx_phys_drv
{
@@ -448,7 +448,7 @@ struct mlx_phys_drv
u_int8_t pd_period;
u_int8_t pd_offset;
u_int32_t pd_config_size;
-} __attribute__ ((packed));
+} __packed;
struct mlx_core_cfg
{
@@ -456,7 +456,7 @@ struct mlx_core_cfg
u_int8_t cc_res1[3];
struct mlx_sys_drv cc_sys_drives[32];
struct mlx_phys_drv cc_phys_drives[5 * 16];
-} __attribute__ ((packed));
+} __packed;
struct mlx_dcdb
{
@@ -482,7 +482,7 @@ struct mlx_dcdb
u_int8_t dcdb_sense[64];
u_int8_t dcdb_status;
u_int8_t res1;
-} __attribute__ ((packed));
+} __packed;
struct mlx_bbtable_entry
{
@@ -492,7 +492,7 @@ struct mlx_bbtable_entry
u_int8_t bbt_entry_type;
u_int8_t bbt_system_drive:5;
u_int8_t res2:3;
-} __attribute__ ((packed));
+} __packed;
#ifdef _KERNEL
/*
diff --git a/sys/dev/mly/mlyreg.h b/sys/dev/mly/mlyreg.h
index 2809eb5..a4106a5 100644
--- a/sys/dev/mly/mlyreg.h
+++ b/sys/dev/mly/mlyreg.h
@@ -48,7 +48,7 @@
struct mly_sg_entry {
u_int64_t physaddr;
u_int64_t length;
-} __attribute__ ((packed));
+} __packed;
/*
* 5.2 System Device Access
@@ -146,7 +146,7 @@ struct mly_lun_map {
u_int8_t lun; /* LUN */
u_int8_t tid; /* TID */
u_int8_t hid[32]; /* HID (one bit for each host) */
-} __attribute__ ((packed));
+} __packed;
/*
* 10.1 Controller Parameters
@@ -252,7 +252,7 @@ struct mly_param_controller {
#define MLY_STARTUP_ALWAYS 0x5
u_int8_t res15[62];
-} __attribute__ ((packed));
+} __packed;
/*
* 10.2 Physical Device Parameters
@@ -264,7 +264,7 @@ struct mly_param_physical_device {
u_int8_t combing:1;
u_int8_t res1:7;
u_int8_t res2[3];
-} __attribute__ ((packed));
+} __packed;
/*
* 10.3 Logical Device Parameters
@@ -278,7 +278,7 @@ struct mly_param_logical_device {
u_int8_t stripe_size; /* see 8.3 */
u_int8_t read_write_control; /* see 8.5 */
u_int8_t res2[8];
-} __attribute__ ((packed));
+} __packed;
/*
* 12.3 Health Status Buffer
@@ -298,7 +298,7 @@ struct mly_health_status {
u_int32_t profiler_page; /* N/A */
u_int32_t next_event;
u_int8_t res3[4 + 16 + 64]; /* N/A */
-} __attribute__ ((packed));
+} __packed;
/*
* 14.2 Timeout Bit Format
@@ -309,7 +309,7 @@ struct mly_timeout {
#define MLY_TIMEOUT_SECONDS 0x0
#define MLY_TIMEOUT_MINUTES 0x1
#define MLY_TIMEOUT_HOURS 0x2
-} __attribute__ ((packed));
+} __packed;
/*
* 14.3 Operation Device
@@ -335,7 +335,7 @@ struct mly_status {
u_int8_t status;
u_int8_t sense_length;
int32_t residue;
-} __attribute__ ((packed));
+} __packed;
/*
* 14.5 Command Control Bit (CCB) format
@@ -353,7 +353,7 @@ struct mly_command_control {
u_int8_t res2:1;
u_int8_t no_auto_sense:1;
u_int8_t disable_disconnect:1;
-} __attribute__ ((packed));
+} __packed;
/*
* 15.0 Commands
@@ -436,7 +436,7 @@ struct mly_command_control {
*/
struct mly_short_transfer {
struct mly_sg_entry sg[2];
-} __attribute__ ((packed));
+} __packed;
/*
* 17.1.5 Data Transfer Memory Address With SG List
@@ -447,7 +447,7 @@ struct mly_sg_transfer {
u_int16_t entries[3];
u_int16_t res1;
u_int64_t table_physaddr[3];
-} __attribute__ ((packed));
+} __packed;
/*
* 17.1.3 Data Transfer Memory Address Format
@@ -484,7 +484,7 @@ union mly_command_transfer {
struct mly_ioctl_param_data {
u_int8_t param[10];
union mly_command_transfer transfer;
-} __attribute__ ((packed));
+} __packed;
/*
* 21.2 MDACIOCTL_SETMEMORYMAILBOX
@@ -496,7 +496,7 @@ struct mly_ioctl_param_setmemorymailbox {
u_int64_t command_mailbox_physaddr;
u_int64_t status_mailbox_physaddr;
u_int64_t res2[2];
-} __attribute__ ((packed));
+} __packed;
/*
* 21.8.2 MDACIOCTL_GETCONTROLLERINFO: Data Format
@@ -609,7 +609,7 @@ struct mly_ioctl_getcontrollerinfo {
u_int8_t number;
u_int8_t res1[12]; /* N/A */
char name[16]; /* N/A */
- } cpu[2] __attribute__ ((packed));
+ } cpu[2] __packed;
/* debugging/profiling/command time tracing information */
u_int16_t profiling_page; /* N/A */
u_int16_t profiling_programs; /* N/A */
@@ -674,7 +674,7 @@ struct mly_ioctl_getcontrollerinfo {
u_int8_t res26:6; /* N/A */
u_int8_t res27[3]; /* N/A */
u_int8_t res28[32 + 512]; /* N/A */
-} __attribute__ ((packed));
+} __packed;
/*
* 21.9.2 MDACIOCTL_GETLOGDEVINFOVALID
@@ -724,7 +724,7 @@ struct mly_ioctl_getlogdevinfovalid {
u_int64_t migration_block;
u_int64_t patrol_block; /* N/A */
u_int8_t res7[64]; /* N/A */
-} __attribute__ ((packed));
+} __packed;
/*
* 21.10.2 MDACIOCTL_GETPHYSDEVINFOVALID: Data Format
@@ -784,7 +784,7 @@ struct mly_ioctl_getphysdevinfovalid {
u_int64_t migration_block; /* N/A */
u_int64_t patrol_block; /* N/A */
u_int8_t res11[256];
-} __attribute__ ((packed));
+} __packed;
union mly_devinfo {
struct mly_ioctl_getlogdevinfovalid logdev;
@@ -818,7 +818,7 @@ struct mly_ioctl_getdevstatistics {
u_int16_t active_commands; /* N/A */
u_int16_t waiting_commands; /* N/A */
u_int8_t res3[8]; /* N/A */
-} __attribute__ ((packed));
+} __packed;
/*
* 21.13.2 MDACIOCTL_GETCONTROLLERSTATISTICS: Data Format
@@ -860,14 +860,14 @@ struct mly_ioctl_getcontrollerstatistics {
u_int16_t host_system_commands_active; /* N/A */
u_int16_t host_system_commands_waiting; /* N/A */
u_int8_t res4[48 + 64]; /* N/A */
-} __attribute__ ((packed));
+} __packed;
/*
* 21.2 MDACIOCTL_SETRAIDDEVSTATE
*/
struct mly_ioctl_param_setraiddevstate {
u_int8_t state;
-} __attribute__ ((packed));
+} __packed;
/*
* 21.27.2 MDACIOCTL_GETBDT_FOR_SYSDRIVE: Data Format
@@ -876,7 +876,7 @@ struct mly_ioctl_param_setraiddevstate {
struct mly_ioctl_getbdt_for_sysdrive {
u_int32_t num_of_bdt_entries;
u_int32_t bad_data_block_address[MLY_MAX_BDT_ENTRIES];
-} __attribute__ ((packed));
+} __packed;
/*
* 22.1 Physical Device Definition (PDD)
@@ -891,7 +891,7 @@ struct mly_pdd {
u_int8_t target;
u_int8_t lun;
u_int32_t start_address;
-} __attribute__ ((packed));
+} __packed;
/*
* 22.2 RAID Device Use Definition (UDD)
@@ -901,7 +901,7 @@ struct mly_udd {
u_int8_t state; /* see 8.1 */
u_int16_t raid_device;
u_int32_t start_address;
-} __attribute__ ((packed));
+} __packed;
/*
* RAID Device Definition (LDD)
@@ -917,7 +917,7 @@ struct mly_ldd {
u_int8_t read_write_control; /* see 8.5 */
u_int32_t devices_used_size; /* XXX "block or MB" Huh? */
u_int16_t devices_used[32]; /* XXX actual size of this field unknown! */
-} __attribute__ ((packed));
+} __packed;
/*
* Define a datastructure giving the smallest allocation that will hold
@@ -943,7 +943,7 @@ union mly_ioctl_devconfinfo {
*/
struct mly_ioctl_param_renameraiddev {
u_int8_t new_raid_device;
-} __attribute__ ((packed));
+} __packed;
/*
* 23.6.2 MDACIOCTL_XLATEPHYSDEVTORAIDDEV
@@ -957,7 +957,7 @@ struct mly_ioctl_param_xlatephysdevtoraiddev {
u_int8_t channel;
u_int8_t target;
u_int8_t lun;
-} __attribute__ ((packed));
+} __packed;
/*
* 23.7 MDACIOCTL_GETGROUPCONFINFO
@@ -966,7 +966,7 @@ struct mly_ioctl_param_getgroupconfinfo {
u_int16_t group;
u_int8_t res1[8];
union mly_command_transfer transfer;
-} __attribute__ ((packed));
+} __packed;
/*
* 23.9.2 MDACIOCTL_GETFREESPACELIST: Data Format
@@ -979,14 +979,14 @@ struct mly_ioctl_getfreespacelist_entry {
u_int8_t res1[6];
u_int32_t address; /* XXX "blocks or MB" Huh? */
u_int32_t size; /* XXX "blocks or MB" Huh? */
-} __attribute__ ((packed));
+} __packed;
struct mly_ioctl_getfrespacelist {
u_int16_t returned_entries;
u_int16_t total_entries;
u_int8_t res1[12];
struct mly_ioctl_getfreespacelist_entry space[0]; /* expand to suit */
-} __attribute__ ((packed));
+} __packed;
/*
* 27.1 MDACIOCTL_GETSUBSYSTEMDATA
@@ -1003,7 +1003,7 @@ struct mly_ioctl_param_subsystemdata {
u_int8_t subsystem:4;
#define MLY_SUBSYSTEM_BBU 0x01
u_int parameter[3]; /* only for SETSUBSYSTEMDATA */
-} __attribute__ ((packed));
+} __packed;
struct mly_ioctl_getsubsystemdata_bbustatus {
u_int16_t current_power;
@@ -1025,7 +1025,7 @@ struct mly_ioctl_getsubsystemdata_bbustatus {
#define MLY_BBU_STATUS_DISCHARGING 0x20
#define MLY_BBU_STATUS_FASTCHARGING 0x40
u_int8_t res2;
-} __attribute__ ((packed));
+} __packed;
/*
* 28.9 MDACIOCTL_RESETDEVICE
@@ -1035,7 +1035,7 @@ struct mly_ioctl_getsubsystemdata_bbustatus {
*/
struct mly_ioctl_param_deviceoperation {
u_int8_t operation_device; /* see 14.3 */
-} __attribute__ ((packed));
+} __packed;
/*
* 31.1 Event Data Format
@@ -1051,7 +1051,7 @@ struct mly_event {
u_int8_t res1[4];
u_int32_t param;
u_int8_t sense[40];
-} __attribute__ ((packed));
+} __packed;
/*
* 31.2 MDACIOCTL_GETEVENT
@@ -1060,7 +1060,7 @@ struct mly_ioctl_param_getevent {
u_int16_t sequence_number_low;
u_int8_t res1[8];
union mly_command_transfer transfer;
-} __attribute__ ((packed));
+} __packed;
union mly_ioctl_param {
struct mly_ioctl_param_data data;
@@ -1082,13 +1082,13 @@ struct mly_command_address_physical {
u_int8_t target;
u_int8_t channel:3;
u_int8_t controller:5;
-} __attribute__ ((packed));
+} __packed;
struct mly_command_address_logical {
u_int16_t logdev;
u_int8_t res1:3;
u_int8_t controller:5;
-} __attribute__ ((packed));
+} __packed;
union mly_command_address {
struct mly_command_address_physical phys;
@@ -1106,7 +1106,7 @@ struct mly_command_generic {
u_int8_t maximum_sense_size;
u_int8_t res1[11];
union mly_command_transfer transfer;
-} __attribute__ ((packed));
+} __packed;
/*
@@ -1125,7 +1125,7 @@ struct mly_command_scsi_small {
u_int8_t cdb_length;
u_int8_t cdb[MLY_CMD_SCSI_SMALL_CDB];
union mly_command_transfer transfer;
-} __attribute__ ((packed));
+} __packed;
/*
* 19.2 MDACMD_SCSILC & MDACMD_SCSILCPT
@@ -1143,7 +1143,7 @@ struct mly_command_scsi_large {
u_int16_t res1;
u_int64_t cdb_physaddr;
union mly_command_transfer transfer;
-} __attribute__ ((packed));
+} __packed;
/*
* 20.1 IOCTL Command Format: Internal Bus
@@ -1159,7 +1159,7 @@ struct mly_command_ioctl {
u_int8_t maximum_sense_size;
u_int8_t sub_ioctl;
union mly_ioctl_param param;
-} __attribute__ ((packed));
+} __packed;
/*
* PG6: 8.2.2
@@ -1167,7 +1167,7 @@ struct mly_command_ioctl {
struct mly_command_mmbox {
u_int32_t flag;
u_int8_t data[60];
-} __attribute__ ((packed));
+} __packed;
union mly_command_packet {
struct mly_command_generic generic;
@@ -1254,7 +1254,7 @@ union mly_status_packet {
struct {
u_int32_t flag;
u_int8_t data[4];
- } __attribute__ ((packed)) mmbox;
+ } __packed mmbox;
};
union mly_health_region {
struct mly_health_status status;
@@ -1267,4 +1267,4 @@ struct mly_mmbox {
union mly_command_packet mmm_command[MLY_MMBOX_COMMANDS];
union mly_status_packet mmm_status[MLY_MMBOX_STATUS];
union mly_health_region mmm_health;
-} __attribute__ ((packed));
+} __packed;
diff --git a/sys/dev/pst/pst-iop.h b/sys/dev/pst/pst-iop.h
index f8a0eac..3b45d89 100644
--- a/sys/dev/pst/pst-iop.h
+++ b/sys/dev/pst/pst-iop.h
@@ -102,7 +102,7 @@ struct i2o_sgl {
#define I2O_SGL_END 0x80
u_int32_t phys_addr[1];
-} __attribute__((packed));
+} __packed;
#define I2O_SGL_MAX_SEGS ((I2O_IOP_OUTBOUND_FRAME_SIZE - (8 + 2)) + 1)
@@ -133,7 +133,7 @@ struct i2o_basic_message {
u_int32_t function:8;
u_int32_t initiator_context;
u_int32_t transaction_context;
-} __attribute__((packed));
+} __packed;
/* basic reply layout */
struct i2o_single_reply {
@@ -197,7 +197,7 @@ struct i2o_single_reply {
#define I2O_REPLY_STATUS_PROGRESS_REPORT 0x80
u_int32_t donecount;
-} __attribute__((packed));
+} __packed;
struct i2o_fault_reply {
u_int8_t version_offset;
@@ -239,7 +239,7 @@ struct i2o_fault_reply {
u_int32_t failing_host_unit_id:16;
u_int32_t age_limit;
u_int64_t preserved_mfa;
-} __attribute__((packed));
+} __packed;
struct i2o_exec_iop_reset_message {
u_int8_t version_offset;
@@ -251,7 +251,7 @@ struct i2o_exec_iop_reset_message {
u_int8_t reserved[16];
u_int32_t status_word_low_addr;
u_int32_t status_word_high_addr;
-} __attribute__((packed));
+} __packed;
struct i2o_exec_status_get_message {
u_int8_t version_offset;
@@ -264,7 +264,7 @@ struct i2o_exec_status_get_message {
u_int32_t reply_buf_low_addr;
u_int32_t reply_buf_high_addr;
u_int32_t reply_buf_length;
-} __attribute__((packed));
+} __packed;
struct i2o_status_get_reply {
u_int16_t organization_id;
@@ -301,7 +301,7 @@ struct i2o_status_get_reply {
u_int32_t current_private_iobase;
u_int8_t reserved3[3];
u_int8_t sync_byte;
-} __attribute__((packed));
+} __packed;
struct i2o_exec_init_outqueue_message {
u_int8_t version_offset;
@@ -317,7 +317,7 @@ struct i2o_exec_init_outqueue_message {
u_int8_t reserved;
u_int16_t queue_framesize;
struct i2o_sgl sgl[2];
-} __attribute__((packed));
+} __packed;
#define I2O_EXEC_OUTBOUND_INIT_IN_PROGRESS 0x01
#define I2O_EXEC_OUTBOUND_INIT_REJECTED 0x02
@@ -350,7 +350,7 @@ struct i2o_exec_systab_set_message {
u_int32_t reserved2:4;
u_int32_t reserved3:8;
struct i2o_sgl sgl[3];
-} __attribute__((packed));
+} __packed;
struct i2o_exec_systab {
u_int8_t entries;
@@ -373,7 +373,7 @@ struct i2o_exec_systab {
u_int32_t last_changed;
u_int32_t iop_capabilities;
u_int64_t messenger_info;
-} __attribute__((packed));
+} __packed;
struct i2o_exec_get_lct_message {
u_int8_t version_offset;
@@ -387,7 +387,7 @@ struct i2o_exec_get_lct_message {
u_int32_t class;
u_int32_t last_change_id;
struct i2o_sgl sgl;
-} __attribute__((packed));
+} __packed;
#define I2O_TID_IOP 0x000
#define I2O_TID_HOST 0x001
@@ -428,7 +428,7 @@ struct i2o_lct_entry {
u_int32_t bios_info:8;
u_int8_t identity_tag[8];
u_int32_t event_capabilities;
-} __attribute__((packed));
+} __packed;
#define I2O_LCT_ENTRYSIZE (sizeof(struct i2o_lct_entry)/sizeof(u_int32_t))
@@ -439,7 +439,7 @@ struct i2o_get_lct_reply {
u_int32_t iop_flags;
u_int32_t current_change_id;
struct i2o_lct_entry entry[1];
-} __attribute__((packed));
+} __packed;
struct i2o_util_get_param_message {
u_int8_t version_offset;
@@ -452,7 +452,7 @@ struct i2o_util_get_param_message {
u_int32_t transaction_context;
u_int32_t operation_flags;
struct i2o_sgl sgl[2];
-} __attribute__((packed));
+} __packed;
struct i2o_get_param_template {
u_int16_t operation;
@@ -489,13 +489,13 @@ struct i2o_get_param_template {
u_int16_t field_count;
u_int16_t pad;
-} __attribute__((packed));
+} __packed;
struct i2o_get_param_operation {
u_int16_t operation_count;
u_int16_t reserved;
struct i2o_get_param_template operation[1];
-} __attribute__((packed));
+} __packed;
struct i2o_get_param_reply {
u_int16_t result_count;;
@@ -504,7 +504,7 @@ struct i2o_get_param_reply {
u_int8_t block_status;
u_int8_t error_info_size;
u_int32_t result[1];
-} __attribute__((packed));
+} __packed;
struct i2o_device_identity {
u_int32_t class;
@@ -516,7 +516,7 @@ struct i2o_device_identity {
u_int8_t revision[8];
u_int8_t sn_format;
u_int8_t serial[256];
-} __attribute__((packed));
+} __packed;
struct i2o_bsa_device {
u_int8_t device_type;
@@ -526,7 +526,7 @@ struct i2o_bsa_device {
u_int64_t capacity;
u_int32_t capabilities;
u_int32_t state;
-} __attribute__((packed));
+} __packed;
struct i2o_util_claim_message {
u_int8_t version_offset;
@@ -540,7 +540,7 @@ struct i2o_util_claim_message {
u_int16_t claim_flags;
u_int8_t reserved;
u_int8_t claim_type;
-} __attribute__((packed));
+} __packed;
struct i2o_util_event_register_message {
u_int8_t version_offset;
@@ -552,7 +552,7 @@ struct i2o_util_event_register_message {
u_int32_t initiator_context;
u_int32_t transaction_context;
u_int32_t event_mask;
-} __attribute__((packed));
+} __packed;
struct i2o_util_event_reply_message {
u_int8_t version_offset;
@@ -565,7 +565,7 @@ struct i2o_util_event_reply_message {
u_int32_t transaction_context;
u_int32_t event_mask;
u_int32_t event_data[1];
-} __attribute__((packed));
+} __packed;
struct i2o_util_config_dialog_message {
u_int8_t version_offset;
@@ -578,7 +578,7 @@ struct i2o_util_config_dialog_message {
u_int32_t transaction_context;
u_int32_t page_number;
struct i2o_sgl sgl[2];
-} __attribute__((packed));
+} __packed;
struct i2o_bsa_rw_block_message {
u_int8_t version_offset;
@@ -595,7 +595,7 @@ struct i2o_bsa_rw_block_message {
u_int32_t bytecount;
u_int64_t lba;
struct i2o_sgl sgl;
-} __attribute__((packed));
+} __packed;
struct i2o_bsa_cache_flush_message {
u_int8_t version_offset;
@@ -609,7 +609,7 @@ struct i2o_bsa_cache_flush_message {
u_int16_t control_flags;
u_int8_t time_multiplier;
u_int8_t reserved;
-} __attribute__((packed));
+} __packed;
/* prototypes */
int iop_init(struct iop_softc *);
diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h
index 12ce0d6..f139021 100644
--- a/sys/dev/twe/twereg.h
+++ b/sys/dev/twe/twereg.h
@@ -160,7 +160,7 @@ typedef struct
{
u_int32_t address;
u_int32_t length;
-} TWE_SG_Entry __attribute__ ((packed));
+} TWE_SG_Entry __packed;
typedef struct {
u_int8_t opcode:5; /* TWE_OP_INITCONNECTION */
@@ -173,7 +173,7 @@ typedef struct {
u_int8_t flags;
u_int16_t message_credits;
u_int32_t response_queue_pointer;
-} TWE_Command_INITCONNECTION __attribute__ ((packed));
+} TWE_Command_INITCONNECTION __packed;
typedef struct
{
@@ -188,7 +188,7 @@ typedef struct
u_int16_t block_count;
u_int32_t lba;
TWE_SG_Entry sgl[TWE_MAX_SGL_LENGTH];
-} TWE_Command_IO __attribute__ ((packed));
+} TWE_Command_IO __packed;
typedef struct
{
@@ -205,7 +205,7 @@ typedef struct
#define TWE_OP_HOTSWAP_ADD_CBOD 0x01 /* add CBOD to empty port */
#define TWE_OP_HOTSWAP_ADD_SPARE 0x02 /* add spare to empty port */
u_int8_t aport;
-} TWE_Command_HOTSWAP __attribute__ ((packed));
+} TWE_Command_HOTSWAP __packed;
typedef struct
{
@@ -223,7 +223,7 @@ typedef struct
u_int8_t feature_mode;
u_int16_t all_units;
u_int16_t persistence;
-} TWE_Command_SETATAFEATURE __attribute__ ((packed));
+} TWE_Command_SETATAFEATURE __packed;
typedef struct
{
@@ -236,7 +236,7 @@ typedef struct
u_int8_t status;
u_int8_t flags;
u_int16_t target_status; /* set low byte to target request's ID */
-} TWE_Command_CHECKSTATUS __attribute__ ((packed));
+} TWE_Command_CHECKSTATUS __packed;
typedef struct
{
@@ -250,7 +250,7 @@ typedef struct
u_int8_t flags;
u_int16_t param_count;
TWE_SG_Entry sgl[TWE_MAX_SGL_LENGTH];
-} TWE_Command_PARAM __attribute__ ((packed));
+} TWE_Command_PARAM __packed;
typedef struct
{
@@ -269,7 +269,7 @@ typedef struct
#define TWE_OP_REBUILDUNIT_STARTUNIT 5 /* rebuild src_unit (not supported) */
u_int8_t cs:1; /* request state change on src_unit */
u_int8_t logical_subunit; /* for RAID10 rebuild of logical subunit */
-} TWE_Command_REBUILDUNIT __attribute__ ((packed));
+} TWE_Command_REBUILDUNIT __packed;
typedef struct
{
@@ -289,7 +289,7 @@ typedef struct
u_int8_t drive_head;
u_int8_t command;
TWE_SG_Entry sgl[TWE_MAX_ATA_SGL_LENGTH];
-} TWE_Command_ATA __attribute__ ((packed));
+} TWE_Command_ATA __packed;
typedef struct
{
@@ -307,7 +307,7 @@ typedef struct
#define TWE_FLAGS_FATAL 0x03
#define TWE_FLAGS_PERCENTAGE (1<<8) /* bits 0-6 indicate completion percentage */
u_int16_t count; /* block count, parameter count, message credits */
-} TWE_Command_Generic __attribute__ ((packed));
+} TWE_Command_Generic __packed;
/* command packet - must be TWE_ALIGNMENT aligned */
typedef union
@@ -451,7 +451,7 @@ typedef struct
u_int8_t log_drv_num; /* must be zero for configuration == 0x0f */
u_int32_t start_lba;
u_int32_t block_count; /* actual drive size if configuration == 0x0f, otherwise less DCB size */
-} TWE_Unit_Descriptor __attribute__ ((packed));
+} TWE_Unit_Descriptor __packed;
typedef struct
{
@@ -459,7 +459,7 @@ typedef struct
u_int8_t res1;
u_int8_t mirunit_status[4]; /* bitmap of functional subunits in each mirror */
u_int8_t res2[6];
-} TWE_Mirror_Descriptor __attribute__ ((packed));
+} TWE_Mirror_Descriptor __packed;
typedef struct
{
@@ -480,7 +480,7 @@ typedef struct
u_int32_t start_lba;
u_int32_t block_count; /* actual drive size if configuration == 0x0f, otherwise less DCB size */
TWE_Unit_Descriptor subunit[0]; /* subunit descriptors, in RAID10 mode is [mirunit][subunit] */
-} TWE_Array_Descriptor __attribute__ ((packed));
+} TWE_Array_Descriptor __packed;
typedef struct
{
@@ -488,5 +488,5 @@ typedef struct
u_int8_t parameter_id;
u_int8_t parameter_size_bytes;
u_int8_t data[0];
-} TWE_Param __attribute__ ((packed));
+} TWE_Param __packed;
diff --git a/sys/fs/udf/ecma167-udf.h b/sys/fs/udf/ecma167-udf.h
index 149a4da..4391508 100644
--- a/sys/fs/udf/ecma167-udf.h
+++ b/sys/fs/udf/ecma167-udf.h
@@ -55,25 +55,25 @@ struct desc_tag {
uint16_t desc_crc;
uint16_t desc_crc_len;
uint32_t tag_loc;
-} __attribute__ ((packed));
+} __packed;
/* Recorded Address [4/7.1] */
struct lb_addr {
uint32_t lb_num;
uint16_t part_num;
-} __attribute__ ((packed));
+} __packed;
/* Extent Descriptor [3/7.1] */
struct extent_ad {
uint32_t len;
uint32_t loc;
-} __attribute__ ((packed));
+} __packed;
/* Short Allocation Descriptor [4/14.14.1] */
struct short_ad {
uint32_t len;
uint32_t pos;
-} __attribute__ ((packed));
+} __packed;
/* Long Allocation Descriptor [4/14.14.2] */
struct long_ad {
@@ -81,7 +81,7 @@ struct long_ad {
struct lb_addr loc;
uint16_t ad_flags;
uint32_t ad_id;
-} __attribute__ ((packed));
+} __packed;
/* Extended Allocation Descriptor [4/14.14.3] */
struct ext_ad {
@@ -90,7 +90,7 @@ struct ext_ad {
uint32_t inf_len;
struct lb_addr ex_loc;
uint8_t reserved[2];
-} __attribute__ ((packed));
+} __packed;
union icb {
struct short_ad s_ad;
@@ -102,7 +102,7 @@ union icb {
struct charspec {
uint8_t type;
uint8_t inf[63];
-} __attribute__ ((packed));
+} __packed;
/* Timestamp [1/7.3] */
struct timestamp {
@@ -116,7 +116,7 @@ struct timestamp {
uint8_t centisec;
uint8_t hund_usec;
uint8_t usec;
-} __attribute__ ((packed));
+} __packed;
/* Entity Identifier [1/7.4] */
#define UDF_REGID_ID_SIZE 23
@@ -124,7 +124,7 @@ struct regid {
uint8_t flags;
uint8_t id[UDF_REGID_ID_SIZE];
uint8_t id_suffix[8];
-} __attribute__ ((packed));
+} __packed;
/* ICB Tag [4/14.6] */
struct icb_tag {
@@ -136,7 +136,7 @@ struct icb_tag {
uint8_t file_type;
struct lb_addr parent_icb;
uint16_t flags;
-} __attribute__ ((packed));
+} __packed;
#define UDF_ICB_TAG_FLAGS_SETUID 0x40
#define UDF_ICB_TAG_FLAGS_SETGID 0x80
#define UDF_ICB_TAG_FLAGS_STICKY 0x100
@@ -146,14 +146,14 @@ struct anchor_vdp {
struct desc_tag tag;
struct extent_ad main_vds_ex;
struct extent_ad reserve_vds_ex;
-} __attribute__ ((packed));
+} __packed;
/* Volume Descriptor Pointer [3/10.3] */
struct vol_desc_ptr {
struct desc_tag tag;
uint32_t vds_number;
struct extent_ad next_vds_ex;
-} __attribute__ ((packed));
+} __packed;
/* Primary Volume Descriptor [3/10.1] */
struct pri_vol_desc {
@@ -179,7 +179,7 @@ struct pri_vol_desc {
uint32_t prev_vds_lov;
uint16_t flags;
uint8_t reserved[22];
-} __attribute__ ((packed));
+} __packed;
/* Logical Volume Descriptor [3/10.6] */
struct logvol_desc {
@@ -199,7 +199,7 @@ struct logvol_desc {
uint8_t imp_use[128];
struct extent_ad integrity_seq_id;
uint8_t maps[1];
-} __attribute__ ((packed));
+} __packed;
#define UDF_PMAP_SIZE 64
@@ -209,14 +209,14 @@ struct part_map_1 {
uint8_t len;
uint16_t vol_seq_num;
uint16_t part_num;
-} __attribute__ ((packed));
+} __packed;
/* Type 2 Partition Map [3/10.7.3] */
struct part_map_2 {
uint8_t type;
uint8_t len;
uint8_t part_id[62];
-} __attribute__ ((packed));
+} __packed;
/* Virtual Partition Map [UDF 2.01/2.2.8] */
struct part_map_virt {
@@ -227,7 +227,7 @@ struct part_map_virt {
uint16_t vol_seq_num;
uint16_t part_num;
uint8_t reserved1[24];
-} __attribute__ ((packed));
+} __packed;
/* Sparable Partition Map [UDF 2.01/2.2.9] */
struct part_map_spare {
@@ -242,7 +242,7 @@ struct part_map_spare {
uint8_t reserved1;
uint32_t st_size;
uint32_t st_loc[1];
-} __attribute__ ((packed));
+} __packed;
union udf_pmap {
uint8_t data[UDF_PMAP_SIZE];
@@ -256,7 +256,7 @@ union udf_pmap {
struct spare_map_entry {
uint32_t org;
uint32_t map;
-} __attribute__ ((packed));
+} __packed;
/* Sparing Table [UDF 2.01/2.2.11] */
struct udf_sparing_table {
@@ -266,7 +266,7 @@ struct udf_sparing_table {
uint8_t reserved[2];
uint32_t seq_num;
struct spare_map_entry entries[1];
-} __attribute__ ((packed));
+} __packed;
/* Partition Descriptor [3/10.5] */
struct part_desc {
@@ -282,7 +282,7 @@ struct part_desc {
struct regid imp_id;
uint8_t imp_use[128];
uint8_t reserved[156];
-} __attribute__ ((packed));
+} __packed;
/* File Set Descriptor [4/14.1] */
struct fileset_desc {
@@ -305,7 +305,7 @@ struct fileset_desc {
struct long_ad next_ex;
struct long_ad streamdir_icb;
uint8_t reserved[32];
-} __attribute__ ((packed));
+} __packed;
/* File Identifier Descriptor [4/14.4] */
struct fileid_desc {
@@ -316,7 +316,7 @@ struct fileid_desc {
struct long_ad icb;
uint16_t l_iu; /* Length of implementaion use area */
uint8_t data[1];
-} __attribute__ ((packed));
+} __packed;
#define UDF_FID_SIZE 38
#define UDF_FILE_CHAR_VIS (1 << 0) /* Visible */
#define UDF_FILE_CHAR_DIR (1 << 1) /* Directory */
@@ -347,7 +347,7 @@ struct file_entry {
uint32_t l_ea; /* Length of extended attribute area */
uint32_t l_ad; /* Length of allocation descriptors */
uint8_t data[1];
-} __attribute ((packed));
+} __packed;
#define UDF_FENTRY_SIZE 176
#define UDF_FENTRY_PERM_USER_MASK 0x07
#define UDF_FENTRY_PERM_GRP_MASK 0xE0
diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c
index 6b71206..13879f1 100644
--- a/sys/i386/bios/mca_machdep.c
+++ b/sys/i386/bios/mca_machdep.c
@@ -59,7 +59,7 @@ struct sys_config {
#define FEATURE_IC2 0x40 /* Second interrupt chip present */
#define FEATURE_DMA3 0x80 /* DMA channel 3 used by hard disk BIOS */
u_int8_t pad[3];
-} __attribute__ ((packed));
+} __packed;
/* Function Prototypes */
static void bios_mcabus_present (void *);
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index d45edc7..747a3a1 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -493,7 +493,7 @@ struct pnp_sysdev
#define PNPATTR_CONFIG(a) (((a) >> 7) & 0x3)
/* device-specific data comes here */
u_int8_t devdata[0];
-} __attribute__ ((packed));
+} __packed;
/* We have to cluster arguments within a 64k range for the bios16 call */
struct pnp_sysdevargs
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index b3464a3..356161b 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -110,7 +110,7 @@ xenix_ftime(td, uap)
{
struct timeval tv;
struct ibcs2_timeb {
- unsigned long time __attribute__((packed));
+ unsigned long time __packed;
unsigned short millitm;
short timezone;
short dstflag;
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index cdf7c94..fe1f703 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -83,7 +83,7 @@ struct PnPBIOS_table
u_int32_t oemdevid; /* motherboard EISA ID */
u_int16_t rmbiosseg; /* real-mode BIOS segment */
u_int32_t pmdataseg; /* protected-mode data segment */
-} __attribute__ ((packed));
+} __packed;
/*
@@ -243,13 +243,13 @@ struct PIR_header
u_int32_t ph_miniport;
u_int8_t ph_res[11];
u_int8_t ph_checksum;
-} __attribute__ ((packed));
+} __packed;
struct PIR_intpin
{
u_int8_t link;
u_int16_t irqs;
-} __attribute__ ((packed));
+} __packed;
struct PIR_entry
{
@@ -259,13 +259,13 @@ struct PIR_entry
struct PIR_intpin pe_intpin[4];
u_int8_t pe_slot;
u_int8_t pe_res3;
-} __attribute__ ((packed));
+} __packed;
struct PIR_table
{
struct PIR_header pt_header;
struct PIR_entry pt_entry[0];
-} __attribute__ ((packed));
+} __packed;
/*
* Int 15:E820 'SMAP' structure
@@ -277,4 +277,4 @@ struct bios_smap {
u_int64_t base;
u_int64_t length;
u_int32_t type;
-} __attribute__ ((packed));
+} __packed;
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index 0e943f7..0e991cd 100644
--- a/sys/i386/include/pc/vesa.h
+++ b/sys/i386/include/pc/vesa.h
@@ -32,20 +32,20 @@
struct vesa_info
{
/* mandatory fields */
- u_int8_t v_sig[4] __attribute__ ((packed)); /* VESA */
- u_int16_t v_version __attribute__ ((packed)); /* ver in BCD */
- u_int32_t v_oemstr __attribute__ ((packed)); /* OEM string */
- u_int32_t v_flags __attribute__ ((packed)); /* flags */
+ u_int8_t v_sig[4] __packed; /* VESA */
+ u_int16_t v_version __packed; /* ver in BCD */
+ u_int32_t v_oemstr __packed; /* OEM string */
+ u_int32_t v_flags __packed; /* flags */
#define V_DAC8 (1<<0)
#define V_NONVGA (1<<1)
#define V_SNOW (1<<2)
- u_int32_t v_modetable __attribute__ ((packed)); /* modes */
- u_int16_t v_memsize __attribute__ ((packed)); /* in 64K */
+ u_int32_t v_modetable __packed; /* modes */
+ u_int16_t v_memsize __packed; /* in 64K */
/* 2.0 */
- u_int16_t v_revision __attribute__ ((packed)); /* software rev */
- u_int32_t v_venderstr __attribute__ ((packed)); /* vender */
- u_int32_t v_prodstr __attribute__ ((packed)); /* product name */
- u_int32_t v_revstr __attribute__ ((packed)); /* product rev */
+ u_int16_t v_revision __packed; /* software rev */
+ u_int32_t v_venderstr __packed; /* vender */
+ u_int32_t v_prodstr __packed; /* product name */
+ u_int32_t v_revstr __packed; /* product rev */
};
struct vesa_mode
diff --git a/sys/i386/isa/mca_machdep.c b/sys/i386/isa/mca_machdep.c
index 6b71206..13879f1 100644
--- a/sys/i386/isa/mca_machdep.c
+++ b/sys/i386/isa/mca_machdep.c
@@ -59,7 +59,7 @@ struct sys_config {
#define FEATURE_IC2 0x40 /* Second interrupt chip present */
#define FEATURE_DMA3 0x80 /* DMA channel 3 used by hard disk BIOS */
u_int8_t pad[3];
-} __attribute__ ((packed));
+} __packed;
/* Function Prototypes */
static void bios_mcabus_present (void *);
diff --git a/sys/ia64/include/pc/vesa.h b/sys/ia64/include/pc/vesa.h
index 96f027e..c2c2b16 100644
--- a/sys/ia64/include/pc/vesa.h
+++ b/sys/ia64/include/pc/vesa.h
@@ -36,20 +36,20 @@
struct vesa_info
{
/* mandatory fields */
- u_int8_t v_sig[4] __attribute__ ((packed)); /* VESA */
- u_int16_t v_version __attribute__ ((packed)); /* ver in BCD */
- u_int32_t v_oemstr __attribute__ ((packed)); /* OEM string */
- u_int32_t v_flags __attribute__ ((packed)); /* flags */
+ u_int8_t v_sig[4] __packed; /* VESA */
+ u_int16_t v_version __packed; /* ver in BCD */
+ u_int32_t v_oemstr __packed; /* OEM string */
+ u_int32_t v_flags __packed; /* flags */
#define V_DAC8 (1<<0)
#define V_NONVGA (1<<1)
#define V_SNOW (1<<2)
- u_int32_t v_modetable __attribute__ ((packed)); /* modes */
- u_int16_t v_memsize __attribute__ ((packed)); /* in 64K */
+ u_int32_t v_modetable __packed; /* modes */
+ u_int16_t v_memsize __packed; /* in 64K */
/* 2.0 */
- u_int16_t v_revision __attribute__ ((packed)); /* software rev */
- u_int32_t v_venderstr __attribute__ ((packed)); /* vender */
- u_int32_t v_prodstr __attribute__ ((packed)); /* product name */
- u_int32_t v_revstr __attribute__ ((packed)); /* product rev */
+ u_int16_t v_revision __packed; /* software rev */
+ u_int32_t v_venderstr __packed; /* vender */
+ u_int32_t v_prodstr __packed; /* product name */
+ u_int32_t v_revstr __packed; /* product rev */
};
struct vesa_mode
diff --git a/sys/modules/splash/bmp/splash_bmp.c b/sys/modules/splash/bmp/splash_bmp.c
index 95fc421..4db9cb6 100644
--- a/sys/modules/splash/bmp/splash_bmp.c
+++ b/sys/modules/splash/bmp/splash_bmp.c
@@ -178,43 +178,43 @@ bmp_splash(video_adapter_t *adp, int on)
*/
typedef struct tagBITMAPFILEHEADER { /* bmfh */
- u_short bfType __attribute__ ((packed));
- int bfSize __attribute__ ((packed));
- u_short bfReserved1 __attribute__ ((packed));
- u_short bfReserved2 __attribute__ ((packed));
- int bfOffBits __attribute__ ((packed));
+ u_short bfType __packed;
+ int bfSize __packed;
+ u_short bfReserved1 __packed;
+ u_short bfReserved2 __packed;
+ int bfOffBits __packed;
} BITMAPFILEHEADER;
typedef struct tagBITMAPINFOHEADER { /* bmih */
- int biSize __attribute__ ((packed));
- int biWidth __attribute__ ((packed));
- int biHeight __attribute__ ((packed));
- short biPlanes __attribute__ ((packed));
- short biBitCount __attribute__ ((packed));
- int biCompression __attribute__ ((packed));
- int biSizeImage __attribute__ ((packed));
- int biXPelsPerMeter __attribute__ ((packed));
- int biYPelsPerMeter __attribute__ ((packed));
- int biClrUsed __attribute__ ((packed));
- int biClrImportant __attribute__ ((packed));
+ int biSize __packed;
+ int biWidth __packed;
+ int biHeight __packed;
+ short biPlanes __packed;
+ short biBitCount __packed;
+ int biCompression __packed;
+ int biSizeImage __packed;
+ int biXPelsPerMeter __packed;
+ int biYPelsPerMeter __packed;
+ int biClrUsed __packed;
+ int biClrImportant __packed;
} BITMAPINFOHEADER;
typedef struct tagRGBQUAD { /* rgbq */
- u_char rgbBlue __attribute__ ((packed));
- u_char rgbGreen __attribute__ ((packed));
- u_char rgbRed __attribute__ ((packed));
- u_char rgbReserved __attribute__ ((packed));
+ u_char rgbBlue __packed;
+ u_char rgbGreen __packed;
+ u_char rgbRed __packed;
+ u_char rgbReserved __packed;
} RGBQUAD;
typedef struct tagBITMAPINFO { /* bmi */
- BITMAPINFOHEADER bmiHeader __attribute__ ((packed));
- RGBQUAD bmiColors[256] __attribute__ ((packed));
+ BITMAPINFOHEADER bmiHeader __packed;
+ RGBQUAD bmiColors[256] __packed;
} BITMAPINFO;
typedef struct tagBITMAPF
{
- BITMAPFILEHEADER bmfh __attribute__ ((packed));
- BITMAPINFO bmfi __attribute__ ((packed));
+ BITMAPFILEHEADER bmfh __packed;
+ BITMAPINFO bmfi __packed;
} BITMAPF;
#define BI_RGB 0
diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c
index 4ae0268..3da4bf8 100644
--- a/sys/netgraph/ng_pppoe.c
+++ b/sys/netgraph/ng_pppoe.c
@@ -870,7 +870,7 @@ pppoe_start(sessp sp)
struct {
struct pppoe_tag hdr;
union uniq data;
- } __attribute ((packed)) uniqtag;
+ } __packed uniqtag;
/*
* kick the state machine into starting up
@@ -950,7 +950,7 @@ ng_pppoe_rcvdata(hook_p hook, item_p item)
struct {
struct pppoe_tag hdr;
union uniq data;
- } __attribute ((packed)) uniqtag;
+ } __packed uniqtag;
negp neg = NULL;
struct mbuf *m;
diff --git a/sys/netgraph/ng_pppoe.h b/sys/netgraph/ng_pppoe.h
index 78865b5..4f3a916 100644
--- a/sys/netgraph/ng_pppoe.h
+++ b/sys/netgraph/ng_pppoe.h
@@ -197,7 +197,7 @@ struct pppoe_tag {
u_int16_t tag_type;
u_int16_t tag_len;
char tag_data[0];
-}__attribute ((packed));
+}__packed;
struct pppoe_hdr{
u_int8_t ver:4;
@@ -206,13 +206,13 @@ struct pppoe_hdr{
u_int16_t sid;
u_int16_t length;
struct pppoe_tag tag[0];
-}__attribute__ ((packed));
+}__packed;
struct pppoe_full_hdr {
struct ether_header eh;
struct pppoe_hdr ph;
-}__attribute__ ((packed));
+}__packed;
union packet {
struct pppoe_full_hdr pkt_header;
diff --git a/sys/netncp/ncp.h b/sys/netncp/ncp.h
index 57c4cae..c00f935 100644
--- a/sys/netncp/ncp.h
+++ b/sys/netncp/ncp.h
@@ -66,7 +66,7 @@ struct ncp_fh_s {
u_int32_t val32;
u_int16_t val16;
} val;
-} __attribute__((packed));
+} __packed;
typedef struct ncp_fh_s ncp_fh;
@@ -133,7 +133,7 @@ struct nw_queue_job_entry {
u_int32_t ServerObjectID;
char JobTextDescription[50];
char ClientRecordArea[152];
-} __attribute__((packed));
+} __packed;
struct queue_job {
struct nw_queue_job_entry j;
@@ -168,13 +168,13 @@ struct print_job_record {
char FnameBanner[13];
char FnameHeader[14];
char Path[80];
-} __attribute__((packed));
+} __packed;
struct ncp_station_addr {
u_int32_t NetWork;
u_int8_t Node[6];
u_int16_t Socket;
-} __attribute__((packed));
+} __packed;
struct ncp_prop_login_control {
u_int8_t AccountExpireDate[3];
@@ -193,7 +193,7 @@ struct ncp_prop_login_control {
u_int16_t BadLoginCount;
u_int32_t BadLoginCountDown;
struct ncp_station_addr LastIntruder;
-} __attribute__((packed));
+} __packed;
#define NCP_VOLNAME_LEN (16)
#define NCP_NUMBER_OF_VOLUMES (64)
@@ -313,7 +313,7 @@ struct nw_entry_info {
u_int32_t NSCreator;
u_int8_t nameLen;
u_int8_t entryName[256];
-} __attribute__((packed));
+} __packed;
typedef struct nw_entry_info NW_ENTRY_INFO;
@@ -347,13 +347,13 @@ struct nw_modify_dos_info {
u_int16_t inheritanceGrantMask;
u_int16_t inheritanceRevokeMask;
u_int32_t maximumSpace;
-} __attribute__((packed));
+} __packed;
struct nw_search_seq {
u_int8_t volNumber;
u_int32_t dirNumber;
u_int32_t searchDirNumber;
-} __attribute__((packed));
+} __packed;
typedef struct nw_search_seq SEARCH_SEQUENCE;
@@ -376,7 +376,7 @@ struct ncp_file_server_info {
u_int8_t RestrictionLevel;
u_int8_t InternetBridge;
u_int8_t Reserved[60];
-} __attribute__((packed));
+} __packed;
struct nw_time_buffer {
u_int8_t year;
@@ -386,6 +386,6 @@ struct nw_time_buffer {
u_int8_t minute;
u_int8_t second;
u_int8_t wday;
-} __attribute__((packed));
+} __packed;
#endif /*_NCP_H_ */
diff --git a/sys/netncp/ncp_file.h b/sys/netncp/ncp_file.h
index e5ecea9..24dae7e 100644
--- a/sys/netncp/ncp_file.h
+++ b/sys/netncp/ncp_file.h
@@ -58,7 +58,7 @@ typedef struct {
nuint32 deletedDateAndTime;
nuint32 deletorID;
nuint8 reserved3 [16];
-} __attribute__((packed)) NWDELETED_INFO;
+} __packed NWDELETED_INFO;
__BEGIN_DECLS
diff --git a/sys/netncp/ncp_ncp.h b/sys/netncp/ncp_ncp.h
index d715399..68c0042 100644
--- a/sys/netncp/ncp_ncp.h
+++ b/sys/netncp/ncp_ncp.h
@@ -62,7 +62,7 @@ struct ncp_rqhdr {
u_int8_t conn_high;
u_int8_t fn;
u_int8_t data[0];
-} __attribute__((packed));
+} __packed;
struct ncp_rphdr {
@@ -74,7 +74,7 @@ struct ncp_rphdr {
u_int8_t completion_code;
u_int8_t connection_state;
u_int8_t data[0];
-}__attribute__((packed));
+}__packed;
#define BFL_ABT 0x04
#define BFL_EOB 0x10
@@ -103,7 +103,7 @@ struct ncp_bursthdr {
u_long bh_dofs; /* HL */
u_short bh_dlen; /* HL */
u_short bh_misfrags; /* HL */
-} __attribute__((packed));
+} __packed;
struct ncp_conn;
struct ncp_conn_args;
diff --git a/sys/pc98/pc98/wd_cd.h b/sys/pc98/pc98/wd_cd.h
index 8a6001c..1255546 100644
--- a/sys/pc98/pc98/wd_cd.h
+++ b/sys/pc98/pc98/wd_cd.h
@@ -281,7 +281,7 @@ struct write_param {
u_char vendor_specific_byte3;
*/
-} __attribute__((packed));
+} __packed;
/*
* CDROM Read Track Information structure
*/
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 5955610..a6dbe1b 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -160,7 +160,7 @@ struct wst_reqsense {
u_int ili :1; /* Incorrect Length Indicator */
u_int eom :1; /* End Of Medium */
u_int filemark :1; /* Filemark */
- u_int info __attribute__((packed)); /* Cmd specific info */
+ u_int info __packed; /* Cmd specific info */
u_char asl; /* Additional sense length (n-7) */
u_int command_specific; /* Additional cmd specific info */
u_char asc; /* Additional Sense Code */
OpenPOWER on IntegriCloud