Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for using ppbus(4) on acorn32. Only tested to the extent that it

Browse Source 
attaches correctly.
This commit is contained in:
bjh21 2004-01-22 13:25:51 +00:00
parent 5b067ce441
commit cbd3cc0528
2 changed files with 138 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/acorn32/conf/files.acorn32
View File

@ -1,4 +1,4 @@
# $NetBSD: files.acorn32,v 1.21 2004/01/20 19:58:00 jdolecek Exp $
# $NetBSD: files.acorn32,v 1.22 2004/01/22 13:25:51 bjh21 Exp $
#
# First try for arm-specific configuration info
#
@ -33,7 +33,11 @@ file arch/acorn32/mainbus/wdc_pioc.c wdc_pioc
# Standard parallel driver
attach lpt at pioc with lpt_pioc
file arch/acorn32/mainbus/lpt_pioc.c lpt_pioc needs-flag
file arch/acorn32/mainbus/lpt_pioc.c lpt_pioc & !ppbus needs-flag
# New parallel driver
attach atppc at pioc with atppc_pioc
file arch/acorn32/mainbus/atppc_pioc.c atppc_pioc
# Standard NetBSD fd driver
device fdc {drive = -1}

132
sys/arch/acorn32/mainbus/atppc_pioc.c Normal file
View File

@ -0,0 +1,132 @@
/* $NetBSD: atppc_pioc.c,v 1.1 2004/01/22 13:25:51 bjh21 Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
* 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.
*
* 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.
*
* FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp
*
*/
#include "opt_atppc.h"
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.1 2004/01/22 13:25:51 bjh21 Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/device.h>
#include <machine/intr.h>
#include <machine/bus.h>
#include <arch/acorn32/mainbus/piocvar.h>
#include <dev/ic/atppcreg.h>
#include <dev/ic/atppcvar.h>
#include "locators.h"
/* Probe and attach functions for a atppc device on the PIOC. */
static int atppc_pioc_probe(struct device *, struct cfdata *, void *);
static void atppc_pioc_attach(struct device *, struct device *, void *);
CFATTACH_DECL(atppc_pioc, sizeof(struct atppc_softc), atppc_pioc_probe,
atppc_pioc_attach, NULL, NULL);
#define IO_LPTSIZE 8
/*
* Probe function: find parallel port controller on isa bus. Combined from
* lpt_isa_probe() in lpt.c and atppc_detect_port() from FreeBSD's ppc.c.
*/
static int
atppc_pioc_probe(struct device *parent, struct cfdata *cf, void *aux)
{
bus_space_handle_t ioh;
struct pioc_attach_args *pa = aux;
bus_space_tag_t iot = pa->pa_iot;
int addr = pa->pa_iobase + pa->pa_offset;
int rval = 0;
if (pa->pa_name && strcmp(pa->pa_name, "lpt") != 0)
return 0;
if (pa->pa_offset == PIOCCF_OFFSET_DEFAULT) {
aprint_error("%s(%s): io port unknown.\n", __func__,
parent->dv_xname);
} else if (bus_space_map(iot, addr, IO_LPTSIZE, 0, &ioh) == 0) {
if (atppc_detect_port(iot, ioh) == 0)
rval = 1;
else
aprint_error("%s(%s): unable to write/read I/O "
"port.\n", __func__, parent->dv_xname);
bus_space_unmap(iot, ioh, IO_LPTSIZE);
} else {
aprint_error("%s(%s): attempt to map bus space failed.\n",
__func__, parent->dv_xname);
}
return rval;
}
/* Attach function: attach and configure parallel port controller on isa bus. */
static void
atppc_pioc_attach(struct device *parent, struct device *self, void *aux)
{
struct atppc_softc *sc = (struct atppc_softc *)self;
struct pioc_attach_args *pa = aux;
bus_addr_t iobase;
sc->sc_iot = pa->pa_iot;
sc->sc_has = 0;
iobase = pa->pa_iobase + pa->pa_offset;
if (bus_space_map(sc->sc_iot, iobase, IO_LPTSIZE, 0,
&sc->sc_ioh) != 0) {
aprint_error(": attempt to map bus space failed, device not "
"properly attached.\n");
sc->sc_dev_ok = ATPPC_NOATTACH;
return;
}
sc->sc_dev_ok = ATPPC_ATTACHED;
/* Assign interrupt handler */
if (!(self->dv_cfdata->cf_flags & ATPPC_FLAG_DISABLE_INTR)) {
if (pa->pa_irq != MAINBUSCF_IRQ_DEFAULT) {
/* Establish interrupt handler. */
sc->sc_ieh = intr_claim(pa->pa_irq, IPL_TTY, "atppc",
atppcintr, sc);
sc->sc_has |= ATPPC_HAS_INTR;
} else
ATPPC_DPRINTF(("%s: IRQ not assigned or bad number of "
"IRQs.\n", self->dv_xname));
} else
ATPPC_VPRINTF(("%s: interrupts not configured due to flags.\n",
self->dv_xname));
/* Run soft configuration attach */
atppc_sc_attach(sc);
}