summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/vax/mscp/mscp_disk.c24
-rw-r--r--sys/arch/vax/vsa/ncr.c26
2 files changed, 2 insertions, 48 deletions
diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c
index c2da8381392..f0ffd73281f 100644
--- a/sys/arch/vax/mscp/mscp_disk.c
+++ b/sys/arch/vax/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mscp_disk.c,v 1.11 2002/06/08 08:50:26 art Exp $ */
+/* $OpenBSD: mscp_disk.c,v 1.12 2002/06/12 12:29:15 hugh Exp $ */
/* $NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -506,28 +506,6 @@ rasize(dev)
(ra->ra_disk.dk_label->d_secsize / DEV_BSIZE);
}
-int ra_getdev(adaptor, controller, unit, uname)
- int adaptor, controller, unit;
- char **uname;
-{
- struct mscp_softc *mi;
- struct ra_softc *ra;
- int i;
-
- for (i = 0; i < ra_cd.cd_ndevs; i++) {
- if ((ra = ra_cd.cd_devs[i]) == 0)
- continue;
-
- mi = (void *)ra->ra_dev.dv_parent;
- if (mi->mi_ctlrnr == controller && mi->mi_adapnr == adaptor &&
- ra->ra_hwunit == unit) {
- *uname = ra->ra_dev.dv_xname;
- return i;
- }
- }
- return -1;
-}
-
#endif /* NRA */
#if NRX
diff --git a/sys/arch/vax/vsa/ncr.c b/sys/arch/vax/vsa/ncr.c
index ab4e9f84728..44cf132af4d 100644
--- a/sys/arch/vax/vsa/ncr.c
+++ b/sys/arch/vax/vsa/ncr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr.c,v 1.12 2001/11/06 19:53:17 miod Exp $ */
+/* $OpenBSD: ncr.c,v 1.13 2002/06/12 12:29:15 hugh Exp $ */
/* $NetBSD: ncr.c,v 1.32 2000/06/25 16:00:43 ragge Exp $ */
/*-
@@ -481,27 +481,3 @@ si_dma_stop(ncr_sc)
if (sc->onlyscsi == 0)
vsbus_dma_intr(); /* Try to start more transfers */
}
-
-int
-sd_getdev (adaptor, controller, part, unit, uname)
- int adaptor, controller, part, unit;
- char **uname;
-{
- struct sd_softc *sd;
- struct scsi_link *sl;
- int i;
-
- for (i = 0; i < sd_cd.cd_ndevs; i++) {
- if ((sd = sd_cd.cd_devs[i]) == 0)
- continue;
-
- sl = sd->sc_link;
- if (sl->target == unit && sl->scsibus == adaptor &&
- sl->lun == part) {
- *uname = sd->sc_dev.dv_xname;
- return i;
- }
- }
- return -1;
-}
-