/[qemu]/qemu/hw/pc.c
ViewVC logotype

Diff of /qemu/hw/pc.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.42 by bellard, Sat Nov 5 16:57:08 2005 UTC revision 1.43 by bellard, Sat Nov 5 18:55:28 2005 UTC
# Line 601  static void pc_init1(int ram_size, int v Line 601  static void pc_init1(int ram_size, int v
601      DMA_init(0);      DMA_init(0);
602    
603      if (audio_enabled) {      if (audio_enabled) {
604          AUD_init();          AudioState *audio;
605          if (sb16_enabled)  
606              SB16_init ();          audio = AUD_init();
607            if (audio) {
608                if (sb16_enabled)
609                    SB16_init (audio);
610  #ifdef CONFIG_ADLIB  #ifdef CONFIG_ADLIB
611          if (adlib_enabled)              if (adlib_enabled)
612              Adlib_init ();                  Adlib_init (audio);
613  #endif  #endif
614  #ifdef CONFIG_GUS  #ifdef CONFIG_GUS
615          if (gus_enabled)              if (gus_enabled)
616              GUS_init ();                  GUS_init (audio);
617  #endif  #endif
618          if (pci_enabled && es1370_enabled)              if (pci_enabled && es1370_enabled)
619              es1370_init (pci_bus);                  es1370_init (pci_bus, audio);
620            }
621      }      }
622    
623      floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);      floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26