From be2f57f0de2a6855db62bb713ef0a49edcc3f8d4 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Sat, 18 Aug 2012 11:47:03 +0100 Subject: [PATCH] 64-bit fixes for wb840 network driver. --- build/jam/Haiku64Image | 2 +- src/add-ons/kernel/drivers/network/wb840/wb840.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image index 63b2b2d559..f75de0da32 100644 --- a/build/jam/Haiku64Image +++ b/build/jam/Haiku64Image @@ -75,7 +75,7 @@ SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = vesa ; SYSTEM_ADD_ONS_DRIVERS_NET = 3com atheros813x ar81xx attansic_l1 attansic_l2 broadcom440x broadcom570x dec21xxx etherpci ipro100 ipro1000 jmicron2x0 marvell_yukon nforce pcnet pegasus rtl8139 rtl81xx sis19x syskonnect - via_rhine + via_rhine wb840 ; SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci ps2 isa scsi config_manager diff --git a/src/add-ons/kernel/drivers/network/wb840/wb840.c b/src/add-ons/kernel/drivers/network/wb840/wb840.c index d478006fd9..4335d35037 100644 --- a/src/add-ons/kernel/drivers/network/wb840/wb840.c +++ b/src/add-ons/kernel/drivers/network/wb840/wb840.c @@ -539,7 +539,7 @@ wb_create_rings(wb_device* device) return device->rxArea; for (i = 1; i < WB_RX_LIST_CNT; i++) { - device->rxBuffer[i] = (void*)(((uint32)device->rxBuffer[0]) + device->rxBuffer[i] = (void*)(((addr_t)device->rxBuffer[0]) + (i * WB_BUFBYTES)); } @@ -567,7 +567,7 @@ wb_create_rings(wb_device* device) } for (i = 1; i < WB_TX_LIST_CNT; i++) { - device->txBuffer[i] = (void*)(((uint32)device->txBuffer[0]) + device->txBuffer[i] = (void*)(((addr_t)device->txBuffer[0]) + (i * WB_BUFBYTES)); }