Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi move spic_acpi to arch/i386/acpi
details: https://anonhg.NetBSD.org/src/rev/1b4014488920
branches: trunk
changeset: 532911:1b4014488920
user: christos <christos%NetBSD.org@localhost>
date: Mon Jun 17 22:39:25 2002 +0000
description:
move spic_acpi to arch/i386/acpi
diffstat:
sys/dev/acpi/files.acpi | 6 +-
sys/dev/acpi/spic_acpi.c | 140 -----------------------------------------------
2 files changed, 1 insertions(+), 145 deletions(-)
diffs (161 lines):
diff -r 291de21c3e07 -r 1b4014488920 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi Mon Jun 17 22:38:31 2002 +0000
+++ b/sys/dev/acpi/files.acpi Mon Jun 17 22:39:25 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.6 2002/04/22 12:42:56 augustss Exp $
+# $NetBSD: files.acpi,v 1.7 2002/06/17 22:39:25 christos Exp $
include "dev/acpi/acpica/files.acpica"
@@ -33,7 +33,3 @@
device acpibat
attach acpibat at acpi
file dev/acpi/acpi_bat.c acpibat
-
-# Sony SPIC (jog dial etc.)
-attach spic at acpi with spic_acpi
-file dev/acpi/spic_acpi.c spic_acpi
diff -r 291de21c3e07 -r 1b4014488920 sys/dev/acpi/spic_acpi.c
--- a/sys/dev/acpi/spic_acpi.c Mon Jun 17 22:38:31 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/* $NetBSD: spic_acpi.c,v 1.2 2002/06/13 16:48:34 augustss Exp $ */
-
-/*
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart%augustsson.net@localhost).
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.2 2002/06/13 16:48:34 augustss Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/callout.h>
-
-#include <machine/bus.h>
-
-void *isa_intr_establish(void *ic, int irq, int type,
- int level, int (*ih_fun)(void *), void *ih_arg);
-
-#include <dev/ic/spicvar.h>
-
-#include <dev/acpi/acpica.h>
-#include <dev/acpi/acpivar.h>
-
-struct spic_acpi_softc {
- struct spic_softc sc_spic; /* spic device */
-
- struct acpi_devnode *sc_node; /* our ACPI devnode */
-
- struct acpi_resources sc_res; /* our bus resources */
-
- void *sc_ih;
-};
-
-int spic_acpi_match(struct device *, struct cfdata *, void *);
-void spic_acpi_attach(struct device *, struct device *, void *);
-
-struct cfattach spic_acpi_ca = {
- sizeof(struct spic_acpi_softc), spic_acpi_match, spic_acpi_attach,
- /* spic_acpi_detach, spic_acpi_activate */
-};
-
-int
-spic_acpi_match(struct device *parent, struct cfdata *match, void *aux)
-{
- struct acpi_attach_args *aa = aux;
-
- if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
- return (0);
-
- if (strcmp(aa->aa_node->ad_devinfo.HardwareId, "SNY6001") == 0)
- return (1);
-
- return (0);
-}
-
-void
-spic_acpi_attach(struct device *parent, struct device *self, void *aux)
-{
- struct spic_acpi_softc *sc = (void *) self;
- struct acpi_attach_args *aa = aux;
- struct acpi_io *io;
- struct acpi_irq *irq;
- ACPI_STATUS rv;
-
- printf(": Sony Programmable I/O Controller\n");
-
- sc->sc_node = aa->aa_node;
-
- /* Parse our resources. */
- rv = acpi_resource_parse(&sc->sc_spic.sc_dev, sc->sc_node, &sc->sc_res,
- &acpi_resource_parse_ops_default);
- if (rv != AE_OK) {
- printf("%s: unable to parse resources: %d\n",
- sc->sc_spic.sc_dev.dv_xname, rv);
- return;
- }
-
- sc->sc_spic.sc_iot = aa->aa_iot;
- io = acpi_res_io(&sc->sc_res, 0);
- if (io == NULL) {
- printf("%s: unable to find io resource\n",
- sc->sc_spic.sc_dev.dv_xname);
- return;
- }
- if (bus_space_map(sc->sc_spic.sc_iot, io->ar_base, io->ar_length,
- 0, &sc->sc_spic.sc_ioh) != 0) {
- printf("%s: unable to map data register\n",
- sc->sc_spic.sc_dev.dv_xname);
- return;
- }
- irq = acpi_res_irq(&sc->sc_res, 0);
- if (irq == NULL) {
- printf("%s: unable to find irq resource\n",
- sc->sc_spic.sc_dev.dv_xname);
- /* XXX unmap */
- return;
- }
-#if 0
- sc->sc_ih = isa_intr_establish(NULL, irq->ar_irq,
- IST_EDGE, IPL_TTY, spic_intr, sc);
-#endif
-
- spic_attach(&sc->sc_spic);
-}
-
Home |
Main Index |
Thread Index |
Old Index