 @@ -1,14 +1,14 @@
-/*	$NetBSD: nvram.c,v 1.19 2011/06/05 06:33:43 tsutsui Exp $	*/
+/*	$NetBSD: nvram.c,v 1.20 2015/03/06 12:41:05 christos Exp $	*/
 /*
  * Copyright (c) 1995 Leo Weppelman.
  * 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.
 @@ -20,47 +20,53 @@
  * 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.
  */
 /*
  * Nvram driver
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.19 2011/06/05 06:33:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.20 2015/03/06 12:41:05 christos Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <machine/iomap.h>
 #include <machine/cpu.h>
 #include <atari/dev/clockreg.h>
 #include <atari/dev/nvramvar.h>
 #include "ioconf.h"
 #include "nvr.h"
 #ifdef NVRAM_DEBUG
 #define DPRINTF(a) printf a
 #else
 #define DPRINTF(a)
 #endif
 #define	MC_NVRAM_CSUM	(MC_NVRAM_START + MC_NVRAM_SIZE - 2)
 #if NNVR > 0
 static void	nvram_set_csum(u_char csum);
 static int	nvram_csum_valid(u_char csum);
 static u_char	nvram_csum(void);
 /*
  * Auto config stuff....
  */
 static void	nvr_attach(device_t, device_t, void *);
 static int	nvr_match(device_t, cfdata_t, void *);
 @@ -126,44 +132,40 @@ int
 nvram_uio(struct uio *uio)
+{
 	int			i;
 	off_t			offset;
 	int			nleft;
 	u_char			buf[MC_NVRAM_CSUM - MC_NVRAM_START + 1];
 	u_char			*p;
 	struct nvr_softc	*sc;
 	sc = device_lookup_private(&nvr_cd,0);
 	if (!(sc->sc_flags & NVR_CONFIGURED))
 		return ENXIO;
-#ifdef NV_DEBUG
+	DPRINTF(("Request to transfer %d bytes offset: %d, %s nvram\n",
 	printf("Request to transfer %d bytes offset: %d, %s nvram\n",
 				(long)uio->uio_resid, (long)uio->uio_offset,
-				(uio->uio_rw == UIO_READ) ? "from" : "to");
+				(uio->uio_rw == UIO_READ) ? "from" : "to"));
 #endif /* NV_DEBUG */
 	offset = uio->uio_offset + MC_NVRAM_START;
 	nleft  = uio->uio_resid;
 	if (offset + nleft >= MC_NVRAM_CSUM) {
 		if (offset == MC_NVRAM_CSUM)
 			return (0);
 		nleft = MC_NVRAM_CSUM - offset;
 		if (nleft <= 0)
 			return (EINVAL);
+	}
-#ifdef NV_DEBUG
+	DPRINTF(("Translated: offset = %d, bytes: %d\n", (long)offset, nleft));
 	printf("Translated: offset = %d, bytes: %d\n", (long)offset, nleft);
 #endif /* NV_DEBUG */
 	if (uio->uio_rw == UIO_READ) {
 		for (i = 0, p = buf; i < nleft; i++, p++)
 			*p =  mc146818_read(RTC, offset + i);
+	}
 	if ((i = uiomove(buf, nleft, uio)) != 0)
 		return (i);
 	if (uio->uio_rw == UIO_WRITE) {
 		for (i = 0, p = buf; i < nleft; i++, p++)
 			mc146818_write(RTC, offset + i, *p);
 		nvram_set_csum(nvram_csum());
+	}
 	return(0);