patch-2.4.9 linux/drivers/scsi/aic7xxx/aicasm/aicasm.c

• Lines: 82
• Date: Sun Aug 12 17:37:53 2001
• Orig file: v2.4.8/linux/drivers/scsi/aic7xxx/aicasm/aicasm.c
• Orig date: Sun Mar 4 14:30:18 2001

diff -u --recursive --new-file v2.4.8/linux/drivers/scsi/aic7xxx/aicasm/aicasm.c linux/drivers/scsi/aic7xxx/aicasm/aicasm.c
@@ -14,7 +14,7 @@
  *    derived from this software without specific prior written permission.
  *
  * Alternatively, this software may be distributed under the terms of the
- * GNU Public License ("GPL").
+ * GNU General Public License ("GPL").
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: //depot/src/aic7xxx/aicasm/aicasm.c#6 $
+ * $Id: //depot/src/aic7xxx/aicasm/aicasm.c#8 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.29 2000/10/05 04:25:42 gibbs Exp $
  */
@@ -178,9 +178,10 @@
 							"times\n", appname);
 				}
 				includes_search_curdir = 0;
-				for (include_dir = search_path.slh_first;
+				for (include_dir = SLIST_FIRST(&search_path);
 				     include_dir != NULL;
-				     include_dir = include_dir->links.sle_next)
+				     include_dir = SLIST_NEXT(include_dir,
+							      links))
 					/*
 					 * All entries before a '-I-' only
 					 * apply to includes specified with
@@ -276,9 +277,9 @@
 {
 	struct instruction *cur_instr;
 
-	for(cur_instr = seq_program.stqh_first;
-	    cur_instr != NULL;
-	    cur_instr = cur_instr->links.stqe_next) {
+	for (cur_instr = STAILQ_FIRST(&seq_program);
+	     cur_instr != NULL;
+	     cur_instr = STAILQ_NEXT(cur_instr, links)) {
 		if (cur_instr->patch_label != NULL) {
 			struct ins_format3 *f3_instr;
 			u_int address;
@@ -312,16 +313,18 @@
 	instrcount = 0;
 	fprintf(ofile,
 "/*
-  * DO NOT EDIT - This file is automatically generated.
-  */\n");
+ * DO NOT EDIT - This file is automatically generated
+ *		 from the following source files:
+ *
+%s */\n", versions);
 
 	fprintf(ofile, "static uint8_t seqprog[] = {\n");
-	for(cur_instr = seq_program.stqh_first;
-	    cur_instr != NULL;
-	    cur_instr = cur_instr->links.stqe_next) {
+	for (cur_instr = STAILQ_FIRST(&seq_program);
+	     cur_instr != NULL;
+	     cur_instr = STAILQ_NEXT(cur_instr, links)) {
 
 		fprintf(ofile, "%s\t0x%02x, 0x%02x, 0x%02x, 0x%02x",
-			cur_instr == seq_program.stqh_first ? "" : ",\n",
+			cur_instr == STAILQ_FIRST(&seq_program) ? "" : ",\n",
 #if BYTE_ORDER == LITTLE_ENDIAN
 			cur_instr->format.bytes[0],
 			cur_instr->format.bytes[1],
@@ -340,9 +343,9 @@
 	/*
 	 *  Output patch information.  Patch functions first.
 	 */
-	for(cur_node = SLIST_FIRST(&patch_functions);
-	    cur_node != NULL;
-	    cur_node = SLIST_NEXT(cur_node,links)) {
+	for (cur_node = SLIST_FIRST(&patch_functions);
+	     cur_node != NULL;
+	     cur_node = SLIST_NEXT(cur_node,links)) {
 		fprintf(ofile,
 "static int ahc_patch%d_func(struct ahc_softc *ahc);