1 files changed, 3 insertions, 81 deletions

diff --git a/kernel/wcte12xp/vpmadt032.c b/kernel/wcte12xp/vpmadt032.c
index 0cb45a0..f118fd1 100644
--- a/kernel/wcte12xp/vpmadt032.c
+++ b/kernel/wcte12xp/vpmadt032.c
@@ -35,6 +35,7 @@
 #include <linux/list.h> 
 
 #include "zaptel.h"
+#include "voicebus.h"
 
 #include "wcte12xp.h"
 #include "vpmadt032.h"
@@ -698,6 +699,7 @@ void t1_vpm150m_init(struct t1 *wc) {
 	extern u8 _binary_zaptel_fw_vpmadt032_bin_start[];
 #else
 	static const char vpmadt032_firmware[] = "zaptel-fw-vpmadt032.bin";
+	struct pci_dev* pdev = voicebus_get_pci_dev(wc->vb);
 #endif
 
 #if 0
@@ -771,44 +773,6 @@ void t1_vpm150m_init(struct t1 *wc) {
 	}
 	debug_printk(1, "Passed\n");
 	
-#if 0
-	/* begin short test */
-#define TEST_SIZE 1
-	{
-	 	int i;
-		unsigned short msg[TEST_SIZE];
-
-		set_bit(VPM150M_HPIRESET, &vpm150m->control);
-		msleep(2000);
-
-		/* lets see whats in there to start with*/
-		gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg);
-		printk("at first :");
-		for (i = 0; i< TEST_SIZE; i++)
-			printk("%04x ", msg[i]);
-		printk("\n");
-
-		/* what if we put dead in there*/
-		for (i = 0; i< TEST_SIZE; i++)
-			msg[i] = 0xdead;
-		gpakWriteDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg);
-		gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg);
-		printk("now      :");
-		for (i = 0; i< TEST_SIZE; i++)
-			printk("%04x ", msg[i]);
-		printk("\n");
-
-		/* lets see if its in there now */
-		gpakReadDspMemory(vpm150m->dspid, 0x1000, TEST_SIZE, msg);
-		printk("try again:");
-		for (i = 0; i< TEST_SIZE; i++)
-			printk("%04x ", msg[i]);
-		printk("\n");
-	}
-		
-	goto failed_exit;
-#endif
-
 #define TEST_SIZE 2
 	if (debug) {
 		int i;
@@ -866,51 +830,9 @@ void t1_vpm150m_init(struct t1 *wc) {
 			printk("%x ", msg[i]);
 		printk("\n");
 	}
-#if 0
-	printk("Sending\n");
-
-	for (i = 0; i < 4; i++) {
-		unsigned short x = 0xffff;
-		t1_vpm150m_setreg(wc, 1, 0x1000 + i, &x);
-	}
-
-	gpakReadDspMemory(vpm150m->dspid, 0x1000, 4, imsg);
-
-	printk("Read back:\n");
-	for (i = 0; i < 4; i++)
-		printk("%x ", imsg[i]);
-	printk("\n");
-
-	printk("Sending\n");
-	gpakWriteDspMemory(vpm150m->dspid, 0x1000, 4, omsg);
-	for (i = 0; i < 4; i++)
-		t1_vpm150m_getreg(wc, 1, 0x1000 + i, &imsg[i]);
 
-	printk("Read back\n");
-	for (i = 0; i < 4; i++)
-		printk("%x ", imsg[i]);
-	printk("\n");
-
-#endif
-
-#if 0
-	/* Load the firmware */
-	set_bit(VPM150M_SPIRESET, &vpm150m->control);
-
-	/* Wait for it to boot */
-	msleep(7000);
-
-	pingstatus = gpakPingDsp(vpm150m->dspid, &version);
-
-	if (pingstatus) {
-			module_printk("Pingstatus %d, you failed!!! Ha ha ha ha\n", pingstatus);
-	} else 
-			module_printk("version is 0x%08x\n", version);
-
-	if (pingstatus || (version != 0x106)) {
-#endif
 #if defined(HOTPLUG_FIRMWARE)
-		if ((request_firmware(&firmware, vpmadt032_firmware, &wc->dev->dev) != 0) ||
+		if ((request_firmware(&firmware, vpmadt032_firmware, &pdev->dev) != 0) ||
 		    !firmware) {
 			printk("VPMADT032: firmware %s not available from userspace\n", vpmadt032_firmware);
 			goto failed_exit;