 @@ -1,2458 +1,2453 @@
-/*	$NetBSD: ace_ebus.c,v 1.20 2016/11/20 03:30:11 pgoyette Exp $	*/
+/*	$NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code was written by Alessandro Forin and Neil Pittman
  * at Microsoft Research and contributed to The NetBSD Foundation
  * by Microsoft Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20 2016/11/20 03:30:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
 #include <sys/queue.h>
 #include <sys/rndsource.h>
 #include <machine/intr.h>
 #include <machine/bus.h>
 #include "locators.h"
 #include <prop/proplib.h>
 #include <emips/ebus/ebusvar.h>
 #include <emips/emips/machdep.h>
 #include <machine/emipsreg.h>
 /* Structure returned by the Identify command (see CFlash specs)
  * NB: We only care for the first sector so that is what we define here.
  * NB: Beware of mis-alignment for all 32bit things
  */
 typedef struct _CFLASH_IDENTIFY {
 	uint16_t Signature;				/* Word 0 */
 #define CFLASH_SIGNATURE 0x848a
 	uint16_t DefaultNumberOfCylinders;		/* Word 1 */
 	uint16_t Reserved1;				/* Word 2 */
 	uint16_t DefaultNumberOfHeads;			/* Word 3 */
 	uint16_t Obsolete1[2];				/* Word 4 */
 	uint16_t DefaultSectorsPerTrack;		/* Word 6 */
 	uint16_t SectorsPerCard[2];			/* Word 7 */
 	uint16_t Obsolete2;				/* Word 9 */
 	uint8_t  SerialNumber[20]; /* padded, right-justified Word 10 */
 	uint16_t Obsolete3[2];				/* Word 20 */
 	uint16_t EccBytesInRWLong;			/* Word 22 */
 	uint8_t  FirmwareRevision[8];			/* Word 23 */
 	uint8_t  ModelNumber[40];			/* Word 27 */
 	uint16_t SectorsInRWMultiple;			/* Word 47 */
 	uint16_t Reserved2;				/* Word 48 */
 	uint16_t Capabilities;				/* Word 49 */
 	uint16_t Reserved3;				/* Word 50 */
 	uint16_t PioMode;				/* Word 51 */
 	uint16_t Obsolete4;				/* Word 52 */
 	uint16_t FieldValidity;				/* Word 53 */
 	uint16_t CurrentNumberOfCylinders;		/* Word 54 */
 	uint16_t CurrentNumberOfHeads;			/* Word 55 */
 	uint16_t CurrentSectorsPerTrack;		/* Word 56 */
 	uint16_t CurrentCapacity[2];			/* Word 57 */
 	uint16_t MultiSectorSettings;			/* Word 59 */
 	uint16_t NumberOfAddressableSectors[2];		/* Word 60 */
 	uint16_t Reserved4;				/* Word 62 */
 	uint16_t MultiWordDmaTransfer;			/* Word 63 */
 	uint16_t AdvancedPioModes;			/* Word 64 */
 	uint16_t MinimumMultiWordDmaTiming;		/* Word 65 */
 	uint16_t RecommendedMultiWordDmaTiming;		/* Word 66 */
 	uint16_t PioTimingNoFlowControl;		/* Word 67 */
 	uint16_t PioTimingWithFlowControl;		/* Word 68 */
 	uint16_t Reserved5[13];				/* Word 69 */
 	uint16_t FeaturesSupported[3];			/* Word 82 */
 	uint16_t FeaturesEnabled[3];			/* Word 85 */
 	uint16_t UdmaMode;				/* Word 88 */
 	uint16_t SecurityEraseTime;			/* Word 89 */
 	uint16_t EnhancedSecurityEraseTime;		/* Word 90 */
 	uint16_t CurrentPowerManagementValue;		/* Word 91 */
 	uint8_t  Reserved6[72];				/* Word 92-127 */
 	uint8_t  SecondHalf[256];			/* Word 128-255 */
 } CFLASH_IDENTIFY, *PCFLASH_IDENTIFY;
 #define SIZEOF_IDENTIFY CF_SECTOR_SIZE /* must be a sector multiple */
 /* Instead of dragging in atavar.h.. */
 /*
  * Parameters/state needed by the controller to perform an ATA bio.
  */
 struct ace_bio {
 	volatile int flags;/* cmd flags */
 #define	ATA_POLL	0x0002	/* poll for completion */
 #define	ATA_SINGLE	0x0008	/* transfer must be done in singlesector mode */
 #define	ATA_READ	0x0020	/* transfer is a read (otherwise a write) */
 #define	ATA_CORR	0x0040	/* transfer had a corrected error */
 	daddr_t		blkno;	/* block addr */
 	daddr_t		blkdone;/* number of blks transferred */
 	size_t		nblks;	/* number of blocks currently transferring */
 	size_t		nbytes;	/* number of bytes currently transferring */
 	char		*databuf;/* data buffer address */
 	volatile int	error;
 #define	NOERROR		0	/* There was no error (r_error invalid),
 				   else see acedone()*/
 #define FAILED(er) (er != 0)
 #define EDOOFUS EIO
 	uint32_t	r_error;/* copy of status register */
 #ifdef HAS_BAD144_HANDLING
 	daddr_t		badsect[127];/* 126 plus trailing -1 marker */
 #endif
 };
 /* End of atavar.h*/
 struct ace_softc {
 	/* General disk infos */
 	device_t sc_dev;
 	struct disk sc_dk;
 	struct bufq_state *sc_q;
 	struct callout sc_restart_ch;
 	/* IDE disk soft states */
 	struct buf *sc_bp; /* buf being transfered */
 	struct buf *active_xfer; /* buf handoff to thread  */
 	/* current transfer data */
 	struct ace_bio sc_bio; /* current transfer */
 	struct proc *ch_thread;
 	int ch_flags;
 #define ATACH_SHUTDOWN 0x02        /* thread is shutting down */
 #define ATACH_IRQ_WAIT 0x10        /* thread is waiting for irq */
 #define ATACH_DISABLED 0x80        /* channel is disabled */
 #define ATACH_TH_RUN   0x100       /* the kernel thread is working */
 #define ATACH_TH_RESET 0x200       /* someone ask the thread to reset */
 	int openings;
 	int media_has_changed;
 #define    ACECE_MC    0x20    /* media changed */
 #define    ACECE_MCR   0x08    /* media change requested */
 	struct _CFLASH_IDENTIFY sc_params;/* drive characteristics found */
 	int sc_flags;
 #define	ACEF_WLABEL	0x004 /* label is writable */
 #define	ACEF_LABELLING	0x008 /* writing label */
 #define ACEF_LOADED	0x010 /* parameters loaded */
 #define ACEF_WAIT	0x020 /* waiting for resources */
 #define ACEF_KLABEL	0x080 /* retain label after 'full' close */
 	uint64_t sc_capacity;
 	uint32_t sc_multi; /* max sectors per xfer */
 	struct	_Sac   *sc_dr;		/* reg pointers */
 	int hw_busy;
 	int retries; /* number of xfer retry */
 	krndsource_t	rnd_source;
 };
 int  ace_ebus_match(device_t, cfdata_t, void *);
 void ace_ebus_attach(device_t, device_t, void *);
 void aceattach(struct ace_softc *);
 int	 acedetach(device_t, int);
 int	 aceactivate(device_t, enum devact);
 void  acedone(struct ace_softc *);
 static void ace_set_geometry(struct ace_softc *ace);
 CFATTACH_DECL_NEW(ace_ebus, sizeof(struct ace_softc),
     ace_ebus_match, ace_ebus_attach, acedetach, aceactivate);
 int  ace_ebus_intr(void *cookie, void *f);
 static void sysace_thread(void *arg);
 int
 ace_ebus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct ebus_attach_args *d = aux;
 	struct _Sac *sac = (struct _Sac *)d->ia_vaddr;
 	if (strcmp("ace", d->ia_name) != 0)
 		return 0;
 	if ((sac == NULL) ||
 	    ((sac->Tag & SAC_TAG) != PMTTAG_SYSTEM_ACE))
 		return 0;
 	return 1;
+}
 void
 ace_ebus_attach(device_t parent, device_t self, void *aux)
+{
 	struct ace_softc *ace = device_private(self);
 	struct ebus_attach_args *ia = aux;
 	int error;
 	ace->sc_dev = self;
 	/*
 	 * It's on the baseboard, with a dedicated interrupt line.
 	 */
 	ace->sc_dr = (struct _Sac *)ia->ia_vaddr;
 #if DEBUG
 	printf(" virt=%p", (void*)ace->sc_dr);
 #endif
 	printf(" : System ACE\n");
 	ebus_intr_establish(parent, (void*)ia->ia_cookie, IPL_BIO,
 	    ace_ebus_intr, ace);
 	config_pending_incr(self);
 	error = kthread_create(PRI_NONE, 0, NULL, sysace_thread,
 	    ace, NULL, "%s", device_xname(ace->sc_dev));
 	if (error)
 		aprint_error_dev(ace->sc_dev, "unable to create kernel "
 		    "thread: error %d\n", error);
+}
 /*
  * Sysace driver I(af) wrote for FreeBsd.
  */
 #define CF_SECBITS     9
 #define CF_SECTOR_SIZE (1 << CF_SECBITS)
 static int sysace_attach(struct ace_softc *sc);
 static int sysace_reset(struct ace_softc *sc);
 static int sysace_identify(struct ace_softc *sc);
 static int sysace_lock_registers(struct ace_softc *sc);
 static int sysace_unlock_registers(struct ace_softc *sc);
 static int sysace_start(struct ace_softc *sc, uint32_t Command, uint32_t Lba,
 			uint32_t nSectors);
 static int sysace_validate(struct ace_softc *sc, daddr_t start, size_t *pSize);
 static int sysace_read_at (struct ace_softc *sc, daddr_t start_sector,
 			   char *buffer, size_t nblocks, size_t * pSizeRead);
 static int sysace_write_at(struct ace_softc *sc, daddr_t start_sector,
 			   char *buffer, size_t nblocks, size_t * pSizeWritten);
 #ifdef USE_ACE_FOR_RECONFIG /* Old code, despised and replaced by ICAP */
 static int sysace_send_config(struct ace_softc *sc,
                               uint32_t *Data, unsigned int nBytes);
 #endif
 #define DEBUG_INTR   0x01
 #define DEBUG_XFERS  0x02
 #define DEBUG_STATUS 0x04
 #define DEBUG_FUNCS  0x08
 #define DEBUG_PROBE  0x10
 #define DEBUG_WRITES 0x20
 #define DEBUG_READS  0x40
 #define DEBUG_ERRORS 0x80
 #ifdef DEBUG
 int ace_debug = DEBUG_ERRORS /*|DEBUG_WRITES*/;
 #define ACE_DEBUG(x) (ace_debug & (x))
 #define DBGME(_lev_,_x_) if ((_lev_) & ace_debug) _x_
 #else
 #define ACE_DEBUG(x) (0)
 #define DBGME(_lev_,_x_)
 #endif
 #define DEBUG_PRINT(_args_,_lev_) DBGME(_lev_,printf _args_)
 static int
 sysace_attach(struct ace_softc *sc)
+{
 	int error;
 	DBGME(DEBUG_FUNCS, printf("Sysace::delayed_attach %p\n", sc));
 	sc->media_has_changed = TRUE;
 	sc->sc_capacity = 0;
 	error = sysace_reset(sc);
 	if (error) {
 		device_printf(sc->sc_dev,
 		    "failed to reset, errno=%d\n", error);
 		goto Out;
+	}
 	error = sysace_identify(sc);
 	if (error) {
 		device_printf(sc->sc_dev,
 		    "failed to identify card, errno=%d.\n", error);
 		goto Out;
+	}
 	DBGME(DEBUG_PROBE, device_printf(sc->sc_dev,
 	    "Card has %qx sectors.\n", sc->sc_capacity));
 	if (sc->sc_capacity == 0) {
 		device_printf(sc->sc_dev, "size 0, no card? Wont work.\n");
 		error = EDOOFUS;
 		goto Out;
+	}
 	sc->media_has_changed = FALSE;
 Out:
 	return error;
+}
 static void
 sysace_wedges(void *arg);
 extern int	dkwedge_autodiscover;
 /*
  * Aux temp thread to avoid deadlock when doing
  * the partitio.. ahem wedges thing.
  */
 static void
 sysace_wedges(void *arg)
+{
 	struct ace_softc *sc = arg;
 	DBGME(DEBUG_STATUS, printf("Sysace::wedges started for %p\n", sc));
 	/* Discover wedges on this disk. */
 	dkwedge_autodiscover = 1;
 	dkwedge_discover(&sc->sc_dk);
 	config_pending_decr(sc->sc_dev);
 	DBGME(DEBUG_STATUS, printf("Sysace::thread done for %p\n", sc));
 	kthread_exit(0);
+}
 static void
 sysace_thread(void *arg)
+{
 	struct ace_softc *sc = arg;
 	struct buf *bp;
 	int s, error;
 	DBGME(DEBUG_STATUS, printf("Sysace::thread started for %p\n", sc));
 	s = splbio();
 	aceattach(sc);
 	splx(s);
 	error = kthread_create(PRI_NONE, 0 /* MPSAFE??? */, NULL,
 	    sysace_wedges, sc, NULL, "%s.wedges", device_xname(sc->sc_dev));
 	if (error)
 		aprint_error_dev(sc->sc_dev, "wedges: unable to create "
 		    "kernel thread: error %d\n", error);
 	DBGME(DEBUG_STATUS,
 	    printf("Sysace::thread service active for %p\n", sc));
 	s = splbio();
 	for (;;) {
 		/* Get next I/O request, wait if necessary */
 		if ((sc->ch_flags & (ATACH_TH_RESET | ATACH_SHUTDOWN)) == 0 &&
 		    (sc->active_xfer == NULL)) {
 			sc->ch_flags &= ~ATACH_TH_RUN;
 			(void) tsleep(&sc->ch_thread, PRIBIO, "aceth", 0);
 			sc->ch_flags |= ATACH_TH_RUN;
+		}
 		if (sc->ch_flags & ATACH_SHUTDOWN)
 			break;
 		bp = sc->active_xfer;
 		sc->active_xfer = NULL;
 		if (bp != NULL) {
 			size_t sz, bnow;
 			DBGME(DEBUG_XFERS,
 			    printf("Sysace::task %p %p %x %p %qx %d (%zd)\n",
 			    sc, bp, sc->sc_bio.flags, sc->sc_bio.databuf,
 			    sc->sc_bio.blkno, sc->sc_bio.nbytes,
 			    sc->sc_bio.nblks));
 			sc->sc_bio.error = 0;
 			for (; sc->sc_bio.nblks > 0;) {
 				bnow = sc->sc_bio.nblks;
 				if (sc->sc_bio.flags & ATA_SINGLE)
 					bnow = 1;
 				if (sc->sc_bio.flags & ATA_READ) {
 					sc->sc_bio.error =
 					    sysace_read_at(sc,
 					    sc->sc_bio.blkno,
 					    sc->sc_bio.databuf, bnow, &sz);
 				} else {
 					sc->sc_bio.error =
 					    sysace_write_at(sc,
 					    sc->sc_bio.blkno,
 					    sc->sc_bio.databuf, bnow, &sz);
+				}
 				if (FAILED(sc->sc_bio.error))
 					break;
 				sc->sc_bio.blkno += sz; /* in blocks */
 				sc->sc_bio.nblks -= sz;
 				sc->sc_bio.blkdone += sz;
 				sz = sz << CF_SECBITS; /* in bytes */
 				sc->sc_bio.databuf += sz;
 				sc->sc_bio.nbytes  -= sz;
+			}
 			acedone(sc);
+		}
+	}
 	splx(s);
 	sc->ch_thread = NULL;
 	wakeup(&sc->ch_flags);
 	kthread_exit(0);
+}
 /* Worker routines
  */
 #if _DEBUG
 typedef char *NAME;
 typedef struct _REGDESC {
 	NAME RegisterName;
 	NAME BitNames[32];
 } REGDESC, *PREGDESC;
 static void
 SysacePrintRegister(const REGDESC *Desc, uint32_t Value)
+{
 	int i;
 	printf("\t%s %x =", Desc->RegisterName, Value);
 	for (i = 31; i >= 0; i--) {
 		if (Value & (1 << i))
 			printf(" %s",
 			    (Desc->BitNames[i]) ? Desc->BitNames[i] : "?");
+	}
 	printf("\n");
+}
 static uint32_t
 SysaceDumpRegisters(struct _Sac *regs)
+{
 	const REGDESC Control_Names = {
 		"Control",
+		{
 ,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 			"RST",		/* 0x00010000 */
 			"BUS8",		/* 0x00020000 */
 			"BUS16",	/* 0x00040000 */
 			"BUS32",	/* 0x00080000 */
 			"IRQ",		/* 0x00100000 */
 			"BRDY",		/* 0x00200000 */
 			"IMSK0",	/* 0x00400000 */
 			"IMSK1",	/* 0x00800000 */
 			"TD0",		/* 0x0f000000 */
 			"TD1",		/* 0x0f000000 */
 			"TD2",		/* 0x0f000000 */
 			"TD3",		/* 0x0f000000 */
 			"BUFW8",	/* 0x10000000 */
 			"BUFW16",	/* 0x20000000 */
 			"BUFW32",	/* 0x40000000 */
 			"DEBUG"		/* 0x80000000 */
+		}
 	};
 	const REGDESC STATUS_Names = {
 		"STATUS",
+		{
 			"CFGLOCK",	/* 0x00000001 */
 			"MPULOCK",	/* 0x00000002 */
 			"CFGERROR",	/* 0x00000004 */
 			"CFCERROR",	/* 0x00000008 */
 			"CFDETECT",	/* 0x00000010 */
 			"DATABUFRDY",	/* 0x00000020 */
 			"DATABUFWRITE",	/* 0x00000040 */
 			"CFGDONE",	/* 0x00000080 */
 			"RDYFORCFCMD",	/* 0x00000100 */
 			"CFGMODEPIN",	/* 0x00000200 */
 ,0,0,
 			"CFGADDRPIN0",	/* 0x0000e000 */
 			"CFGADDRPIN1",	/* 0x0000e000 */
 			"CFGADDRPIN2",	/* 0x0000e000 */
 ,
 			"CFBSY",	/* 0x00020000 */
 			"CFRDY",	/* 0x00040000 */
 			"CFDWF",	/* 0x00080000 */
 			"CFDSC",	/* 0x00100000 */
 			"CFDRQ",	/* 0x00200000 */
 			"CFCORR",	/* 0x00400000 */
 			"CFERR",	/* 0x00800000 */
 ,
+		}
 	};
 	const REGDESC ERRORREG_Names = {
 		"ERRORREG",
+		{
 			"CARDRESETERR",	/* 0x00000001 */
 			"CARDRDYERR",	/* 0x00000002 */
 			"CARDREADERR",	/* 0x00000004 */
 			"CARDWRITEERR",	/* 0x00000008 */
 			"SECTORRDYERR",	/* 0x00000010 */
 			"CFGADDRERR",	/* 0x00000020 */
 			"CFGFAILED",	/* 0x00000040 */
 			"CFGREADERR",	/* 0x00000080 */
 			"CFGINSTRERR",	/* 0x00000100 */
 			"CFGINITERR",	/* 0x00000200 */
 ,
 			"CFBBK",	/* 0x00000800 */
 			"CFUNC",	/* 0x00001000 */
 			"CFIDNF",	/* 0x00002000 */
 			"CFABORT",	/* 0x00004000 */
 			"CFAMNF",	/* 0x00008000 */
 ,
+		}
 	};
 	const NAME CommandNames[8] = {
 		"0",			/* 0x0000 */
 		"RESETMEMCARD",		/* 0x0100 */
 		"IDENTIFYMEMCARD",	/* 0x0200 */
 		"READMEMCARDDATA",	/* 0x0300 */
 		"WRITEMEMCARDDATA",	/* 0x0400 */
 		"5",			/* 0x0500 */
 		"ABORT",		/* 0x0600 */
 		"7"			/* 0x0700 */
 	};
 	const REGDESC CONTROLREG_Names = {
 		"CONTROLREG",
+		{
 			"FORCELOCKREQ",	/* 0x00000001 */
 			"LOCKREQ",	/* 0x00000002 */
 			"FORCECFGADDR",	/* 0x00000004 */
 			"FORCECFGMODE",	/* 0x00000008 */
 			"CFGMODE",	/* 0x00000010 */
 			"CFGSTART",	/* 0x00000020 */
 			"CFGSEL_MPU",	/* 0x00000040 */
 			"CFGRESET",	/* 0x00000080 */
 			"DATABUFRDYIRQ",/* 0x00000100 */
 			"ERRORIRQ",	/* 0x00000200 */
 			"CFGDONEIRQ",	/* 0x00000400 */
 			"RESETIRQ",	/* 0x00000800 */
 			"CFGPROG",	/* 0x00001000 */
 			"CFGADDR_B0",	/* 0x00002000 */
 			"CFGADDR_B1",	/* 0x00004000 */
 			"CFGADDR_B2",	/* 0x00008000 */
 ,
+		}
 	};
 	const REGDESC FATSTATREG_Names = {
 		"FATSTATREG",
+		{
 			"MBRVALID",	/* 0x00000001 */
 			"PBRVALID",	/* 0x00000002 */
 			"MBRFAT12",	/* 0x00000004 */
 			"PBRFAT12",	/* 0x00000008 */
 			"MBRFAT16",	/* 0x00000010 */
 			"PBRFAT16",	/* 0x00000020 */
 			"CALCFAT12",	/* 0x00000040 */
 			"CALCFAT16",	/* 0x00000080 */
 ,
+		}
 	};
 	printf("Sysace@%p:\n", regs);
 	printf("\tTag %x\n", regs->Tag);
 	SysacePrintRegister(&Control_Names, regs->Control);
 	printf("\tBUSMODEREG %x\n", regs->BUSMODEREG);
 	SysacePrintRegister(&STATUS_Names, regs->STATUS);
 	SysacePrintRegister(&ERRORREG_Names, regs->ERRORREG);
 	printf("\tCFGLBAREG %x\n", regs->CFGLBAREG);
 	printf("\tMPULBAREG %x\n", regs->MPULBAREG);
 	printf("\tVERSIONREG %x\n", regs->VERSIONREG);
 	printf("\tSECCNTCMDREG %x = %s cnt=%d\n", regs->SECCNTCMDREG,
 	    CommandNames[(regs->SECCNTCMDREG >> 8) & 7],
 	    regs->SECCNTCMDREG & SAC_SECCCNT);
 	SysacePrintRegister(&CONTROLREG_Names, regs->CONTROLREG);
 	SysacePrintRegister(&FATSTATREG_Names, regs->FATSTATREG);
 	return 1;
+}
 #else
 #define SysaceDumpRegisters(_c_)
 #endif
 /*
  * Reset the device and the interface
  */
 static int
 sysace_reset(struct ace_softc *sc)
+{
 	struct _Sac *regs = sc->sc_dr;
 	DBGME(DEBUG_FUNCS, printf("Sysace::Reset %p\n", sc));
 	/* 16bit etc etc */
 	uint32_t BusMode, Control;
 	/* reset our interface */
 	regs->Control = SAC_RST;
 	DELAY(200);
 	/* repeat on both byte lanes */
 	regs->BUSMODEREG = SAC_MODE16 | (SAC_MODE16 << 8);
 	DELAY(1);
 	/* check what our interface does and what the SysACE expects */
 	Control = regs->Control;
 	BusMode = regs->BUSMODEREG;
 	/* get them to agree */
 	if (BusMode & SAC_MODE16) {
 		regs->Control = Control | SAC_BUS16;
 		regs->Control = regs->Control & ~SAC_BUS8;
 	} else {
 		regs->Control = Control | SAC_BUS8;
 		regs->Control = regs->Control & ~SAC_BUS16;
+	}
 	/* check that it worked */
 	BusMode = regs->BUSMODEREG;
 	Control = regs->Control;
 	if (((BusMode & SAC_MODE16) == 0) && ((Control & SAC_BUS8) == 0))
 		return EDOOFUS;
 	if (((BusMode & SAC_MODE16) > 0) && ((Control & SAC_BUS16) == 0))
 		return EDOOFUS;
 	/* interrupts off for now */
 	regs->Control &= ~SAC_INTMASK;
 #define SAC_INTERRUPTS (SAC_DATABUFRDYIRQ | SAC_ERRORIRQ /* | SAC_CFGDONEIRQ */)
 	Control = regs->CONTROLREG;
 	Control = (Control & ~SAC_INTERRUPTS) | SAC_RESETIRQ | SAC_FORCECFGMODE;
 	regs->CONTROLREG = Control;
 	regs->CONTROLREG = Control & ~SAC_RESETIRQ;
 	/* no command */
 	regs->MPULBAREG = 0;
 	return 0;
+}
 /*
  * Take control of the ACE datapath
  */
 static int
 sysace_lock_registers(struct ace_softc *sc)
+{
 	uint32_t Status;
 	int i;
 	DBGME(DEBUG_FUNCS, printf("Sysace::Lock %p\n", sc));
 	/*
 	 * Locked already?
 	 */
 	Status = sc->sc_dr->STATUS;
 	if (Status & SAC_MPULOCK)
 		return TRUE;
 	/*
 	 * Request lock
 	 */
 	sc->sc_dr->CONTROLREG |= SAC_LOCKREQ;
 	/*
 	 * Spin a bit until we get it
 	 */
 	for (i = 0; i < 200; i++) {
 		Status = sc->sc_dr->STATUS;
 		if (Status & SAC_MPULOCK)
 			return TRUE;
 		DELAY(100);
 		DBGME(DEBUG_FUNCS,
 		    printf("Sysace::Lock loops.. (st=%x)\n",Status));
+	}
 	/*
 	 * oopsie!
 	 */
 	DBGME(DEBUG_ERRORS, printf("Sysace::Lock timeout (st=%x)\n",Status));
 	SysaceDumpRegisters(sc->sc_dr);
 	return FALSE;
+}
 /*
  * Release control of the ACE datapath
  */
 static int
 sysace_unlock_registers(struct ace_softc *sc)
+{
 	uint32_t Status;
 	int i;
 	DBGME(DEBUG_FUNCS, printf("Sysace::Unlock %p\n", sc));
 	/*
 	 * Clear reset
 	 */
 	sc->sc_dr->CONTROLREG &= ~SAC_CFGRESET;
 	/*
 	 * Unlocked already?
 	 */
 	Status = sc->sc_dr->STATUS;
 	if ((Status & SAC_MPULOCK) == 0)
 		return TRUE;
 	/*
 	 * Request unlock
 	 */
 	sc->sc_dr->CONTROLREG &= ~SAC_LOCKREQ;
 	/*
 	 * Spin a bit until we get it
 	 */
 	for (i = 0; i < 200; i++) {
 		Status = sc->sc_dr->STATUS;
 		if ((Status & SAC_MPULOCK) == 0)
 			return TRUE;
 		DELAY(100);
 		DBGME(DEBUG_FUNCS,
 		    printf("Sysace::Unlock loops.. (st=%x)\n",Status));
+	}
 	/*
 	 * oopsie!
 	 */
 	DBGME(DEBUG_ERRORS, printf("Sysace::Unlock timeout (st=%x)\n",Status));
 	SysaceDumpRegisters(sc->sc_dr);
 	return FALSE;
+}
 /*
  * Check if the ACE is waiting for a comamnd
  */
 #define sysace_ready(_s_) ((_s_)->sc_dr->STATUS & SAC_RDYFORCFCMD)
 /*
  * Check if the ACE is executing a comamnd
  */
 #define sysace_busy(_s_) ((_s_)->sc_dr->STATUS & SAC_CFBSY)
 /*
  * Turn on interrupts from the ACE
  */
 #define sysace_inton(_s_) { \
 	(_s_)->sc_dr->CONTROLREG |= SAC_INTERRUPTS; \
 	(_s_)->sc_dr->Control |= SAC_INTMASK; \
+}
 /*
  * Turn off interrupts from the ACE
  */
 #define sysace_intoff(_s_) { \
 	(_s_)->sc_dr->CONTROLREG &= ~SAC_INTERRUPTS; \
 	(_s_)->sc_dr->Control &= ~SAC_INTMASK; \
+}
 /*
  * Start a command on the ACE, such as read or identify.
  */
 static int
 sysace_start(struct ace_softc *sc, uint32_t Command, uint32_t Lba,
     uint32_t nSectors)
+{
 	/*
 	 * Lock it if not already
 	 */
 	if (!sysace_lock_registers(sc)) {
 		/* printed already */
 		return ETIMEDOUT;
+	}
 	/*
 	 * Is there a CF inserted
 	 */
 	if (!(sc->sc_dr->STATUS & SAC_CFDETECT)) {
 		/* NB: Not a failure state */
 		DBGME(DEBUG_ERRORS,
 		    printf("Sysace:: no media (st=%x)\n", sc->sc_dr->STATUS));
 		if (sc->sc_capacity) {
 			sc->media_has_changed = TRUE;
 			sc->sc_capacity = 0;
+		}
 		return ENODEV;
+	}
 	/*
 	 * Is it ready for a command
 	 */
 	if (!sysace_ready(sc)) {
 		DBGME(DEBUG_ERRORS,
 		    printf("Sysace:: not ready (st=%x)\n", sc->sc_dr->STATUS));
 		SysaceDumpRegisters(sc->sc_dr);
 		return EBUSY;
+	}
 	/*
 	 * sector number and command
 	 */
 	sc->sc_dr->MPULBAREG = Lba;
 	sc->sc_dr->SECCNTCMDREG =
 	    (uint16_t)(Command | (nSectors & SAC_SECCCNT));
 	/*
 	 *  re-route the chip
 	 * NB: The "RESET" is actually not much of a misnomer.
 	 * The chip was designed for a one-shot execution at reset time,
 	 * namely loading the configuration data into the FPGA. So.
 	 */
 	sc->hw_busy = TRUE;
 	sc->sc_dr->CONTROLREG |= SAC_CFGRESET;
 	return 0;
+}
 /*
  * Identify the (size of the) CompactFlash card inserted in the slot.
  */
 static int
 sysace_identify(struct ace_softc *sc)
+{
 	PCFLASH_IDENTIFY Identify = &sc->sc_params;
 	uint32_t Status = 0;
 	int i, j, error;
 	DBGME(DEBUG_FUNCS, printf("Sysace::Identify %p\n", sc));
 	/*
 	 * Turn on interrupts before we start the command
 	 */
 	sysace_inton(sc); /* BUGBUG we should add polling mode (for dump too) */
 	/*
 	 * This will invalidate the ACE's current sector data
 	 */
 	sc->sc_capacity = 0;
 	/*
 	 * Get it going
 	 */
 	error = sysace_start(sc, SAC_CMD_IDENTIFYMEMCARD, 0, 1);
 	/*
 	 * Wait until its done
 	 */
 	if (!FAILED(error)) {
 		/* Might be called during autoconf, no interrupts */
 		if (cold) {
 			do {
 				DELAY(10);
 				Status = sc->sc_dr->STATUS;
 			} while ((Status &
 			    (SAC_DATABUFRDY|SAC_CFCERROR|SAC_CFGERROR)) == 0);
 		} else {
 			while (sc->hw_busy) {
 				DBGME(DEBUG_FUNCS,
 				    printf("Sysace:: cwait.. (st=%x)"
 				    " sizeof=%d\n",
 				    sc->sc_dr->STATUS, sizeof(*Identify)));
 				error = tsleep(&sc->media_has_changed, PRIBIO,
 				    "aceidfy", 0);
+			}
+		}
 		/*
 		 * Did it work?
 		 */
 		Status = sc->sc_dr->STATUS;
 		if (Status & SAC_DATABUFRDY) {
 			/*
 			 * Yes, pull out all the data.
 			 * NB: Until we do so the chip will not be ready for
 			 *     another command
 			 */
 			for (i = 0; i < sizeof(*Identify); i += 4) {
 				/*
 				 * Verify the (32-bytes) FIFO has reloaded
 				 */
 				for (j = 0; j < 10; j++) {
 					Status = sc->sc_dr->STATUS;
 					if (Status & SAC_DATABUFRDY)
 						break;
 					DELAY(10);
+				}
 				if (Status & SAC_DATABUFRDY) {
 					uint32_t Data32;
 					/*
 					 * This pulls two 16-bit words out of
 					 * the FIFO.
 					 * They are ordered in LE.
 					 * NB: Yes this is different from
 					 *     regular data accesses
 					 */
 					Data32 = sc->sc_dr->DATABUFREG[0];
 #if _BYTE_ORDER == _LITTLE_ENDIAN
 					/* all is fine */
 #else
 					Data32 =
 					    (Data32 >> 16) | (Data32 << 16);
 #endif
 					memcpy(((char *)Identify) + i,
 					    &Data32, 4);
 				} else {
 					/*
 					 * Ooops, what's going on here?
 					 */
 					DBGME(DEBUG_ERRORS,
 					    printf("Sysace::!DATABUFRDY %x\n",
 					    Status));
 					error = EIO;
 					break;
+				}
+			}
 			/*
 			 * Make sure we did ok and pick up the relevant info
 			 */
 			if (Status & SAC_DATABUFRDY) {
 				DBGME(DEBUG_XFERS,
 				    device_printf(sc->sc_dev,
 				    "model: %.40s/%.20s\n",
 				    Identify->ModelNumber,
 				    Identify->SerialNumber));
 				if (Identify->Signature == CFLASH_SIGNATURE) {
 					DBGME(DEBUG_PROBE,
 					    printf("Sysace::Card is"
 					    " %.40s::%.20s\n",
 					    Identify->ModelNumber,
 					    Identify->SerialNumber));
 					sc->sc_capacity =
 					    (Identify->SectorsPerCard[0] << 16)
 					    | Identify->SectorsPerCard[1];
 					DBGME(DEBUG_PROBE,
 					    printf("Sysace::sc_capacity x%qx\n",
 					    sc->sc_capacity));
 					ace_set_geometry(sc);
 				} else {
 					DBGME(DEBUG_ERRORS,
 					    printf("Sysace::Bad card signature?"
 					    " %x != %x\n",
 					    Identify->Signature,
 					    CFLASH_SIGNATURE));
 					sc->sc_capacity = 0;
 					error = ENXIO;
+				}
 			} else {
 				error = ETIMEDOUT;
+			}
 		} else {
 			/*
 			 * No, it did not work. Maybe there is no card inserted
 			 */
 			DBGME(DEBUG_ERRORS,
 			    printf("Sysace::Identify failed,"
 			    " missing CFLASH card?\n"));
 			SysaceDumpRegisters(sc->sc_dr);
 			/* BUGBUG Fix the error code accordingly */
 			error = ETIMEDOUT;
+		}
+	}
 	/* remember this jic */
 	sc->sc_bio.r_error = Status;
 	/* Free the ACE for the JTAG, just in case */
 	sysace_unlock_registers(sc);
 	/*
 	 * Done
 	 */
 	return error;
+}
 /*
  * Common code for read&write argument validation
  */
 static int
 sysace_validate(struct ace_softc *sc, daddr_t start, size_t *pSize)
+{
 	daddr_t Size;
 	/*
 	 * Verify that we know the media size
 	 */
 	if (sc->sc_capacity == 0) {
 		int error = sysace_identify(sc);
 		if (FAILED(error))
 			return error;
+	}
 	/*
 	 * Validate args
 	 */
 	if (start >= sc->sc_capacity) {
 		*pSize = 0;
 		DBGME(DEBUG_ERRORS,
 		    printf("Sysace::ValidateArg(%qx) EOF\n", start));
 		return E2BIG;
+	}
 	/*
 	 * Adjust size if necessary
 	 */
 	Size = start + *pSize;
 	if (Size > sc->sc_capacity) {
 		/*
 		 * At most this many sectors
 		 */
 		Size = sc->sc_capacity - start;
 		*pSize = (size_t)Size;
+	}
 	DBGME(DEBUG_FUNCS,
 	    printf("Sysace::Validate %qx %zd\n", start, *pSize));
 	return 0;
+}
 /* Read SIZE bytes from sysace device, at offset Position
  */
 uint32_t ace_maxatatime = 255;
 #define MAXATATIME ace_maxatatime //255 /* BUGBUG test me on real hardware!! */
 static int
 sysace_read_at(struct ace_softc *sc, daddr_t start_sector, char *buffer,
     size_t nblocks, size_t *pSizeRead)
+{
 	int error;
 	uint32_t BlocksThisTime;
 	uint32_t Status = 0, SizeRead = 0;
 	uint32_t i, j;
 	DBGME(DEBUG_XFERS|DEBUG_READS,
 	    printf("SysaceReadAt(%p %qx %p %zd %p)\n",
 	    sc, start_sector, buffer, nblocks, pSizeRead));
 	/*
 	 * Validate & trim arguments
 	 */
 	error = sysace_validate(sc, start_sector, &nblocks);
 	/*
 	 * Repeat until we are done or error
 	 */
 	while (error == 0) {
 		/*
 		 * .. one bunch of sectors at a time
 		 */
 		BlocksThisTime = nblocks;
 		if (BlocksThisTime > MAXATATIME)
 			BlocksThisTime = MAXATATIME;
 		/*
 		 * Yes, start a sector read
 		 */
 		sysace_inton(sc);
 		error = sysace_start(sc,
 		    SAC_CMD_READMEMCARDDATA,
 		    (uint32_t)start_sector,  /* BUGBUG trims here, no warn. */
 		    BlocksThisTime);
 		/*
 		 * And wait until done, if ok
 		 */
 		if (!FAILED(error)) {
 			start_sector += BlocksThisTime;
 			/* Might be called during autoconf, no interrupts */
 			/* BUGBUG timeouts! */
 			if (cold) {
 				do {
 					DELAY(10);
 					Status = sc->sc_dr->STATUS;
 				} while ((Status &
 				    (SAC_DATABUFRDY|SAC_CFCERROR|SAC_CFGERROR))
 				    == 0);
 			} else {
 				while (sc->hw_busy) {
 					error = tsleep(&sc->media_has_changed,
 					    PRIBIO, "aceread", 0);
+				}
+			}
+		}
 		/*
 		 * Are we doing ok
 		 */
 		if (!FAILED(error)) {
 		/*
 		 * Get the data out of the ACE
 		 */
 			for (i = 0; i < (BlocksThisTime << CF_SECBITS);
 			    i += 4) {
 				/*
 				 * Make sure the FIFO is ready
 				 */
 				for (j = 0; j < 10; j++) {
 					Status = sc->sc_dr->STATUS;
 					if (Status & SAC_DATABUFRDY)
 						break;
 					DELAY(1000);
+				}
 				/*
 				 * Got it?
 				 */
 				if (Status & SAC_DATABUFRDY) {
 					uint32_t Data32;
 					Data32 = sc->sc_dr->DATABUFREG[0];
 					Data32 = le32toh(Data32);
 					memcpy(buffer + i, &Data32, 4);
 				} else {
 					/*
 					 * Ooops, get out of here
 					 */
 					DBGME(DEBUG_ERRORS,
 					    printf("Sysace::READ timeout\n"));
 					SysaceDumpRegisters(sc->sc_dr);
 					error = ETIMEDOUT;
 					break;
+				}
+			}
 			/*
 			 * Still doing ok?
 			 */
 			if (!FAILED(error)) {
 				nblocks   -= BlocksThisTime;
 				SizeRead  += BlocksThisTime;
 				buffer    += BlocksThisTime << CF_SECBITS;
 			} else {
 				/* remember this jic */
 				sc->sc_bio.r_error = Status;
+			}
+		}
 		/* Free the ACE for the JTAG, just in case */
 		sysace_unlock_registers(sc);
 		/*
 		 * Are we done yet?
 		 */
 		if (nblocks == 0)
 			break;
+	}
 	if (pSizeRead)
 		*pSizeRead = SizeRead;
 	return error;
+}
 /*
  * Write SIZE bytes to device.
  */
 static int
 sysace_write_at(struct ace_softc *sc, daddr_t start_sector, char *buffer,
     size_t nblocks, size_t *pSizeWritten)
+{
 	int error;
 	uint32_t BlocksThisTime;
 	uint32_t Status = 0, SizeWritten = 0;
 	uint32_t i, j;
 	DBGME(DEBUG_XFERS|DEBUG_WRITES,
 	    printf("SysaceWriteAt(%p %qx %p %zd %p)\n",
 	    sc, start_sector, buffer, nblocks, pSizeWritten));
 	/*
 	 * Validate & trim arguments
 	 */
 	error = sysace_validate(sc, start_sector, &nblocks);
 	/*
 	 * Repeat until we are done or error
 	 */
 	while (error == 0) {
 		/*
 		 * .. one sector at a time
 		 * BUGBUG Supposedly we can do up to 256 sectors?
 		 */
 		BlocksThisTime = nblocks;
 		if (BlocksThisTime > MAXATATIME)
 			BlocksThisTime = MAXATATIME;
 		/*
 		 * Yes, start a sector write
 		 */
 		sysace_inton(sc);
 		error = sysace_start(sc,
 		    SAC_CMD_WRITEMEMCARDDATA,
 		    (uint32_t)start_sector,  /* BUGBUG trims here, no warn. */
 		    BlocksThisTime);
 		/*
 		 * And wait until done, if ok
 		 */
 		if (!FAILED(error)) {
 			start_sector += BlocksThisTime;
 			/* BUGBUG timeouts! */
 			while (sc->hw_busy) {
 				error = tsleep(&sc->media_has_changed,
 				    PRIBIO, "acewrite", 0);
+			}
+		}
 		/*
 		 * Are we doing ok
 		 */
 		if (!FAILED(error)) {
 			/*
 			 * Get the data out to the ACE
 			 */
 			for (i = 0; i < (BlocksThisTime << CF_SECBITS);
 			    i += 4) {
 				/*
 				 * Make sure the FIFO is ready
 				 */
 				for (j = 0; j < 10; j++) {
 					Status = sc->sc_dr->STATUS;
 					if (Status & SAC_DATABUFRDY)
 						break;
 					DELAY(1000);
+				}
 				/*
 				 * Got it?
 				 */
 				if (Status & SAC_DATABUFRDY) {
 					uint32_t Data32;
 					memcpy(&Data32, buffer + i, 4);
 					Data32 = htole32(Data32);
 					sc->sc_dr->DATABUFREG[0] = Data32;
 				} else {
 					/*
 					 * Ooops, get out of here
 					 */
 					DBGME(DEBUG_ERRORS,
 					    printf("Sysace::WRITE timeout\n"));
 					SysaceDumpRegisters(sc->sc_dr);
 					error = ETIMEDOUT;
 					/* remember this jic */
 					sc->sc_bio.r_error = Status;
 					break;
+				}
+			}
 			/*
 			 * Still doing ok?
 			 */
 			if (!FAILED(error)) {
 				nblocks     -= BlocksThisTime;
 				SizeWritten += BlocksThisTime;
 				buffer      += BlocksThisTime << CF_SECBITS;
+			}
+		}
 		/*
 		 * We need to wait until the device is ready for the
 		 * next command
 		 * Experimentation shows that it can take longer than 10msec.
 		 */
 		if (!FAILED(error)) {
 			for (j = 0; j < 300; j++) {
 				Status = sc->sc_dr->STATUS;
 				if (Status & SAC_RDYFORCFCMD)
 					break;
 				(void)tsleep(&sc->media_has_changed,
 				    PRIBIO, "acewrite", 2);
+			}
 			if (!(Status & SAC_RDYFORCFCMD)) {
 				DBGME(DEBUG_ERRORS,
 				    printf("Sysace::WRITE-COMPLETE timeout"
 				    " St=%x\n", Status));
 				SysaceDumpRegisters(sc->sc_dr);
 				/*
 				 * Ignore, we'll handle it the next time around
 				 * BUGBUG To be revised along with non-existant
 				 * error handling
 				 */
+			}
+		}
 		/* Free the ACE for the JTAG, just in case */
 		sysace_unlock_registers(sc);
 		/*
 		 * Are we done yet?
 		 */
 		if (nblocks == 0)
 			break;
+	}
 	if (pSizeWritten)
 		*pSizeWritten = SizeWritten;
 	return error;
+}
 int
 ace_ebus_intr(void *cookie, void *f)
+{
 	struct ace_softc *sc = cookie;
 	uint32_t Control;
 	/*
 	 * Turn off interrupts and ACK them
 	 */
 	sysace_intoff(sc);
 	Control = sc->sc_dr->CONTROLREG & (~(SAC_RESETIRQ|SAC_INTERRUPTS));
 	sc->sc_dr->CONTROLREG = Control | SAC_RESETIRQ;
 	sc->sc_dr->CONTROLREG = Control;
 	/* ... read status and do whatever ... */
 	sc->hw_busy = FALSE;
 	wakeup(&sc->media_has_changed);
 	return 1;
+}
 #ifdef USE_ACE_FOR_RECONFIG
 static int
 sysace_send_config(struct ace_softc *sc, uint32_t *Data, unsigned int nBytes)
+{
 	struct _Sac *Interface = sc->sc_dr;
 	unsigned int i, j, nWords;
 	uint32_t CtlWas;
 	uint32_t Status;
 	CtlWas = Interface->CONTROLREG;
 	/* Set the bits but in RESET (pag 49-50 of specs)*/
 #define CFGCMD (SAC_FORCELOCKREQ | SAC_LOCKREQ | SAC_CFGSEL | \
 		SAC_FORCECFGMODE |/* SAC_CFGMODE |*/ SAC_CFGSTART)
 	Interface->CONTROLREG = CFGCMD | SAC_CFGRESET;
 	/* Take it out of RESET */
 	Interface->CONTROLREG = CFGCMD;
 	/*
 	 * Must wait till it says READY
 	 * It can take a looong time
 	 */
 	for (j = 0; j < 1000; j++) {
 		Status = Interface->STATUS;
 		if (Status & SAC_RDYFORCFCMD)
 			break;
 		DELAY(1000);
+	}
 	if (0 == (Status & SAC_RDYFORCFCMD)) {
 		DBGME(DEBUG_ERRORS,
 		    printf("Sysace::CMD error %x (j=%d)\n", Status, j));
 		goto Error;
+	}
 	/*
 	 * Get the data out to the ACE
 	 */
 #define ACEROUNDUP 32
 	nBytes = (nBytes + ACEROUNDUP - 1) & ~(ACEROUNDUP-1);
 	nWords = (nBytes + 3) / 4;
 	DBGME(DEBUG_FUNCS,
 	    printf("Sending %d bytes (as %d words) to %p ",
 	    nBytes, nWords, Interface));
 	for (i = 0; i < nWords; i += 1/*word*/) {
 		/* Stop on errors */
 		Status = Interface->ERRORREG;
 		if (Status) {
 			/*
 			 * Ooops, get out of here
 			 */
 			DBGME(DEBUG_ERRORS,
 			    printf("Sysace::CFG error %x (i=%d)\n", Status, i));
 			goto Error;
+		}
 		/*
 		 * Make sure the FIFO is ready
 		 */
 		for (j = 0; j < 100; j++) {
 			Status = Interface->STATUS;
 			if (Status & SAC_DATABUFRDY)
 				break;
 			DELAY(1000);
+		}
 		/*
 		 * Got it?
 		 */
 		if (Status & SAC_DATABUFRDY) {
 			uint32_t Data32;
 			Data32 = Data[i];
 			Data32 = htole32(Data32);
 			Interface->DATABUFREG[0] = Data32;
 		} else {
 			/*
 			 * Ooops, get out of here
 			 */
 			DBGME(DEBUG_ERRORS,
 			    printf("Sysace::WRITE timeout %x (i=%d)\n",
 			    Status, i));
 			goto Error;
+		}
+	}
 	DBGME(DEBUG_FUNCS, printf("done ok.\n"));
 	/* Put it back the way it was (try to.. :-( )*/
 	Interface->CONTROLREG = CtlWas;
 	return 0;
  Error:
 	SysaceDumpRegisters(Interface);
 	Interface->CONTROLREG = CtlWas;
 	return EIO;
+}
 #endif /* USE_ACE_FOR_RECONFIG */
 /*
  * Rest of code lifted with mods from the dev\ata\wd.c driver
  */
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *	notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *	notice, this list of conditions and the following disclaimer in the
  *	documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *	must display the following acknowledgement:
  *  This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *	derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Onno van der Linden.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *        This product includes software developed by the NetBSD
  *        Foundation, Inc. and its contributors.
  * 4. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 static const char ST506[] = "ST506";
 #define	ACEIORETRIES_SINGLE 4	/* number of retries before single-sector */
 #define	ACEIORETRIES	5	/* number of retries before giving up */
 #define	RECOVERYTIME hz/2	/* time to wait before retrying a cmd */
 #define	ACEUNIT(dev)		DISKUNIT(dev)
 #define	ACEPART(dev)		DISKPART(dev)
 #define	ACEMINOR(unit, part)	DISKMINOR(unit, part)
 #define	MAKEACEDEV(maj, unit, part)	MAKEDISKDEV(maj, unit, part)
 #define	ACELABELDEV(dev)	(MAKEACEDEV(major(dev), ACEUNIT(dev), RAW_PART))
 void	aceperror(const struct ace_softc *);
 extern struct cfdriver ace_cd;
 dev_type_open(aceopen);
 dev_type_close(aceclose);
 dev_type_read(aceread);
 dev_type_write(acewrite);
 dev_type_ioctl(aceioctl);
 dev_type_strategy(acestrategy);
 dev_type_dump(acedump);
 dev_type_size(acesize);
 const struct bdevsw ace_bdevsw = {
 	.d_open = aceopen,
 	.d_close = aceclose,
 	.d_strategy = acestrategy,
 	.d_ioctl = aceioctl,
 	.d_dump = acedump,
 	.d_psize = acesize,
 	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 const struct cdevsw ace_cdevsw = {
 	.d_open = aceopen,
 	.d_close = aceclose,
 	.d_read = aceread,
 	.d_write = acewrite,
 	.d_ioctl = aceioctl,
 	.d_stop = nostop,
 	.d_tty = notty,
 	.d_poll = nopoll,
 	.d_mmap = nommap,
 	.d_kqfilter = nokqfilter,
 	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 void  acegetdefaultlabel(struct ace_softc *, struct disklabel *);
 void  acegetdisklabel(struct ace_softc *);
 void  acestart(void *);
 void  __acestart(struct ace_softc*, struct buf *);
 void  acerestart(void *);
 struct dkdriver acedkdriver = {
 	.d_strategy = acestrategy,
 	.d_minphys = minphys
 };
 #ifdef HAS_BAD144_HANDLING
 static void bad144intern(struct ace_softc *);
 #endif
 void
 aceattach(struct ace_softc *ace)
+{
 	device_t self = ace->sc_dev;
 	char tbuf[41], pbuf[9], c, *p, *q;
 	int i, blank;
 	DEBUG_PRINT(("aceattach\n"), DEBUG_FUNCS | DEBUG_PROBE);
 	callout_init(&ace->sc_restart_ch, 0);
 	bufq_alloc(&ace->sc_q, BUFQ_DISK_DEFAULT_STRAT, BUFQ_SORT_RAWBLOCK);
 	ace->openings = 1; /* wazziz?*/
 	ace->sc_multi = MAXATATIME;
 	aprint_naive("\n");
 	/* setup all required fields so that if the attach fails we are ok */
 	ace->sc_dk.dk_driver = &acedkdriver;
 	ace->sc_dk.dk_name = device_xname(ace->sc_dev);
 	/* read our drive info */
 	if (sysace_attach(ace) != 0) {
 		aprint_error_dev(ace->sc_dev, "attach failed\n");
 		return;
+	}
 	aprint_normal_dev(ace->sc_dev, "drive supports %d-sector PIO xfers\n",
 	    ace->sc_multi);
 	for (blank = 0, p = ace->sc_params.ModelNumber, q = tbuf, i = 0;
 	    i < sizeof(ace->sc_params.ModelNumber); i++) {
 		c = *p++;
 		if (c == '\0')
 			break;
 		if (c != ' ') {
 			if (blank) {
 				*q++ = ' ';
 				blank = 0;
+			}
 			*q++ = c;
 		} else
 			blank = 1;
+	}
 	*q++ = '\0';
 	aprint_normal_dev(ace->sc_dev, "card is <%s>\n", tbuf);
 	format_bytes(pbuf, sizeof(pbuf), ace->sc_capacity * DEV_BSIZE);
 	aprint_normal("%s: %s, %d cyl, %d head, %d sec, "
 	    "%d bytes/sect x %llu sectors\n",
 	    device_xname(self), pbuf,
 	    (int)(ace->sc_capacity /
 	    (ace->sc_params.CurrentNumberOfHeads *
 	    ace->sc_params.CurrentSectorsPerTrack)),
 	    ace->sc_params.CurrentNumberOfHeads,
 	    ace->sc_params.CurrentSectorsPerTrack,
 	    DEV_BSIZE, (unsigned long long)ace->sc_capacity);
 	/*
 	 * Attach the disk structure. We fill in dk_info later.
 	 */
 	disk_attach(&ace->sc_dk);
 	rnd_attach_source(&ace->rnd_source, device_xname(ace->sc_dev),
 			  RND_TYPE_DISK, RND_FLAG_DEFAULT);
+}
 int
 aceactivate(device_t self, enum devact act)
+{
 	int rv = 0;
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		/*
 		 * Nothing to do; we key off the device's DVF_ACTIVATE.
 		 */
 		break;
 	default:
 		rv = EOPNOTSUPP;
+	}
 	return rv;
+}
 int
 acedetach(device_t self, int flags)
+{
 	struct ace_softc *sc = device_private(self);
 	int s, bmaj, cmaj, i, mn;
 	/* locate the major number */
 	bmaj = bdevsw_lookup_major(&ace_bdevsw);
 	cmaj = cdevsw_lookup_major(&ace_cdevsw);
 	/* Nuke the vnodes for any open instances. */
 	for (i = 0; i < MAXPARTITIONS; i++) {
 		mn = ACEMINOR(device_unit(self), i);
 		vdevgone(bmaj, mn, mn, VBLK);
 		vdevgone(cmaj, mn, mn, VCHR);
+	}
 	/* Delete all of our wedges. */
 	dkwedge_delall(&sc->sc_dk);
 	s = splbio();
 	/* Kill off any queued buffers. */
 	bufq_drain(sc->sc_q);
 #if 0
 	sc->atabus->ata_killpending(sc->drvp);
 #endif
 	splx(s);
 	bufq_free(sc->sc_q);
 	/* Detach disk. */
 	disk_detach(&sc->sc_dk);
 	/* Unhook the entropy source. */
 	rnd_detach_source(&sc->rnd_source);
 #if 0
 	sc->drvp->drive_flags = 0; /* no drive any more here */
 #endif
 	return 0;
+}
 /*
  * Read/write routine for a buffer.  Validates the arguments and schedules the
  * transfer.  Does not wait for the transfer to complete.
  */
 void
 acestrategy(struct buf *bp)
+{
 	struct ace_softc *ace;
 	struct disklabel *lp;
 	daddr_t blkno;
 	int s;
 	ace = device_lookup_private(&ace_cd, ACEUNIT(bp->b_dev));
 	if (ace == NULL) {
 		bp->b_error = ENXIO;
 		biodone(bp);
 		return;
+	}
 	lp = ace->sc_dk.dk_label;
 	DEBUG_PRINT(("acestrategy (%s) %lld\n",
 	    device_xname(ace->sc_dev), bp->b_blkno), DEBUG_XFERS);
 	/* Valid request?  */
 	if (bp->b_blkno < 0 ||
 	    (bp->b_bcount % lp->d_secsize) != 0 ||
 	    (bp->b_bcount / lp->d_secsize) >= (1 << NBBY)) {
 		bp->b_error = EINVAL;
 		goto done;
+	}
 	/* If device invalidated (e.g. media change, door open), error. */
 	if ((ace->sc_flags & ACEF_LOADED) == 0) {
 		bp->b_error = EIO;
 		goto done;
+	}
 	/* If it's a null transfer, return immediately. */
 	if (bp->b_bcount == 0)
 		goto done;
 	/*
 	 * Do bounds checking, adjust transfer. if error, process.
 	 * If end of partition, just return.
 	 */
 	if (ACEPART(bp->b_dev) == RAW_PART) {
 		if (bounds_check_with_mediasize(bp, DEV_BSIZE,
 		    ace->sc_capacity) <= 0)
 			goto done;
 	} else {
 		if (bounds_check_with_label(&ace->sc_dk, bp,
 		    (ace->sc_flags & (ACEF_WLABEL|ACEF_LABELLING)) != 0) <= 0)
 			goto done;
+	}
 	/*
 	 * Now convert the block number to absolute and put it in
 	 * terms of the device's logical block size.
 	 */
 	if (lp->d_secsize >= DEV_BSIZE)
 		blkno = bp->b_blkno / (lp->d_secsize / DEV_BSIZE);
 	else
 		blkno = bp->b_blkno * (DEV_BSIZE / lp->d_secsize);
 	if (ACEPART(bp->b_dev) != RAW_PART)
 		blkno += lp->d_partitions[ACEPART(bp->b_dev)].p_offset;
 	bp->b_rawblkno = blkno;
 	/* Queue transfer on drive, activate drive and controller if idle. */
 	s = splbio();
 	bufq_put(ace->sc_q, bp);
 	acestart(ace);
 	splx(s);
 	return;
 done:
 	/* Toss transfer; we're done early. */
 	bp->b_resid = bp->b_bcount;
 	biodone(bp);
+}
 /*
  * Queue a drive for I/O.
  */
 void
 acestart(void *arg)
+{
 	struct ace_softc *ace = arg;
 	struct buf *bp = NULL;
 	DEBUG_PRINT(("acestart %s\n", device_xname(ace->sc_dev)), DEBUG_XFERS);
 	while (ace->openings > 0) {
 		/* Is there a buf for us ? */
 		if ((bp = bufq_get(ace->sc_q)) == NULL)
 			return;
 		/*
 		 * Make the command. First lock the device
 		 */
 		ace->openings--;
 		ace->retries = 0;
 		__acestart(ace, bp);
+	}
+}
 void
 __acestart(struct ace_softc *sc, struct buf *bp)
+{
 	sc->sc_bp = bp;
 	/*
 	 * If we're retrying, retry in single-sector mode. This will give us
 	 * the sector number of the problem, and will eventually allow the
 	 * transfer to succeed.
 	 */
 	if (sc->retries >= ACEIORETRIES_SINGLE)
 		sc->sc_bio.flags = ATA_SINGLE;
 	else
 		sc->sc_bio.flags = 0;
 	if (bp->b_flags & B_READ)
 		sc->sc_bio.flags |= ATA_READ;
 	sc->sc_bio.blkno = bp->b_rawblkno;
 	sc->sc_bio.blkdone = 0;
 	sc->sc_bio.nbytes = bp->b_bcount;
 	sc->sc_bio.nblks  = bp->b_bcount >> CF_SECBITS;
 	sc->sc_bio.databuf = bp->b_data;
 	/* Instrumentation. */
 	disk_busy(&sc->sc_dk);
 	sc->active_xfer = bp;
 	wakeup(&sc->ch_thread);
+}
 void
 acedone(struct ace_softc *ace)
+{
 	struct buf *bp = ace->sc_bp;
 	const char *errmsg;
 	int do_perror = 0;
 	DEBUG_PRINT(("acedone %s\n", device_xname(ace->sc_dev)), DEBUG_XFERS);
 	if (bp == NULL)
 		return;
 	bp->b_resid = ace->sc_bio.nbytes;
 	switch (ace->sc_bio.error) {
 	case ETIMEDOUT:
 		errmsg = "device timeout";
 	do_perror = 1;
 		goto retry;
 	case EBUSY:
 	case EDOOFUS:
 		errmsg = "device stuck";
 retry:		/* Just reset and retry. Can we do more ? */
 		sysace_reset(ace);
 		diskerr(bp, "ace", errmsg, LOG_PRINTF,
 		    ace->sc_bio.blkdone, ace->sc_dk.dk_label);
 		if (ace->retries < ACEIORETRIES)
 			printf(", retrying");
 		printf("\n");
 		if (do_perror)
 			aceperror(ace);
 		if (ace->retries < ACEIORETRIES) {
 			ace->retries++;
 			callout_reset(&ace->sc_restart_ch, RECOVERYTIME,
 			    acerestart, ace);
 			return;
+		}
 		bp->b_error = EIO;
 		break;
 	case 0:
 		if ((ace->sc_bio.flags & ATA_CORR) || ace->retries > 0)
 			printf("%s: soft error (corrected)\n",
 			    device_xname(ace->sc_dev));
 		break;
 	case ENODEV:
 	case E2BIG:
 		bp->b_error = EIO;
 		break;
+	}
 	disk_unbusy(&ace->sc_dk, (bp->b_bcount - bp->b_resid),
 	    (bp->b_flags & B_READ));
 	rnd_add_uint32(&ace->rnd_source, bp->b_blkno);
 	biodone(bp);
 	ace->openings++;
 	acestart(ace);
+}
 void
 acerestart(void *v)
+{
 	struct ace_softc *ace = v;
 	struct buf *bp = ace->sc_bp;
 	int s;
 	DEBUG_PRINT(("acerestart %s\n",
 	    device_xname(ace->sc_dev)), DEBUG_XFERS);
 	s = splbio();
 	__acestart(v, bp);
 	splx(s);
+}
 int
 aceread(dev_t dev, struct uio *uio, int flags)
+{
 	int r;
 	DEBUG_PRINT(("aceread\n"), DEBUG_XFERS);
 	r = physio(acestrategy, NULL, dev, B_READ, minphys, uio);
 	DEBUG_PRINT(("aceread -> x%x resid=%x\n",r,uio->uio_resid),DEBUG_XFERS);
 	return r;
+}
 int
 acewrite(dev_t dev, struct uio *uio, int flags)
+{
 	DEBUG_PRINT(("acewrite\n"), DEBUG_XFERS);
 	return physio(acestrategy, NULL, dev, B_WRITE, minphys, uio);
+}
 int
 aceopen(dev_t dev, int flag, int fmt, struct lwp *l)
+{
 	struct ace_softc *ace;
 	int part, error;
 	DEBUG_PRINT(("aceopen\n"), DEBUG_FUNCS);
 	ace = device_lookup_private(&ace_cd, ACEUNIT(dev));
 	if (ace == NULL)
 		return ENXIO;
 	if (! device_is_active(ace->sc_dev))
 		return ENODEV;
 	part = ACEPART(dev);
 	mutex_enter(&ace->sc_dk.dk_openlock);
 	/*
 	 * If there are wedges, and this is not RAW_PART, then we
 	 * need to fail.
 	 */
 	if (ace->sc_dk.dk_nwedges != 0 && part != RAW_PART) {
 		error = EBUSY;
 		goto bad;
+	}
 	if (ace->sc_dk.dk_openmask != 0) {
 		/*
 		 * If any partition is open, but the disk has been invalidated,
 		 * disallow further opens.
 		 */
 		if ((ace->sc_flags & ACEF_LOADED) == 0) {
 			error = EIO;
 			goto bad;
+		}
 	} else {
 		if ((ace->sc_flags & ACEF_LOADED) == 0) {
 			ace->sc_flags |= ACEF_LOADED;
 			/* Load the physical device parameters. */
 			if (ace->sc_capacity == 0) {
 				error = sysace_identify(ace);
 				if (error)
 					goto bad;
+			}
 			/* Load the partition info if not already loaded. */
 			acegetdisklabel(ace);
+		}
+	}
 	/* Check that the partition exists. */
 	if (part != RAW_PART &&
 	    (part >= ace->sc_dk.dk_label->d_npartitions ||
 	     ace->sc_dk.dk_label->d_partitions[part].p_fstype == FS_UNUSED)) {
 		error = ENXIO;
 		goto bad;
+	}
 	/* Insure only one open at a time. */
 	switch (fmt) {
 	case S_IFCHR:
 		ace->sc_dk.dk_copenmask |= (1 << part);
 		break;
 	case S_IFBLK:
 		ace->sc_dk.dk_bopenmask |= (1 << part);
 		break;
+	}
 	ace->sc_dk.dk_openmask =
 	    ace->sc_dk.dk_copenmask | ace->sc_dk.dk_bopenmask;
 	mutex_exit(&ace->sc_dk.dk_openlock);
 	return 0;
  bad:
 	mutex_exit(&ace->sc_dk.dk_openlock);
 	return error;
+}
 int
 aceclose(dev_t dev, int flag, int fmt, struct lwp *l)
+{
 	struct ace_softc *ace = device_lookup_private(&ace_cd, ACEUNIT(dev));
 	int part = ACEPART(dev);
 	DEBUG_PRINT(("aceclose\n"), DEBUG_FUNCS);
 	if (ace == NULL)
 		return ENXIO;
 	mutex_enter(&ace->sc_dk.dk_openlock);
 	switch (fmt) {
 	case S_IFCHR:
 		ace->sc_dk.dk_copenmask &= ~(1 << part);
 		break;
 	case S_IFBLK:
 		ace->sc_dk.dk_bopenmask &= ~(1 << part);
 		break;
+	}
 	ace->sc_dk.dk_openmask =
 	    ace->sc_dk.dk_copenmask | ace->sc_dk.dk_bopenmask;
 	if (ace->sc_dk.dk_openmask == 0) {
 		if (!(ace->sc_flags & ACEF_KLABEL))
 			ace->sc_flags &= ~ACEF_LOADED;
+	}
 	mutex_exit(&ace->sc_dk.dk_openlock);
 	return 0;
+}
 void
 acegetdefaultlabel(struct ace_softc *ace, struct disklabel *lp)
+{
 	DEBUG_PRINT(("acegetdefaultlabel\n"), DEBUG_FUNCS);
 	memset(lp, 0, sizeof(struct disklabel));
 	lp->d_secsize = DEV_BSIZE;
 	lp->d_ntracks = ace->sc_params.CurrentNumberOfHeads;
 	lp->d_nsectors = ace->sc_params.CurrentSectorsPerTrack;
 	lp->d_ncylinders = ace->sc_capacity /
 	    (ace->sc_params.CurrentNumberOfHeads *
 	     ace->sc_params.CurrentSectorsPerTrack);
 	lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
 	lp->d_type = DKTYPE_ST506; /* ?!? */
 	strncpy(lp->d_typename, ace->sc_params.ModelNumber, 16);
 	strncpy(lp->d_packname, "fictitious", 16);
 	if (ace->sc_capacity > UINT32_MAX)
 		lp->d_secperunit = UINT32_MAX;
 	else
 		lp->d_secperunit = ace->sc_capacity;
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
 	lp->d_flags = 0;
 	lp->d_partitions[RAW_PART].p_offset = 0;
 	lp->d_partitions[RAW_PART].p_size =
 	    lp->d_secperunit * (lp->d_secsize / DEV_BSIZE);
 	lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
 	lp->d_npartitions = RAW_PART + 1;
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
 	lp->d_checksum = dkcksum(lp);
+}
 /*
  * Fabricate a default disk label, and try to read the correct one.
  */
 void
 acegetdisklabel(struct ace_softc *ace)
+{
 	struct disklabel *lp = ace->sc_dk.dk_label;
 	const char *errstring;
 	DEBUG_PRINT(("acegetdisklabel\n"), DEBUG_FUNCS);
 	memset(ace->sc_dk.dk_cpulabel, 0, sizeof(struct cpu_disklabel));
 	acegetdefaultlabel(ace, lp);
 #ifdef HAS_BAD144_HANDLING
 	ace->sc_bio.badsect[0] = -1;
 #endif
 	errstring = readdisklabel(MAKEACEDEV(0, device_unit(ace->sc_dev),
 				  RAW_PART), acestrategy, lp,
 				  ace->sc_dk.dk_cpulabel);
 	if (errstring) {
 		printf("%s: %s\n", device_xname(ace->sc_dev), errstring);
 		return;
+	}
 #if DEBUG
 	if (ACE_DEBUG(DEBUG_WRITES)) {
 		int i, n = ace->sc_dk.dk_label->d_npartitions;
 		printf("%s: %d parts\n", device_xname(ace->sc_dev), n);
 		for (i = 0; i < n; i++) {
 			printf("\t[%d]: t=%x s=%d o=%d\n", i,
 			    ace->sc_dk.dk_label->d_partitions[i].p_fstype,
 			    ace->sc_dk.dk_label->d_partitions[i].p_size,
 			    ace->sc_dk.dk_label->d_partitions[i].p_offset);
+		}
+	}
 #endif
 #ifdef HAS_BAD144_HANDLING
 	if ((lp->d_flags & D_BADSECT) != 0)
 		bad144intern(ace);
 #endif
+}
 void
 aceperror(const struct ace_softc *ace)
+{
 	const char *devname = device_xname(ace->sc_dev);
 	uint32_t Status = ace->sc_bio.r_error;
 	printf("%s: (", devname);
 	if (Status == 0)
 		printf("error not notified");
 	else
 		printf("status=x%x", Status);
 	printf(")\n");
+}
 int
 aceioctl(dev_t dev, u_long xfer, void *addr, int flag, struct lwp *l)
+{
 	struct ace_softc *ace = device_lookup_private(&ace_cd, ACEUNIT(dev));
 	int error = 0, s;
 	DEBUG_PRINT(("aceioctl\n"), DEBUG_FUNCS);
 	if ((ace->sc_flags & ACEF_LOADED) == 0)
 		return EIO;
 	error = disk_ioctl(&ace->sc_dk, dev, xfer, addr, flag, l);
 	if (error != EPASSTHROUGH)
 		return error;
 	switch (xfer) {
 #ifdef HAS_BAD144_HANDLING
 	case DIOCSBAD:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		ace->sc_dk.dk_cpulabel->bad = *(struct dkbad *)addr;
 		ace->sc_dk.dk_label->d_flags |= D_BADSECT;
 		bad144intern(ace);
 		return 0;
 #endif
 	case DIOCWDINFO:
 	case DIOCSDINFO:
+	{
 		struct disklabel *lp;
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		lp = (struct disklabel *)addr;
 		mutex_enter(&ace->sc_dk.dk_openlock);
 		ace->sc_flags |= ACEF_LABELLING;
 		error = setdisklabel(ace->sc_dk.dk_label,
 		    lp, /*ace->sc_dk.dk_openmask : */0,
 		    ace->sc_dk.dk_cpulabel);
 		if (error == 0) {
 			if (xfer == DIOCWDINFO)
 				error = writedisklabel(ACELABELDEV(dev),
 				    acestrategy, ace->sc_dk.dk_label,
 				    ace->sc_dk.dk_cpulabel);
+		}
 		ace->sc_flags &= ~ACEF_LABELLING;
 		mutex_exit(&ace->sc_dk.dk_openlock);
 		return error;
+	}
 	case DIOCKLABEL:
 		if (*(int *)addr)
 			ace->sc_flags |= ACEF_KLABEL;
 		else
 			ace->sc_flags &= ~ACEF_KLABEL;
 		return 0;
 	case DIOCWLABEL:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		if (*(int *)addr)
 			ace->sc_flags |= ACEF_WLABEL;
 		else
 			ace->sc_flags &= ~ACEF_WLABEL;
 		return 0;
 	case DIOCGDEFLABEL:
 		acegetdefaultlabel(ace, (struct disklabel *)addr);
 		return 0;
 	case DIOCCACHESYNC:
 		return 0;
 	case DIOCGSTRATEGY:
+	    {
 		struct disk_strategy *dks = (void *)addr;
 		s = splbio();
 		strlcpy(dks->dks_name, bufq_getstrategyname(ace->sc_q),
 		    sizeof(dks->dks_name));
 		splx(s);
 		dks->dks_paramlen = 0;
 		return 0;
+	    }
 	case DIOCSSTRATEGY:
+	    {
 		struct disk_strategy *dks = (void *)addr;
 		struct bufq_state *new;
 		struct bufq_state *old;
 		if ((flag & FWRITE) == 0) {
 			return EBADF;
+		}
 		if (dks->dks_param != NULL) {
 			return EINVAL;
+		}
 		dks->dks_name[sizeof(dks->dks_name) - 1] = 0; /* ensure term */
 		error = bufq_alloc(&new, dks->dks_name,
 		    BUFQ_EXACT|BUFQ_SORT_RAWBLOCK);
 		if (error) {
 			return error;
+		}
 		s = splbio();
 		old = ace->sc_q;
 		bufq_move(new, old);
 		ace->sc_q = new;
 		splx(s);
 		bufq_free(old);
 		return 0;
+	    }
 #ifdef USE_ACE_FOR_RECONFIG
 	/*
 	 * Ok, how do I get this standardized
 	 * [nothing to do with disks either]
 	 */
 #define DIOC_FPGA_RECONFIGURE _IOW('d',166, struct ioctl_pt)
 	case DIOC_FPGA_RECONFIGURE:
+	    {
 		/*
 		 * BUGBUG This is totally wrong, we need to fault in
 		 * all data in advance.
 		 * Otherwise we get back here with the sysace in a bad state
 		 * (its NOT reentrant!)
 		 */
 		struct ioctl_pt *pt = (struct ioctl_pt *)addr;
 		return sysace_send_config(ace,(uint32_t*)pt->data,pt->com);
+	    }
 #endif /* USE_ACE_FOR_RECONFIG */
 	default:
 		/*
 		 * NB: we get a DIOCGWEDGEINFO, but nobody else handles it
 		 * either
 		 */
 		DEBUG_PRINT(("aceioctl: unsup x%lx\n", xfer), DEBUG_FUNCS);
 		return ENOTTY;
+	}
+}
 int
 acesize(dev_t dev)
+{
 	struct ace_softc *ace;
 	int part, omask;
 	int size;
 	DEBUG_PRINT(("acesize\n"), DEBUG_FUNCS);
 	ace = device_lookup_private(&ace_cd, ACEUNIT(dev));
 	if (ace == NULL)
 		return -1;
 	part = ACEPART(dev);
 	omask = ace->sc_dk.dk_openmask & (1 << part);
 	if (omask == 0 && aceopen(dev, 0, S_IFBLK, NULL) != 0)
 		return -1;
 	if (ace->sc_dk.dk_label->d_partitions[part].p_fstype != FS_SWAP)
 		size = -1;
 	else
 		size = ace->sc_dk.dk_label->d_partitions[part].p_size *
 		    (ace->sc_dk.dk_label->d_secsize / DEV_BSIZE);
 	if (omask == 0 && aceclose(dev, 0, S_IFBLK, NULL) != 0)
 		return -1;
 	return size;
+}
 /* #define ACE_DUMP_NOT_TRUSTED if you just want to watch */
 #define ACE_DUMP_NOT_TRUSTED
 static int acedoingadump = 0;
 /*
  * Dump core after a system crash.
  */
 int
 acedump(dev_t dev, daddr_t blkno, void *va, size_t size)
+{
 	struct ace_softc *ace;	/* disk unit to do the I/O */
 	struct disklabel *lp;   /* disk's disklabel */
 	int part, err;
 	int nblks;	/* total number of sectors left to write */
 	/* Check if recursive dump; if so, punt. */
 	if (acedoingadump)
 		return EFAULT;
 	acedoingadump = 1;
 	ace = device_lookup_private(&ace_cd, ACEUNIT(dev));
 	if (ace == NULL)
 		return ENXIO;
 	part = ACEPART(dev);
 	/* Convert to disk sectors.  Request must be a multiple of size. */
 	lp = ace->sc_dk.dk_label;
 	if ((size % lp->d_secsize) != 0)
 		return EFAULT;
 	nblks = size / lp->d_secsize;
 	blkno = blkno / (lp->d_secsize / DEV_BSIZE);
 	/* Check transfer bounds against partition size. */
 	if ((blkno < 0) || ((blkno + nblks) > lp->d_partitions[part].p_size))
 		return EINVAL;
 	/* Offset block number to start of partition. */
 	blkno += lp->d_partitions[part].p_offset;
 	ace->sc_bp = NULL;
 	ace->sc_bio.blkno = blkno;
 	ace->sc_bio.flags = ATA_POLL;
 	ace->sc_bio.nbytes = nblks * lp->d_secsize;
 	ace->sc_bio.databuf = va;
 #ifndef ACE_DUMP_NOT_TRUSTED
 	ace->active_xfer = bp;
 	wakeup(&ace->ch_thread);
 	switch(ace->sc_bio.error) {
 	case ETIMEDOUT:
 		printf("acedump: device timed out");
 		err = EIO;
 		break;
 	case 0:
 		err = 0;
 		break;
 	default:
 		panic("acedump: unknown error type");
+	}
 	if (err != 0) {
 		printf("\n");
 		return err;
+	}
 #else	/* ACE_DUMP_NOT_TRUSTED */
 	/* Let's just talk about this first... */
 	device_printf(ace->sc_dev, ": dump addr 0x%p, size %zu blkno %llx\n",
 	    va, size, blkno);
 	DELAY(500 * 1000);	/* half a second */
 	err = 0;
 	__USE(err);
 #endif
 	acedoingadump = 0;
 	return 0;
+}
 #ifdef HAS_BAD144_HANDLING
 /*
  * Internalize the bad sector table.
  */
 void
 bad144intern(struct ace_softc *ace)
+{
 	struct dkbad *bt = &ace->sc_dk.dk_cpulabel->bad;
 	struct disklabel *lp = ace->sc_dk.dk_label;
 	int i = 0;
 	DEBUG_PRINT(("bad144intern\n"), DEBUG_XFERS);
 	for (; i < NBT_BAD; i++) {
 		if (bt->bt_bad[i].bt_cyl == 0xffff)
 			break;
 		ace->sc_bio.badsect[i] =
 		    bt->bt_bad[i].bt_cyl * lp->d_secpercyl +
 		    (bt->bt_bad[i].bt_trksec >> 8) * lp->d_nsectors +
 		    (bt->bt_bad[i].bt_trksec & 0xff);
+	}
 	for (; i < NBT_BAD+1; i++)
 		ace->sc_bio.badsect[i] = -1;
+}
 #endif
 static void
 ace_set_geometry(struct ace_softc *ace)
+{
 	struct disk_geom *dg = &ace->sc_dk.dk_geom;
 	memset(dg, 0, sizeof(*dg));
 	dg->dg_secperunit = ace->sc_capacity;
 	dg->dg_secsize = DEV_BSIZE /* XXX 512? */;
 	dg->dg_nsectors = ace->sc_params.CurrentSectorsPerTrack;
 	dg->dg_ntracks = ace->sc_params.CurrentNumberOfHeads;
 	disk_set_info(ace->sc_dev, &ace->sc_dk, ST506);
+}

 @@ -1,2287 +1,2282 @@
-/*	$NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $	*/
+/*	$NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code was written by Alessandro Forin and Neil Pittman
  * at Microsoft Research and contributed to The NetBSD Foundation
  * by Microsoft Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20 2018/03/04 21:41:48 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $");
 /* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
  * Extended to include the Intel JS28F256P30T95.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/syslog.h>
 #include <sys/vnode.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
 #include <sys/queue.h>
 #include <sys/rndsource.h>
 #include "locators.h"
 #include <prop/proplib.h>
 #include <emips/ebus/ebusvar.h>
 #include <emips/emips/machdep.h>
 #include <machine/emipsreg.h>
 /* Internal config switches
  */
 #define USE_BUFFERED_WRITES 0    /* Faster, but might not work in some (older) cases */
 #define Verbose 0
 /* Debug tools
  */
 #define DEBUG_INTR   0x01
 #define DEBUG_XFERS  0x02
 #define DEBUG_STATUS 0x04
 #define DEBUG_FUNCS  0x08
 #define DEBUG_PROBE  0x10
 #define DEBUG_WRITES 0x20
 #define DEBUG_READS  0x40
 #define DEBUG_ERRORS 0x80
 #ifdef DEBUG
 int eflash_debug = DEBUG_ERRORS;
 #define EFLASH_DEBUG(x) (eflash_debug & (x))
 #define DBGME(_lev_,_x_) if ((_lev_) & eflash_debug) _x_
 #else
 #define EFLASH_DEBUG(x) (0)
 #define DBGME(_lev_,_x_)
 #endif
 #define DEBUG_PRINT(_args_,_lev_) DBGME(_lev_,printf _args_)
 /* Product ID codes
  */
 #define MANUF_INTEL  0x89
 #define DEVICE_320   0x16
 #define DEVICE_640   0x17
 #define DEVICE_128   0x18
 #define DEVICE_256   0x19
 /* Table of chips we understand.
  */
 #define nDELTAS 3
 struct flash_type {
     struct {
         uint32_t nSectors;
         uint32_t nKB;
     } ft_deltas[nDELTAS];
     uint8_t ft_manuf_code;
     uint8_t ft_device_code;
     uint16_t ft_total_sectors;
     const char *ft_name;
 };
 static const struct flash_type sector_maps[] = {
+    {
      {{32,128},{0,0},},
      MANUF_INTEL, DEVICE_320, 32,   /* a J3 part */
      "StrataFlash 28F320"
     },
+    {
      {{64,128},{0,0},},
      MANUF_INTEL, DEVICE_640, 64,   /* a J3 part */
      "StrataFlash 28F640"
     },
+    {
      {{128,128},{0,0},},
      MANUF_INTEL, DEVICE_128, 128,   /* a J3 part */
      "StrataFlash 28F128"
     },
+    {
      {{255,128},{4,32},{0,0}},
      MANUF_INTEL, DEVICE_256, 259,  /* a P30 part */
 	 "StrataFlash 28F256"
+    }
 };
 #define nMAPS ((sizeof sector_maps) / (sizeof sector_maps[0]))
 /* Instead of dragging in atavar.h.. */
 struct eflash_bio {
 	volatile int flags;/* cmd flags */
 #define	ATA_POLL	0x0002	/* poll for completion */
 #define	ATA_SINGLE	0x0008	/* transfer must be done in singlesector mode */
 #define	ATA_READ	0x0020	/* transfer is a read (otherwise a write) */
 #define	ATA_CORR	0x0040	/* transfer had a corrected error */
 	daddr_t		blkno;	/* block addr */
 	daddr_t		blkdone;/* number of blks transferred */
 	size_t		nblks;	/* number of blocks currently transferring */
 	size_t	    nbytes;	/* number of bytes currently transferring */
 	char		*databuf;/* data buffer address */
 	volatile int	error;
 	u_int32_t	r_error;/* copy of status register */
 #ifdef HAS_BAD144_HANDLING
 	daddr_t		badsect[127];/* 126 plus trailing -1 marker */
 #endif
 };
 /* End of atavar.h*/
 /* chip-specific functions
  */
 struct flash_ops;
 /*
  * Device softc
  */
 struct eflash_softc {
 	device_t sc_dev;
 	/* General disk infos */
 	struct disk sc_dk;
 	struct bufq_state *sc_q;
 	struct callout sc_restart_ch;
 	/* IDE disk soft states */
 	struct buf *sc_bp; /* buf being transfered */
 	struct buf *active_xfer; /* buf handoff to thread  */
 	struct eflash_bio sc_bio; /* current transfer */
     struct proc *ch_thread;
     int ch_flags;
 #define ATACH_SHUTDOWN 0x02        /* thread is shutting down */
 #define ATACH_IRQ_WAIT 0x10        /* thread is waiting for irq */
 #define ATACH_DISABLED 0x80        /* channel is disabled */
 #define ATACH_TH_RUN   0x100       /* the kernel thread is working */
 #define ATACH_TH_RESET 0x200       /* someone ask the thread to reset */
 	int openings;
 	int sc_flags;
 #define	EFLASHF_WLABEL	0x004 /* label is writable */
 #define	EFLASHF_LABELLING	0x008 /* writing label */
 #define EFLASHF_LOADED	0x010 /* parameters loaded */
 #define EFLASHF_WAIT	0x020 /* waiting for resources */
 #define EFLASHF_KLABEL	0x080 /* retain label after 'full' close */
 	int retries; /* number of xfer retry */
 	krndsource_t	rnd_source;
     /* flash-specific state */
 	struct _Flash *sc_dp;
     uint32_t sc_size;
     uint32_t sc_capacity;
     paddr_t  sc_base;
     volatile uint8_t *sc_page0;
     /* current read-write sector mapping */
     /*volatile*/ uint8_t *sc_sector;
     uint32_t sc_sector_size;
     uint32_t sc_sector_offset;
 #define NOSECTOR ((uint32_t)(~0))
     int sc_erased;
     /* device-specificity */
     uint32_t sc_buffersize;
     vsize_t sc_max_secsize;
     unsigned int sc_chips;
     const struct flash_ops *sc_ops;
     struct flash_type sc_type;
 };
 static int	eflash_ebus_match (device_t, cfdata_t, void *);
 static void	eflash_ebus_attach (device_t, device_t, void *);
 CFATTACH_DECL_NEW(flash_ebus, sizeof (struct eflash_softc),
     eflash_ebus_match, eflash_ebus_attach, NULL, NULL);
 /* implementation decls */
 static int flash_identify(struct eflash_softc*);
 static int KBinSector(struct flash_type * SecMap, unsigned int SecNo);
 static uint32_t SectorStart(struct flash_type * SecMap, int SecNo);
 static unsigned int SectorNumber(struct flash_type * SecMap, uint32_t Offset);
 static void eflash_thread(void *arg);
 static int eflash_read_at (struct eflash_softc *sc, daddr_t start_sector, char *buffer,
                            size_t nblocks, size_t * pSizeRead);
 static int eflash_write_at(struct eflash_softc *sc, daddr_t start_sector, char *buffer,
                            size_t nblocks, size_t * pSizeWritten);
 /* Config functions
  */
 static int
 eflash_ebus_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct ebus_attach_args *ia = aux;
 	struct _Flash *f = (struct _Flash *)ia->ia_vaddr;
 	if (strcmp("flash", ia->ia_name) != 0)
 		return (0);
 	if ((f == NULL) ||
 	    ((f->BaseAddressAndTag & FLASHBT_TAG) != PMTTAG_FLASH))
 		return (0);
 	return (1);
+}
 static void
 eflash_ebus_attach(device_t parent, device_t self, void *aux)
+{
 	struct ebus_attach_args *ia =aux;
 	struct eflash_softc *sc = device_private(self);
     uint32_t base, ctrl;
     int error;
     /* Plan.
      * - mips_map_physmem() (with uncached) first page
      * - keep it around since we need status ops
      * - find what type it is.
      * - then mips_map_physmem() each sector as needed.
      */
 	sc->sc_dev = self;
 	sc->sc_dp = (struct _Flash*)ia->ia_vaddr;
     base = sc->sc_dp->BaseAddressAndTag & FLASHBT_BASE;
     ctrl = sc->sc_dp->Control;
     sc->sc_size = ctrl & FLASHST_SIZE;
     sc->sc_capacity = sc->sc_size / DEV_BSIZE;
     sc->sc_base = base;
     /* The chip is 16bit, so if we get 32bit there are two */
     sc->sc_chips = (ctrl & FLASHST_BUS_32) ? 2 : 1;
     /* Map the first page to see what chip we got */
     sc->sc_page0 = (volatile uint8_t *) mips_map_physmem(base, PAGE_SIZE);
     if (flash_identify(sc)) {
         printf(" base %x: %dMB flash memory (%d x %s)\n", base, sc->sc_size >> 20,
                sc->sc_chips, sc->sc_type.ft_name);
     } else {
         /* BUGBUG If we dont identify it stop the driver! */
         printf(": unknown manufacturer id %x, device id %x\n",
                sc->sc_type.ft_manuf_code, sc->sc_type.ft_device_code);
+    }
     config_pending_incr(self);
 	error = kthread_create(PRI_NONE, 0, NULL,
 	    eflash_thread, sc, NULL, "%s", device_xname(sc->sc_dev));
 	if (error)
 		aprint_error_dev(sc->sc_dev,
 		    "unable to create kernel thread: error %d\n", error);
+}
 /* Implementation functions
  */
 /* Returns the size in KBytes of a given sector,
  * or -1 for bad arguments.
  */
 static int KBinSector(struct flash_type * SecMap, unsigned int SecNo)
+{
     int i;
     for (i = 0; i < nDELTAS; i++) {
         if (SecNo < SecMap->ft_deltas[i].nSectors)
             return SecMap->ft_deltas[i].nKB;
         SecNo -= SecMap->ft_deltas[i].nSectors;
+    }
     return -1;
+}
 #define SectorSize(_map_,_sector_) (1024 * KBinSector(_map_,_sector_))
 /* Whats the starting offset of sector N
  */
 static uint32_t SectorStart(struct flash_type * SecMap, int SecNo)
+{
     int i;
     uint32_t Offset = 0;
     for (i = 0; i < nDELTAS; i++) {
         if ((unsigned int)SecNo < SecMap->ft_deltas[i].nSectors)
             return 1024 * (Offset + (SecMap->ft_deltas[i].nKB * SecNo));
         SecNo -= SecMap->ft_deltas[i].nSectors;
         Offset += SecMap->ft_deltas[i].nSectors * SecMap->ft_deltas[i].nKB;
+    }
     return ~0;
+}
 /* What sector number corresponds to a given offset
  */
 static unsigned int SectorNumber(struct flash_type * SecMap, uint32_t Offset)
+{
     unsigned int i;
     unsigned int SecNo = 0;
     Offset /= 1024;
     for (i = 0; i < nDELTAS; i++) {
         if (Offset < (unsigned int)
             ((SecMap->ft_deltas[i].nSectors * SecMap->ft_deltas[i].nKB)))
             return SecNo + (Offset / SecMap->ft_deltas[i].nKB);
         SecNo += SecMap->ft_deltas[i].nSectors;
         Offset -= SecMap->ft_deltas[i].nSectors * SecMap->ft_deltas[i].nKB;
+    }
     return ~0;
+}
 /*
  * Semi-generic operations
  */
 struct flash_ops {
     void (*write_uint8)    (struct eflash_softc *sc, volatile void *Offset, uint8_t Value);
     void (*read_uint8)     (struct eflash_softc *sc, volatile void *Offset, uint8_t *Value);
     void (*write_uint16)   (struct eflash_softc *sc, volatile void *Offset, uint16_t Value);
     void (*read_uint16)    (struct eflash_softc *sc, volatile void *Offset, uint16_t *Value);
     void (*write_uint32)   (struct eflash_softc *sc, volatile void *Offset, uint32_t Value);
     void (*read_uint32)    (struct eflash_softc *sc, volatile void *Offset, uint32_t *Value);
     int  (*program_word)   (struct eflash_softc *sc, volatile void *Offset, uint16_t *pValues,
                             int  Verify, int *nWritten);
     int  (*program_buffer) (struct eflash_softc *sc, volatile void *Offset, uint16_t *pValues,
                             int  Verify, int *nWritten);
 };
 /*
  * Hardware access proper, single-chip
  */
 static void single_write_uint8  (struct eflash_softc *sc,volatile void *Offset,uint8_t Value)
+{
     volatile uint8_t * Where = Offset;
     *Where = Value;
+}
 static void single_read_uint8   (struct eflash_softc *sc,volatile void *Offset,uint8_t *Value)
+{
     volatile uint8_t * Where = Offset;
     *Value = *Where;
+}
 static void single_write_uint16 (struct eflash_softc *sc,volatile void *Offset,uint16_t Value)
+{
     volatile uint16_t * Where = Offset;
     *Where = Value;
+}
 static void single_read_uint16  (struct eflash_softc *sc,volatile void *Offset,uint16_t *Value)
+{
     volatile uint16_t * Where = Offset;
     *Value = *Where;
+}
 /* This one should not be used, probably */
 static void single_write_uint32 (struct eflash_softc *sc,volatile void *Offset,uint32_t Value)
+{
 #if 0
     /* The chip cannot take back-to-back writes */
     volatile uint32_t * Where = Offset;
     *Where = Value;
 #else
     volatile uint8_t * Where = Offset;
     uint16_t v0, v1;
     /* Unfortunately, this is bytesex dependent */
 #if (BYTE_ORDER == BIG_ENDIAN)
     v1 = (uint16_t) Value;
     v0 = (uint16_t) (Value >> 16);
 #else
     v0 = (uint16_t) Value;
     v1 = (uint16_t) (Value >> 16);
 #endif
     single_write_uint16(sc,Where,v0);
     single_write_uint16(sc,Where+2,v1);
 #endif
+}
 static void single_read_uint32  (struct eflash_softc *sc,volatile void *Offset,uint32_t *Value)
+{
     /* back-to-back reads must be ok */
     volatile uint32_t * Where = Offset;
     *Value = *Where;
+}
 /*
  * Hardware access proper, paired-chips
  * NB: This set of ops assumes two chips in parallel on a 32bit bus,
  *     each operation is repeated in parallel to both chips
  */
 static void twin_write_uint8  (struct eflash_softc *sc,volatile void *Offset,uint8_t Value)
+{
     volatile uint32_t * Where = Offset;
     uint32_t v = Value | ((uint32_t)Value << 16);
     v = le32toh(v);
     *Where = v;
+}
 static void twin_read_uint8   (struct eflash_softc *sc,volatile void *Offset,uint8_t *Value)
+{
     volatile uint32_t * Where = Offset;
     uint32_t v;
     v = *Where;
     v = le32toh(v);
     *Value = (uint8_t) v;
+}
 /* This one should *not* be used, error-prone */
 static void twin_write_uint16 (struct eflash_softc *sc,volatile void *Offset,uint16_t Value)
+{
     volatile uint16_t * Where = Offset;
     *Where = Value;
+}
 static void twin_read_uint16  (struct eflash_softc *sc,volatile void *Offset,uint16_t *Value)
+{
     volatile uint16_t * Where = Offset;
     *Value = *Where;
+}
 static void twin_write_uint32 (struct eflash_softc *sc,volatile void *Offset,uint32_t Value)
+{
     volatile uint32_t * Where = Offset;
     Value = le32toh(Value);
     *Where = Value;
+}
 static void twin_read_uint32  (struct eflash_softc *sc,volatile void *Offset,uint32_t *Value)
+{
     volatile uint32_t * Where = Offset;
     uint32_t v;
     v = *Where;
     v = le32toh(v);
     *Value = v;
+}
 /*
  * Command and status definitions
  */
 /* Defines for the STATUS register
  */
 #define ST_reserved          0x01
 #define ST_BLOCK_LOCKED      0x02
 #define ST_PROGRAM_SUSPENDED 0x04
 #define ST_LOW_VOLTAGE       0x08
 #define ST_LOCK_BIT_ERROR    0x10
 #define ST_ERASE_ERROR       0x20
 #define ST_ERASE_SUSPENDED   0x40
 #define ST_READY             0x80
 #define ST_ERASE_MASK        0xee  /* bits to check after erase command */
 #define ST_MASK              0xfe  /* ignore reserved */
 /* Command set (what we use of it)
  */
 #define CMD_CONFIRM       0xd0
 #define CMD_READ_ARRAY    0xff
 #define CMD_READ_ID       0x90
 #define CMD_READ_STATUS   0x70
 #define CMD_CLEAR_STATUS  0x50
 #define CMD_WRITE_WORD    0x40
 #define CMD_WRITE_BUFFER  0xe8
 #define CMD_ERASE_SETUP   0x20
 #define CMD_ERASE_CONFIRM CMD_CONFIRM
 #define CMD_SET_PREFIX    0x60  /* set read config, lock bits */
 #define CMD_LOCK          0x01
 #define CMD_UNLOCK        CMD_CONFIRM
 /* What we dont use of it
  */
 #define CMD_READ_QUERY    0x98
 # define BUFFER_BYTES          32
 #define CMD_ERASE_SUSPEND 0xb0
 #define CMD_ERASE_RESUME  CMD_CONFIRM
 #define CMD_CONFIGURATION 0xb8
 #define CMD_PROTECT       0xc0
 /* Enter the Product ID mode (Read Identifier Codes)
  */
 static void ProductIdEnter(struct eflash_softc *sc)
+{
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_READ_ID);
+}
 /* Exit the Product ID mode (enter Read Array mode)
  */
 static void ProductIdExit(struct eflash_softc *sc)
+{
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_READ_ARRAY);
+}
 /* Read the status register
  */
 static uint8_t ReadStatusRegister(struct eflash_softc *sc)
+{
     uint8_t Status;
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_READ_STATUS);
     sc->sc_ops->read_uint8(sc,sc->sc_page0,&Status);
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_READ_ARRAY);
     return Status;
+}
 /* Clear error bits in status
  */
 static void ClearStatusRegister(struct eflash_softc *sc)
+{
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_CLEAR_STATUS);
+}
 #if DEBUG
 /* Decode status bits
  */
 typedef const char *string;
 static void PrintStatus(uint8_t Status)
+{
     /* BUGBUG there's a %b format I think? */
     string BitNames[8] = {
         "reserved", "BLOCK_LOCKED",
         "PROGRAM_SUSPENDED", "LOW_VOLTAGE",
         "LOCK_BIT_ERROR", "ERASE_ERROR",
         "ERASE_SUSPENDED", "READY"
     };
     int i;
     int  OneSet = FALSE;
     printf("[status %x =",Status);
     for (i = 0; i < 8; i++) {
         if (Status & (1<<i)) {
             printf("%c%s",
                      (OneSet) ? '|' : ' ',
                      BitNames[i]);
             OneSet = TRUE;
+        }
+    }
     printf("]\n");
+}
 #else
 #define PrintStatus(x)
 #endif
 /*
  * The device can lock up under certain conditions.
  * There is no software workaround [must toggle RP# to GND]
  * Check if it seems that we are in that state.
  */
 static int  IsIrresponsive(struct eflash_softc *sc)
+{
     uint8_t Status = ReadStatusRegister(sc);
     if (Status & ST_READY)
         return FALSE;
     if ((Status & ST_MASK) ==
         (ST_LOCK_BIT_ERROR|ST_ERASE_SUSPENDED|ST_ERASE_ERROR)) {
         /* yes, looks that way */
         return TRUE;
+    }
     /* Something is indeed amiss, but we dont really know for sure */
     PrintStatus(ReadStatusRegister(sc));
     ClearStatusRegister(sc);
     PrintStatus(ReadStatusRegister(sc));
     if ((Status & ST_MASK) ==
         (ST_LOCK_BIT_ERROR|ST_ERASE_SUSPENDED|ST_ERASE_ERROR)) {
         /* yes, looks that way */
         return TRUE;
+    }
     return FALSE;
+}
 /* Write one 16bit word
  */
 static int
 single_program_word(struct eflash_softc *sc, volatile void *Offset, uint16_t *Values,
                   int  Verify, int *nWritten)
+{
     uint8_t Status;
     uint16_t i, Data16, Value;
     *nWritten = 0;
     Value = Values[0];
     if (Verify) {
         sc->sc_ops->read_uint16(sc,Offset,&Data16);
 #ifdef Verbose
         if (Verbose) {
             printf("Location %p was x%x\n",
                    Offset, Data16);
+        }
 #endif
         if (Data16 != 0xffff)
             printf("Offset %p not ERASED, wont take.\n",Offset);
+    }
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_WRITE_WORD);
     sc->sc_ops->write_uint16(sc,Offset,Value);
     /* Wait until the operation is completed
      * Specs say it takes between 210 and 630 us
      * Errata says 360 TYP and Max=TBD (sic)
      */
     DELAY(800);
     for (i = 0; i < 10; i++) {
         sc->sc_ops->read_uint8(sc,Offset,&Status);
         if ((Status & ST_READY)) break;
         DELAY(100);
+    }
     ProductIdExit(sc);
     if (Verify) {
         sc->sc_ops->read_uint16(sc,Offset,&Data16);
 #ifdef Verbose
         if (Verbose) {
             printf("Location %p is now x%x\n",
                    Offset, Data16);
+        }
 #endif
         if ((Data16 != Value)) {
             PrintStatus(Status);
             printf(". That didnt work, try again.. [%x != %x]\n",
                    Data16, Value);
             ClearStatusRegister(sc);
             return FALSE;
+        }
+    }
     *nWritten = 2;
     return TRUE;
+}
 /* Write one buffer, 16bit words at a time
  */
 static int
 single_program_buffer(struct eflash_softc *sc, volatile void *Offset, uint16_t *Values,
                   int  Verify, int *nWritten)
+{
     uint8_t Status;
     uint16_t i, Data16, Value = 0;
     volatile uint8_t *Where = Offset;
     *nWritten = 0;
     if (sc->sc_buffersize == 0)
         return FALSE; /* sanity */
     if (Verify) {
         for (i = 0; i < sc->sc_buffersize; i+= 2) {
             sc->sc_ops->read_uint16(sc,Where+i,&Data16);
 #ifdef Verbose
             if (Verbose) {
                 printf("Location %p was x%x\n",
                        Where+i, Data16);
+            }
 #endif
             if (Data16 != 0xffff)
                 printf("Offset %p not ERASED, wont take.\n",Where+i);
+        }
+    }
     /* Specs say to retry if necessary */
     for (i = 0; i < 5; i++) {
         sc->sc_ops->write_uint8(sc,Offset,CMD_WRITE_BUFFER);
         DELAY(10);
         sc->sc_ops->read_uint8(sc,Offset,&Status);
         if ((Status & ST_READY)) break;
+    }
     if (0 == (Status & ST_READY)) {
         printf("FAILED program_buffer at Location %p, Status= x%x\n",
                  Offset, Status);
         return FALSE;
+    }
     /* Say how many words we'll be sending */
     sc->sc_ops->write_uint8(sc,Offset,(uint8_t)(sc->sc_buffersize/2));
     /* Send the data */
     for (i = 0; i < sc->sc_buffersize; i+= 2) {
         Value = Values[i/2];
         sc->sc_ops->write_uint16(sc,Where+i,Value);
         DELAY(10);/*jic*/
+    }
     /* Write confirmation */
     sc->sc_ops->write_uint8(sc,Offset,CMD_CONFIRM);
     /* Wait until the operation is completed
      * Specs say it takes between 800 and 2400 us
      * Errata says 1600 TYP and Max=TBD (sic), but fixed in stepping A3 and above.
      */
     DELAY(800);
     for (i = 0; i < 20; i++) {
         sc->sc_ops->write_uint8(sc,Offset,CMD_READ_STATUS);
         sc->sc_ops->read_uint8(sc,Offset,&Status);
         if ((Status & ST_READY)) break;
         DELAY(200);
+    }
     ProductIdExit(sc);
     /* Verify? */
     if (Verify) {
         for (i = 0; i < sc->sc_buffersize; i+= 2) {
             sc->sc_ops->read_uint16(sc,Where+i,&Data16);
 #ifdef Verbose
             if (Verbose) {
                 printf("Location %p is now x%x\n",
                        Where+i, Data16);
+            }
 #endif
             Value = Values[i/2];
             if ((Data16 != Value)) {
                 PrintStatus(Status);
                 printf(". That didnt work, try again.. [%x != %x]\n",
                        Data16, Value);
                 ClearStatusRegister(sc);
                 return FALSE;
+            }
+        }
+    }
     *nWritten = sc->sc_buffersize;
     return TRUE;
+}
 /* Write one 32bit word
  */
 static int
 twin_program_word(struct eflash_softc *sc, volatile void *Offset, uint16_t *Values,
                 int  Verify, int *nWritten)
+{
     uint8_t Status;
     uint32_t i, Data32, Value;
     uint16_t v0, v1;
     *nWritten = 0;
     v0 = Values[0];
     v0 = le16toh(v0);
     v1 = Values[1];
     v1 = le16toh(v1);
     Value = v0 | ((uint32_t)v1 << 16);
     if (Verify) {
         sc->sc_ops->read_uint32(sc,Offset,&Data32);
 #ifdef Verbose
         if (Verbose) {
             printf("Location %p was x%x\n",
                    Offset, Data32);
+        }
 #endif
         if (Data32 != 0xffffffff)
             printf("Offset %p not ERASED, wont take.\n",Offset);
+    }
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_WRITE_WORD);
     sc->sc_ops->write_uint32(sc,Offset,Value);
     /* Wait until the operation is completed
      * Specs say it takes between 210 and 630 us
      * Errata says 360 TYP and Max=TBD (sic)
      */
     DELAY(400);
     for (i = 0; i < 10; i++) {
         sc->sc_ops->read_uint8(sc,Offset,&Status);
         if ((Status & ST_READY)) break;
         DELAY(100);
+    }
     ProductIdExit(sc);
     if (Verify) {
         sc->sc_ops->read_uint32(sc,Offset,&Data32);
 #ifdef Verbose
         if (Verbose) {
             printf("Location %p is now x%x\n",
                    Offset, Data32);
+        }
 #endif
         if ((Data32 != Value)) {
             PrintStatus(Status);
             printf(". That didnt work, try again.. [%x != %x]\n",
                    Data32, Value);
             ClearStatusRegister(sc);
             return FALSE;
+        }
+    }
     *nWritten = 4;
     return TRUE;
+}
 /* Write one buffer, 32bit words at a time
  */
 static int
 twin_program_buffer(struct eflash_softc *sc, volatile void *Offset, uint16_t *Values,
                 int  Verify, int *nWritten)
+{
     uint8_t Status;
     uint32_t i, Data32, Value;
     uint16_t v0 = 0, v1;
     volatile uint8_t *Where = Offset;
     *nWritten = 0;
     if (sc->sc_buffersize == 0)
         return FALSE; /* sanity */
     if (Verify) {
         for (i = 0; i < sc->sc_buffersize; i+= 4) {
             sc->sc_ops->read_uint32(sc,Where+i,&Data32);
 #ifdef Verbose
             if (Verbose) {
                 printf("Location %p was x%x\n",
                        Where+i, Data32);
+            }
 #endif
             if (Data32 != 0xffffffff)
                 printf("Offset %p not ERASED, wont take.\n",Where+i);
+        }
+    }
     /* Specs say to retry if necessary */
     for (i = 0; i < 5; i++) {
         sc->sc_ops->write_uint8(sc,Offset,CMD_WRITE_BUFFER);
         DELAY(10);
         sc->sc_ops->read_uint8(sc,Offset,&Status);
         if ((Status & ST_READY)) break;
+    }
     if (0 == (Status & ST_READY)) {
         printf("FAILED program_buffer at Location %p, Status= x%x\n",
                  Offset, Status);
         return FALSE;
+    }
     /* Say how many words we'll be sending */
     sc->sc_ops->write_uint8(sc,Offset,(uint8_t)(sc->sc_buffersize/4)); /* to each twin! */
     /* Send the data */
     for (i = 0; i < sc->sc_buffersize; i+= 4) {
         v0 = Values[i/2];
         v0 = le16toh(v0);
         v1 = Values[1+(i/2)];
         v1 = le16toh(v1);
         Value = v0 | ((uint32_t)v1 << 16);
         sc->sc_ops->write_uint32(sc,Where+i,Value);
         DELAY(10);/*jic*/
+    }
     /* Write confirmation */
     sc->sc_ops->write_uint8(sc,Offset,CMD_CONFIRM);
     /* Wait until the operation is completed
      * Specs say it takes between 800 and 2400 us
      * Errata says 1600 TYP and Max=TBD (sic), but fixed in stepping A3 and above.
      */
     DELAY(800);
     for (i = 0; i < 20; i++) {
         sc->sc_ops->write_uint8(sc,Offset,CMD_READ_STATUS);
         sc->sc_ops->read_uint8(sc,Offset,&Status);
         if ((Status & ST_READY)) break;
         DELAY(200);
+    }
     ProductIdExit(sc);
     /* Verify */
     if (Verify) {
         for (i = 0; i < sc->sc_buffersize; i+= 4) {
             sc->sc_ops->read_uint32(sc,Where+i,&Data32);
 #ifdef Verbose
             if (Verbose) {
                 printf("Location %p is now x%x\n",
                        Where+i, Data32);
+            }
 #endif
             v0 = Values[i/2];
             v0 = le16toh(v0);
             v1 = Values[1+(i/2)];
             v1 = le16toh(v1);
             Value = v0 | ((uint32_t)v1 << 16);
             if ((Data32 != Value)) {
                 PrintStatus(Status);
                 printf(". That didnt work, try again.. [%x != %x]\n",
                        Data32, Value);
                 ClearStatusRegister(sc);
                 return FALSE;
+            }
+        }
+    }
     *nWritten = sc->sc_buffersize;
     return TRUE;
+}
 /* Is there a lock on a given sector
  */
 static int IsSectorLocked(struct eflash_softc *sc, uint8_t *secptr)
+{
     uint8_t Data, Data1;
     ProductIdEnter(sc);
     /* Lockout info is at address 2 of the given sector, meaning A0=0 A1=1.
      */
     sc->sc_ops->read_uint8(sc,secptr+(0x0002*2*sc->sc_chips),&Data);
     sc->sc_ops->read_uint8(sc,secptr+(0x0003*2*sc->sc_chips),&Data1);
     ProductIdExit(sc);
     return (Data & 1);
+}
 /* Remove the write-lock to a sector
  */
 static void SectorUnLock(struct eflash_softc *sc, uint8_t *secptr)
+{
     uint8_t Status;
     int i;
     DBGME(DEBUG_FUNCS,printf("%s: Unlocking sector %d [ptr %p] ...\n",
 	device_xname(sc->sc_dev), sc->sc_sector_offset, secptr));
     sc->sc_ops->write_uint8(sc,sc->sc_page0,CMD_SET_PREFIX);
     sc->sc_ops->write_uint8(sc,secptr,CMD_UNLOCK);
     /* Wait until the unlock is complete.
      * Specs say this takes between 64 and 75 usecs.
      */
     DELAY(100);
     for (i = 0; i < 10; i++) {
         sc->sc_ops->read_uint8(sc,secptr,&Status);
         if ((Status & ST_READY)) break;
         DELAY(100);
+    }
     ProductIdExit(sc);
     if ((Status & ST_MASK) == ST_READY) {
         DBGME(DEBUG_FUNCS,printf("%s: Unlocked ok.\n",
 	    device_xname(sc->sc_dev)));
         return;
+    }
     PrintStatus(Status);
     DBGME(DEBUG_ERRORS,printf("%s: Unlock of sector %d NOT completed (status=%x).\n",
                               device_xname(sc->sc_dev),
 			      sc->sc_sector_offset, Status));
     ClearStatusRegister(sc);
+}
 /* Erase one sector
  */
 static int  SectorErase(struct eflash_softc *sc, void *secptr)
+{
     uint8_t Status = 0;
     uint16_t i;
     DBGME(DEBUG_FUNCS,printf("%s: Erasing sector %d [ptr %p] ...\n",
 	device_xname(sc->sc_dev), sc->sc_sector_offset, secptr));
     /* On some chips we just cannot avoid the locking business.
      */
     if ((sc->sc_chips == 1) &&
         IsSectorLocked(sc,secptr))
         SectorUnLock(sc,secptr);
     sc->sc_ops->write_uint8(sc,secptr,CMD_ERASE_SETUP);
     sc->sc_ops->write_uint8(sc,secptr,CMD_ERASE_CONFIRM);
     /* Wait until the erase is actually completed
      * Specs say it will take between 1 and 5 seconds.
      * Errata says it takes 2 sec min and 25 sec max.
      * Double that before giving up.
      */
     for (i = 0; i < 20; i++) {
         /* Sleep for at least 2 seconds
          */
         tsleep(sc,PWAIT,"erase", hz * 2);
         sc->sc_ops->read_uint8(sc,secptr,&Status);
         if ((Status & ST_READY)) break;
         PrintStatus(Status);
+    }
     ProductIdExit(sc);
     if ((Status & ST_ERASE_MASK) == ST_READY) {
         DBGME(DEBUG_FUNCS,printf("%s: Erased ok.\n", device_xname(sc->sc_dev)));
         return 0;
+    }
     PrintStatus(Status);
     DBGME(DEBUG_ERRORS,printf("%s: Erase of sector %d NOT completed (status=%x).\n",
                               device_xname(sc->sc_dev),
 			      sc->sc_sector_offset, Status));
     ClearStatusRegister(sc);
     return EIO;
+}
 /* Write (a portion of) a sector
  */
 static size_t eflash_write_sector(struct eflash_softc *sc, char *Buffer, size_t n,
                                uint8_t *Offset, int Verify)
+{
     size_t i;
     /* Make sure the device is not screwed up
      */
     if (IsIrresponsive(sc)) {
         printf("FLASH is locked-up (or mapped cacheable?), wont work. ");
+    }
     for (i = 0; i < n;) {
         int nTries;
         int nWritten = 0;/*we expect 2 or 4 */
         if (sc->sc_buffersize && ((n-i) >= sc->sc_buffersize)) {
             for (nTries = 0; nTries < 5; nTries++)
                 if (sc->sc_ops->program_buffer(sc,Offset,(uint16_t*)(Buffer+i),Verify,&nWritten))
                     break;
         } else {
             for (nTries = 0; nTries < 5; nTries++)
                 if (sc->sc_ops->program_word(sc,Offset,(uint16_t*)(Buffer+i),Verify,&nWritten))
                     break;
+        }
         Offset += nWritten;
         i += nWritten;
         if (nWritten == 0)
             break;
+    }
     return i;
+}
 /* Identify type and the sector map of the FLASH.
  * Argument is the base address of the device and the count of chips on the bus (1/2)
  * Returns FALSE if failed
  */
 static const struct flash_ops single_ops = {
     single_write_uint8,
     single_read_uint8,
     single_write_uint16,
     single_read_uint16,
     single_write_uint32,
     single_read_uint32,
     single_program_word,
     single_program_buffer
 };
 static const struct flash_ops twin_ops = {
     twin_write_uint8,
     twin_read_uint8,
     twin_write_uint16,
     twin_read_uint16,
     twin_write_uint32,
     twin_read_uint32,
     twin_program_word,
     twin_program_buffer
 };
 static int  flash_identify(struct eflash_softc *sc)
+{
     uint8_t Mid, Did;
     int i;
     if (sc->sc_chips > 1)
         sc->sc_ops = &twin_ops;
     else
         sc->sc_ops = &single_ops;
     sc->sc_buffersize = 0;
 #if USE_BUFFERED_WRITES
     sc->sc_buffersize = BUFFER_BYTES * sc->sc_chips;
 #endif
     sc->sc_sector = NULL;
     sc->sc_sector_size = 0;
     sc->sc_sector_offset = NOSECTOR;
     sc->sc_erased = FALSE;
     ProductIdEnter(sc);
     sc->sc_ops->read_uint8(sc,sc->sc_page0+(0x0000*2*sc->sc_chips),&Mid);
     sc->sc_ops->read_uint8(sc,sc->sc_page0+(0x0001*2*sc->sc_chips),&Did);
     ProductIdExit(sc);
     sc->sc_type.ft_manuf_code = Mid;
     sc->sc_type.ft_device_code = Did;
     for (i = 0; i < nMAPS; i++) {
         if ((sector_maps[i].ft_manuf_code == Mid) && (sector_maps[i].ft_device_code == Did)) {
             int j;
             uint32_t ms = 0;
             sc->sc_type = sector_maps[i];
             /* double the sector sizes if twin-chips */
             for (j = 0; j < nDELTAS; j++) {
                 sc->sc_type.ft_deltas[j].nKB *= sc->sc_chips;
                 if (ms < sc->sc_type.ft_deltas[j].nKB)
                     ms = sc->sc_type.ft_deltas[j].nKB;
+            }
             sc->sc_max_secsize = ms * 1024;
             return TRUE;
+        }
+    }
     return FALSE;
+}
 /* Common code for read&write argument validation
  */
 static int eflash_validate(struct eflash_softc *sc, daddr_t start, size_t *pSize, void **pSrc)
+{
     daddr_t Size;
     uint32_t sec;
     size_t secsize, secstart;
     /* Validate args
      */
     if (start >= sc->sc_capacity) {
         *pSize = 0;
         DBGME(DEBUG_ERRORS,printf("eflash::ValidateArg(%qx) EOF\n", start));
         return E2BIG;
+    }
     /* Map sector if not already
      */
     sec = SectorNumber(&sc->sc_type, start << DEV_BSHIFT);
     secsize = SectorSize( &sc->sc_type, sec);
     secstart = SectorStart(&sc->sc_type,sec);
     if (sec != sc->sc_sector_offset) {
         int error;
         /* unmap previous first */
         if (sc->sc_sector_offset != NOSECTOR) {
             DBGME(DEBUG_FUNCS,printf("%s: unmap %p %zx\n",
 		device_xname(sc->sc_dev), sc->sc_sector, sc->sc_sector_size));
             iounaccess((vaddr_t)sc->sc_sector, sc->sc_sector_size);
             sc->sc_sector_offset = NOSECTOR;
+        }
         /* map new */
         error = ioaccess((vaddr_t)sc->sc_sector,
                          secstart + sc->sc_base,
                          secsize);
         DBGME(DEBUG_FUNCS,printf("%s: mapped %p %zx -> %zx %d\n",
 	    device_xname(sc->sc_dev),
 	    sc->sc_sector, secsize, secstart + sc->sc_base,error));
         if (error) return error;
         /* Update state. We have to assume the sector was not erased. Sigh. */
         sc->sc_sector_offset = sec;
         sc->sc_sector_size = secsize;
         sc->sc_erased = FALSE;
+    }
     /* Adjust size if necessary
      */
     Size = start + *pSize; /* last sector */
     if (Size > sc->sc_capacity) {
         /* At most this many sectors
          */
         Size = sc->sc_capacity - start;
         *pSize = (size_t)Size;
+    }
     if (*pSize > (secsize >> DEV_BSHIFT)) {
         *pSize = secsize >> DEV_BSHIFT;
+    }
     *pSrc = sc->sc_sector + (start << DEV_BSHIFT) - secstart;
     DBGME(DEBUG_FUNCS,printf("%s: Validate %qx %zd %p\n",
 	device_xname(sc->sc_dev), start,*pSize, *pSrc));
     return 0;
+}
 static int eflash_read_at (struct eflash_softc *sc,
                            daddr_t start_sector, char *buffer, size_t nblocks,
                            size_t * pSizeRead)
+{
     int error;
     uint32_t SizeRead = 0;
     void *src;
     DBGME(DEBUG_XFERS|DEBUG_READS,printf("%s: EflashReadAt(%qx %p %zd %p)\n",
                      device_xname(sc->sc_dev), start_sector, buffer, nblocks, pSizeRead));
     /* Validate & trim arguments
      */
     error = eflash_validate(sc, start_sector, &nblocks, &src);
     /* Copy data if
      */
     if (error == 0) {
         SizeRead = nblocks;
         memcpy(buffer, src, nblocks << DEV_BSHIFT);
+    }
     if (pSizeRead)
         *pSizeRead = SizeRead;
     return error;
+}
 /* Write SIZE bytes to device.
  */
 static int eflash_write_at (struct eflash_softc *sc,
                            daddr_t start_sector, char *buffer, size_t nblocks,
                            size_t * pSizeWritten)
+{
     int error;
     void *src;
     size_t SizeWritten = 0;
     DBGME(DEBUG_XFERS|DEBUG_WRITES,printf("%s: EflashWriteAt(%qx %p %zd %p)\n",
                      device_xname(sc->sc_dev), start_sector, buffer, nblocks, pSizeWritten));
     /* Validate & trim arguments
      */
     error = eflash_validate(sc, start_sector, &nblocks, &src);
     if (error == 0) {
         /* Do we have to erase it */
         if (! sc->sc_erased) {
             error = SectorErase(sc,src);
             if (error)
                 goto Out;
             sc->sc_erased = TRUE;
+        }
         SizeWritten = eflash_write_sector(sc, buffer, nblocks << DEV_BSHIFT, src, TRUE);
         SizeWritten >>= DEV_BSHIFT;
+    }
  Out:
     if (pSizeWritten)
         *pSizeWritten = SizeWritten;
     return error;
+}
 /* Rest of code lifted with mods from the dev\ata\wd.c driver
  */
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *	notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *	notice, this list of conditions and the following disclaimer in the
  *	documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *	must display the following acknowledgement:
  *  This product includes software developed by Manuel Bouyer.
  * 4. The name of the author may not be used to endorse or promote products
  *	derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Onno van der Linden.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *        This product includes software developed by the NetBSD
  *        Foundation, Inc. and its contributors.
  * 4. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 static const char ST506[] = "ST506";
 #define	EFLASHIORETRIES_SINGLE 4	/* number of retries before single-sector */
 #define	EFLASHIORETRIES	5	/* number of retries before giving up */
 #define	RECOVERYTIME hz/2	/* time to wait before retrying a cmd */
 #define	EFLASHUNIT(dev)		DISKUNIT(dev)
 #define	EFLASHPART(dev)		DISKPART(dev)
 #define	EFLASHMINOR(unit, part)	DISKMINOR(unit, part)
 #define	MAKEEFLASHDEV(maj, unit, part)	MAKEDISKDEV(maj, unit, part)
 #define	EFLASHLABELDEV(dev)	(MAKEEFLASHDEV(major(dev), EFLASHUNIT(dev), RAW_PART))
 void	eflashperror(const struct eflash_softc *);
 extern struct cfdriver eflash_cd;
 dev_type_open(eflashopen);
 dev_type_close(eflashclose);
 dev_type_read(eflashread);
 dev_type_write(eflashwrite);
 dev_type_ioctl(eflashioctl);
 dev_type_strategy(eflashstrategy);
 dev_type_dump(eflashdump);
 dev_type_size(eflashsize);
 const struct bdevsw eflash_bdevsw = {
 	.d_open = eflashopen,
 	.d_close = eflashclose,
 	.d_strategy = eflashstrategy,
 	.d_ioctl = eflashioctl,
 	.d_dump = eflashdump,
 	.d_psize = eflashsize,
 	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 const struct cdevsw eflash_cdevsw = {
 	.d_open = eflashopen,
 	.d_close = eflashclose,
 	.d_read = eflashread,
 	.d_write = eflashwrite,
 	.d_ioctl = eflashioctl,
 	.d_stop = nostop,
 	.d_tty = notty,
 	.d_poll = nopoll,
 	.d_mmap = nommap,
 	.d_kqfilter = nokqfilter,
 	.d_discard = nodiscard,
 	.d_flag = D_DISK
 };
 void  eflashgetdefaultlabel(struct eflash_softc *, struct disklabel *);
 void  eflashgetdisklabel(struct eflash_softc *);
 void  eflashstart(void *);
 void  __eflashstart(struct eflash_softc *, struct buf *);
 void  eflashrestart(void *);
 void  eflashattach(struct eflash_softc *);
 int   eflashdetach(device_t, int);
 int   eflashactivate(device_t, enum devact);
 void  eflashdone(struct eflash_softc *);
 static void eflash_set_geometry(struct eflash_softc *sc);
 struct dkdriver eflashdkdriver = {
 	.d_strategy = eflashstrategy,
 	.d_minphys = minphys
 };
 #ifdef HAS_BAD144_HANDLING
 static void bad144intern(struct eflash_softc *);
 #endif
 static void eflash_wedges(void *arg);
 void
 eflashattach(struct eflash_softc *sc)
+{
 	device_t self = sc->sc_dev;
 	char pbuf[9];
 	DEBUG_PRINT(("%s: eflashattach\n",  device_xname(sc->sc_dev)), DEBUG_FUNCS | DEBUG_PROBE);
 	callout_init(&sc->sc_restart_ch, 0);
 	bufq_alloc(&sc->sc_q, BUFQ_DISK_DEFAULT_STRAT, BUFQ_SORT_RAWBLOCK);
     sc->openings = 1; /* wazziz?*/
 	aprint_naive("\n");
     /* setup all required fields so that if the attach fails we are ok */
 	sc->sc_dk.dk_driver = &eflashdkdriver;
 	sc->sc_dk.dk_name = device_xname(sc->sc_dev);
 	format_bytes(pbuf, sizeof(pbuf), sc->sc_capacity * DEV_BSIZE);
 	aprint_normal("%s: %s, %d cyl, %d head, %d sec, %d bytes/sect x %llu sectors\n",
 	    device_xname(self), pbuf, 1, 1, sc->sc_capacity,
 	    DEV_BSIZE, (unsigned long long)sc->sc_capacity);
     eflash_set_geometry(sc);
 	/*
 	 * Attach the disk structure. We fill in dk_info later.
 	 */
 	disk_attach(&sc->sc_dk);
 	rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
 			  RND_TYPE_DISK, RND_FLAG_DEFAULT);
+}
 int
 eflashactivate(device_t self, enum devact act)
+{
 	int rv = 0;
 	DEBUG_PRINT(("eflashactivate %x\n",  act), DEBUG_FUNCS | DEBUG_PROBE);
 	switch (act) {
 	case DVACT_DEACTIVATE:
 		/*
 		 * Nothing to do; we key off the device's DVF_ACTIVATE.
 		 */
 		break;
 	default:
 		rv = EOPNOTSUPP;
 		break;
+	}
 	return (rv);
+}
 int
 eflashdetach(device_t self, int flags)
+{
 	struct eflash_softc *sc = device_private(self);
 	int s, bmaj, cmaj, i, mn;
 	DEBUG_PRINT(("%s: eflashdetach\n",  device_xname(sc->sc_dev)), DEBUG_FUNCS | DEBUG_PROBE);
 	/* locate the major number */
 	bmaj = bdevsw_lookup_major(&eflash_bdevsw);
 	cmaj = cdevsw_lookup_major(&eflash_cdevsw);
 	/* Nuke the vnodes for any open instances. */
 	for (i = 0; i < MAXPARTITIONS; i++) {
 		mn = EFLASHMINOR(device_unit(self), i);
 		vdevgone(bmaj, mn, mn, VBLK);
 		vdevgone(cmaj, mn, mn, VCHR);
+	}
 	/* Delete all of our wedges. */
 	dkwedge_delall(&sc->sc_dk);
 	s = splbio();
 	/* Kill off any queued buffers. */
 	bufq_drain(sc->sc_q);
 	/*sc->atabus->ata_killpending(sc->drvp);*/
 	splx(s);
 	bufq_free(sc->sc_q);
 	/* Detach disk. */
 	disk_detach(&sc->sc_dk);
 	/* Unhook the entropy source. */
 	rnd_detach_source(&sc->rnd_source);
 	/*sc->drvp->drive_flags = 0; -- no drive any more here */
 	return (0);
+}
 extern int	dkwedge_autodiscover;
 /* Aux temp thread to avoid deadlock when doing the partitio.. ahem wedges thing.
  */
 static void
 eflash_wedges(void *arg)
+{
 	struct eflash_softc *sc = (struct eflash_softc*)arg;
     DBGME(DEBUG_STATUS,printf("%s: wedges started for %p\n", sc->sc_dk.dk_name, sc));
 	/* Discover wedges on this disk. */
     dkwedge_autodiscover = 1;
 	dkwedge_discover(&sc->sc_dk);
     config_pending_decr(sc->sc_dev);
     DBGME(DEBUG_STATUS,printf("%s: wedges thread done for %p\n", device_xname(sc->sc_dev), sc));
 	kthread_exit(0);
+}
 static void
 eflash_thread(void *arg)
+{
 	struct eflash_softc *sc = (struct eflash_softc*)arg;
 	struct buf *bp;
     vaddr_t addr;
 	int s, error;
     DBGME(DEBUG_STATUS,printf("%s: thread started for %p\n", device_xname(sc->sc_dev), sc));
     s = splbio();
     eflashattach(sc);
     splx(s);
     /* Allocate a VM window large enough to map the largest sector
      * BUGBUG We could risk it and allocate/free on open/close?
      */
     addr = uvm_km_alloc(kernel_map, sc->sc_max_secsize, 0, UVM_KMF_VAONLY);
     if (addr == 0)
         panic("eflash_thread: kernel map full (%lx)", (long unsigned)sc->sc_max_secsize);
     sc->sc_sector = (/*volatile*/ uint8_t *) addr;
     sc->sc_sector_size = 0;
     sc->sc_sector_offset = NOSECTOR;
 	error = kthread_create(PRI_NONE, 0, NULL,
 	    eflash_wedges, sc, NULL, "%s.wedges", device_xname(sc->sc_dev));
 	if (error) {
 		aprint_error_dev(sc->sc_dev, "wedges: unable to create kernel "
 		    "thread: error %d\n", error);
 		/* XXX: why continue? */
+	}
     DBGME(DEBUG_STATUS,printf("%s: thread service active for %p\n", device_xname(sc->sc_dev), sc));
     s = splbio();
 	for (;;) {
         /* Get next I/O request, wait if necessary
          */
 		if ((sc->ch_flags & (ATACH_TH_RESET | ATACH_SHUTDOWN)) == 0 &&
 		    (sc->active_xfer == NULL)) {
 			sc->ch_flags &= ~ATACH_TH_RUN;
 			(void) tsleep(&sc->ch_thread, PRIBIO, "eflashth", 0);
 			sc->ch_flags |= ATACH_TH_RUN;
+		}
 		if (sc->ch_flags & ATACH_SHUTDOWN) {
 			break;
+        }
         bp = sc->active_xfer;
         sc->active_xfer = NULL;
 		if (bp != NULL) {
             size_t sz = DEV_BSIZE, bnow;
             DBGME(DEBUG_XFERS,printf("%s: task %p %x %p %qx %d (%zd)\n", device_xname(sc->sc_dev), bp,
                                      sc->sc_bio.flags, sc->sc_bio.databuf, sc->sc_bio.blkno,
                                      sc->sc_bio.nbytes, sc->sc_bio.nblks));
             sc->sc_bio.error = 0;
             for (; sc->sc_bio.nblks > 0;) {
                 bnow = sc->sc_bio.nblks;
                 if (sc->sc_bio.flags & ATA_SINGLE) bnow = 1;
                 if (sc->sc_bio.flags & ATA_READ) {
                     sc->sc_bio.error =
                         eflash_read_at(sc, sc->sc_bio.blkno, sc->sc_bio.databuf, bnow, &sz);
                 } else {
                     sc->sc_bio.error =
                         eflash_write_at(sc, sc->sc_bio.blkno, sc->sc_bio.databuf, bnow, &sz);
+                }
                 if (sc->sc_bio.error)
                     break;
                 sc->sc_bio.blkno += sz; /* in blocks */
                 sc->sc_bio.nblks -= sz;
                 sc->sc_bio.blkdone += sz;
                 sz = sz << DEV_BSHIFT; /* in bytes */
                 sc->sc_bio.databuf += sz;
                 sc->sc_bio.nbytes  -= sz;
+            }
             eflashdone(sc);
+        }
+	}
 	splx(s);
 	sc->ch_thread = NULL;
 	wakeup(&sc->ch_flags);
     DBGME(DEBUG_STATUS,printf("%s: thread service terminated for %p\n", device_xname(sc->sc_dev), sc));
 	kthread_exit(0);
+}
 /*
  * Read/write routine for a buffer.  Validates the arguments and schedules the
  * transfer.  Does not wait for the transfer to complete.
  */
 void
 eflashstrategy(struct buf *bp)
+{
 	struct eflash_softc *sc = device_lookup_private(&eflash_cd, EFLASHUNIT(bp->b_dev));
 	struct disklabel *lp = sc->sc_dk.dk_label;
 	daddr_t blkno;
 	int s;
 	DEBUG_PRINT(("%s: eflashstrategy %lld\n", device_xname(sc->sc_dev), bp->b_blkno),
 	    DEBUG_XFERS);
 	/* Valid request?  */
 	if (bp->b_blkno < 0 ||
 	    (bp->b_bcount % lp->d_secsize) != 0 ||
 	    (bp->b_bcount / lp->d_secsize) >= (1 << NBBY)) {
 		bp->b_error = EINVAL;
 		goto done;
+	}
 	/* If device invalidated (e.g. media change, door open), error. */
 	if ((sc->sc_flags & EFLASHF_LOADED) == 0) {
 		bp->b_error = EIO;
 		goto done;
+	}
 	/* If it's a null transfer, return immediately. */
 	if (bp->b_bcount == 0)
 		goto done;
 	/*
 	 * Do bounds checking, adjust transfer. if error, process.
 	 * If end of partition, just return.
 	 */
 	if (EFLASHPART(bp->b_dev) == RAW_PART) {
 		if (bounds_check_with_mediasize(bp, DEV_BSIZE,
 		    sc->sc_capacity) <= 0)
 			goto done;
 	} else {
 		if (bounds_check_with_label(&sc->sc_dk, bp,
 		    (sc->sc_flags & (EFLASHF_WLABEL|EFLASHF_LABELLING)) != 0) <= 0)
 			goto done;
+	}
 	/*
 	 * Now convert the block number to absolute and put it in
 	 * terms of the device's logical block size.
 	 */
 	if (lp->d_secsize >= DEV_BSIZE)
 		blkno = bp->b_blkno / (lp->d_secsize / DEV_BSIZE);
 	else
 		blkno = bp->b_blkno * (DEV_BSIZE / lp->d_secsize);
 	if (EFLASHPART(bp->b_dev) != RAW_PART)
 		blkno += lp->d_partitions[EFLASHPART(bp->b_dev)].p_offset;
 	bp->b_rawblkno = blkno;
 	/* Queue transfer on drive, activate drive and controller if idle. */
 	s = splbio();
 	bufq_put(sc->sc_q, bp);
 	eflashstart(sc);
 	splx(s);
 	return;
 done:
 	/* Toss transfer; we're done early. */
 	bp->b_resid = bp->b_bcount;
 	biodone(bp);
+}
 /*
  * Queue a drive for I/O.
  */
 void
 eflashstart(void *arg)
+{
 	struct eflash_softc *sc = arg;
 	struct buf *bp = NULL;
 	DEBUG_PRINT(("%s: eflashstart\n", device_xname(sc->sc_dev)),
 	    DEBUG_XFERS);
 	while (sc->openings > 0) {
 		/* Is there a buf for us ? */
 		if ((bp = bufq_get(sc->sc_q)) == NULL)
 			return;
 		/*
 		 * Make the command. First lock the device
 		 */
 		sc->openings--;
 		sc->retries = 0;
 		__eflashstart(sc, bp);
+	}
+}
 void
 __eflashstart(struct eflash_softc *sc, struct buf *bp)
+{
 	DEBUG_PRINT(("%s: __eflashstart %p\n", device_xname(sc->sc_dev), bp),
 	    DEBUG_XFERS);
 	sc->sc_bp = bp;
 	/*
 	 * If we're retrying, retry in single-sector mode. This will give us
 	 * the sector number of the problem, and will eventually allow the
 	 * transfer to succeed.
 	 */
 	if (sc->retries >= EFLASHIORETRIES_SINGLE)
 		sc->sc_bio.flags = ATA_SINGLE;
 	else
 		sc->sc_bio.flags = 0;
 	if (bp->b_flags & B_READ)
 		sc->sc_bio.flags |= ATA_READ;
 	sc->sc_bio.blkno = bp->b_rawblkno;
 	sc->sc_bio.blkdone = 0;
 	sc->sc_bio.nbytes = bp->b_bcount;
 	sc->sc_bio.nblks  = bp->b_bcount >> DEV_BSHIFT;
 	sc->sc_bio.databuf = bp->b_data;
 	/* Instrumentation. */
 	disk_busy(&sc->sc_dk);
     sc->active_xfer = bp;
     wakeup(&sc->ch_thread);
+}
 void
 eflashdone(struct eflash_softc *sc)
+{
 	struct buf *bp = sc->sc_bp;
 	const char *errmsg;
 	int do_perror = 0;
 	DEBUG_PRINT(("%s: eflashdone %p\n", device_xname(sc->sc_dev), bp),
 	    DEBUG_XFERS);
 	if (bp == NULL)
 		return;
 	bp->b_resid = sc->sc_bio.nbytes;
 	switch (sc->sc_bio.error) {
 	case ETIMEDOUT:
 		errmsg = "device timeout";
         do_perror = 1;
 		goto retry;
 	case EBUSY:
 		errmsg = "device stuck";
 retry:		/* Just reset and retry. Can we do more ? */
 		/*eflash_reset(sc);*/
 		diskerr(bp, "flash", errmsg, LOG_PRINTF,
 		    sc->sc_bio.blkdone, sc->sc_dk.dk_label);
 		if (sc->retries < EFLASHIORETRIES)
 			printf(", retrying");
 		printf("\n");
 		if (do_perror)
 			eflashperror(sc);
 		if (sc->retries < EFLASHIORETRIES) {
 			sc->retries++;
 			callout_reset(&sc->sc_restart_ch, RECOVERYTIME,
 			    eflashrestart, sc);
 			return;
+		}
 		bp->b_error = EIO;
 		break;
 	case 0:
         if ((sc->sc_bio.flags & ATA_CORR) || sc->retries > 0)
 			printf("%s: soft error (corrected)\n",
 			    device_xname(sc->sc_dev));
 		break;
 	case ENODEV:
 	case E2BIG:
 		bp->b_error = EIO;
 		break;
+	}
 	disk_unbusy(&sc->sc_dk, (bp->b_bcount - bp->b_resid),
 	    (bp->b_flags & B_READ));
 	rnd_add_uint32(&sc->rnd_source, bp->b_blkno);
     biodone(bp);
     sc->openings++;
 	eflashstart(sc);
+}
 void
 eflashrestart(void *v)
+{
 	struct eflash_softc *sc = v;
 	struct buf *bp = sc->sc_bp;
 	int s;
 	DEBUG_PRINT(("%s: eflashrestart\n", device_xname(sc->sc_dev)),
 	    DEBUG_XFERS);
 	s = splbio();
 	__eflashstart(v, bp);
 	splx(s);
+}
 int
 eflashread(dev_t dev, struct uio *uio, int flags)
+{
 	DEBUG_PRINT(("eflashread\n"), DEBUG_XFERS);
 	return (physio(eflashstrategy, NULL, dev, B_READ, minphys, uio));
+}
 int
 eflashwrite(dev_t dev, struct uio *uio, int flags)
+{
 	DEBUG_PRINT(("eflashwrite\n"), DEBUG_XFERS);
 	return (physio(eflashstrategy, NULL, dev, B_WRITE, minphys, uio));
+}
 int
 eflashopen(dev_t dev, int flag, int fmt, struct lwp *l)
+{
 	struct eflash_softc *sc;
 	int part, error;
 	DEBUG_PRINT(("eflashopen %" PRIx64 "\n", dev), DEBUG_FUNCS);
 	sc = device_lookup_private(&eflash_cd, EFLASHUNIT(dev));
 	if (sc == NULL)
 		return (ENXIO);
 	if (! device_is_active(sc->sc_dev))
 		return (ENODEV);
 	part = EFLASHPART(dev);
 	mutex_enter(&sc->sc_dk.dk_openlock);
 	/*
 	 * If there are wedges, and this is not RAW_PART, then we
 	 * need to fail.
 	 */
 	if (sc->sc_dk.dk_nwedges != 0 && part != RAW_PART) {
 		error = EBUSY;
 		goto bad;
+	}
 	if (sc->sc_dk.dk_openmask != 0) {
 		/*
 		 * If any partition is open, but the disk has been invalidated,
 		 * disallow further opens.
 		 */
 		if ((sc->sc_flags & EFLASHF_LOADED) == 0) {
 			error = EIO;
 			goto bad;
+		}
 	} else {
 		if ((sc->sc_flags & EFLASHF_LOADED) == 0) {
 			sc->sc_flags |= EFLASHF_LOADED;
 			/* Load the partition info if not already loaded. */
 			eflashgetdisklabel(sc);
+		}
+	}
 	/* Check that the partition exists. */
 	if (part != RAW_PART &&
 	    (part >= sc->sc_dk.dk_label->d_npartitions ||
 	     sc->sc_dk.dk_label->d_partitions[part].p_fstype == FS_UNUSED)) {
 		error = ENXIO;
 		goto bad;
+	}
 	/* Insure only one open at a time. */
 	switch (fmt) {
 	case S_IFCHR:
 		sc->sc_dk.dk_copenmask |= (1 << part);
 		break;
 	case S_IFBLK:
 		sc->sc_dk.dk_bopenmask |= (1 << part);
 		break;
+	}
 	sc->sc_dk.dk_openmask =
 	    sc->sc_dk.dk_copenmask | sc->sc_dk.dk_bopenmask;
 	mutex_exit(&sc->sc_dk.dk_openlock);
 	return 0;
  bad:
 	mutex_exit(&sc->sc_dk.dk_openlock);
 	DEBUG_PRINT(("%s: eflashopen -> %d\n", device_xname(sc->sc_dev), error),
 	    DEBUG_XFERS);
 	return error;
+}
 int
 eflashclose(dev_t dev, int flag, int fmt, struct lwp *l)
+{
 	struct eflash_softc *sc = device_lookup_private(&eflash_cd, EFLASHUNIT(dev));
 	int part = EFLASHPART(dev);
 	DEBUG_PRINT(("eflashclose %" PRIx64 "\n", dev), DEBUG_FUNCS);
 	mutex_enter(&sc->sc_dk.dk_openlock);
 	switch (fmt) {
 	case S_IFCHR:
 		sc->sc_dk.dk_copenmask &= ~(1 << part);
 		break;
 	case S_IFBLK:
 		sc->sc_dk.dk_bopenmask &= ~(1 << part);
 		break;
+	}
 	sc->sc_dk.dk_openmask =
 	    sc->sc_dk.dk_copenmask | sc->sc_dk.dk_bopenmask;
 	if (sc->sc_dk.dk_openmask == 0) {
 		if (! (sc->sc_flags & EFLASHF_KLABEL))
 			sc->sc_flags &= ~EFLASHF_LOADED;
         DEBUG_PRINT(("%s: eflashclose flg %x\n", device_xname(sc->sc_dev), sc->sc_flags),
                     DEBUG_XFERS);
+	}
 	mutex_exit(&sc->sc_dk.dk_openlock);
 	return 0;
+}
 void
 eflashgetdefaultlabel(struct eflash_softc *sc, struct disklabel *lp)
+{
 	DEBUG_PRINT(("%s: eflashgetdefaultlabel\n", device_xname(sc->sc_dev)), DEBUG_FUNCS);
 	memset(lp, 0, sizeof(struct disklabel));
 	lp->d_secsize = DEV_BSIZE;
 	lp->d_ntracks = 1;
 	lp->d_nsectors = sc->sc_capacity;
 	lp->d_ncylinders = 1;
 	lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
 	lp->d_type = DKTYPE_ST506; /* ?!? */
 	strncpy(lp->d_typename, ST506, 16);
 	strncpy(lp->d_packname, "fictitious", 16);
 	if (sc->sc_capacity > UINT32_MAX)
 		lp->d_secperunit = UINT32_MAX;
 	else
 		lp->d_secperunit = sc->sc_capacity;
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
 	lp->d_flags = 0;
 	lp->d_partitions[RAW_PART].p_offset = 0;
 	lp->d_partitions[RAW_PART].p_size =
 	    lp->d_secperunit * (lp->d_secsize / DEV_BSIZE);
 	lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
 	lp->d_npartitions = RAW_PART + 1;
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
 	lp->d_checksum = dkcksum(lp);
+}
 /*
  * Fabricate a default disk label, and try to read the correct one.
  */
 void
 eflashgetdisklabel(struct eflash_softc *sc)
+{
 	struct disklabel *lp = sc->sc_dk.dk_label;
 	const char *errstring;
 	DEBUG_PRINT(("%s: eflashgetdisklabel\n",  device_xname(sc->sc_dev)), DEBUG_FUNCS);
 	memset(sc->sc_dk.dk_cpulabel, 0, sizeof(struct cpu_disklabel));
 	eflashgetdefaultlabel(sc, lp);
 #ifdef HAS_BAD144_HANDLING
 	sc->sc_bio.badsect[0] = -1;
 #endif
     /* BUGBUG: maj==0?? why is this not EFLASHLABELDEV(??sc->sc_dev) */
 	errstring = readdisklabel(MAKEEFLASHDEV(0, device_unit(sc->sc_dev),
 				  RAW_PART), eflashstrategy, lp,
 				  sc->sc_dk.dk_cpulabel);
 	if (errstring) {
 		printf("%s: %s\n", device_xname(sc->sc_dev), errstring);
 		return;
+	}
 #if DEBUG
     if (EFLASH_DEBUG(DEBUG_WRITES)) {
         int i, n = sc->sc_dk.dk_label->d_npartitions;
         printf("%s: %d parts\n", device_xname(sc->sc_dev), n);
         for (i = 0; i < n; i++) {
             printf("\t[%d]: t=%x s=%d o=%d\n", i,
                    sc->sc_dk.dk_label->d_partitions[i].p_fstype,
                    sc->sc_dk.dk_label->d_partitions[i].p_size,
                    sc->sc_dk.dk_label->d_partitions[i].p_offset);
+        }
+    }
 #endif
 #ifdef HAS_BAD144_HANDLING
 	if ((lp->d_flags & D_BADSECT) != 0)
 		bad144intern(sc);
 #endif
+}
 void
 eflashperror(const struct eflash_softc *sc)
+{
 	const char *devname = device_xname(sc->sc_dev);
 	u_int32_t Status = sc->sc_bio.r_error;
 	printf("%s: (", devname);
 	if (Status == 0)
 		printf("error not notified");
 	else
 		printf("status=x%x", Status);
 	printf(")\n");
+}
 int
 eflashioctl(dev_t dev, u_long xfer, void *addr, int flag, struct lwp *l)
+{
 	struct eflash_softc *sc = device_lookup_private(&eflash_cd, EFLASHUNIT(dev));
 	int error = 0, s;
 	DEBUG_PRINT(("eflashioctl(%lx)\n",xfer), DEBUG_FUNCS);
 	if ((sc->sc_flags & EFLASHF_LOADED) == 0)
 		return EIO;
 	error = disk_ioctl(&sc->sc_dk, dev, xfer, addr, flag, l);
 	if (error != EPASSTHROUGH)
 		return (error);
 	switch (xfer) {
 #ifdef HAS_BAD144_HANDLING
 	case DIOCSBAD:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		sc->sc_dk.dk_cpulabel->bad = *(struct dkbad *)addr;
 		sc->sc_dk.dk_label->d_flags |= D_BADSECT;
 		bad144intern(sc);
 		return 0;
 #endif
 	case DIOCWDINFO:
 	case DIOCSDINFO:
+	{
 		struct disklabel *lp;
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		lp = (struct disklabel *)addr;
 		mutex_enter(&sc->sc_dk.dk_openlock);
 		sc->sc_flags |= EFLASHF_LABELLING;
 		error = setdisklabel(sc->sc_dk.dk_label,
 		    lp, /*sc->sc_dk.dk_openmask : */0,
 		    sc->sc_dk.dk_cpulabel);
 		if (error == 0) {
 			if (xfer == DIOCWDINFO)
 				error = writedisklabel(EFLASHLABELDEV(dev),
 				    eflashstrategy, sc->sc_dk.dk_label,
 				    sc->sc_dk.dk_cpulabel);
+		}
 		sc->sc_flags &= ~EFLASHF_LABELLING;
 		mutex_exit(&sc->sc_dk.dk_openlock);
 		return error;
+	}
 	case DIOCKLABEL:
 		if (*(int *)addr)
 			sc->sc_flags |= EFLASHF_KLABEL;
 		else
 			sc->sc_flags &= ~EFLASHF_KLABEL;
 		return 0;
 	case DIOCWLABEL:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		if (*(int *)addr)
 			sc->sc_flags |= EFLASHF_WLABEL;
 		else
 			sc->sc_flags &= ~EFLASHF_WLABEL;
 		return 0;
 	case DIOCGDEFLABEL:
 		eflashgetdefaultlabel(sc, (struct disklabel *)addr);
 		return 0;
 	case DIOCCACHESYNC:
 		return 0;
 	case DIOCGSTRATEGY:
+	    {
 		struct disk_strategy *dks = (void *)addr;
 		s = splbio();
 		strlcpy(dks->dks_name, bufq_getstrategyname(sc->sc_q),
 		    sizeof(dks->dks_name));
 		splx(s);
 		dks->dks_paramlen = 0;
 		return 0;
+	    }
 	case DIOCSSTRATEGY:
+	    {
 		struct disk_strategy *dks = (void *)addr;
 		struct bufq_state *new;
 		struct bufq_state *old;
 		if ((flag & FWRITE) == 0) {
 			return EBADF;
+		}
 		if (dks->dks_param != NULL) {
 			return EINVAL;
+		}
 		dks->dks_name[sizeof(dks->dks_name) - 1] = 0; /* ensure term */
 		error = bufq_alloc(&new, dks->dks_name,
 		    BUFQ_EXACT|BUFQ_SORT_RAWBLOCK);
 		if (error) {
 			return error;
+		}
 		s = splbio();
 		old = sc->sc_q;
 		bufq_move(new, old);
 		sc->sc_q = new;
 		splx(s);
 		bufq_free(old);
 		return 0;
+	    }
 	default:
         /* NB: we get a DIOCGWEDGEINFO, but nobody else handles it either */
         DEBUG_PRINT(("eflashioctl: unsup x%lx\n", xfer), DEBUG_FUNCS);
 		return ENOTTY;
+	}
+}
 int
 eflashsize(dev_t dev)
+{
 	struct eflash_softc *sc;
 	int part, omask;
 	int size;
 	DEBUG_PRINT(("eflashsize\n"), DEBUG_FUNCS);
 	sc = device_lookup_private(&eflash_cd, EFLASHUNIT(dev));
 	if (sc == NULL)
 		return (-1);
 	part = EFLASHPART(dev);
 	omask = sc->sc_dk.dk_openmask & (1 << part);
 	if (omask == 0 && eflashopen(dev, 0, S_IFBLK, NULL) != 0)
 		return (-1);
 	if (sc->sc_dk.dk_label->d_partitions[part].p_fstype != FS_SWAP)
 		size = -1;
 	else
 		size = sc->sc_dk.dk_label->d_partitions[part].p_size *
 		    (sc->sc_dk.dk_label->d_secsize / DEV_BSIZE);
 	if (omask == 0 && eflashclose(dev, 0, S_IFBLK, NULL) != 0)
 		return (-1);
 	return (size);
+}
 /*
  * Dump core after a system crash.
  */
 int
 eflashdump(dev_t dev, daddr_t blkno, void *va, size_t size)
+{
     /* no we dont */
     return (ENXIO);
+}
 #ifdef HAS_BAD144_HANDLING
 /*
  * Internalize the bad sector table.
  */
 void
 bad144intern(struct eflash_softc *sc)
+{
 	struct dkbad *bt = &sc->sc_dk.dk_cpulabel->bad;
 	struct disklabel *lp = sc->sc_dk.dk_label;
 	int i = 0;
 	DEBUG_PRINT(("bad144intern\n"), DEBUG_XFERS);
 	for (; i < NBT_BAD; i++) {
 		if (bt->bt_bad[i].bt_cyl == 0xffff)
 			break;
 		sc->sc_bio.badsect[i] =
 		    bt->bt_bad[i].bt_cyl * lp->d_secpercyl +
 		    (bt->bt_bad[i].bt_trksec >> 8) * lp->d_nsectors +
 		    (bt->bt_bad[i].bt_trksec & 0xff);
+	}
 	for (; i < NBT_BAD+1; i++)
 		sc->sc_bio.badsect[i] = -1;
+}
 #endif
 static void
 eflash_set_geometry(struct eflash_softc *sc)
+{
 	struct disk_geom *dg = &sc->sc_dk.dk_geom;
 	memset(dg, 0, sizeof(*dg));
 	dg->dg_secperunit = sc->sc_capacity;
 	dg->dg_secsize = DEV_BSIZE /* XXX 512? */;
 	dg->dg_nsectors = sc->sc_capacity;
 	dg->dg_ntracks = 1;
 	dg->dg_ncylinders = sc->sc_capacity;
 	disk_set_info(sc->sc_dev, &sc->sc_dk, ST506);
+}