Author: rwatson
Date: Sun Jan 13 16:21:51 2013
New Revision: 245372
URL: http://svnweb.freebsd.org/changeset/base/245372
Log:
Merge Perforce changeset 219937 to head:
Copy Terasic MTL nexus bus attachment as a starting point for an
FDT attachment for the same driver.
Sponsored by: DARPA, AFRL
Added:
head/sys/dev/terasic/mtl/terasic_mtl_fdt.c
- copied unchanged from r245363,
head/sys/dev/terasic/mtl/terasic_mtl_nexus.c
Copied: head/sys/dev/terasic/mtl/terasic_mtl_fdt.c (from r245363,
head/sys/dev/terasic/mtl/terasic_mtl_nexus.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/dev/terasic/mtl/terasic_mtl_fdt.c Sun Jan 13 16:21:51 2013
(r245372, copy of r245363, head/sys/dev/terasic/mtl/terasic_mtl_nexus.c)
@@ -0,0 +1,196 @@
+/*-
+ * Copyright (c) 2012 Robert N. M. Watson
+ * All rights reserved.
+ *
+ * This software was developed by SRI International and the University of
+ * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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 AUTHOR 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 AUTHOR 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>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/condvar.h>
+#include <sys/conf.h>
+#include <sys/consio.h> /* struct vt_mode */
+#include <sys/fbio.h> /* video_adapter_t */
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/rman.h>
+#include <sys/systm.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <dev/terasic/mtl/terasic_mtl.h>
+
+static int
+terasic_mtl_nexus_probe(device_t dev)
+{
+
+ device_set_desc(dev, "Terasic Multi-touch LCD (MTL)");
+ return (BUS_PROBE_DEFAULT);
+}
+
+static int
+terasic_mtl_nexus_attach(device_t dev)
+{
+ struct terasic_mtl_softc *sc;
+ u_long pixel_maddr, text_maddr, reg_maddr;
+ u_long pixel_msize, text_msize, reg_msize;
+ int error;
+
+ sc = device_get_softc(dev);
+ sc->mtl_dev = dev;
+ sc->mtl_unit = device_get_unit(dev);
+
+ /*
+ * Query non-standard hints to find the locations of our two memory
+ * regions. Enforce certain alignment and size requirements.
+ */
+ if (resource_long_value(device_get_name(dev), device_get_unit(dev),
+ "reg_maddr", ®_maddr) != 0 || (reg_maddr % PAGE_SIZE != 0)) {
+ device_printf(dev, "improper register address");
+ return (ENXIO);
+ }
+ if (resource_long_value(device_get_name(dev), device_get_unit(dev),
+ "reg_msize", ®_msize) != 0 || (reg_msize % PAGE_SIZE != 0)) {
+ device_printf(dev, "improper register size");
+ return (ENXIO);
+ }
+ if (resource_long_value(device_get_name(dev), device_get_unit(dev),
+ "pixel_maddr", &pixel_maddr) != 0 ||
+ (pixel_maddr % PAGE_SIZE != 0)) {
+ device_printf(dev, "improper pixel frame buffer address");
+ return (ENXIO);
+ }
+ if (resource_long_value(device_get_name(dev), device_get_unit(dev),
+ "pixel_msize", &pixel_msize) != 0 ||
+ (pixel_msize % PAGE_SIZE != 0)) {
+ device_printf(dev, "improper pixel frame buffer size");
+ return (ENXIO);
+ }
+ if (resource_long_value(device_get_name(dev), device_get_unit(dev),
+ "text_maddr", &text_maddr) != 0 ||
+ (text_maddr % PAGE_SIZE != 0)) {
+ device_printf(dev, "improper text frame buffer address");
+ return (ENXIO);
+ }
+ if (resource_long_value(device_get_name(dev), device_get_unit(dev),
+ "text_msize", &text_msize) != 0 ||
+ (text_msize % PAGE_SIZE != 0)) {
+ device_printf(dev, "improper text frame buffer size");
+ return (ENXIO);
+ }
+
+ /*
+ * Allocate resources.
+ */
+ sc->mtl_reg_rid = 0;
+ sc->mtl_reg_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
+ &sc->mtl_reg_rid, reg_maddr, reg_maddr + reg_msize - 1,
+ reg_msize, RF_ACTIVE);
+ if (sc->mtl_reg_res == NULL) {
+ device_printf(dev, "couldn't map register memory\n");
+ error = ENXIO;
+ goto error;
+ }
+ device_printf(sc->mtl_dev, "registers at mem %p-%p\n",
+ (void *)reg_maddr, (void *)(reg_maddr + reg_msize));
+ sc->mtl_pixel_rid = 0;
+ sc->mtl_pixel_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
+ &sc->mtl_pixel_rid, pixel_maddr, pixel_maddr + pixel_msize - 1,
+ pixel_msize, RF_ACTIVE);
+ if (sc->mtl_pixel_res == NULL) {
+ device_printf(dev, "couldn't map pixel memory\n");
+ error = ENXIO;
+ goto error;
+ }
+ device_printf(sc->mtl_dev, "pixel frame buffer at mem %p-%p\n",
+ (void *)pixel_maddr, (void *)(pixel_maddr + pixel_msize));
+ sc->mtl_text_rid = 0;
+ sc->mtl_text_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
+ &sc->mtl_text_rid, text_maddr, text_maddr + text_msize - 1,
+ text_msize, RF_ACTIVE);
+ if (sc->mtl_text_res == NULL) {
+ device_printf(dev, "couldn't map text memory\n");
+ error = ENXIO;
+ goto error;
+ }
+ device_printf(sc->mtl_dev, "text frame buffer at mem %p-%p\n",
+ (void *)text_maddr, (void *)(text_maddr + text_msize));
+ error = terasic_mtl_attach(sc);
+ if (error == 0)
+ return (0);
+error:
+ if (sc->mtl_text_res != NULL)
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->mtl_text_rid,
+ sc->mtl_text_res);
+ if (sc->mtl_pixel_res != NULL)
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->mtl_pixel_rid,
+ sc->mtl_pixel_res);
+ if (sc->mtl_reg_res != NULL)
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->mtl_reg_rid,
+ sc->mtl_reg_res);
+ return (error);
+}
+
+static int
+terasic_mtl_nexus_detach(device_t dev)
+{
+ struct terasic_mtl_softc *sc;
+
+ sc = device_get_softc(dev);
+ terasic_mtl_detach(sc);
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->mtl_text_rid,
+ sc->mtl_text_res);
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->mtl_pixel_rid,
+ sc->mtl_pixel_res);
+ bus_release_resource(dev, SYS_RES_MEMORY, sc->mtl_reg_rid,
+ sc->mtl_reg_res);
+ return (0);
+}
+
+static device_method_t terasic_mtl_nexus_methods[] = {
+ DEVMETHOD(device_probe, terasic_mtl_nexus_probe),
+ DEVMETHOD(device_attach, terasic_mtl_nexus_attach),
+ DEVMETHOD(device_detach, terasic_mtl_nexus_detach),
+ { 0, 0 }
+};
+
+static driver_t terasic_mtl_nexus_driver = {
+ "terasic_mtl",
+ terasic_mtl_nexus_methods,
+ sizeof(struct terasic_mtl_softc),
+};
+
+static devclass_t terasic_mtl_devclass;
+
+DRIVER_MODULE(mtl, nexus, terasic_mtl_nexus_driver, terasic_mtl_devclass, 0,
+ 0);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
