1 files changed, 19 insertions, 18 deletions

diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq
index e56367e36cd..66bdf6f42bf 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.seq
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.seq,v 1.11 2002/06/28 00:34:55 smurph Exp $ */
+/* $OpenBSD: aic7xxx.seq,v 1.12 2002/06/30 18:25:58 smurph Exp $ */
 /*
  * Adaptec 274x/284x/294x device driver firmware for Linux and FreeBSD.
  *
@@ -32,7 +32,8 @@
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.seq,v 1.119 2001/08/05 22:20:12 gibbs Exp $
  */
 
-VERSION = "$Id: aic7xxx.seq,v 1.11 2002/06/28 00:34:55 smurph Exp $"
+VERSION = "$Id: aic7xxx.seq,v 1.12 2002/06/30 18:25:58 smurph Exp $"
+PATCH_ARG_LIST = "struct ahc_softc *ahc"
 
 #include <dev/microcode/aic7xxx/aic7xxx.reg>
 #include <scsi/scsi_message.h>
@@ -81,7 +82,7 @@ poll_for_work_loop:
         test    SSTAT0, SELDO|SELDI     jnz selection;
 test_queue:
 	/* Has the driver posted any work for us? */
-BEGIN_CRITICAL
+BEGIN_CRITICAL;
 	if ((ahc->features & AHC_QUEUE_REGS) != 0) {
 		test	QOFF_CTLSTA, SCB_AVAIL jz poll_for_work_loop;
 	} else {
@@ -102,7 +103,7 @@ BEGIN_CRITICAL
                 mov     SCBPTR, ARG_1;
 	}
         or      SEQ_FLAGS2, SCB_DMA;
-END_CRITICAL
+END_CRITICAL;
 dma_queued_scb:
         /*
          * DMA the SCB from host ram into the current SCB location.
@@ -116,7 +117,7 @@ dma_queued_scb:
          * value.
          */
         mov     A, ARG_1;
-BEGIN_CRITICAL
+BEGIN_CRITICAL;
         cmp     NEXT_QUEUED_SCB, A jne abort_qinscb;
         if ((ahc->flags & AHC_SEQUENCER_DEBUG) != 0) {
                 cmp     SCB_TAG, A je . + 2;
@@ -131,7 +132,7 @@ BEGIN_CRITICAL
                 inc     QINPOS;
         }
         and     SEQ_FLAGS2, ~SCB_DMA;
-END_CRITICAL
+END_CRITICAL;
 start_waiting:
 	/*
          * Start the first entry on the waiting SCB list.
@@ -1372,7 +1373,7 @@ p_command_embedded:
          * The data fifo seems to require 4 byte aligned
          * transfers from the sequencer.  Force this to
          * be the case by clearing HADDR[0] even though
-         * we aren't going to touch host memeory.
+	 * we aren't going to touch host memory.
          */
         clr     HADDR[0];
         if ((ahc->features & AHC_ULTRA2) != 0) {
@@ -1978,7 +1979,7 @@ target_outb:
  * removal of the found SCB from the disconnected list.
  */
 if ((ahc->flags & AHC_PAGESCBS) != 0) {
-BEGIN_CRITICAL
+BEGIN_CRITICAL;
 findSCB:
         mov     A, SINDEX;                      /* Tag passed in SINDEX */
         cmp     DISCONNECTED_SCBH, SCB_LIST_NULL je findSCB_notFound;
@@ -2000,7 +2001,7 @@ rem_scb_from_disc_list:
 	mov	SCBPTR, SINDEX ret;
 rHead:
 	mov	DISCONNECTED_SCBH,SCB_NEXT ret;
-END_CRITICAL
+END_CRITICAL;
 findSCB_notFound:
         /*
          * We didn't find it.  Page in the SCB.
@@ -2125,7 +2126,7 @@ set_1byte_addr:
 	adc	DINDIR, A, SINDIR ret;
 
 /*
- * Either post or fetch and SCB from host memory based on the
+ * Either post or fetch an SCB from host memory based on the
  * DIRECTION bit in DMAPARAMS. The host SCB index is in SINDEX.
  */
 dma_scb:
@@ -2283,11 +2284,11 @@ cleanup_scb:
         }
 add_scb_to_free_list:
 	if ((ahc->flags & AHC_PAGESCBS) != 0) {
-BEGIN_CRITICAL
+BEGIN_CRITICAL;
 		mov	SCB_NEXT, FREE_SCBH;
 		mvi	SCB_TAG, SCB_LIST_NULL;
 		mov	FREE_SCBH, SCBPTR ret;
-END_CRITICAL
+END_CRITICAL;
 	} else {
 		mvi	SCB_TAG, SCB_LIST_NULL ret;
 	}
@@ -2301,7 +2302,7 @@ set_hhaddr:
 
 if ((ahc->flags & AHC_PAGESCBS) != 0) {
 get_free_or_disc_scb:
-BEGIN_CRITICAL
+BEGIN_CRITICAL;
 	cmp	FREE_SCBH, SCB_LIST_NULL jne dequeue_free_scb;
 	cmp	DISCONNECTED_SCBH, SCB_LIST_NULL jne dequeue_disc_scb;
 return_error:
@@ -2310,14 +2311,14 @@ return_error:
 dequeue_disc_scb:
 	mov	SCBPTR, DISCONNECTED_SCBH;
         mov     DISCONNECTED_SCBH, SCB_NEXT;
-END_CRITICAL
+END_CRITICAL;
 	mvi	DMAPARAMS, FIFORESET;
         mov     SCB_TAG jmp dma_scb;
-BEGIN_CRITICAL
+BEGIN_CRITICAL;
 dequeue_free_scb:
 	mov	SCBPTR, FREE_SCBH;
 	mov	FREE_SCBH, SCB_NEXT ret;
-END_CRITICAL
+END_CRITICAL;
 
 add_scb_to_disc_list:
 /*
@@ -2325,10 +2326,10 @@ add_scb_to_disc_list:
  * candidates for paging out an SCB if one is needed for a new command.
  * Modifying the disconnected list is a critical(pause dissabled) section.
  */
-BEGIN_CRITICAL
+BEGIN_CRITICAL;
 	mov	SCB_NEXT, DISCONNECTED_SCBH;
 	mov	DISCONNECTED_SCBH, SCBPTR ret;
-END_CRITICAL
+END_CRITICAL;
 }
 set_seqint:
         mov     INTSTAT, SINDEX;