Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 17:05:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NDIS]

Browse source 
- Disable timer queuing code (hackfix for various network driver failures)
- Also needs to be merged into 0.3.12

svn path=/trunk/; revision=48968
This commit is contained in:
Cameron Gutman 2010-10-03 15:18:57 +00:00
parent b01fc3d9a7
commit e14624d8ca
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/drivers/network/ndis/ndis/time.c
View file

@ -145,7 +145,7 @@ NdisMCancelTimer(
* - call at IRQL <= DISPATCH_LEVEL
*/
{
KIRQL OldIrql;
//KIRQL OldIrql;
ASSERT_IRQL(DISPATCH_LEVEL);
ASSERT(TimerCancelled);
@ -153,6 +153,7 @@ NdisMCancelTimer(
*TimerCancelled = KeCancelTimer (&Timer->Timer);
#if 0
if (*TimerCancelled)
{
KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);
@ -160,6 +161,7 @@ NdisMCancelTimer(
if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE);
KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
}
#endif
}
VOID NTAPI
@ -170,6 +172,7 @@ MiniTimerDpcFunction(PKDPC Dpc,
{
PNDIS_MINIPORT_TIMER Timer = DeferredContext;
#if 0
/* Only dequeue if the timer has a period of 0 */
if (!Timer->Timer.Period)
{
@ -178,6 +181,7 @@ MiniTimerDpcFunction(PKDPC Dpc,
if (!DequeueMiniportTimer(Timer)) ASSERT(FALSE);
KeReleaseSpinLockFromDpcLevel(&Timer->Miniport->Lock);
}
#endif
Timer->MiniportTimerFunction(Dpc,
Timer->MiniportTimerContext,
@ -240,14 +244,15 @@ NdisMSetPeriodicTimer(
*/
{
LARGE_INTEGER Timeout;
KIRQL OldIrql;
//KIRQL OldIrql;
ASSERT_IRQL(DISPATCH_LEVEL);
ASSERT(Timer);
/* relative delays are negative, absolute are positive; resolution is 100ns */
Timeout.QuadPart = Int32x32To64(MillisecondsPeriod, -10000);
#if 0
/* Lock the miniport block */
KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);
@ -260,6 +265,7 @@ NdisMSetPeriodicTimer(
/* Unlock the miniport block */
KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
#endif
KeSetTimerEx(&Timer->Timer, Timeout, MillisecondsPeriod, &Timer->Dpc);
}
@ -285,7 +291,7 @@ NdisMSetTimer(
*/
{
LARGE_INTEGER Timeout;
KIRQL OldIrql;
//KIRQL OldIrql;
ASSERT_IRQL(DISPATCH_LEVEL);
ASSERT(Timer);
@ -293,6 +299,7 @@ NdisMSetTimer(
/* relative delays are negative, absolute are positive; resolution is 100ns */
Timeout.QuadPart = Int32x32To64(MillisecondsToDelay, -10000);
#if 0
/* Lock the miniport block */
KeAcquireSpinLock(&Timer->Miniport->Lock, &OldIrql);
@ -305,6 +312,7 @@ NdisMSetTimer(
/* Unlock the miniport block */
KeReleaseSpinLock(&Timer->Miniport->Lock, OldIrql);
#endif
KeSetTimer(&Timer->Timer, Timeout, &Timer->Dpc);
}