summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2003-08-28 02:32:48 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2003-08-28 02:32:48 +0000
commitfe8c4348c69f30f4dd33ad3888d6d96291090769 (patch)
tree6c68fd379c9b8187f3fc64de3f2caeea4d96d551
parent6df9ad5d42245d017dbdb8247b65aceab2a82c28 (diff)
Sync ('make microcode') with change to aicasm_symbol.c:
Fix use of uninitialized variable by porting NetBSD patch to correctly initialize it. Said variable is used as the value of the define DOWNLOAD_CONST_COUNT in the generated file aic7xxxreg.h. This define is currently not used anywhere. Spotted and ok mickey@.
-rw-r--r--sys/dev/ic/aic7xxxreg.h8
-rw-r--r--sys/dev/microcode/aic7xxx/aic7xxx_seq.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/ic/aic7xxxreg.h b/sys/dev/ic/aic7xxxreg.h
index a551d49ba8a..6772b27ace5 100644
--- a/sys/dev/ic/aic7xxxreg.h
+++ b/sys/dev/ic/aic7xxxreg.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: aic7xxxreg.h,v 1.12 2002/07/05 05:41:03 smurph Exp $ */
+/* $OpenBSD: aic7xxxreg.h,v 1.13 2003/08/28 02:32:47 krw Exp $ */
/*
* DO NOT EDIT - This file is automatically generated
* from the following source files:
*
- * $Id: aic7xxxreg.h,v 1.12 2002/07/05 05:41:03 smurph Exp $
- * $Id: aic7xxxreg.h,v 1.12 2002/07/05 05:41:03 smurph Exp $
+ * $Id: aic7xxxreg.h,v 1.13 2003/08/28 02:32:47 krw Exp $
+ * $Id: aic7xxxreg.h,v 1.13 2003/08/28 02:32:47 krw Exp $
*/
#define SCSISEQ 0x00
@@ -715,7 +715,7 @@
#define INVERTED_CACHESIZE_MASK 0x03
#define CACHESIZE_MASK 0x02
#define QINFIFO_OFFSET 0x01
-#define DOWNLOAD_CONST_COUNT 0xb003
+#define DOWNLOAD_CONST_COUNT 0x07
/* Exported Labels */
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
index 2f159fc2053..6d90775b2d1 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: aic7xxx_seq.h,v 1.11 2003/08/12 20:32:33 mickey Exp $ */
+/* $OpenBSD: aic7xxx_seq.h,v 1.12 2003/08/28 02:32:47 krw Exp $ */
/*
* DO NOT EDIT - This file is automatically generated
* from the following source files:
*
- * $Id: aic7xxx_seq.h,v 1.11 2003/08/12 20:32:33 mickey Exp $
- * $Id: aic7xxx_seq.h,v 1.11 2003/08/12 20:32:33 mickey Exp $
+ * $Id: aic7xxx_seq.h,v 1.12 2003/08/28 02:32:47 krw Exp $
+ * $Id: aic7xxx_seq.h,v 1.12 2003/08/28 02:32:47 krw Exp $
*/
static const u_int8_t seqprog[] = {
0xb2, 0x00, 0x00, 0x08,