diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2005-01-30 08:12:37 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2005-01-30 08:12:37 +0000 |
| commit | 43792195376d49565d1ce5daf330b19f90bce1d3 (patch) | |
| tree | 60c80029e1db66c753066e1ca06309b6a56d0ce6 /sys/dev/mcd | |
| parent | 6b0206227514ad8c99ed9d119fdf795ca94fe7df (diff) | |
Notes
Diffstat (limited to 'sys/dev/mcd')
| -rw-r--r-- | sys/dev/mcd/mcd.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index db351909c652..e9cc575ecf2a 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -135,7 +135,8 @@ static void mcd_soft_reset(struct mcd_softc *); static int mcd_hard_reset(struct mcd_softc *); static int mcd_setmode(struct mcd_softc *, int mode); static int mcd_getqchan(struct mcd_softc *, struct mcd_qchninfo *q); -static int mcd_subchan(struct mcd_softc *, struct ioc_read_subchannel *sc); +static int mcd_subchan(struct mcd_softc *, struct ioc_read_subchannel *sc, + int nocopyout); static int mcd_toc_header(struct mcd_softc *, struct ioc_toc_header *th); static int mcd_read_toc(struct mcd_softc *); static int mcd_toc_entrys(struct mcd_softc *, struct ioc_read_toc_entry *te); @@ -440,8 +441,10 @@ MCD_TRACE("ioctl called 0x%lx\n", cmd); return mcd_playblocks(sc, (struct ioc_play_blocks *) addr); case CDIOCPLAYMSF: return mcd_playmsf(sc, (struct ioc_play_msf *) addr); + case CDIOCREADSUBCHANNEL_SYSSPACE: + return mcd_subchan(sc, (struct ioc_read_subchannel *) addr, 1); case CDIOCREADSUBCHANNEL: - return mcd_subchan(sc, (struct ioc_read_subchannel *) addr); + return mcd_subchan(sc, (struct ioc_read_subchannel *) addr, 0); case CDIOREADTOCHEADER: return mcd_toc_header(sc, (struct ioc_toc_header *) addr); case CDIOREADTOCENTRYS: @@ -1357,7 +1360,7 @@ mcd_getqchan(struct mcd_softc *sc, struct mcd_qchninfo *q) } static int -mcd_subchan(struct mcd_softc *sc, struct ioc_read_subchannel *sch) +mcd_subchan(struct mcd_softc *sc, struct ioc_read_subchannel *sch, int nocopyout) { struct mcd_qchninfo q; struct cd_sub_channel_info data; @@ -1423,7 +1426,10 @@ mcd_subchan(struct mcd_softc *sc, struct ioc_read_subchannel *sch) break; } - return copyout(&data, sch->data, min(sizeof(struct cd_sub_channel_info), sch->data_len)); + if (nocopyout == 0) + return copyout(&data, sch->data, min(sizeof(struct cd_sub_channel_info), sch->data_len)); + bcopy(&data, sch->data, min(sizeof(struct cd_sub_channel_info), sch->data_len)); + return (0) } static int |