motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-10 02:54:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/audio/ac97: Coding style fixes to avoid checkpatch errors

Browse source 
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Víctor Colombo <victor.colombo@eldorado.org.br>
Message-Id: <62862a057e9c9ec0bb45248b2b9a3a1babb346a6.1650706617.git.balaton@eik.bme.hu>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
BALATON Zoltan 2022-04-23 11:36:57 +02:00 • committed by Paolo Bonzini
parent c06ebc0f1b
commit ab9f0f7d44
1 changed files with 357 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

137
hw/audio/ac97.c
View file

@ -241,10 +241,9 @@ static void fetch_bd (AC97LinkState *s, AC97BusMasterRegs *r)
r->bd.addr = le32_to_cpu(*(uint32_t *) &b[0]) & ~3;
r->bd.ctl_len = le32_to_cpu(*(uint32_t *) &b[4]);
r->picb = r->bd.ctl_len & 0xffff;
dolog ("bd %2d addr=%#x ctl=%#06x len=%#x(%d bytes)\n",
dolog("bd %2d addr=0x%x ctl=0x%06x len=0x%x(%d bytes)\n",
r->civ, r->bd.addr, r->bd.ctl_len >> 16,
r->bd.ctl_len & 0xffff,
(r->bd.ctl_len & 0xffff) << 1);
r->bd.ctl_len & 0xffff, (r->bd.ctl_len & 0xffff) << 1);
}
static void update_sr(AC97LinkState *s, AC97BusMasterRegs *r, uint32_t new_sr)
@ -260,8 +259,7 @@ static void update_sr (AC97LinkState *s, AC97BusMasterRegs *r, uint32_t new_sr)
if (!new_mask) {
event = 1;
level = 0;
}
else {
} else {
if ((new_mask & SR_LVBCI) && (r->cr & CR_LVBIE)) {
event = 1;
level = 1;
@ -275,20 +273,18 @@ static void update_sr (AC97LinkState *s, AC97BusMasterRegs *r, uint32_t new_sr)
r->sr = new_sr;
dolog ("IOC%d LVB%d sr=%#x event=%d level=%d\n",
r->sr & SR_BCIS, r->sr & SR_LVBCI,
r->sr,
event, level);
dolog("IOC%d LVB%d sr=0x%x event=%d level=%d\n",
r->sr & SR_BCIS, r->sr & SR_LVBCI, r->sr, event, level);
if (!event)
if (!event) {
return;
}
if (level) {
s->glob_sta |= masks[r - s->bm_regs];
dolog("set irq level=1\n");
pci_irq_assert(&s->dev);
}
else {
} else {
s->glob_sta &= ~masks[r - s->bm_regs];
dolog("set irq level=0\n");
pci_irq_deassert(&s->dev);
@ -352,8 +348,7 @@ static uint16_t mixer_load (AC97LinkState *s, uint32_t i)
if (i + 2 > sizeof(s->mixer_data)) {
dolog("mixer_load: index %d out of bounds %zd\n",
i, sizeof(s->mixer_data));
}
else {
} else {
val = s->mixer_data[i + 0] | (s->mixer_data[i + 1] << 8);
}
@ -405,8 +400,7 @@ static void open_voice (AC97LinkState *s, int index, int freq)
);
break;
}
}
else {
} else {
s->invalid_freq[index] = freq;
switch (index) {
case PI_INDEX:
@ -565,7 +559,7 @@ static void mixer_reset (AC97LinkState *s)
static uint32_t nam_readb(void *opaque, uint32_t addr)
{
AC97LinkState *s = opaque;
dolog ("U nam readb %#x\n", addr);
dolog("U nam readb 0x%x\n", addr);
s->cas = 0;
return ~0U;
}
@ -581,7 +575,7 @@ static uint32_t nam_readw (void *opaque, uint32_t addr)
static uint32_t nam_readl(void *opaque, uint32_t addr)
{
AC97LinkState *s = opaque;
dolog ("U nam readl %#x\n", addr);
dolog("U nam readl 0x%x\n", addr);
s->cas = 0;
return ~0U;
}
@ -593,7 +587,7 @@ static uint32_t nam_readl (void *opaque, uint32_t addr)
static void nam_writeb(void *opaque, uint32_t addr, uint32_t val)
{
AC97LinkState *s = opaque;
dolog ("U nam writeb %#x <- %#x\n", addr, val);
dolog("U nam writeb 0x%x <- 0x%x\n", addr, val);
s->cas = 0;
}
@ -621,10 +615,10 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
break;
case AC97_Vendor_ID1:
case AC97_Vendor_ID2:
dolog ("Attempt to write vendor ID to %#x\n", val);
dolog("Attempt to write vendor ID to 0x%x\n", val);
break;
case AC97_Extended_Audio_ID:
dolog ("Attempt to write extended audio ID to %#x\n", val);
dolog("Attempt to write extended audio ID to 0x%x\n", val);
break;
case AC97_Extended_Audio_Ctrl_Stat:
if (!(val & EACS_VRA)) {
@ -637,7 +631,7 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
mixer_store(s, AC97_MIC_ADC_Rate, 0xbb80);
open_voice(s, MC_INDEX, 48000);
}
dolog ("Setting extended audio control to %#x\n", val);
dolog("Setting extended audio control to 0x%x\n", val);
mixer_store(s, AC97_Extended_Audio_Ctrl_Stat, val);
break;
case AC97_PCM_Front_DAC_Rate:
@ -645,10 +639,8 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
mixer_store(s, index, val);
dolog("Set front DAC rate to %d\n", val);
open_voice(s, PO_INDEX, val);
}
else {
dolog ("Attempt to set front DAC rate to %d, "
"but VRA is not set\n",
} else {
dolog("Attempt to set front DAC rate to %d, but VRA is not set\n",
val);
}
break;
@ -657,10 +649,8 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
mixer_store(s, index, val);
dolog("Set MIC ADC rate to %d\n", val);
open_voice(s, MC_INDEX, val);
}
else {
dolog ("Attempt to set MIC ADC rate to %d, "
"but VRM is not set\n",
} else {
dolog("Attempt to set MIC ADC rate to %d, but VRM is not set\n",
val);
}
break;
@ -669,8 +659,7 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
mixer_store(s, index, val);
dolog("Set front LR ADC rate to %d\n", val);
open_voice(s, PI_INDEX, val);
}
else {
} else {
dolog("Attempt to set LR ADC rate to %d, but VRA is not set\n",
val);
}
@ -693,7 +682,7 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
/* None of the features in these regs are emulated, so they are RO */
break;
default:
dolog ("U nam writew %#x <- %#x\n", addr, val);
dolog("U nam writew 0x%x <- 0x%x\n", addr, val);
mixer_store(s, index, val);
break;
}
@ -702,7 +691,7 @@ static void nam_writew (void *opaque, uint32_t addr, uint32_t val)
static void nam_writel(void *opaque, uint32_t addr, uint32_t val)
{
AC97LinkState *s = opaque;
dolog ("U nam writel %#x <- %#x\n", addr, val);
dolog("U nam writel 0x%x <- 0x%x\n", addr, val);
s->cas = 0;
}
@ -728,38 +717,38 @@ static uint32_t nabm_readb (void *opaque, uint32_t addr)
case MC_CIV:
r = &s->bm_regs[GET_BM(index)];
val = r->civ;
dolog ("CIV[%d] -> %#x\n", GET_BM (index), val);
dolog("CIV[%d] -> 0x%x\n", GET_BM(index), val);
break;
case PI_LVI:
case PO_LVI:
case MC_LVI:
r = &s->bm_regs[GET_BM(index)];
val = r->lvi;
dolog ("LVI[%d] -> %#x\n", GET_BM (index), val);
dolog("LVI[%d] -> 0x%x\n", GET_BM(index), val);
break;
case PI_PIV:
case PO_PIV:
case MC_PIV:
r = &s->bm_regs[GET_BM(index)];
val = r->piv;
dolog ("PIV[%d] -> %#x\n", GET_BM (index), val);
dolog("PIV[%d] -> 0x%x\n", GET_BM(index), val);
break;
case PI_CR:
case PO_CR:
case MC_CR:
r = &s->bm_regs[GET_BM(index)];
val = r->cr;
dolog ("CR[%d] -> %#x\n", GET_BM (index), val);
dolog("CR[%d] -> 0x%x\n", GET_BM(index), val);
break;
case PI_SR:
case PO_SR:
case MC_SR:
r = &s->bm_regs[GET_BM(index)];
val = r->sr & 0xff;
dolog ("SRb[%d] -> %#x\n", GET_BM (index), val);
dolog("SRb[%d] -> 0x%x\n", GET_BM(index), val);
break;
default:
dolog ("U nabm readb %#x -> %#x\n", addr, val);
dolog("U nabm readb 0x%x -> 0x%x\n", addr, val);
break;
}
return val;
@ -778,17 +767,17 @@ static uint32_t nabm_readw (void *opaque, uint32_t addr)
case MC_SR:
r = &s->bm_regs[GET_BM(index)];
val = r->sr;
dolog ("SR[%d] -> %#x\n", GET_BM (index), val);
dolog("SR[%d] -> 0x%x\n", GET_BM(index), val);
break;
case PI_PICB:
case PO_PICB:
case MC_PICB:
r = &s->bm_regs[GET_BM(index)];
val = r->picb;
dolog ("PICB[%d] -> %#x\n", GET_BM (index), val);
dolog("PICB[%d] -> 0x%x\n", GET_BM(index), val);
break;
default:
dolog ("U nabm readw %#x -> %#x\n", addr, val);
dolog("U nabm readw 0x%x -> 0x%x\n", addr, val);
break;
}
return val;
@ -807,14 +796,14 @@ static uint32_t nabm_readl (void *opaque, uint32_t addr)
case MC_BDBAR:
r = &s->bm_regs[GET_BM(index)];
val = r->bdbar;
dolog ("BMADDR[%d] -> %#x\n", GET_BM (index), val);
dolog("BMADDR[%d] -> 0x%x\n", GET_BM(index), val);
break;
case PI_CIV:
case PO_CIV:
case MC_CIV:
r = &s->bm_regs[GET_BM(index)];
val = r->civ | (r->lvi << 8) | (r->sr << 16);
dolog ("CIV LVI SR[%d] -> %#x, %#x, %#x\n", GET_BM (index),
dolog("CIV LVI SR[%d] -> 0x%x, 0x%x, 0x%x\n", GET_BM(index),
r->civ, r->lvi, r->sr);
break;
case PI_PICB:
@ -822,19 +811,19 @@ static uint32_t nabm_readl (void *opaque, uint32_t addr)
case MC_PICB:
r = &s->bm_regs[GET_BM(index)];
val = r->picb | (r->piv << 16) | (r->cr << 24);
dolog ("PICB PIV CR[%d] -> %#x %#x %#x %#x\n", GET_BM (index),
dolog("PICB PIV CR[%d] -> 0x%x 0x%x 0x%x 0x%x\n", GET_BM(index),
val, r->picb, r->piv, r->cr);
break;
case GLOB_CNT:
val = s->glob_cnt;
dolog ("glob_cnt -> %#x\n", val);
dolog("glob_cnt -> 0x%x\n", val);
break;
case GLOB_STA:
val = s->glob_sta | GS_S0CR;
dolog ("glob_sta -> %#x\n", val);
dolog("glob_sta -> 0x%x\n", val);
break;
default:
dolog ("U nabm readl %#x -> %#x\n", addr, val);
dolog("U nabm readl 0x%x -> 0x%x\n", addr, val);
break;
}
return val;
@ -861,7 +850,7 @@ static void nabm_writeb (void *opaque, uint32_t addr, uint32_t val)
fetch_bd(s, r);
}
r->lvi = val % 32;
dolog ("LVI[%d] <- %#x\n", GET_BM (index), val);
dolog("LVI[%d] <- 0x%x\n", GET_BM(index), val);
break;
case PI_CR:
case PO_CR:
@ -869,14 +858,12 @@ static void nabm_writeb (void *opaque, uint32_t addr, uint32_t val)
r = &s->bm_regs[GET_BM(index)];
if (val & CR_RR) {
reset_bm_regs(s, r);
}
else {
} else {
r->cr = val & CR_VALID_MASK;
if (!(r->cr & CR_RPBM)) {
voice_set_active(s, r - s->bm_regs, 0);
r->sr |= SR_DCH;
}
else {
} else {
r->civ = r->piv;
r->piv = (r->piv + 1) % 32;
fetch_bd(s, r);
@ -884,7 +871,7 @@ static void nabm_writeb (void *opaque, uint32_t addr, uint32_t val)
voice_set_active(s, r - s->bm_regs, 1);
}
}
dolog ("CR[%d] <- %#x (cr %#x)\n", GET_BM (index), val, r->cr);
dolog("CR[%d] <- 0x%x (cr 0x%x)\n", GET_BM(index), val, r->cr);
break;
case PI_SR:
case PO_SR:
@ -892,10 +879,10 @@ static void nabm_writeb (void *opaque, uint32_t addr, uint32_t val)
r = &s->bm_regs[GET_BM(index)];
r->sr |= val & ~(SR_RO_MASK | SR_WCLEAR_MASK);
update_sr(s, r, r->sr & ~(val & SR_WCLEAR_MASK));
dolog ("SR[%d] <- %#x (sr %#x)\n", GET_BM (index), val, r->sr);
dolog("SR[%d] <- 0x%x (sr 0x%x)\n", GET_BM(index), val, r->sr);
break;
default:
dolog ("U nabm writeb %#x <- %#x\n", addr, val);
dolog("U nabm writeb 0x%x <- 0x%x\n", addr, val);
break;
}
}
@ -912,10 +899,10 @@ static void nabm_writew (void *opaque, uint32_t addr, uint32_t val)
r = &s->bm_regs[GET_BM(index)];
r->sr |= val & ~(SR_RO_MASK | SR_WCLEAR_MASK);
update_sr(s, r, r->sr & ~(val & SR_WCLEAR_MASK));
dolog ("SR[%d] <- %#x (sr %#x)\n", GET_BM (index), val, r->sr);
dolog("SR[%d] <- 0x%x (sr 0x%x)\n", GET_BM(index), val, r->sr);
break;
default:
dolog ("U nabm writew %#x <- %#x\n", addr, val);
dolog("U nabm writew 0x%x <- 0x%x\n", addr, val);
break;
}
}
@ -931,25 +918,27 @@ static void nabm_writel (void *opaque, uint32_t addr, uint32_t val)
case MC_BDBAR:
r = &s->bm_regs[GET_BM(index)];
r->bdbar = val & ~3;
dolog ("BDBAR[%d] <- %#x (bdbar %#x)\n",
GET_BM (index), val, r->bdbar);
dolog("BDBAR[%d] <- 0x%x (bdbar 0x%x)\n", GET_BM(index), val, r->bdbar);
break;
case GLOB_CNT:
if (val & GC_WR)
if (val & GC_WR) {
warm_reset(s);
if (val & GC_CR)
}
if (val & GC_CR) {
cold_reset(s);
if (!(val & (GC_WR | GC_CR)))
}
if (!(val & (GC_WR | GC_CR))) {
s->glob_cnt = val & GC_VALID_MASK;
dolog ("glob_cnt <- %#x (glob_cnt %#x)\n", val, s->glob_cnt);
}
dolog("glob_cnt <- 0x%x (glob_cnt 0x%x)\n", val, s->glob_cnt);
break;
case GLOB_STA:
s->glob_sta &= ~(val & GS_WCLEAR_MASK);
s->glob_sta |= (val & ~(GS_WCLEAR_MASK | GS_RO_MASK)) & GS_VALID_MASK;
dolog ("glob_sta <- %#x (glob_sta %#x)\n", val, s->glob_sta);
dolog("glob_sta <- 0x%x (glob_sta 0x%x)\n", val, s->glob_sta);
break;
default:
dolog ("U nabm writel %#x <- %#x\n", addr, val);
dolog("U nabm writel 0x%x <- 0x%x\n", addr, val);
break;
}
}
@ -989,8 +978,7 @@ static int write_audio (AC97LinkState *s, AC97BusMasterRegs *r,
if (to_copy < 4) {
dolog("whoops\n");
s->last_samp = 0;
}
else {
} else {
s->last_samp = *(uint32_t *)&tmpbuf[to_copy - 4];
}
}
@ -1009,8 +997,7 @@ static void write_bup (AC97LinkState *s, int elapsed)
for (i = 0; i < sizeof(s->silence) / 4; i++, p += 4) {
*(uint32_t *) p = s->last_samp;
}
}
else {
} else {
memset(s->silence, 0, sizeof(s->silence));
}
s->bup_flag |= BUP_SET;
@ -1020,8 +1007,9 @@ static void write_bup (AC97LinkState *s, int elapsed)
int temp = MIN(elapsed, sizeof(s->silence));
while (temp) {
int copied = AUD_write(s->voice_po, s->silence, temp);
if (!copied)
if (!copied) {
return;
}
temp -= copied;
elapsed -= copied;
}
@ -1094,7 +1082,7 @@ static void transfer_audio (AC97LinkState *s, int index, int elapsed)
}
if (!r->picb) {
dolog ("fresh bd %d is empty %#x %#x\n",
dolog("fresh bd %d is empty 0x%x 0x%x\n",
r->civ, r->bd.addr, r->bd.ctl_len);
if (r->civ == r->lvi) {
r->sr |= SR_DCH; /* CELV? */
@ -1136,8 +1124,7 @@ static void transfer_audio (AC97LinkState *s, int index, int elapsed)
new_sr |= SR_LVBCI | SR_DCH | SR_CELV;
stop = 1;
s->bup_flag = (r->bd.ctl_len & BD_BUP) ? BUP_LAST : 0;
}
else {
} else {
r->civ = r->piv;
r->piv = (r->piv + 1) % 32;
fetch_bd(s, r);