Merge pull request #48 from thp/cmi-support

Compile in C-Media CMI8738/8338 support

makefile

@@ -34,6 +34,7 @@ CARDS_SRC := mpxplay/au_cards/ac97_def.c \
 	     mpxplay/au_cards/pcibios.c \
 	     mpxplay/au_cards/sc_e1371.c \
 	     mpxplay/au_cards/sc_ich.c \
+	     mpxplay/au_cards/sc_cmi.c \
 	     mpxplay/au_cards/sc_inthd.c \
 	     mpxplay/au_cards/sc_sbl24.c \
 	     mpxplay/au_cards/sc_sbliv.c \

mpxplay/au_cards/au_cards.c

@@ -53,12 +53,12 @@ extern one_sndcard_info ICH_sndcard_info;
 extern one_sndcard_info IHD_sndcard_info;
 extern one_sndcard_info VIA82XX_sndcard_info;
 extern one_sndcard_info SBLIVE_sndcard_info;
+extern one_sndcard_info CMI8X38_sndcard_info;
 #ifndef SBEMU
 extern one_sndcard_info ESS_sndcard_info;
 extern one_sndcard_info WSS_sndcard_info;
 extern one_sndcard_info SB16_sndcard_info;
 extern one_sndcard_info EMU20KX_sndcard_info;
-extern one_sndcard_info CMI8X38_sndcard_info;
 extern one_sndcard_info GUS_sndcard_info;
 extern one_sndcard_info SB_sndcard_info;
 extern one_sndcard_info MIDAS_sndcard_info;
@@ -67,7 +67,6 @@ extern one_sndcard_info MIDAS_sndcard_info;
 #undef AU_CARDS_LINK_WSS
 #undef AU_CARDS_LINK_SB16
 #undef AU_CARDS_LINK_EMU20KX
-#undef AU_CARDS_LINK_CMI8X38
 #undef AU_CARDS_LINK_GUS
 #undef AU_CARDS_LINK_SB
 #undef AU_CARDS_LINK_MIDAS

mpxplay/au_cards/sc_cmi.c

@@ -331,7 +331,7 @@ typedef struct cmi8x38_card
  unsigned char   device_type;
  struct pci_config_s  *pci_dev;
 
- dosmem_t *dm;
+ cardmem_t *dm;
  char *pcmout_buffer;
  long pcmout_bufsize;
 
@@ -593,7 +593,7 @@ static int CMI8X38_adetect(struct mpxplay_audioout_info_s *aui)
  if(!card->pci_dev)
   goto err_adetect;
 
- if(pcibios_search_devices(&cmi_devices,card->pci_dev)!=PCI_SUCCESSFUL)
+ if(pcibios_search_devices(cmi_devices,card->pci_dev)!=PCI_SUCCESSFUL)
   goto err_adetect;
 
  pcibios_set_master(card->pci_dev);