[svn-commits] tzafrir: branch tools/2.6 r10548 - in /tools/branches/2.6/xpp: ./ xtalk/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Mar 20 01:27:21 2012
New Revision: 10548

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10548
Log:
xpp: fix build warnings

Unlike original: also fixed fpga_load.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10543

Modified:
    tools/branches/2.6/xpp/astribank_allow.c
    tools/branches/2.6/xpp/astribank_license.c
    tools/branches/2.6/xpp/echo_loader.c
    tools/branches/2.6/xpp/fpga_load.c
    tools/branches/2.6/xpp/xtalk/xtalk.c

Modified: tools/branches/2.6/xpp/astribank_allow.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.6/xpp/astribank_allow.c?view=diff&rev=10548&r1=10547&r2=10548
==============================================================================
--- tools/branches/2.6/xpp/astribank_allow.c (original)
+++ tools/branches/2.6/xpp/astribank_allow.c Tue Mar 20 01:27:21 2012
@@ -142,7 +142,7 @@
 		return 1;
 	}
 	if (do_write) {
-		int used_marker;
+		unsigned int used_marker;
 		/* update capabilities based on input file */
 		file = stdin;
 		if (filename) {

Modified: tools/branches/2.6/xpp/astribank_license.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.6/xpp/astribank_license.c?view=diff&rev=10548&r1=10547&r2=10548
==============================================================================
--- tools/branches/2.6/xpp/astribank_license.c (original)
+++ tools/branches/2.6/xpp/astribank_license.c Tue Mar 20 01:27:21 2012
@@ -22,6 +22,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <string.h>
 #include <debug.h>
 #include "astribank_license.h"
@@ -230,7 +231,7 @@
 	char buf[256];
 	char *line, *key, *value;
 	int lineno = 0;
-	unsigned int license_marker_begin;
+	unsigned int license_marker_begin = 0;
 	unsigned int license_marker_end;
 	struct table {
 		struct eeprom_table eeprom_table;

Modified: tools/branches/2.6/xpp/echo_loader.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.6/xpp/echo_loader.c?view=diff&rev=10548&r1=10547&r2=10548
==============================================================================
--- tools/branches/2.6/xpp/echo_loader.c (original)
+++ tools/branches/2.6/xpp/echo_loader.c Tue Mar 20 01:27:21 2012
@@ -123,7 +123,7 @@
 	long	usec;
 
 	usec = usb_buffer_usec(ub);
-	AB_INFO(astribank, "Octasic statistics: packet_size=[%d, %ld, %d] packets=%d, bytes=%ld msec=%ld usec/packet=%d\n",
+	AB_INFO(astribank, "Octasic statistics: packet_size=[%d, %ld, %d] packets=%d, bytes=%ld msec=%ld usec/packet=%ld\n",
 		ub->min_send,
 		ub->total_bytes / ub->num_sends,
 		ub->max_send,
@@ -801,9 +801,7 @@
 
 int load_echo(struct astribank_device *astribank, char *filename, int is_alaw)
 {
-	int		iLen;
 	int		ret;
-	unsigned char	*pbyFileData = NULL; 
 	UINT32		octasic_status;
 
 	AB_INFO(astribank, "Loading ECHOCAN Firmware: %s (%s)\n",

Modified: tools/branches/2.6/xpp/fpga_load.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.6/xpp/fpga_load.c?view=diff&rev=10548&r1=10547&r2=10548
==============================================================================
--- tools/branches/2.6/xpp/fpga_load.c (original)
+++ tools/branches/2.6/xpp/fpga_load.c Tue Mar 20 01:27:21 2012
@@ -557,7 +557,6 @@
 
 const struct astribank_type *my_usb_device_identify(const char devpath[], struct my_usb_device *mydev)
 {
-	struct usb_device_descriptor	*dev_desc;
 	struct usb_config_descriptor	*config_desc;
 	int				i;
 
@@ -570,7 +569,6 @@
 		ERR("Bailing out\n");
 		return 0;
 	}
-	dev_desc = &mydev->dev->descriptor;
 	config_desc = mydev->dev->config;
 	for(i = 0; i < sizeof(astribank_types)/sizeof(astribank_types[0]); i++) {
 		if(match_usb_device_identity(config_desc, &astribank_types[i])) {
@@ -592,7 +590,6 @@
 	struct usb_interface		*interface;
 	struct usb_interface_descriptor	*iface_desc;
 	struct usb_endpoint_descriptor	*endpoint;
-	int				ret;
 	int				i;
 
 	assert(mydev != NULL);
@@ -638,10 +635,10 @@
 	mydev->abtype = abtype;
 	mydev->my_ep_in = abtype->my_ep_in;
 	mydev->my_ep_out = abtype->my_ep_out;
-	ret = get_usb_string(mydev->iManufacturer, BUFSIZ, dev_desc->iManufacturer, mydev->handle);
-	ret = get_usb_string(mydev->iProduct, BUFSIZ, dev_desc->iProduct, mydev->handle);
-	ret = get_usb_string(mydev->iSerialNumber, BUFSIZ, dev_desc->iSerialNumber, mydev->handle);
-	ret = get_usb_string(mydev->iInterface, BUFSIZ, iface_desc->iInterface, mydev->handle);
+	get_usb_string(mydev->iManufacturer, BUFSIZ, dev_desc->iManufacturer, mydev->handle);
+	get_usb_string(mydev->iProduct, BUFSIZ, dev_desc->iProduct, mydev->handle);
+	get_usb_string(mydev->iSerialNumber, BUFSIZ, dev_desc->iSerialNumber, mydev->handle);
+	get_usb_string(mydev->iInterface, BUFSIZ, iface_desc->iInterface, mydev->handle);
 	INFO("ID=%04X:%04X Manufacturer=[%s] Product=[%s] SerialNumber=[%s] Interface=[%s]\n",
 		dev_desc->idVendor,
 		dev_desc->idProduct,

Modified: tools/branches/2.6/xpp/xtalk/xtalk.c
URL: http://svnview.digium.com/svn/dahdi/tools/branches/2.6/xpp/xtalk/xtalk.c?view=diff&rev=10548&r1=10547&r2=10548
==============================================================================
--- tools/branches/2.6/xpp/xtalk/xtalk.c (original)
+++ tools/branches/2.6/xpp/xtalk/xtalk.c Tue Mar 20 01:27:21 2012
@@ -243,16 +243,17 @@
 {
 	int		ret;
 	int		len;
-	char		*buf;
 	void		*priv = xtalk_dev->transport_priv;
 
 	len = cmd->header.len;
 	cmd->header.seq = xtalk_dev->tx_sequenceno;
 
-	buf = (char *)cmd;
 	//printf("%s: len=%d\n", __FUNCTION__, len);
 #if 0
 	extern	FILE	*fp;
+	char		*buf;
+
+	buf = (char *)cmd;
 	if(fp) {
 		int	i;