[ros-diffs] [gvg] 20046: Merge from trunk:

[gvg at svn.reactos.com]

Merge from trunk:
Shut off some debug messages
Modified:
branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac
e.c
Modified:
branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c
Modified:
branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c
  _____  

Modified:
branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac
e.c
---
branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac
e.c	2005-12-10 22:24:51 UTC (rev 20045)
+++
branches/ros-branch-0_2_9/reactos/drivers/lib/oskittcp/oskittcp/interfac
e.c	2005-12-10 22:28:26 UTC (rev 20046)
@@ -140,7 +140,8 @@

 
     *OutLen = 0;
 
-    printf("so->so_state %x\n", ((struct socket
*)connection)->so_state);
+    OS_DbgPrint(OSK_MID_TRACE,
+                ("so->so_state %x\n", ((struct socket
*)connection)->so_state));
 
     if( Flags & OSK_MSG_OOB )      tcp_flags |= MSG_OOB;
     if( Flags & OSK_MSG_DONTWAIT ) tcp_flags |= MSG_DONTWAIT;
  _____  

Modified:
branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c
--- branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c
2005-12-10 22:24:51 UTC (rev 20045)
+++ branches/ros-branch-0_2_9/reactos/drivers/net/ndis/ndis/miniport.c
2005-12-10 22:28:26 UTC (rev 20046)
@@ -377,7 +377,9 @@

 MiniSendResourcesAvailable(
     IN  NDIS_HANDLE MiniportAdapterHandle)
 {
+/*
     UNIMPLEMENTED
+*/
 }
 
 
  _____  

Modified:
branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c
--- branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c
2005-12-10 22:24:51 UTC (rev 20045)
+++ branches/ros-branch-0_2_9/reactos/drivers/net/tcpip/datalink/lan.c
2005-12-10 22:28:26 UTC (rev 20046)
@@ -386,7 +386,8 @@

 	TI_DbgPrint(DEBUG_DATALINK,
 		    ("Work item inserted %x %x\n", &LanWorkItem,
WQItem));
     } else {
-	DbgPrint("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem);
+	TI_DbgPrint(DEBUG_DATALINK,
+                    ("LAN WORKER BUSY %x %x\n", &LanWorkItem, WQItem));
     }
     TcpipReleaseSpinLock( &LanWorkLock, OldIrql );
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051210/6af841f5/attachment.html