Non-functional changes to NEWCARD stuff.

This is the first part of a two-part update to NEWCARD.  Changes in this
commit are non-functional, and includes the following:
 * indentation and other changes to meet style(9).
 * other minor style consistancy changes
 * addition of comments
 * renaming of device_t variables to be consistant across all of NEWCARD.

(note that not all style violations are fixed in this commit -- those that
 aren't will be clobbered by the next commit.)

1 files changed, 60 insertions, 60 deletions

diff --git a/sys/dev/cardbus/cardbus_cis.h b/sys/dev/cardbus/cardbus_cis.h
index f884eef..ca21090 100644
--- a/sys/dev/cardbus/cardbus_cis.h
+++ b/sys/dev/cardbus/cardbus_cis.h
@@ -34,74 +34,74 @@
 
 struct cis_tupleinfo;
 
-int cardbus_do_cis(device_t dev, device_t child);
-int cardbus_cis_read(device_t dev, device_t child, u_int8_t id,
-		     struct cis_tupleinfo** buff, int* nret);
-void cardbus_cis_free(device_t dev, struct cis_tupleinfo *buff, int* nret);
+int	cardbus_do_cis(device_t, device_t);
+int	cardbus_cis_read(device_t, device_t, u_int8_t, struct cis_tupleinfo**,
+	    int*);
+void	cardbus_cis_free(device_t, struct cis_tupleinfo*, int*);
 
-#define MAXTUPLESIZE		0x400
+#define	MAXTUPLESIZE		0x400
 
 /* CIS TUPLES */
 
-#define CISTPL_NULL		0x00
-#define CISTPL_DEVICE		0x01
-#define CISTPL_LONG_LINK_CB	0x02
-#define CISTPL_INDIRECT		0x03
-#define CISTPL_CONFIG_CB	0x04
-#define CISTPL_CFTABLE_ENTRY_CB	0x05
-#define CISTPL_LONGLINK_MFC	0x06
-#define CISTPL_BAR		0x07
-#define CISTPL_PWR_MGMNT	0x08
-#define CISTPL_EXTDEVICE	0x09
-#define CISTPL_CHECKSUM		0x10
-#define CISTPL_LONGLINK_A	0x11
-#define CISTPL_LONGLINK_C	0x12
-#define CISTPL_LINKTARGET	0x13
-#define CISTPL_NO_LINK		0x14
-#define CISTPL_VERS_1		0x15
-#define CISTPL_ALTSTR		0x16
-#define CISTPL_DEVICE_A		0x17
-#define CISTPL_JEDEC_C		0x18
-#define CISTPL_JEDEC_A		0x19
-#define CISTPL_CONFIG		0x1A
-#define CISTPL_CFTABLE_ENTRY	0x1B
-#define CISTPL_DEVICE_OC	0x1C
-#define CISTPL_DEVICE_OA	0x1D
-#define CISTPL_DEVICE_GEO	0x1E
-#define CISTPL_DEVICE_GEO_A	0x1F
-#define CISTPL_MANFID		0x20
-#define CISTPL_FUNCID		0x21
-#define CISTPL_FUNCE		0x22
-#define CISTPL_SWIL		0x23
-#define CISTPL_VERS_2		0x40
-#define CISTPL_FORMAT		0x41
-#define CISTPL_GEOMETRY		0x42
-#define CISTPL_BYTEORDER	0x43
-#define CISTPL_DATE		0x44
-#define CISTPL_BATTERY		0x45
-#define CISTPL_ORG		0x46
-#define CISTPL_CUSTOMSTART	0x80
-#define CISTPL_END		0xFF
+#define	CISTPL_NULL		0x00
+#define	CISTPL_DEVICE		0x01
+#define	CISTPL_LONG_LINK_CB	0x02
+#define	CISTPL_INDIRECT		0x03
+#define	CISTPL_CONFIG_CB	0x04
+#define	CISTPL_CFTABLE_ENTRY_CB	0x05
+#define	CISTPL_LONGLINK_MFC	0x06
+#define	CISTPL_BAR		0x07
+#define	CISTPL_PWR_MGMNT	0x08
+#define	CISTPL_EXTDEVICE	0x09
+#define	CISTPL_CHECKSUM		0x10
+#define	CISTPL_LONGLINK_A	0x11
+#define	CISTPL_LONGLINK_C	0x12
+#define	CISTPL_LINKTARGET	0x13
+#define	CISTPL_NO_LINK		0x14
+#define	CISTPL_VERS_1		0x15
+#define	CISTPL_ALTSTR		0x16
+#define	CISTPL_DEVICE_A		0x17
+#define	CISTPL_JEDEC_C		0x18
+#define	CISTPL_JEDEC_A		0x19
+#define	CISTPL_CONFIG		0x1A
+#define	CISTPL_CFTABLE_ENTRY	0x1B
+#define	CISTPL_DEVICE_OC	0x1C
+#define	CISTPL_DEVICE_OA	0x1D
+#define	CISTPL_DEVICE_GEO	0x1E
+#define	CISTPL_DEVICE_GEO_A	0x1F
+#define	CISTPL_MANFID		0x20
+#define	CISTPL_FUNCID		0x21
+#define	CISTPL_FUNCE		0x22
+#define	CISTPL_SWIL		0x23
+#define	CISTPL_VERS_2		0x40
+#define	CISTPL_FORMAT		0x41
+#define	CISTPL_GEOMETRY		0x42
+#define	CISTPL_BYTEORDER	0x43
+#define	CISTPL_DATE		0x44
+#define	CISTPL_BATTERY		0x45
+#define	CISTPL_ORG		0x46
+#define	CISTPL_CUSTOMSTART	0x80
+#define	CISTPL_END		0xFF
 
-#define CISTPL_GENERIC		-1	/* catchall */
+#define	CISTPL_GENERIC		-1	/* catchall */
 
 /* BAR */
-#define TPL_BAR_REG_ASI_MASK	0x07
-#define TPL_BAR_REG_AS		0x10
+#define	TPL_BAR_REG_ASI_MASK			0x07
+#define	TPL_BAR_REG_AS				0x10
 
 /* CISTPL_FUNC */
-#define TPL_FUNC_MF		0	/* multi function tuple */
-#define TPL_FUNC_MEM		1	/* memory */
-#define TPL_FUNC_SERIAL		2	/* serial, including modem and fax */
-#define TPL_FUNC_PARALLEL	3	/* parallel, including printer and SCSI */
-#define TPL_FUNC_DISK		4	/* Disk */
-#define TPL_FUNC_VIDEO		5	/* Video Adaptor */
-#define TPL_FUNC_LAN		6	/* LAN Adaptor */
-#define TPL_FUNC_AIMS		7	/* Auto Inclement Mass Strages */
+#define	TPL_FUNC_MF		0	/* multi function tuple */
+#define	TPL_FUNC_MEM		1	/* memory */
+#define	TPL_FUNC_SERIAL		2	/* serial, including modem and fax */
+#define	TPL_FUNC_PARALLEL	3	/* parallel, including printer and SCSI */
+#define	TPL_FUNC_DISK		4	/* Disk */
+#define	TPL_FUNC_VIDEO		5	/* Video Adaptor */
+#define	TPL_FUNC_LAN		6	/* LAN Adaptor */
+#define	TPL_FUNC_AIMS		7	/* Auto Inclement Mass Strages */
 
 /* TPL_FUNC_LAN */
-#define TPL_FUNCE_LAN_TECH	1	/* technology */
-#define TPL_FUNCE_LAN_SPEED	2	/* speed */
-#define TPL_FUNCE_LAN_MEDIA	2	/* which media do you use? */
-#define TPL_FUNCE_LAN_NID	4	/* node id (address) */
-#define TPL_FUNCE_LAN_CONN	5	/* connector type (shape) */
+#define	TPL_FUNCE_LAN_TECH	1	/* technology */
+#define	TPL_FUNCE_LAN_SPEED	2	/* speed */
+#define	TPL_FUNCE_LAN_MEDIA	2	/* which media do you use? */
+#define	TPL_FUNCE_LAN_NID	4	/* node id (address) */
+#define	TPL_FUNCE_LAN_CONN	5	/* connector type (shape) */