[zaptel-commits] kpfleming: trunk r1922 - in /trunk: ./ xpp/

zaptel-commits at lists.digium.com zaptel-commits at lists.digium.com
Tue Jan 23 08:32:04 MST 2007


Author: kpfleming
Date: Tue Jan 23 09:32:03 2007
New Revision: 1922

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

................
r1921 | kpfleming | 2007-01-23 09:29:28 -0600 (Tue, 23 Jan 2007) | 10 lines

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

........
r1920 | kpfleming | 2007-01-23 09:25:42 -0600 (Tue, 23 Jan 2007) | 2 lines

clean up various compiler warnings

........

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

Modified:
    trunk/   (props changed)
    trunk/pciradio.c
    trunk/torisa.c
    trunk/wctdm.c
    trunk/wctdm24xxp.c
    trunk/xpp/xpp_zap.c
    trunk/zaptel.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jan 23 09:32:03 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921

Modified: trunk/pciradio.c
URL: http://svn.digium.com/view/zaptel/trunk/pciradio.c?view=diff&rev=1922&r1=1921&r2=1922
==============================================================================
--- trunk/pciradio.c (original)
+++ trunk/pciradio.c Tue Jan 23 09:32:03 2007
@@ -169,8 +169,8 @@
 	volatile unsigned long ioaddr;
 	dma_addr_t 	readdma;
 	dma_addr_t	writedma;
-	volatile int *writechunk;	/* Double-word aligned write memory */
-	volatile int *readchunk;	/* Double-word aligned read memory */
+	volatile unsigned int *writechunk;	/* Double-word aligned write memory */
+	volatile unsigned int *readchunk;	/* Double-word aligned read memory */
 	unsigned char saudio_status[NUM_CHANS];
 	char gotcor[NUM_CHANS];
 	char gotct[NUM_CHANS];
@@ -539,7 +539,7 @@
 static void _do_encdec(struct pciradio *rad)
 {
 int	i,n;
-unsigned char byte1,byte2;
+unsigned char byte1 = 0, byte2 = 0;
 
 	/* return doing nothing if busy */
 	if ((rad->encdec.lastcmd + 2) > jiffies) return;
@@ -1258,7 +1258,7 @@
 				if ((rad->rxindex < stack.p.data) &&
 				  (rad->srxtimer < SRX_TIMEOUT) &&
 				    ((rad->remmode[chan->chanpos - 1] == ZT_RADPAR_REM_SERIAL) ||
-					(!strchr(rad->rxbuf,'\r'))))
+					(!strchr((char *) rad->rxbuf,'\r'))))
 				{
 					spin_unlock_irqrestore(&rad->lock,flags);
 					interruptible_sleep_on_timeout(&mywait,2);
@@ -1660,7 +1660,7 @@
 
 			/* Allocate enough memory for two zt chunks, receive and transmit.  Each sample uses
 			   32 bits.  Allocate an extra set just for control too */
-			rad->writechunk = (int *)pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &rad->writedma);
+			rad->writechunk = pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &rad->writedma);
 			if (!rad->writechunk) {
 				printk("pciradio: Unable to allocate DMA-able memory\n");
 				if (rad->freeregion)

Modified: trunk/torisa.c
URL: http://svn.digium.com/view/zaptel/trunk/torisa.c?view=diff&rev=1922&r1=1921&r2=1922
==============================================================================
--- trunk/torisa.c (original)
+++ trunk/torisa.c Tue Jan 23 09:32:03 2007
@@ -1136,6 +1136,17 @@
 	return 0;
 }
 
+
+#if !defined(LINUX26)
+static int __init set_tor_base(char *str)
+{
+	base = simple_strtol(str, NULL, 0);
+	return 1;
+}
+
+__setup("tor=", set_tor_base);
+#endif
+
 static void __exit tor_exit(void)
 {
 	free_irq(irq, NULL);

Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?view=diff&rev=1922&r1=1921&r2=1922
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Tue Jan 23 09:32:03 2007
@@ -345,8 +345,8 @@
 	unsigned long ioaddr;
 	dma_addr_t 	readdma;
 	dma_addr_t	writedma;
-	volatile int *writechunk;					/* Double-word aligned write memory */
-	volatile int *readchunk;					/* Double-word aligned read memory */
+	volatile unsigned int *writechunk;				/* Double-word aligned write memory */
+	volatile unsigned int *readchunk;				/* Double-word aligned read memory */
 	struct zt_chan chans[NUM_CARDS];
 };
 
@@ -2281,7 +2281,7 @@
 
 			/* Allocate enough memory for two zt chunks, receive and transmit.  Each sample uses
 			   32 bits.  Allocate an extra set just for control too */
-			wc->writechunk = (int *)pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &wc->writedma);
+			wc->writechunk = pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &wc->writedma);
 			if (!wc->writechunk) {
 				printk("wctdm: Unable to allocate DMA-able memory\n");
 				if (wc->freeregion)

Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?view=diff&rev=1922&r1=1921&r2=1922
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Tue Jan 23 09:32:03 2007
@@ -423,7 +423,6 @@
 static int battthresh = DEFAULT_BATT_THRESH;
 static int debug = 0;
 static int robust = 0;
-static int timingonly = 0;
 static int lowpower = 0;
 static int boostringer = 0;
 static int fastringer = 0;
@@ -440,7 +439,6 @@
 #ifdef VPM_SUPPORT
 static int vpmsupport = 1;
 static int vpmdtmfsupport = 0;
-static int vpmspans = 4;
 #define VPM_DEFAULT_DTMFTHRESHOLD 1250
 static int dtmfthreshold = VPM_DEFAULT_DTMFTHRESHOLD;
 #endif
@@ -3326,7 +3324,7 @@
 
 			/* Allocate enough memory for two zt chunks, receive and transmit.  Each sample uses
 			   32 bits.  Allocate an extra set just for control too */
-			wc->writechunk = (int *)pci_alloc_consistent(pdev, PCI_WINDOW_SIZE, &wc->writedma);
+			wc->writechunk = pci_alloc_consistent(pdev, PCI_WINDOW_SIZE, &wc->writedma);
 			if (!wc->writechunk) {
 				printk("wctdm: Unable to allocate DMA-able memory\n");
 				if (wc->freeregion)
@@ -3500,7 +3498,6 @@
 module_param(robust, int, 0600);
 module_param(_opermode, int, 0600);
 module_param(opermode, charp, 0600);
-module_param(timingonly, int, 0600);
 module_param(lowpower, int, 0600);
 module_param(boostringer, int, 0600);
 module_param(fastringer, int, 0600);
@@ -3516,7 +3513,6 @@
 #ifdef VPM_SUPPORT
 module_param(vpmsupport, int, 0600);
 module_param(vpmdtmfsupport, int, 0600);
-module_param(vpmspans, int, 0600);
 module_param(dtmfthreshold, int, 0600);
 #endif
 #else
@@ -3525,7 +3521,6 @@
 MODULE_PARM(robust, "i");
 MODULE_PARM(_opermode, "i");
 MODULE_PARM(opermode, "s");
-MODULE_PARM(timingonly, "i");
 MODULE_PARM(lowpower, "i");
 MODULE_PARM(boostringer, "i");
 MODULE_PARM(fastringer, "i");
@@ -3541,7 +3536,6 @@
 #ifdef VPM_SUPPORT
 MODULE_PARM(vpmsupport, "i");
 MODULE_PARM(vpmdtmfsupport, "i");
-MODULE_PARM(vpmspans, "i");
 MODULE_PARM(dtmfthreshold, "i");
 #endif
 #endif

Modified: trunk/xpp/xpp_zap.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xpp_zap.c?view=diff&rev=1922&r1=1921&r2=1922
==============================================================================
--- trunk/xpp/xpp_zap.c (original)
+++ trunk/xpp/xpp_zap.c Tue Jan 23 09:32:03 2007
@@ -433,7 +433,9 @@
 		len += sprintf(page + len, "\nzaptel state: %s RUNNING\n", (xpd->span.flags & ZT_FLAG_RUNNING)?"IS":"IS NOT");
 		len += sprintf(page + len, "\nPCM:\n            |         [readchunk]       |         [writechunk]      | delay");
 		for_each_line(xpd, i) {
+#if 0
 			struct zt_chan	*chans = xpd->span.chans;
+#endif
 			byte	rchunk[ZT_CHUNKSIZE];
 			byte	wchunk[ZT_CHUNKSIZE];
 			byte	*rp;

Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?view=diff&rev=1922&r1=1921&r2=1922
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Tue Jan 23 09:32:03 2007
@@ -222,7 +222,8 @@
 
 static int deftaps = 64;
 
-static
+#if !defined(LINUX26)
+static 
 __u16 fcstab[256] =
 {
 	0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
@@ -258,6 +259,7 @@
 	0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
 	0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
 };
+#endif
 
 static int debug;
 
@@ -6595,7 +6597,7 @@
 static void __zt_receive_chunk(struct zt_chan *chan, unsigned char *buf)
 {
 	/* Receive chunk of audio -- called with chan->lock held */
-	char waste[ZT_CHUNKSIZE];
+	unsigned char waste[ZT_CHUNKSIZE];
 
 	if (!buf) {
 		memset(waste, ZT_LIN2X(0, chan), sizeof(waste));



More information about the zaptel-commits mailing list