avoid bypassing sys/queue.h in many places in the kernel.

many assumptions were made about the way the various list types are
implemented.

lots of suggestions and help from otto and miod.
ok otto@

2 files changed, 8 insertions, 12 deletions

diff --git a/sys/dev/microcode/aic7xxx/aicasm_gram.y b/sys/dev/microcode/aic7xxx/aicasm_gram.y
index 7d98873715f..cd70b0395c9 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_gram.y
+++ b/sys/dev/microcode/aic7xxx/aicasm_gram.y
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: aicasm_gram.y,v 1.14 2006/12/23 21:08:01 krw Exp $	*/
+/*	$OpenBSD: aicasm_gram.y,v 1.15 2007/05/28 22:17:21 pyr Exp $	*/
 /*	$NetBSD: aicasm_gram.y,v 1.3 2003/04/19 19:26:11 fvdl Exp $	*/
 
 /*
@@ -1845,9 +1845,7 @@ type_check(symbol_t *symbol, expression_t *expression, int opcode)
 	 * expression are defined for this register.
 	 */
 	if (symbol->info.rinfo->typecheck_masks != FALSE) {
-		for(node = expression->referenced_syms.slh_first;
-		    node != NULL;
-		    node = node->links.sle_next) {
+		SLIST_FOREACH(node, &expression->referenced_syms, links) {
 			if ((node->symbol->type == MASK
 			  || node->symbol->type == FIELD
 			  || node->symbol->type == ENUM
@@ -1943,8 +1941,8 @@ yyerror(const char *string)
 static int
 is_download_const(expression_t *immed)
 {
-	if ((immed->referenced_syms.slh_first != NULL)
-	 && (immed->referenced_syms.slh_first->symbol->type == DOWNLOAD_CONST))
+	if (!SLIST_EMPTY(&immed->referenced_syms))
+	 && (SLIST_FIRST(&immed->referenced_syms)->symbol->type == DOWNLOAD_CONST))
 		return (TRUE);
 
 	return (FALSE);
diff --git a/sys/dev/microcode/aic7xxx/aicasm_scan.l b/sys/dev/microcode/aic7xxx/aicasm_scan.l
index 27fe114d60f..57f9eaaa762 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_scan.l
+++ b/sys/dev/microcode/aic7xxx/aicasm_scan.l
@@ -1,5 +1,5 @@
 %{
-/*	$OpenBSD: aicasm_scan.l,v 1.9 2004/09/18 19:51:53 mickey Exp $	*/
+/*	$OpenBSD: aicasm_scan.l,v 1.10 2007/05/28 22:17:21 pyr Exp $	*/
 /*
  * Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler.
  *
@@ -39,7 +39,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: aicasm_scan.l,v 1.9 2004/09/18 19:51:53 mickey Exp $
+ * $Id: aicasm_scan.l,v 1.10 2007/05/28 22:17:21 pyr Exp $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l,v 1.22 2003/12/16 23:54:07 gibbs Exp $
  */
@@ -459,9 +459,7 @@ include_file(char *file_name, include_type type)
 
 	if (newfile == NULL && type != SOURCE_FILE) {
                 path_entry_t include_dir;
-                for (include_dir = search_path.slh_first;
-                     include_dir != NULL;                
-                     include_dir = include_dir->links.sle_next) {
+		SLIST_FOREACH(include_dir, &search_path, links) {
 			char fullname[PATH_MAX];
 
 			if ((include_dir->quoted_includes_only == TRUE)
@@ -595,7 +593,7 @@ yywrap()
 	if (yyfilename != NULL)
 		free(yyfilename);
 	yyfilename = NULL;
-	include = include_stack.slh_first;
+	include = SLIST_FIRST(&include_stack);
 	if (include != NULL) {
 		yy_switch_to_buffer(include->buffer);
 		yylineno = include->lineno;