svn commit: r193720 - head/sys/boot/i386/libi386

[John Baldwin]

Author: jhb
Date: Mon Jun  8 15:09:22 2009
New Revision: 193720
URL: http://svn.freebsd.org/changeset/base/193720

Log:
  Instead of packing the individual fields in the PnP structures, pack the
  entire structures.  This trims some warnings.
  
  Verified by:	md5(1)
  MFC after:	1 week

Modified:
  head/sys/boot/i386/libi386/biospnp.c

Modified: head/sys/boot/i386/libi386/biospnp.c
==============================================================================
--- head/sys/boot/i386/libi386/biospnp.c	Mon Jun  8 15:07:35 2009	(r193719)
+++ head/sys/boot/i386/libi386/biospnp.c	Mon Jun  8 15:09:22 2009	(r193720)
@@ -49,38 +49,38 @@ struct pnphandler biospnphandler =
 
 struct pnp_ICstructure
 {
-    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;
-};
+    u_int8_t	pnp_signature[4];
+    u_int8_t	pnp_version;
+    u_int8_t	pnp_length;
+    u_int16_t	pnp_BIOScontrol;
+    u_int8_t	pnp_checksum;
+    u_int32_t	pnp_eventflag;
+    u_int16_t	pnp_rmip;
+    u_int16_t	pnp_rmcs;
+    u_int16_t	pnp_pmip;
+    u_int32_t	pnp_pmcs;
+    u_int8_t	pnp_OEMdev[4];
+    u_int16_t	pnp_rmds;
+    u_int32_t	pnp_pmds;
+} __packed;
 
 struct pnp_devNode 
 {
-    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;
-};
+    u_int16_t	dn_size;
+    u_int8_t	dn_handle;
+    u_int8_t	dn_id[4];
+    u_int8_t	dn_type[3];
+    u_int16_t	dn_attrib;
+    u_int8_t	dn_data[1];
+} __packed;
 
 struct pnp_isaConfiguration
 {
-    u_int8_t	ic_revision	__packed;
-    u_int8_t	ic_nCSN		__packed;
-    u_int16_t	ic_rdport	__packed;
-    u_int16_t	ic_reserved	__packed;
-};
+    u_int8_t	ic_revision;
+    u_int8_t	ic_nCSN;
+    u_int16_t	ic_rdport;
+    u_int16_t	ic_reserved;
+} __packed;
 
 static struct pnp_ICstructure	*pnp_Icheck = NULL;
 static u_int16_t		pnp_NumNodes;