[PATCH] rioboot: lindent

This is the result of indent -kr -i8 -bri0 -l255

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 704 insertions, 811 deletions

diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c
index 92df43552f1..9a96fc644e5 100644
--- a/drivers/char/rio/rioboot.c
+++ b/drivers/char/rio/rioboot.c
@@ -80,149 +80,141 @@ static char *_rioboot_c_sccs_ = "@(#)rioboot.c	1.3";
 #include "cmdblk.h"
 #include "route.h"
 
-static int RIOBootComplete( struct rio_info *p, struct Host *HostP, uint Rup, struct PktCmd *PktCmdP );
-
-static uchar
-RIOAtVec2Ctrl[] =
-{
-	/* 0 */  INTERRUPT_DISABLE,
-	/* 1 */  INTERRUPT_DISABLE,
-	/* 2 */  INTERRUPT_DISABLE,
-	/* 3 */  INTERRUPT_DISABLE,
-	/* 4 */  INTERRUPT_DISABLE,
-	/* 5 */  INTERRUPT_DISABLE,
-	/* 6 */  INTERRUPT_DISABLE,
-	/* 7 */  INTERRUPT_DISABLE,
-	/* 8 */  INTERRUPT_DISABLE,
-	/* 9 */  IRQ_9|INTERRUPT_ENABLE,
+static int RIOBootComplete(struct rio_info *p, struct Host *HostP, uint Rup, struct PktCmd *PktCmdP);
+
+static uchar RIOAtVec2Ctrl[] = {
+	/* 0 */ INTERRUPT_DISABLE,
+	/* 1 */ INTERRUPT_DISABLE,
+	/* 2 */ INTERRUPT_DISABLE,
+	/* 3 */ INTERRUPT_DISABLE,
+	/* 4 */ INTERRUPT_DISABLE,
+	/* 5 */ INTERRUPT_DISABLE,
+	/* 6 */ INTERRUPT_DISABLE,
+	/* 7 */ INTERRUPT_DISABLE,
+	/* 8 */ INTERRUPT_DISABLE,
+	/* 9 */ IRQ_9 | INTERRUPT_ENABLE,
 	/* 10 */ INTERRUPT_DISABLE,
-	/* 11 */ IRQ_11|INTERRUPT_ENABLE,
-	/* 12 */ IRQ_12|INTERRUPT_ENABLE,
+	/* 11 */ IRQ_11 | INTERRUPT_ENABLE,
+	/* 12 */ IRQ_12 | INTERRUPT_ENABLE,
 	/* 13 */ INTERRUPT_DISABLE,
 	/* 14 */ INTERRUPT_DISABLE,
-	/* 15 */ IRQ_15|INTERRUPT_ENABLE
+	/* 15 */ IRQ_15 | INTERRUPT_ENABLE
 };
 
 /*
 ** Load in the RTA boot code.
 */
-int
-RIOBootCodeRTA(p, rbp)
-struct rio_info *	p;
-struct DownLoad *	rbp; 
+int RIOBootCodeRTA(p, rbp)
+struct rio_info *p;
+struct DownLoad *rbp;
 {
 	int offset;
 
-	func_enter ();
+	func_enter();
 
 	/* Linux doesn't allow you to disable interrupts during a
 	   "copyin". (Crash when a pagefault occurs). */
 	/* disable(oldspl); */
-	
-	rio_dprintk (RIO_DEBUG_BOOT, "Data at user address 0x%x\n",(int)rbp->DataP);
+
+	rio_dprintk(RIO_DEBUG_BOOT, "Data at user address 0x%x\n", (int) rbp->DataP);
 
 	/*
-	** Check that we have set asside enough memory for this
-	*/
-	if ( rbp->Count > SIXTY_FOUR_K ) {
-		rio_dprintk (RIO_DEBUG_BOOT, "RTA Boot Code Too Large!\n");
+	 ** Check that we have set asside enough memory for this
+	 */
+	if (rbp->Count > SIXTY_FOUR_K) {
+		rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code Too Large!\n");
 		p->RIOError.Error = HOST_FILE_TOO_LARGE;
 		/* restore(oldspl); */
-		func_exit ();
+		func_exit();
 		return -ENOMEM;
 	}
 
-	if ( p->RIOBooting ) {
-		rio_dprintk (RIO_DEBUG_BOOT, "RTA Boot Code : BUSY BUSY BUSY!\n");
+	if (p->RIOBooting) {
+		rio_dprintk(RIO_DEBUG_BOOT, "RTA Boot Code : BUSY BUSY BUSY!\n");
 		p->RIOError.Error = BOOT_IN_PROGRESS;
 		/* restore(oldspl); */
-		func_exit ();
+		func_exit();
 		return -EBUSY;
 	}
 
 	/*
-	** The data we load in must end on a (RTA_BOOT_DATA_SIZE) byte boundary,
-	** so calculate how far we have to move the data up the buffer
-	** to achieve this.
-	*/
-	offset = (RTA_BOOT_DATA_SIZE - (rbp->Count % RTA_BOOT_DATA_SIZE)) % 
-							RTA_BOOT_DATA_SIZE;
+	 ** The data we load in must end on a (RTA_BOOT_DATA_SIZE) byte boundary,
+	 ** so calculate how far we have to move the data up the buffer
+	 ** to achieve this.
+	 */
+	offset = (RTA_BOOT_DATA_SIZE - (rbp->Count % RTA_BOOT_DATA_SIZE)) % RTA_BOOT_DATA_SIZE;
 
 	/*
-	** Be clean, and clear the 'unused' portion of the boot buffer,
-	** because it will (eventually) be part of the Rta run time environment
-	** and so should be zeroed.
-	*/
-	bzero( (caddr_t)p->RIOBootPackets, offset );
+	 ** Be clean, and clear the 'unused' portion of the boot buffer,
+	 ** because it will (eventually) be part of the Rta run time environment
+	 ** and so should be zeroed.
+	 */
+	bzero((caddr_t) p->RIOBootPackets, offset);
 
 	/*
-	** Copy the data from user space.
-	*/
+	 ** Copy the data from user space.
+	 */
 
-	if ( copyin((int)rbp->DataP,((caddr_t)(p->RIOBootPackets))+offset,
-				rbp->Count) ==COPYFAIL ) {
-		rio_dprintk (RIO_DEBUG_BOOT, "Bad data copy from user space\n");
+	if (copyin((int) rbp->DataP, ((caddr_t) (p->RIOBootPackets)) + offset, rbp->Count) == COPYFAIL) {
+		rio_dprintk(RIO_DEBUG_BOOT, "Bad data copy from user space\n");
 		p->RIOError.Error = COPYIN_FAILED;
 		/* restore(oldspl); */
-		func_exit ();
+		func_exit();
 		return -EFAULT;
 	}
 
 	/*
-	** Make sure that our copy of the size includes that offset we discussed
-	** earlier.
-	*/
-	p->RIONumBootPkts = (rbp->Count+offset)/RTA_BOOT_DATA_SIZE;
-	p->RIOBootCount   = rbp->Count;
+	 ** Make sure that our copy of the size includes that offset we discussed
+	 ** earlier.
+	 */
+	p->RIONumBootPkts = (rbp->Count + offset) / RTA_BOOT_DATA_SIZE;
+	p->RIOBootCount = rbp->Count;
 
 	/* restore(oldspl); */
 	func_exit();
 	return 0;
 }
 
-void rio_start_card_running (struct Host * HostP)
+void rio_start_card_running(struct Host *HostP)
 {
-	func_enter ();
+	func_enter();
 
-	switch ( HostP->Type ) {
+	switch (HostP->Type) {
 	case RIO_AT:
-		rio_dprintk (RIO_DEBUG_BOOT, "Start ISA card running\n");
-		WBYTE(HostP->Control, 
-		      BOOT_FROM_RAM | EXTERNAL_BUS_ON
-		      | HostP->Mode
-		      | RIOAtVec2Ctrl[HostP->Ivec & 0xF] );
+		rio_dprintk(RIO_DEBUG_BOOT, "Start ISA card running\n");
+		WBYTE(HostP->Control, BOOT_FROM_RAM | EXTERNAL_BUS_ON | HostP->Mode | RIOAtVec2Ctrl[HostP->Ivec & 0xF]);
 		break;
-		
+
 #ifdef FUTURE_RELEASE
 	case RIO_MCA:
-				/*
-				** MCA handles IRQ vectors differently, so we don't write 
-				** them to this register.
-				*/
-		rio_dprintk (RIO_DEBUG_BOOT, "Start MCA card running\n");
+		/*
+		 ** MCA handles IRQ vectors differently, so we don't write
+		 ** them to this register.
+		 */
+		rio_dprintk(RIO_DEBUG_BOOT, "Start MCA card running\n");
 		WBYTE(HostP->Control, McaTpBootFromRam | McaTpBusEnable | HostP->Mode);
 		break;
 
 	case RIO_EISA:
-				/*
-				** EISA is totally different and expects OUTBZs to turn it on.
-				*/
-		rio_dprintk (RIO_DEBUG_BOOT, "Start EISA card running\n");
-		OUTBZ( HostP->Slot, EISA_CONTROL_PORT, HostP->Mode | RIOEisaVec2Ctrl[HostP->Ivec] | EISA_TP_RUN | EISA_TP_BUS_ENABLE | EISA_TP_BOOT_FROM_RAM );
+		/*
+		 ** EISA is totally different and expects OUTBZs to turn it on.
+		 */
+		rio_dprintk(RIO_DEBUG_BOOT, "Start EISA card running\n");
+		OUTBZ(HostP->Slot, EISA_CONTROL_PORT, HostP->Mode | RIOEisaVec2Ctrl[HostP->Ivec] | EISA_TP_RUN | EISA_TP_BUS_ENABLE | EISA_TP_BOOT_FROM_RAM);
 		break;
 #endif
 
 	case RIO_PCI:
-				/*
-				** PCI is much the same as MCA. Everything is once again memory
-				** mapped, so we are writing to memory registers instead of io
-				** ports.
-				*/
-		rio_dprintk (RIO_DEBUG_BOOT, "Start PCI card running\n");
+		/*
+		 ** PCI is much the same as MCA. Everything is once again memory
+		 ** mapped, so we are writing to memory registers instead of io
+		 ** ports.
+		 */
+		rio_dprintk(RIO_DEBUG_BOOT, "Start PCI card running\n");
 		WBYTE(HostP->Control, PCITpBootFromRam | PCITpBusEnable | HostP->Mode);
 		break;
 	default:
-		rio_dprintk (RIO_DEBUG_BOOT, "Unknown host type %d\n", HostP->Type);
+		rio_dprintk(RIO_DEBUG_BOOT, "Unknown host type %d\n", HostP->Type);
 		break;
 	}
 /* 
@@ -239,9 +231,8 @@ void rio_start_card_running (struct Host * HostP)
 ** Put your rubber pants on before messing with this code - even the magic
 ** numbers have trouble understanding what they are doing here.
 */
-int
-RIOBootCodeHOST(p, rbp)
-struct rio_info *	p;
+int RIOBootCodeHOST(p, rbp)
+struct rio_info *p;
 register struct DownLoad *rbp;
 {
 	register struct Host *HostP;
@@ -254,355 +245,346 @@ register struct DownLoad *rbp;
 	BYTE *DestP;
 	int wait_count;
 	ushort OldParmMap;
-	ushort offset;	/* It is very important that this is a ushort */
+	ushort offset;		/* It is very important that this is a ushort */
 	/* uint byte; */
 	caddr_t DownCode = NULL;
 	unsigned long flags;
 
-	HostP = NULL; /* Assure the compiler we've initialized it */
-	for ( host=0; host<p->RIONumHosts; host++ ) {
-		rio_dprintk (RIO_DEBUG_BOOT, "Attempt to boot host %d\n",host);
+	HostP = NULL;		/* Assure the compiler we've initialized it */
+	for (host = 0; host < p->RIONumHosts; host++) {
+		rio_dprintk(RIO_DEBUG_BOOT, "Attempt to boot host %d\n", host);
 		HostP = &p->RIOHosts[host];
-		
-		rio_dprintk (RIO_DEBUG_BOOT,  "Host Type = 0x%x, Mode = 0x%x, IVec = 0x%x\n",
-		    HostP->Type, HostP->Mode, HostP->Ivec);
 
+		rio_dprintk(RIO_DEBUG_BOOT, "Host Type = 0x%x, Mode = 0x%x, IVec = 0x%x\n", HostP->Type, HostP->Mode, HostP->Ivec);
 
-		if ( (HostP->Flags & RUN_STATE) != RC_WAITING ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "%s %d already running\n","Host",host);
+
+		if ((HostP->Flags & RUN_STATE) != RC_WAITING) {
+			rio_dprintk(RIO_DEBUG_BOOT, "%s %d already running\n", "Host", host);
 			continue;
 		}
 
 		/*
-		** Grab a 32 bit pointer to the card.
-		*/
+		 ** Grab a 32 bit pointer to the card.
+		 */
 		Cad = HostP->Caddr;
 
 		/*
-		** We are going to (try) and load in rbp->Count bytes.
-		** The last byte will reside at p->RIOConf.HostLoadBase-1;
-		** Therefore, we need to start copying at address
-		** (caddr+p->RIOConf.HostLoadBase-rbp->Count)
-		*/
-		StartP = (caddr_t)&Cad[p->RIOConf.HostLoadBase-rbp->Count];
-
-		rio_dprintk (RIO_DEBUG_BOOT, "kernel virtual address for host is 0x%x\n", (int)Cad );
-		rio_dprintk (RIO_DEBUG_BOOT, "kernel virtual address for download is 0x%x\n", (int)StartP);
-		rio_dprintk (RIO_DEBUG_BOOT, "host loadbase is 0x%x\n",p->RIOConf.HostLoadBase);
-		rio_dprintk (RIO_DEBUG_BOOT, "size of download is 0x%x\n", rbp->Count);
-
-		if ( p->RIOConf.HostLoadBase < rbp->Count ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "Bin too large\n");
+		 ** We are going to (try) and load in rbp->Count bytes.
+		 ** The last byte will reside at p->RIOConf.HostLoadBase-1;
+		 ** Therefore, we need to start copying at address
+		 ** (caddr+p->RIOConf.HostLoadBase-rbp->Count)
+		 */
+		StartP = (caddr_t) & Cad[p->RIOConf.HostLoadBase - rbp->Count];
+
+		rio_dprintk(RIO_DEBUG_BOOT, "kernel virtual address for host is 0x%x\n", (int) Cad);
+		rio_dprintk(RIO_DEBUG_BOOT, "kernel virtual address for download is 0x%x\n", (int) StartP);
+		rio_dprintk(RIO_DEBUG_BOOT, "host loadbase is 0x%x\n", p->RIOConf.HostLoadBase);
+		rio_dprintk(RIO_DEBUG_BOOT, "size of download is 0x%x\n", rbp->Count);
+
+		if (p->RIOConf.HostLoadBase < rbp->Count) {
+			rio_dprintk(RIO_DEBUG_BOOT, "Bin too large\n");
 			p->RIOError.Error = HOST_FILE_TOO_LARGE;
-			func_exit ();
+			func_exit();
 			return -EFBIG;
 		}
 		/*
-		** Ensure that the host really is stopped.
-		** Disable it's external bus & twang its reset line.
-		*/
-		RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot );
+		 ** Ensure that the host really is stopped.
+		 ** Disable it's external bus & twang its reset line.
+		 */
+		RIOHostReset(HostP->Type, (struct DpRam *) HostP->CardP, HostP->Slot);
 
 		/*
-		** Copy the data directly from user space to the SRAM.
-		** This ain't going to be none too clever if the download
-		** code is bigger than this segment.
-		*/
-		rio_dprintk (RIO_DEBUG_BOOT, "Copy in code\n");
+		 ** Copy the data directly from user space to the SRAM.
+		 ** This ain't going to be none too clever if the download
+		 ** code is bigger than this segment.
+		 */
+		rio_dprintk(RIO_DEBUG_BOOT, "Copy in code\n");
 
 		/*
-		** PCI hostcard can't cope with 32 bit accesses and so need to copy 
-		** data to a local buffer, and then dripfeed the card.
-		*/
-		if ( HostP->Type == RIO_PCI ) {
-		  /* int offset; */
+		 ** PCI hostcard can't cope with 32 bit accesses and so need to copy
+		 ** data to a local buffer, and then dripfeed the card.
+		 */
+		if (HostP->Type == RIO_PCI) {
+			/* int offset; */
 
 			DownCode = sysbrk(rbp->Count);
-			if ( !DownCode ) {
-				rio_dprintk (RIO_DEBUG_BOOT, "No system memory available\n");
+			if (!DownCode) {
+				rio_dprintk(RIO_DEBUG_BOOT, "No system memory available\n");
 				p->RIOError.Error = NOT_ENOUGH_CORE_FOR_PCI_COPY;
-				func_exit ();
+				func_exit();
 				return -ENOMEM;
 			}
 			bzero(DownCode, rbp->Count);
 
-			if ( copyin((int)rbp->DataP,DownCode,rbp->Count)==COPYFAIL ) {
-				rio_dprintk (RIO_DEBUG_BOOT, "Bad copyin of host data\n");
-				sysfree( DownCode, rbp->Count );
+			if (copyin((int) rbp->DataP, DownCode, rbp->Count) == COPYFAIL) {
+				rio_dprintk(RIO_DEBUG_BOOT, "Bad copyin of host data\n");
+				sysfree(DownCode, rbp->Count);
 				p->RIOError.Error = COPYIN_FAILED;
-				func_exit ();
+				func_exit();
 				return -EFAULT;
 			}
 
-			HostP->Copy( DownCode, StartP, rbp->Count );
+			HostP->Copy(DownCode, StartP, rbp->Count);
 
-			sysfree( DownCode, rbp->Count );
-		}
-		else if ( copyin((int)rbp->DataP,StartP,rbp->Count)==COPYFAIL ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "Bad copyin of host data\n");
+			sysfree(DownCode, rbp->Count);
+		} else if (copyin((int) rbp->DataP, StartP, rbp->Count) == COPYFAIL) {
+			rio_dprintk(RIO_DEBUG_BOOT, "Bad copyin of host data\n");
 			p->RIOError.Error = COPYIN_FAILED;
-			func_exit ();
+			func_exit();
 			return -EFAULT;
 		}
 
-		rio_dprintk (RIO_DEBUG_BOOT, "Copy completed\n");
+		rio_dprintk(RIO_DEBUG_BOOT, "Copy completed\n");
 
 		/*
-		**			S T O P !
-		**
-		** Upto this point the code has been fairly rational, and possibly
-		** even straight forward. What follows is a pile of crud that will
-		** magically turn into six bytes of transputer assembler. Normally
-		** you would expect an array or something, but, being me, I have
-		** chosen [been told] to use a technique whereby the startup code
-		** will be correct if we change the loadbase for the code. Which
-		** brings us onto another issue - the loadbase is the *end* of the
-		** code, not the start.
-		**
-		** If I were you I wouldn't start from here.
-		*/
+		 **                     S T O P !
+		 **
+		 ** Upto this point the code has been fairly rational, and possibly
+		 ** even straight forward. What follows is a pile of crud that will
+		 ** magically turn into six bytes of transputer assembler. Normally
+		 ** you would expect an array or something, but, being me, I have
+		 ** chosen [been told] to use a technique whereby the startup code
+		 ** will be correct if we change the loadbase for the code. Which
+		 ** brings us onto another issue - the loadbase is the *end* of the
+		 ** code, not the start.
+		 **
+		 ** If I were you I wouldn't start from here.
+		 */
 
 		/*
-		** We now need to insert a short boot section into
-		** the memory at the end of Sram2. This is normally (de)composed
-		** of the last eight bytes of the download code. The
-		** download has been assembled/compiled to expect to be
-		** loaded from 0x7FFF downwards. We have loaded it
-		** at some other address. The startup code goes into the small
-		** ram window at Sram2, in the last 8 bytes, which are really
-		** at addresses 0x7FF8-0x7FFF.
-		**
-		** If the loadbase is, say, 0x7C00, then we need to branch to
-		** address 0x7BFE to run the host.bin startup code. We assemble
-		** this jump manually.
-		**
-		** The two byte sequence 60 08 is loaded into memory at address
-		** 0x7FFE,F. This is a local branch to location 0x7FF8 (60 is nfix 0,
-		** which adds '0' to the .O register, complements .O, and then shifts
-		** it left by 4 bit positions, 08 is a jump .O+8 instruction. This will
-		** add 8 to .O (which was 0xFFF0), and will branch RELATIVE to the new
-		** location. Now, the branch starts from the value of .PC (or .IP or
-		** whatever the bloody register is called on this chip), and the .PC
-		** will be pointing to the location AFTER the branch, in this case
-		** .PC == 0x8000, so the branch will be to 0x8000+0xFFF8 = 0x7FF8.
-		**
-		** A long branch is coded at 0x7FF8. This consists of loading a four
-		** byte offset into .O using nfix (as above) and pfix operators. The
-		** pfix operates in exactly the same way as the nfix operator, but
-		** without the complement operation. The offset, of course, must be
-		** relative to the address of the byte AFTER the branch instruction,
-		** which will be (urm) 0x7FFC, so, our final destination of the branch
-		** (loadbase-2), has to be reached from here. Imagine that the loadbase
-		** is 0x7C00 (which it is), then we will need to branch to 0x7BFE (which
-		** is the first byte of the initial two byte short local branch of the
-		** download code).
-		**
-		** To code a jump from 0x7FFC (which is where the branch will start
-		** from) to 0x7BFE, we will need to branch 0xFC02 bytes (0x7FFC+0xFC02)=
-		** 0x7BFE.
-		** This will be coded as four bytes:
-		** 60 2C 20 02
-		** being nfix .O+0
-		**	   pfix .O+C
-		**	   pfix .O+0
-		**	   jump .O+2
-		**
-		** The nfix operator is used, so that the startup code will be
-		** compatible with the whole Tp family. (lies, damn lies, it'll never
-		** work in a month of Sundays).
-		**
-		** The nfix nyble is the 1s complement of the nyble value you
-		** want to load - in this case we wanted 'F' so we nfix loaded '0'.
-		*/
+		 ** We now need to insert a short boot section into
+		 ** the memory at the end of Sram2. This is normally (de)composed
+		 ** of the last eight bytes of the download code. The
+		 ** download has been assembled/compiled to expect to be
+		 ** loaded from 0x7FFF downwards. We have loaded it
+		 ** at some other address. The startup code goes into the small
+		 ** ram window at Sram2, in the last 8 bytes, which are really
+		 ** at addresses 0x7FF8-0x7FFF.
+		 **
+		 ** If the loadbase is, say, 0x7C00, then we need to branch to
+		 ** address 0x7BFE to run the host.bin startup code. We assemble
+		 ** this jump manually.
+		 **
+		 ** The two byte sequence 60 08 is loaded into memory at address
+		 ** 0x7FFE,F. This is a local branch to location 0x7FF8 (60 is nfix 0,
+		 ** which adds '0' to the .O register, complements .O, and then shifts
+		 ** it left by 4 bit positions, 08 is a jump .O+8 instruction. This will
+		 ** add 8 to .O (which was 0xFFF0), and will branch RELATIVE to the new
+		 ** location. Now, the branch starts from the value of .PC (or .IP or
+		 ** whatever the bloody register is called on this chip), and the .PC
+		 ** will be pointing to the location AFTER the branch, in this case
+		 ** .PC == 0x8000, so the branch will be to 0x8000+0xFFF8 = 0x7FF8.
+		 **
+		 ** A long branch is coded at 0x7FF8. This consists of loading a four
+		 ** byte offset into .O using nfix (as above) and pfix operators. The
+		 ** pfix operates in exactly the same way as the nfix operator, but
+		 ** without the complement operation. The offset, of course, must be
+		 ** relative to the address of the byte AFTER the branch instruction,
+		 ** which will be (urm) 0x7FFC, so, our final destination of the branch
+		 ** (loadbase-2), has to be reached from here. Imagine that the loadbase
+		 ** is 0x7C00 (which it is), then we will need to branch to 0x7BFE (which
+		 ** is the first byte of the initial two byte short local branch of the
+		 ** download code).
+		 **
+		 ** To code a jump from 0x7FFC (which is where the branch will start
+		 ** from) to 0x7BFE, we will need to branch 0xFC02 bytes (0x7FFC+0xFC02)=
+		 ** 0x7BFE.
+		 ** This will be coded as four bytes:
+		 ** 60 2C 20 02
+		 ** being nfix .O+0
+		 **        pfix .O+C
+		 **        pfix .O+0
+		 **        jump .O+2
+		 **
+		 ** The nfix operator is used, so that the startup code will be
+		 ** compatible with the whole Tp family. (lies, damn lies, it'll never
+		 ** work in a month of Sundays).
+		 **
+		 ** The nfix nyble is the 1s complement of the nyble value you
+		 ** want to load - in this case we wanted 'F' so we nfix loaded '0'.
+		 */
 
 
 		/*
-		** Dest points to the top 8 bytes of Sram2. The Tp jumps
-		** to 0x7FFE at reset time, and starts executing. This is
-		** a short branch to 0x7FF8, where a long branch is coded.
-		*/
+		 ** Dest points to the top 8 bytes of Sram2. The Tp jumps
+		 ** to 0x7FFE at reset time, and starts executing. This is
+		 ** a short branch to 0x7FF8, where a long branch is coded.
+		 */
 
-		DestP = (BYTE *)&Cad[0x7FF8];	/* <<<---- READ THE ABOVE COMMENTS */
+		DestP = (BYTE *) & Cad[0x7FF8];	/* <<<---- READ THE ABOVE COMMENTS */
 
 #define	NFIX(N)	(0x60 | (N))	/* .O  = (~(.O + N))<<4 */
 #define	PFIX(N)	(0x20 | (N))	/* .O  =   (.O + N)<<4  */
-#define	JUMP(N)	(0x00 | (N))	/* .PC =   .PC + .O	 */
+#define	JUMP(N)	(0x00 | (N))	/* .PC =   .PC + .O      */
 
 		/*
-		** 0x7FFC is the address of the location following the last byte of
-		** the four byte jump instruction.
-		** READ THE ABOVE COMMENTS
-		**
-		** offset is (TO-FROM) % MEMSIZE, but with compound buggering about.
-		** Memsize is 64K for this range of Tp, so offset is a short (unsigned,
-		** cos I don't understand 2's complement).
-		*/
-		offset = (p->RIOConf.HostLoadBase-2)-0x7FFC;
-		WBYTE( DestP[0] , NFIX(((ushort)(~offset) >> (ushort)12) & 0xF) );
-		WBYTE( DestP[1] , PFIX(( offset >> 8) & 0xF) );
-		WBYTE( DestP[2] , PFIX(( offset >> 4) & 0xF) );
-		WBYTE( DestP[3] , JUMP( offset & 0xF) );
-
-		WBYTE( DestP[6] , NFIX(0) );
-		WBYTE( DestP[7] , JUMP(8) );
-
-		rio_dprintk (RIO_DEBUG_BOOT, "host loadbase is 0x%x\n",p->RIOConf.HostLoadBase);
-		rio_dprintk (RIO_DEBUG_BOOT, "startup offset is 0x%x\n",offset);
+		 ** 0x7FFC is the address of the location following the last byte of
+		 ** the four byte jump instruction.
+		 ** READ THE ABOVE COMMENTS
+		 **
+		 ** offset is (TO-FROM) % MEMSIZE, but with compound buggering about.
+		 ** Memsize is 64K for this range of Tp, so offset is a short (unsigned,
+		 ** cos I don't understand 2's complement).
+		 */
+		offset = (p->RIOConf.HostLoadBase - 2) - 0x7FFC;
+		WBYTE(DestP[0], NFIX(((ushort) (~offset) >> (ushort) 12) & 0xF));
+		WBYTE(DestP[1], PFIX((offset >> 8) & 0xF));
+		WBYTE(DestP[2], PFIX((offset >> 4) & 0xF));
+		WBYTE(DestP[3], JUMP(offset & 0xF));
+
+		WBYTE(DestP[6], NFIX(0));
+		WBYTE(DestP[7], JUMP(8));
+
+		rio_dprintk(RIO_DEBUG_BOOT, "host loadbase is 0x%x\n", p->RIOConf.HostLoadBase);
+		rio_dprintk(RIO_DEBUG_BOOT, "startup offset is 0x%x\n", offset);
 
 		/*
-		** Flag what is going on
-		*/
+		 ** Flag what is going on
+		 */
 		HostP->Flags &= ~RUN_STATE;
 		HostP->Flags |= RC_STARTUP;
 
 		/*
-		** Grab a copy of the current ParmMap pointer, so we
-		** can tell when it has changed.
-		*/
+		 ** Grab a copy of the current ParmMap pointer, so we
+		 ** can tell when it has changed.
+		 */
 		OldParmMap = RWORD(HostP->__ParmMapR);
 
-		rio_dprintk (RIO_DEBUG_BOOT, "Original parmmap is 0x%x\n",OldParmMap);
+		rio_dprintk(RIO_DEBUG_BOOT, "Original parmmap is 0x%x\n", OldParmMap);
 
 		/*
-		** And start it running (I hope).
-		** As there is nothing dodgy or obscure about the
-		** above code, this is guaranteed to work every time.
-		*/
-		rio_dprintk (RIO_DEBUG_BOOT,  "Host Type = 0x%x, Mode = 0x%x, IVec = 0x%x\n",
-		    HostP->Type, HostP->Mode, HostP->Ivec);
+		 ** And start it running (I hope).
+		 ** As there is nothing dodgy or obscure about the
+		 ** above code, this is guaranteed to work every time.
+		 */
+		rio_dprintk(RIO_DEBUG_BOOT, "Host Type = 0x%x, Mode = 0x%x, IVec = 0x%x\n", HostP->Type, HostP->Mode, HostP->Ivec);
 
 		rio_start_card_running(HostP);
 
-		rio_dprintk (RIO_DEBUG_BOOT, "Set control port\n");
+		rio_dprintk(RIO_DEBUG_BOOT, "Set control port\n");
 
 		/*
-		** Now, wait for upto five seconds for the Tp to setup the parmmap
-		** pointer:
-		*/
-		for ( wait_count=0; (wait_count<p->RIOConf.StartupTime)&&
-			(RWORD(HostP->__ParmMapR)==OldParmMap); wait_count++ ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "Checkout %d, 0x%x\n",wait_count,RWORD(HostP->__ParmMapR));
+		 ** Now, wait for upto five seconds for the Tp to setup the parmmap
+		 ** pointer:
+		 */
+		for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && (RWORD(HostP->__ParmMapR) == OldParmMap); wait_count++) {
+			rio_dprintk(RIO_DEBUG_BOOT, "Checkout %d, 0x%x\n", wait_count, RWORD(HostP->__ParmMapR));
 			delay(HostP, HUNDRED_MS);
 
 		}
 
 		/*
-		** If the parmmap pointer is unchanged, then the host code
-		** has crashed & burned in a really spectacular way
-		*/
-		if ( RWORD(HostP->__ParmMapR) == OldParmMap ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "parmmap 0x%x\n", RWORD(HostP->__ParmMapR));
-			rio_dprintk (RIO_DEBUG_BOOT, "RIO Mesg Run Fail\n");
-
-#define	HOST_DISABLE \
-		HostP->Flags &= ~RUN_STATE; \
-		HostP->Flags |= RC_STUFFED; \
-		RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot );\
-		continue
-
-			HOST_DISABLE;
-		}
-
-		rio_dprintk (RIO_DEBUG_BOOT, "Running 0x%x\n", RWORD(HostP->__ParmMapR));
+		 ** If the parmmap pointer is unchanged, then the host code
+		 ** has crashed & burned in a really spectacular way
+		 */
+		if (RWORD(HostP->__ParmMapR) == OldParmMap) {
+			rio_dprintk(RIO_DEBUG_BOOT, "parmmap 0x%x\n", RWORD(HostP->__ParmMapR));
+			rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail\n");
+			HostP->Flags &= ~RUN_STATE;
+			HostP->Flags |= RC_STUFFED;
+			RIOHostReset(HostP->Type, (struct DpRam *) HostP->CardP, HostP->Slot);
+		continue}
+
+		rio_dprintk(RIO_DEBUG_BOOT, "Running 0x%x\n", RWORD(HostP->__ParmMapR));
 
 		/*
-		** Well, the board thought it was OK, and setup its parmmap
-		** pointer. For the time being, we will pretend that this
-		** board is running, and check out what the error flag says.
-		*/
+		 ** Well, the board thought it was OK, and setup its parmmap
+		 ** pointer. For the time being, we will pretend that this
+		 ** board is running, and check out what the error flag says.
+		 */
 
 		/*
-		** Grab a 32 bit pointer to the parmmap structure
-		*/
-		ParmMapP = (PARM_MAP *)RIO_PTR(Cad,RWORD(HostP->__ParmMapR));
-		rio_dprintk (RIO_DEBUG_BOOT, "ParmMapP : %x\n", (int)ParmMapP);
-		ParmMapP = (PARM_MAP *)((unsigned long)Cad + 
-						(unsigned long)((RWORD((HostP->__ParmMapR))) & 0xFFFF)); 
-		rio_dprintk (RIO_DEBUG_BOOT, "ParmMapP : %x\n", (int)ParmMapP);
+		 ** Grab a 32 bit pointer to the parmmap structure
+		 */
+		ParmMapP = (PARM_MAP *) RIO_PTR(Cad, RWORD(HostP->__ParmMapR));
+		rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %x\n", (int) ParmMapP);
+		ParmMapP = (PARM_MAP *) ((unsigned long) Cad + (unsigned long) ((RWORD((HostP->__ParmMapR))) & 0xFFFF));
+		rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %x\n", (int) ParmMapP);
 
 		/*
-		** The links entry should be 0xFFFF; we set it up
-		** with a mask to say how many PHBs to use, and 
-		** which links to use.
-		*/
-		if ( (RWORD(ParmMapP->links) & 0xFFFF) != 0xFFFF ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
-			rio_dprintk (RIO_DEBUG_BOOT, "Links = 0x%x\n",RWORD(ParmMapP->links));
-			HOST_DISABLE;
-		}
-
-		WWORD(ParmMapP->links , RIO_LINK_ENABLE);
+		 ** The links entry should be 0xFFFF; we set it up
+		 ** with a mask to say how many PHBs to use, and
+		 ** which links to use.
+		 */
+		if ((RWORD(ParmMapP->links) & 0xFFFF) != 0xFFFF) {
+			rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
+			rio_dprintk(RIO_DEBUG_BOOT, "Links = 0x%x\n", RWORD(ParmMapP->links));
+			HostP->Flags &= ~RUN_STATE;
+			HostP->Flags |= RC_STUFFED;
+			RIOHostReset(HostP->Type, (struct DpRam *) HostP->CardP, HostP->Slot);
+		continue}
+
+		WWORD(ParmMapP->links, RIO_LINK_ENABLE);
 
 		/*
-		** now wait for the card to set all the parmmap->XXX stuff
-		** this is a wait of upto two seconds....
-		*/
-		rio_dprintk (RIO_DEBUG_BOOT, "Looking for init_done - %d ticks\n",p->RIOConf.StartupTime);
+		 ** now wait for the card to set all the parmmap->XXX stuff
+		 ** this is a wait of upto two seconds....
+		 */
+		rio_dprintk(RIO_DEBUG_BOOT, "Looking for init_done - %d ticks\n", p->RIOConf.StartupTime);
 		HostP->timeout_id = 0;
-		for ( wait_count=0; (wait_count<p->RIOConf.StartupTime) && 
-						!RWORD(ParmMapP->init_done); wait_count++ ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "Waiting for init_done\n");
+		for (wait_count = 0; (wait_count < p->RIOConf.StartupTime) && !RWORD(ParmMapP->init_done); wait_count++) {
+			rio_dprintk(RIO_DEBUG_BOOT, "Waiting for init_done\n");
 			delay(HostP, HUNDRED_MS);
 		}
-		rio_dprintk (RIO_DEBUG_BOOT, "OK! init_done!\n");
+		rio_dprintk(RIO_DEBUG_BOOT, "OK! init_done!\n");
 
-		if (RWORD(ParmMapP->error) != E_NO_ERROR || 
-							!RWORD(ParmMapP->init_done) ) {
-			rio_dprintk (RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
-			rio_dprintk (RIO_DEBUG_BOOT, "Timedout waiting for init_done\n");
-			HOST_DISABLE;
-		}
+		if (RWORD(ParmMapP->error) != E_NO_ERROR || !RWORD(ParmMapP->init_done)) {
+			rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail %s\n", HostP->Name);
+			rio_dprintk(RIO_DEBUG_BOOT, "Timedout waiting for init_done\n");
+			HostP->Flags &= ~RUN_STATE;
+			HostP->Flags |= RC_STUFFED;
+			RIOHostReset(HostP->Type, (struct DpRam *) HostP->CardP, HostP->Slot);
+		continue}
 
-		rio_dprintk (RIO_DEBUG_BOOT, "Got init_done\n");
+		rio_dprintk(RIO_DEBUG_BOOT, "Got init_done\n");
 
 		/*
-		** It runs! It runs!
-		*/
-		rio_dprintk (RIO_DEBUG_BOOT, "Host ID %x Running\n",HostP->UniqueNum);
+		 ** It runs! It runs!
+		 */
+		rio_dprintk(RIO_DEBUG_BOOT, "Host ID %x Running\n", HostP->UniqueNum);
 
 		/*
-		** set the time period between interrupts.
-		*/
-		WWORD(ParmMapP->timer, (short)p->RIOConf.Timer );
+		 ** set the time period between interrupts.
+		 */
+		WWORD(ParmMapP->timer, (short) p->RIOConf.Timer);
 
 		/*
-		** Translate all the 16 bit pointers in the __ParmMapR into
-		** 32 bit pointers for the driver.
-		*/
-		HostP->ParmMapP	 =	ParmMapP;
-		HostP->PhbP		 =	(PHB*)RIO_PTR(Cad,RWORD(ParmMapP->phb_ptr));
-		HostP->RupP		 =	(RUP*)RIO_PTR(Cad,RWORD(ParmMapP->rups));
-		HostP->PhbNumP	  = (ushort*)RIO_PTR(Cad,RWORD(ParmMapP->phb_num_ptr));
-		HostP->LinkStrP	 =	(LPB*)RIO_PTR(Cad,RWORD(ParmMapP->link_str_ptr));
+		 ** Translate all the 16 bit pointers in the __ParmMapR into
+		 ** 32 bit pointers for the driver.
+		 */
+		HostP->ParmMapP = ParmMapP;
+		HostP->PhbP = (PHB *) RIO_PTR(Cad, RWORD(ParmMapP->phb_ptr));
+		HostP->RupP = (RUP *) RIO_PTR(Cad, RWORD(ParmMapP->rups));
+		HostP->PhbNumP = (ushort *) RIO_PTR(Cad, RWORD(ParmMapP->phb_num_ptr));
+		HostP->LinkStrP = (LPB *) RIO_PTR(Cad, RWORD(ParmMapP->link_str_ptr));
 
 		/*
-		** point the UnixRups at the real Rups
-		*/
-		for ( RupN = 0; RupN<MAX_RUP; RupN++ ) {
-			HostP->UnixRups[RupN].RupP		= &HostP->RupP[RupN];
-			HostP->UnixRups[RupN].Id		  = RupN+1;
+		 ** point the UnixRups at the real Rups
+		 */
+		for (RupN = 0; RupN < MAX_RUP; RupN++) {
+			HostP->UnixRups[RupN].RupP = &HostP->RupP[RupN];
+			HostP->UnixRups[RupN].Id = RupN + 1;
 			HostP->UnixRups[RupN].BaseSysPort = NO_PORT;
 			spin_lock_init(&HostP->UnixRups[RupN].RupLock);
 		}
 
-		for ( RupN = 0; RupN<LINKS_PER_UNIT; RupN++ ) {
-			HostP->UnixRups[RupN+MAX_RUP].RupP	= &HostP->LinkStrP[RupN].rup;
-			HostP->UnixRups[RupN+MAX_RUP].Id  = 0;
-			HostP->UnixRups[RupN+MAX_RUP].BaseSysPort = NO_PORT;
-			spin_lock_init(&HostP->UnixRups[RupN+MAX_RUP].RupLock);
+		for (RupN = 0; RupN < LINKS_PER_UNIT; RupN++) {
+			HostP->UnixRups[RupN + MAX_RUP].RupP = &HostP->LinkStrP[RupN].rup;
+			HostP->UnixRups[RupN + MAX_RUP].Id = 0;
+			HostP->UnixRups[RupN + MAX_RUP].BaseSysPort = NO_PORT;
+			spin_lock_init(&HostP->UnixRups[RupN + MAX_RUP].RupLock);
 		}
 
 		/*
-		** point the PortP->Phbs at the real Phbs
-		*/
-		for ( PortN=p->RIOFirstPortsMapped; 
-				PortN<p->RIOLastPortsMapped+PORTS_PER_RTA; PortN++ ) {
-			if ( p->RIOPortp[PortN]->HostP == HostP ) {
+		 ** point the PortP->Phbs at the real Phbs
+		 */
+		for (PortN = p->RIOFirstPortsMapped; PortN < p->RIOLastPortsMapped + PORTS_PER_RTA; PortN++) {
+			if (p->RIOPortp[PortN]->HostP == HostP) {
 				struct Port *PortP = p->RIOPortp[PortN];
 				struct PHB *PhbP;
 				/* int oldspl; */
 
-				if ( !PortP->Mapped )
+				if (!PortP->Mapped)
 					continue;
 
 				PhbP = &HostP->PhbP[PortP->HostPort];
@@ -610,40 +592,40 @@ register struct DownLoad *rbp;
 
 				PortP->PhbP = PhbP;
 
-				PortP->TxAdd	= (WORD *)RIO_PTR(Cad,RWORD(PhbP->tx_add));
-				PortP->TxStart  = (WORD *)RIO_PTR(Cad,RWORD(PhbP->tx_start));
-				PortP->TxEnd	= (WORD *)RIO_PTR(Cad,RWORD(PhbP->tx_end));
-				PortP->RxRemove = (WORD *)RIO_PTR(Cad,RWORD(PhbP->rx_remove));
-				PortP->RxStart  = (WORD *)RIO_PTR(Cad,RWORD(PhbP->rx_start));
-				PortP->RxEnd	= (WORD *)RIO_PTR(Cad,RWORD(PhbP->rx_end));
+				PortP->TxAdd = (WORD *) RIO_PTR(Cad, RWORD(PhbP->tx_add));
+				PortP->TxStart = (WORD *) RIO_PTR(Cad, RWORD(PhbP->tx_start));
+				PortP->TxEnd = (WORD *) RIO_PTR(Cad, RWORD(PhbP->tx_end));
+				PortP->RxRemove = (WORD *) RIO_PTR(Cad, RWORD(PhbP->rx_remove));
+				PortP->RxStart = (WORD *) RIO_PTR(Cad, RWORD(PhbP->rx_start));
+				PortP->RxEnd = (WORD *) RIO_PTR(Cad, RWORD(PhbP->rx_end));
 
 				rio_spin_unlock_irqrestore(&PortP->portSem, flags);
 				/*
-				** point the UnixRup at the base SysPort
-				*/
-				if ( !(PortN % PORTS_PER_RTA) )
+				 ** point the UnixRup at the base SysPort
+				 */
+				if (!(PortN % PORTS_PER_RTA))
 					HostP->UnixRups[PortP->RupNum].BaseSysPort = PortN;
 			}
 		}
 
-		rio_dprintk (RIO_DEBUG_BOOT, "Set the card running... \n");
+		rio_dprintk(RIO_DEBUG_BOOT, "Set the card running... \n");
 		/*
-		** last thing - show the world that everything is in place
-		*/
+		 ** last thing - show the world that everything is in place
+		 */
 		HostP->Flags &= ~RUN_STATE;
 		HostP->Flags |= RC_RUNNING;
 	}
 	/*
-	** MPX always uses a poller. This is actually patched into the system
-	** configuration and called directly from each clock tick.
-	**
-	*/
+	 ** MPX always uses a poller. This is actually patched into the system
+	 ** configuration and called directly from each clock tick.
+	 **
+	 */
 	p->RIOPolling = 1;
 
 	p->RIOSystemUp++;
-	
-	rio_dprintk (RIO_DEBUG_BOOT, "Done everything %x\n", HostP->Ivec);
-	func_exit ();
+
+	rio_dprintk(RIO_DEBUG_BOOT, "Done everything %x\n", HostP->Ivec);
+	func_exit();
 	return 0;
 }
 
@@ -653,23 +635,22 @@ register struct DownLoad *rbp;
 ** Boot an RTA. If we have successfully processed this boot, then
 ** return 1. If we havent, then return 0.
 */
-int
-RIOBootRup( p, Rup, HostP, PacketP)
-struct rio_info *	p;
+int RIOBootRup(p, Rup, HostP, PacketP)
+struct rio_info *p;
 uint Rup;
 struct Host *HostP;
-struct PKT *PacketP; 
+struct PKT *PacketP;
 {
-	struct PktCmd *PktCmdP = (struct PktCmd *)PacketP->data;
+	struct PktCmd *PktCmdP = (struct PktCmd *) PacketP->data;
 	struct PktCmd_M *PktReplyP;
 	struct CmdBlk *CmdBlkP;
 	uint sequence;
 
 	/*
-	** If we haven't been told what to boot, we can't boot it.
-	*/
-	if ( p->RIONumBootPkts == 0 ) {
-		rio_dprintk (RIO_DEBUG_BOOT, "No RTA code to download yet\n");
+	 ** If we haven't been told what to boot, we can't boot it.
+	 */
+	if (p->RIONumBootPkts == 0) {
+		rio_dprintk(RIO_DEBUG_BOOT, "No RTA code to download yet\n");
 		return 0;
 	}
 
@@ -677,117 +658,111 @@ struct PKT *PacketP;
 	/* ShowPacket( DBG_BOOT, PacketP ); */
 
 	/*
-	** Special case of boot completed - if we get one of these then we
-	** don't need a command block. For all other cases we do, so handle
-	** this first and then get a command block, then handle every other
-	** case, relinquishing the command block if disaster strikes!
-	*/
-	if ( (RBYTE(PacketP->len) & PKT_CMD_BIT) && 
-			(RBYTE(PktCmdP->Command)==BOOT_COMPLETED) )
-		return RIOBootComplete(p, HostP, Rup, PktCmdP );
+	 ** Special case of boot completed - if we get one of these then we
+	 ** don't need a command block. For all other cases we do, so handle
+	 ** this first and then get a command block, then handle every other
+	 ** case, relinquishing the command block if disaster strikes!
+	 */
+	if ((RBYTE(PacketP->len) & PKT_CMD_BIT) && (RBYTE(PktCmdP->Command) == BOOT_COMPLETED))
+		return RIOBootComplete(p, HostP, Rup, PktCmdP);
 
 	/*
-	** try to unhook a command block from the command free list.
-	*/
-	if ( !(CmdBlkP = RIOGetCmdBlk()) ) {
-		rio_dprintk (RIO_DEBUG_BOOT, "No command blocks to boot RTA! come back later.\n");
+	 ** try to unhook a command block from the command free list.
+	 */
+	if (!(CmdBlkP = RIOGetCmdBlk())) {
+		rio_dprintk(RIO_DEBUG_BOOT, "No command blocks to boot RTA! come back later.\n");
 		return 0;
 	}
 
 	/*
-	** Fill in the default info on the command block
-	*/
-	CmdBlkP->Packet.dest_unit = Rup < (ushort)MAX_RUP ? Rup