diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-10-17 17:47:25 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-10-17 17:47:25 +0000 |
commit | 7a58392680d465306b00c059336c7425bf2b0cc0 (patch) | |
tree | 512185a4d0a29ea88512ea7cca5d8b4430a4c984 /sys/scsi/ch.c | |
parent | 584faa50b6b03ada08c80824e96fd3e3245a85d6 (diff) |
renumber the CHIO* since they clash w/ the CDIO, keep the old ones as OCHIO, EOL set to post 3.3
Diffstat (limited to 'sys/scsi/ch.c')
-rw-r--r-- | sys/scsi/ch.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 743cd84d38a..c780fcf239a 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ch.c,v 1.12 2002/03/14 01:27:13 millert Exp $ */ +/* $OpenBSD: ch.c,v 1.13 2002/10/17 17:47:24 mickey Exp $ */ /* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */ /* @@ -286,8 +286,11 @@ chioctl(dev, cmd, data, flags, p) * have the device open for writing. */ switch (cmd) { + case OCHIOGPICKER: case CHIOGPICKER: + case OCHIOGPARAMS: case CHIOGPARAMS: + case OCHIOGSTATUS: case CHIOGSTATUS: break; @@ -297,22 +300,27 @@ chioctl(dev, cmd, data, flags, p) } switch (cmd) { + case OCHIOMOVE: case CHIOMOVE: error = ch_move(sc, (struct changer_move *)data); break; + case OCHIOEXCHANGE: case CHIOEXCHANGE: error = ch_exchange(sc, (struct changer_exchange *)data); break; + case OCHIOPOSITION: case CHIOPOSITION: error = ch_position(sc, (struct changer_position *)data); break; + case OCHIOGPICKER: case CHIOGPICKER: *(int *)data = sc->sc_picker - sc->sc_firsts[CHET_MT]; break; + case OCHIOSPICKER: case CHIOSPICKER: { int new_picker = *(int *)data; @@ -321,6 +329,7 @@ chioctl(dev, cmd, data, flags, p) sc->sc_picker = sc->sc_firsts[CHET_MT] + new_picker; break; } + case OCHIOGPARAMS: case CHIOGPARAMS: { struct changer_params *cp = (struct changer_params *)data; @@ -331,6 +340,7 @@ chioctl(dev, cmd, data, flags, p) cp->cp_ndrives = sc->sc_counts[CHET_DT]; break; } + case OCHIOGSTATUS: case CHIOGSTATUS: { struct changer_element_status *ces = (struct changer_element_status *)data; |