diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-06-17 01:32:50 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2008-06-17 01:32:50 +0000 |
| commit | e558d4dc8081d6328d1c9d81ad95b50b10278af1 (patch) | |
| tree | bcd3468684f60435645b1d20b0193d1bda7cd446 /sys/scsi/cd.c | |
| parent | b73c46866bf8c5c3f182801c1f255166c9f02907 (diff) | |
Nuke unnecessary re-definition of READ_CAPACITY, scsi_read_capacity, and
scsi_read_cap_data as READ_CD_CAPACITY, scsi_read_cd_capacity and
scsi_read_cd_cap_data respectively. No functional change as all were
identical to their counterparts.
Diffstat (limited to 'sys/scsi/cd.c')
| -rw-r--r-- | sys/scsi/cd.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 6ccba930625..58c2facee6c 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.138 2008/06/15 00:36:41 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.139 2008/06/17 01:32:49 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -1180,13 +1180,12 @@ done: u_long cd_size(struct cd_softc *cd, int flags) { - struct scsi_read_cd_cap_data rdcap; - struct scsi_read_cd_capacity scsi_cmd; + struct scsi_read_cap_data rdcap; + struct scsi_read_capacity scsi_cmd; u_long size; int blksize; - /* Reasonable defaults for drives that don't support - READ_CD_CAPACITY */ + /* Reasonable defaults for drives that don't support READ_CAPACITY */ cd->params.blksize = 2048; cd->params.disksize = 400000; @@ -1198,7 +1197,7 @@ cd_size(struct cd_softc *cd, int flags) * it for you. */ bzero(&scsi_cmd, sizeof(scsi_cmd)); - scsi_cmd.opcode = READ_CD_CAPACITY; + scsi_cmd.opcode = READ_CAPACITY; /* * If the command works, interpret the result as a 4 byte |