summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-08-08 06:43:02 +0000
committermarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-08-08 06:43:02 +0000
commitf141bad531007bd50a793982f8db8b472004ecf2 (patch)
tree17ce1b1f346a5688de6baea7ad4879698a5aad64
parent81600fe9610fd0b976bbe85a003fba6fcf699fd5 (diff)
Fix tor2 for 64 bit machines (bug #4914)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@718 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 f1efff9..e7b3a2a 100755
--- a/tor2.c
+++ b/tor2.c
@@ -101,7 +101,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 */
@@ -1191,7 +1191,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;