CVS commit: src/sys/dev/ic

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Wed Jan 22 17:29:29 UTC 2014

Modified Files:
        src/sys/dev/ic: arn9380.c

Log Message:
swap16 -> bswap16   swap32 -> bswap32


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/arn9380.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/arn9380.c
diff -u src/sys/dev/ic/arn9380.c:1.2 src/sys/dev/ic/arn9380.c:1.3
--- src/sys/dev/ic/arn9380.c:1.2	Wed Apr  3 14:20:02 2013
+++ src/sys/dev/ic/arn9380.c	Wed Jan 22 17:29:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: arn9380.c,v 1.2 2013/04/03 14:20:02 christos Exp $	*/
+/*	$NetBSD: arn9380.c,v 1.3 2014/01/22 17:29:29 matt Exp $	*/
 /*	$OpenBSD: ar9380.c,v 1.17 2012/10/20 09:54:20 stsp Exp $	*/
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn9380.c,v 1.2 2013/04/03 14:20:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn9380.c,v 1.3 2014/01/22 17:29:29 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -224,25 +224,25 @@ ar9380_swap_rom(struct athn_softc *sc)
 	struct ar9380_modal_eep_header *modal;
 	int i;
 
-	base->regDmn[0] = swap16(base->regDmn[0]);
-	base->regDmn[1] = swap16(base->regDmn[1]);
-	base->swreg = swap32(base->swreg);
+	base->regDmn[0] = bswap16(base->regDmn[0]);
+	base->regDmn[1] = bswap16(base->regDmn[1]);
+	base->swreg = bswap32(base->swreg);
 
 	modal = &eep->modalHeader2G;
-	modal->antCtrlCommon = swap32(modal->antCtrlCommon);
-	modal->antCtrlCommon2 = swap32(modal->antCtrlCommon2);
-	modal->papdRateMaskHt20 = swap32(modal->papdRateMaskHt20);
-	modal->papdRateMaskHt40 = swap32(modal->papdRateMaskHt40);
+	modal->antCtrlCommon = bswap32(modal->antCtrlCommon);
+	modal->antCtrlCommon2 = bswap32(modal->antCtrlCommon2);
+	modal->papdRateMaskHt20 = bswap32(modal->papdRateMaskHt20);
+	modal->papdRateMaskHt40 = bswap32(modal->papdRateMaskHt40);
 	for (i = 0; i < AR9380_MAX_CHAINS; i++)
-		modal->antCtrlChain[i] = swap16(modal->antCtrlChain[i]);
+		modal->antCtrlChain[i] = bswap16(modal->antCtrlChain[i]);
 
 	modal = &eep->modalHeader5G;
-	modal->antCtrlCommon = swap32(modal->antCtrlCommon);
-	modal->antCtrlCommon2 = swap32(modal->antCtrlCommon2);
-	modal->papdRateMaskHt20 = swap32(modal->papdRateMaskHt20);
-	modal->papdRateMaskHt40 = swap32(modal->papdRateMaskHt40);
+	modal->antCtrlCommon = bswap32(modal->antCtrlCommon);
+	modal->antCtrlCommon2 = bswap32(modal->antCtrlCommon2);
+	modal->papdRateMaskHt20 = bswap32(modal->papdRateMaskHt20);
+	modal->papdRateMaskHt40 = bswap32(modal->papdRateMaskHt40);
 	for (i = 0; i < AR9380_MAX_CHAINS; i++)
-		modal->antCtrlChain[i] = swap16(modal->antCtrlChain[i]);
+		modal->antCtrlChain[i] = bswap16(modal->antCtrlChain[i]);
 #endif
 }