Commit b0f3b8fac4cf3813b70fa0f2f65be83f9970a286
1 parent
c45ca54f
Enable ac97 by default
ac97 has drivers for Vista 64-bit whereas sb16 and es1370 do not appear to. I asked malc why it was disabled and he said it was because it was GPL. He did not object to enabling it now that more QEMU code is GPL'd. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6253 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
1 additions
and
6 deletions
Makefile.target
| @@ -593,10 +593,7 @@ ifdef CONFIG_OSS | @@ -593,10 +593,7 @@ ifdef CONFIG_OSS | ||
| 593 | LIBS += $(CONFIG_OSS_LIB) | 593 | LIBS += $(CONFIG_OSS_LIB) |
| 594 | endif | 594 | endif |
| 595 | 595 | ||
| 596 | -SOUND_HW = sb16.o es1370.o | ||
| 597 | -ifdef CONFIG_AC97 | ||
| 598 | -SOUND_HW += ac97.o | ||
| 599 | -endif | 596 | +SOUND_HW = sb16.o es1370.o ac97.o |
| 600 | ifdef CONFIG_ADLIB | 597 | ifdef CONFIG_ADLIB |
| 601 | SOUND_HW += fmopl.o adlib.o | 598 | SOUND_HW += fmopl.o adlib.o |
| 602 | adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 | 599 | adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 |
vl.c
| @@ -4308,7 +4308,6 @@ struct soundhw soundhw[] = { | @@ -4308,7 +4308,6 @@ struct soundhw soundhw[] = { | ||
| 4308 | }, | 4308 | }, |
| 4309 | #endif | 4309 | #endif |
| 4310 | 4310 | ||
| 4311 | -#ifdef CONFIG_AC97 | ||
| 4312 | { | 4311 | { |
| 4313 | "ac97", | 4312 | "ac97", |
| 4314 | "Intel 82801AA AC97 Audio", | 4313 | "Intel 82801AA AC97 Audio", |
| @@ -4316,7 +4315,6 @@ struct soundhw soundhw[] = { | @@ -4316,7 +4315,6 @@ struct soundhw soundhw[] = { | ||
| 4316 | 0, | 4315 | 0, |
| 4317 | { .init_pci = ac97_init } | 4316 | { .init_pci = ac97_init } |
| 4318 | }, | 4317 | }, |
| 4319 | -#endif | ||
| 4320 | 4318 | ||
| 4321 | { | 4319 | { |
| 4322 | "es1370", | 4320 | "es1370", |