From 43f12c5b662543e2074b6839790830d6e8e4fa98 Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 12 May 2020 02:23:11 +0000
Subject: [PATCH] [ath_hal_ar9300] Ensure AH_BYTE_ORDER is defined before used.

Same deal here - ensure endian bits are set here first!
---
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_ap121.h   | 5 +++++
 .../dev/ath/ath_hal/ar9300/ar9300template_aphrodite.h       | 5 +++++
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_cus157.h  | 5 +++++
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_generic.h | 5 +++++
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb112.h   | 5 +++++
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb116.h   | 5 +++++
 .../dev/ath/ath_hal/ar9300/ar9300template_osprey_k31.h      | 5 +++++
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_wasp_2.h  | 6 ++++++
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb112.h   | 5 +++++
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb113.h   | 5 +++++
 10 files changed, 51 insertions(+)

diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_ap121.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_ap121.h
index 6468445b8a82..fabed1cb8fe0 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_ap121.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_ap121.h
@@ -25,6 +25,11 @@
 #ifndef __ar9300templateAP121_h__
 #define __ar9300templateAP121_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_ap121=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_aphrodite.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_aphrodite.h
index a9e5f3635976..0f756b81cd81 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_aphrodite.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_aphrodite.h
@@ -26,6 +26,11 @@
 #ifndef __ar9300templateAphrodite_h__
 #define __ar9300templateAphrodite_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_aphrodite=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_cus157.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_cus157.h
index dc37977956ec..fab9558bf588 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_cus157.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_cus157.h
@@ -25,6 +25,11 @@
 #ifndef __ar9300template_cus157_h__
 #define __ar9300template_cus157_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t Ar9300Template_cus157=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_generic.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_generic.h
index 6b7a0d1bb8f4..08b30c215eaf 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_generic.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_generic.h
@@ -25,6 +25,11 @@
 #ifndef __ar9300templateGeneric_h__
 #define __ar9300templateGeneric_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_generic=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb112.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb112.h
index c3bbc1d30203..674d8e430e94 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb112.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb112.h
@@ -25,6 +25,11 @@
 #ifndef __ar9300templateHB112_h__
 #define __ar9300templateHB112_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_hb112=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb116.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb116.h
index c1de18ebbe0e..600955181bbc 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb116.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_hb116.h
@@ -26,6 +26,11 @@
 #ifndef __ar9300templateHB116_h__
 #define __ar9300templateHB116_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_hb116=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_osprey_k31.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_osprey_k31.h
index b6b09e80985b..14fdaab18f2f 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_osprey_k31.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_osprey_k31.h
@@ -25,6 +25,11 @@
 #ifndef __ar9300templateOsprey_k31_h__
 #define __ar9300templateOsprey_k31_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_osprey_k31=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_wasp_2.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_wasp_2.h
index 2eb165f3a72f..0e53dace2b9e 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_wasp_2.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_wasp_2.h
@@ -24,6 +24,12 @@
 
 #ifndef __ar9300template_wasp_2_h__
 #define __ar9300template_wasp_2_h__
+
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_wasp_2=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb112.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb112.h
index 864efbab8ce1..645ab78a7157 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb112.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb112.h
@@ -25,6 +25,11 @@
 #ifndef __ar9300templateXB112_h__
 #define __ar9300templateXB112_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_xb112=
 {
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb113.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb113.h
index 7b715455a6cb..291b163be823 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb113.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300template_xb113.h
@@ -25,6 +25,11 @@
 #ifndef __ar9300templateXB113_h__
 #define __ar9300templateXB113_h__
 
+/* Ensure that AH_BYTE_ORDER is defined */
+#ifndef AH_BYTE_ORDER
+#error AH_BYTE_ORDER needs to be defined!
+#endif
+
 static ar9300_eeprom_t ar9300_template_xb113=
 {