cosmetic

1 files changed, 59 insertions, 31 deletions

diff --git a/sys/dev/usb/if_zydreg.h b/sys/dev/usb/if_zydreg.h
index 6be82aa02f2..c531210a0f8 100644
--- a/sys/dev/usb/if_zydreg.h
+++ b/sys/dev/usb/if_zydreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zydreg.h,v 1.18 2006/11/30 17:45:40 damien Exp $	*/
+/*	$OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -588,6 +588,8 @@
 	{ 0x181a60, 0x1c0000 }	\
 }
 
+
+
 #define ZYD_AL2230_PHY							\
 {									\
 	{ ZYD_CR15,  0x20 }, { ZYD_CR23,  0x40 }, { ZYD_CR24,  0x20 },	\
@@ -608,7 +610,7 @@
 	{ ZYD_CR119, 0x10 }, { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x77 },	\
 	{ ZYD_CR122, 0xe0 }, { ZYD_CR137, 0x88 }, { ZYD_CR252, 0xff },	\
 	{ ZYD_CR253, 0xff }, { ZYD_CR251, 0x2f }, { ZYD_CR251, 0x3f },	\
-	{ ZYD_CR138, 0x28 }, { ZYD_CR203, 0x06 }, 			\
+	{ ZYD_CR138, 0x28 }, { ZYD_CR203, 0x06 } 			\
 }
 
 #define ZYD_AL2230_PHY_B						\
@@ -722,24 +724,26 @@
 	0x193d76, 0x9dd844, 0x500007, 0xd8c010, 0x3c9000, 0xf15d58	\
 }
 
-#define ZYD_AL7230B_CHANTABLE						\
-{									\
-	{ 0x09ec00, 0x8cccc8 },						\
-	{ 0x09ec00, 0x8cccd8 },						\
-	{ 0x09ec00, 0x8cccc0 },						\
-	{ 0x09ec00, 0x8cccd0 },						\
-	{ 0x05ec00, 0x8cccc8 },						\
-	{ 0x05ec00, 0x8cccd8 },						\
-	{ 0x05ec00, 0x8cccc0 },						\
-	{ 0x05ec00, 0x8cccd0 },						\
-	{ 0x0dec00, 0x8cccc8 },						\
-	{ 0x0dec00, 0x8cccd8 },						\
-	{ 0x0dec00, 0x8cccc0 },						\
-	{ 0x0dec00, 0x8cccd0 },						\
-	{ 0x03ec00, 0x8cccc8 },						\
-	{ 0x03ec00, 0x866660 }						\
+#define ZYD_AL7230B_CHANTABLE	\
+{				\
+	{ 0x09ec00, 0x8cccc8 },	\
+	{ 0x09ec00, 0x8cccd8 },	\
+	{ 0x09ec00, 0x8cccc0 },	\
+	{ 0x09ec00, 0x8cccd0 },	\
+	{ 0x05ec00, 0x8cccc8 },	\
+	{ 0x05ec00, 0x8cccd8 },	\
+	{ 0x05ec00, 0x8cccc0 },	\
+	{ 0x05ec00, 0x8cccd0 },	\
+	{ 0x0dec00, 0x8cccc8 },	\
+	{ 0x0dec00, 0x8cccd8 },	\
+	{ 0x0dec00, 0x8cccc0 },	\
+	{ 0x0dec00, 0x8cccd0 },	\
+	{ 0x03ec00, 0x8cccc8 },	\
+	{ 0x03ec00, 0x866660 }	\
 }
 
+
+
 #define ZYD_AL2210_PHY							\
 {									\
 	{ ZYD_CR9,   0xe0 }, { ZYD_CR10, 0x91 }, { ZYD_CR12,  0x90 },	\
@@ -765,6 +769,8 @@
 	0x019a80, 0x019b40 						\
 }
 
+
+
 #define ZYD_GCT_PHY							\
 {									\
 	{ ZYD_CR47,  0x1e }, { ZYD_CR15, 0xdc }, { ZYD_CR113, 0xc0 },	\
@@ -793,6 +799,8 @@
 	0x1a3000, 0x1ab000						\
 }
 
+
+
 #define ZYD_MAXIM_PHY							\
 {									\
 	{ ZYD_CR23,  0x40 }, { ZYD_CR15,  0x20 }, { ZYD_CR28,  0x3e },	\
@@ -827,17 +835,25 @@
 	0x00026c							\
 }
 
-#define ZYD_MAXIM_CHANTABLE_F						\
-{									\
-	0x0ccd4, 0x22224, 0x37774, 0x0ccd4, 0x22224, 0x37774, 0x0ccd4,	\
-	0x22224, 0x37774, 0x0ccd4, 0x22224, 0x37774, 0x0ccd4, 0x199a4	\
+#define ZYD_MAXIM_CHANTABLE	\
+{				\
+	{ 0x0ccd4, 0x30a03 },	\
+	{ 0x22224, 0x00a13 },	\
+	{ 0x37774, 0x10a13 },	\
+	{ 0x0ccd4, 0x30a13 },	\
+	{ 0x22224, 0x00a23 },	\
+	{ 0x37774, 0x10a23 },	\
+	{ 0x0ccd4, 0x30a23 },	\
+	{ 0x22224, 0x00a33 },	\
+	{ 0x37774, 0x10a33 },	\
+	{ 0x0ccd4, 0x30a33 },	\
+	{ 0x22224, 0x00a43 },	\
+	{ 0x37774, 0x10a43 },	\
+	{ 0x0ccd4, 0x30a43 },	\
+	{ 0x199a4, 0x20a53 }	\
 }
 
-#define ZYD_MAXIM_CHANTABLE_N						\
-{									\
-	0x30a03, 0x00a13, 0x10a13, 0x30a13, 0x00a23, 0x10a23, 0x30a23,	\
-	0x00a33, 0x10a33, 0x30a33, 0x00a43, 0x10a43, 0x30a43, 0x20a53	\
-}
+
 
 #define ZYD_MAXIM2_PHY							\
 {									\
@@ -878,10 +894,22 @@
 	0x08884, 0x1ddd4, 0x33334, 0x08884, 0x1ddd4, 0x33334, 0x26664	\
 }
 
-#define ZYD_MAXIM2_CHANTABLE_N						\
-{									\
-	0x10a03, 0x20a13, 0x30a13, 0x10a13, 0x20a23, 0x30a23, 0x10a23,	\
-	0x20a33, 0x30a33, 0x10a33, 0x20a43, 0x30a43, 0x10a43, 0x20a53	\
+#define ZYD_MAXIM2_CHANTABLE	\
+{				\
+	{ 0x33334, 0x10a03 },	\
+	{ 0x08884, 0x20a13 },	\
+	{ 0x1ddd4, 0x30a13 },	\
+	{ 0x33334, 0x10a13 },	\
+	{ 0x08884, 0x20a23 },	\
+	{ 0x1ddd4, 0x30a23 },	\
+	{ 0x33334, 0x10a23 },	\
+	{ 0x08884, 0x20a33 },	\
+	{ 0x1ddd4, 0x30a33 },	\
+	{ 0x33334, 0x10a33 },	\
+	{ 0x08884, 0x20a43 },	\
+	{ 0x1ddd4, 0x30a43 },	\
+	{ 0x33334, 0x10a43 },	\
+	{ 0x26664, 0x20a53 }	\
 }
 
 /*