From c3bf92aa58711a79372f74b05f1873f9cd6ff74f Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Sat, 23 Nov 2002 22:51:50 +0000 Subject: Allow acd(4) and cd(4) to support old behavior for CDRIOC*SPEED ioctls. If the value from the user is less than 177, assume it is a multiple of a single speed CDROM and convert to KB/sec. No complaints from: sos Reviewed by: ken Approved by: re MFC after: 1 day --- sys/dev/ata/atapi-cd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index d3bcd60dbced..667bdd203286 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -1021,11 +1021,24 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td) break; case CDRIOCREADSPEED: - error = acd_set_speed(cdp, *(int *)addr, CDR_MAX_SPEED); + { + int speed = *(int *)addr; + + /* Preserve old behavior: units in multiples of CDROM speed */ + if (speed < 177) + speed *= 177; + error = acd_set_speed(cdp, speed, CDR_MAX_SPEED); + } break; case CDRIOCWRITESPEED: - error = acd_set_speed(cdp, CDR_MAX_SPEED, *(int *)addr); + { + int speed = *(int *)addr; + + if (speed < 177) + speed *= 177; + error = acd_set_speed(cdp, CDR_MAX_SPEED, speed); + } break; case CDRIOCGETBLOCKSIZE: -- cgit v1.3