summaryrefslogtreecommitdiff
path: root/pciradio.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-01-23 15:32:03 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2007-01-23 15:32:03 +0000
commit39d34cf50e3dd65ba61c579b77495311c6737e43 (patch)
tree830a32650b7a7f2ea36ad8acc3b3e9528b0f26ac /pciradio.c
parent32474245aaab39b88fd2ff7b03356bedbb0ad3ac (diff)
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 ........ ................ git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1922 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'pciradio.c')
-rw-r--r--pciradio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/pciradio.c b/pciradio.c
index 10ea7b2..ff423a9 100644
--- a/pciradio.c
+++ b/pciradio.c
@@ -169,8 +169,8 @@ struct pciradio {
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 @@ unsigned long flags;
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 @@ static int pciradio_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long
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 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de
/* 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)