summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruebayasi <uebayasi@NetBSD.org>2006-11-22 01:54:09 +0000
committeruebayasi <uebayasi@NetBSD.org>2006-11-22 01:54:09 +0000
commit25e0bf9073a7cb7cb3443ad5b3b97717c19b18ac (patch)
treeaa8b56637c67b5748a4640972dcdae2b2f10f105
parent156f4ce7bbd93048623b8cd43b28360473007f95 (diff)
Use C99 initializers where needed.
-rw-r--r--sys/dev/pci/if_devar.h86
1 files changed, 53 insertions, 33 deletions
diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h
index 053f6030dbe..65a8aa8153f 100644
--- a/sys/dev/pci/if_devar.h
+++ b/sys/dev/pci/if_devar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_devar.h,v 1.45 2006/05/29 15:12:57 drochner Exp $ */
+/* $NetBSD: if_devar.h,v 1.46 2006/11/22 01:54:09 uebayasi Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -790,37 +790,57 @@ static const struct {
tulip_media_t sc_media;
u_int32_t sc_attrs;
} tulip_srom_conninfo[] = {
- { TULIP_SROM_CONNTYPE_10BASET, TULIP_MEDIA_10BASET },
- { TULIP_SROM_CONNTYPE_BNC, TULIP_MEDIA_BNC },
- { TULIP_SROM_CONNTYPE_AUI, TULIP_MEDIA_AUI },
- { TULIP_SROM_CONNTYPE_100BASETX, TULIP_MEDIA_100BASETX },
- { TULIP_SROM_CONNTYPE_100BASET4, TULIP_MEDIA_100BASET4 },
- { TULIP_SROM_CONNTYPE_100BASEFX, TULIP_MEDIA_100BASEFX },
- { TULIP_SROM_CONNTYPE_MII_10BASET, TULIP_MEDIA_10BASET,
- TULIP_SROM_ATTR_MII },
- { TULIP_SROM_CONNTYPE_MII_100BASETX, TULIP_MEDIA_100BASETX,
- TULIP_SROM_ATTR_MII },
- { TULIP_SROM_CONNTYPE_MII_100BASET4, TULIP_MEDIA_100BASET4,
- TULIP_SROM_ATTR_MII },
- { TULIP_SROM_CONNTYPE_MII_100BASEFX, TULIP_MEDIA_100BASEFX,
- TULIP_SROM_ATTR_MII },
- { TULIP_SROM_CONNTYPE_10BASET_NWAY, TULIP_MEDIA_10BASET,
- TULIP_SROM_ATTR_NWAY },
- { TULIP_SROM_CONNTYPE_10BASET_FD, TULIP_MEDIA_10BASET_FD },
- { TULIP_SROM_CONNTYPE_MII_10BASET_FD, TULIP_MEDIA_10BASET_FD,
- TULIP_SROM_ATTR_MII },
- { TULIP_SROM_CONNTYPE_100BASETX_FD, TULIP_MEDIA_100BASETX_FD },
- { TULIP_SROM_CONNTYPE_MII_100BASETX_FD, TULIP_MEDIA_100BASETX_FD,
- TULIP_SROM_ATTR_MII },
- { TULIP_SROM_CONNTYPE_10BASET_NOLINKPASS, TULIP_MEDIA_10BASET,
- TULIP_SROM_ATTR_NOLINKPASS },
- { TULIP_SROM_CONNTYPE_AUTOSENSE, TULIP_MEDIA_UNKNOWN,
- TULIP_SROM_ATTR_AUTOSENSE },
- { TULIP_SROM_CONNTYPE_AUTOSENSE_POWERUP, TULIP_MEDIA_UNKNOWN,
- TULIP_SROM_ATTR_AUTOSENSE|TULIP_SROM_ATTR_POWERUP },
- { TULIP_SROM_CONNTYPE_AUTOSENSE_NWAY, TULIP_MEDIA_UNKNOWN,
- TULIP_SROM_ATTR_AUTOSENSE|TULIP_SROM_ATTR_NWAY },
- { TULIP_SROM_CONNTYPE_NOT_USED, TULIP_MEDIA_UNKNOWN }
+ { .sc_type = TULIP_SROM_CONNTYPE_10BASET,
+ .sc_media = TULIP_MEDIA_10BASET },
+ { .sc_type = TULIP_SROM_CONNTYPE_BNC,
+ .sc_media = TULIP_MEDIA_BNC },
+ { .sc_type = TULIP_SROM_CONNTYPE_AUI,
+ .sc_media = TULIP_MEDIA_AUI },
+ { .sc_type = TULIP_SROM_CONNTYPE_100BASETX,
+ .sc_media = TULIP_MEDIA_100BASETX },
+ { .sc_type = TULIP_SROM_CONNTYPE_100BASET4,
+ .sc_media = TULIP_MEDIA_100BASET4 },
+ { .sc_type = TULIP_SROM_CONNTYPE_100BASEFX,
+ .sc_media = TULIP_MEDIA_100BASEFX },
+ { .sc_type = TULIP_SROM_CONNTYPE_MII_10BASET,
+ .sc_media = TULIP_MEDIA_10BASET,
+ .sc_attrs = TULIP_SROM_ATTR_MII },
+ { .sc_type = TULIP_SROM_CONNTYPE_MII_100BASETX,
+ .sc_media = TULIP_MEDIA_100BASETX,
+ .sc_attrs = TULIP_SROM_ATTR_MII },
+ { .sc_type = TULIP_SROM_CONNTYPE_MII_100BASET4,
+ .sc_media = TULIP_MEDIA_100BASET4,
+ .sc_attrs = TULIP_SROM_ATTR_MII },
+ { .sc_type = TULIP_SROM_CONNTYPE_MII_100BASEFX,
+ .sc_media = TULIP_MEDIA_100BASEFX,
+ .sc_attrs = TULIP_SROM_ATTR_MII },
+ { .sc_type = TULIP_SROM_CONNTYPE_10BASET_NWAY,
+ .sc_media = TULIP_MEDIA_10BASET,
+ .sc_attrs = TULIP_SROM_ATTR_NWAY },
+ { .sc_type = TULIP_SROM_CONNTYPE_10BASET_FD,
+ .sc_media = TULIP_MEDIA_10BASET_FD },
+ { .sc_type = TULIP_SROM_CONNTYPE_MII_10BASET_FD,
+ .sc_media = TULIP_MEDIA_10BASET_FD,
+ .sc_attrs = TULIP_SROM_ATTR_MII },
+ { .sc_type = TULIP_SROM_CONNTYPE_100BASETX_FD,
+ .sc_media = TULIP_MEDIA_100BASETX_FD },
+ { .sc_type = TULIP_SROM_CONNTYPE_MII_100BASETX_FD,
+ .sc_media = TULIP_MEDIA_100BASETX_FD,
+ .sc_attrs = TULIP_SROM_ATTR_MII },
+ { .sc_type = TULIP_SROM_CONNTYPE_10BASET_NOLINKPASS,
+ .sc_media = TULIP_MEDIA_10BASET,
+ .sc_attrs = TULIP_SROM_ATTR_NOLINKPASS },
+ { .sc_type = TULIP_SROM_CONNTYPE_AUTOSENSE,
+ .sc_media = TULIP_MEDIA_UNKNOWN,
+ .sc_attrs = TULIP_SROM_ATTR_AUTOSENSE },
+ { .sc_type = TULIP_SROM_CONNTYPE_AUTOSENSE_POWERUP,
+ .sc_media = TULIP_MEDIA_UNKNOWN,
+ .sc_attrs = TULIP_SROM_ATTR_AUTOSENSE|TULIP_SROM_ATTR_POWERUP },
+ { .sc_type = TULIP_SROM_CONNTYPE_AUTOSENSE_NWAY,
+ .sc_media = TULIP_MEDIA_UNKNOWN,
+ .sc_attrs = TULIP_SROM_ATTR_AUTOSENSE|TULIP_SROM_ATTR_NWAY },
+ { .sc_type = TULIP_SROM_CONNTYPE_NOT_USED,
+ .sc_media = TULIP_MEDIA_UNKNOWN }
};
#define TULIP_SROM_LASTCONNIDX \
(sizeof(tulip_srom_conninfo)/sizeof(tulip_srom_conninfo[0]) - 1)
@@ -838,7 +858,7 @@ static const struct {
{ TULIP_MEDIA_AUI, TULIP_SROM_MEDIA_AUI },
{ TULIP_MEDIA_BNC, TULIP_SROM_MEDIA_BNC },
{ TULIP_MEDIA_10BASET, TULIP_SROM_MEDIA_10BASET },
- { TULIP_MEDIA_UNKNOWN }
+ { .sm_type = TULIP_MEDIA_UNKNOWN }
};
#endif /* TULIP_HDR_DATA */