- Add some IRQL checks for ne2000 like those in r36406

svn path=/branches/aicom-network-fixes/; revision=36408

diff --git a/drivers/network/dd/ne2000/include/debug.h b/drivers/network/dd/ne2000/include/debug.h
index 168bc3b..dbf5e87 100644 (file)
--- a/drivers/network/dd/ne2000/include/debug.h
+++ b/drivers/network/dd/ne2000/include/debug.h
@@ -56,12 +56,14 @@ extern ULONG DebugTraceLevel;
 #endif /* NASSERT */
 #endif
 #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x))
+#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x))
 
 #else /* DBG */
 
 #define NDIS_DbgPrint(_t_, _x_)
 
 #define ASSERT_IRQL(x)
+#define ASSERT_IRQL_EQUAL(x)
 /* #define ASSERT(x) */  /* ndis.h */
 
 #endif /* DBG */

diff --git a/drivers/network/dd/ne2000/ne2000/main.c b/drivers/network/dd/ne2000/ne2000/main.c
index 603d9f4..dca4563 100644 (file)
--- a/drivers/network/dd/ne2000/ne2000/main.c
+++ b/drivers/network/dd/ne2000/ne2000/main.c
@@ -121,6 +121,8 @@ static VOID STDCALL MiniportHalt(
 {
     PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
 
+    ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
+
     NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 #ifndef NOCARD
     /* Stop the NIC */
@@ -228,6 +230,8 @@ static NDIS_STATUS STDCALL MiniportInitialize(
     NDIS_STATUS Status;
     PNIC_ADAPTER Adapter;
 
+    ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
+
     NDIS_DbgPrint(MAX_TRACE, ("Called (Adapter %X).\n", MiniportAdapterHandle));
 
     /* Search for 802.3 media which is the only one we support */
@@ -475,6 +479,8 @@ static NDIS_STATUS STDCALL MiniportQueryInformation(
     NDIS_MEDIUM Medium   = NdisMedium802_3;
     PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
 
+    ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
+
     NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid));
 
     Status   = NDIS_STATUS_SUCCESS;
@@ -641,6 +647,8 @@ static NDIS_STATUS STDCALL MiniportReset(
  *     Status of operation
  */
 {
+    ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
+
     NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 
     return NDIS_STATUS_FAILURE;
@@ -664,6 +672,8 @@ static NDIS_STATUS STDCALL MiniportSend(
 {
     PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
 
+    ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
+
     NDIS_DbgPrint(MID_TRACE, ("Queueing packet.\n"));
 
 #ifdef NOCARD
@@ -713,6 +723,8 @@ static NDIS_STATUS STDCALL MiniportSetInformation(
     NDIS_STATUS Status   = NDIS_STATUS_SUCCESS;
     PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
 
+    ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
+
     NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid));
 
     switch (Oid) {
@@ -822,6 +834,8 @@ static NDIS_STATUS STDCALL MiniportTransferData(
     UINT RecvStop;
     PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
 
+    ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
+
     NDIS_DbgPrint(MAX_TRACE, ("Called. Packet (0x%X)  ByteOffset (0x%X)  BytesToTransfer (%d).\n",
         Packet, ByteOffset, BytesToTransfer));