[svn-commits] tzafrir: tools/trunk r10504 - /tools/trunk/xpp/

Thu Mar 15 15:46:01 CDT 2012

Author: tzafrir
Date: Thu Mar 15 15:45:57 2012
New Revision: 10504

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10504
Log:
xpp: clobber fpga_load

* It was replaced long ago by astribank_hexload/astribank_tool/astribank_allow
* It hasn't been used for several releases now, nor updated.
* Time to move into the eternal bit-bucket.
* Left (very) few strings as a tribute...

Signed-off-by: Oron Peled <oron.peled at xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Removed:
    tools/trunk/xpp/fpga_load.8
    tools/trunk/xpp/fpga_load.c
Modified:
    tools/trunk/xpp/Makefile
    tools/trunk/xpp/README.Astribank
    tools/trunk/xpp/astribank_hexload.8

Modified: tools/trunk/xpp/Makefile
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/xpp/Makefile?view=diff&rev=10504&r1=10503&r2=10504
==============================================================================

--- tools/trunk/xpp/Makefile (original)
+++ tools/trunk/xpp/Makefile Thu Mar 15 15:45:57 2012
@@ -80,12 +80,12 @@
 PROG_INSTALL	= astribank_is_starting
 MAN_INSTALL	= $(PROG_INSTALL:%=%.8)
 ifeq	(1,$(PBX_USB))
-TARGETS	+= fpga_load		\
+TARGETS	+= \
 	   astribank_tool	\
 	   astribank_hexload	\
 	   astribank_allow	\
 	   test_parse
-PROG_INSTALL	+= fpga_load astribank_tool astribank_hexload astribank_allow
+PROG_INSTALL	+= astribank_tool astribank_hexload astribank_allow
 endif
 ifneq	(,$(PERLLIBDIR))
 PROG_INSTALL	+= $(PERL_SCRIPTS)
@@ -122,9 +122,6 @@
 
 CFLAGS		+= -I. -Ixtalk
 
-fpga_load: fpga_load.o hexfile.o
-fpga_load: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
-
 astribank_hexload: $(ABHEXLOAD_OBJS)
 astribank_hexload: LIBS+=$(EXTRA_LIBS) $(USB_LIB)
 astribank_hexload: CFLAGS+=$(OCT_CFLAGS)
@@ -137,8 +134,6 @@
 
 astribank_is_starting: astribank_is_starting.o
 astribank_is_starting: LIBS+=$(EXTRA_LIBS)
-
-fpga_load.o: CFLAGS+=-D_GNU_SOURCE	# We use memrchr()
 
 hex2iic: hex2iic.o iic.o hexfile.o
 

Modified: tools/trunk/xpp/README.Astribank
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/xpp/README.Astribank?view=diff&rev=10504&r1=10503&r2=10504
==============================================================================
--- tools/trunk/xpp/README.Astribank (original)
+++ tools/trunk/xpp/README.Astribank Thu Mar 15 15:45:57 2012
@@ -45,7 +45,8 @@
 -------------------------
 Apart from the standard DAHDI build requirements, you also need:
 
-* *libusb development headers* to build the fpga_load firmware loader.
+* *libusb development headers* to build the Astribank firmware tools
+  (astribank_tool, astribank_hexload, astribank_allow).
   This is typically the package libusb-dev on Debian (and derivatives
   like Ubuntu) or libusb-devel on RedHat (and derivatives like
   CentOS/Trixbox).
@@ -561,9 +562,9 @@
 - If lsusb shows the Product ID as *11x1* - only the USB firmware is loaded 
   and not the FPGA firmware is loaded. If this is still the case after 
   a while - either the firmware loading has failed or you don't have
-  fpga_load. Make sure you have libusb-dev(el) installed when
-  building DAHDI. After you have installed it, you may need to re-run
-  ./configure .
+  astribank_hexload/astribank_tool. Make sure you have libusb-dev(el)
+  installed when building DAHDI. After you have installed it, you may need
+  to re-run ./configure .
 - It should list all of your Astribank devices. If it doesn't (for
   more than period of time needed for the initial firmware
   loading) - Check that the Astribank is connected indeed.
@@ -698,7 +699,7 @@
 
 Or disconnect the Astribank from the power and reocnnect. On some older 
 versions of the USB firmware resetting the firmware (or any operation of 
-fpga_load) would fail if the driver is loaded. Hence you would need to 
+astribank_tool) would fail if the driver is loaded. Hence you would need to
 run `rmmod xpp_usb` . In the end, reload the drivers.
 
 
@@ -960,9 +961,9 @@
 (and a new device number).
 
 In the second stage, the "FPGA" firmware is loaded.
-The second-stage firmware loading is performed by using program fpga_load, 
-which is built in the directory xpp/utils and then copied to folder 
-/usr/sbin during DAHDI installation.
+The second-stage firmware loading is performed by using program
+astribank_hexload and astribank_tool, which are built in the directory
+xpp/utils and then copied to folder /usr/sbin during DAHDI installation.
 
 The command syntax is similar to the syntax of fxload. You can use the 
 following command in order to load the FPGA firmware manually:
@@ -977,13 +978,6 @@
   astribank_hexload -D /dev/bus/usb/MMM/NNN -p /usr/share/dahdi/PIC_TYPE_[1-4].hex
   # reenumerate (disconnect and reconnect)
   astribank_tool  -D /dev/bus/usb/MMM/NNN -n
-
-With older USB firmwares (before the one included in e.g. dahdi-linux
-2.2) you needed to use instead of all the above:
-
-  # pick the right name according to the device ID. FPGA_1151.hex is for
-  # 115x Astribanks:
-  fpga_load -D /dev/bus/usb/MMM/NNN -I /usr/share/dahdi/FPGA_1151.hex
 
 Please note, that  NNN value differs from that that was used for the 
 fxload command due to the fact that device has "reconnected" itself 

Modified: tools/trunk/xpp/astribank_hexload.8
URL: http://svnview.digium.com/svn/dahdi/tools/trunk/xpp/astribank_hexload.8?view=diff&rev=10504&r1=10503&r2=10504
==============================================================================
--- tools/trunk/xpp/astribank_hexload.8 (original)
+++ tools/trunk/xpp/astribank_hexload.8 Thu Mar 15 15:45:57 2012
@@ -17,11 +17,15 @@
 
 .SH DESCRIPTION
 .B astribank_hexload
-is a second-stage firmware loader for Xorcom Astribanks. Note that some 
-older models use fpga_load(8) instead.
+is a second-stage firmware loader for Xorcom Astribanks.
 
-It is used to load a file in the Intel HEX format into a Xorcom
-Astribank. It can be used to load either an FPGA firmware or a PIC
+Note that some very old models use fpga_load(8) instead.
+This legacy tool hasn't been used for several releases.
+It can be found in version 2.6 and below of dahdi-tools.
+
+The astribank_hexload(8) program is used to load a file in the
+Intel HEX format into a Xorcom Astribank.
+It can be used to load either an FPGA firmware or a PIC
 firmware. It is normally run by the script xpp_fxloader.
 
 .SH OPTIONS
@@ -92,7 +96,7 @@
 .RE
 
 .SH SEE ALSO
-fxload(8), lsusb(8), astribank_tool(8), fpga_load(8)
+fxload(8), lsusb(8), astribank_tool(8)
 
 .SH AUTHOR
 This manual page was written by Tzafrir Cohen <tzafrir.cohen at xorcom.com> .


