Author: cgutman
Date: Fri Jan 8 19:36:59 2010
New Revision: 45007
URL: http://svn.reactos.org/svn/reactos?rev=45007&view=rev
Log:
- Remove some incorrect IRQL checks (needed for the NDIS fixes coming soon)
- Change some NdisDprAcquireSpinLock/NdisDprReleaseSpinLock calls to
NdisAcquireSpinLock/NdisReleaseSpinLock
Modified:
branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c
branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c
branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c
Modified: branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c?rev=45007&r1=45006&r2=45007&view=diff
==============================================================================
--- branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c
[iso-8859-1] (original)
+++ branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c
[iso-8859-1] Fri Jan 8 19:36:59 2010
@@ -501,8 +501,6 @@
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;
@@ -671,8 +669,6 @@
{
NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS;
- ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
-
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
#ifndef NOCARD
@@ -751,8 +747,6 @@
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));
@@ -862,8 +856,6 @@
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));
Modified: branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c?rev=45007&r1=45006&r2=45007&view=diff
==============================================================================
--- branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c [iso-8859-1]
(original)
+++ branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c [iso-8859-1]
Fri Jan 8 19:36:59 2010
@@ -1101,8 +1101,6 @@
{
DPRINT("Called\n");
- ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
-
/* MiniportReset doesn't do anything at the moment... perhaps this should be
fixed. */
*AddressingReset = FALSE;
Modified: branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c?rev=45007&r1=45006&r2=45007&view=diff
==============================================================================
--- branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c
[iso-8859-1] (original)
+++ branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c
[iso-8859-1] Fri Jan 8 19:36:59 2010
@@ -118,11 +118,9 @@
DPRINT("Called. OID 0x%x\n", Oid);
- ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
-
ASSERT(Adapter);
- NdisDprAcquireSpinLock(&Adapter->Lock);
+ NdisAcquireSpinLock(&Adapter->Lock);
Status = NDIS_STATUS_SUCCESS;
CopyFrom = (PVOID)&GenericULONG;
@@ -369,7 +367,7 @@
*BytesNeeded = 0;
}
- NdisDprReleaseSpinLock(&Adapter->Lock);
+ NdisReleaseSpinLock(&Adapter->Lock);
DPRINT("Leaving. Status is 0x%x\n", Status);
@@ -408,11 +406,9 @@
ASSERT(Adapter);
- ASSERT_IRQL_EQUAL(DISPATCH_LEVEL);
-
DPRINT("Called, OID 0x%x\n", Oid);
- NdisDprAcquireSpinLock(&Adapter->Lock);
+ NdisAcquireSpinLock(&Adapter->Lock);
switch (Oid)
{
@@ -511,7 +507,7 @@
*BytesNeeded = 0;
}
- NdisDprReleaseSpinLock(&Adapter->Lock);
+ NdisReleaseSpinLock(&Adapter->Lock);
DPRINT("Leaving. Status (0x%X).\n", Status);
