diff options
Diffstat (limited to 'sys/pci')
-rw-r--r-- | sys/pci/ide_pci.c | 10 | ||||
-rw-r--r-- | sys/pci/pci.c | 6 | ||||
-rw-r--r-- | sys/pci/tek390.c | 14 |
3 files changed, 7 insertions, 23 deletions
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c index b3a301f..0045b8b 100644 --- a/sys/pci/ide_pci.c +++ b/sys/pci/ide_pci.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: wd82371.c,v 1.5.2.1 1996/11/16 21:19:51 phk Exp $ + * $Id: ide_pci.c,v 1.4 1997/09/20 07:41:55 dyson Exp $ */ #include "pci.h" @@ -157,7 +157,6 @@ static int ide_pci_dmasetup(void *, char *, u_long, int); static void ide_pci_dmastart(void *); static int ide_pci_dmadone(void *); static int ide_pci_status(void *); -static int ide_pci_timing(void *, int); static int ide_pci_iobase(void *xcp); static int ide_pci_altiobase(void *xcp); @@ -484,7 +483,7 @@ static void promise_status(struct ide_pci_cookie *cookie) { pcici_t tag; - int i,j; + int i; u_int32_t port0_command, port0_altstatus; u_int32_t port1_command, port1_altstatus; u_int32_t dma_block; @@ -930,7 +929,6 @@ ide_pci_probe(pcici_t tag, pcidi_t type) static void ide_pci_attach(pcici_t tag, int unit) { - u_long idetm; u_long class, cmd; int bmista_1, bmista_2; int iobase_wd_1, iobase_wd_2, iobase_bm_1, iobase_bm_2; @@ -1031,7 +1029,7 @@ ide_pci: giving up\n"); * addresses, from a PCI device to an ISA probe. Sorry :-). */ if (iobase_wd_1 != IO_WD1) { - struct isa_device *dvp, *dvp1, *dvup, *dvup1; + struct isa_device *dvp, *dvp1, *dvup; for( dvp = isa_devtab_bio; dvp->id_id != 0; dvp++) { @@ -1261,8 +1259,6 @@ ide_pci_dmasetup(void *xcp, char *vaddr, u_long vcount, int dir) u_long prd_base, prd_count; u_long nbase, ncount, nend; int iobase_bm; - static int trashmore = 0xdeadbeef; - static int *trashmore_p = 0; u_long count, checkcount; prd = cp->prd; diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 468ec05..f94498d 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: pci.c,v 1.78 1997/08/02 14:33:12 bde Exp $ + * $Id: pci.c,v 1.79 1997/09/14 03:19:36 peter Exp $ * */ @@ -357,6 +357,7 @@ pci_readcfg(pcicfgregs *probe) return (cfg); } +#if 0 /* free pcicfgregs structure and all depending data structures */ static int @@ -369,6 +370,7 @@ pci_freecfg(pcicfgregs *cfg) free(cfg, M_DEVBUF); return (0); } +#endif static void pci_addcfg(pcicfgregs *cfg) @@ -491,9 +493,7 @@ pci_close(dev_t dev, int flag, int devtype, struct proc *p) static int pci_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { - struct pci_conf_io *cio; struct pci_io *io; - size_t iolen; int error; if (cmd != PCIOCGETCONF && !(flag & FWRITE)) diff --git a/sys/pci/tek390.c b/sys/pci/tek390.c index b9283dd..9b4bcd2 100644 --- a/sys/pci/tek390.c +++ b/sys/pci/tek390.c @@ -123,7 +123,6 @@ static void DC390_InvalidCmd( PACB pACB ); * XXX No timeouts are scheduled in this driver as the timeout handler * doesn't do anything yet!!! */ -static void DC390_timeout( void *arg1); static void DC390_reset (PACB pACB); static PUCHAR phystovirt( PSRB pSRB, ULONG xferCnt ); @@ -217,9 +216,7 @@ static PACB pACB_current = NULL; static PDCB pPrevDCB = NULL; static USHORT adapterCnt = 0; static USHORT CurrSyncOffset = 0; -static USHORT mech2Agent; -static ULONG mech1addr; -static UCHAR mech2bus, mech2CfgSPenR, CurrentID, CurrentLUN; +static UCHAR CurrentID, CurrentLUN; static PVOID DC390_phase0[]={ DC390_DataOut_0, @@ -984,15 +981,6 @@ DC390_reset (PACB pACB) } -void -DC390_timeout( void *arg1) -{ - PSRB pSRB; - - pSRB = (PSRB) arg1; -} - - #include <pci/scsiiom.c> |