projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add PowerPC power-management state check callback.
[qemu]
/
hw
/
es1370.c
diff --git
a/hw/es1370.c
b/hw/es1370.c
index
217fd30
..
d607a94
100644
(file)
--- a/
hw/es1370.c
+++ b/
hw/es1370.c
@@
-324,7
+324,7
@@
static void es1370_update_status (ES1370State *s, uint32_t new_status)
else {
s->status = new_status & ~STAT_INTR;
}
else {
s->status = new_status & ~STAT_INTR;
}
- pci_set_irq (s->pci_dev, 0, !!level);
+ qemu_set_irq(s->pci_dev->irq[0], !!level);
}
static void es1370_reset (ES1370State *s)
}
static void es1370_reset (ES1370State *s)
@@
-350,7
+350,7
@@
static void es1370_reset (ES1370State *s)
s->dac_voice[i] = NULL;
}
}
s->dac_voice[i] = NULL;
}
}
- pci_set_irq (s->pci_dev, 0, 0);
+ qemu_irq_lower(s->pci_dev->irq[0]);
}
static void es1370_maybe_lower_irq (ES1370State *s, uint32_t sctl)
}
static void es1370_maybe_lower_irq (ES1370State *s, uint32_t sctl)
@@
-423,6
+423,7
@@
static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
as.freq = new_freq;
as.nchannels = 1 << (new_fmt & 1);
as.fmt = (new_fmt & 2) ? AUD_FMT_S16 : AUD_FMT_U8;
as.freq = new_freq;
as.nchannels = 1 << (new_fmt & 1);
as.fmt = (new_fmt & 2) ? AUD_FMT_S16 : AUD_FMT_U8;
+ as.endianness = 0;
if (i == ADC_CHANNEL) {
s->adc_voice =
if (i == ADC_CHANNEL) {
s->adc_voice =
@@
-477,9
+478,10
@@
static inline uint32_t es1370_fixup (ES1370State *s, uint32_t addr)
IO_WRITE_PROTO (es1370_writeb)
{
ES1370State *s = opaque;
IO_WRITE_PROTO (es1370_writeb)
{
ES1370State *s = opaque;
- addr = es1370_fixup (s, addr);
uint32_t shift, mask;
uint32_t shift, mask;
+ addr = es1370_fixup (s, addr);
+
switch (addr) {
case ES1370_REG_CONTROL:
case ES1370_REG_CONTROL + 1:
switch (addr) {
case ES1370_REG_CONTROL:
case ES1370_REG_CONTROL + 1: