ISA version of CS4231A

Hopefully someday will be merged with cs4231.c (SPARC version)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4741 c046a42c-6fe2-441c-8c8c-71466251a162

Makefile.target

@@ -497,6 +497,9 @@ endif
 ifdef CONFIG_GUS
 SOUND_HW += gus.o gusemu_hal.o gusemu_mixer.o
 endif
+ifdef CONFIG_CS4231A
+SOUND_HW += cs4231a.o
+endif
 
 ifdef CONFIG_VNC_TLS
 CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)

configure

@@ -90,6 +90,7 @@ slirp="yes"
 adlib="no"
 ac97="no"
 gus="no"
+cs4231a="no"
 oss="no"
 dsound="no"
 coreaudio="no"
@@ -288,6 +289,8 @@ for opt do
   ;;
   --enable-gus) gus="yes"
   ;;
+  --enable-cs4231a) cs4231a="yes"
+  ;;
   --disable-kqemu) kqemu="no"
   ;;
   --disable-brlapi) brlapi="no"
@@ -419,6 +422,7 @@ echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"
 echo "  --enable-adlib           enable Adlib emulation"
 echo "  --enable-ac97            enable AC97 emulation"
 echo "  --enable-gus             enable Gravis Ultrasound emulation"
+echo "  --enable-cs4231a         enable CS4231A emulation"
 echo "  --enable-coreaudio       enable Coreaudio audio driver"
 echo "  --enable-alsa            enable ALSA audio driver"
 echo "  --enable-esd             enable EsoundD audio driver"
@@ -830,6 +834,7 @@ echo "mingw32 support   $mingw32"
 echo "Adlib support     $adlib"
 echo "AC97 support      $ac97"
 echo "GUS support       $gus"
+echo "CS4231A support   $cs4231a"
 echo "CoreAudio support $coreaudio"
 echo "ALSA support      $alsa"
 echo "EsounD support    $esd"
@@ -1038,6 +1043,10 @@ if test "$gus" = "yes" ; then
   echo "CONFIG_GUS=yes" >> $config_mak
   echo "#define CONFIG_GUS 1" >> $config_h
 fi
+if test "$cs4231a" = "yes" ; then
+  echo "CONFIG_CS4231A=yes" >> $config_mak
+  echo "#define CONFIG_CS4231A 1" >> $config_h
+fi
 if test "$oss" = "yes" ; then
   echo "CONFIG_OSS=yes" >> $config_mak
   echo "#define CONFIG_OSS 1" >> $config_h

hw/audiodev.h

@@ -12,3 +12,6 @@ int GUS_init (AudioState *s, qemu_irq *pic);
 
 /* ac97.c */
 int ac97_init (PCIBus *buf, AudioState *s);
+
+/* cs4231a.c */
+int cs4231a_init (AudioState *s, qemu_irq *pic);

qemu-doc.texi

@@ -175,13 +175,16 @@ Adlib(OPL2) - Yamaha YM3812 compatible chip
 @item
 Gravis Ultrasound GF1 sound card
 @item
+CS4231A compatible sound card
+@item
 PCI UHCI USB controller and a virtual USB hub.
 @end itemize
 
 SMP is supported with up to 255 CPUs.
 
-Note that adlib, ac97 and gus are only available when QEMU was configured
-with --enable-adlib, --enable-ac97 or --enable-gus respectively.
+Note that adlib, ac97, gus and cs4231a are only available when QEMU
+was configured with --enable-adlib, --enable-ac97, --enable-gus or
+--enable-cs4231a respectively.
 
 QEMU uses the PC BIOS from the Bochs project and the Plex86/Bochs LGPL
 VGA BIOS.
@@ -191,6 +194,8 @@ QEMU uses YM3812 emulation by Tatsuyuki Satoh.
 QEMU uses GUS emulation(GUSEMU32 @url{http://www.deinmeister.de/gusemu/})
 by Tibor "TS" Schütz.
 
+CS4231A is the chip used in Windows Sound System and GUSMAX products
+
 @c man end
 
 @node pcsys_quickstart

vl.c

@@ -7552,6 +7552,16 @@ struct soundhw soundhw[] = {
         { .init_isa = SB16_init }
     },
 
+#ifdef CONFIG_CS4231A
+    {
+        "cs4231a",
+        "CS4231A",
+        0,
+        1,
+        { .init_isa = cs4231a_init }
+    },
+#endif
+
 #ifdef CONFIG_ADLIB
     {
         "adlib",