 @@ -1,14 +1,14 @@
-/*	$NetBSD: leo.c,v 1.17 2010/04/13 09:51:07 tsutsui Exp $	*/
+/*	$NetBSD: leo.c,v 1.18 2011/06/10 09:29:07 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1997 maximum entropy <entropy@zippy.bernstein.com>
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * 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
 @@ -37,27 +37,27 @@
  * drivers in the NetBSD distribution as examples.  The file I referred to
  * the most was /sys/arch/atari/vme/if_le_vme.c.  Due credits:
  * Copyright (c) 1997 Leo Weppelman.  All rights reserved.
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  * This code is derived from software contributed to Berkeley by
  * 	Ralph Campbell and Rick Macklem.
  * This product includes software developed by the University of
  *	California, Berkeley and its contributors.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.17 2010/04/13 09:51:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.18 2011/06/10 09:29:07 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/iomap.h>
 #include <machine/scu.h>
 #include <atari/vme/vmevar.h>
 @@ -68,62 +68,62 @@ __KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.17
 static struct leo_addresses {
 	u_long reg_addr;
 	u_int reg_size;
 	u_long mem_addr;
 	u_int mem_size;
 } leostd[] = {
 	{ 0xfed90000, 0x100, 0xfec00000, 0x100000 }
 };
 #define NLEOSTD (sizeof(leostd) / sizeof(leostd[0]))
 struct leo_softc {
-	struct device sc_dev;		/* XXX what goes here? */
+	device_t sc_dev;		/* XXX what goes here? */
 	bus_space_tag_t sc_iot;
 	bus_space_tag_t sc_memt;
 	bus_space_handle_t sc_ioh;
 	bus_space_handle_t sc_memh;
 	int sc_flags;
 	int sc_maddr;
 	u_int sc_msize;
 };
 #define LEO_SC_FLAGS_INUSE 1
-static int leo_match(struct device *, struct cfdata *, void *);
+static int leo_match(device_t, cfdata_t, void *);
-static void leo_attach(struct device *, struct device *, void *);
+static void leo_attach(device_t, device_t, void *);
 static int leo_probe(bus_space_tag_t *, bus_space_tag_t *,
 			  bus_space_handle_t *, bus_space_handle_t *,
 			  u_int, u_int);
 static int leo_init(struct leo_softc *, int);
 static int leo_scroll(struct leo_softc *, int);
-CFATTACH_DECL(leo, sizeof(struct leo_softc),
+CFATTACH_DECL_NEW(leo, sizeof(struct leo_softc),
     leo_match, leo_attach, NULL, NULL);
 dev_type_open(leoopen);
 dev_type_close(leoclose);
 dev_type_read(leomove);
 dev_type_ioctl(leoioctl);
 dev_type_mmap(leommap);
 const struct cdevsw leo_cdevsw = {
 	leoopen, leoclose, leomove, leomove, leoioctl,
 	nostop, notty, nopoll, leommap, nokqfilter,
 };
 static int
-leo_match(struct device *parent, struct cfdata *cfp, void *aux)
+leo_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct vme_attach_args *va = aux;
 	int i;
 	bus_space_tag_t iot;
 	bus_space_tag_t memt;
 	bus_space_handle_t ioh;
 	bus_space_handle_t memh;
 	/*
 	 * We are passed our configuration in the attachment arguments.
 	 * The configuration information may be partially unspecified.
 	 * For any unspecified configuration parameters, we fill in those
 	 * parameters with data for a "standard" configuration.
 @@ -195,61 +195,63 @@ leo_probe(bus_space_tag_t *iot, bus_spac
 	 * with the test pattern.
 	 */
 	bus_space_write_4(*memt, *memh, 0, 0xa5a5a5a5);
 	if ((bus_space_read_4(*memt, *memh, 0) & 0xffffff) != 0xa5a5a5)
 		return 0;
 	bus_space_write_4(*memt, *memh, msize - 4, 0xa5a5a5a5);
 	if ((bus_space_read_4(*memt, *memh, msize - 4) & 0xffffff)
 		!= 0xa5a5a5)
 		return 0;
 	return 1;
+}
 static void
-leo_attach(struct device *parent, struct device *self, void *aux)
+leo_attach(device_t parent, device_t self, void *aux)
+{
-	struct leo_softc *sc = (struct leo_softc *)self;
+	struct leo_softc *sc = device_private(self);
 	struct vme_attach_args *va = aux;
 	bus_space_handle_t ioh;
 	bus_space_handle_t memh;
 #ifndef SET_REGION
 	int i;
 #endif
 	sc->sc_dev = self;
 	printf("\n");
 	if (bus_space_map(va->va_iot, va->va_iobase, va->va_iosize, 0, &ioh))
 		panic("leo_attach: cannot map io area");
 	if (bus_space_map(va->va_memt, va->va_maddr, va->va_msize,
 			  BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_CACHEABLE, &memh))
 		panic("leo_attach: cannot map memory area");
 #ifdef SET_REGION /* XXX seems to be unimplemented on atari? */
 	bus_space_set_region_4(va->va_memt, memh, 0, 0, va->va_msize >> 2);
 #else
 	for (i = 0; i < (va->va_msize >> 2); i++)
 		bus_space_write_4(va->va_memt, memh, i << 2, 0);
 #endif
 	sc->sc_iot = va->va_iot;
 	sc->sc_ioh = ioh;
 	sc->sc_memt = va->va_memt;
 	sc->sc_memh = memh;
 	sc->sc_flags = 0;
 	sc->sc_maddr = va->va_maddr;
 	sc->sc_msize = va->va_msize;
 	leo_init(sc, 512);
 	leo_scroll(sc, 0);
+}
 int
-leoopen(dev_t dev, int flags, int devtype, struct proc *p)
+leoopen(dev_t dev, int flags, int devtype, struct lwp *l)
+{
 	struct leo_softc *sc;
 	int r;
 	sc = device_lookup_private(&leo_cd, minor(dev));
 	if (!sc)
 		return ENXIO;
 	if (sc->sc_flags & LEO_SC_FLAGS_INUSE)
 		return EBUSY;
 	r = leo_init(sc, 512);
 	if (r != 0)
 		return r;
 	r = leo_scroll(sc, 0);
 @@ -318,27 +320,27 @@ static int
 leo_scroll(struct leo_softc *sc, int scroll)
+{
 	if ((scroll < 0) || (scroll > 255))
 		return EINVAL;
         bus_space_write_1(sc->sc_iot, sc->sc_ioh, LEO_REG_MSBSCROLL,
 			  (scroll >> 6) && 0xff);
         bus_space_write_1(sc->sc_iot, sc->sc_ioh, LEO_REG_LSBSCROLL,
 			  (scroll << 2) && 0xff);
 	return 0;
+}
 int
-leoclose(dev_t dev, int flags, int devtype, struct proc *p)
+leoclose(dev_t dev, int flags, int devtype, struct lwp *l)
+{
 	struct leo_softc *sc;
 	sc = device_lookup_private(&leo_cd, minor(dev));
 	sc->sc_flags &= ~LEO_SC_FLAGS_INUSE;
 	return 0;
+}
 #define SMALLBSIZE      32
 int
 leomove(dev_t dev, struct uio *uio, int flags)
+{
 @@ -362,27 +364,27 @@ leomove(dev_t dev, struct uio *uio, int
                 if (uio->uio_rw == UIO_READ)
                         bus_space_read_region_1(sc->sc_memt, sc->sc_memh,
                                         offset, smallbuf, size);
                 if ((error = uiomove((void *)smallbuf, size, uio)))
                         return (error);
                 if (uio->uio_rw == UIO_WRITE)
                         bus_space_write_region_1(sc->sc_memt, sc->sc_memh,
                                         offset, smallbuf, size);
+        }
         return 0;
+}
 int
-leoioctl(dev_t dev, u_long cmd, void *data, int flags, struct proc *p)
+leoioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
+{
 	struct leo_softc *sc;
 	sc = device_lookup_private(&leo_cd,minor(dev));
         switch (cmd) {
         case LIOCYRES:
 		return leo_init(sc, *(int *)data);
 		break;
         case LIOCSCRL:
 		return leo_scroll(sc, *(int *)data);
 		break;
 	default:
 		return EINVAL;