Author: cgutman
Date: Mon Sep 22 23:53:59 2008
New Revision: 36408
URL:
http://svn.reactos.org/svn/reactos?rev=36408&view=rev
Log:
- Add some IRQL checks for ne2000 like those in r36406
Modified:
branches/aicom-network-fixes/drivers/network/dd/ne2000/include/debug.h
branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c
Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
==============================================================================
--- branches/aicom-network-fixes/drivers/network/dd/ne2000/include/debug.h [iso-8859-1]
(original)
+++ branches/aicom-network-fixes/drivers/network/dd/ne2000/include/debug.h [iso-8859-1]
Mon Sep 22 23:53:59 2008
@@ -56,12 +56,14 @@
#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 */
Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
==============================================================================
--- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1]
(original)
+++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Mon
Sep 22 23:53:59 2008
@@ -121,6 +121,8 @@
{
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
+ ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
+
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
#ifndef NOCARD
/* Stop the NIC */
@@ -227,6 +229,8 @@
UINT i;
NDIS_STATUS Status;
PNIC_ADAPTER Adapter;
+
+ ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called (Adapter %X).\n",
MiniportAdapterHandle));
@@ -475,6 +479,8 @@
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 @@
* Status of operation
*/
{
+ ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
+
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
return NDIS_STATUS_FAILURE;
@@ -663,6 +671,8 @@
*/
{
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
+
+ ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MID_TRACE, ("Queueing packet.\n"));
@@ -712,6 +722,8 @@
ULONG GenericULONG;
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));
@@ -821,6 +833,8 @@
UINT RecvStart;
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));