Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/thorpej_scsipi]: src/sys/dev Remove files that should not have been added
details: https://anonhg.NetBSD.org/src/rev/aff4997f0038
branches: thorpej_scsipi
changeset: 477323:aff4997f0038
user: bouyer <bouyer%NetBSD.org@localhost>
date: Mon Nov 20 18:03:30 2000 +0000
description:
Remove files that should not have been added
diffstat:
sys/dev/eisa/ahb.c.orig | 1132 ----
sys/dev/ic/ncr53c9x.c.rej | 127 -
sys/dev/ic/ncr53c9xvar.h.rej | 43 -
sys/dev/ic/uha.c.rej | 167 -
sys/dev/isa/nca_isa.c.orig | 431 -
sys/dev/isa/nca_isa.c.rej | 76 -
sys/dev/isa/seagate.c.orig | 1456 ------
sys/dev/isa/seagate.c.rej | 124 -
sys/dev/isa/wdc_isa.c.orig | 215 -
sys/dev/isa/wds.c.orig | 1534 ------
sys/dev/isa/wds.c.rej | 498 --
sys/dev/pci/ncr.c.orig | 8213 ----------------------------------
sys/dev/pci/ncr.c.rej | 216 -
sys/dev/pci/pciide.c.orig | 3475 --------------
sys/dev/pci/pciide_apollo_reg.h.orig | 94 -
sys/dev/pci/pcscp.c.orig | 680 --
sys/dev/pci/pcscp.c.rej | 92 -
sys/dev/pcmcia/aic_pcmcia.c.orig | 256 -
18 files changed, 0 insertions(+), 18829 deletions(-)
diffs (truncated from 18901 to 300 lines):
diff -r 3ca96be5647e -r aff4997f0038 sys/dev/eisa/ahb.c.orig
--- a/sys/dev/eisa/ahb.c.orig Mon Nov 20 17:58:54 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1132 +0,0 @@
-/* $NetBSD: ahb.c.orig,v 1.1.2.1 2000/11/20 11:39:55 bouyer Exp $ */
-
-#include "opt_ddb.h"
-
-#undef AHBDEBUG
-#ifdef DDB
-#define integrate
-#else
-#define integrate static inline
-#endif
-
-/*-
- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
- * Simulation Facility, NASA Ames Research Center.
- *
- * 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.
- */
-
-/*
- * Originally written by Julian Elischer (julian%tfs.com@localhost)
- * for TRW Financial Systems for use under the MACH(2.5) operating system.
- *
- * TRW Financial Systems, in accordance with their agreement with Carnegie
- * Mellon University, makes this software available to CMU to distribute
- * or use in any manner that they see fit as long as this message is kept with
- * the software. For this reason TFS also grants any other persons or
- * organisations permission to use or modify this software.
- *
- * TFS supplies this software to be publicly redistributed
- * on the understanding that TFS is not responsible for the correct
- * functioning of this software in any circumstances.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
-#include <sys/buf.h>
-#include <sys/proc.h>
-#include <sys/user.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/scsipi/scsi_all.h>
-#include <dev/scsipi/scsipi_all.h>
-#include <dev/scsipi/scsiconf.h>
-
-#include <dev/eisa/eisareg.h>
-#include <dev/eisa/eisavar.h>
-#include <dev/eisa/eisadevs.h>
-#include <dev/eisa/ahbreg.h>
-
-#ifndef DDB
-#define Debugger() panic("should call debugger here (aha1742.c)")
-#endif /* ! DDB */
-
-#define AHB_ECB_MAX 32 /* store up to 32 ECBs at one time */
-#define ECB_HASH_SIZE 32 /* hash table size for phystokv */
-#define ECB_HASH_SHIFT 9
-#define ECB_HASH(x) ((((long)(x))>>ECB_HASH_SHIFT) & (ECB_HASH_SIZE - 1))
-
-#define AHB_MAXXFER ((AHB_NSEG - 1) << PGSHIFT)
-
-struct ahb_softc {
- struct device sc_dev;
-
- bus_space_tag_t sc_iot;
- bus_space_handle_t sc_ioh;
- bus_dma_tag_t sc_dmat;
- void *sc_ih;
-
- bus_dmamap_t sc_dmamap_ecb; /* maps the ecbs */
- struct ahb_ecb *sc_ecbs; /* all our ecbs */
-
- struct ahb_ecb *sc_ecbhash[ECB_HASH_SIZE];
- TAILQ_HEAD(, ahb_ecb) sc_free_ecb;
- struct ahb_ecb *sc_immed_ecb; /* an outstanding immediete command */
- int sc_numecbs;
- struct scsipi_link sc_link;
- struct scsipi_adapter sc_adapter;
-
- TAILQ_HEAD(, scsipi_xfer) sc_queue;
-};
-
-/*
- * Offset of an ECB from the beginning of the ECB DMA mapping.
- */
-#define AHB_ECB_OFF(e) (((u_long)(e)) - ((u_long)&sc->sc_ecbs[0]))
-
-struct ahb_probe_data {
- int sc_irq;
- int sc_scsi_dev;
-};
-
-void ahb_send_mbox __P((struct ahb_softc *, int, struct ahb_ecb *));
-void ahb_send_immed __P((struct ahb_softc *, u_int32_t, struct ahb_ecb *));
-int ahbintr __P((void *));
-void ahb_free_ecb __P((struct ahb_softc *, struct ahb_ecb *));
-struct ahb_ecb *ahb_get_ecb __P((struct ahb_softc *, int));
-struct ahb_ecb *ahb_ecb_phys_kv __P((struct ahb_softc *, physaddr));
-void ahb_done __P((struct ahb_softc *, struct ahb_ecb *));
-int ahb_find __P((bus_space_tag_t, bus_space_handle_t, struct ahb_probe_data *));
-int ahb_init __P((struct ahb_softc *));
-void ahbminphys __P((struct buf *));
-int ahb_scsi_cmd __P((struct scsipi_xfer *));
-int ahb_poll __P((struct ahb_softc *, struct scsipi_xfer *, int));
-void ahb_timeout __P((void *));
-int ahb_create_ecbs __P((struct ahb_softc *, struct ahb_ecb *, int));
-
-integrate void ahb_reset_ecb __P((struct ahb_softc *, struct ahb_ecb *));
-integrate int ahb_init_ecb __P((struct ahb_softc *, struct ahb_ecb *));
-
-/* the below structure is so we have a default dev struct for our link struct */
-struct scsipi_device ahb_dev = {
- NULL, /* Use default error handler */
- NULL, /* have a queue, served by this */
- NULL, /* have no async handler */
- NULL, /* Use default 'done' routine */
-};
-
-int ahbmatch __P((struct device *, struct cfdata *, void *));
-void ahbattach __P((struct device *, struct device *, void *));
-
-struct cfattach ahb_ca = {
- sizeof(struct ahb_softc), ahbmatch, ahbattach
-};
-
-#define AHB_ABORT_TIMEOUT 2000 /* time to wait for abort (mSec) */
-
-/*
- * Check the slots looking for a board we recognise
- * If we find one, note it's address (slot) and call
- * the actual probe routine to check it out.
- */
-int
-ahbmatch(parent, match, aux)
- struct device *parent;
- struct cfdata *match;
- void *aux;
-{
- struct eisa_attach_args *ea = aux;
- bus_space_tag_t iot = ea->ea_iot;
- bus_space_handle_t ioh;
- int rv;
-
- /* must match one of our known ID strings */
- if (strcmp(ea->ea_idstring, "ADP0000") &&
- strcmp(ea->ea_idstring, "ADP0001") &&
- strcmp(ea->ea_idstring, "ADP0002") &&
- strcmp(ea->ea_idstring, "ADP0400"))
- return (0);
-
- if (bus_space_map(iot,
- EISA_SLOT_ADDR(ea->ea_slot) + AHB_EISA_SLOT_OFFSET, AHB_EISA_IOSIZE,
- 0, &ioh))
- return (0);
-
- rv = !ahb_find(iot, ioh, NULL);
-
- bus_space_unmap(iot, ioh, AHB_EISA_IOSIZE);
-
- return (rv);
-}
-
-/*
- * Attach all the sub-devices we can find
- */
-void
-ahbattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- struct eisa_attach_args *ea = aux;
- struct ahb_softc *sc = (void *)self;
- bus_space_tag_t iot = ea->ea_iot;
- bus_space_handle_t ioh;
- eisa_chipset_tag_t ec = ea->ea_ec;
- eisa_intr_handle_t ih;
- const char *model, *intrstr;
- struct ahb_probe_data apd;
-
- if (!strcmp(ea->ea_idstring, "ADP0000"))
- model = EISA_PRODUCT_ADP0000;
- else if (!strcmp(ea->ea_idstring, "ADP0001"))
- model = EISA_PRODUCT_ADP0001;
- else if (!strcmp(ea->ea_idstring, "ADP0002"))
- model = EISA_PRODUCT_ADP0002;
- else if (!strcmp(ea->ea_idstring, "ADP0400"))
- model = EISA_PRODUCT_ADP0400;
- else
- model = "unknown model!";
- printf(": %s\n", model);
-
- if (bus_space_map(iot,
- EISA_SLOT_ADDR(ea->ea_slot) + AHB_EISA_SLOT_OFFSET, AHB_EISA_IOSIZE,
- 0, &ioh))
- panic("ahbattach: could not map I/O addresses");
-
- sc->sc_iot = iot;
- sc->sc_ioh = ioh;
- sc->sc_dmat = ea->ea_dmat;
- if (ahb_find(iot, ioh, &apd))
- panic("ahbattach: ahb_find failed!");
-
- TAILQ_INIT(&sc->sc_free_ecb);
- TAILQ_INIT(&sc->sc_queue);
-
- if (ahb_init(sc) != 0) {
- /* Error during initialization! */
- return;
- }
-
- /*
- * Fill in the adapter switch.
- */
- sc->sc_adapter.scsipi_cmd = ahb_scsi_cmd;
- sc->sc_adapter.scsipi_minphys = ahbminphys;
-
- /*
- * fill in the prototype scsipi_link.
- */
- sc->sc_link.scsipi_scsi.channel = SCSI_CHANNEL_ONLY_ONE;
- sc->sc_link.adapter_softc = sc;
- sc->sc_link.scsipi_scsi.adapter_target = apd.sc_scsi_dev;
- sc->sc_link.adapter = &sc->sc_adapter;
- sc->sc_link.device = &ahb_dev;
- sc->sc_link.openings = 4;
- sc->sc_link.scsipi_scsi.max_target = 7;
- sc->sc_link.scsipi_scsi.max_lun = 7;
- sc->sc_link.type = BUS_SCSI;
-
- if (eisa_intr_map(ec, apd.sc_irq, &ih)) {
- printf("%s: couldn't map interrupt (%d)\n",
- sc->sc_dev.dv_xname, apd.sc_irq);
- return;
- }
- intrstr = eisa_intr_string(ec, ih);
- sc->sc_ih = eisa_intr_establish(ec, ih, IST_LEVEL, IPL_BIO,
- ahbintr, sc);
- if (sc->sc_ih == NULL) {
- printf("%s: couldn't establish interrupt",
- sc->sc_dev.dv_xname);
- if (intrstr != NULL)
- printf(" at %s", intrstr);
- printf("\n");
- return;
- }
- if (intrstr != NULL)
- printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname,
- intrstr);
-
- /*
- * ask the adapter what subunits are present
- */
- config_found(self, &sc->sc_link, scsiprint);
-}
-
-/*
- * Function to send a command out through a mailbox
- */
-void
Home |
Main Index |
Thread Index |
Old Index