[svn-commits] kpfleming: branch mogorman/zaptel-1.2-transcoder r1905 - in /team/mogorman/za...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 22 16:56:54 2007
New Revision: 1905

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1905
Log:
more branch updates

Modified:
    team/mogorman/zaptel-1.2-transcoder/Makefile
    team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c

Modified: team/mogorman/zaptel-1.2-transcoder/Makefile
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/Makefile?view=diff&rev=1905&r1=1904&r2=1905
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/Makefile (original)
+++ team/mogorman/zaptel-1.2-transcoder/Makefile Mon Jan 22 16:56:54 2007
@@ -118,7 +118,7 @@
 MOD_DESTDIR:=zaptel
 
 obj-m:=$(MODULESO)
-obj-m+=wct4xxp wctc4xxb/
+obj-m+=wct4xxp/ wctc4xxb/
 MODULES+=wct4xxp wctc4xxb
 
 # Also build xpp in the subdirectory xpp/ . But only for >=2.6.10 and only 
@@ -137,7 +137,7 @@
 
 all: $(BUILDVER) $(LIBTONEZONE_SO)
 
-linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o $(BINS)
+linux24: prereq $(MODULESO) wct4xxp/wct4xxp.o wctc4xxb/wctc4xxb.o $(BINS)
 
 linux26: prereq $(BINS)
 	@echo $(KSRC)
@@ -156,7 +156,6 @@
 
 wctc4xxb/wctc4xxb.o:
 	$(MAKE) -C wctc4xxb KFLAGS="$(KFLAGS) -I.." CFLAGS="$(CFLAGS) -I.."
-
 
 devel: tor2ee 
 
@@ -333,10 +332,7 @@
 	done; \
 	$(KMAKE_INST);
 else
-	for x in $(MODULESO) wct4xxp/wct4xxp.o; do \
-		install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
-	done;
-	for x in $(MODULESO) wctc4xxb/wctc4xxb.o; do \
+	for x in $(MODULESO) wct4xxp/wct4xxp.o wctc4xxb/wctc4xxb.o; do \
 		install -D -m 644 $$x $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/$$x ; \
 	done;
 

Modified: team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c?view=diff&rev=1905&r1=1904&r2=1905
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wct4xxp/base.c Mon Jan 22 16:56:54 2007
@@ -2675,13 +2675,14 @@
 	unsigned int check1, check2;
 	int laws[4] = { 0, };
 	int x;
+	unsigned int vpm_capacity;
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
 #if !defined(HOTPLUG_FIRMWARE)
-	extern const u32 _binary_OCT6114_64D_size;
-	extern const u32 _binary_OCT6114_128D_size;
-	extern const u8 *_binary_OCT6114_64D_start;
-	extern const u8 *_binary_OCT6114_128D_start;
+	extern const u32 _binary_OCT6114_64D_ima_size;
+	extern const u32 _binary_OCT6114_128D_ima_size;
+	extern u8 _binary_OCT6114_64D_ima_start;
+	extern u8 _binary_OCT6114_128D_ima_start;
 #endif
 
 	if (!vpmsupport) {
@@ -2708,7 +2709,7 @@
 			laws[x] = 1;
 	}
 
-	switch (get_vpm450m_capacity(wc)) {
+	switch ((vpm_capacity = get_vpm450m_capacity(wc))) {
 	case 64:
 #if defined(HOTPLUG_FIRMWARE)
 		if ((request_firmware(&firmware, oct064_firmware, &wc->dev->dev) != 0) ||
@@ -2717,9 +2718,10 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_OCT6114D_64D_ima_start;
-		embedded_firmware.size = _binary_OCT6114D_64D_ima_start;
-#endif
+		embedded_firmware.data = &_binary_OCT6114_64D_ima_start;
+		embedded_firmware.size = _binary_OCT6114_64D_ima_size;
+#endif
+		break;
 	case 128:
 #if defined(HOTPLUG_FIRMWARE)
 		if ((request_firmware(&firmware, oct128_firmware, &wc->dev->dev) != 0) ||
@@ -2728,11 +2730,12 @@
 			return;
 		}
 #else
-		embedded_firmware.data = _binary_OCT6114D_128D_ima_start;
-		embedded_firmware.size = _binary_OCT6114D_128D_ima_start;
-#endif
+		embedded_firmware.data = &_binary_OCT6114_128D_ima_start;
+		embedded_firmware.size = _binary_OCT6114_128D_ima_size;
+#endif
+		break;
 	default:
-		printk("Unsupported channel capacity found on VPM module.\n");
+		printk("Unsupported channel capacity found on VPM module (%d).\n", vpm_capacity);
 		return;
 	}