[alsa-cvslog] CVS: alsa-driver/lowlevel/ppc pmac.c,1.6,1.7

[Takashi I. <ti...@us...>]

Update of /cvsroot/alsa/alsa-driver/lowlevel/ppc
In directory usw-pr-cvs1:/tmp/cvs-serv12677/lowlevel/ppc

Modified Files:
	pmac.c 
Log Message:
- Merged snd-card-imac and snd-card-ibook to snd-card-pmac.
- Fixed compile.
- Enabled MMAP mode.



Index: pmac.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/lowlevel/ppc/pmac.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pmac.c	2001/06/21 14:15:13	1.6
+++ pmac.c	2001/07/27 14:21:09	1.7
@@ -403,9 +403,7 @@
 
 static snd_pcm_hardware_t snd_pmac_playback =
 {
-	info:		(SNDRV_PCM_INFO_INTERLEAVED
-			 /*| SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID*/ /* XXX no mmap! */
-			 ),
+	info:		SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID,
 	formats:	SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE,
 	rates:		SNDRV_PCM_RATE_8000_44100,
 	rate_min:	7350,
@@ -421,9 +419,7 @@
 
 static snd_pcm_hardware_t snd_pmac_capture =
 {
-	info:		(SNDRV_PCM_INFO_INTERLEAVED
-			 /*| SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID*/
-			 ),
+	info:		SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID,
 	formats:	SNDRV_PCM_FMTBIT_S16_BE | SNDRV_PCM_FMTBIT_S16_LE,
 	rates:		SNDRV_PCM_RATE_8000_44100,
 	rate_min:	7350,
@@ -438,6 +434,7 @@
 };
 
 
+#if 0 // NYI
 static int snd_pmac_hw_rule_rate(snd_pcm_hw_params_t *params,
 				 snd_pcm_hw_rule_t *rule)
 {
@@ -466,6 +463,7 @@
 	return snd_mask_refine_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT),
 				   rec->cur_formats);
 }
+#endif // NYI
 
 static int snd_pmac_pcm_open(pmac_t *chip, pmac_stream_t *rec, snd_pcm_substream_t *subs)
 {