Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jun 2009 19:16:43 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
Subject:   svn commit: r194255 - in stable/6/sys: . boot/i386/libi386 contrib/pf dev/cxgb
Message-ID:  <200906151916.n5FJGhlB098817@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Mon Jun 15 19:16:43 2009
New Revision: 194255
URL: http://svn.freebsd.org/changeset/base/194255

Log:
  MFC: Pack PnP structures instead of individual fields.

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/boot/i386/libi386/biospnp.c
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/boot/i386/libi386/biospnp.c
==============================================================================
--- stable/6/sys/boot/i386/libi386/biospnp.c	Mon Jun 15 19:16:24 2009	(r194254)
+++ stable/6/sys/boot/i386/libi386/biospnp.c	Mon Jun 15 19:16:43 2009	(r194255)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906151916.n5FJGhlB098817>