PERFORCE change 132317 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=132317

Change 132317 by hselasky at hselasky_laptop001 on 2008/01/02 18:12:28

	
	We need to expand some macros because indent doesn't like them!

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#31 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#31 (text+ko) ====

@@ -162,68 +162,59 @@
 static const struct zyd_phy_pair zyd_def_phyB[] = ZYD_DEF_PHYB;
 
 /* various supported device vendors/products */
-#define ZYD_ZD1211_DEV(v, p)	\
-	{ { USB_VENDOR_##v, USB_PRODUCT_##v##_##p }, ZYD_ZD1211 }
-#define ZYD_ZD1211B_DEV(v, p)	\
-	{ { USB_VENDOR_##v, USB_PRODUCT_##v##_##p }, ZYD_ZD1211B }
 static const struct zyd_type {
 	struct usb_devno	dev;
 	uint8_t			rev;
 #define ZYD_ZD1211	0
 #define ZYD_ZD1211B	1
 } zyd_devs[] = {
-	ZYD_ZD1211_DEV(3COM2,		3CRUSB10075),
-	ZYD_ZD1211_DEV(ABOCOM,		WL54),
-	ZYD_ZD1211_DEV(ASUS,		WL159G),
-	ZYD_ZD1211_DEV(CYBERTAN,	TG54USB),
-	ZYD_ZD1211_DEV(DRAYTEK,		VIGOR550),
-	ZYD_ZD1211_DEV(PLANEX2,		GWUS54GD),
-	ZYD_ZD1211_DEV(PLANEX2,		GWUS54GZL),
-	ZYD_ZD1211_DEV(PLANEX3,		GWUS54GZ),
-	ZYD_ZD1211_DEV(PLANEX3,		GWUS54MINI),
-	ZYD_ZD1211_DEV(SAGEM,		XG760A),
-	ZYD_ZD1211_DEV(SENAO,		NUB8301),
-	ZYD_ZD1211_DEV(SITECOMEU,	WL113),
-	ZYD_ZD1211_DEV(SWEEX,		ZD1211),
-	ZYD_ZD1211_DEV(TEKRAM,		QUICKWLAN),
-	ZYD_ZD1211_DEV(TEKRAM,		ZD1211_1),
-	ZYD_ZD1211_DEV(TEKRAM,		ZD1211_2),
-	ZYD_ZD1211_DEV(TWINMOS,		G240),
-	ZYD_ZD1211_DEV(UMEDIA,		ALL0298V2),
-	ZYD_ZD1211_DEV(UMEDIA,		TEW429UB_A),
-	ZYD_ZD1211_DEV(UMEDIA,		TEW429UB),
-	ZYD_ZD1211_DEV(WISTRONNEWEB,	UR055G),
-	ZYD_ZD1211_DEV(ZCOM,		ZD1211),
-	ZYD_ZD1211_DEV(ZYDAS,		ZD1211),
-	ZYD_ZD1211_DEV(ZYXEL,		AG225H),
-	ZYD_ZD1211_DEV(ZYXEL,		ZYAIRG220),
-	ZYD_ZD1211_DEV(ZYXEL,		G200V2),
-
-	ZYD_ZD1211B_DEV(ACCTON,		SMCWUSBG),
-	ZYD_ZD1211B_DEV(ACCTON,		ZD1211B),
-	ZYD_ZD1211B_DEV(ASUS,		A9T_WIFI),
-	ZYD_ZD1211B_DEV(BELKIN,		F5D7050_V4000),
-	ZYD_ZD1211B_DEV(BELKIN,		ZD1211B),
-	ZYD_ZD1211B_DEV(CISCOLINKSYS,	WUSBF54G),
-	ZYD_ZD1211B_DEV(FIBERLINE,	WL430U),
-	ZYD_ZD1211B_DEV(MELCO,		KG54L),
-	ZYD_ZD1211B_DEV(PHILIPS,	SNU5600),
-	ZYD_ZD1211B_DEV(PLANEX2,	GW_US54GXS),
-	ZYD_ZD1211B_DEV(SAGEM,		XG76NA),
-	ZYD_ZD1211B_DEV(SITECOMEU,	ZD1211B),
-	ZYD_ZD1211B_DEV(UMEDIA,		TEW429UBC1),
-#if 0	/* Shall we needs? */
-	ZYD_ZD1211B_DEV(UNKNOWN1,	ZD1211B_1),
-	ZYD_ZD1211B_DEV(UNKNOWN1,	ZD1211B_2),
-	ZYD_ZD1211B_DEV(UNKNOWN2,	ZD1211B),
-	ZYD_ZD1211B_DEV(UNKNOWN3,	ZD1211B),
-#endif
-	ZYD_ZD1211B_DEV(USR,		USR5423),
-	ZYD_ZD1211B_DEV(VTECH,		ZD1211B),
-	ZYD_ZD1211B_DEV(ZCOM,		ZD1211B),
-	ZYD_ZD1211B_DEV(ZYDAS,		ZD1211B),
-	ZYD_ZD1211B_DEV(ZYXEL,		M202),
-	ZYD_ZD1211B_DEV(ZYXEL,		G220V2),
+  /* ZYD_ZD1211 */
+ { { USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075 }, ZYD_ZD1211 },
+ { { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WL54 }, ZYD_ZD1211 },
+ { { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL159G }, ZYD_ZD1211 },
+ { { USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB }, ZYD_ZD1211 },
+ { { USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550 }, ZYD_ZD1211 },
+ { { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GD }, ZYD_ZD1211 },
+ { { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GZL }, ZYD_ZD1211 },
+ { { USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ }, ZYD_ZD1211 },
+ { { USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI }, ZYD_ZD1211 },
+ { { USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A }, ZYD_ZD1211 },
+ { { USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301 }, ZYD_ZD1211 },
+ { { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113 }, ZYD_ZD1211 },
+ { { USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211 }, ZYD_ZD1211 },
+ { { USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_QUICKWLAN }, ZYD_ZD1211 },
+ { { USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_1 }, ZYD_ZD1211 },
+ { { USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_2 }, ZYD_ZD1211 },
+ { { USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240 }, ZYD_ZD1211 },
+ { { USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2 }, ZYD_ZD1211 },
+ { { USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A }, ZYD_ZD1211 },
+ { { USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB }, ZYD_ZD1211 },
+ { { USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G }, ZYD_ZD1211 },
+ { { USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211 }, ZYD_ZD1211 },
+ { { USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211 }, ZYD_ZD1211 },
+ { { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG225H }, ZYD_ZD1211 },
+ { { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220 }, ZYD_ZD1211 },
+ { { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2 }, ZYD_ZD1211 },
+ /* ZYD_ZD1211B */
+ { { USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SMCWUSBG }, ZYD_ZD1211B },
+ { { USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B }, ZYD_ZD1211B },
+ { { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_A9T_WIFI }, ZYD_ZD1211B },
+ { { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050_V4000 }, ZYD_ZD1211B },
+ { { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B }, ZYD_ZD1211B },
+ { { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSBF54G }, ZYD_ZD1211B },
+ { { USB_VENDOR_FIBERLINE, USB_PRODUCT_FIBERLINE_WL430U }, ZYD_ZD1211B },
+ { { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54L }, ZYD_ZD1211B },
+ { { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SNU5600 }, ZYD_ZD1211B },
+ { { USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US54GXS }, ZYD_ZD1211B },
+ { { USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG76NA }, ZYD_ZD1211B },
+ { { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_ZD1211B }, ZYD_ZD1211B },
+ { { USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UBC1 }, ZYD_ZD1211B },
+ { { USB_VENDOR_USR, USB_PRODUCT_USR_USR5423 }, ZYD_ZD1211B },
+ { { USB_VENDOR_VTECH, USB_PRODUCT_VTECH_ZD1211B }, ZYD_ZD1211B },
+ { { USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211B }, ZYD_ZD1211B },
+ { { USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211B }, ZYD_ZD1211B },
+ { { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_M202 }, ZYD_ZD1211B },
+ { { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2 }, ZYD_ZD1211B },
 };
 #define zyd_lookup(v, p)	\
 	((const struct zyd_type *)usb_lookup(zyd_devs, v, p))