[svn-commits] fjoe: freebsd/trunk r8722 - in /freebsd/trunk: drivers/dahdi/wct4xxp/ freebsd...

[SVN commits to the Digium repositories]

Author: fjoe
Date: Tue Jun  1 01:32:14 2010
New Revision: 8722

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8722
Log:
- Reduce differences to Linux: Octasic firmware modules now have the same names as in Linux.
- Connect HX8 firmware to the build.

Added:
    freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/
      - copied from r8338, freebsd/trunk/freebsd/dahdi_fw_oct6114_064/
    freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/
      - copied from r8338, freebsd/trunk/freebsd/dahdi_fw_oct6114_128/
Modified:
    freebsd/trunk/drivers/dahdi/wct4xxp/base.c
    freebsd/trunk/freebsd/Makefile
    freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile
    freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile

Modified: freebsd/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=8722&r1=8721&r2=8722
==============================================================================
--- freebsd/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ freebsd/trunk/drivers/dahdi/wct4xxp/base.c Tue Jun  1 01:32:14 2010
@@ -3885,13 +3885,8 @@
 	extern u8 _binary_dahdi_fw_oct6114_064_bin_start[];
 	extern u8 _binary_dahdi_fw_oct6114_128_bin_start[];
 #else
-#if defined(__FreeBSD__)
-	static const char oct064_firmware[] = "dahdi_fw_oct6114_064";
-	static const char oct128_firmware[] = "dahdi_fw_oct6114_128";
-#else
 	static const char oct064_firmware[] = "dahdi-fw-oct6114-064.bin";
 	static const char oct128_firmware[] = "dahdi-fw-oct6114-128.bin";
-#endif
 #endif
 
 	if (!vpmsupport) {

Modified: freebsd/trunk/freebsd/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/Makefile?view=diff&rev=8722&r1=8721&r2=8722
==============================================================================
--- freebsd/trunk/freebsd/Makefile (original)
+++ freebsd/trunk/freebsd/Makefile Tue Jun  1 01:32:14 2010
@@ -11,8 +11,9 @@
 	dahdi_echocan_mg2\
 	dahdi_echocan_sec\
 	dahdi_echocan_sec2\
-	dahdi_fw_oct6114_064\
-	dahdi_fw_oct6114_128\
+	dahdi-fw-hx8.bin\
+	dahdi-fw-oct6114-064.bin\
+	dahdi-fw-oct6114-128.bin\
 	dahdi_voicebus\
 	ng_dahdi_netdev\
 	wcb4xxp\

Modified: freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile?view=diff&rev=8722&r1=8338&r2=8722
==============================================================================
--- freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile (original)
+++ freebsd/trunk/freebsd/dahdi-fw-oct6114-064.bin/Makefile Tue Jun  1 01:32:14 2010
@@ -1,7 +1,7 @@
 # $Id$
 
-KMOD=	dahdi_fw_oct6114_064
-FIRMWS=	dahdi-fw-oct6114-064.bin:dahdi_fw_oct6114_064
+KMOD=	dahdi-fw-oct6114-064.bin
+FIRMWS=	dahdi-fw-oct6114-064.bin:dahdi-fw-oct6114-064.bin
 
 .include "../../firmware.mk"
 .include <bsd.kmod.mk>

Modified: freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile?view=diff&rev=8722&r1=8338&r2=8722
==============================================================================
--- freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile (original)
+++ freebsd/trunk/freebsd/dahdi-fw-oct6114-128.bin/Makefile Tue Jun  1 01:32:14 2010
@@ -1,7 +1,7 @@
 # $Id$
 
-KMOD=	dahdi_fw_oct6114_128
-FIRMWS=	dahdi-fw-oct6114-128.bin:dahdi_fw_oct6114_128
+KMOD=	dahdi-fw-oct6114-128.bin
+FIRMWS=	dahdi-fw-oct6114-128.bin:dahdi-fw-oct6114-128.bin
 
 .include "../../firmware.mk"
 .include <bsd.kmod.mk>