diff options
33 files changed, 76 insertions, 76 deletions
diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c index 4b9042c52a0..244fe78d0c3 100644 --- a/sys/arch/alpha/alpha/api_up1000.c +++ b/sys/arch/alpha/alpha/api_up1000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: api_up1000.c,v 1.7 2004/07/18 02:29:11 deraadt Exp $ */ +/* $OpenBSD: api_up1000.c,v 1.8 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $ */ /* @@ -220,7 +220,7 @@ api_up1000_device_register(dev, aux) (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd"))) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; if (parent->dv_parent != scsidev) return; diff --git a/sys/arch/alpha/alpha/dec_1000a.c b/sys/arch/alpha/alpha/dec_1000a.c index 8c0162d06e1..76a6b3b3605 100644 --- a/sys/arch/alpha/alpha/dec_1000a.c +++ b/sys/arch/alpha/alpha/dec_1000a.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_1000a.c,v 1.3 2005/05/09 21:55:12 martin Exp $ */ +/* $OpenBSD: dec_1000a.c,v 1.4 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_1000a.c,v 1.14 2001/06/05 04:53:11 thorpej Exp $ */ /* @@ -319,7 +319,7 @@ dec_1000a_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c index cbf973d09b3..52ded48e041 100644 --- a/sys/arch/alpha/alpha/dec_2100_a50.c +++ b/sys/arch/alpha/alpha/dec_2100_a50.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_2100_a50.c,v 1.17 2005/05/09 21:55:12 martin Exp $ */ +/* $OpenBSD: dec_2100_a50.c,v 1.18 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */ /* @@ -238,7 +238,7 @@ dec_2100_a50_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/alpha/alpha/dec_3000_300.c b/sys/arch/alpha/alpha/dec_3000_300.c index 03ea5243398..84607a6aa9d 100644 --- a/sys/arch/alpha/alpha/dec_3000_300.c +++ b/sys/arch/alpha/alpha/dec_3000_300.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_3000_300.c,v 1.11 2002/06/25 21:33:19 miod Exp $ */ +/* $OpenBSD: dec_3000_300.c,v 1.12 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_3000_300.c,v 1.30 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -226,7 +226,7 @@ dec_3000_300_device_register(dev, aux) (strcmp(cd->cd_name, "sd") == 0 || strcmp(cd->cd_name, "st") == 0 || strcmp(cd->cd_name, "cd") == 0)) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; if (parent->dv_parent != scsidev) return; diff --git a/sys/arch/alpha/alpha/dec_3000_500.c b/sys/arch/alpha/alpha/dec_3000_500.c index 3a614b64f8f..93f69538cfe 100644 --- a/sys/arch/alpha/alpha/dec_3000_500.c +++ b/sys/arch/alpha/alpha/dec_3000_500.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_3000_500.c,v 1.11 2002/06/25 21:33:19 miod Exp $ */ +/* $OpenBSD: dec_3000_500.c,v 1.12 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_3000_500.c,v 1.29 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -245,7 +245,7 @@ dec_3000_500_device_register(dev, aux) (strcmp(cd->cd_name, "sd") == 0 || strcmp(cd->cd_name, "st") == 0 || strcmp(cd->cd_name, "cd") == 0)) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; if (parent->dv_parent != scsidev) return; diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c index dbbf15277a2..6a8ef78cbe2 100644 --- a/sys/arch/alpha/alpha/dec_550.c +++ b/sys/arch/alpha/alpha/dec_550.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_550.c,v 1.9 2005/05/09 21:55:12 martin Exp $ */ +/* $OpenBSD: dec_550.c,v 1.10 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $ */ /* @@ -226,7 +226,7 @@ dec_550_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c index 704cd7cf8b5..20c1e9d3431 100644 --- a/sys/arch/alpha/alpha/dec_6600.c +++ b/sys/arch/alpha/alpha/dec_6600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_6600.c,v 1.8 2005/05/09 21:55:12 martin Exp $ */ +/* $OpenBSD: dec_6600.c,v 1.9 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */ /* @@ -253,7 +253,7 @@ dec_6600_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c index 5385a486ded..42662b098ef 100644 --- a/sys/arch/alpha/alpha/dec_axppci_33.c +++ b/sys/arch/alpha/alpha/dec_axppci_33.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_axppci_33.c,v 1.18 2005/05/09 21:55:12 martin Exp $ */ +/* $OpenBSD: dec_axppci_33.c,v 1.19 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -272,7 +272,7 @@ dec_axppci_33_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/alpha/alpha/dec_eb164.c b/sys/arch/alpha/alpha/dec_eb164.c index d245fc28932..61150dd9f0f 100644 --- a/sys/arch/alpha/alpha/dec_eb164.c +++ b/sys/arch/alpha/alpha/dec_eb164.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_eb164.c,v 1.13 2006/07/16 21:52:05 miod Exp $ */ +/* $OpenBSD: dec_eb164.c,v 1.14 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_eb164.c,v 1.33 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -228,7 +228,7 @@ dec_eb164_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/alpha/alpha/dec_eb64plus.c b/sys/arch/alpha/alpha/dec_eb64plus.c index cfb8fd8708e..4f73bdd1672 100644 --- a/sys/arch/alpha/alpha/dec_eb64plus.c +++ b/sys/arch/alpha/alpha/dec_eb64plus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_eb64plus.c,v 1.4 2005/05/09 21:55:12 martin Exp $ */ +/* $OpenBSD: dec_eb64plus.c,v 1.5 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_eb64plus.c,v 1.25 2001/06/05 04:53:11 thorpej Exp $ */ /* @@ -231,7 +231,7 @@ dec_eb64plus_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c index cd545c112c1..9735679d88f 100644 --- a/sys/arch/alpha/alpha/dec_kn20aa.c +++ b/sys/arch/alpha/alpha/dec_kn20aa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dec_kn20aa.c,v 1.16 2005/05/09 21:55:12 martin Exp $ */ +/* $OpenBSD: dec_kn20aa.c,v 1.17 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp $ */ /* @@ -229,7 +229,7 @@ dec_kn20aa_device_register(dev, aux) if (!strcmp(cd->cd_name, "sd") || !strcmp(cd->cd_name, "st") || !strcmp(cd->cd_name, "cd")) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *periph = sa->sa_sc_link; int unit; diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c index eb59e03d38d..10314957658 100644 --- a/sys/arch/hp300/hp300/autoconf.c +++ b/sys/arch/hp300/hp300/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.38 2006/06/24 13:20:17 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.39 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: autoconf.c,v 1.45 1999/04/10 17:31:02 kleink Exp $ */ /* @@ -378,7 +378,7 @@ device_register(dev, aux) if (device_match(dev->dv_xname, "cd") == 0 || device_match(dev->dv_xname, "sd") == 0 || device_match(dev->dv_xname, "st") == 0) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; dd->dd_slave = sa->sa_sc_link->target; dd->dd_punit = sa->sa_sc_link->lun; diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c index 1c9d0ea8325..feba7c42f2f 100644 --- a/sys/arch/hppa/hppa/autoconf.c +++ b/sys/arch/hppa/hppa/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.44 2005/12/27 18:31:08 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.45 2006/11/28 16:56:50 dlg Exp $ */ /* * Copyright (c) 1998-2003 Michael Shalayeff @@ -825,7 +825,7 @@ device_register(struct device *dev, void *aux) #if NCD > 0 || NSD > 0 || NST > 0 if (strcmp(basename, "sd") == 0 || strcmp(basename, "cd") == 0 || strcmp(basename, "st") == 0) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sl = sa->sa_sc_link; /* diff --git a/sys/arch/hppa64/hppa64/autoconf.c b/sys/arch/hppa64/hppa64/autoconf.c index ef93254bdab..96d405eadcd 100644 --- a/sys/arch/hppa64/hppa64/autoconf.c +++ b/sys/arch/hppa64/hppa64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.4 2005/12/27 18:31:09 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.5 2006/11/28 16:56:50 dlg Exp $ */ /* * Copyright (c) 1998-2005 Michael Shalayeff @@ -884,7 +884,7 @@ device_register(struct device *dev, void *aux) #if NCD > 0 || NSD > 0 || NST > 0 if (strcmp(basename, "sd") == 0 || strcmp(basename, "cd") == 0 || strcmp(basename, "st") == 0) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sl = sa->sa_sc_link; /* diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c index 52908534a7c..62f05b20a47 100644 --- a/sys/arch/luna88k/luna88k/autoconf.c +++ b/sys/arch/luna88k/luna88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.7 2006/01/26 07:11:08 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.8 2006/11/28 16:56:50 dlg Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -426,7 +426,7 @@ device_register(struct device *dev, void *aux) */ if (strncmp("sd", dev->dv_xname, 2) == 0 || strncmp("cd", dev->dv_xname, 2) == 0) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct device *spcsc; spcsc = dev->dv_parent->dv_parent; diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c index 43bbd9de2b8..ee6d6ea4d72 100644 --- a/sys/arch/mvme68k/mvme68k/autoconf.c +++ b/sys/arch/mvme68k/mvme68k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.35 2006/07/10 19:23:25 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.36 2006/11/28 16:56:50 dlg Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -555,7 +555,7 @@ device_register(struct device *dev, void *aux) */ if (strncmp("sd", dev->dv_xname, 2) == 0 || strncmp("cd", dev->dv_xname, 2) == 0) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int target, lun; #ifdef MVME147 /* diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c index cede04bd2cc..6c6a779f47e 100644 --- a/sys/arch/mvme88k/mvme88k/autoconf.c +++ b/sys/arch/mvme88k/mvme88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.34 2006/05/02 21:43:09 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.35 2006/11/28 16:56:50 dlg Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -385,7 +385,7 @@ device_register(struct device *dev, void *aux) */ if (strncmp("cd", dev->dv_xname, 2) == 0 || strncmp("sd", dev->dv_xname, 2) == 0) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int target, bus, lun; if (get_target(&target, &bus, &lun) != 0) diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 97ff7b46a9f..9ad0e42534a 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.73 2006/07/24 18:27:36 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.74 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -2175,7 +2175,7 @@ device_register(struct device *dev, void *aux) */ if (strncmp("sd", dev->dv_xname, 2) == 0 || strncmp("cd", dev->dv_xname, 2) == 0) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsibus_softc *sbsc; int target, lun; diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index e17d64053b6..2fd2316d9dc 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.57 2006/08/10 01:11:13 gwk Exp $ */ +/* $OpenBSD: autoconf.c,v 1.58 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -1685,7 +1685,7 @@ device_register(dev, aux) * device to determine whether this target is on the * correct controller in our boot path. */ - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sl = sa->sa_sc_link; struct scsibus_softc *sbsc = (struct scsibus_softc *)dev->dv_parent; diff --git a/sys/arch/vax/vax/autoconf.c b/sys/arch/vax/vax/autoconf.c index 057cae61024..8741725e6af 100644 --- a/sys/arch/vax/vax/autoconf.c +++ b/sys/arch/vax/vax/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.23 2006/07/23 19:23:09 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.24 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: autoconf.c,v 1.45 1999/10/23 14:56:05 ragge Exp $ */ /* @@ -323,7 +323,7 @@ booted_qe(struct device *dev, void *aux) int booted_sd(struct device *dev, void *aux) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct device *ppdev; /* Is this a SCSI device? */ diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 19ebf06f078..1eab6c06942 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.115 2006/11/27 23:14:22 beck Exp $ */ +/* $OpenBSD: cd.c,v 1.116 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -176,7 +176,7 @@ cdmatch(parent, match, aux) struct device *parent; void *match, *aux; { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int priority; (void)scsi_inqmatch(sa->sa_inqbuf, @@ -195,7 +195,7 @@ cdattach(parent, self, aux) void *aux; { struct cd_softc *cd = (void *)self; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sc_link = sa->sa_sc_link; SC_DEBUG(sc_link, SDEV_DB2, ("cdattach:\n")); diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index f8c8e4cdd9d..6dea2d3f9e1 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ch.c,v 1.31 2006/11/27 23:14:22 beck Exp $ */ +/* $OpenBSD: ch.c,v 1.32 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */ /* @@ -147,7 +147,7 @@ chmatch(parent, match, aux) struct device *parent; void *match, *aux; { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int priority; (void)scsi_inqmatch(sa->sa_inqbuf, @@ -163,7 +163,7 @@ chattach(parent, self, aux) void *aux; { struct ch_softc *sc = (struct ch_softc *)self; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *link = sa->sa_sc_link; /* Glue into the SCSI bus */ diff --git a/sys/scsi/safte.c b/sys/scsi/safte.c index ea6ef9fd9c8..4bc8d19a91a 100644 --- a/sys/scsi/safte.c +++ b/sys/scsi/safte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safte.c,v 1.30 2006/10/01 10:42:18 grange Exp $ */ +/* $OpenBSD: safte.c,v 1.31 2006/11/28 16:56:50 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -106,7 +106,7 @@ int64_t safte_temp2uK(u_int8_t, int); int safte_match(struct device *parent, void *match, void *aux) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_inquiry_data *inq = sa->sa_inqbuf; struct scsi_inquiry_data inqbuf; struct scsi_inquiry cmd; @@ -157,7 +157,7 @@ void safte_attach(struct device *parent, struct device *self, void *aux) { struct safte_softc *sc = (struct safte_softc *)self; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int i = 0; sc->sc_link = sa->sa_sc_link; diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 71547f25fbb..af21d61a4ec 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.121 2006/11/27 18:32:33 dlg Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.122 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -220,7 +220,7 @@ int scsibussubmatch(struct device *parent, void *match, void *aux) { struct cfdata *cf = match; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sc_link = sa->sa_sc_link; if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != sc_link->target) @@ -581,7 +581,7 @@ const struct scsi_quirk_inquiry_pattern scsi_quirk_patterns[] = { int scsibusprint(void *aux, const char *pnp) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_inquiry_data *inqbuf; u_int8_t type; int removable; @@ -693,7 +693,7 @@ scsi_probedev(struct scsibus_softc *scsi, int target, int lun) { const struct scsi_quirk_inquiry_pattern *finger; static struct scsi_inquiry_data inqbuf; - struct scsibus_attach_args sa; + struct scsi_attach_args sa; struct scsi_link *sc_link; struct cfdata *cf; int priority, rslt = 0; diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 2ca21be321f..5d0fe1123f0 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.79 2006/11/28 13:40:55 dlg Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.80 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -209,7 +209,7 @@ struct scsibus_softc { * This is used to pass information from the high-level configuration code * to the device-specific drivers. */ -struct scsibus_attach_args { +struct scsi_attach_args { struct scsi_link *sa_sc_link; struct scsi_inquiry_data *sa_inqbuf; }; diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 0ce25761f0d..d7152397f64 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.113 2006/11/27 23:14:22 beck Exp $ */ +/* $OpenBSD: sd.c,v 1.114 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -149,7 +149,7 @@ sdmatch(parent, match, aux) struct device *parent; void *match, *aux; { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int priority; (void)scsi_inqmatch(sa->sa_inqbuf, @@ -170,7 +170,7 @@ sdattach(parent, self, aux) int error, result; struct sd_softc *sd = (void *)self; struct disk_parms *dp = &sd->params; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sc_link = sa->sa_sc_link; SC_DEBUG(sc_link, SDEV_DB2, ("sdattach:\n")); diff --git a/sys/scsi/ses.c b/sys/scsi/ses.c index b7a5e77bb6b..7ad1f6d7418 100644 --- a/sys/scsi/ses.c +++ b/sys/scsi/ses.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ses.c,v 1.40 2006/10/01 10:42:18 grange Exp $ */ +/* $OpenBSD: ses.c,v 1.41 2006/11/28 16:56:50 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -120,7 +120,7 @@ char *ses_dump_enc_string(u_char *, ssize_t); int ses_match(struct device *parent, void *match, void *aux) { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_inquiry_data *inq = sa->sa_inqbuf; if (inq == NULL) @@ -142,7 +142,7 @@ void ses_attach(struct device *parent, struct device *self, void *aux) { struct ses_softc *sc = (struct ses_softc *)self; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; char vendor[33]; struct ses_sensor *sensor; #if NBIO > 0 diff --git a/sys/scsi/ss.c b/sys/scsi/ss.c index 3e1bf16b49c..7a66324be18 100644 --- a/sys/scsi/ss.c +++ b/sys/scsi/ss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss.c,v 1.56 2006/10/07 23:40:07 beck Exp $ */ +/* $OpenBSD: ss.c,v 1.57 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: ss.c,v 1.10 1996/05/05 19:52:55 christos Exp $ */ /* @@ -299,7 +299,7 @@ ssmatch(parent, match, aux) struct device *parent; void *match, *aux; { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int priority; (void)scsi_inqmatch(sa->sa_inqbuf, @@ -320,7 +320,7 @@ ssattach(parent, self, aux) void *aux; { struct ss_softc *ss = (void *)self; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sc_link = sa->sa_sc_link; SC_DEBUG(sc_link, SDEV_DB2, ("ssattach:\n")); diff --git a/sys/scsi/ss_mustek.c b/sys/scsi/ss_mustek.c index b8847beec1e..c0201312a38 100644 --- a/sys/scsi/ss_mustek.c +++ b/sys/scsi/ss_mustek.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss_mustek.c,v 1.13 2006/05/11 00:45:59 krw Exp $ */ +/* $OpenBSD: ss_mustek.c,v 1.14 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: ss_mustek.c,v 1.4 1996/05/05 19:52:57 christos Exp $ */ /* @@ -99,7 +99,7 @@ struct ss_special mustek_special = { void mustek_attach(ss, sa) struct ss_softc *ss; - struct scsibus_attach_args *sa; + struct scsi_attach_args *sa; { #ifdef SCSIDEBUG struct scsi_link *sc_link = sa->sa_sc_link; diff --git a/sys/scsi/ss_scanjet.c b/sys/scsi/ss_scanjet.c index 01be5125fea..d331491aa44 100644 --- a/sys/scsi/ss_scanjet.c +++ b/sys/scsi/ss_scanjet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ss_scanjet.c,v 1.29 2006/05/11 00:45:59 krw Exp $ */ +/* $OpenBSD: ss_scanjet.c,v 1.30 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: ss_scanjet.c,v 1.6 1996/05/18 22:58:01 christos Exp $ */ /* @@ -89,7 +89,7 @@ struct ss_special scanjet_special = { void scanjet_attach(ss, sa) struct ss_softc *ss; - struct scsibus_attach_args *sa; + struct scsi_attach_args *sa; { #ifdef SCSIDEBUG struct scsi_link *sc_link = sa->sa_sc_link; diff --git a/sys/scsi/ssvar.h b/sys/scsi/ssvar.h index a1de14f3173..be9f3fbedbb 100644 --- a/sys/scsi/ssvar.h +++ b/sys/scsi/ssvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssvar.h,v 1.10 2003/05/18 16:06:35 mickey Exp $ */ +/* $OpenBSD: ssvar.h,v 1.11 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: ssvar.h,v 1.2 1996/03/30 21:47:11 christos Exp $ */ /* @@ -75,5 +75,5 @@ struct ss_softc { /* * define the special attach routines if configured */ -void mustek_attach(struct ss_softc *, struct scsibus_attach_args *); -void scanjet_attach(struct ss_softc *, struct scsibus_attach_args *); +void mustek_attach(struct ss_softc *, struct scsi_attach_args *); +void scanjet_attach(struct ss_softc *, struct scsi_attach_args *); diff --git a/sys/scsi/st.c b/sys/scsi/st.c index afcc958952d..9386aba68fe 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.67 2006/11/27 23:14:22 beck Exp $ */ +/* $OpenBSD: st.c,v 1.68 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -285,7 +285,7 @@ stmatch(parent, match, aux) struct device *parent; void *match, *aux; { - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; int priority; (void)scsi_inqmatch(sa->sa_inqbuf, @@ -304,7 +304,7 @@ stattach(parent, self, aux) void *aux; { struct st_softc *st = (void *)self; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sc_link = sa->sa_sc_link; SC_DEBUG(sc_link, SDEV_DB2, ("stattach:\n")); diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c index 8188a6cf29c..4129df89537 100644 --- a/sys/scsi/uk.c +++ b/sys/scsi/uk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uk.c,v 1.11 2006/07/11 21:18:12 dlg Exp $ */ +/* $OpenBSD: uk.c,v 1.12 2006/11/28 16:56:50 dlg Exp $ */ /* $NetBSD: uk.c,v 1.15 1996/03/17 00:59:57 thorpej Exp $ */ /* @@ -88,7 +88,7 @@ void ukattach(struct device *parent, struct device *self, void *aux) { struct uk_softc *uk = (void *)self; - struct scsibus_attach_args *sa = aux; + struct scsi_attach_args *sa = aux; struct scsi_link *sc_link = sa->sa_sc_link; SC_DEBUG(sc_link, SDEV_DB2, ("ukattach: ")); |