[ros-diffs] [sginsberg] 36951: - Fix ne2000 compilation (treat pointer size as ULONG_PTR, correct function prototypes)

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Sat Oct 25 11:12:03 2008
New Revision: 36951

URL: http://svn.reactos.org/svn/reactos?rev=36951&view=rev
Log:
- Fix ne2000 compilation (treat pointer size as ULONG_PTR, correct function prototypes)

Modified:
    branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/include/ne2000.h
    branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/8390.c

Modified: branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/include/ne2000.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/include/ne2000.h?rev=36951&r1=36950&r2=36951&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/include/ne2000.h [iso-8859-1] Sat Oct 25 11:12:03 2008
@@ -79,7 +79,7 @@
     NDIS_MINIPORT_INTERRUPT Interrupt;
 
     /* I/O base address and interrupt number of adapter */
-    ULONG IoBaseAddress;
+    ULONG_PTR IoBaseAddress;
     ULONG InterruptLevel;
     ULONG InterruptVector;
     BOOLEAN InterruptShared;
@@ -221,24 +221,24 @@
 VOID NICReadDataAlign(
     PNIC_ADAPTER Adapter,
     PUSHORT Target,
-    ULONG Source,
+    ULONG_PTR Source,
     USHORT Length);
 
 VOID NICWriteDataAlign(
     PNIC_ADAPTER Adapter,
-    ULONG Target,
+    ULONG_PTR Target,
     PUSHORT Source,
     USHORT Length);
 
 VOID NICReadData(
     PNIC_ADAPTER Adapter,
     PUCHAR Target,
-    ULONG Source,
+    ULONG_PTR Source,
     USHORT Length);
 
 VOID NICWriteData(
     PNIC_ADAPTER Adapter,
-    ULONG Target,
+    ULONG_PTR Target,
     PUCHAR Source,
     USHORT Length);
 

Modified: branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/8390.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/8390.c?rev=36951&r1=36950&r2=36951&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Sat Oct 25 11:12:03 2008
@@ -11,10 +11,10 @@
 #include <debug.h>
 
 /* Null-terminated array of ports to probe. This is "semi-risky" (Don Becker).  */
-ULONG ProbeAddressList[] = { 0x280, 0x300, 0x320, 0x340, 0x360, 0x380, 0 };
+ULONG_PTR ProbeAddressList[] = { 0x280, 0x300, 0x320, 0x340, 0x360, 0x380, 0 };
 
 static BOOLEAN ProbeAddressForNIC(
-    ULONG address)
+    ULONG_PTR address)
 /*
  * FUNCTION: Probes an address for a NIC
  * ARGUMENTS:
@@ -129,7 +129,7 @@
  *     Start at 1KB and test for every 1KB up to 64KB
  */
 {
-    ULONG Base;
+    ULONG_PTR Base;
 
     NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));