diff options
Diffstat (limited to 'usr/src')
| -rwxr-xr-x | usr/src/uts/common/io/audio/sada/drv/audiohd/audiohd.c | 6 | ||||
| -rwxr-xr-x | usr/src/uts/common/sys/audio/impl/audiohd_impl.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/usr/src/uts/common/io/audio/sada/drv/audiohd/audiohd.c b/usr/src/uts/common/io/audio/sada/drv/audiohd/audiohd.c index f79e76a630..92e31a3ffc 100755 --- a/usr/src/uts/common/io/audio/sada/drv/audiohd/audiohd.c +++ b/usr/src/uts/common/io/audio/sada/drv/audiohd/audiohd.c @@ -259,7 +259,7 @@ static struct dev_ops audiohd_dev_ops = { /* Linkage structure for loadable drivers */ static struct modldrv audiohd_modldrv = { &mod_driverops, /* drv_modops */ - AUDIOHD_MOD_NAME"%I%", /* drv_linkinfo */ + AUDIOHD_MOD_NAME"1.3", /* drv_linkinfo */ &audiohd_dev_ops, /* drv_dev_ops */ }; @@ -2139,7 +2139,7 @@ audiohd_12bit_verb_to_codec(audiohd_state_t *statep, uint8_t caddr, uint8_t nid, uint16_t wptr; uint16_t rptr; - ASSERT((cmd & 0xfff000ff) == 0); + ASSERT((cmd & AUDIOHDC_12BIT_VERB_MASK) == 0); wptr = AUDIOHD_REG_GET16(AUDIOHD_REG_CORBWP) & AUDIOHD_CMDIO_ENT_MASK; rptr = AUDIOHD_REG_GET16(AUDIOHD_REG_CORBRP) & AUDIOHD_CMDIO_ENT_MASK; @@ -2178,7 +2178,7 @@ audiohd_4bit_verb_to_codec(audiohd_state_t *statep, uint8_t caddr, uint8_t nid, uint16_t wptr; uint16_t rptr; - ASSERT((cmd & 0xfff000ff) == 0); + ASSERT((cmd & AUDIOHDC_4BIT_VERB_MASK) == 0); wptr = AUDIOHD_REG_GET16(AUDIOHD_REG_CORBWP) & AUDIOHD_CMDIO_ENT_MASK; rptr = AUDIOHD_REG_GET16(AUDIOHD_REG_CORBRP) & AUDIOHD_CMDIO_ENT_MASK; diff --git a/usr/src/uts/common/sys/audio/impl/audiohd_impl.h b/usr/src/uts/common/sys/audio/impl/audiohd_impl.h index 1abf0b06ec..98348d2dbd 100755 --- a/usr/src/uts/common/sys/audio/impl/audiohd_impl.h +++ b/usr/src/uts/common/sys/audio/impl/audiohd_impl.h @@ -212,6 +212,12 @@ extern "C" { #define AUDIOHDC_AUDIO_FUNC_GROUP 1 /* + * HD audio verbs can be either 12-bit or 4-bit in length. + */ +#define AUDIOHDC_12BIT_VERB_MASK 0xfffff000 +#define AUDIOHDC_4BIT_VERB_MASK 0xfffffff0 + +/* * 12-bit verbs */ #define AUDIOHDC_VERB_GET_PARAM 0xf00 |