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

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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;
  }