attribute packed -> __packed

ok miod@ a while ago, ok pyr@

2 files changed, 62 insertions, 62 deletions

diff --git a/sys/dev/ic/aacreg.h b/sys/dev/ic/aacreg.h
index 073b118885d..d0c5587d334 100644
--- a/sys/dev/ic/aacreg.h
+++ b/sys/dev/ic/aacreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aacreg.h,v 1.8 2006/04/22 02:36:26 brad Exp $	*/
+/*	$OpenBSD: aacreg.h,v 1.9 2007/10/04 19:33:11 gilles Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -87,7 +87,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
@@ -109,7 +109,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
@@ -133,7 +133,7 @@ struct aac_queue_table {
 struct aac_fib_list_entry {
 	u_int32_t	Flink;
 	u_int32_t	Blink;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * FIB (FSA Interface Block?); this is the datastructure passed between the host
@@ -156,14 +156,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
@@ -287,7 +287,7 @@ struct aac_adapter_init {
 #define	AAC_PAGE_SIZE				4096
 	u_int32_t	HostPhysMemPages;
 	u_int32_t	HostElapsedSeconds;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Shared data types
@@ -342,17 +342,17 @@ typedef enum {
 struct aac_sg_entry {
 	u_int32_t	SgAddress;
 	u_int32_t	SgByteCount;
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_sg_entry64 {
 	u_int64_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.
@@ -360,7 +360,7 @@ struct aac_sg_table {
 struct aac_sg_table64 {
 	u_int32_t	SgCount;
 	struct aac_sg_entry64	SgEntry64[0];
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Container creation data
@@ -376,7 +376,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
@@ -405,7 +405,7 @@ struct FsaRevision {
 		u_int32_t	ul;
 	} external;
 	u_int32_t	buildNumber;
-}  __attribute__ ((__packed__));
+}  __packed;
 
 /*
  * Adapter Information
@@ -528,7 +528,7 @@ struct aac_adapter_info {
 	u_int32_t		SupportedOptions; /* supported features of this
 						   * controller */
 	AAC_OemFlavor	OemVariant;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Monitor/Kernel interface.
@@ -611,7 +611,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 */
@@ -631,7 +631,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
@@ -692,7 +692,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
@@ -708,7 +708,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;
@@ -717,7 +717,7 @@ struct aac_AifJobProgressReport {
 	u_int32_t		currentTick;
 	u_int32_t		jobSpecificData1;
 	u_int32_t		jobSpecificData2;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Event Notification
@@ -753,46 +753,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,
@@ -806,7 +806,7 @@ typedef enum {
 
 struct aac_AifEnsClusterEvent {
 	AAC_ClusterAifEvent	eventType;
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_AifEventNotify {
 	AAC_AifEventNotifyType	type;
@@ -822,7 +822,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
@@ -860,7 +860,7 @@ struct aac_aif_command {
 		u_int8_t			AR[AAC_AIF_REPORT_MAX_SIZE];
 		u_int8_t			data[AAC_FIB_DATASIZE - 8];
 	} data;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Filesystem commands/data
@@ -998,20 +998,20 @@ struct aac_mntobj {
 		u_int32_t	pad[8];
 	} ObjExtension;
 	u_int32_t			AlterEgoId;
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_mntinfo {
 	u_int32_t		Command;
 	u_int32_t		MntType;
 	u_int32_t		MntCount;
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_mntinforesp {
 	u_int32_t		Status;
 	u_int32_t		MntType;
 	u_int32_t		MntRespCount;
 	struct aac_mntobj	MntTable[1];
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Container shutdown command.
@@ -1019,7 +1019,7 @@ struct aac_mntinforesp {
 struct aac_closecommand {
 	u_int32_t	Command;
 	u_int32_t	ContainerId;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Container Config Command
@@ -1029,13 +1029,13 @@ struct aac_ctcfg {
 	u_int32_t		Command;
 	u_int32_t		cmd;
 	u_int32_t		param;
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_ctcfg_resp {
 	u_int32_t		Status;
 	u_int32_t		resp;
 	u_int32_t		param;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * 'Ioctl' commads
@@ -1053,7 +1053,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 {
 	u_int32_t		Command;
@@ -1062,7 +1062,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 {
 	u_int32_t		Status;
@@ -1071,7 +1071,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))
@@ -1150,7 +1150,7 @@ struct aac_blockread {
 	u_int32_t		BlockNumber;
 	u_int32_t		ByteCount;
 	struct aac_sg_table	SgMap;		/* variable size */
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_blockread64 {
 	u_int32_t		Command;
@@ -1160,12 +1160,12 @@ struct aac_blockread64 {
 	u_int16_t		Pad;
 	u_int16_t		Flags;
 	struct aac_sg_table64	SgMap64;
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_blockread_response {
 	u_int32_t		Status;
 	u_int32_t		ByteCount;
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_blockwrite {
 	u_int32_t		Command;	/* not FSACommand! */
@@ -1174,7 +1174,7 @@ struct aac_blockwrite {
 	u_int32_t		ByteCount;
 	u_int32_t		Stable;
 	struct aac_sg_table	SgMap;		/* variable size */
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_blockwrite64 {
 	u_int32_t		Command;	/* not FSACommand! */
@@ -1184,13 +1184,13 @@ struct aac_blockwrite64 {
 	u_int16_t		Pad;
 	u_int16_t		Flags;
 	struct aac_sg_table64	SgMap64;	/* variable size */
-} __attribute__ ((__packed__));
+} __packed;
 
 struct aac_blockwrite_response {
 	u_int32_t		Status;
 	u_int32_t		ByteCount;
 	u_int32_t		Committed;
-} __attribute__ ((__packed__));
+} __packed;
 
 /*
  * Container shutdown command.
diff --git a/sys/dev/ic/anreg.h b/sys/dev/ic/anreg.h
index 864720d5acb..46cfb1734a7 100644
--- a/sys/dev/ic/anreg.h
+++ b/sys/dev/ic/anreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: anreg.h,v 1.10 2006/01/09 21:19:47 jsg Exp $	*/
+/*	$OpenBSD: anreg.h,v 1.11 2007/10/04 19:33:11 gilles Exp $	*/
 /*	$NetBSD: anreg.h,v 1.11 2005/01/15 11:01:46 dyoung Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -257,7 +257,7 @@ struct an_rid_genconfig {
 	u_int8_t		an_magic_packet_ctl;	/* 0x99 */
 	u_int16_t		an_rsvd9;
 	u_int16_t               an_spare[24];
-} __attribute__((__packed__));
+} __packed;
 
 #define AN_OPMODE_IBSS_ADHOC			0x0000
 #define AN_OPMODE_INFRASTRUCTURE_STATION	0x0001
@@ -331,7 +331,7 @@ struct an_rid_ssidlist {
 		u_int16_t	an_ssid_len;
 		char		an_ssid[32];
 	} __attribute__((__packed__)) an_entry[3];	/* 25 for fwver.5 */
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Valid AP list.
@@ -342,7 +342,7 @@ struct an_rid_aplist {
 	u_int8_t		an_ap2[8];
 	u_int8_t		an_ap3[8];
 	u_int8_t		an_ap4[8];
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Driver name.
@@ -350,7 +350,7 @@ struct an_rid_aplist {
 #define AN_RID_DRVNAME		0xFF13
 struct an_rid_drvname {
 	u_int8_t		an_drvname[16];
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Frame encapsulation.
@@ -361,8 +361,8 @@ struct an_rid_encap {
 	struct an_rid_encap_entry {
 		u_int16_t	an_ethertype;
 		u_int16_t	an_action;
-	} __attribute__((__packed__)) an_entry[AN_ENCAP_NENTS];
-} __attribute__((__packed__));
+	} __packed an_entry[AN_ENCAP_NENTS];
+} __packed;
 
 #define AN_ENCAP_ACTION_RX	0x0001
 #define AN_ENCAP_ACTION_TX	0x0002
@@ -410,7 +410,7 @@ struct an_rid_caps {
 	/* extended capabilities */
 	u_int16_t		an_ext_softcaps;	/* 0x82 */
 	u_int16_t		an_spare[34];
-} __attribute__((__packed__));
+} __packed;
 
 #define	AN_REGDOMAIN_USA	0
 #define	AN_REGDOMAIN_EUROPE	1
@@ -436,7 +436,7 @@ struct an_rid_caps {
 struct an_rid_apinfo {
 	u_int16_t		an_tim_addr;
 	u_int16_t		an_airo_addr;
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Radio info (read only).
@@ -487,7 +487,7 @@ struct an_rid_status {
 	u_int16_t		an_avg_noise_prev_min;	/* 0x7C */
 	u_int16_t		an_max_noise_prev_min;	/* 0x7E */
 	u_int16_t		an_spare[11];
-} __attribute__((__packed__));
+} __packed;
 
 #define AN_STATUS_OPMODE_CONFIGURED		0x0001
 #define AN_STATUS_OPMODE_MAC_ENABLED		0x0002
@@ -610,7 +610,7 @@ struct an_rid_stats {
 	u_int32_t		an_uptime_secs;		/* 0x17C */
 	u_int32_t		an_lostsync_better_ap;	/* 0x180 */
 	u_int32_t		an_rsvd[10];
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Volatile WEP Key
@@ -621,7 +621,7 @@ struct an_rid_wepkey {
 	u_int8_t		an_mac_addr[6];		/* 0x04 */
 	u_int16_t		an_key_len;		/* 0x0A */
 	u_int8_t		an_key[16];		/* 0x0C */
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Persistent WEP Key
@@ -636,7 +636,7 @@ struct an_rid_wepkey {
 struct an_rid_leapkey {
 	u_int16_t		an_key_len;		/* 0x02 */
 	u_int8_t		an_key[32];		/* 0x04 */
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * MIC
@@ -648,7 +648,7 @@ struct an_rid_mic {
 	u_int8_t		an_mic_mcast[16];	/* 0x06 */
 	u_int16_t		an_mic_ucast_valid;	/* 0x16 */
 	u_int8_t		an_mic_ucast[16];	/* 0x18 */
-} __attribute__((__packed__));
+} __packed;
 
 /*
  * Receive frame structure.
@@ -666,7 +666,7 @@ struct an_rxframe {
 	u_int8_t		an_plcp_hdr[4];		/* 0x10 */
 	struct ieee80211_frame_addr4	an_whdr;
 	u_int16_t		an_gaplen;		/* 0x32 */
-} __attribute__((__packed__));
+} __packed;
 #define AN_RXGAP_MAX	8
 
 /*
@@ -686,7 +686,7 @@ struct an_txframe {
 	u_int8_t		an_rsvd0[2];		/* 0x12 */
 	struct ieee80211_frame_addr4	an_whdr;
 	u_int16_t		an_gaplen;		/* 0x32 */
-} __attribute__((__packed__));
+} __packed;
 
 #define	AN_TXGAP_802_3	0
 #define	AN_TXGAP_802_11	6
@@ -696,7 +696,7 @@ struct an_802_3_hdr {
 	u_int16_t		an_802_3_payload_len;
 	u_int8_t		an_dst_addr[6];
 	u_int8_t		an_src_addr[6];
-} __attribute__((__packed__));
+} __packed;
 
 #define AN_TXSTAT_EXCESS_RETRY	0x0002
 #define AN_TXSTAT_LIFE_EXCEEDED	0x0004