diff options
author | jmz <jmz@FreeBSD.org> | 1997-05-19 17:37:30 +0000 |
---|---|---|
committer | jmz <jmz@FreeBSD.org> | 1997-05-19 17:37:30 +0000 |
commit | e88d62e737bf6cc19132c3e914b2cc5b2bf30d24 (patch) | |
tree | 2a8e9bf1bdcf115b3857c5d716467ece8057b58e | |
parent | 14c035ab6ad58a85ae5467655a9a741fa8f51f97 (diff) | |
download | FreeBSD-src-e88d62e737bf6cc19132c3e914b2cc5b2bf30d24.zip FreeBSD-src-e88d62e737bf6cc19132c3e914b2cc5b2bf30d24.tar.gz |
Remove the select command. The WORMIOCQUIRKSELECT ioctl call has been removed
from the driver.
-rw-r--r-- | usr.sbin/wormcontrol/wormcontrol.8 | 40 | ||||
-rw-r--r-- | usr.sbin/wormcontrol/wormcontrol.c | 21 |
2 files changed, 9 insertions, 52 deletions
diff --git a/usr.sbin/wormcontrol/wormcontrol.8 b/usr.sbin/wormcontrol/wormcontrol.8 index 3030d0e..eafa525 100644 --- a/usr.sbin/wormcontrol/wormcontrol.8 +++ b/usr.sbin/wormcontrol/wormcontrol.8 @@ -32,7 +32,7 @@ .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $Id$ +.\" $Id: wormcontrol.8,v 1.7 1997/02/22 16:14:11 peter Exp $ .\" .\" arrgh, hilit19 needs this" :-( .Dd Jan 27, 1996 @@ -75,10 +75,7 @@ without destroying the medium in case of a catastrophic failure. In order to write a new track, the drive must be told whether the new track will become an audio or a data track. Audio tracks are written with a block size of 2352 bytes, while data tracks have 2048 bytes per -block. There are actually more data formats available, but the driver -currently does only support this -.Em Yellow Book -Mode 1 format. For audio tracks, the driver does further need to know +block. For audio tracks, the driver does further need to know whether the data are recorded with a preemphasis. .Pp Once all tracks of a session have been written, the disk must be @@ -87,38 +84,6 @@ This writes the table of contents and leadout information to the disk. The disk won't be usable without doing this. .Ss Commands .Bl -tag -indent -width "prepdisk" -.It select Ar vendor-id model-id -Unfortunately, each CD-R drive vendor decided to implement a set of -SCSI commands of his own. Thus, the -.Xr worm 4 -driver needs to know which set of -.Ql quirk -functions to use for a particular device. Currently, only devices -that have quirk information statically compiled into the driver will -work; it is however planned to make them available as loadable modules -in the future. The -.Em select -command causes the driver to lookup the appropriate quirks. The driver -matches the provided -.Ar vendor-id -and -.Ar model-id -against the list of known quirks. An error will be returned if no -quirk record matches, and the device won't be usable for anything else -until a quirk record has been successfully selected. -.Pp -By now, the vendor/model names of -.Dq PLASMON -\&/ -.Dq RF4100 , -.Dq PHILIPS -\&/ -.Dq CDD2000 , -and -.Dq HP -\&/ -.Dq 4020i -are known. .It prepdisk Ar single \&| double Op Ar dummy Prepare the disk for recording. This must be done before any tracks can be prepared, and remains in effect until the session has been @@ -175,7 +140,6 @@ facility. .Sh EXAMPLES The typical sequence of burning a data CD-R looks like: .Bd -literal -# wormcontrol select PLASMON RF4100 # wormcontrol prepdisk double # wormcontrol track data # rtprio 5 team -v 1m 5 < cdrom.image | rtprio 5 dd of=/dev/rworm0 obs=20k diff --git a/usr.sbin/wormcontrol/wormcontrol.c b/usr.sbin/wormcontrol/wormcontrol.c index 47673cb..49b44e8 100644 --- a/usr.sbin/wormcontrol/wormcontrol.c +++ b/usr.sbin/wormcontrol/wormcontrol.c @@ -32,7 +32,7 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $Id: wormcontrol.c,v 1.4 1997/02/22 16:14:12 peter Exp $ + * $Id: wormcontrol.c,v 1.5 1997/03/31 05:11:40 imp Exp $ * */ @@ -89,16 +89,7 @@ main(int argc, char **argv) if ((fd = open(devname, O_RDONLY | O_NONBLOCK, 0)) == -1) err(EX_NOINPUT, "open(%s)", devname); - if (eq(argv[0], "select")) { - struct wormio_quirk_select q; - if (argc != 3) - errx(EX_USAGE, "wrong params for \"select\""); - q.vendor = argv[1]; - q.model = argv[2]; - if (ioctl(fd, WORMIOCQUIRKSELECT, &q) == -1) - err(EX_IOERR, "ioctl(WORMIOCQUIRKSELECT)"); - } - else if (eq(argv[0], "prepdisk")) { + if (eq(argv[0], "prepdisk")) { struct wormio_prepare_disk d; d.dummy = 0; d.speed = -1; @@ -120,15 +111,17 @@ main(int argc, char **argv) err(EX_IOERR, "ioctl(WORMIOCPREPDISK)"); } else if (eq(argv[0], "track")) { - struct wormio_prepare_track t; + struct wormio_prepare_track t; + bzero(&t, sizeof (t)); t.audio = -1; t.preemp = 0; for (i = 1; i < argc; i++) { if (eq(argv[i], "audio")) t.audio = 1; - else if (eq(argv[i], "data")) + else if (eq(argv[i], "data")) { t.audio = 0; - else if (eq(argv[i], "preemp")) + t.track_type = BLOCK_MODE_1; + } else if (eq(argv[i], "preemp")) t.preemp = 1; else errx(EX_USAGE, |