diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-05-23 18:29:16 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-05-23 18:29:16 +0000 |
| commit | 669a743526cfabe7eeef0655721c0534b12c4e9e (patch) | |
| tree | 2d8df093c02bbe92049cf7ff6dd833f487eaebbc /sys/scsi | |
| parent | 49d5050018a07dcccc3ecf650e7395d3794a7663 (diff) | |
Remove superfluous and confusing define and use correct field names
instead.
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/atapi_cd.h | 4 | ||||
| -rw-r--r-- | sys/scsi/cd_atapi.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/scsi/atapi_cd.h b/sys/scsi/atapi_cd.h index be03edd0901..b7019ea6c51 100644 --- a/sys/scsi/atapi_cd.h +++ b/sys/scsi/atapi_cd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atapi_cd.h,v 1.4 2005/05/23 06:46:38 krw Exp $ */ +/* $OpenBSD: atapi_cd.h,v 1.5 2005/05/23 18:29:15 krw Exp $ */ /* $NetBSD: atapi_cd.h,v 1.9 1998/07/13 16:50:56 thorpej Exp $ */ /* @@ -40,8 +40,6 @@ struct atapi_load_unload { u_int8_t unused3[3]; }; -#define ATAPI_AUDIO_PAGE_MASK 0x4e - struct atapi_cd_mode_data { struct scsi_mode_header_big header; struct cd_audio_page audio; diff --git a/sys/scsi/cd_atapi.c b/sys/scsi/cd_atapi.c index 4d1f672c322..1f80d985c2b 100644 --- a/sys/scsi/cd_atapi.c +++ b/sys/scsi/cd_atapi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd_atapi.c,v 1.7 2005/05/23 07:06:16 krw Exp $ */ +/* $OpenBSD: cd_atapi.c,v 1.8 2005/05/23 18:29:15 krw Exp $ */ /* $NetBSD: cd_atapi.c,v 1.10 1998/08/31 22:28:06 cgd Exp $ */ /* @@ -144,7 +144,8 @@ cd_atapibus_setvol(cd, arg, flags) if (error != 0) return (error); - error = scsi_mode_sense_big(cd->sc_link, 0, ATAPI_AUDIO_PAGE_MASK, + error = scsi_mode_sense_big(cd->sc_link, 0, + AUDIO_PAGE | SMS_PAGE_CTRL_CHANGEABLE, (struct scsi_mode_header_big *)&mask, sizeof(mask), flags, 20000); if (error != 0) return (error); |