Leftover __attribute__((packed)) -> __packed conversions. Untested.
Index: sys/arch/amd64/include/fpu.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/fpu.h,v
retrieving revision 1.6
diff -u -p -r1.6 fpu.h
--- sys/arch/amd64/include/fpu.h 29 Sep 2010 15:11:31 -0000 1.6
+++ sys/arch/amd64/include/fpu.h 11 Nov 2010 09:47:49 -0000
@@ -26,7 +26,7 @@ struct fxsave64 {
u_int64_t fx_st[8][2]; /* 8 normal FP regs */
u_int64_t fx_xmm[16][2]; /* 16 SSE2 registers */
u_int8_t fx_unused3[96];
-} __attribute__((packed));
+} __packed;
struct savefpu {
struct fxsave64 fp_fxsave; /* see above */
Index: sys/arch/amd64/include/segments.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/segments.h,v
retrieving revision 1.7
diff -u -p -r1.7 segments.h
--- sys/arch/amd64/include/segments.h 26 Oct 2010 05:49:10 -0000 1.7
+++ sys/arch/amd64/include/segments.h 11 Nov 2010 09:47:49 -0000
@@ -107,7 +107,7 @@ struct sys_segment_descriptor {
/*BITFIELDTYPE*/ u_int64_t sd_xx2:8; /* reserved */
/*BITFIELDTYPE*/ u_int64_t sd_zero:5; /* must be zero */
/*BITFIELDTYPE*/ u_int64_t sd_xx3:19; /* reserved */
-} __attribute__((packed));
+} __packed;
/*
* Below is used for cs, ds, etc.
@@ -124,7 +124,7 @@ struct mem_segment_descriptor {
unsigned int sd_def32:1; /* default 32 vs 16 bit size */
unsigned int sd_gran:1; /* limit granularity (byte/page) */
unsigned int sd_hibase:8; /* segment base address (msb) */
-} __attribute__((packed));
+} __packed;
/*
* Gate descriptors (e.g. indirect descriptors)
@@ -141,7 +141,7 @@ struct gate_descriptor {
/*BITFIELDTYPE*/ u_int64_t gd_xx2:8; /* reserved */
/*BITFIELDTYPE*/ u_int64_t gd_zero:5; /* must be zero */
/*BITFIELDTYPE*/ u_int64_t gd_xx3:19; /* reserved */
-} __attribute__((packed));
+} __packed;
/*
* region descriptors, used to load gdt/idt tables before segments yet exist.
@@ -149,7 +149,7 @@ struct gate_descriptor {
struct region_descriptor {
u_int16_t rd_limit; /* segment extent */
u_int64_t rd_base; /* base address */
-} __attribute__((packed));
+} __packed;
#ifdef _KERNEL
#if 0
Index: sys/arch/amd64/include/tss.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/tss.h,v
retrieving revision 1.1
diff -u -p -r1.1 tss.h
--- sys/arch/amd64/include/tss.h 28 Jan 2004 01:39:39 -0000 1.1
+++ sys/arch/amd64/include/tss.h 11 Nov 2010 09:47:49 -0000
@@ -57,6 +57,6 @@ struct x86_64_tss {
u_int32_t tss_reserved5;
u_int16_t tss_reserved6;
u_int16_t tss_iobase;
-} __attribute__((packed));
+} __packed;
#endif /* _AMD64_TSS_H_ */
Index: sys/arch/amd64/stand/libsa/pxe.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/stand/libsa/pxe.h,v
retrieving revision 1.4
diff -u -p -r1.4 pxe.h
--- sys/arch/amd64/stand/libsa/pxe.h 9 May 2010 19:41:43 -0000 1.4
+++ sys/arch/amd64/stand/libsa/pxe.h 11 Nov 2010 09:47:49 -0000
@@ -89,7 +89,7 @@ typedef struct {
uint16_t UNDICodeSize; /* UNDI Code segment size (bytes) */
SEGOFF16_t PXEPtr; /* SEG:OFF to !PXE struct,
only present when Version > 2.1 */
-} __attribute__((__packed__)) pxenv_t;
+} __packed pxenv_t;
/* !PXE */
typedef struct {
@@ -113,7 +113,7 @@ typedef struct {
SEGDESC_t BC_Data;
SEGDESC_t BC_Code;
SEGDESC_t BC_CodeWrite;
-} __attribute__((__packed__)) pxe_t;
+} __packed pxe_t;
#define PXENV_START_UNDI 0x0000
typedef struct {
@@ -123,17 +123,17 @@ typedef struct {
uint16_t dx;
uint16_t di;
uint16_t es;
-} __attribute__((__packed__)) t_PXENV_START_UNDI;
+} __packed t_PXENV_START_UNDI;
#define PXENV_UNDI_STARTUP 0x0001
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_STARTUP;
+} __packed t_PXENV_UNDI_STARTUP;
#define PXENV_UNDI_CLEANUP 0x0002
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_CLEANUP;
+} __packed t_PXENV_UNDI_CLEANUP;
#define PXENV_UNDI_INITIALIZE 0x0003
typedef struct {
@@ -141,7 +141,7 @@ typedef struct {
ADDR32_t ProtocolIni; /* Phys addr of a copy of the
driver module */
uint8_t reserved[8];
-} __attribute__((__packed__)) t_PXENV_UNDI_INITIALIZE;
+} __packed t_PXENV_UNDI_INITIALIZE;
#define MAXNUM_MCADDR 8
@@ -149,18 +149,18 @@ typedef struct {
PXENV_STATUS_t Status;
uint16_t MCastAddrCount;
MAC_ADDR McastAddr[MAXNUM_MCADDR];
-} __attribute__((__packed__)) t_PXENV_UNDI_MCAST_ADDRESS;
+} __packed t_PXENV_UNDI_MCAST_ADDRESS;
#define PXENV_UNDI_RESET_ADAPTER 0x0004
typedef struct {
PXENV_STATUS_t Status;
t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-} __attribute__((__packed__)) t_PXENV_UNDI_RESET;
+} __packed t_PXENV_UNDI_RESET;
#define PXENV_UNDI_SHUTDOWN 0x0005
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_SHUTDOWN;
+} __packed t_PXENV_UNDI_SHUTDOWN;
#define PXENV_UNDI_OPEN 0x0006
typedef struct {
@@ -173,12 +173,12 @@ typedef struct {
# define FLTR_SRC_RTG 0x0004
t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-} __attribute__((__packed__)) t_PXENV_UNDI_OPEN;
+} __packed t_PXENV_UNDI_OPEN;
#define PXENV_UNDI_CLOSE 0x0007
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_CLOSE;
+} __packed t_PXENV_UNDI_CLOSE;
#define PXENV_UNDI_TRANSMIT 0x0008
typedef struct {
@@ -196,7 +196,7 @@ typedef struct {
SEGOFF16_t DestAddr;
SEGOFF16_t TBD;
uint32_t Reserved[2];
-} __attribute__((__packed__)) t_PXENV_UNDI_TRANSMIT;
+} __packed t_PXENV_UNDI_TRANSMIT;
#define MAX_DATA_BLKS 8
typedef struct {
@@ -209,25 +209,25 @@ typedef struct {
uint16_t TDDataLen;
SEGOFF16_t TDDataPtr;
} DataBlock[MAX_DATA_BLKS];
-} __attribute__((__packed__)) t_PXENV_UNDI_TBD;
+} __packed t_PXENV_UNDI_TBD;
#define PXENV_UNDI_SET_MCAST_ADDRESS 0x0009
typedef struct {
PXENV_STATUS_t Status;
t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-} __attribute__((__packed__)) t_PXENV_UNDI_SET_MCAST_ADDR;
+} __packed t_PXENV_UNDI_SET_MCAST_ADDR;
#define PXENV_UNDI_SET_STATION_ADDRESS 0x000A
typedef struct {
PXENV_STATUS_t Status;
MAC_ADDR StationAddress; /* Temp MAC address to use */
-} __attribute__((__packed__)) t_PXENV_UNDI_SET_STATION_ADDR;
+} __packed t_PXENV_UNDI_SET_STATION_ADDR;
#define PXENV_UNDI_SET_PACKET_FILTER 0x000B
typedef struct {
PXENV_STATUS_t Status;
uint8_t filter; /* see UNDI_OPEN (0x0006) */
-} __attribute__((__packed__)) t_PXENV_UNDI_SET_PACKET_FILTER;
+} __packed t_PXENV_UNDI_SET_PACKET_FILTER;
#define PXENV_UNDI_GET_INFORMATION 0x000C
typedef struct {
@@ -250,7 +250,7 @@ typedef struct {
address */
uint16_t RxBufCt; /* Receive queue length */
uint16_t TxBufCt; /* Transmit queue length */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_INFORMATION;
+} __packed t_PXENV_UNDI_GET_INFORMATION;
#define PXENV_UNDI_GET_STATISTICS 0x000D
typedef struct {
@@ -262,29 +262,29 @@ typedef struct {
uint32_t RcvCRCErrors; /* Number of frames with
CRC errors */
uint32_t RcvResourceErrors; /* Number of frames dropped */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_STATISTICS;
+} __packed t_PXENV_UNDI_GET_STATISTICS;
#define PXENV_UNDI_CLEAR_STATISTICS 0x000E
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_CLEAR_STATISTICS;
+} __packed t_PXENV_UNDI_CLEAR_STATISTICS;
#define PXENV_UNDI_INITIATE_DIAGS 0x000F
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_INITIATE_DIAGS;
+} __packed t_PXENV_UNDI_INITIATE_DIAGS;
#define PXENV_UNDI_FORCE_INTERRUPT 0x0010
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_FORCE_INTERRUPT;
+} __packed t_PXENV_UNDI_FORCE_INTERRUPT;
#define PXENV_UNDI_GET_MCAST_ADDRESS 0x0011
typedef struct {
PXENV_STATUS_t Status;
IP4_t InetAddr; /* IP mulicast address */
MAC_ADDR MediaAddr; /* MAC multicast address */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_MCAST_ADDR;
+} __packed t_PXENV_UNDI_GET_MCAST_ADDR;
#define PXENV_UNDI_GET_NIC_TYPE 0x0012
typedef struct {
@@ -314,7 +314,7 @@ typedef struct {
uint16_t CardSelNum;
} pnp;
} info;
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_NIC_TYPE;
+} __packed t_PXENV_UNDI_GET_NIC_TYPE;
#define PXENV_UNDI_GET_IFACE_INFO 0x0013
typedef struct {
@@ -323,7 +323,7 @@ typedef struct {
uint32_t LinkSpeed; /* Defined in NDIS 2.0 spec */
uint32_t ServiceFlags; /* Defined in NDIS 2.0 spec */
uint32_t Reserved[4]; /* must be 0 */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_NDIS_INFO;
+} __packed t_PXENV_UNDI_GET_NDIS_INFO;
#define PXENV_UNDI_ISR 0x0014
typedef struct {
@@ -353,12 +353,12 @@ typedef struct {
# define PXENV_UNDI_ISR_OUT_TRANSMIT 2
# define PXENV_UNDI_ISR_OUT_RECIEVE 3
# define PXENV_UNDI_ISR_OUT_BUSY 4
-} __attribute__((__packed__)) t_PXENV_UNDI_ISR;
+} __packed t_PXENV_UNDI_ISR;
#define PXENV_STOP_UNDI 0x0015
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_STOP_UNDI;
+} __packed t_PXENV_STOP_UNDI;
#define PXENV_TFTP_OPEN 0x0020
typedef struct {
@@ -368,12 +368,12 @@ typedef struct {
uint8_t FileName[128];
UDP_PORT_t TFTPPort;
uint16_t PacketSize;
-} __attribute__((__packed__)) t_PXENV_TFTP_OPEN;
+} __packed t_PXENV_TFTP_OPEN;
#define PXENV_TFTP_CLOSE 0x0021
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_TFTP_CLOSE;
+} __packed t_PXENV_TFTP_CLOSE;
#define PXENV_TFTP_READ 0x0022
typedef struct {
@@ -381,7 +381,7 @@ typedef struct {
uint16_t PacketNumber;
uint16_t BufferSize;
SEGOFF16_t Buffer;
-} __attribute__((__packed__)) t_PXENV_TFTP_READ;
+} __packed t_PXENV_TFTP_READ;
#define PXENV_TFTP_READ_FILE 0x0023
typedef struct {
@@ -396,7 +396,7 @@ typedef struct {
UDP_PORT_t TFTPSrvPort;
uint16_t TFTPOpenTimeOut;
uint16_t TFTPReopenDelay;
-} __attribute__((__packed__)) t_PXENV_TFTP_READ_FILE;
+} __packed t_PXENV_TFTP_READ_FILE;
#define PXENV_TFTP_GET_FSIZE 0x0025
typedef struct {
@@ -405,18 +405,18 @@ typedef struct {
IP4_t GatewayIPAddress;
uint8_t FileName[128];
uint32_t FileSize;
-} __attribute__((__packed__)) t_PXENV_TFTP_GET_FSIZE;
+} __packed t_PXENV_TFTP_GET_FSIZE;
#define PXENV_UDP_OPEN 0x0030
typedef struct {
PXENV_STATUS_t status;
IP4_t src_ip; /* IP address of this station */
-} __attribute__((__packed__)) t_PXENV_UDP_OPEN;
+} __packed t_PXENV_UDP_OPEN;
#define PXENV_UDP_CLOSE 0x0031
typedef struct {
PXENV_STATUS_t status;
-} __attribute__((__packed__)) t_PXENV_UDP_CLOSE;
+} __packed t_PXENV_UDP_CLOSE;
#define PXENV_UDP_READ 0x0032
typedef struct {
@@ -429,7 +429,7 @@ typedef struct {
this port */
uint16_t buffer_size; /* Size of the packet buffer */
SEGOFF16_t buffer; /* SEG:OFF to the packet buffer */
-} __attribute__((__packed__)) t_PXENV_UDP_READ;
+} __packed t_PXENV_UDP_READ;
#define PXENV_UDP_WRITE 0x0033
typedef struct {
@@ -440,13 +440,13 @@ typedef struct {
UDP_PORT_t dst_port; /* destination udp port */
uint16_t buffer_size; /* Size of the packet buffer */
SEGOFF16_t buffer; /* SEG:OFF to the packet buffer */
-} __attribute__((__packed__)) t_PXENV_UDP_WRITE;
+} __packed t_PXENV_UDP_WRITE;
#define PXENV_UNLOAD_STACK 0x0070
typedef struct {
PXENV_STATUS_t Status;
uint8_t reserved[10];
-} __attribute__((__packed__)) t_PXENV_UNLOAD_STACK;
+} __packed t_PXENV_UNLOAD_STACK;
#define PXENV_GET_CACHED_INFO 0x0071
@@ -460,7 +460,7 @@ typedef struct {
pointer */
SEGOFF16_t Buffer; /* copy to, leave at 0 for pointer */
uint16_t BufferLimit; /* max size of buffer in BC dataseg ? */
-} __attribute__((__packed__)) t_PXENV_GET_CACHED_INFO;
+} __packed t_PXENV_GET_CACHED_INFO;
/* structure filled in by PXENV_GET_CACHED_INFO
@@ -508,7 +508,7 @@ typedef struct {
does... */
} v;
} vendor;
-} __attribute__((__packed__)) BOOTPLAYER;
+} __packed BOOTPLAYER;
#define PXENV_RESTART_TFTP 0x0073
#define t_PXENV_RESTART_TFTP t_PXENV_TFTP_READ_FILE
@@ -516,12 +516,12 @@ typedef struct {
#define PXENV_START_BASE 0x0075
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_START_BASE;
+} __packed t_PXENV_START_BASE;
#define PXENV_STOP_BASE 0x0076
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_STOP_BASE;
+} __packed t_PXENV_STOP_BASE;
#define PXENV_STATUS_SUCCESS 0
#define PXENV_STATUS_FAILURE 1
Index: sys/arch/i386/pci/pcibios.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/pci/pcibios.c,v
retrieving revision 1.39
diff -u -p -r1.39 pcibios.c
--- sys/arch/i386/pci/pcibios.c 26 Jun 2008 05:42:11 -0000 1.39
+++ sys/arch/i386/pci/pcibios.c 11 Nov 2010 09:47:56 -0000
@@ -387,7 +387,7 @@ pcibios_get_intr_routing(struct pcibios_
u_int16_t size;
u_int32_t offset;
u_int16_t segment;
- } __attribute__((__packed__)) args;
+ } __packed args;
args.size = *nentries * sizeof(*table);
args.offset = (u_int32_t)table;
Index: sys/arch/i386/stand/libsa/pxe.h
===================================================================
RCS file: /cvs/src/sys/arch/i386/stand/libsa/pxe.h,v
retrieving revision 1.4
diff -u -p -r1.4 pxe.h
--- sys/arch/i386/stand/libsa/pxe.h 7 May 2010 20:49:14 -0000 1.4
+++ sys/arch/i386/stand/libsa/pxe.h 11 Nov 2010 09:47:56 -0000
@@ -89,7 +89,7 @@ typedef struct {
uint16_t UNDICodeSize; /* UNDI Code segment size (bytes) */
SEGOFF16_t PXEPtr; /* SEG:OFF to !PXE struct,
only present when Version > 2.1 */
-} __attribute__((__packed__)) pxenv_t;
+} __packed pxenv_t;
/* !PXE */
typedef struct {
@@ -113,7 +113,7 @@ typedef struct {
SEGDESC_t BC_Data;
SEGDESC_t BC_Code;
SEGDESC_t BC_CodeWrite;
-} __attribute__((__packed__)) pxe_t;
+} __packed pxe_t;
#define PXENV_START_UNDI 0x0000
typedef struct {
@@ -123,17 +123,17 @@ typedef struct {
uint16_t dx;
uint16_t di;
uint16_t es;
-} __attribute__((__packed__)) t_PXENV_START_UNDI;
+} __packed t_PXENV_START_UNDI;
#define PXENV_UNDI_STARTUP 0x0001
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_STARTUP;
+} __packed t_PXENV_UNDI_STARTUP;
#define PXENV_UNDI_CLEANUP 0x0002
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_CLEANUP;
+} __packed t_PXENV_UNDI_CLEANUP;
#define PXENV_UNDI_INITIALIZE 0x0003
typedef struct {
@@ -141,7 +141,7 @@ typedef struct {
ADDR32_t ProtocolIni; /* Phys addr of a copy of the
driver module */
uint8_t reserved[8];
-} __attribute__((__packed__)) t_PXENV_UNDI_INITIALIZE;
+} __packed t_PXENV_UNDI_INITIALIZE;
#define MAXNUM_MCADDR 8
@@ -149,18 +149,18 @@ typedef struct {
PXENV_STATUS_t Status;
uint16_t MCastAddrCount;
MAC_ADDR McastAddr[MAXNUM_MCADDR];
-} __attribute__((__packed__)) t_PXENV_UNDI_MCAST_ADDRESS;
+} __packed t_PXENV_UNDI_MCAST_ADDRESS;
#define PXENV_UNDI_RESET_ADAPTER 0x0004
typedef struct {
PXENV_STATUS_t Status;
t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-} __attribute__((__packed__)) t_PXENV_UNDI_RESET;
+} __packed t_PXENV_UNDI_RESET;
#define PXENV_UNDI_SHUTDOWN 0x0005
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_SHUTDOWN;
+} __packed t_PXENV_UNDI_SHUTDOWN;
#define PXENV_UNDI_OPEN 0x0006
typedef struct {
@@ -173,12 +173,12 @@ typedef struct {
# define FLTR_SRC_RTG 0x0004
t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-} __attribute__((__packed__)) t_PXENV_UNDI_OPEN;
+} __packed t_PXENV_UNDI_OPEN;
#define PXENV_UNDI_CLOSE 0x0007
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_CLOSE;
+} __packed t_PXENV_UNDI_CLOSE;
#define PXENV_UNDI_TRANSMIT 0x0008
typedef struct {
@@ -196,7 +196,7 @@ typedef struct {
SEGOFF16_t DestAddr;
SEGOFF16_t TBD;
uint32_t Reserved[2];
-} __attribute__((__packed__)) t_PXENV_UNDI_TRANSMIT;
+} __packed t_PXENV_UNDI_TRANSMIT;
#define MAX_DATA_BLKS 8
typedef struct {
@@ -209,25 +209,25 @@ typedef struct {
uint16_t TDDataLen;
SEGOFF16_t TDDataPtr;
} DataBlock[MAX_DATA_BLKS];
-} __attribute__((__packed__)) t_PXENV_UNDI_TBD;
+} __packed t_PXENV_UNDI_TBD;
#define PXENV_UNDI_SET_MCAST_ADDRESS 0x0009
typedef struct {
PXENV_STATUS_t Status;
t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-} __attribute__((__packed__)) t_PXENV_UNDI_SET_MCAST_ADDR;
+} __packed t_PXENV_UNDI_SET_MCAST_ADDR;
#define PXENV_UNDI_SET_STATION_ADDRESS 0x000A
typedef struct {
PXENV_STATUS_t Status;
MAC_ADDR StationAddress; /* Temp MAC address to use */
-} __attribute__((__packed__)) t_PXENV_UNDI_SET_STATION_ADDR;
+} __packed t_PXENV_UNDI_SET_STATION_ADDR;
#define PXENV_UNDI_SET_PACKET_FILTER 0x000B
typedef struct {
PXENV_STATUS_t Status;
uint8_t filter; /* see UNDI_OPEN (0x0006) */
-} __attribute__((__packed__)) t_PXENV_UNDI_SET_PACKET_FILTER;
+} __packed t_PXENV_UNDI_SET_PACKET_FILTER;
#define PXENV_UNDI_GET_INFORMATION 0x000C
typedef struct {
@@ -250,7 +250,7 @@ typedef struct {
address */
uint16_t RxBufCt; /* Receive queue length */
uint16_t TxBufCt; /* Transmit queue length */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_INFORMATION;
+} __packed t_PXENV_UNDI_GET_INFORMATION;
#define PXENV_UNDI_GET_STATISTICS 0x000D
typedef struct {
@@ -262,29 +262,29 @@ typedef struct {
uint32_t RcvCRCErrors; /* Number of frames with
CRC errors */
uint32_t RcvResourceErrors; /* Number of frames dropped */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_STATISTICS;
+} __packed t_PXENV_UNDI_GET_STATISTICS;
#define PXENV_UNDI_CLEAR_STATISTICS 0x000E
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_CLEAR_STATISTICS;
+} __packed t_PXENV_UNDI_CLEAR_STATISTICS;
#define PXENV_UNDI_INITIATE_DIAGS 0x000F
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_INITIATE_DIAGS;
+} __packed t_PXENV_UNDI_INITIATE_DIAGS;
#define PXENV_UNDI_FORCE_INTERRUPT 0x0010
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_UNDI_FORCE_INTERRUPT;
+} __packed t_PXENV_UNDI_FORCE_INTERRUPT;
#define PXENV_UNDI_GET_MCAST_ADDRESS 0x0011
typedef struct {
PXENV_STATUS_t Status;
IP4_t InetAddr; /* IP mulicast address */
MAC_ADDR MediaAddr; /* MAC multicast address */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_MCAST_ADDR;
+} __packed t_PXENV_UNDI_GET_MCAST_ADDR;
#define PXENV_UNDI_GET_NIC_TYPE 0x0012
typedef struct {
@@ -314,7 +314,7 @@ typedef struct {
uint16_t CardSelNum;
} pnp;
} info;
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_NIC_TYPE;
+} __packed t_PXENV_UNDI_GET_NIC_TYPE;
#define PXENV_UNDI_GET_IFACE_INFO 0x0013
typedef struct {
@@ -323,7 +323,7 @@ typedef struct {
uint32_t LinkSpeed; /* Defined in NDIS 2.0 spec */
uint32_t ServiceFlags; /* Defined in NDIS 2.0 spec */
uint32_t Reserved[4]; /* must be 0 */
-} __attribute__((__packed__)) t_PXENV_UNDI_GET_NDIS_INFO;
+} __packed t_PXENV_UNDI_GET_NDIS_INFO;
#define PXENV_UNDI_ISR 0x0014
typedef struct {
@@ -353,12 +353,12 @@ typedef struct {
# define PXENV_UNDI_ISR_OUT_TRANSMIT 2
# define PXENV_UNDI_ISR_OUT_RECIEVE 3
# define PXENV_UNDI_ISR_OUT_BUSY 4
-} __attribute__((__packed__)) t_PXENV_UNDI_ISR;
+} __packed t_PXENV_UNDI_ISR;
#define PXENV_STOP_UNDI 0x0015
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_STOP_UNDI;
+} __packed t_PXENV_STOP_UNDI;
#define PXENV_TFTP_OPEN 0x0020
typedef struct {
@@ -368,12 +368,12 @@ typedef struct {
uint8_t FileName[128];
UDP_PORT_t TFTPPort;
uint16_t PacketSize;
-} __attribute__((__packed__)) t_PXENV_TFTP_OPEN;
+} __packed t_PXENV_TFTP_OPEN;
#define PXENV_TFTP_CLOSE 0x0021
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_TFTP_CLOSE;
+} __packed t_PXENV_TFTP_CLOSE;
#define PXENV_TFTP_READ 0x0022
typedef struct {
@@ -381,7 +381,7 @@ typedef struct {
uint16_t PacketNumber;
uint16_t BufferSize;
SEGOFF16_t Buffer;
-} __attribute__((__packed__)) t_PXENV_TFTP_READ;
+} __packed t_PXENV_TFTP_READ;
#define PXENV_TFTP_READ_FILE 0x0023
typedef struct {
@@ -396,7 +396,7 @@ typedef struct {
UDP_PORT_t TFTPSrvPort;
uint16_t TFTPOpenTimeOut;
uint16_t TFTPReopenDelay;
-} __attribute__((__packed__)) t_PXENV_TFTP_READ_FILE;
+} __packed t_PXENV_TFTP_READ_FILE;
#define PXENV_TFTP_GET_FSIZE 0x0025
typedef struct {
@@ -405,18 +405,18 @@ typedef struct {
IP4_t GatewayIPAddress;
uint8_t FileName[128];
uint32_t FileSize;
-} __attribute__((__packed__)) t_PXENV_TFTP_GET_FSIZE;
+} __packed t_PXENV_TFTP_GET_FSIZE;
#define PXENV_UDP_OPEN 0x0030
typedef struct {
PXENV_STATUS_t status;
IP4_t src_ip; /* IP address of this station */
-} __attribute__((__packed__)) t_PXENV_UDP_OPEN;
+} __packed t_PXENV_UDP_OPEN;
#define PXENV_UDP_CLOSE 0x0031
typedef struct {
PXENV_STATUS_t status;
-} __attribute__((__packed__)) t_PXENV_UDP_CLOSE;
+} __packed t_PXENV_UDP_CLOSE;
#define PXENV_UDP_READ 0x0032
typedef struct {
@@ -429,7 +429,7 @@ typedef struct {
this port */
uint16_t buffer_size; /* Size of the packet buffer */
SEGOFF16_t buffer; /* SEG:OFF to the packet buffer */
-} __attribute__((__packed__)) t_PXENV_UDP_READ;
+} __packed t_PXENV_UDP_READ;
#define PXENV_UDP_WRITE 0x0033
typedef struct {
@@ -440,13 +440,13 @@ typedef struct {
UDP_PORT_t dst_port; /* destination udp port */
uint16_t buffer_size; /* Size of the packet buffer */
SEGOFF16_t buffer; /* SEG:OFF to the packet buffer */
-} __attribute__((__packed__)) t_PXENV_UDP_WRITE;
+} __packed t_PXENV_UDP_WRITE;
#define PXENV_UNLOAD_STACK 0x0070
typedef struct {
PXENV_STATUS_t Status;
uint8_t reserved[10];
-} __attribute__((__packed__)) t_PXENV_UNLOAD_STACK;
+} __packed t_PXENV_UNLOAD_STACK;
#define PXENV_GET_CACHED_INFO 0x0071
@@ -460,7 +460,7 @@ typedef struct {
pointer */
SEGOFF16_t Buffer; /* copy to, leave at 0 for pointer */
uint16_t BufferLimit; /* max size of buffer in BC dataseg ? */
-} __attribute__((__packed__)) t_PXENV_GET_CACHED_INFO;
+} __packed t_PXENV_GET_CACHED_INFO;
/* structure filled in by PXENV_GET_CACHED_INFO
@@ -508,7 +508,7 @@ typedef struct {
does... */
} v;
} vendor;
-} __attribute__((__packed__)) BOOTPLAYER;
+} __packed BOOTPLAYER;
#define PXENV_RESTART_TFTP 0x0073
#define t_PXENV_RESTART_TFTP t_PXENV_TFTP_READ_FILE
@@ -516,12 +516,12 @@ typedef struct {
#define PXENV_START_BASE 0x0075
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_START_BASE;
+} __packed t_PXENV_START_BASE;
#define PXENV_STOP_BASE 0x0076
typedef struct {
PXENV_STATUS_t Status;
-} __attribute__((__packed__)) t_PXENV_STOP_BASE;
+} __packed t_PXENV_STOP_BASE;
#define PXENV_STATUS_SUCCESS 0
#define PXENV_STATUS_FAILURE 1
Index: sys/dev/i2o/ioprbs.c
===================================================================
RCS file: /cvs/src/sys/dev/i2o/ioprbs.c,v
retrieving revision 1.24
diff -u -p -r1.24 ioprbs.c
--- sys/dev/i2o/ioprbs.c 12 Oct 2010 00:53:32 -0000 1.24
+++ sys/dev/i2o/ioprbs.c 11 Nov 2010 09:48:19 -0000
@@ -180,7 +180,7 @@ ioprbs_attach(struct device *parent, str
struct i2o_param_rbs_device_info bdi;
struct i2o_param_rbs_operation op;
} p;
- } param /* XXX gcc __attribute__ ((__packed__)) */;
+ } __packed param;
int i;
TAILQ_INIT(&sc->sc_free_ccb);
Index: sys/dev/ic/atwvar.h
===================================================================
RCS file: /cvs/src/sys/dev/ic/atwvar.h,v
retrieving revision 1.23
diff -u -p -r1.23 atwvar.h
--- sys/dev/ic/atwvar.h 7 Sep 2010 16:21:42 -0000 1.23
+++ sys/dev/ic/atwvar.h 11 Nov 2010 09:48:20 -0000
@@ -325,7 +325,7 @@ struct atw_frame {
struct ieee80211_frame ihdr;
} s2;
} u;
-} __attribute__((__packed__));
+} __packed;
#define atw_hdrctl u.s1.hdrctl
#define atw_fragthr u.s1.fragthr
Index: sys/dev/usb/uticom.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uticom.c,v
retrieving revision 1.5
diff -u -p -r1.5 uticom.c
--- sys/dev/usb/uticom.c 24 Sep 2010 08:33:59 -0000 1.5
+++ sys/dev/usb/uticom.c 11 Nov 2010 09:48:25 -0000
@@ -109,7 +109,7 @@ static int uticomdebug = 0;
struct uticom_fw_header {
uint16_t length;
uint8_t checkSum;
-} __attribute__((packed));
+} __packed
struct uticom_buf {
unsigned int buf_size;
Index: sys/dev/vesa/vesabiosreg.h
===================================================================
RCS file: /cvs/src/sys/dev/vesa/vesabiosreg.h,v
retrieving revision 1.1
diff -u -p -r1.1 vesabiosreg.h
--- sys/dev/vesa/vesabiosreg.h 27 Nov 2006 18:04:28 -0000 1.1
+++ sys/dev/vesa/vesabiosreg.h 11 Nov 2010 09:48:25 -0000
@@ -49,13 +49,13 @@ struct modeinfoblock {
uint32_t MaxPixelClock;
uint8_t Reserved4[189];
#endif
-} __attribute__ ((packed));
+} __packed;
struct paletteentry {
uint8_t Blue;
uint8_t Green;
uint8_t Red;
uint8_t Alignment;
-} __attribute__ ((packed));
+} __packed;
#endif /* !_VESABIOSREG_H */
Index: sys/net/pipex_local.h
===================================================================
RCS file: /cvs/src/sys/net/pipex_local.h,v
retrieving revision 1.9
diff -u -p -r1.9 pipex_local.h
--- sys/net/pipex_local.h 24 Sep 2010 14:50:30 -0000 1.9
+++ sys/net/pipex_local.h 11 Nov 2010 09:48:27 -0000
@@ -220,7 +220,7 @@ struct pipex_gre_header {
uint16_t len; /* length not include gre header */
uint16_t call_id; /* call_id */
-} __attribute__((__packed__));
+} __packed;
/* pppoe header */
struct pipex_pppoe_header {
@@ -232,7 +232,7 @@ struct pipex_pppoe_header {
uint16_t session_id; /* session id */
uint16_t length; /* length */
-} __attribute__((__packed__));
+} __packed;
/* l2tp header */
struct pipex_l2tp_header {
@@ -249,18 +249,18 @@ struct pipex_l2tp_header {
uint16_t tunnel_id;
uint16_t session_id;
/* can be followed by option header */
-} __attribute__((__packed__));
+} __packed;
/* l2tp option header */
struct pipex_l2tp_seq_header {
uint16_t ns;
uint16_t nr;
-} __attribute__((__packed__));
+} __packed;
struct pipex_l2tp_offset_header {
uint16_t offset_size;
/* uint8_t offset_pad[] */
-} __attribute__((__packed__));
+} __packed;
#ifdef PIPEX_DEBUG
#define PIPEX_DBG(a) if (pipex_debug & 1) pipex_session_log a
Index: sys/sys/videoio.h
===================================================================
RCS file: /cvs/src/sys/sys/videoio.h,v
retrieving revision 1.5
diff -u -p -r1.5 videoio.h
--- sys/sys/videoio.h 26 Sep 2010 23:44:51 -0000 1.5
+++ sys/sys/videoio.h 11 Nov 2010 09:48:27 -0000
@@ -752,7 +752,7 @@ struct v4l2_ext_control {
__s64 value64;
void *reserved;
} un;
-} __attribute__((packed));
+} __packed;
struct v4l2_ext_controls {
__u32 ctrl_class;
