Author: rwatson
Date: Sun Jan 13 15:13:25 2013
New Revision: 245368
URL: http://svnweb.freebsd.org/changeset/base/245368

Log:
  Merge Perforce changeset 219926 to head:
  
    Copy Altera SDCard nexus attachment as a starting point for the FDT
    attachment.
  
  Sponsored by: DARPA, AFRL

Added:
  head/sys/dev/altera/sdcard/altera_sdcard_fdt.c
     - copied unchanged from r245363, 
head/sys/dev/altera/sdcard/altera_sdcard_nexus.c

Copied: head/sys/dev/altera/sdcard/altera_sdcard_fdt.c (from r245363, 
head/sys/dev/altera/sdcard/altera_sdcard_nexus.c)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/dev/altera/sdcard/altera_sdcard_fdt.c      Sun Jan 13 15:13:25 
2013        (r245368, copy of r245363, 
head/sys/dev/altera/sdcard/altera_sdcard_nexus.c)
@@ -0,0 +1,116 @@
+/*-
+ * 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/bio.h>
+#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 <sys/taskqueue.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <geom/geom_disk.h>
+
+#include <dev/altera/sdcard/altera_sdcard.h>
+
+/*
+ * Nexus bus attachment for the Altera SD Card IP core.  Appropriate for most
+ * Altera FPGA SoC-style configurations in which the IP core will be exposed
+ * to the processor via a memory-mapped Avalon bus.
+ */
+static int
+altera_sdcard_nexus_probe(device_t dev)
+{
+
+       device_set_desc(dev, "Altera Secure Data Card IP Core");
+       return (BUS_PROBE_DEFAULT);
+}
+
+static int
+altera_sdcard_nexus_attach(device_t dev)
+{
+       struct altera_sdcard_softc *sc;
+
+       sc = device_get_softc(dev);
+       sc->as_dev = dev;
+       sc->as_unit = device_get_unit(dev);
+       sc->as_rid = 0;
+       sc->as_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+           &sc->as_rid, RF_ACTIVE);
+       if (sc->as_res == NULL) {
+               device_printf(dev, "couldn't map memory\n");
+               return (ENXIO);
+       }
+       altera_sdcard_attach(sc);
+       return (0);
+}
+
+static int
+altera_sdcard_nexus_detach(device_t dev)
+{
+       struct altera_sdcard_softc *sc;
+
+       sc = device_get_softc(dev);
+       KASSERT(sc->as_res != NULL, ("%s: resources not allocated",
+           __func__));
+       altera_sdcard_detach(sc);
+       bus_release_resource(dev, SYS_RES_MEMORY, sc->as_rid, sc->as_res);
+       return (0);
+}
+
+static device_method_t altera_sdcard_nexus_methods[] = {
+       DEVMETHOD(device_probe,         altera_sdcard_nexus_probe),
+       DEVMETHOD(device_attach,        altera_sdcard_nexus_attach),
+       DEVMETHOD(device_detach,        altera_sdcard_nexus_detach),
+       { 0, 0 }
+};
+
+static driver_t altera_sdcard_nexus_driver = {
+       "altera_sdcardc",
+       altera_sdcard_nexus_methods,
+       sizeof(struct altera_sdcard_softc),
+};
+
+static devclass_t altera_sdcard_devclass;
+
+DRIVER_MODULE(altera_sdcard, nexus, altera_sdcard_nexus_driver,
+    altera_sdcard_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"

Reply via email to