sync 0521

4 files changed, 23 insertions, 24 deletions

diff --git a/sys/dev/microcode/aic7xxx/Makefile.inc b/sys/dev/microcode/aic7xxx/Makefile.inc
index 063a9b92afd..88ff6c63822 100644
--- a/sys/dev/microcode/aic7xxx/Makefile.inc
+++ b/sys/dev/microcode/aic7xxx/Makefile.inc
@@ -1,3 +1,5 @@
+#	$NetBSD: Makefile.inc,v 1.4 1996/05/20 00:48:43 thorpej Exp $
+
 .if target(aic7xxx.o)
 PATH: $S/dev/microcode/aic7xxx
 
@@ -7,5 +9,7 @@ aic7xxx_seq.h: aic7xxx_asm $S/dev/microcode/aic7xxx/aic7xxx.seq
 	./aic7xxx_asm -o ${.TARGET} $S/dev/microcode/aic7xxx/aic7xxx.seq
 
 aic7xxx_asm: $S/dev/microcode/aic7xxx/aic7xxx_asm.c
-	cc -o ${.TARGET} $<
+
+clean::
+	rm -f aic7xxx_asm
 .endif
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq
index 9db05bec6f0..718c8db724a 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.seq
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq
@@ -1,3 +1,5 @@
+/*	$NetBSD: aic7xxx.seq,v 1.3 1996/05/20 00:48:45 thorpej Exp $	*/
+
 /*+M***********************************************************************
  *Adaptec 274x/284x/294x device driver for Linux and FreeBSD.
  *
@@ -39,10 +41,10 @@
  *
  *-M************************************************************************/
 
-VERSION AIC7XXX_SEQ_VER "$Id: aic7xxx.seq,v 1.2 1996/05/05 12:42:37 deraadt Exp $"
+VERSION AIC7XXX_SEQ_VER "$NetBSD: aic7xxx.seq,v 1.3 1996/05/20 00:48:45 thorpej Exp $"
 
 #if defined(__NetBSD__)
-#include "../../../../dev/microcode/aic7xxx/aic7xxx_reg.h"
+#include "../../../../dev/ic/aic7xxxreg.h"
 #elif defined(__FreeBSD__)
 #include "../../dev/aic7xxx/aic7xxx_reg.h"
 #endif
@@ -397,7 +399,7 @@ dma_finish2:
  * For Linux, we must throw away four bytes since there is a 32bit gap
  * in the middle of a struct scatterlist.
  */
-#ifdef linux
+#ifdef __linux__
 	mov	NONE,DFDAT
 	mov	NONE,DFDAT
 	mov	NONE,DFDAT
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_asm.1 b/sys/dev/microcode/aic7xxx/aic7xxx_asm.1
index 2ff33b78190..be533d3c052 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_asm.1
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_asm.1
@@ -1,3 +1,5 @@
+.\"	$NetBSD: aic7xxx_asm.1,v 1.2 1996/05/20 00:48:47 thorpej Exp $
+.\"
 .\" Copyright (c) 1994, 1995
 .\"	Justin T. Gibbs.  All rights reserved.
 .\"
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_asm.c b/sys/dev/microcode/aic7xxx/aic7xxx_asm.c
index 2d2a47efb4a..fd9e8bb4229 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx_asm.c
+++ b/sys/dev/microcode/aic7xxx/aic7xxx_asm.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: aic7xxx_asm.c,v 1.4 1996/05/20 00:48:48 thorpej Exp $	*/
+
 /*+M*************************************************************************
  * Adaptec AIC7770/AIC7870 sequencer code assembler.
  *
@@ -43,7 +45,7 @@
  * are token separators.
  *
  *-M*************************************************************************/
-static char id[] = "$Id: aic7xxx_asm.c,v 1.3 1996/05/07 07:38:22 deraadt Exp $";
+static char id[] = "$NetBSD: aic7xxx_asm.c,v 1.4 1996/05/20 00:48:48 thorpej Exp $";
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
@@ -87,9 +89,7 @@ Malloc(size_t size)
 }
 
 void *
-Realloc(ptr, size)
-	void *ptr;
-	size_t size;
+Realloc(void *ptr, size_t size)
 {
 	void *p = realloc(ptr, size);
 	if (!p)
@@ -143,8 +143,7 @@ define(char *name, int value)
 }
 
 sym_t *
-lookup(name)
-	char *name;
+lookup(char *name)
 {
 	sym_t *p;
 
@@ -163,7 +162,7 @@ patch(sym_t *p, int location)
 	p->patch[p->npatch - 1] = location;
 }
 
-void backpatch()
+void backpatch(void)
 {
 	int i;
 	sym_t *p;
@@ -203,8 +202,7 @@ void backpatch()
  *  since the sequencer RAM is loaded that way.
  */
 void
-output(fp)
-	FILE *fp;
+output(FILE *fp)
 {
 	int i;
 
@@ -218,8 +216,7 @@ output(fp)
 }
 
 char **
-getl(n)
-	int *n;
+getl(int *n)
 {
 	int i;
 	char *p, *quote;
@@ -378,9 +375,7 @@ eval_operand(char **a, int spec)
 }
 
 int
-eval_sdi(a, spec)
-	char **a;
-	int spec;
+eval_sdi(char **a, int spec)
 {
 	sym_t *p;
 	unsigned val;
@@ -450,9 +445,7 @@ eval_sdi(a, spec)
 }
 
 int
-eval_addr(a, spec)
-	char **a;
-	int spec;
+eval_addr(char **a, int spec)
 {
 	sym_t *p;
 
@@ -477,9 +470,7 @@ eval_addr(a, spec)
 }
 
 int
-crack(a, n)
-	char **a;
-	int n;
+crack(char **a, int n)
 {
 	int i;
 	int I_imm, I_addr;