Merge from amd64-branch:

[reactos.git] / reactos / drivers / network / dd / ne2000 / include / ne2000.h

diff --git a/reactos/drivers/network/dd/ne2000/include/ne2000.h b/reactos/drivers/network/dd/ne2000/include/ne2000.h
index 64fc8fb..4c4e28b 100644 (file)
--- a/reactos/drivers/network/dd/ne2000/include/ne2000.h
+++ b/reactos/drivers/network/dd/ne2000/include/ne2000.h
@@ -4,8 +4,8 @@
  * FILE:        include/ne2000.h
  * PURPOSE:     NE2000 driver definitions
  */
-#ifndef __NE2000_H
-#define __NE2000_H
+
+#pragma once
 
 #define NDIS_MINIPORT_DRIVER 1
 #define NDIS_LEGACY_MINIPORT 1
@@ -55,7 +55,8 @@
 /* Interrupt Mask Register value */
 #define DRIVER_INTERRUPT_MASK   IMR_ALLE - IMR_RDCE
 
-
+/* Maximum number of interrupts handled per call to MiniportHandleInterrupt */
+#define INTERRUPT_LIMIT 10
 
 /* Global structures */
 
@@ -79,7 +80,7 @@ typedef struct _NIC_ADAPTER
     NDIS_MINIPORT_INTERRUPT Interrupt;
 
     /* I/O base address and interrupt number of adapter */
-    ULONG IoBaseAddress;
+    ULONG_PTR IoBaseAddress;
     ULONG InterruptLevel;
     ULONG InterruptVector;
     BOOLEAN InterruptShared;
@@ -175,6 +176,7 @@ typedef struct _NIC_ADAPTER
     /* Flags used for driver cleanup */
     BOOLEAN IOPortRangeRegistered;
     BOOLEAN InterruptRegistered;
+    BOOLEAN ShutdownHandlerRegistered;
 } NIC_ADAPTER, *PNIC_ADAPTER;
 
 /* Global driver information */
@@ -220,30 +222,28 @@ VOID NICUpdateCounters(
 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);
 
 VOID NICTransmit(
     PNIC_ADAPTER Adapter);
 
-#endif /* __NE2000_H */
-
 /* EOF */