Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-04 02:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Add some IRQL checks for ne2000 like those in r36406

Browse source 
svn path=/branches/aicom-network-fixes/; revision=36408
This commit is contained in:
Cameron Gutman 2008-09-23 04:53:59 +00:00
parent 751bd9fb71
commit 521d849d25
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/network/dd/ne2000/include/debug.h
View file

@ -56,12 +56,14 @@ extern ULONG DebugTraceLevel;
#endif /* NASSERT */ #endif /* NASSERT */
#endif #endif
#define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x))
#define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x))
#else /* DBG */ #else /* DBG */
#define NDIS_DbgPrint(_t_, _x_) #define NDIS_DbgPrint(_t_, _x_)
#define ASSERT_IRQL(x) #define ASSERT_IRQL(x)
#define ASSERT_IRQL_EQUAL(x)
/* #define ASSERT(x) */ /* ndis.h */ /* #define ASSERT(x) */ /* ndis.h */
#endif /* DBG */ #endif /* DBG */

14
drivers/network/dd/ne2000/ne2000/main.c
View file

@ -121,6 +121,8 @@ static VOID STDCALL MiniportHalt(
{ {
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
#ifndef NOCARD #ifndef NOCARD
/* Stop the NIC */ /* Stop the NIC */
@ -228,6 +230,8 @@ static NDIS_STATUS STDCALL MiniportInitialize(
NDIS_STATUS Status; NDIS_STATUS Status;
PNIC_ADAPTER Adapter; PNIC_ADAPTER Adapter;
ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called (Adapter %X).\n", MiniportAdapterHandle)); NDIS_DbgPrint(MAX_TRACE, ("Called (Adapter %X).\n", MiniportAdapterHandle));
/* Search for 802.3 media which is the only one we support */ /* 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; NDIS_MEDIUM Medium = NdisMedium802_3;
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid));
Status = NDIS_STATUS_SUCCESS; Status = NDIS_STATUS_SUCCESS;
@ -641,6 +647,8 @@ static NDIS_STATUS STDCALL MiniportReset(
* Status of operation * Status of operation
*/ */
{ {
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
return NDIS_STATUS_FAILURE; return NDIS_STATUS_FAILURE;
@ -664,6 +672,8 @@ static NDIS_STATUS STDCALL MiniportSend(
{ {
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MID_TRACE, ("Queueing packet.\n")); NDIS_DbgPrint(MID_TRACE, ("Queueing packet.\n"));
#ifdef NOCARD #ifdef NOCARD
@ -713,6 +723,8 @@ static NDIS_STATUS STDCALL MiniportSetInformation(
NDIS_STATUS Status = NDIS_STATUS_SUCCESS; NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext;
ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid));
switch (Oid) { switch (Oid) {
@ -822,6 +834,8 @@ static NDIS_STATUS STDCALL MiniportTransferData(
UINT RecvStop; UINT RecvStop;
PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; 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", NDIS_DbgPrint(MAX_TRACE, ("Called. Packet (0x%X) ByteOffset (0x%X) BytesToTransfer (%d).\n",
Packet, ByteOffset, BytesToTransfer)); Packet, ByteOffset, BytesToTransfer));