summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrussell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-08-08 18:23:03 +0000
committerrussell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-08-08 18:23:03 +0000
commit5d10e650814b4bae22e82bb0d7a595dcc101483b (patch)
tree8c27c08c0f53c13b20053b46c8e018006bd844f5
parentf3eb1526b218581770b198fcd72e257c47bf820b (diff)
fix for 64 bit arch (bug #4914)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/v1-0@724 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rwxr-xr-xtor2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tor2.c b/tor2.c
index f68228c..013f223 100755
--- a/tor2.c
+++ b/tor2.c
@@ -97,7 +97,7 @@ struct tor2 {
volatile unsigned short *plx; /* Virtual representation of local space */
unsigned long xilinx32_region; /* 32 bit Region allocated to Xilinx */
unsigned long xilinx32_len; /* Length of 32 bit Xilinx region */
- volatile unsigned long *mem32; /* Virtual representation of 32 bit Xilinx memory area */
+ volatile unsigned int *mem32; /* Virtual representation of 32 bit Xilinx memory area */
unsigned long xilinx8_region; /* 8 bit Region allocated to Xilinx */
unsigned long xilinx8_len; /* Length of 8 bit Xilinx region */
volatile unsigned char *mem8; /* Virtual representation of 8 bit Xilinx memory area */
@@ -1172,7 +1172,7 @@ static void tor2_intr(int irq, void *dev_id, struct pt_regs *regs)
#endif
{
int n, i, j, k, syncsrc;
- unsigned long rxword,txword;
+ unsigned int rxword,txword;
unsigned char c, rxc;
unsigned char abits, bbits;