patch-2.1.126 linux/drivers/sound/ad1848.c

• Lines: 70
• Date: Fri Oct 9 11:56:59 1998
• Orig file: v2.1.125/linux/drivers/sound/ad1848.c
• Orig date: Thu Sep 17 17:53:37 1998

diff -u --recursive --new-file v2.1.125/linux/drivers/sound/ad1848.c linux/drivers/sound/ad1848.c
@@ -206,7 +206,7 @@
 		return;
 
 	timeout = 80000;
-	while (timeout > 0 && ad_read(devc, 11) & 0x20)
+	while (timeout > 0 && (ad_read(devc, 11) & 0x20))
 		timeout--;
 	if (ad_read(devc, 11) & 0x20)
 		if (devc->model != MD_1845)
@@ -916,7 +916,7 @@
 		cnt >>= 1;
 	cnt--;
 
-	if (devc->audio_mode & PCM_ENABLE_OUTPUT && audio_devs[dev]->flags & DMA_AUTOMODE &&
+	if ((devc->audio_mode & PCM_ENABLE_OUTPUT) && (audio_devs[dev]->flags & DMA_AUTOMODE) &&
 	    intrflag &&
 	    cnt == devc->xfer_count)
 	{
@@ -958,7 +958,7 @@
 		cnt >>= 1;
 	cnt--;
 
-	if (devc->audio_mode & PCM_ENABLE_INPUT && audio_devs[dev]->flags & DMA_AUTOMODE &&
+	if ((devc->audio_mode & PCM_ENABLE_INPUT) && (audio_devs[dev]->flags & DMA_AUTOMODE) &&
 		intrflag &&
 		cnt == devc->xfer_count)
 	{
@@ -1182,10 +1182,10 @@
 
 	unsigned char   bits = ad_read(devc, 9);
 
-	if (bits & 0x01 && portc->open_mode & OPEN_WRITE)
+	if (bits & 0x01 && (portc->open_mode & OPEN_WRITE))
 		ad1848_halt_output(dev);
 
-	if (bits & 0x02 && portc->open_mode & OPEN_READ)
+	if (bits & 0x02 && (portc->open_mode & OPEN_READ))
 		ad1848_halt_input(dev);
 	devc->audio_mode = 0;
 }
@@ -1308,7 +1308,7 @@
 		0x00, 0x0c, 0x02, 0x00, 0x8a, 0x01, 0x00, 0x00,
 
 	/* Positions 16 to 31 just for CS4231/2 and ad1845 */
-		0x80, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+		0x80, 0x00, 0x10, 0x10, 0x00, 0x00, 0x1f, 0x40,
 		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	};
 
@@ -1997,16 +1997,16 @@
 			ad_write(devc, 24, ad_read(devc, 24) & ~alt_stat);	/* Selective ack */
 		}
 
-		if (devc->open_mode & OPEN_READ && devc->audio_mode & PCM_ENABLE_INPUT && alt_stat & 0x20)
+		if ((devc->open_mode & OPEN_READ) && (devc->audio_mode & PCM_ENABLE_INPUT) && (alt_stat & 0x20))
 		{
 			DMAbuf_inputintr(devc->record_dev);
 		}
-		if (devc->open_mode & OPEN_WRITE && devc->audio_mode & PCM_ENABLE_OUTPUT &&
-		      alt_stat & 0x10)
+		if ((devc->open_mode & OPEN_WRITE) && (devc->audio_mode & PCM_ENABLE_OUTPUT) &&
+		      (alt_stat & 0x10))
 		{
 			DMAbuf_outputintr(devc->playback_dev, 1);
 		}
-		if (devc->model != MD_1848 && alt_stat & 0x40)	/* Timer interrupt */
+		if (devc->model != MD_1848 && (alt_stat & 0x40))	/* Timer interrupt */
 		{
 			devc->timer_ticks++;
 #if defined(CONFIG_SEQUENCER) && !defined(EXCLUDE_TIMERS)