diff options
Diffstat (limited to 'sys/dev/ata')
-rw-r--r-- | sys/dev/ata/ata-disk.c | 23 | ||||
-rw-r--r-- | sys/dev/ata/ata-disk.h | 6 | ||||
-rw-r--r-- | sys/dev/ata/atapi-all.c | 3 | ||||
-rw-r--r-- | sys/dev/ata/atapi-cd.c | 30 | ||||
-rw-r--r-- | sys/dev/ata/atapi-cd.h | 8 | ||||
-rw-r--r-- | sys/dev/ata/atapi-fd.c | 18 | ||||
-rw-r--r-- | sys/dev/ata/atapi-fd.h | 6 | ||||
-rw-r--r-- | sys/dev/ata/atapi-tape.c | 13 | ||||
-rw-r--r-- | sys/dev/ata/atapi-tape.h | 6 |
9 files changed, 27 insertions, 86 deletions
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 2206642..8546501 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -25,13 +25,11 @@ * (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: ata-disk.c,v 1.16 1999/08/10 21:59:57 sos Exp $ + * $Id: ata-disk.c,v 1.17 1999/08/14 11:40:33 phk Exp $ */ #include "ata.h" #include "atadisk.h" -#include "opt_devfs.h" - #if NATA > 0 && NATADISK > 0 #include <sys/param.h> @@ -47,9 +45,6 @@ #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/stat.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <vm/vm.h> #include <vm/vm_prot.h> #include <vm/pmap.h> @@ -236,18 +231,10 @@ ad_attach(void *notused) DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_IDE, 0x180); -#ifdef DEVFS - adp->cdevs_token = devfs_add_devswf(&ad_cdevsw, - dkmakeminor(adp->lun, 0, 0), - DV_CHR, - UID_ROOT, GID_OPERATOR, - 0640, "rad%d", adp->lun); - adp->bdevs_token = devfs_add_devswf(&ad_cdevsw, - dkmakeminor(adp->lun, 0, 0), - DV_BLK, - UID_ROOT, GID_OPERATOR, - 0640, "ad%d", adp->lun); -#endif + make_dev(&ad_cdevsw, dkmakeminor(adp->lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0640, "rad%d", adp->lun); + make_dev(&ad_cdevsw, dkmakeminor(adp->lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0640, "ad%d", adp->lun); bufq_init(&adp->queue); adtab[adnlun++] = adp; } diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h index ad9a0d3..db4147b 100644 --- a/sys/dev/ata/ata-disk.h +++ b/sys/dev/ata/ata-disk.h @@ -25,7 +25,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: ata-disk.h,v 1.6 1999/05/20 09:12:03 sos Exp $ + * $Id: ata-disk.h,v 1.7 1999/06/25 09:03:00 sos Exp $ */ /* ATA device parameter information */ @@ -140,10 +140,6 @@ struct ad_softc { struct buf_queue_head queue; /* head of request queue */ struct devstat stats; /* devstat entry */ -#ifdef DEVFS - void *cdevs_token; - void *bdevs_token; -#endif }; struct ad_request { diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c index e85bbbd..ff13d46 100644 --- a/sys/dev/ata/atapi-all.c +++ b/sys/dev/ata/atapi-all.c @@ -25,14 +25,13 @@ * (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: atapi-all.c,v 1.10 1999/06/25 09:03:01 sos Exp $ + * $Id: atapi-all.c,v 1.11 1999/08/10 21:59:58 sos Exp $ */ #include "ata.h" #include "atapicd.h" #include "atapist.h" #include "atapifd.h" -#include "opt_devfs.h" #if NATA > 0 diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index a0cf35a..439c4d6 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -25,12 +25,11 @@ * (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: atapi-cd.c,v 1.10 1999/05/31 11:24:27 phk Exp $ + * $Id: atapi-cd.c,v 1.11 1999/06/25 09:03:04 sos Exp $ */ #include "ata.h" #include "atapicd.h" -#include "opt_devfs.h" #if NATA > 0 && NATAPICD > 0 @@ -47,9 +46,6 @@ #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/stat.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <pci/pcivar.h> #include <dev/ata/ata-all.h> #include <dev/ata/atapi-all.h> @@ -239,22 +235,14 @@ acd_init_lun(struct atapi_softc *atp, int32_t lun, struct devstat *stats) } else acd->stats = stats; -#ifdef DEVFS - acd->a_cdevfs_token = devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0), - DV_CHR, UID_ROOT, GID_OPERATOR, 0644, - "racd%da", lun); - acd->c_cdevfs_token = devfs_add_devswf(&acd_cdevsw, - dkmakeminor(lun, 0, RAW_PART), - DV_CHR, UID_ROOT, GID_OPERATOR, 0644, - "racd%dc", lun); - acd->a_bdevfs_token = devfs_add_devswf(&acd_cdevsw, dkmakeminor(lun, 0, 0), - DV_BLK, UID_ROOT, GID_OPERATOR, 0644, - "acd%da", lun); - acd->c_bdevfs_token = devfs_add_devswf(&acd_cdevsw, - dkmakeminor(lun, 0, RAW_PART), - DV_BLK, UID_ROOT, GID_OPERATOR, 0644, - "acd%dc", lun); -#endif + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0644, "racd%da", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), + UID_ROOT, GID_OPERATOR, 0644, "racd%dc", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, 0), + UID_ROOT, GID_OPERATOR, 0644, "acd%da", lun); + make_dev(&acd_cdevsw, dkmakeminor(lun, 0, RAW_PART), + UID_ROOT, GID_OPERATOR, 0644, "acd%dc", lun); return acd; } diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h index 2531989..95a0af6 100644 --- a/sys/dev/ata/atapi-cd.h +++ b/sys/dev/ata/atapi-cd.h @@ -25,7 +25,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: atapi-cd.h,v 1.1 1999/03/01 21:19:18 sos Exp $ + * $Id: atapi-cd.h,v 1.2 1999/03/03 21:10:29 sos Exp $ */ /* CDROM Table Of Contents */ @@ -334,12 +334,6 @@ struct acd_softc { u_int32_t next_writeable_lba; /* next writable position */ struct wormio_prepare_track preptrack; /* scratch region */ struct devstat *stats; /* devstat entry */ -#ifdef DEVFS - void *a_cdevfs_token; - void *c_cdevfs_token; - void *a_bdevfs_token; - void *c_bdevfs_token; -#endif }; #define CDRIOCBLANK _IO('c',100) /* blank a CDRW disc */ diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index 13684b4..f8c3865 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -25,12 +25,11 @@ * (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: atapi-fd.c,v 1.11 1999/06/25 09:03:05 sos Exp $ + * $Id: atapi-fd.c,v 1.12 1999/08/14 11:40:33 phk Exp $ */ #include "ata.h" #include "atapifd.h" -#include "opt_devfs.h" #if NATA > 0 && NATAPIFD > 0 @@ -48,9 +47,6 @@ #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/stat.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <pci/pcivar.h> #include <dev/ata/ata-all.h> #include <dev/ata/atapi-all.h> @@ -137,14 +133,10 @@ afdattach(struct atapi_softc *atp) DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_IDE, 0x174); -#ifdef DEVFS - fdp->cdevs_token = devfs_add_devswf(&afd_cdevsw, dkmakeminor(fdp->lun, 0,0), - DV_CHR, UID_ROOT, GID_OPERATOR, - 0640, "rafd%d", fdp->lun); - fdp->bdevs_token = devfs_add_devswf(&afd_cdevsw, dkmakeminor(fdp->lun, 0,0), - DV_BLK, UID_ROOT, GID_OPERATOR, - 0640, "afd%d", fdp->lun); -#endif + make_dev(&afd_cdevsw, dkmakeminor(fdp->lun, 0,0), + UID_ROOT, GID_OPERATOR, 0640, "rafd%d", fdp->lun); + make_dev(&afd_cdevsw, dkmakeminor(fdp->lun, 0,0), + UID_ROOT, GID_OPERATOR, 0640, "afd%d", fdp->lun); return 0; } diff --git a/sys/dev/ata/atapi-fd.h b/sys/dev/ata/atapi-fd.h index 4d6a6d2..59babb0 100644 --- a/sys/dev/ata/atapi-fd.h +++ b/sys/dev/ata/atapi-fd.h @@ -25,7 +25,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: atapi-fd.h,v 1.1 1999/03/03 21:10:29 sos Exp $ + * $Id: atapi-fd.h,v 1.2 1999/05/20 09:12:06 sos Exp $ */ /* MODE SENSE parameter header */ @@ -82,9 +82,5 @@ struct afd_softc { struct afd_cappage cap; /* capabilities page info */ struct diskslices *slices; /* virtual drives */ struct devstat stats; -#ifdef DEVFS - void *cdevs_token; - void *bdevs_token; -#endif }; diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index 3f618c8..8dc2044 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -25,12 +25,11 @@ * (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: atapi-tape.c,v 1.10 1999/05/31 11:24:30 phk Exp $ + * $Id: atapi-tape.c,v 1.11 1999/06/25 09:03:06 sos Exp $ */ #include "ata.h" #include "atapist.h" -#include "opt_devfs.h" #if NATA > 0 && NATAPIST > 0 @@ -43,9 +42,6 @@ #include <sys/mtio.h> #include <sys/disklabel.h> #include <sys/devicestat.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <machine/clock.h> #include <pci/pcivar.h> #include <dev/ata/ata-all.h> @@ -136,11 +132,8 @@ astattach(struct atapi_softc *atp) DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_SEQUENTIAL | DEVSTAT_TYPE_IF_IDE, 0x170); -#ifdef DEVFS - stp->cdevs_token = devfs_add_devswf(&ast_cdevsw, dkmakeminor(stp->lun, 0,0), - DV_CHR, UID_ROOT, GID_OPERATOR, 0640, - "rast%d", stp->lun); -#endif + make_dev(&ast_cdevsw, dkmakeminor(stp->lun, 0,0), + UID_ROOT, GID_OPERATOR, 0640, "rast%d", stp->lun); return 0; } diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h index 666ac96..9c61225 100644 --- a/sys/dev/ata/atapi-tape.h +++ b/sys/dev/ata/atapi-tape.h @@ -25,7 +25,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: atapi-tape.h,v 1.3 1999/03/07 21:49:14 sos Exp $ + * $Id: atapi-tape.h,v 1.4 1999/06/25 09:03:07 sos Exp $ */ /* MODE SENSE parameter header */ @@ -86,8 +86,4 @@ struct ast_softc { struct ast_header header; /* MODE SENSE param header */ struct ast_cappage cap; /* capabilities page info */ struct devstat stats; /* devstat entry */ -#ifdef DEVFS - void *cdevs_token; - void *bdevs_token; -#endif }; |