isisalsa-devel — Developers mailing list

[Isisalsa-devel] Isis Informarion

[Felipe C. <sho...@gm...>]

Hello, I don't know if anyone is still reading these?

I am trying to write an improved initializer and mixer for DOS, cross
compiling from the alsa drivers and maxiinit  command line tool. I got
maxiinit to work and the card now plays back audio (somewhat) from the
SBPRO legacy system in real DOS.

I am having a really hard time figuring out the details. I saw, using
wayback machine, that there used to be a site with information on the
chipsets, the Bochs setup that was used to help RE and some more, but the
files are gone.

The DOS drivers provided by Guillemot just don't work, they initialize the
Maestro but they do not initialize the 9707 properly, so no audio pass
through.

Are those files still available? Pushing it a bit further, could I ask some
questions about how the card works?

I know asking for such 10 years later is a bit of a stretch. Thank you!

[Isisalsa-devel] More inches for more pleasure!

[<di...@vi...>]

Extremely reduced prices for the most needed meds
http://qpfp.windowsoxonline.com

[Isisalsa-devel] isis .cvsignore,1.5,1.6 sam9707.c,1.9,1.10

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10196

Modified Files:
	.cvsignore sam9707.c 
Log Message:
removale of .tmp_versions noise


Index: .cvsignore
===================================================================
RCS file: /cvsroot/isisalsa/isis/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** .cvsignore	3 Jun 2007 20:17:50 -0000	1.5
--- .cvsignore	28 Jul 2007 12:20:36 -0000	1.6
***************
*** 7,8 ****
--- 7,9 ----
  .tmp_versions/
  *.symvers
+ .tmp_versions

Index: sam9707.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** sam9707.c	15 May 2007 09:56:28 -0000	1.9
--- sam9707.c	28 Jul 2007 12:20:36 -0000	1.10
***************
*** 1190,1201 ****
  	 * 		Setting up clock source
  	 */
! 	outw(0x019B, chip->io_port + 0x64); // set GPIO mask
! 	outw(0x0e64, chip->io_port + 0x68); // set GPIO dir
  	value = inw(chip->io_port + 0x60); //read the GPIO
! 	value &= 0x000f;
  	value |= 0x0024;
  	outw(value, chip->io_port + 0x60); // write new value to GPIO
  	value = inw(chip->io_port + 0x64); //read the GPIO mask
! 	value |= 0x0fff;
  	outw(0x019B, chip->io_port + 0x64); // set GPIO mask
  	snd_printk("Clock source set\n");
--- 1190,1206 ----
  	 * 		Setting up clock source
  	 */
! 	value = inw(chip->io_port + 0x64); //read the GPIO mask
! 	value &= 0x19b;
! 	outw(0x019B, value); // set GPIO mask
! 	value = inw(chip->io_port + 0x64); //read the GPIO dir
! 	value &= 0xf000;
! 	value |= 0x0e64;
! 	outw(0x0e64,value); // set GPIO dir
  	value = inw(chip->io_port + 0x60); //read the GPIO
! 	value &= 0xf000;
  	value |= 0x0024;
  	outw(value, chip->io_port + 0x60); // write new value to GPIO
  	value = inw(chip->io_port + 0x64); //read the GPIO mask
! 	value |= 0xf000;
  	outw(0x019B, chip->io_port + 0x64); // set GPIO mask
  	snd_printk("Clock source set\n");

[Isisalsa-devel] isis/.tmp_versions snd-es1968.mod,NONE,1.1

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis/.tmp_versions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6645/.tmp_versions

Added Files:
	snd-es1968.mod 
Log Message:
printk correction and test is ok.

--- NEW FILE: snd-es1968.mod ---
/home/jeanseb/eclipse/isis/snd-es1968.ko
/home/jeanseb/eclipse/isis/es1968.o /home/jeanseb/eclipse/isis/sam9707.o

[Isisalsa-devel] isis/.settings org.eclipse.ltk.core.refactoring.prefs, NONE, 1.1 org.eclipse.cdt.core.prefs, 1.2, 1.3

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis/.settings
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6645/.settings

Modified Files:
	org.eclipse.cdt.core.prefs 
Added Files:
	org.eclipse.ltk.core.refactoring.prefs 
Log Message:
printk correction and test is ok.

--- NEW FILE: org.eclipse.ltk.core.refactoring.prefs ---
#Sun Jun 03 22:15:14 CEST 2007
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

Index: org.eclipse.cdt.core.prefs
===================================================================
RCS file: /cvsroot/isisalsa/isis/.settings/org.eclipse.cdt.core.prefs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** org.eclipse.cdt.core.prefs	15 May 2007 09:56:28 -0000	1.2
--- org.eclipse.cdt.core.prefs	3 Jun 2007 20:17:51 -0000	1.3
***************
*** 1,3 ****
! #Sun May 13 23:09:40 CEST 2007
  eclipse.preferences.version=1
! indexerId=org.eclipse.cdt.core.nullindexer
--- 1,3 ----
! #Sun Jun 03 22:15:16 CEST 2007
  eclipse.preferences.version=1
! indexerId=org.eclipse.cdt.core.domsourceindexer

[Isisalsa-devel] isis es1968.c, 1.46, 1.47 .cdtproject, 1.2, 1.3 .cvsignore, 1.4, 1.5

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6645

Modified Files:
	es1968.c .cdtproject .cvsignore 
Log Message:
printk correction and test is ok.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/isisalsa/isis/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** .cvsignore	31 Dec 2005 15:00:51 -0000	1.4
--- .cvsignore	3 Jun 2007 20:17:50 -0000	1.5
***************
*** 5,6 ****
--- 5,8 ----
  *.cmd
  dmesg
+ .tmp_versions/
+ *.symvers

Index: .cdtproject
===================================================================
RCS file: /cvsroot/isisalsa/isis/.cdtproject,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** .cdtproject	5 Nov 2004 12:09:43 -0000	1.2
--- .cdtproject	3 Jun 2007 20:17:50 -0000	1.3
***************
*** 3,6 ****
  
  <cdtproject id="org.eclipse.cdt.make.core.make">
! <extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.ELF"/>
  </cdtproject>
--- 3,12 ----
  
  <cdtproject id="org.eclipse.cdt.make.core.make">
! <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
! <data>
! <item id="org.eclipse.cdt.core.pathentry">
! <pathentry kind="src" path=""/>
! <pathentry kind="out" path=""/>
! </item>
! </data>
  </cdtproject>

Index: es1968.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/es1968.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** es1968.c	15 May 2007 09:56:28 -0000	1.46
--- es1968.c	3 Jun 2007 20:17:50 -0000	1.47
***************
*** 2686,2690 ****
  	case TYPE_MAESTRO2E:
  #ifdef SND_ISIS
! 		strcpy(card->driver, "ES1978");
  		strcpy(card->shortname, "Guillemot ISIS Maxi sound");
  #else
--- 2686,2690 ----
  	case TYPE_MAESTRO2E:
  #ifdef SND_ISIS
! 		strcpy(card->driver, "ISIS");
  		strcpy(card->shortname, "Guillemot ISIS Maxi sound");
  #else
***************
*** 2705,2709 ****
  	if ((err = snd_es1968_pcm(chip, 0)) < 0) {
  		snd_card_free(card);
- 		printk(KERN_ERR "test 2 \n");
  		return err;
  	}
--- 2705,2708 ----
***************
*** 2711,2715 ****
  	if ((err = snd_es1968_mixer(chip)) < 0) {
  		snd_card_free(card);
- 		printk(KERN_ERR "test 3 \n");
  		return err;
  	}
--- 2710,2713 ----
***************
*** 2749,2752 ****
--- 2747,2751 ----
  	if ((err = snd_card_register(card)) < 0) {
  		snd_card_free(card);
+ 		printk("%d \n", err);
  		return err;
  	}

[Isisalsa-devel] isis sam9707.c, 1.8, 1.9 isis.h, 1.14, 1.15 es1968.c, 1.45, 1.46 es1968.h, 1.2, 1.3

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28981

Modified Files:
	sam9707.c isis.h es1968.c es1968.h 
Log Message:
Import of 2.6.21 es1968 change.
Compiling, not tested 

Index: sam9707.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sam9707.c	24 Jul 2006 09:01:21 -0000	1.8
--- sam9707.c	15 May 2007 09:56:28 -0000	1.9
***************
*** 55,59 ****
  };
  
! static snd_pcm_hardware_t snd_sam9407_play[2] = {
  	{
  		.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
--- 55,59 ----
  };
  
! static struct snd_pcm_hardware snd_sam9407_play[2] = {
  	{
  		.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
***************
*** 92,96 ****
  };
  
! static snd_pcm_hardware_t snd_sam9407_rec[4] = {
  	{
  		.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
--- 92,96 ----
  };
  
! static struct snd_pcm_hardware snd_sam9407_rec[4] = {
  	{
  		.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
***************
*** 229,232 ****
--- 229,260 ----
  }
  
+ /* from old stuff to test */
+ static inline int isis_dream_outb(struct isis_sam9707_chip *chip,u16 reg,int value)
+ {
+         int count=0;
+         int status;
+ 
+         do
+         {
+                 outw(1,chip->io_port + 0x44); /* select status register */
+                 status = inw(chip->io_port + 0x46) & 0xff;
+                 outw(2,chip->io_port + 0x44); /* select back data16 register */
+         }
+         while((count++ < 0x6000) && ((status & 0x40) != 0));
+         printk("isis.o: outb = status %x, count %d\n", status, count);
+         /*              SAM READY */
+         if(count<= 0x6000)
+         {
+                 outw(reg & 0xff, chip->io_port + 0x44);
+                 outw(value & 0xff, chip->io_port + 0x46);
+                 outw(2, chip->io_port + 0x44);
+                 return 0;
+         }
+         else
+                 return -EIO;
+ 
+ }
+ 
+ 
  /*
   * 		Write a byte register on SAM 9707
***************
*** 337,342 ****
  
  
! int snd_isis_sam9707_playback_info(snd_kcontrol_t *kcontrol,
! 									snd_ctl_elem_info_t *uinfo) {
  
  	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
--- 365,370 ----
  
  
! int snd_isis_sam9707_playback_info(struct snd_kcontrol *kcontrol,
! 									struct snd_ctl_elem_info*uinfo) {
  
  	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
***************
*** 347,352 ****
  } 
  
! int snd_isis_sam9707_playback_get(snd_kcontrol_t *kcontrol,
! 								snd_ctl_elem_value_t *ucontrol) {
  	/* TODO :
  	 * 		Read and return volume value for selected playback channel
--- 375,380 ----
  } 
  
! int snd_isis_sam9707_playback_get(struct snd_kcontrol*kcontrol,
! 								struct snd_ctl_elem_value *ucontrol) {
  	/* TODO :
  	 * 		Read and return volume value for selected playback channel
***************
*** 363,368 ****
  }
  
! int snd_isis_sam9707_playback_put(snd_kcontrol_t *kcontrol,
! 										snd_ctl_elem_value_t *ucontrol) {
  	/* TODO :
  	 * 		Set volume value for selected playback channel
--- 391,396 ----
  }
  
! int snd_isis_sam9707_playback_put(struct snd_kcontrol*kcontrol,
! 										struct snd_ctl_elem_value *ucontrol) {
  	/* TODO :
  	 * 		Set volume value for selected playback channel
***************
*** 382,387 ****
   * RACK controls 
   */
! int snd_isis_sam9707_rack_info(snd_kcontrol_t *kcontrol,
! 									snd_ctl_elem_info_t *uinfo) {
  
  	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
--- 410,415 ----
   * RACK controls 
   */
! int snd_isis_sam9707_rack_info(struct snd_kcontrol *kcontrol,
! 									struct snd_ctl_elem_info *uinfo) {
  
  	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
***************
*** 392,397 ****
  } 
  
! int snd_isis_sam9707_rack_get(snd_kcontrol_t *kcontrol,
! 								snd_ctl_elem_value_t *ucontrol) {
  	/* TODO :
  	 * 		Read and return volume value for selected playback channel
--- 420,425 ----
  } 
  
! int snd_isis_sam9707_rack_get(struct snd_kcontrol*kcontrol,
! 								struct snd_ctl_elem_value *ucontrol) {
  	/* TODO :
  	 * 		Read and return volume value for selected playback channel
***************
*** 405,410 ****
  }
  
! int snd_isis_sam9707_rack_put(snd_kcontrol_t *kcontrol,
! 										snd_ctl_elem_value_t *ucontrol) {
  	/* TODO :
  	 * 		Set volume value for selected playback channel
--- 433,438 ----
  }
  
! int snd_isis_sam9707_rack_put(struct snd_kcontrol*kcontrol,
! 										struct snd_ctl_elem_value *ucontrol) {
  	/* TODO :
  	 * 		Set volume value for selected playback channel
***************
*** 432,436 ****
   * 
   */
! int snd_isis_firm_open (snd_info_entry_t *entry,  unsigned short mode, 
  		void **file_private_data)
  {
--- 460,464 ----
   * 
   */
! int snd_isis_firm_open (struct snd_info_entry *entry,  unsigned short mode, 
  		void **file_private_data)
  {
***************
*** 459,463 ****
  	return 0;
  }
! long snd_isis_firm_write(snd_info_entry_t *entry, 
  							void * file_private_data, struct file * file, 
  							const char *buf, unsigned long count,
--- 487,491 ----
  	return 0;
  }
! long snd_isis_firm_write(struct snd_info_entry *entry, 
  							void * file_private_data, struct file * file, 
  							const char *buf, unsigned long count,
***************
*** 482,486 ****
  	return count;
  }
! int snd_isis_firm_release(snd_info_entry_t * entry,
                          unsigned short mode, void *file_private_data)
  {
--- 510,514 ----
  	return count;
  }
! int snd_isis_firm_release(struct snd_info_entry * entry,
                          unsigned short mode, void *file_private_data)
  {
***************
*** 500,503 ****
--- 528,532 ----
   	 * 	Reset the sam chip
   	 */
+ 
   	/*snd_printk("Resetting the chip\n");
   	snd_isis_write_control(chip,SAM_CMD_HOT_RES);
***************
*** 505,508 ****
--- 534,538 ----
  	mdelay(50);*/
  
+ 
  	/*loop = SAM_READ_LOOP_COUNTER;
  	while((snd_isis_read(chip, SAM9707_STATUS) != 0xa0) & --loop) 
***************
*** 518,522 ****
  
  	
! 	snd_isis_write_control(chip, SAM_RESET);
  
  	snd_printk("read data8 : %2x\n",snd_isis_read(chip, SAM9707_DATA8));
--- 548,553 ----
  
  	
! 	//	snd_isis_write_control(chip, SAM_RESET);
! 	isis_dream_outb(chip, SAM9707_CONTROL,SAM_RESET);
  
  	snd_printk("read data8 : %2x\n",snd_isis_read(chip, SAM9707_DATA8));
***************
*** 753,757 ****
  
  
! int snd_isis_sam9707_play_open(snd_pcm_substream_t *subs) {
   	struct isis_sam9707_chip *chip= snd_pcm_substream_chip(subs);
   	
--- 784,788 ----
  
  
! int snd_isis_sam9707_play_open(struct snd_pcm_substream *subs) {
   	struct isis_sam9707_chip *chip= snd_pcm_substream_chip(subs);
   	
***************
*** 766,770 ****
   };
   
! int snd_isis_sam9707_play_close(snd_pcm_substream_t *subs) {
   	struct isis_sam9707_chip *chip =  snd_pcm_substream_chip(subs);
   		
--- 797,801 ----
   };
   
! int snd_isis_sam9707_play_close(struct snd_pcm_substream *subs) {
   	struct isis_sam9707_chip *chip =  snd_pcm_substream_chip(subs);
   		
***************
*** 773,777 ****
   };
   
! int snd_isis_sam9707_rec_open(snd_pcm_substream_t *subs) {
   	struct isis_sam9707_chip *chip= snd_pcm_substream_chip(subs);
   	
--- 804,808 ----
   };
   
! int snd_isis_sam9707_rec_open(struct snd_pcm_substream *subs) {
   	struct isis_sam9707_chip *chip= snd_pcm_substream_chip(subs);
   	
***************
*** 786,790 ****
   };
   
!  static int snd_isis_sam9707_rec_close(snd_pcm_substream_t *subs) {
   	struct isis_sam9707_chip *chip =  snd_pcm_substream_chip(subs);
   		
--- 817,821 ----
   };
   
!  static int snd_isis_sam9707_rec_close(struct snd_pcm_substream *subs) {
   	struct isis_sam9707_chip *chip =  snd_pcm_substream_chip(subs);
   		
***************
*** 807,812 ****
  };
   
! int snd_isis_pcm_hw_params(snd_pcm_substream_t *substream,
!  	snd_pcm_hw_params_t *hw_params)
   {
   	snd_printk("snd_isis_pcm_hw_params");
--- 838,843 ----
  };
   
! int snd_isis_pcm_hw_params(struct snd_pcm_substream *substream,
!  	struct snd_pcm_hw_params *hw_params)
   {
   	snd_printk("snd_isis_pcm_hw_params");
***************
*** 815,827 ****
   };
   
! int snd_isis_pcm_hw_free(snd_pcm_substream_t *substream)
   {
   	return snd_pcm_lib_free_pages(substream);
   };
   
! int snd_isis_pcm_prepare(snd_pcm_substream_t *substream)
  {
  	struct isis_sam9707_chip *chip = snd_pcm_substream_chip(substream);
! 	snd_pcm_runtime_t *runtime = substream->runtime;
  	u8 format;
  	
--- 846,858 ----
   };
   
! int snd_isis_pcm_hw_free(struct snd_pcm_substream *substream)
   {
   	return snd_pcm_lib_free_pages(substream);
   };
   
! int snd_isis_pcm_prepare(struct snd_pcm_substream *substream)
  {
  	struct isis_sam9707_chip *chip = snd_pcm_substream_chip(substream);
! 	struct snd_pcm_runtime *runtime = substream->runtime;
  	u8 format;
  	
***************
*** 846,853 ****
  };
  
! int snd_isis_pcm_rec_prepare(snd_pcm_substream_t *substream)
  {
  	struct isis_sam9707_chip *chip = snd_pcm_substream_chip(substream);
! 	snd_pcm_runtime_t *runtime = substream->runtime;
  	u8 format;
  	
--- 877,884 ----
  };
  
! int snd_isis_pcm_rec_prepare(struct snd_pcm_substream *substream)
  {
  	struct isis_sam9707_chip *chip = snd_pcm_substream_chip(substream);
! 	struct snd_pcm_runtime  *runtime = substream->runtime;
  	u8 format;
  	
***************
*** 871,875 ****
  };
  
! int snd_isis_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
  {
  	struct isis_sam9707_chip *chip = snd_pcm_substream_chip(substream);
--- 902,906 ----
  };
  
! int snd_isis_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
  {
  	struct isis_sam9707_chip *chip = snd_pcm_substream_chip(substream);
***************
*** 892,902 ****
  };
  
! snd_pcm_uframes_t snd_isis_pcm_rec_pointer(
! 			snd_pcm_substream_t  *substream)
  {
  		return 0;
  };
  
! snd_pcm_uframes_t snd_isis_pcm_pointer(snd_pcm_substream_t  *substream)
  {
  		snd_printk("snd_isis_pcm_pointer");
--- 923,933 ----
  };
  
! struct snd_pcm_uframes *snd_isis_pcm_rec_pointer(
! 			struct snd_pcm_substream  *substream)
  {
  		return 0;
  };
  
! struct snd_pcm_uframes *snd_isis_pcm_pointer(struct snd_pcm_substream *substream)
  {
  		snd_printk("snd_isis_pcm_pointer");
***************
*** 907,911 ****
  
  
! void snd_isis_pcm_free(snd_pcm_t *pcm) {
   
   	struct isis_sam9707_chip *chip = (struct isis_sam9707_chip *) pcm->private_data;
--- 938,942 ----
  
  
! void snd_isis_pcm_free(struct snd_pcm *pcm) {
   
   	struct isis_sam9707_chip *chip = (struct isis_sam9707_chip *) pcm->private_data;
***************
*** 942,946 ****
  };
  
! static snd_kcontrol_new_t snd_isis_sam9707_ctl_vol[2] = {
  	{
  		.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,
--- 973,977 ----
  };
  
! static struct snd_kcontrol_new snd_isis_sam9707_ctl_vol[2] = {
  	{
  		.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,
***************
*** 965,969 ****
  };
  
! static snd_kcontrol_new_t snd_isis_sam9707_rec_ctl_vol[4] = {
  	{
  		.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,
--- 996,1000 ----
  };
  
! static struct snd_kcontrol_new snd_isis_sam9707_rec_ctl_vol[4] = {
  	{
  		.iface	= SNDRV_CTL_ELEM_IFACE_MIXER,
***************
*** 1008,1012 ****
  };
  
! static snd_kcontrol_new_t snd_isis_rack_controls[2] = {
  	{
  			.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
--- 1039,1043 ----
  };
  
! static struct snd_kcontrol_new snd_isis_rack_controls[2] = {
  	{
  			.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
***************
*** 1030,1034 ****
  
  
! static  snd_pcm_ops_t snd_isis_sam9707_pcm_play_ops = {
  	.open = snd_isis_sam9707_play_open,
  	.close = snd_isis_sam9707_play_close,
--- 1061,1065 ----
  
  
! static struct snd_pcm_ops snd_isis_sam9707_pcm_play_ops = {
  	.open = snd_isis_sam9707_play_open,
  	.close = snd_isis_sam9707_play_close,
***************
*** 1042,1046 ****
  
  
! static  snd_pcm_ops_t snd_isis_sam9707_pcm_rec_ops = {
  	.open = snd_isis_sam9707_rec_open,
  	.close = snd_isis_sam9707_rec_close,
--- 1073,1077 ----
  
  
! static  struct snd_pcm_ops snd_isis_sam9707_pcm_rec_ops = {
  	.open = snd_isis_sam9707_rec_open,
  	.close = snd_isis_sam9707_rec_close,
***************
*** 1055,1060 ****
  
  int __devinit snd_isis_new_pcm(struct isis_sam9707_chip *chip) {
!  	snd_pcm_t *pcmo;
!  	snd_pcm_t *pcmi;
   	int err;
   	int i; /* loop counter */
--- 1086,1091 ----
  
  int __devinit snd_isis_new_pcm(struct isis_sam9707_chip *chip) {
!  	struct snd_pcm *pcmo;
!  	struct snd_pcm *pcmi;
   	int err;
   	int i; /* loop counter */
***************
*** 1105,1109 ****
  	int loop, err, i;
  	u16 value,tmp;
! 	snd_info_entry_t  *entry;	/*	data for retreiving new snd_info_entry */
  	
  	err = snd_card_proc_new(chip->card, "firmware", &entry);
--- 1136,1140 ----
  	int loop, err, i;
  	u16 value,tmp;
! 	struct snd_info_entry  *entry;	/*	data for retreiving new snd_info_entry */
  	
  	err = snd_card_proc_new(chip->card, "firmware", &entry);
***************
*** 1121,1126 ****
  	outw(tmp, chip->io_port + 0x18);
  	
! 	snd_isis_write_control(chip, 0x70);	
! 	snd_isis_write_data8(chip, 0x11);
  	mdelay(100);	
  	if((tmp = snd_isis_read_data8(chip)) != 0x00)
--- 1152,1159 ----
  	outw(tmp, chip->io_port + 0x18);
  	
! //	snd_isis_write_control(chip, 0x70);	
! 	isis_dream_outb(chip, SAM9707_CONTROL, 0x70);
! //	snd_isis_write_data8(chip, 0x11);
! 	isis_dream_outb(chip, SAM9707_DATA8, 0x11);
  	mdelay(100);	
  	if((tmp = snd_isis_read_data8(chip)) != 0x00)

Index: isis.h
===================================================================
RCS file: /cvsroot/isisalsa/isis/isis.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** isis.h	29 Apr 2006 20:07:52 -0000	1.14
--- isis.h	15 May 2007 09:56:28 -0000	1.15
***************
*** 181,194 ****
  /*  definition of the chip-specific record*/
  struct isis_sam9707_chip {
! 	snd_card_t *card;
! 	struct snd_es1968 *parent;
  	spinlock_t  reg_lock;
  	int firm;		/* 0 card not ready, 1 firm file opend, 2 firm downloaded */
  	u8 *firmptr;
  	long firmpos;
! 	snd_info_entry_t  *entry;
  	unsigned long io_port;	/* hardware address 	*/
! 	snd_pcm_t *pcmi;
! 	snd_pcm_t *pcmo;
  	u8 ivoices;	/*! Flags each bit a sam  input channel channel, value = isopend*/
  	struct isis_voice play_voice[2];
--- 181,194 ----
  /*  definition of the chip-specific record*/
  struct isis_sam9707_chip {
! 	struct snd_card *card;
! 	struct es1968 *parent;
  	spinlock_t  reg_lock;
  	int firm;		/* 0 card not ready, 1 firm file opend, 2 firm downloaded */
  	u8 *firmptr;
  	long firmpos;
! 	struct snd_info_entry *entry;
  	unsigned long io_port;	/* hardware address 	*/
! 	struct snd_pcm *pcmi;
! 	struct snd_pcm *pcmo;
  	u8 ivoices;	/*! Flags each bit a sam  input channel channel, value = isopend*/
  	struct isis_voice play_voice[2];

Index: es1968.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/es1968.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** es1968.c	29 Apr 2006 20:07:52 -0000	1.45
--- es1968.c	15 May 2007 09:56:28 -0000	1.46
***************
*** 101,107 ****
--- 101,110 ----
  #include <linux/init.h>
  #include <linux/pci.h>
+ #include <linux/dma-mapping.h>
  #include <linux/slab.h>
  #include <linux/gameport.h>
  #include <linux/moduleparam.h>
+ #include <linux/mutex.h>
+ 
  #include <sound/core.h>
  #include <sound/pcm.h>
***************
*** 137,141 ****
  static int pcm_substreams_p[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4 };
  static int pcm_substreams_c[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
! static int clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
  static int use_pm[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
  static int enable_mpu[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
--- 140,144 ----
  static int pcm_substreams_p[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4 };
  static int pcm_substreams_c[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1 };
! static int clock[SNDRV_CARDS];/* = {[0 ... (SNDRV_CARDS - 1)] = 0};*/
  static int use_pm[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
  static int enable_mpu[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
***************
*** 445,488 ****
  #define ESM_MODE_CAPTURE	1
  
- /* acpi states */
- enum {
- 	ACPI_D0=0,
- 	ACPI_D1,
- 	ACPI_D2,
- 	ACPI_D3
- };
- 
- /* bits in the acpi masks */
- #define ACPI_12MHZ	( 1 << 15)
- #define ACPI_24MHZ	( 1 << 14)
- #define ACPI_978	( 1 << 13)
- #define ACPI_SPDIF	( 1 << 12)
- #define ACPI_GLUE	( 1 << 11)
- #define ACPI__10	( 1 << 10) /* reserved */
- #define ACPI_PCIINT	( 1 << 9)
- #define ACPI_HV		( 1 << 8) /* hardware volume */
- #define ACPI_GPIO	( 1 << 7)
- #define ACPI_ASSP	( 1 << 6)
- #define ACPI_SB		( 1 << 5) /* sb emul */
- #define ACPI_FM		( 1 << 4) /* fm emul */
- #define ACPI_RB		( 1 << 3) /* ringbus / aclink */
- #define ACPI_MIDI	( 1 << 2) 
- #define ACPI_GP		( 1 << 1) /* game port */
- #define ACPI_WP		( 1 << 0) /* wave processor */
- 
- #define ACPI_ALL	(0xffff)
- #define ACPI_SLEEP	(~(ACPI_SPDIF|ACPI_ASSP|ACPI_SB|ACPI_FM| \
- 			ACPI_MIDI|ACPI_GP|ACPI_WP))
- #define ACPI_NONE	(ACPI__10)
- 
- /* these masks indicate which units we care about at
- 	which states */
- static u16 acpi_state_mask[] = {
- 	[ACPI_D0] = ACPI_ALL,
- 	[ACPI_D1] = ACPI_SLEEP,
- 	[ACPI_D2] = ACPI_SLEEP,
- 	[ACPI_D3] = ACPI_NONE
- };
- 
  
  /* APU use in the driver */
--- 448,451 ----
***************
*** 585,589 ****
  	int bobclient;		/* active timer instancs */
  	int bob_freq;		/* timer frequency */
! 	struct semaphore memory_mutex;	/* memory lock */
  
  	/* APU states */
--- 548,552 ----
  	int bobclient;		/* active timer instancs */
  	int bob_freq;		/* timer frequency */
! 	struct mutex memory_mutex;	/* memory lock */
  
  	/* APU states */
***************
*** 606,610 ****
  };
  
! static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id, struct pt_regs *regs);
  
  static struct pci_device_id snd_es1968_ids[] = {
--- 569,573 ----
  };
  
! static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id);
  
  static struct pci_device_id snd_es1968_ids[] = {
***************
*** 632,636 ****
  }
  
! inline static void maestro_write(struct es1968 *chip, u16 reg, u16 data)
  {
  	unsigned long flags;
--- 595,599 ----
  }
  
! static inline void maestro_write(struct es1968 *chip, u16 reg, u16 data)
  {
  	unsigned long flags;
***************
*** 650,654 ****
  }
  
! inline static u16 maestro_read(struct es1968 *chip, u16 reg)
  {
  	unsigned long flags;
--- 613,617 ----
  }
  
! static inline u16 maestro_read(struct es1968 *chip, u16 reg)
  {
  	unsigned long flags;
***************
*** 684,688 ****
--- 647,653 ----
  	spin_lock_irqsave(&chip->ac97_lock, flags);
  	outw(val, chip->io_port + ESM_AC97_DATA);
+ 	/*msleep(1);*/
  	outb(reg, chip->io_port + ESM_AC97_INDEX);
+ 	/*msleep(1);*/
  	spin_unlock_irqrestore(&chip->ac97_lock, flags);
  }
***************
*** 692,697 ****
  	u16 data = 0;
  	struct es1968 *chip = ac97->private_data;
!     unsigned long flags;	
! 
  
  	snd_es1968_ac97_wait(chip);
--- 657,661 ----
  	u16 data = 0;
  	struct es1968 *chip = ac97->private_data;
! 	unsigned long flags;
  
  	snd_es1968_ac97_wait(chip);
***************
*** 699,705 ****
--- 663,671 ----
  	spin_lock_irqsave(&chip->ac97_lock, flags);
  	outb(reg | 0x80, chip->io_port + ESM_AC97_INDEX);
+ 	/*msleep(1);*/
  
  	if (! snd_es1968_ac97_wait(chip)) {
  		data = inw(chip->io_port + ESM_AC97_DATA);
+ 		/*msleep(1);*/
  	}
  	spin_unlock_irqrestore(&chip->ac97_lock, flags);
***************
*** 936,940 ****
  static u32 snd_es1968_compute_rate(struct es1968 *chip, u32 freq)
  {
- 
  	u32 rate = (freq << 16) / chip->clock;
  #if 0 /* XXX: do we need this? */ 
--- 902,905 ----
***************
*** 946,950 ****
  
  /* get current pointer */
! inline static unsigned int
  snd_es1968_get_dma_ptr(struct es1968 *chip, struct esschan *es)
  {
--- 911,915 ----
  
  /* get current pointer */
! static inline unsigned int
  snd_es1968_get_dma_ptr(struct es1968 *chip, struct esschan *es)
  {
***************
*** 1132,1136 ****
  
  
! static void init_capture_apu(struct es1968 *chip,struct esschan *es, int channel,
  			     unsigned int pa, unsigned int bsize,
  			     int mode, int route)
--- 1097,1101 ----
  
  
! static void init_capture_apu(struct es1968 *chip, struct esschan *es, int channel,
  			     unsigned int pa, unsigned int bsize,
  			     int mode, int route)
***************
*** 1373,1377 ****
  	int max_size = 0;
  	
! 	down(&chip->memory_mutex);
  	list_for_each(p, &chip->buf_list) {
  		struct esm_memory *buf = list_entry(p, struct esm_memory, list);
--- 1338,1342 ----
  	int max_size = 0;
  	
! 	mutex_lock(&chip->memory_mutex);
  	list_for_each(p, &chip->buf_list) {
  		struct esm_memory *buf = list_entry(p, struct esm_memory, list);
***************
*** 1379,1383 ****
  			max_size = buf->buf.bytes;
  	}
! 	up(&chip->memory_mutex);
  	if (max_size >= 128*1024)
  		max_size = 127*1024;
--- 1344,1348 ----
  			max_size = buf->buf.bytes;
  	}
! 	mutex_unlock(&chip->memory_mutex);
  	if (max_size >= 128*1024)
  		max_size = 127*1024;
***************
*** 1391,1396 ****
  	struct list_head *p;
  	
! 	size = ((size + ESM_MEM_ALIGN - 1) / ESM_MEM_ALIGN) * ESM_MEM_ALIGN;
! 	down(&chip->memory_mutex);
  	list_for_each(p, &chip->buf_list) {
  		buf = list_entry(p, struct esm_memory, list);
--- 1356,1361 ----
  	struct list_head *p;
  	
! 	size = ALIGN(size, ESM_MEM_ALIGN);
! 	mutex_lock(&chip->memory_mutex);
  	list_for_each(p, &chip->buf_list) {
  		buf = list_entry(p, struct esm_memory, list);
***************
*** 1398,1402 ****
  			goto __found;
  	}
! 	up(&chip->memory_mutex);
  	return NULL;
  
--- 1363,1367 ----
  			goto __found;
  	}
! 	mutex_unlock(&chip->memory_mutex);
  	return NULL;
  
***************
*** 1405,1409 ****
  		struct esm_memory *chunk = kmalloc(sizeof(*chunk), GFP_KERNEL);
  		if (chunk == NULL) {
! 			up(&chip->memory_mutex);
  			return NULL;
  		}
--- 1370,1374 ----
  		struct esm_memory *chunk = kmalloc(sizeof(*chunk), GFP_KERNEL);
  		if (chunk == NULL) {
! 			mutex_unlock(&chip->memory_mutex);
  			return NULL;
  		}
***************
*** 1417,1421 ****
  	}
  	buf->empty = 0;
! 	up(&chip->memory_mutex);
  	return buf;
  }
--- 1382,1386 ----
  	}
  	buf->empty = 0;
! 	mutex_unlock(&chip->memory_mutex);
  	return buf;
  }
***************
*** 1426,1430 ****
  	struct esm_memory *chunk;
  
! 	down(&chip->memory_mutex);
  	buf->empty = 1;
  	if (buf->list.prev != &chip->buf_list) {
--- 1391,1395 ----
  	struct esm_memory *chunk;
  
! 	mutex_lock(&chip->memory_mutex);
  	buf->empty = 1;
  	if (buf->list.prev != &chip->buf_list) {
***************
*** 1445,1449 ****
  		}
  	}
! 	up(&chip->memory_mutex);
  }
  
--- 1410,1414 ----
  		}
  	}
! 	mutex_unlock(&chip->memory_mutex);
  }
  
***************
*** 1531,1535 ****
  
  /* remove dma areas if allocated */
! static int snd_es1968_hw_free(struct snd_pcm_substream * substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
--- 1496,1500 ----
  
  /* remove dma areas if allocated */
! static int snd_es1968_hw_free(struct snd_pcm_substream *substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
***************
*** 1590,1594 ****
  		return apu1;
  
! 	es = kzalloc(sizeof(*es), GFP_KERNEL);	
  	if (!es) {
  		snd_es1968_free_apu_pair(chip, apu1);
--- 1555,1559 ----
  		return apu1;
  
! 	es = kzalloc(sizeof(*es), GFP_KERNEL);
  	if (!es) {
  		snd_es1968_free_apu_pair(chip, apu1);
***************
*** 1678,1682 ****
  }
  
! static int snd_es1968_playback_close(struct snd_pcm_substream * substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
--- 1643,1647 ----
  }
  
! static int snd_es1968_playback_close(struct snd_pcm_substream *substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
***************
*** 1695,1699 ****
  }
  
! static int snd_es1968_capture_close(struct snd_pcm_substream * substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
--- 1660,1664 ----
  }
  
! static int snd_es1968_capture_close(struct snd_pcm_substream *substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
***************
*** 1792,1797 ****
  	chip->in_measurement = 1;
  	chip->measure_apu = apu;
- 	snd_es1968_bob_inc(chip, ESM_BOB_FREQ);
  	spin_lock_irq(&chip->reg_lock);
  	__apu_set_register(chip, apu, 5, pa & 0xffff);
  	snd_es1968_trigger_apu(chip, apu, ESM_APU_16BITLINEAR);
--- 1757,1762 ----
  	chip->in_measurement = 1;
  	chip->measure_apu = apu;
  	spin_lock_irq(&chip->reg_lock);
+ 	snd_es1968_bob_inc(chip, ESM_BOB_FREQ);
  	__apu_set_register(chip, apu, 5, pa & 0xffff);
  	snd_es1968_trigger_apu(chip, apu, ESM_APU_16BITLINEAR);
***************
*** 1803,1809 ****
  	do_gettimeofday(&stop_time);
  	snd_es1968_trigger_apu(chip, apu, 0); /* stop */
- 	spin_unlock_irq(&chip->reg_lock);
  	snd_es1968_bob_dec(chip);
  	chip->in_measurement = 0;
  
  	/* check the current position */
--- 1768,1774 ----
  	do_gettimeofday(&stop_time);
  	snd_es1968_trigger_apu(chip, apu, 0); /* stop */
  	snd_es1968_bob_dec(chip);
  	chip->in_measurement = 0;
+ 	spin_unlock_irq(&chip->reg_lock);
  
  	/* check the current position */
***************
*** 1919,1923 ****
  	   based on differences from the default register
  	   values. */
! 	x = inb(chip->io_port + 0x1c);
  	/* Reset the volume control registers. */
  	outb(0x88, chip->io_port + 0x1c);
--- 1884,1888 ----
  	   based on differences from the default register
  	   values. */
! 	x = inb(chip->io_port + 0x1c) & 0xee;
  	/* Reset the volume control registers. */
  	outb(0x88, chip->io_port + 0x1c);
***************
*** 1925,1930 ****
  	outb(0x88, chip->io_port + 0x1e);
  	outb(0x88, chip->io_port + 0x1f);
! 	
!     if (chip->in_suspend)
  		return;
  
--- 1890,1895 ----
  	outb(0x88, chip->io_port + 0x1e);
  	outb(0x88, chip->io_port + 0x1f);
! 
! 	if (chip->in_suspend)
  		return;
  
***************
*** 1932,1967 ****
  		return;
  
!     /* FIXME: we can't call snd_ac97_* functions since here is in tasklet. */
  	spin_lock_irqsave(&chip->ac97_lock, flags);
- 
  	val = chip->ac97->regs[AC97_MASTER];
! 	if (x & 1) {
  		/* mute */
  		val ^= 0x8000;
!         chip->ac97->regs[AC97_MASTER] = val;
  		outw(val, chip->io_port + ESM_AC97_DATA);
  		outb(AC97_MASTER, chip->io_port + ESM_AC97_INDEX);
  		snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
  			       &chip->master_switch->id);
! 	} else {
! 		val &= 0x7fff;
! 		if (((x>>1) & 7) > 4) {
! 			/* volume up */
! 			if ((val & 0xff) > 0)
! 				val--;
! 			if ((val & 0xff00) > 0)
! 				val -= 0x0100;
! 		} else {
! 			/* volume down */
! 			if ((val & 0xff) < 0x1f)
! 				val++;
! 			if ((val & 0xff00) < 0x1f00)
! 				val += 0x0100;
! 		}
  		chip->ac97->regs[AC97_MASTER] = val;
!         outw(val, chip->io_port + ESM_AC97_DATA);
  		outb(AC97_MASTER, chip->io_port + ESM_AC97_INDEX);
  		snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
  			       &chip->master_volume->id);
  	}
  	spin_unlock_irqrestore(&chip->ac97_lock, flags);
--- 1897,1937 ----
  		return;
  
! 	/* FIXME: we can't call snd_ac97_* functions since here is in tasklet. */
  	spin_lock_irqsave(&chip->ac97_lock, flags);
  	val = chip->ac97->regs[AC97_MASTER];
! 	switch (x) {
! 	case 0x88:
  		/* mute */
  		val ^= 0x8000;
! 		chip->ac97->regs[AC97_MASTER] = val;
  		outw(val, chip->io_port + ESM_AC97_DATA);
  		outb(AC97_MASTER, chip->io_port + ESM_AC97_INDEX);
  		snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
  			       &chip->master_switch->id);
! 		break;
! 	case 0xaa:
! 		/* volume up */
! 		if ((val & 0x7f) > 0)
! 			val--;
! 		if ((val & 0x7f00) > 0)
! 			val -= 0x0100;
  		chip->ac97->regs[AC97_MASTER] = val;
! 		outw(val, chip->io_port + ESM_AC97_DATA);
  		outb(AC97_MASTER, chip->io_port + ESM_AC97_INDEX);
  		snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
  			       &chip->master_volume->id);
+ 		break;
+ 	case 0x66:
+ 		/* volume down */
+ 		if ((val & 0x7f) < 0x1f)
+ 			val++;
+ 		if ((val & 0x7f00) < 0x1f00)
+ 			val += 0x0100;
+ 		chip->ac97->regs[AC97_MASTER] = val;
+ 		outw(val, chip->io_port + ESM_AC97_DATA);
+ 		outb(AC97_MASTER, chip->io_port + ESM_AC97_INDEX);
+ 		snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+ 			       &chip->master_volume->id);
+ 		break;
  	}
  	spin_unlock_irqrestore(&chip->ac97_lock, flags);
***************
*** 1971,1983 ****
   * interrupt handler
   */
! static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id, struct pt_regs *regs)
  {
  	struct es1968 *chip = dev_id;
  	u32 event;
  
- 	
  	if (!(event = inb(chip->io_port + 0x1A)))
  		return IRQ_NONE;
- //	snd_printk("Interrupt rised Event %2x \n", event);
  
  	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);
--- 1941,1951 ----
   * interrupt handler
   */
! static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id)
  {
  	struct es1968 *chip = dev_id;
  	u32 event;
  
  	if (!(event = inb(chip->io_port + 0x1A)))
  		return IRQ_NONE;
  
  	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);
***************
*** 1990,1994 ****
  
  	if ((event & ESM_MPU401_IRQ) && chip->rmidi) {
! 		snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs);
  	}
  
--- 1958,1962 ----
  
  	if ((event & ESM_MPU401_IRQ) && chip->rmidi) {
! 		snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data);
  	}
  
***************
*** 2035,2038 ****
--- 2003,2007 ----
  	if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
  		return err;
+ 	pbus->no_vra = 1; /* ES1968 doesn't need VRA */
  
  	memset(&ac97, 0, sizeof(ac97));
***************
*** 2040,2044 ****
  	if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97)) < 0)
  		return err;
- 	 pbus->no_vra = 1; /* ES1968 doesn't need VRA */
  
  	/* attach master switch / volumes for h/w volume control */
--- 2009,2012 ----
***************
*** 2175,2193 ****
  
  /*
-  * power management
-  */
- static void snd_es1968_set_acpi(struct es1968 *chip, int state)
- {
- 	u16 active_mask = acpi_state_mask[state];
- 
- 	pci_set_power_state(chip->pci, state);
- 	/* make sure the units we care about are on 
- 		XXX we might want to do this before state flipping? */
- 	pci_write_config_word(chip->pci, 0x54, ~ active_mask);
- 	pci_write_config_word(chip->pci, 0x56, ~ active_mask);
- }
- 
- 
- /*
   * initialize maestro chip
   */
--- 2143,2146 ----
***************
*** 2211,2217 ****
  	 */
  	
- 	/* do config work at full power */
- 	snd_es1968_set_acpi(chip, ACPI_D0);
- 
  	/* Config Reg A */
  	pci_read_config_word(pci, ESM_CONFIG_A, &w);
--- 2164,2167 ----
***************
*** 2408,2418 ****
  
  	chip->in_suspend = 1;
!     snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
  	snd_pcm_suspend_all(chip->pcm);
  	snd_ac97_suspend(chip->ac97);
  	snd_es1968_bob_stop(chip);
! 	snd_es1968_set_acpi(chip, ACPI_D3);
!     pci_disable_device(pci);
!     pci_save_state(pci);
  	return 0;
  }
--- 2358,2369 ----
  
  	chip->in_suspend = 1;
! 	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
  	snd_pcm_suspend_all(chip->pcm);
  	snd_ac97_suspend(chip->ac97);
  	snd_es1968_bob_stop(chip);
! 
! 	pci_disable_device(pci);
! 	pci_save_state(pci);
! 	pci_set_power_state(pci, pci_choose_state(pci, state));
  	return 0;
  }
***************
*** 2420,2424 ****
  static int es1968_resume(struct pci_dev *pci)
  {
!     struct snd_card *card = pci_get_drvdata(pci);
  	struct es1968 *chip = card->private_data;
  	struct list_head *p;
--- 2371,2375 ----
  static int es1968_resume(struct pci_dev *pci)
  {
! 	struct snd_card *card = pci_get_drvdata(pci);
  	struct es1968 *chip = card->private_data;
  	struct list_head *p;
***************
*** 2428,2434 ****
  
  	/* restore all our config */
  	pci_restore_state(pci);
!     pci_enable_device(pci);
  	pci_set_master(pci);
  	snd_es1968_chip_init(chip);
  
--- 2379,2392 ----
  
  	/* restore all our config */
+ 	pci_set_power_state(pci, PCI_D0);
  	pci_restore_state(pci);
! 	if (pci_enable_device(pci) < 0) {
! 		printk(KERN_ERR "es1968: pci_enable_device failed, "
! 		       "disabling device\n");
! 		snd_card_disconnect(card);
! 		return -EIO;
! 	}
  	pci_set_master(pci);
+ 
  	snd_es1968_chip_init(chip);
  
***************
*** 2443,2457 ****
  	/* restore ac97 state */
  	snd_ac97_resume(chip->ac97);
!     list_for_each(p, &chip->substream_list) {
  		struct esschan *es = list_entry(p, struct esschan, list);
!         switch (es->mode) {
!         	case ESM_MODE_PLAY:
!             	snd_es1968_playback_setup(chip, es, es->substream->runtime);
!                 break;
! 			case ESM_MODE_CAPTURE:
!             	snd_es1968_capture_setup(chip, es, es->substream->runtime);
!                 break;
! 			}
!        }
  
  	/* start timer again */
--- 2401,2416 ----
  	/* restore ac97 state */
  	snd_ac97_resume(chip->ac97);
! 
! 	list_for_each(p, &chip->substream_list) {
  		struct esschan *es = list_entry(p, struct esschan, list);
! 		switch (es->mode) {
! 		case ESM_MODE_PLAY:
! 			snd_es1968_playback_setup(chip, es, es->substream->runtime);
! 			break;
! 		case ESM_MODE_CAPTURE:
! 			snd_es1968_capture_setup(chip, es, es->substream->runtime);
! 			break;
! 		}
! 	}
  
  	/* start timer again */
***************
*** 2465,2514 ****
  #endif /* CONFIG_PM */
  
- 
  #ifdef SUPPORT_JOYSTICK
! #define JOYSTICK_ADDR  0x200
  static int __devinit snd_es1968_create_gameport(struct es1968 *chip, int dev)
  {
!        struct gameport *gp;
!        struct resource *r;
!        u16 val;
  
!        if (!joystick[dev])
!                return -ENODEV;
  
!        r = request_region(JOYSTICK_ADDR, 8, "ES1968 gameport");
!        if (!r)
!                return -EBUSY;
  
!        chip->gameport = gp = gameport_allocate_port();
!        if (!gp) {
!                printk(KERN_ERR "es1968: cannot allocate memory for gameport\n");
!                release_and_free_resource(r);
!                return -ENOMEM;
!        }
  
!        pci_read_config_word(chip->pci, ESM_LEGACY_AUDIO_CONTROL, &val);
!        pci_write_config_word(chip->pci, ESM_LEGACY_AUDIO_CONTROL, val | 0x04);
  
!        gameport_set_name(gp, "ES1968 Gameport");
!        gameport_set_phys(gp, "pci%s/gameport0", pci_name(chip->pci));
!        gameport_set_dev_parent(gp, &chip->pci->dev);
!        gp->io = JOYSTICK_ADDR;
!        gameport_set_port_data(gp, r);
  
!        gameport_register_port(gp);
  
!        return 0;
  }
  static void snd_es1968_free_gameport(struct es1968 *chip)
  {
!        if (chip->gameport) {
!                struct resource *r = gameport_get_port_data(chip->gameport);
  
!                gameport_unregister_port(chip->gameport);
!                chip->gameport = NULL;
  
!                release_and_free_resource(r);
!        }
  }
  #else
--- 2424,2473 ----
  #endif /* CONFIG_PM */
  
  #ifdef SUPPORT_JOYSTICK
! #define JOYSTICK_ADDR	0x200
  static int __devinit snd_es1968_create_gameport(struct es1968 *chip, int dev)
  {
! 	struct gameport *gp;
! 	struct resource *r;
! 	u16 val;
  
! 	if (!joystick[dev])
! 		return -ENODEV;
  
! 	r = request_region(JOYSTICK_ADDR, 8, "ES1968 gameport");
! 	if (!r)
! 		return -EBUSY;
  
! 	chip->gameport = gp = gameport_allocate_port();
! 	if (!gp) {
! 		printk(KERN_ERR "es1968: cannot allocate memory for gameport\n");
! 		release_and_free_resource(r);
! 		return -ENOMEM;
! 	}
  
! 	pci_read_config_word(chip->pci, ESM_LEGACY_AUDIO_CONTROL, &val);
! 	pci_write_config_word(chip->pci, ESM_LEGACY_AUDIO_CONTROL, val | 0x04);
  
! 	gameport_set_name(gp, "ES1968 Gameport");
! 	gameport_set_phys(gp, "pci%s/gameport0", pci_name(chip->pci));
! 	gameport_set_dev_parent(gp, &chip->pci->dev);
! 	gp->io = JOYSTICK_ADDR;
! 	gameport_set_port_data(gp, r);
  
! 	gameport_register_port(gp);
  
! 	return 0;
  }
+ 
  static void snd_es1968_free_gameport(struct es1968 *chip)
  {
! 	if (chip->gameport) {
! 		struct resource *r = gameport_get_port_data(chip->gameport);
  
! 		gameport_unregister_port(chip->gameport);
! 		chip->gameport = NULL;
  
! 		release_and_free_resource(r);
! 	}
  }
  #else
***************
*** 2519,2541 ****
  static int snd_es1968_free(struct es1968 *chip)
  {
!         if (chip->io_port) {
!                 synchronize_irq(chip->irq);
!                 outw(1, chip->io_port + 0x04); /* clear WP interrupts */
!                 outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */
!         }
  
!         if (chip->irq >= 0)
!                 free_irq(chip->irq, (void *)chip);
!         snd_es1968_free_gameport(chip);
!         snd_es1968_set_acpi(chip, ACPI_D3);
!         chip->master_switch = NULL;
!         chip->master_volume = NULL;
!         pci_release_regions(chip->pci);
!         pci_disable_device(chip->pci);
!         kfree(chip);
!         return 0;
  }
  
- 
  static int snd_es1968_dev_free(struct snd_device *device)
  {
--- 2478,2498 ----
  static int snd_es1968_free(struct es1968 *chip)
  {
! 	if (chip->io_port) {
! 		synchronize_irq(chip->irq);
! 		outw(1, chip->io_port + 0x04); /* clear WP interrupts */
! 		outw(0, chip->io_port + ESM_PORT_HOST_IRQ); /* disable IRQ */
! 	}
  
! 	if (chip->irq >= 0)
! 		free_irq(chip->irq, chip);
! 	snd_es1968_free_gameport(chip);
! 	chip->master_switch = NULL;
! 	chip->master_volume = NULL;
! 	pci_release_regions(chip->pci);
! 	pci_disable_device(chip->pci);
! 	kfree(chip);
! 	return 0;
  }
  
  static int snd_es1968_dev_free(struct snd_device *device)
  {
***************
*** 2562,2566 ****
  };
  
! static int __devinit snd_es1968_create(struct snd_card * card,
  				       struct pci_dev *pci,
  				       int total_bufsize,
--- 2519,2523 ----
  };
  
! static int __devinit snd_es1968_create(struct snd_card *card,
  				       struct pci_dev *pci,
  				       int total_bufsize,
***************
*** 2576,2580 ****
  	struct es1968 *chip;
  	int i, err;
- 	
  
  	*chip_ret = NULL;
--- 2533,2536 ----
***************
*** 2584,2589 ****
  		return err;
  	/* check, if we can restrict PCI DMA transfers to 28 bits */
! 	if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
! 	    pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
  		snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
  		pci_disable_device(pci);
--- 2540,2545 ----
  		return err;
  	/* check, if we can restrict PCI DMA transfers to 28 bits */
! 	if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
! 	    pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
  		snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
  		pci_disable_device(pci);
***************
*** 2591,2595 ****
  	}
  
! 	chip =  kzalloc(sizeof(*chip), GFP_KERNEL);
  	if (! chip) {
  		pci_disable_device(pci);
--- 2547,2551 ----
  	}
  
! 	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
  	if (! chip) {
  		pci_disable_device(pci);
***************
*** 2604,2608 ****
  	INIT_LIST_HEAD(&chip->substream_list);
  	spin_lock_init(&chip->ac97_lock);
! 	init_MUTEX(&chip->memory_mutex);
  	tasklet_init(&chip->hwvol_tq, es1968_update_hw_volume, (unsigned long)chip);
  	chip->card = card;
--- 2560,2564 ----
  	INIT_LIST_HEAD(&chip->substream_list);
  	spin_lock_init(&chip->ac97_lock);
! 	mutex_init(&chip->memory_mutex);
  	tasklet_init(&chip->hwvol_tq, es1968_update_hw_volume, (unsigned long)chip);
  	chip->card = card;
***************
*** 2619,2624 ****
  	}
  	chip->io_port = pci_resource_start(pci, 0);
! 	if (request_irq(pci->irq, snd_es1968_interrupt, SA_INTERRUPT|SA_SHIRQ,
! 			"ESS Maestro", (void*)chip)) {
  		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
  		snd_es1968_free(chip);
--- 2575,2580 ----
  	}
  	chip->io_port = pci_resource_start(pci, 0);
! 	if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED,
! 			"ESS Maestro", chip)) {
  		snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
  		snd_es1968_free(chip);
***************
*** 2770,2787 ****
  			}
  		}
! 	}printk(KERN_ERR "test 4 \n");
  	if (enable_mpu[dev]) {
  		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
! 					       chip->io_port + ESM_MPU401_PORT, 1,
  					       chip->irq, 0, &chip->rmidi)) < 0) {
  			printk(KERN_WARNING "es1968: skipping MPU-401 MIDI support..\n");
  		}
  	}
! 	
  	snd_es1968_create_gameport(chip, dev);
! 	printk(KERN_ERR "test 5 \n");
! 	
  	snd_es1968_start_irq(chip);
! printk(KERN_ERR "test 6 \n");
  	chip->clock = clock[dev];
  	if (! chip->clock)
--- 2726,2743 ----
  			}
  		}
! 	}
  	if (enable_mpu[dev]) {
  		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
! 					       chip->io_port + ESM_MPU401_PORT,
! 					       MPU401_INFO_INTEGRATED,
  					       chip->irq, 0, &chip->rmidi)) < 0) {
  			printk(KERN_WARNING "es1968: skipping MPU-401 MIDI support..\n");
  		}
  	}
! 
  	snd_es1968_create_gameport(chip, dev);
! 
  	snd_es1968_start_irq(chip);
! 
  	chip->clock = clock[dev];
  	if (! chip->clock)
***************
*** 2793,2802 ****
  	if ((err = snd_card_register(card)) < 0) {
  		snd_card_free(card);
- 		printk(KERN_ERR "error registering card : %d \n", err);
  		return err;
  	}
  	pci_set_drvdata(pci, card);
  	dev++;
- 	printk(KERN_ERR "test 8 \n");
  	return 0;
  }
--- 2749,2756 ----
***************
*** 2814,2821 ****
  	.remove = __devexit_p(snd_es1968_remove),
  #ifdef CONFIG_PM
!     .suspend = es1968_suspend,
!     .resume = es1968_resume,
  #endif
- 
  };
  
--- 2768,2774 ----
  	.remove = __devexit_p(snd_es1968_remove),
  #ifdef CONFIG_PM
! 	.suspend = es1968_suspend,
! 	.resume = es1968_resume,
  #endif
  };
  

Index: es1968.h
===================================================================
RCS file: /cvsroot/isisalsa/isis/es1968.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** es1968.h	17 Apr 2006 11:37:00 -0000	1.2
--- es1968.h	15 May 2007 09:56:28 -0000	1.3
***************
*** 15,23 ****
  #include <sound/ac97_codec.h>
  
- 
  #define NR_APUS			64
  #define NR_APU_REGS		16
  
! struct snd_es1968 {
  	/* Module Config */
  	int total_bufsize;			/* in bytes */
--- 15,22 ----
  #include <sound/ac97_codec.h>
  
  #define NR_APUS			64
  #define NR_APU_REGS		16
  
! struct es1968 {
  	/* Module Config */
  	int total_bufsize;			/* in bytes */
***************
*** 40,45 ****
  	int type;
  	struct pci_dev *pci;
! 	snd_card_t *card;
! 	snd_pcm_t *pcm;
  	int do_pm;		/* power-management enabled */
  
--- 39,44 ----
  	int type;
  	struct pci_dev *pci;
! 	struct snd_card *card;
! 	struct snd_pcm *pcm;
  	int do_pm;		/* power-management enabled */
  
***************
*** 48,60 ****
  
  	/* ALSA Stuff */
! 	ac97_t *ac97;
! 	snd_kcontrol_t *master_switch; /* for h/w volume control */
! 	snd_kcontrol_t *master_volume;
  
! 	snd_rawmidi_t *rmidi;
  
  	spinlock_t reg_lock;
! 	struct semaphore ac97_mutex;	/* ac97 lock */
  	struct tasklet_struct hwvol_tq;
  
  	/* Maestro Stuff */
--- 47,60 ----
  
  	/* ALSA Stuff */
! 	struct snd_ac97 *ac97;
! 	struct snd_kcontrol *master_switch; /* for h/w volume control */
! 	struct snd_kcontrol *master_volume;
  
! 	struct snd_rawmidi *rmidi;
  
  	spinlock_t reg_lock;
! 	spinlock_t ac97_lock;
  	struct tasklet_struct hwvol_tq;
+ 	unsigned int in_suspend;
  
  	/* Maestro Stuff */
***************
*** 62,66 ****
  	int bobclient;		/* active timer instancs */
  	int bob_freq;		/* timer frequency */
! 	struct semaphore memory_mutex;	/* memory lock */
  
  	/* APU states */
--- 62,66 ----
  	int bobclient;		/* active timer instancs */
  	int bob_freq;		/* timer frequency */
! 	struct mutex memory_mutex;	/* memory lock */
  
  	/* APU states */
***************
*** 76,81 ****
  
  #ifdef SUPPORT_JOYSTICK
! 	struct gameport gameport;
! 	struct resource *res_joystick;
  #endif
  #ifdef SND_ISIS
--- 76,80 ----
  
  #ifdef SUPPORT_JOYSTICK
! 	struct gameport *gameport;
  #endif
  #ifdef SND_ISIS
***************
*** 83,85 ****
  #endif
  };
! #endif
\ No newline at end of file
--- 82,84 ----
  #endif
  };
! #endif

[Isisalsa-devel] isis/.settings org.eclipse.cdt.core.prefs, 1.1, 1.2

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis/.settings
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28981/.settings

Modified Files:
	org.eclipse.cdt.core.prefs 
Log Message:
Import of 2.6.21 es1968 change.
Compiling, not tested 

Index: org.eclipse.cdt.core.prefs
===================================================================
RCS file: /cvsroot/isisalsa/isis/.settings/org.eclipse.cdt.core.prefs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** org.eclipse.cdt.core.prefs	24 Jul 2006 09:01:21 -0000	1.1
--- org.eclipse.cdt.core.prefs	15 May 2007 09:56:28 -0000	1.2
***************
*** 1,3 ****
! #Mon Jul 10 07:29:42 CEST 2006
  eclipse.preferences.version=1
  indexerId=org.eclipse.cdt.core.nullindexer
--- 1,3 ----
! #Sun May 13 23:09:40 CEST 2007
  eclipse.preferences.version=1
  indexerId=org.eclipse.cdt.core.nullindexer

[Isisalsa-devel] isis/.tmp_versions .cvsignore,NONE,1.1

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis/.tmp_versions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28981/.tmp_versions

Added Files:
	.cvsignore 
Log Message:
Import of 2.6.21 es1968 change.
Compiling, not tested 

--- NEW FILE: .cvsignore ---
*.mod

[Isisalsa-devel] isis/.tmp_versions - New directory

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis/.tmp_versions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28964/.tmp_versions

Log Message:
Directory /cvsroot/isisalsa/isis/.tmp_versions added to the repository

[Isisalsa-devel] =?iso-2022-jp?b?GyRCJDMkcyRLJEEkTxsoQiheXiA=?= =?iso-2022-jp?b?GyRCInYbKEI=?=

[<de...@ya...>]

はじめまして美樹です。
掲示板で見て趣味合うかなって思ってメールしちゃいました。
 
イキナリでゴメンなさいm(__)m
こういう感じで知り合えるのに憧れてて初挑戦しちゃいました。
お返事もらえたら簡単な自己紹介しますネ(^_-)-☆
もしそんな気なかったらそう言ってもらえれば諦めますので。
もちろん仲良くなれた方が嬉しいけど。
お返事気長に待ってま〜す(^_^)/~
http://www.star-lightz.com/m-box

Re: [Isisalsa-devel] [isisalsa-devel] firmware and initscripts

[Jeanseb <jea...@fr...>]

what is the cat error message and the lkernel version used ?
Have you tried editing the /etc/init.d/mountkernfs.sh -don't forget backu=
p ;))
to remove one of this option ?
If so which one slove the problem ?
Selon Felipe Sologuren <sol...@es...>:

> Now my debian (sarge) changed initscripts with a call for mounting /pro=
c
> with -onodev,noexec,nosuid options (/etc/init.d/mountkernfs.sh) and
> cause that I can't cat'ing the firmware.
>
> I don't know whose is that bug, but maybe this thread could help:
> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D386945
>
> Cheers,
> Felipe
> --
> Linux is like a teepee - no Windows, no Gates, Apache inside.
>
> -----------------------------------------------------------------------=
--
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share=
 your
> opinions on IT & business topics through brief surveys -- and earn cash
> http://www.techsay.com/default.php?page=3Djoin.php&p=3Dsourceforge&CID=3D=
DEVDEV
> _______________________________________________
> Isisalsa-devel mailing list
> Isi...@li...
> https://lists.sourceforge.net/lists/listinfo/isisalsa-devel
>


-------------------------------------------------------------------------=
--------------------------------
Je suis celui qui peint la nuit en sombre
Celui qui voit tous les jours la p=E9nombre
Je suis celui... qui a =E9t=E9
--
AqME, je suis

[Isisalsa-devel] [isisalsa-devel] firmware and initscripts

[Felipe S. <sol...@es...>]

Now my debian (sarge) changed initscripts with a call for mounting /proc 
with -onodev,noexec,nosuid options (/etc/init.d/mountkernfs.sh) and 
cause that I can't cat'ing the firmware.

I don't know whose is that bug, but maybe this thread could help: 
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=386945

Cheers,
Felipe
-- 
Linux is like a teepee - no Windows, no Gates, Apache inside.

[Isisalsa-devel] isis sam9707.c,1.7,1.8

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26205

Modified Files:
	sam9707.c 
Log Message:
change on gpio init

Index: sam9707.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sam9707.c	29 Apr 2006 20:07:52 -0000	1.7
--- sam9707.c	24 Jul 2006 09:01:21 -0000	1.8
***************
*** 245,249 ****
  	outw(SAM9707_STATUS, chip->io_port + ISIS_ADDRESS);
  	while(tmploop-- && (
! 		(tmp = inw(chip->io_port+ISIS_DATA)) &  0x40));
  	outw(reg, chip->io_port + ISIS_ADDRESS);
  	outw(data & 0xff, chip->io_port + ISIS_DATA);
--- 245,249 ----
  	outw(SAM9707_STATUS, chip->io_port + ISIS_ADDRESS);
  	while(tmploop-- && (
! 		((tmp = inw(chip->io_port+ISIS_DATA)) &  0x40)!=0x40));
  	outw(reg, chip->io_port + ISIS_ADDRESS);
  	outw(data & 0xff, chip->io_port + ISIS_DATA);
***************
*** 494,509 ****
  		return -ENODEV;
  	}
! //	if((err = snd_isis_setup_card(chip)))
! //		return err;
  
  	/*
   	 * 	Reset the sam chip
   	 */
!  	snd_printk("Resetting the chip\n");
   	snd_isis_write_control(chip,SAM_CMD_HOT_RES);
  	snd_isis_write_data8(chip,0x11);
! 	mdelay(50);
  
! 	loop = SAM_READ_LOOP_COUNTER;
  	while((snd_isis_read(chip, SAM9707_STATUS) != 0xa0) & --loop) 
  	{
--- 494,509 ----
  		return -ENODEV;
  	}
! 	/*if((err = snd_isis_setup_card(chip)))
! 		return err;*/
  
  	/*
   	 * 	Reset the sam chip
   	 */
!  	/*snd_printk("Resetting the chip\n");
   	snd_isis_write_control(chip,SAM_CMD_HOT_RES);
  	snd_isis_write_data8(chip,0x11);
! 	mdelay(50);*/
  
! 	/*loop = SAM_READ_LOOP_COUNTER;
  	while((snd_isis_read(chip, SAM9707_STATUS) != 0xa0) & --loop) 
  	{
***************
*** 529,533 ****
  	{
  		snd_printk("read data8 : %2x\n",snd_isis_read(chip, SAM9707_DATA8));
! 	}
  	/*
  	 * Load bootstrap
--- 529,533 ----
  	{
  		snd_printk("read data8 : %2x\n",snd_isis_read(chip, SAM9707_DATA8));
! 	}*/
  	/*
  	 * Load bootstrap
***************
*** 537,544 ****
  	mdelay(10);
  
! 	while(((snd_isis_read(chip, SAM9707_STATUS) & ( 1 << 7)) == 0) & --loop) 
  	{
  		snd_printk("read data8 : %2x\n",snd_isis_read(chip, SAM9707_DATA8));
! 	};
  	snd_isis_write_control(chip, 0x04);
  
--- 537,544 ----
  	mdelay(10);
  
! 	/*while(((snd_isis_read(chip, SAM9707_STATUS) & ( 1 << 7)) == 0) & --loop) 
  	{
  		snd_printk("read data8 : %2x\n",snd_isis_read(chip, SAM9707_DATA8));
! 	};*/
  	snd_isis_write_control(chip, 0x04);
  
***************
*** 1118,1122 ****
  	entry->mode = S_IFCHR | S_IWUSR;
  	chip->firm = 1;
! 	tmp = inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
  	outw(tmp, chip->io_port + 0x18);
  	
--- 1118,1122 ----
  	entry->mode = S_IFCHR | S_IWUSR;
  	chip->firm = 1;
! 	/*tmp = inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
  	outw(tmp, chip->io_port + 0x18);
  	
***************
*** 1129,1133 ****
  		printk("Isis detection OK\n");
  	tmp = inw(chip->io_port + 0x18) | SAM_INTERRUPT;
! 	outw(tmp, chip->io_port + 0x18);
  	
  	snd_printk("Creating SAM CHIP\n");
--- 1129,1133 ----
  		printk("Isis detection OK\n");
  	tmp = inw(chip->io_port + 0x18) | SAM_INTERRUPT;
! 	outw(tmp, chip->io_port + 0x18);*/
  	
  	snd_printk("Creating SAM CHIP\n");
***************
*** 1157,1166 ****
  	 * 		Setting up clock source
  	 */
! 	outw(0x0193, chip->io_port + 0x64); // set GPIO mask
  	outw(0x0e64, chip->io_port + 0x68); // set GPIO dir
  	value = inw(chip->io_port + 0x60); //read the GPIO
! 	value &= 0xff9f;
  	value |= 0x0024;
  	outw(value, chip->io_port + 0x60); // write new value to GPIO
  	snd_printk("Clock source set\n");
  	/*
--- 1157,1169 ----
  	 * 		Setting up clock source
  	 */
! 	outw(0x019B, chip->io_port + 0x64); // set GPIO mask
  	outw(0x0e64, chip->io_port + 0x68); // set GPIO dir
  	value = inw(chip->io_port + 0x60); //read the GPIO
! 	value &= 0x000f;
  	value |= 0x0024;
  	outw(value, chip->io_port + 0x60); // write new value to GPIO
+ 	value = inw(chip->io_port + 0x64); //read the GPIO mask
+ 	value |= 0x0fff;
+ 	outw(0x019B, chip->io_port + 0x64); // set GPIO mask
  	snd_printk("Clock source set\n");
  	/*

[Isisalsa-devel] isis/.settings org.eclipse.cdt.core.prefs, NONE, 1.1

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis/.settings
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26205/.settings

Added Files:
	org.eclipse.cdt.core.prefs 
Log Message:
change on gpio init

--- NEW FILE: org.eclipse.cdt.core.prefs ---
#Mon Jul 10 07:29:42 CEST 2006
eclipse.preferences.version=1
indexerId=org.eclipse.cdt.core.nullindexer

[Isisalsa-devel] isis/.settings - New directory

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis/.settings
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26160/.settings

Log Message:
Directory /cvsroot/isisalsa/isis/.settings added to the repository

[Isisalsa-devel] isis sam9707.c,1.6,1.7 isis.h,1.13,1.14 es1968.c,1.44,1.45

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2322

Modified Files:
	sam9707.c isis.h es1968.c 
Log Message:
ok as single card

Index: sam9707.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sam9707.c	17 Apr 2006 11:37:00 -0000	1.6
--- sam9707.c	29 Apr 2006 20:07:52 -0000	1.7
***************
*** 172,176 ****
   */
  
!  u8 __isis_read(isis_sam9707_chip_t *chip, u16 reg) {
  	int value;
  	
--- 172,176 ----
   */
  
!  u8 __isis_read(struct isis_sam9707_chip *chip, u16 reg) {
  	int value;
  	
***************
*** 180,184 ****
  }
  
!  u8 snd_isis_read(isis_sam9707_chip_t *chip, u16 reg) {
  	unsigned long flags;
  	u8 data;
--- 180,184 ----
  }
  
!  u8 snd_isis_read(struct isis_sam9707_chip *chip, u16 reg) {
  	unsigned long flags;
  	u8 data;
***************
*** 191,195 ****
  
  
!  u8 __isis_read_status(isis_sam9707_chip_t *chip) {
  	int value;
  	
--- 191,195 ----
  
  
!  u8 __isis_read_status(struct isis_sam9707_chip *chip) {
  	int value;
  	
***************
*** 199,203 ****
  
  
!  u8 snd_isis_read_status(isis_sam9707_chip_t *chip) {
  	unsigned long flags;
  	u8 data;
--- 199,203 ----
  
  
!  u8 snd_isis_read_status(struct isis_sam9707_chip *chip) {
  	unsigned long flags;
  	u8 data;
***************
*** 209,213 ****
  }
  
!  u8 __isis_read_data8(isis_sam9707_chip_t *chip) {
  	int value;
  	int loop =SAM_READ_LOOP_COUNTER;
--- 209,213 ----
  }
  
!  u8 __isis_read_data8(struct isis_sam9707_chip *chip) {
  	int value;
  	int loop =SAM_READ_LOOP_COUNTER;
***************
*** 219,223 ****
  
  
!  u8 snd_isis_read_data8(isis_sam9707_chip_t *chip) {
  	unsigned long flags;
  	u8 data;
--- 219,223 ----
  
  
!  u8 snd_isis_read_data8(struct isis_sam9707_chip *chip) {
  	unsigned long flags;
  	u8 data;
***************
*** 239,243 ****
   */
  
!  void __isis_write(isis_sam9707_chip_t *chip, u16 reg, u8 data) {
  	int tmploop= SAM_READ_LOOP_COUNTER;
  	int tmp;
--- 239,243 ----
   */
  
!  void __isis_write(struct isis_sam9707_chip *chip, u16 reg, u8 data) {
  	int tmploop= SAM_READ_LOOP_COUNTER;
  	int tmp;
***************
*** 251,255 ****
  
  
!  void isis_write(isis_sam9707_chip_t *chip, u16 reg, u8 data) {
  	unsigned long flags;
  	
--- 251,255 ----
  
  
!  void isis_write(struct isis_sam9707_chip *chip, u16 reg, u8 data) {
  	unsigned long flags;
  	
***************
*** 267,271 ****
   */
  
!  u16 __isis_read16(isis_sam9707_chip_t *chip, u16 reg) {
  	u16 value;
  	
--- 267,271 ----
   */
  
!  u16 __isis_read16(struct isis_sam9707_chip *chip, u16 reg) {
  	u16 value;
  	
***************
*** 275,279 ****
  }
  
!  u16 isis_read16(isis_sam9707_chip_t *chip, u16 reg) {
  	unsigned long flags;
  	u16 data;
--- 275,279 ----
  }
  
!  u16 isis_read16(struct isis_sam9707_chip *chip, u16 reg) {
  	unsigned long flags;
  	u16 data;
***************
*** 295,299 ****
   */
  
!  void __isis_write16(isis_sam9707_chip_t *chip, u16 data) {
  	int tmploop= SAM_READ_LOOP_COUNTER;
  	
--- 295,299 ----
   */
  
!  void __isis_write16(struct isis_sam9707_chip *chip, u16 data) {
  	int tmploop= SAM_READ_LOOP_COUNTER;
  	
***************
*** 303,307 ****
  }
  
!  void isis_write16(isis_sam9707_chip_t *chip, u16 reg, u16 data) {
  	unsigned long flags;
  	
--- 303,307 ----
  }
  
!  void isis_write16(struct isis_sam9707_chip *chip, u16 reg, u16 data) {
  	unsigned long flags;
  	
***************
*** 317,321 ****
   * 
   */
!  void __isis_burst_write(isis_sam9707_chip_t *chip,u16 *w, int nbw) {
  	int tmploop= SAM_READ_LOOP_COUNTER;
  	
--- 317,321 ----
   * 
   */
!  void __isis_burst_write(struct isis_sam9707_chip *chip,u16 *w, int nbw) {
  	int tmploop= SAM_READ_LOOP_COUNTER;
  	
***************
*** 325,329 ****
  }
  
!  void isis_burst_write(isis_sam9707_chip_t *chip,u16 *w, int nbw) {
  	unsigned long flags;
  	
--- 325,329 ----
  }
  
!  void isis_burst_write(struct isis_sam9707_chip *chip,u16 *w, int nbw) {
  	unsigned long flags;
  	

Index: isis.h
===================================================================
RCS file: /cvsroot/isisalsa/isis/isis.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** isis.h	6 Jul 2005 18:38:04 -0000	1.13
--- isis.h	29 Apr 2006 20:07:52 -0000	1.14
***************
*** 172,180 ****
  /*	Structures	*/
  
! /*  forward definition of the chip-specific record*/
! typedef struct isis_sam9707_chip isis_sam9707_chip_t;
  /* Voice definition */
  struct isis_voice {
! 	isis_sam9707_chip_t *chip;
  	u16		volleft;
  	u16		volright;
--- 172,179 ----
  /*	Structures	*/
  
! 
  /* Voice definition */
  struct isis_voice {
! 	struct isis_sam9707_chip *chip;
  	u16		volleft;
  	u16		volright;
***************
*** 202,225 ****
  
  /* prototypes */
! u8 __isis_read(isis_sam9707_chip_t *chip, u16 reg);
! u8 snd_isis_read(isis_sam9707_chip_t *chip, u16 reg);
! u8 __isis_read_status(isis_sam9707_chip_t *chip);
! u8 snd_isis_read_status(isis_sam9707_chip_t *chip);
! u8 __isis_read_data8(isis_sam9707_chip_t *chip);
! u8 snd_isis_read_data8(isis_sam9707_chip_t *chip);
  
! void __isis_write(isis_sam9707_chip_t *chip, u16 reg, u8 data);
! void isis_write(isis_sam9707_chip_t *chip, u16 reg, u8 data);
  #define snd_isis_write_data8(chip, data) isis_write(chip, SAM9707_DATA8, data)
  #define snd_isis_write_control(chip, data) isis_write(chip, SAM9707_CONTROL, data)
  
! u16 __isis_read16(isis_sam9707_chip_t *chip, u16 reg);
! u16 isis_read16(isis_sam9707_chip_t *chip, u16 reg);
  
! void __isis_write16(isis_sam9707_chip_t *chip, u16 data);
! void isis_write16(isis_sam9707_chip_t *chip, u16 reg, u16 data);
  
! void __isis_burst_write(isis_sam9707_chip_t *chip,u16 *w, int nbw);
! void isis_burst_write(isis_sam9707_chip_t *chip,u16 *w, int nbw);
  										
  int snd_isis_setup_card(struct isis_sam9707_chip *chip);
--- 201,224 ----
  
  /* prototypes */
! u8 __isis_read(struct isis_sam9707_chip *chip, u16 reg);
! u8 snd_isis_read(struct isis_sam9707_chip *chip, u16 reg);
! u8 __isis_read_status(struct isis_sam9707_chip *chip);
! u8 snd_isis_read_status(struct isis_sam9707_chip *chip);
! u8 __isis_read_data8(struct isis_sam9707_chip *chip);
! u8 snd_isis_read_data8(struct isis_sam9707_chip *chip);
  
! void __isis_write(struct isis_sam9707_chip *chip, u16 reg, u8 data);
! void isis_write(struct isis_sam9707_chip *chip, u16 reg, u8 data);
  #define snd_isis_write_data8(chip, data) isis_write(chip, SAM9707_DATA8, data)
  #define snd_isis_write_control(chip, data) isis_write(chip, SAM9707_CONTROL, data)
  
! u16 __isis_read16(struct isis_sam9707_chip *chip, u16 reg);
! u16 isis_read16(struct isis_sam9707_chip *chip, u16 reg);
  
! void __isis_write16(struct isis_sam9707_chip *chip, u16 data);
! void isis_write16(struct isis_sam9707_chip *chip, u16 reg, u16 data);
  
! void __isis_burst_write(struct isis_sam9707_chip *chip,u16 *w, int nbw);
! void isis_burst_write(struct isis_sam9707_chip *chip,u16 *w, int nbw);
  										
  int snd_isis_setup_card(struct isis_sam9707_chip *chip);
***************
*** 227,229 ****
--- 226,230 ----
  void snd_sam9707_irq(int irq, struct isis_sam9707_chip *chip);
  
+  int snd_isis_setup_card(struct isis_sam9707_chip *chip);
+ 
  #endif	/* __sam9707_H */

Index: es1968.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/es1968.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** es1968.c	16 Apr 2006 19:56:05 -0000	1.44
--- es1968.c	29 Apr 2006 20:07:52 -0000	1.45
***************
*** 934,939 ****
   *************/
  
! static inline unsigned int 
! snd_es1968_compute_rate(struct es1968 *chip, u32 freq)
  {
  
--- 934,938 ----
   *************/
  
! static u32 snd_es1968_compute_rate(struct es1968 *chip, u32 freq)
  {
  
***************
*** 968,972 ****
  
  /* spin lock held */
! static void snd_es1968_trigger_apu(struct es1968 *esm, int apu, int mode)
  {
  	/* set the APU mode */
--- 967,971 ----
  
  /* spin lock held */
! static inline void snd_es1968_trigger_apu(struct es1968 *esm, int apu, int mode)
  {
  	/* set the APU mode */
***************
*** 1579,1586 ****
   ******************/
  
! static int snd_es1968_playback_open(snd_pcm_substream_t *substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
! 	snd_pcm_runtime_t *runtime = substream->runtime;
  	struct esschan *es;
  	int apu1;
--- 1578,1585 ----
   ******************/
  
! static int snd_es1968_playback_open(struct snd_pcm_substream *substream)
  {
  	struct es1968 *chip = snd_pcm_substream_chip(substream);
! 	struct snd_pcm_runtime *runtime = substream->runtime;
  	struct esschan *es;
  	int apu1;
***************
*** 1888,1892 ****
  	unsigned int hwptr;
  	unsigned int diff;
! 	snd_pcm_substream_t *subs = es->substream;
          
  	if (subs == NULL || !es->running)
--- 1887,1891 ----
  	unsigned int hwptr;
  	unsigned int diff;
! 	struct snd_pcm_substream *subs = es->substream;
          
  	if (subs == NULL || !es->running)
***************
*** 1966,1969 ****
--- 1965,1969 ----
  			       &chip->master_volume->id);
  	}
+ 	spin_unlock_irqrestore(&chip->ac97_lock, flags);
  }
  
***************
*** 2571,2575 ****
  				       struct es1968 **chip_ret)
  {
! 	static snd_device_ops_t ops = {
  		.dev_free =	snd_es1968_dev_free,
  	};
--- 2571,2575 ----
  				       struct es1968 **chip_ret)
  {
! 	static struct snd_device_ops ops = {
  		.dev_free =	snd_es1968_dev_free,
  	};
***************
*** 2586,2590 ****
  	if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
  	    pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
! 		snd_printk("architecture does not support 28bit PCI busmaster DMA\n");
  		pci_disable_device(pci);
  		return -ENXIO;
--- 2586,2590 ----
  	if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||
  	    pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {
! 		snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n");
  		pci_disable_device(pci);
  		return -ENXIO;
***************
*** 2666,2671 ****
  	snd_card_set_dev(card, &pci->dev);
  #ifdef SND_ISIS
! 	if(!(chip->sam9707_chip  = (isis_sam9707_chip_t *) kcalloc(1, 
! 							sizeof(isis_sam9707_chip_t),GFP_KERNEL)))
  				return -ENOMEM;
  	chip->sam9707_chip->card = card;
--- 2666,2671 ----
  	snd_card_set_dev(card, &pci->dev);
  #ifdef SND_ISIS
! 	if(!(chip->sam9707_chip  = (struct isis_sam9707_chip *) kcalloc(1, 
! 							sizeof(struct isis_sam9707_chip),GFP_KERNEL)))
  				return -ENOMEM;
  	chip->sam9707_chip->card = card;
***************
*** 2677,2681 ****
  	spin_lock_init(&chip->sam9707_chip->reg_lock);
  	
! 	snd_isis_setup_card(chip->sam9707_chip);
  	
  #endif
--- 2677,2682 ----
  	spin_lock_init(&chip->sam9707_chip->reg_lock);
  	
! 	if(err = snd_isis_setup_card(chip->sam9707_chip))
! 		return err ;
  	
  #endif
***************
*** 2721,2724 ****
--- 2722,2726 ----
  				     &chip)) < 0) {
  		snd_card_free(card);
+ 		printk(KERN_ERR "test 1 \n");
  		return err;
  	}
***************
*** 2747,2750 ****
--- 2749,2753 ----
  	if ((err = snd_es1968_pcm(chip, 0)) < 0) {
  		snd_card_free(card);
+ 		printk(KERN_ERR "test 2 \n");
  		return err;
  	}
***************
*** 2752,2755 ****
--- 2755,2759 ----
  	if ((err = snd_es1968_mixer(chip)) < 0) {
  		snd_card_free(card);
+ 		printk(KERN_ERR "test 3 \n");
  		return err;
  	}
***************
*** 2766,2770 ****
  			}
  		}
! 	}
  	if (enable_mpu[dev]) {
  		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
--- 2770,2774 ----
  			}
  		}
! 	}printk(KERN_ERR "test 4 \n");
  	if (enable_mpu[dev]) {
  		if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
***************
*** 2776,2782 ****
  	
  	snd_es1968_create_gameport(chip, dev);
  	
  	snd_es1968_start_irq(chip);
! 
  	chip->clock = clock[dev];
  	if (! chip->clock)
--- 2780,2787 ----
  	
  	snd_es1968_create_gameport(chip, dev);
+ 	printk(KERN_ERR "test 5 \n");
  	
  	snd_es1968_start_irq(chip);
! printk(KERN_ERR "test 6 \n");
  	chip->clock = clock[dev];
  	if (! chip->clock)
***************
*** 2788,2795 ****
--- 2793,2802 ----
  	if ((err = snd_card_register(card)) < 0) {
  		snd_card_free(card);
+ 		printk(KERN_ERR "error registering card : %d \n", err);
  		return err;
  	}
  	pci_set_drvdata(pci, card);
  	dev++;
+ 	printk(KERN_ERR "test 8 \n");
  	return 0;
  }

Re: [Isisalsa-devel] isis es1968.c,1.43,1.44

[Felipe S. <sol...@es...>]

Maybe I need CONFIG_PM undefined, but make output error is attached

Jean-S=E9bastien Valette wrote:
> Update of /cvsroot/isisalsa/isis
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22742
>=20
> Modified Files:
> 	es1968.c=20
> Log Message:
> es1968.c sync with kernel 2.6.16
> sam9707.c need update.
>=20
> Index: es1968.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/isisalsa/isis/es1968.c,v
> retrieving revision 1.43
> retrieving revision 1.44
> diff -C2 -d -r1.43 -r1.44
> *** es1968.c	31 Dec 2005 16:10:32 -0000	1.43
> --- es1968.c	16 Apr 2006 19:56:05 -0000	1.44
> ***************
> *** 174,196 ****
>  =20
>  =20
> - /* PCI Dev ID's */
> -=20
> - #ifndef PCI_VENDOR_ID_ESS
> - #define PCI_VENDOR_ID_ESS	0x125D
> - #endif
> -=20
> - #define PCI_VENDOR_ID_ESS_OLD	0x1285	/* Platform Tech, the people the=
 ESS
> - 					   was bought form */
> [...1931 lines suppressed...]
>   static int __init alsa_card_es1968_init(void)
>   {
> ! 	return pci_module_init(&driver);
>   }
>  =20
> --- 2806,2819 ----
>   	.probe =3D snd_es1968_probe,
>   	.remove =3D __devexit_p(snd_es1968_remove),
> ! #ifdef CONFIG_PM
> !     .suspend =3D es1968_suspend,
> !     .resume =3D es1968_resume,
> ! #endif
> !=20
>   };
>  =20
>   static int __init alsa_card_es1968_init(void)
>   {
> ! 	return pci_register_driver(&driver);
>   }
>  =20
>=20
>=20
>=20
> -------------------------------------------------------
> This SF.Net email is sponsored by xPML, a groundbreaking scripting lang=
uage
> that extends applications into web and mobile media. Attend the live we=
bcast
> and join the prime developer group breaking into this new coding territ=
ory!
> http://sel.as-us.falkag.net/sel?cmd=3Dlnk&kid=3D110944&bid=3D241720&dat=
=3D121642
> _______________________________________________
> Isisalsa-devel mailing list
> Isi...@li...
> https://lists.sourceforge.net/lists/listinfo/isisalsa-devel
>=20
>=20


--=20
Linux is like a teepee - no Windows, no Gates, Apache inside.

[Isisalsa-devel] isis sam9707.c,1.5,1.6 es1968.h,1.1,1.2

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23018

Modified Files:
	sam9707.c es1968.h 
Log Message:
compil correct 
seem to have problems at alsa registering (or devfs ?)

Index: sam9707.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sam9707.c	31 Dec 2005 16:10:32 -0000	1.5
--- sam9707.c	17 Apr 2006 11:37:00 -0000	1.6
***************
*** 15,18 ****
--- 15,19 ----
  #include <sound/info.h>
  #include <sound/pcm.h>
+ #include <linux/interrupt.h>
  
  #include "es1968.h"
***************
*** 485,489 ****
  {
  	struct isis_sam9707_chip *chip;
! 	int tmp, err,loop;
  
  	chip = (struct isis_sam9707_chip *) entry->private_data;
--- 486,490 ----
  {
  	struct isis_sam9707_chip *chip;
! 	int tmp, loop;
  
  	chip = (struct isis_sam9707_chip *) entry->private_data;

Index: es1968.h
===================================================================
RCS file: /cvsroot/isisalsa/isis/es1968.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** es1968.h	31 Dec 2005 16:10:32 -0000	1.1
--- es1968.h	17 Apr 2006 11:37:00 -0000	1.2
***************
*** 15,18 ****
--- 15,19 ----
  #include <sound/ac97_codec.h>
  
+ 
  #define NR_APUS			64
  #define NR_APU_REGS		16

[Isisalsa-devel] isis es1968.c,1.43,1.44

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22742

Modified Files:
	es1968.c 
Log Message:
es1968.c sync with kernel 2.6.16
sam9707.c need update.

Index: es1968.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/es1968.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** es1968.c	31 Dec 2005 16:10:32 -0000	1.43
--- es1968.c	16 Apr 2006 19:56:05 -0000	1.44
***************
*** 174,196 ****
  
  
- /* PCI Dev ID's */
- 
- #ifndef PCI_VENDOR_ID_ESS
- #define PCI_VENDOR_ID_ESS	0x125D
- #endif
- 
- #define PCI_VENDOR_ID_ESS_OLD	0x1285	/* Platform Tech, the people the ESS
- 					   was bought form */
[...1931 lines suppressed...]
  static int __init alsa_card_es1968_init(void)
  {
! 	return pci_module_init(&driver);
  }
  
--- 2806,2819 ----
  	.probe = snd_es1968_probe,
  	.remove = __devexit_p(snd_es1968_remove),
! #ifdef CONFIG_PM
!     .suspend = es1968_suspend,
!     .resume = es1968_resume,
! #endif
! 
  };
  
  static int __init alsa_card_es1968_init(void)
  {
! 	return pci_register_driver(&driver);
  }
  

[Isisalsa-devel] Working For God.

[<jud...@ya...>]

MIME-Version: 1.0
Content-Type: multipart/alternative; boundary="0-2064736346-1144019218=:48912"
Content-Transfer-Encoding: 8bit

--0-2064736346-1144019218=:48912
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit

¡Tengo nueva dirección de correo!Ahora puedes escribirme a: jud...@ya...

Dear Fellow Believer,


It is by the grace of God that I received Christ, knowing the truth and the truth have set me free. Having known the truth, I had no choice than to do what is lawful and right in the sight of God for eternal life and in the sight of man for witness of God’s mercy and glory upon my life. I have the pleasure to share my testimony with you, having seen your contact from the Internet.


I am Barrister Jude Mbudiche, the legal adviser to late Mrs. B.J. Hayford a British couple that lived in my Country Nigeria for 25 years before she died in the Bellview plane crash October last year. These Lady was a good Christian, She so dedicated to God but she lost her husband so early and she had no child till she died. Throughout her stay in my country, she acquired a lot of properties like lands, house properties, etc. As her legal adviser, before her death, she instructed me to write her WILL. Because she had no child, she dedicated her wealth to God.


According to the WILL, the properties have to be sold and the money be given out to a ministry for the work of God. As her legal adviser, all the documents for the properties were in my care. You will read more stories about the plane crash by visiting this web:

http://www.independentng.com/news/nnoct240503.htm

http://www.cnn.com/2005/WORLD/africa/10/24/nigeria.plane/

http://news.bbc.co.uk/1/hi/world/africa/4368516.stm


She gave me the authority to sell the properties and give out the fund to the Ministries for the work of God.

In short, I sold all the properties after her death, as she instructed And as matter of fact, after I sold all her properties, I realized more than $20,000,000.00 (Twenty million US dollars plus), and what supposed to be the percentage interest of my right legal fee was firstly deducted by me out of the total amount realized from the sold properties, this was base on the initial agreement between me and the owner of the properties before her death.


Therefore the total amount left to be invested into God's work as instructed by the owner, is $20,000,000.00 (Twenty million US dollars) only. But instead of giving the main fund out for the work of God as instructed to me by the owner before her death. I converted the fund to myself with the intention of investing the fund abroad for my personal use. I was afraid of putting the fund in the Bank, because I have to give account to the bank on how I got the money. I then packaged the fund in consignments and deposited the consignments with a security company.


I did not want the management of the Security Company to know the content of the consignments; therefore I registered the content of the consignments as Gold Bars. Now, the security company believes that what I deposited with them was Gold Bars.

I had encounter with Christ when Rev. Billy Graham was preaching on television concerning Ananias and Saphira in Acts 5:1-11. After hearing the word of God, I gave my life to Christ and became a born again Christian. As a born again Christian, I started reading my bible and one day, the Lord opened my eyes to Ezekiel 33: 18 and 19 where the word of God says: "When the righteous truth from his righteousness, and comit iniquity, he shall even die thereby. But if the wicked turn from his wickedness, and do that which is lawful and right, he shall live thereby". From the scripture, I discovered that the only way I could have peace in my life is to do what is lawful and right by giving out the fund as instructed for the work of God by the owner before her death. 


I have asked God for forgiveness and I know that God have forgiven me. But I have to do what is lawful and right in the sight of God by giving out the fund to the chosen ministry for the purpose of God's work as instructed by the owner before her death. After my fasting and prayers, I asked God to make his choice and direct me to a honest Christian but after my fervent prayer over it, then you were nominated to me through divine revelation from God, so these are how I received such a divine revelation from the Lord, how I got your contact information, and I then decided to contact you for the fund to be used wisely for things that will glorify the name of God. 


I have notified the Security Company where I deposited the consignments that contained the fund, that I am moving the consignment abroad and the security company has since been waiting for my authority for the consignment to leave my country and move to abroad. So if you know that you will use this fund honestly and wisely for things that will glorify God's name, then do contact me back through this email:jud...@ya..., for more details.


You should also forward to me your physical contact address were you will like the consignments delivered to you, your direct telephone and fax number for easy communication and to fax you the documents concerning the consignments.

Your prompt response will be highly appreciated.


Sincerely yours,

Bro.Jude Mbudiche.

                                                  

   





- Bro. Jude Mbudiche


--0-2064736346-1144019218=:48912
Content-Type: text/html; charset=iso-8859-1
Content-Transfer-Encoding: 8bit

<div style="border: solid 1px #cccccc; width:448px; background-color:white; margin:10px 0px;";><table border=0 cellspacing=0 cellpadding=0 width="448"><tr><td class=tablot background="http://us.i1.yimg.com/us.yimg.com/i/us/pim/gr/gr_announce_1.gif" valign=center height=57><big style="padding:10px;">¡Tengo nueva dirección de correo!</big></td></tr></table><div style="padding:10px;">Ahora puedes escribirme a: <b>jud...@ya...</b><br><br><span style="color:green;">Dear Fellow Believer,<br><br><br>It is by the grace of God that I received Christ, knowing the truth and the truth have set me free. Having known the truth, I had no choice than to do what is lawful and right in the sight of God for eternal life and in the sight of man for witness of God’s mercy and glory upon my life. I have the pleasure to share my testimony with you, having seen your contact from the Internet.<br><br><br>I am Barrister Jude Mbudiche, the legal adviser to late Mrs. B.J. Hayford a British couple that lived in my Country Nigeria for 25 years before she died in the Bellview plane crash October last year. These Lady was a good Christian, She so dedicated to God but she lost her husband so early and she had no child till she died. Throughout her stay in my country, she acquired a lot of properties like lands, house properties, etc. As her legal adviser, before her death, she instructed me to write her WILL. Because she had no child, she dedicated her wealth to God.<br><br><br>According to the WILL, the properties have to be sold and the money be given out to a ministry for the work of God. As her legal adviser, all the documents for the properties were in my care. You will read more stories about the plane crash by visiting this web:<br><br>http://www.independentng.com/news/nnoct240503.htm<br><br>http://www.cnn.com/2005/WORLD/africa/10/24/nigeria.plane/<br><br>http://news.bbc.co.uk/1/hi/world/africa/4368516.stm<br><br><br>She gave me the authority to sell the properties and give out the fund to the Ministries for the work of God.<br><br>In short, I sold all the properties after her death, as she instructed And as matter of fact, after I sold all her properties, I realized more than $20,000,000.00 (Twenty million US dollars plus), and what supposed to be the percentage interest of my right legal fee was firstly deducted by me out of the total amount realized from the sold properties, this was base on the initial agreement between me and the owner of the properties before her death.<br><br><br>Therefore the total amount left to be invested into God's work as instructed by the owner, is $20,000,000.00 (Twenty million US dollars) only. But instead of giving the main fund out for the work of God as instructed to me by the owner before her death. I converted the fund to myself with the intention of investing the fund abroad for my personal use. I was afraid of putting the fund in the Bank, because I have to give account to the bank on how I got the money. I then packaged the fund in consignments and deposited the consignments with a security company.<br><br><br>I did not want the management of the Security Company to know the content of the consignments; therefore I registered the content of the consignments as Gold Bars. Now, the security company believes that what I deposited with them was Gold Bars.<br><br>I had encounter with Christ when Rev. Billy Graham was preaching on television concerning Ananias and Saphira in Acts 5:1-11. After hearing the word of God, I gave my life to Christ and became a born again Christian. As a born again Christian, I started reading my bible and one day, the Lord opened my eyes to Ezekiel 33: 18 and 19 where the word of God says: "When the righteous truth from his righteousness, and comit iniquity, he shall even die thereby. But if the wicked turn from his wickedness, and do that which is lawful and right, he shall live thereby". From the scripture, I discovered that the only way I could have peace in my life is to do what is lawful and right by giving out the fund as instructed for the work of God by the owner before her death. <br><br><br>I have asked God for forgiveness and I know that God have forgiven me. But I have to do what is lawful and right in the sight of God by giving out the fund to the chosen ministry for the purpose of God's work as instructed by the owner before her death. After my fasting and prayers, I asked God to make his choice and direct me to a honest Christian but after my fervent prayer over it, then you were nominated to me through divine revelation from God, so these are how I received such a divine revelation from the Lord, how I got your contact information, and I then decided to contact you for the fund to be used wisely for things that will glorify the name of God. <br><br><br>I have notified the Security Company where I deposited the consignments that contained the fund, that I am moving the consignment abroad and the security company has since been waiting for my authority for the consignment to leave my country and move to abroad. So if you know that you will use this fund honestly and wisely for things that will glorify God's name, then do contact me back through this email:jud...@ya..., for more details.<br><br><br>You should also forward to me your physical contact address were you will like the consignments delivered to you, your direct telephone and fax number for easy communication and to fax you the documents concerning the consignments.<br><br>Your prompt response will be highly appreciated.<br><br><br>Sincerely yours,<br><br>Bro.Jude Mbudiche.<br><br>                                                  <br><br>   <br><br><br><br></span><br><br>- <span style="color:green;">Bro. Jude Mbudiche</span></div></div>
--0-2064736346-1144019218=:48912--

Re: [Isisalsa-devel] isis es1968.h,NONE,1.1 sam9707.c,1.4,1.5 es1968.c,1.42,1.43

[Felipe S. <sol...@es...>]

*** forgot logs ***

Ok.
Previous log messages disappeared ("Interrupt rised Event  4").
Thank you!


Regards,
Felipe

Jean-S=E9bastien Valette wrote:
> Update of /cvsroot/isisalsa/isis
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9966
>=20
> Modified Files:
> 	sam9707.c es1968.c=20
> Added Files:
> 	es1968.h=20
> Log Message:
> adding some pci init stuff.
> May need some more.
> still fighting withh mmt table  read/write
>=20
> Index: sam9707.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -C2 -d -r1.4 -r1.5
> *** sam9707.c	31 Dec 2005 15:00:51 -0000	1.4
> --- sam9707.c	31 Dec 2005 16:10:32 -0000	1.5
> ***************
> *** 7,10 ****
> --- 7,11 ----
>   #include <linux/types.h>
>   #include <linux/delay.h>
> + #include <linux/pci.h>
>   #include <asm/io.h>
>  =20
> ***************
> *** 15,21 ****
>   #include <sound/pcm.h>
>  =20
>   #include "isis.h"
>  =20
> -=20
>   static u16 samBoot[]=3D{
>   0xD0CE,0x0111,0xD0CE,0x01D5,0x0001,0x0003,0x0004,0x0006,
> --- 16,22 ----
>   #include <sound/pcm.h>
>  =20
> + #include "es1968.h"
>   #include "isis.h"
>  =20
>   static u16 samBoot[]=3D{
>   0xD0CE,0x0111,0xD0CE,0x01D5,0x0001,0x0003,0x0004,0x0006,
> ***************
> *** 735,739 ****
>   	snd_isis_write_data8(chip, 0);
>  =20
> ! 	snd_printk("unluting channlels\n");
>   	outw(0x07ff,chip->io_port + 0x64); // set GPIO mask
>   	tmp =3D inw(chip->io_port + 0x60 ); //read the GPIO
> --- 736,740 ----
>   	snd_isis_write_data8(chip, 0);
>  =20
> ! 	snd_printk("unmuting channlels\n");
>   	outw(0x07ff,chip->io_port + 0x64); // set GPIO mask
>   	tmp =3D inw(chip->io_port + 0x60 ); //read the GPIO
> ***************
> *** 1116,1131 ****
>   	entry->mode =3D S_IFCHR | S_IWUSR;
>   	chip->firm =3D 1;
> ! //	tmp =3D inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
> ! //	outw(tmp, chip->io_port + 0x18);
>   =09
> ! //	snd_isis_write_control(chip->sam9707_chip, 0x70);=09
> ! //	snd_isis_write_data8(chip->sam9707_chip, 0x11);
> ! //	mdelay(100);=09
> ! //	if((tmp =3D snd_isis_read_data8(chip->sam9707_chip)) !=3D 0x00)
> ! //		printk("warning GENINT fail %x\n",tmp);
> ! //	else
> ! //		printk("Isis detection OK\n");
> ! //	tmp =3D inw(chip->io_port + 0x18) | SAM_INTERRUPT;
> ! //	outw(tmp, chip->io_port + 0x18);
>   =09
>   	snd_printk("Creating SAM CHIP\n");
> --- 1117,1132 ----
>   	entry->mode =3D S_IFCHR | S_IWUSR;
>   	chip->firm =3D 1;
> ! 	tmp =3D inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
> ! 	outw(tmp, chip->io_port + 0x18);
>   =09
> ! 	snd_isis_write_control(chip, 0x70);=09
> ! 	snd_isis_write_data8(chip, 0x11);
> ! 	mdelay(100);=09
> ! 	if((tmp =3D snd_isis_read_data8(chip)) !=3D 0x00)
> ! 		printk("warning GENINT fail %x\n",tmp);
> ! 	else
> ! 		printk("Isis detection OK\n");
> ! 	tmp =3D inw(chip->io_port + 0x18) | SAM_INTERRUPT;
> ! 	outw(tmp, chip->io_port + 0x18);
>   =09
>   	snd_printk("Creating SAM CHIP\n");
> ***************
> *** 1148,1155 ****
>   	*	Enabling MPU-401
>   	*/
> ! //	pci_read_config_word(chip->parent->pci, 0x50, &w);
> ! //	w |=3D 0x18;
> ! //	pci_write_config_word(chip->parent->pci, 0x50, w);
> ! //	snd_printk("MPU 401 Enabled\n");
>   	/*
>   	 * 		Setting up clock source
> --- 1149,1156 ----
>   	*	Enabling MPU-401
>   	*/
> ! 	pci_read_config_word(chip->parent->pci, 0x50, &w);
> ! 	w |=3D 0x18;
> ! 	pci_write_config_word(chip->parent->pci, 0x50, w);
> ! 	snd_printk("MPU 401 Enabled\n");
>   	/*
>   	 * 		Setting up clock source
>=20
> Index: es1968.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/isisalsa/isis/es1968.c,v
> retrieving revision 1.42
> retrieving revision 1.43
> diff -C2 -d -r1.42 -r1.43
> *** es1968.c	6 Jul 2005 18:38:04 -0000	1.42
> --- es1968.c	31 Dec 2005 16:10:32 -0000	1.43
> ***************
> *** 2004,2008 ****
>   	if (!(event =3D inb(chip->io_port + 0x1A)))
>   		return IRQ_NONE;
> ! 	snd_printk("Interrupt rised Event %2x \n", event);
>  =20
>   	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);
> --- 2004,2008 ----
>   	if (!(event =3D inb(chip->io_port + 0x1A)))
>   		return IRQ_NONE;
> ! //	snd_printk("Interrupt rised Event %2x \n", event);
>  =20
>   	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);
>=20
> --- NEW FILE: es1968.h ---
> /*
>  *  Driver for ESS Maestro 1/2/2E Sound Card (started 21.8.99)
>  * 			   Guillemot Maxi isis version.
>  *  Copyright (c) by Matze Braun <Mat...@gm...>.
>  *                   Takashi Iwai <ti...@su...>
>  * 					 Valette Jean-sebastien
>  *                 =20
>  *  Most of the driver code comes from Zach Brown(za...@re...)
>  *	Alan Cox OSS Driver
>  *  Rewritted from card-es1938.c source.
>  *
>  */
>=20
> #ifndef ES1968_H
> #include <sound/ac97_codec.h>
>=20
> #define NR_APUS			64
> #define NR_APU_REGS		16
>=20
> struct snd_es1968 {
> 	/* Module Config */
> 	int total_bufsize;			/* in bytes */
>=20
> 	int playback_streams, capture_streams;
>=20
> 	unsigned int clock;		/* clock */
> 	/* for clock measurement */
> 	unsigned int in_measurement: 1;
> 	unsigned int measure_apu;
> 	unsigned int measure_lastpos;
> 	unsigned int measure_count;
>=20
> 	/* buffer */
> 	struct snd_dma_buffer dma;
>=20
> 	/* Resources... */
> 	int irq;
> 	unsigned long io_port;
> 	int type;
> 	struct pci_dev *pci;
> 	snd_card_t *card;
> 	snd_pcm_t *pcm;
> 	int do_pm;		/* power-management enabled */
>=20
> 	/* DMA memory block */
> 	struct list_head buf_list;
>=20
> 	/* ALSA Stuff */
> 	ac97_t *ac97;
> 	snd_kcontrol_t *master_switch; /* for h/w volume control */
> 	snd_kcontrol_t *master_volume;
>=20
> 	snd_rawmidi_t *rmidi;
>=20
> 	spinlock_t reg_lock;
> 	struct semaphore ac97_mutex;	/* ac97 lock */
> 	struct tasklet_struct hwvol_tq;
>=20
> 	/* Maestro Stuff */
> 	u16 maestro_map[32];
> 	int bobclient;		/* active timer instancs */
> 	int bob_freq;		/* timer frequency */
> 	struct semaphore memory_mutex;	/* memory lock */
>=20
> 	/* APU states */
> 	unsigned char apu[NR_APUS];
>=20
> 	/* active substreams */
> 	struct list_head substream_list;
> 	spinlock_t substream_lock;
>=20
> #ifdef CONFIG_PM
> 	u16 apu_map[NR_APUS][NR_APU_REGS];
> #endif
>=20
> #ifdef SUPPORT_JOYSTICK
> 	struct gameport gameport;
> 	struct resource *res_joystick;
> #endif
> #ifdef SND_ISIS
> 	struct isis_sam9707_chip *sam9707_chip;
> #endif
> };
> #endif
>=20
>=20
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log =
files
> for problems?  Stop!  Download the new AJAX search engine that makes
> searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
> http://ads.osdn.com/?ad_id=3D7637&alloc_id=3D16865&op=3Dclick
> _______________________________________________
> Isisalsa-devel mailing list
> Isi...@li...
> https://lists.sourceforge.net/lists/listinfo/isisalsa-devel
>=20
>=20


--=20
In a world without walls who needs gates or windows?

                                --unknown

Re: [Isisalsa-devel] isis es1968.h,NONE,1.1 sam9707.c,1.4,1.5 es1968.c,1.42,1.43

[Felipe S. <sol...@es...>]

Ok.
Previous log messages disappeared ("Interrupt rised Event  4").
Thank you!


Regards,
Felipe

Jean-S=E9bastien Valette wrote:
> Update of /cvsroot/isisalsa/isis
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9966
>=20
> Modified Files:
> 	sam9707.c es1968.c=20
> Added Files:
> 	es1968.h=20
> Log Message:
> adding some pci init stuff.
> May need some more.
> still fighting withh mmt table  read/write
>=20
> Index: sam9707.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -C2 -d -r1.4 -r1.5
> *** sam9707.c	31 Dec 2005 15:00:51 -0000	1.4
> --- sam9707.c	31 Dec 2005 16:10:32 -0000	1.5
> ***************
> *** 7,10 ****
> --- 7,11 ----
>   #include <linux/types.h>
>   #include <linux/delay.h>
> + #include <linux/pci.h>
>   #include <asm/io.h>
>  =20
> ***************
> *** 15,21 ****
>   #include <sound/pcm.h>
>  =20
>   #include "isis.h"
>  =20
> -=20
>   static u16 samBoot[]=3D{
>   0xD0CE,0x0111,0xD0CE,0x01D5,0x0001,0x0003,0x0004,0x0006,
> --- 16,22 ----
>   #include <sound/pcm.h>
>  =20
> + #include "es1968.h"
>   #include "isis.h"
>  =20
>   static u16 samBoot[]=3D{
>   0xD0CE,0x0111,0xD0CE,0x01D5,0x0001,0x0003,0x0004,0x0006,
> ***************
> *** 735,739 ****
>   	snd_isis_write_data8(chip, 0);
>  =20
> ! 	snd_printk("unluting channlels\n");
>   	outw(0x07ff,chip->io_port + 0x64); // set GPIO mask
>   	tmp =3D inw(chip->io_port + 0x60 ); //read the GPIO
> --- 736,740 ----
>   	snd_isis_write_data8(chip, 0);
>  =20
> ! 	snd_printk("unmuting channlels\n");
>   	outw(0x07ff,chip->io_port + 0x64); // set GPIO mask
>   	tmp =3D inw(chip->io_port + 0x60 ); //read the GPIO
> ***************
> *** 1116,1131 ****
>   	entry->mode =3D S_IFCHR | S_IWUSR;
>   	chip->firm =3D 1;
> ! //	tmp =3D inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
> ! //	outw(tmp, chip->io_port + 0x18);
>   =09
> ! //	snd_isis_write_control(chip->sam9707_chip, 0x70);=09
> ! //	snd_isis_write_data8(chip->sam9707_chip, 0x11);
> ! //	mdelay(100);=09
> ! //	if((tmp =3D snd_isis_read_data8(chip->sam9707_chip)) !=3D 0x00)
> ! //		printk("warning GENINT fail %x\n",tmp);
> ! //	else
> ! //		printk("Isis detection OK\n");
> ! //	tmp =3D inw(chip->io_port + 0x18) | SAM_INTERRUPT;
> ! //	outw(tmp, chip->io_port + 0x18);
>   =09
>   	snd_printk("Creating SAM CHIP\n");
> --- 1117,1132 ----
>   	entry->mode =3D S_IFCHR | S_IWUSR;
>   	chip->firm =3D 1;
> ! 	tmp =3D inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
> ! 	outw(tmp, chip->io_port + 0x18);
>   =09
> ! 	snd_isis_write_control(chip, 0x70);=09
> ! 	snd_isis_write_data8(chip, 0x11);
> ! 	mdelay(100);=09
> ! 	if((tmp =3D snd_isis_read_data8(chip)) !=3D 0x00)
> ! 		printk("warning GENINT fail %x\n",tmp);
> ! 	else
> ! 		printk("Isis detection OK\n");
> ! 	tmp =3D inw(chip->io_port + 0x18) | SAM_INTERRUPT;
> ! 	outw(tmp, chip->io_port + 0x18);
>   =09
>   	snd_printk("Creating SAM CHIP\n");
> ***************
> *** 1148,1155 ****
>   	*	Enabling MPU-401
>   	*/
> ! //	pci_read_config_word(chip->parent->pci, 0x50, &w);
> ! //	w |=3D 0x18;
> ! //	pci_write_config_word(chip->parent->pci, 0x50, w);
> ! //	snd_printk("MPU 401 Enabled\n");
>   	/*
>   	 * 		Setting up clock source
> --- 1149,1156 ----
>   	*	Enabling MPU-401
>   	*/
> ! 	pci_read_config_word(chip->parent->pci, 0x50, &w);
> ! 	w |=3D 0x18;
> ! 	pci_write_config_word(chip->parent->pci, 0x50, w);
> ! 	snd_printk("MPU 401 Enabled\n");
>   	/*
>   	 * 		Setting up clock source
>=20
> Index: es1968.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvsroot/isisalsa/isis/es1968.c,v
> retrieving revision 1.42
> retrieving revision 1.43
> diff -C2 -d -r1.42 -r1.43
> *** es1968.c	6 Jul 2005 18:38:04 -0000	1.42
> --- es1968.c	31 Dec 2005 16:10:32 -0000	1.43
> ***************
> *** 2004,2008 ****
>   	if (!(event =3D inb(chip->io_port + 0x1A)))
>   		return IRQ_NONE;
> ! 	snd_printk("Interrupt rised Event %2x \n", event);
>  =20
>   	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);
> --- 2004,2008 ----
>   	if (!(event =3D inb(chip->io_port + 0x1A)))
>   		return IRQ_NONE;
> ! //	snd_printk("Interrupt rised Event %2x \n", event);
>  =20
>   	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);
>=20
> --- NEW FILE: es1968.h ---
> /*
>  *  Driver for ESS Maestro 1/2/2E Sound Card (started 21.8.99)
>  * 			   Guillemot Maxi isis version.
>  *  Copyright (c) by Matze Braun <Mat...@gm...>.
>  *                   Takashi Iwai <ti...@su...>
>  * 					 Valette Jean-sebastien
>  *                 =20
>  *  Most of the driver code comes from Zach Brown(za...@re...)
>  *	Alan Cox OSS Driver
>  *  Rewritted from card-es1938.c source.
>  *
>  */
>=20
> #ifndef ES1968_H
> #include <sound/ac97_codec.h>
>=20
> #define NR_APUS			64
> #define NR_APU_REGS		16
>=20
> struct snd_es1968 {
> 	/* Module Config */
> 	int total_bufsize;			/* in bytes */
>=20
> 	int playback_streams, capture_streams;
>=20
> 	unsigned int clock;		/* clock */
> 	/* for clock measurement */
> 	unsigned int in_measurement: 1;
> 	unsigned int measure_apu;
> 	unsigned int measure_lastpos;
> 	unsigned int measure_count;
>=20
> 	/* buffer */
> 	struct snd_dma_buffer dma;
>=20
> 	/* Resources... */
> 	int irq;
> 	unsigned long io_port;
> 	int type;
> 	struct pci_dev *pci;
> 	snd_card_t *card;
> 	snd_pcm_t *pcm;
> 	int do_pm;		/* power-management enabled */
>=20
> 	/* DMA memory block */
> 	struct list_head buf_list;
>=20
> 	/* ALSA Stuff */
> 	ac97_t *ac97;
> 	snd_kcontrol_t *master_switch; /* for h/w volume control */
> 	snd_kcontrol_t *master_volume;
>=20
> 	snd_rawmidi_t *rmidi;
>=20
> 	spinlock_t reg_lock;
> 	struct semaphore ac97_mutex;	/* ac97 lock */
> 	struct tasklet_struct hwvol_tq;
>=20
> 	/* Maestro Stuff */
> 	u16 maestro_map[32];
> 	int bobclient;		/* active timer instancs */
> 	int bob_freq;		/* timer frequency */
> 	struct semaphore memory_mutex;	/* memory lock */
>=20
> 	/* APU states */
> 	unsigned char apu[NR_APUS];
>=20
> 	/* active substreams */
> 	struct list_head substream_list;
> 	spinlock_t substream_lock;
>=20
> #ifdef CONFIG_PM
> 	u16 apu_map[NR_APUS][NR_APU_REGS];
> #endif
>=20
> #ifdef SUPPORT_JOYSTICK
> 	struct gameport gameport;
> 	struct resource *res_joystick;
> #endif
> #ifdef SND_ISIS
> 	struct isis_sam9707_chip *sam9707_chip;
> #endif
> };
> #endif
>=20
>=20
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log =
files
> for problems?  Stop!  Download the new AJAX search engine that makes
> searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
> http://ads.osdn.com/?ad_id=3D7637&alloc_id=3D16865&op=3Dclick
> _______________________________________________
> Isisalsa-devel mailing list
> Isi...@li...
> https://lists.sourceforge.net/lists/listinfo/isisalsa-devel
>=20
>=20


--=20
In a world without walls who needs gates or windows?

                                --unknown

[Isisalsa-devel] isis es1968.h,NONE,1.1 sam9707.c,1.4,1.5 es1968.c,1.42,1.43

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9966

Modified Files:
	sam9707.c es1968.c 
Added Files:
	es1968.h 
Log Message:
adding some pci init stuff.
May need some more.
still fighting withh mmt table  read/write

Index: sam9707.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sam9707.c	31 Dec 2005 15:00:51 -0000	1.4
--- sam9707.c	31 Dec 2005 16:10:32 -0000	1.5
***************
*** 7,10 ****
--- 7,11 ----
  #include <linux/types.h>
  #include <linux/delay.h>
+ #include <linux/pci.h>
  #include <asm/io.h>
  
***************
*** 15,21 ****
  #include <sound/pcm.h>
  
  #include "isis.h"
  
- 
  static u16 samBoot[]={
  0xD0CE,0x0111,0xD0CE,0x01D5,0x0001,0x0003,0x0004,0x0006,
--- 16,22 ----
  #include <sound/pcm.h>
  
+ #include "es1968.h"
  #include "isis.h"
  
  static u16 samBoot[]={
  0xD0CE,0x0111,0xD0CE,0x01D5,0x0001,0x0003,0x0004,0x0006,
***************
*** 735,739 ****
  	snd_isis_write_data8(chip, 0);
  
! 	snd_printk("unluting channlels\n");
  	outw(0x07ff,chip->io_port + 0x64); // set GPIO mask
  	tmp = inw(chip->io_port + 0x60 ); //read the GPIO
--- 736,740 ----
  	snd_isis_write_data8(chip, 0);
  
! 	snd_printk("unmuting channlels\n");
  	outw(0x07ff,chip->io_port + 0x64); // set GPIO mask
  	tmp = inw(chip->io_port + 0x60 ); //read the GPIO
***************
*** 1116,1131 ****
  	entry->mode = S_IFCHR | S_IWUSR;
  	chip->firm = 1;
! //	tmp = inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
! //	outw(tmp, chip->io_port + 0x18);
  	
! //	snd_isis_write_control(chip->sam9707_chip, 0x70);	
! //	snd_isis_write_data8(chip->sam9707_chip, 0x11);
! //	mdelay(100);	
! //	if((tmp = snd_isis_read_data8(chip->sam9707_chip)) != 0x00)
! //		printk("warning GENINT fail %x\n",tmp);
! //	else
! //		printk("Isis detection OK\n");
! //	tmp = inw(chip->io_port + 0x18) | SAM_INTERRUPT;
! //	outw(tmp, chip->io_port + 0x18);
  	
  	snd_printk("Creating SAM CHIP\n");
--- 1117,1132 ----
  	entry->mode = S_IFCHR | S_IWUSR;
  	chip->firm = 1;
! 	tmp = inw(chip->io_port + 0x18) & ~SAM_INTERRUPT;
! 	outw(tmp, chip->io_port + 0x18);
  	
! 	snd_isis_write_control(chip, 0x70);	
! 	snd_isis_write_data8(chip, 0x11);
! 	mdelay(100);	
! 	if((tmp = snd_isis_read_data8(chip)) != 0x00)
! 		printk("warning GENINT fail %x\n",tmp);
! 	else
! 		printk("Isis detection OK\n");
! 	tmp = inw(chip->io_port + 0x18) | SAM_INTERRUPT;
! 	outw(tmp, chip->io_port + 0x18);
  	
  	snd_printk("Creating SAM CHIP\n");
***************
*** 1148,1155 ****
  	*	Enabling MPU-401
  	*/
! //	pci_read_config_word(chip->parent->pci, 0x50, &w);
! //	w |= 0x18;
! //	pci_write_config_word(chip->parent->pci, 0x50, w);
! //	snd_printk("MPU 401 Enabled\n");
  	/*
  	 * 		Setting up clock source
--- 1149,1156 ----
  	*	Enabling MPU-401
  	*/
! 	pci_read_config_word(chip->parent->pci, 0x50, &w);
! 	w |= 0x18;
! 	pci_write_config_word(chip->parent->pci, 0x50, w);
! 	snd_printk("MPU 401 Enabled\n");
  	/*
  	 * 		Setting up clock source

Index: es1968.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/es1968.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** es1968.c	6 Jul 2005 18:38:04 -0000	1.42
--- es1968.c	31 Dec 2005 16:10:32 -0000	1.43
***************
*** 2004,2008 ****
  	if (!(event = inb(chip->io_port + 0x1A)))
  		return IRQ_NONE;
! 	snd_printk("Interrupt rised Event %2x \n", event);
  
  	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);
--- 2004,2008 ----
  	if (!(event = inb(chip->io_port + 0x1A)))
  		return IRQ_NONE;
! //	snd_printk("Interrupt rised Event %2x \n", event);
  
  	outw(inw(chip->io_port + 4) & 1, chip->io_port + 4);

--- NEW FILE: es1968.h ---
/*
 *  Driver for ESS Maestro 1/2/2E Sound Card (started 21.8.99)
 * 			   Guillemot Maxi isis version.
 *  Copyright (c) by Matze Braun <Mat...@gm...>.
 *                   Takashi Iwai <ti...@su...>
 * 					 Valette Jean-sebastien
 *                  
 *  Most of the driver code comes from Zach Brown(za...@re...)
 *	Alan Cox OSS Driver
 *  Rewritted from card-es1938.c source.
 *
 */

#ifndef ES1968_H
#include <sound/ac97_codec.h>

#define NR_APUS			64
#define NR_APU_REGS		16

struct snd_es1968 {
	/* Module Config */
	int total_bufsize;			/* in bytes */

	int playback_streams, capture_streams;

	unsigned int clock;		/* clock */
	/* for clock measurement */
	unsigned int in_measurement: 1;
	unsigned int measure_apu;
	unsigned int measure_lastpos;
	unsigned int measure_count;

	/* buffer */
	struct snd_dma_buffer dma;

	/* Resources... */
	int irq;
	unsigned long io_port;
	int type;
	struct pci_dev *pci;
	snd_card_t *card;
	snd_pcm_t *pcm;
	int do_pm;		/* power-management enabled */

	/* DMA memory block */
	struct list_head buf_list;

	/* ALSA Stuff */
	ac97_t *ac97;
	snd_kcontrol_t *master_switch; /* for h/w volume control */
	snd_kcontrol_t *master_volume;

	snd_rawmidi_t *rmidi;

	spinlock_t reg_lock;
	struct semaphore ac97_mutex;	/* ac97 lock */
	struct tasklet_struct hwvol_tq;

	/* Maestro Stuff */
	u16 maestro_map[32];
	int bobclient;		/* active timer instancs */
	int bob_freq;		/* timer frequency */
	struct semaphore memory_mutex;	/* memory lock */

	/* APU states */
	unsigned char apu[NR_APUS];

	/* active substreams */
	struct list_head substream_list;
	spinlock_t substream_lock;

#ifdef CONFIG_PM
	u16 apu_map[NR_APUS][NR_APU_REGS];
#endif

#ifdef SUPPORT_JOYSTICK
	struct gameport gameport;
	struct resource *res_joystick;
#endif
#ifdef SND_ISIS
	struct isis_sam9707_chip *sam9707_chip;
#endif
};
#endif

[Isisalsa-devel] isis sam9707.c,1.3,1.4 .cvsignore,1.3,1.4 .sam9707.o.cmd,1.1,NONE .es1968.o.cmd,1.1,NONE

[Jean-Sébastien V. <je...@us...>]

Update of /cvsroot/isisalsa/isis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24688

Modified Files:
	sam9707.c .cvsignore 
Removed Files:
	.sam9707.o.cmd .es1968.o.cmd 
Log Message:
cvs stuff 


--- .es1968.o.cmd DELETED ---

Index: .cvsignore
===================================================================
RCS file: /cvsroot/isisalsa/isis/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore	24 Oct 2005 15:58:54 -0000	1.3
--- .cvsignore	31 Dec 2005 15:00:51 -0000	1.4
***************
*** 4,5 ****
--- 4,6 ----
  *.ko
  *.cmd
+ dmesg

Index: sam9707.c
===================================================================
RCS file: /cvsroot/isisalsa/isis/sam9707.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sam9707.c	3 Nov 2005 13:26:09 -0000	1.3
--- sam9707.c	31 Dec 2005 15:00:51 -0000	1.4
***************
*** 371,374 ****
--- 371,376 ----
  	v->volleft = ucontrol->value.integer.value[0];
  	v->volright = ucontrol->value.integer.value[1];
+ //	isis_write16(chip, SAM_W_VOLLEFT, v->volleft);
+ //	isis_write16(chip, SAM_W_VOLRIGHT, v->volright);
  	return 0;
  };

--- .sam9707.o.cmd DELETED ---