---

yaml --- r: 192807 b: refs/heads/master c: 9afec49 h: refs/heads/master i: 192805: 06e9550 192803: 12102a4 192799: ffb4374 v: v3
git-mirror · May 18, 2010 · 7d31d00 · 7d31d00
1 parent 8b918b7
commit 7d31d00
Show file tree

Hide file tree

Showing 5 changed files with 797 additions and 797 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77012fb9954ebe355ce4ecfdaf9a0d5b88cb665b
+refs/heads/master: 9afec493e2fe1a477305a09f933267d805fe4c8c
diff --git a/trunk/drivers/staging/tm6000/tm6000-alsa.c b/trunk/drivers/staging/tm6000/tm6000-alsa.c
@@ -100,11 +100,11 @@ static int _tm6000_start_audio_dma(struct snd_tm6000_card *chip)
 	int val;
 
 	/* Enables audio */
-	val = tm6000_get_reg(core, REQ_07_SET_GET_AVREG, 0xcc, 0x0);
+	val = tm6000_get_reg(core, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, 0x0);
 	val |= 0x20;
-	tm6000_set_reg(core, REQ_07_SET_GET_AVREG, 0xcc, val);
+	tm6000_set_reg(core, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, val);
 
-	tm6000_set_reg(core, REQ_08_SET_GET_AVREG_BIT, 0x01, 0x80);
+	tm6000_set_reg(core, TM6010_REQ08_R01_A_INIT, 0x80);
 
 	return 0;
 }
@@ -119,11 +119,11 @@ static int _tm6000_stop_audio_dma(struct snd_tm6000_card *chip)
 	dprintk(1, "Stopping audio DMA\n");
 
 	/* Enables audio */
-	val = tm6000_get_reg(core, REQ_07_SET_GET_AVREG, 0xcc, 0x0);
+	val = tm6000_get_reg(core, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, 0x0);
 	val &= ~0x20;
-	tm6000_set_reg(core, REQ_07_SET_GET_AVREG, 0xcc, val);
+	tm6000_set_reg(core, TM6010_REQ07_RCC_ACTIVE_VIDEO_IF, val);
 
-	tm6000_set_reg(core, REQ_08_SET_GET_AVREG_BIT, 0x01, 0);
+	tm6000_set_reg(core, TM6010_REQ08_R01_A_INIT, 0);
 
 	return 0;
 }