Sync with new aicasm.c. No functional change.

4 files changed, 16 insertions, 18 deletions

diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index 2c42cefeef9..efe9573b526 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic79xx.c,v 1.27 2005/07/18 02:43:26 fgsch Exp $	*/
+/*	$OpenBSD: aic79xx.c,v 1.28 2005/10/04 23:52:04 krw Exp $	*/
 
 /*
  * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -8468,9 +8468,9 @@ ahd_dumpseq(struct ahd_softc* ahd)
 void
 ahd_loadseq(struct ahd_softc *ahd)
 {
-	struct	cs cs_table[num_critical_sections];
-	u_int	begin_set[num_critical_sections];
-	u_int	end_set[num_critical_sections];
+	struct	cs cs_table[NUM_CRITICAL_SECTIONS];
+	u_int	begin_set[NUM_CRITICAL_SECTIONS];
+	u_int	end_set[NUM_CRITICAL_SECTIONS];
 	const struct	patch *cur_patch;
 	u_int	cs_count;
 	u_int	cur_cs;
@@ -8586,7 +8586,7 @@ ahd_loadseq(struct ahd_softc *ahd)
 		 * Move through the CS table until we find a CS
 		 * that might apply to this instruction.
 		 */
-		for (; cur_cs < num_critical_sections; cur_cs++) {
+		for (; cur_cs < NUM_CRITICAL_SECTIONS; cur_cs++) {
 			if (critical_sections[cur_cs].end <= i) {
 				if (begin_set[cs_count] == TRUE
 				 && end_set[cs_count] == FALSE) {
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 313c6ecb753..028551bc35a 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic7xxx.c,v 1.67 2005/08/07 17:14:57 deraadt Exp $	*/
+/*	$OpenBSD: aic7xxx.c,v 1.68 2005/10/04 23:52:04 krw Exp $	*/
 /*	$NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aic7xxx.c,v 1.67 2005/08/07 17:14:57 deraadt Exp $
+ * $Id: aic7xxx.c,v 1.68 2005/10/04 23:52:04 krw Exp $
  */
 /*
  * Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
@@ -6259,9 +6259,9 @@ ahc_dumpseq(struct ahc_softc* ahc)
 static int
 ahc_loadseq(struct ahc_softc *ahc)
 {
-	struct	cs cs_table[num_critical_sections];
-	u_int	begin_set[num_critical_sections];
-	u_int	end_set[num_critical_sections];
+	struct	cs cs_table[NUM_CRITICAL_SECTIONS];
+	u_int	begin_set[NUM_CRITICAL_SECTIONS];
+	u_int	end_set[NUM_CRITICAL_SECTIONS];
 	const struct	patch *cur_patch;
 	u_int	cs_count;
 	u_int	cur_cs;
@@ -6326,7 +6326,7 @@ ahc_loadseq(struct ahc_softc *ahc)
 		 * Move through the CS table until we find a CS
 		 * that might apply to this instruction.
 		 */
-		for (; cur_cs < num_critical_sections; cur_cs++) {
+		for (; cur_cs < NUM_CRITICAL_SECTIONS; cur_cs++) {
 			if (critical_sections[cur_cs].end <= i) {
 				if (begin_set[cs_count] == TRUE
 				 && end_set[cs_count] == FALSE) {
diff --git a/sys/dev/microcode/aic7xxx/aic79xx_seq.h b/sys/dev/microcode/aic7xxx/aic79xx_seq.h
index b870c824972..9de96582b48 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic79xx_seq.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: aic79xx_seq.h,v 1.5 2004/12/11 00:12:25 krw Exp $	*/
+/*	$OpenBSD: aic79xx_seq.h,v 1.6 2005/10/04 23:52:05 krw Exp $	*/
 /*
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * Id: aic79xx.seq,v 1.5 2004/12/11 00:08:43 krw Exp 
+ * Id: aic79xx.seq,v 1.6 2005/03/23 23:47:22 deraadt Exp 
  * Id: aic79xx.reg,v 1.4 2004/12/11 00:08:43 krw Exp 
  */
 static const uint8_t seqprog[] = {
@@ -1187,5 +1187,4 @@ static const struct cs {
 	{ 759, 763 }
 };
 
-static const int num_critical_sections = sizeof(critical_sections)
-				       / sizeof(*critical_sections);
+#define NUM_CRITICAL_SECTIONS (sizeof(critical_sections) / sizeof(*critical_sections))
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
index 58063c8333f..bd0bf98d2b2 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx_seq.h,v 1.16 2004/09/18 19:56:53 mickey Exp $ */
+/* $OpenBSD: aic7xxx_seq.h,v 1.17 2005/10/04 23:52:04 krw Exp $ */
 /*
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
@@ -1305,5 +1305,4 @@ static const struct cs {
 	{ 875, 877 }
 };
 
-static const int num_critical_sections = sizeof(critical_sections)
-				       / sizeof(*critical_sections);
+#define NUM_CRITICAL_SECTIONS (sizeof(critical_sections) / sizeof(*critical_sections))