aboutsummaryrefslogtreecommitdiff
path: root/hw/intel-hda.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-11-09 17:28:38 +0100
committermalc <av1474@comtv.ru>2010-11-09 19:32:59 +0300
commitdf0db2212d86e98c41774600c44cc960ddc2b68c (patch)
treeaf5c6eb811f3da39cd4e75fb42700d82637777e2 /hw/intel-hda.c
parente2553eb44e4ddd0b22124216d3dd20b6a0fecefb (diff)
downloadqemu-df0db2212d86e98c41774600c44cc960ddc2b68c.zip
qemu-df0db2212d86e98c41774600c44cc960ddc2b68c.tar.gz
qemu-df0db2212d86e98c41774600c44cc960ddc2b68c.tar.bz2
intel-hda: fix codec addressing.
The HDA bus supports up to 15 codecs, with addresses 0 ... 14. We get that wrong in two places: * When handing out addresses we accept address 15 as valid. * The bitmasks for two registers (WAKEEN and STATESTS) don't have bit 14 set. This patch fixes it. [ v2: codestyle: add braces ] Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: malc <av1474@comtv.ru>
Diffstat (limited to 'hw/intel-hda.c')
-rw-r--r--hw/intel-hda.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 5e13dc3..fe31624 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -56,8 +56,9 @@ static int hda_codec_dev_init(DeviceState *qdev, DeviceInfo *base)
if (dev->cad == -1) {
dev->cad = bus->next_cad;
}
- if (dev->cad > 15)
+ if (dev->cad >= 15) {
return -1;
+ }
bus->next_cad = dev->cad + 1;
return info->init(dev);
}
@@ -643,15 +644,15 @@ static const struct IntelHDAReg regtab[] = {
[ ICH6_REG_WAKEEN ] = {
.name = "WAKEEN",
.size = 2,
- .wmask = 0x3fff,
+ .wmask = 0x7fff,
.offset = offsetof(IntelHDAState, wake_en),
.whandler = intel_hda_set_wake_en,
},
[ ICH6_REG_STATESTS ] = {
.name = "STATESTS",
.size = 2,
- .wmask = 0x3fff,
- .wclear = 0x3fff,
+ .wmask = 0x7fff,
+ .wclear = 0x7fff,
.offset = offsetof(IntelHDAState, state_sts),
.whandler = intel_hda_set_state_sts,
},