[zaptel-commits] file: branch file/zaptel-firmware r1901 - in /team/file/zaptel-firmware: ./ w...

[zaptel-commits at lists.digium.com]

Author: file
Date: Mon Jan 22 16:49:28 2007
New Revision: 1901

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1901
Log:
Merged revisions 1899 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1899 | kpfleming | 2007-01-22 17:43:47 -0500 (Mon, 22 Jan 2007) | 11 lines

Merged revisions 1898 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1898 | kpfleming | 2007-01-22 16:43:06 -0600 (Mon, 22 Jan 2007) | 3 lines

use better definition for linked-in firmware data
ensure that hotplug-loaded firmware is released when we are finished with it

........

................

Modified:
    team/file/zaptel-firmware/   (props changed)
    team/file/zaptel-firmware/Makefile
    team/file/zaptel-firmware/wct4xxp/base.c

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/file/zaptel-firmware/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 22 16:49:28 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1893
+/branches/1.4:1-1900

Modified: team/file/zaptel-firmware/Makefile
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/Makefile?view=diff&rev=1901&r1=1900&r2=1901
==============================================================================
--- team/file/zaptel-firmware/Makefile (original)
+++ team/file/zaptel-firmware/Makefile Mon Jan 22 16:49:28 2007
@@ -159,7 +159,7 @@
 endif
 
 # Set this to override hotplug firmware loading and revert to classic header
-HOTPLUG_FIRMWARE=no
+#HOTPLUG_FIRMWARE=no
 ifeq ($(HOTPLUG_FIRMWARE),yes)
 CFLAGS+=-DHOTPLUG_FIRMWARE
 endif	

Modified: team/file/zaptel-firmware/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/file/zaptel-firmware/wct4xxp/base.c?view=diff&rev=1901&r1=1900&r2=1901
==============================================================================
--- team/file/zaptel-firmware/wct4xxp/base.c (original)
+++ team/file/zaptel-firmware/wct4xxp/base.c Mon Jan 22 16:49:28 2007
@@ -3104,8 +3104,8 @@
 #if !defined(HOTPLUG_FIRMWARE)
 	extern const u32 _binary_zaptel_fw_octasic_064_bin_size;
 	extern const u32 _binary_zaptel_fw_octasic_128_bin_size;
-	extern u8 _binary_zaptel_fw_octasic_064_bin_start;
-	extern u8 _binary_zaptel_fw_octasic_128_bin_start;
+	extern u8 _binary_zaptel_fw_octasic_064_bin_start[];
+	extern u8 _binary_zaptel_fw_octasic_128_bin_start[];
 #endif
 
 	if (!vpmsupport) {
@@ -3141,7 +3141,7 @@
 			return;
 		}
 #else
-		embedded_firmware.data = &_binary_zaptel_fw_octasic_064_bin_start;
+		embedded_firmware.data = _binary_zaptel_fw_octasic_064_bin_start;
 		embedded_firmware.size = _binary_zaptel_fw_octasic_064_bin_size;
 #endif
 		break;
@@ -3153,7 +3153,7 @@
 			return;
 		}
 #else
-		embedded_firmware.data = &_binary_zaptel_fw_octasic_128_bin_start;
+		embedded_firmware.data = _binary_zaptel_fw_octasic_128_bin_start;
 		embedded_firmware.size = _binary_zaptel_fw_octasic_128_bin_size;
 #endif
 		break;
@@ -3164,12 +3164,21 @@
 
 	if (!(wc->vpm450m = init_vpm450m(wc, laws, wc->numspans, firmware))) {
 		printk("VPM450: Failed to initialize\n");
+#if defined(HOTPLUG_FIRMWARE)
+		release_firmware(firmware);
+#endif
 		return;
 	}
+
+#if defined(HOTPLUG_FIRMWARE)
+	release_firmware(firmware);
+#endif
+
 	if (vpmdtmfsupport == -1) {
 		printk("VPM450: hardware DTMF disabled.\n");
 		vpmdtmfsupport = 0;
 	}
+
 	wc->vpm = T4_VPM_PRESENT;
 	printk("VPM450: Present and operational servicing %d span(s)\n", wc->numspans);