--- src/sys/dev/netif/nv/Attic/os.h.patch	2004/08/28 15:08:02	1.1
+++ src/sys/dev/netif/nv/Attic/os.h.patch	2005/04/04 18:45:07	1.2
@@ -1,61 +1,59 @@
 $DragonFly$
 
-diff -u nvnet/os.h nv/os.h
---- nvnet/os.h	2003-05-06 21:39:38.000000000 +0200
-+++ nv/os.h	2004-08-19 18:17:37.000000000 +0200
-@@ -13,9 +13,9 @@
+--- os.h.orig	2005-03-12 10:59:28.000000000 +0100
++++ os.h	2005-04-02 20:33:43.000000000 +0200
+@@ -28,9 +28,9 @@
  
- #define HDO_VERSION_STRING "HDR O: $Revision: 1.1 $";
+ #define HDO_VERSION_STRING "HDR O: $Revision: 1.2 $";
  
 -// This is the maximum packet size that we will be sending
-+/* This is the maximum packet size that we will be sending */
- #define MAX_PACKET_SIZE     2048
+-// #define MAX_PACKET_SIZE     2048
 -//#define RX_BUFFER_SIZE      2048
-+/* #define RX_BUFFER_SIZE      2048 */
++/* This is the maximum packet size that we will be sending */
++/* #define MAX_PACKET_SIZE     2048 */
++/*#define RX_BUFFER_SIZE      2048 */
  
- typedef struct  _MEMORY_BLOCK
- {
-@@ -34,7 +34,7 @@
-     UINT    uiLength;
- 	/* Parameter to OS layer to indicate what type of memory is needed */
- 	USHORT	AllocFlags;
--	USHORT	AlignmentSize; //always power of 2
-+	USHORT	AlignmentSize; /* always power of 2 */
- 	/* Following three fields used for aligned memory allocation */
-     PVOID   pLogicalOrig;
-     ULONG	pPhysicalOrigLow;
-@@ -43,7 +43,7 @@
+ #define MIN_PACKET_MTU_SIZE     576
+ #define MAX_PACKET_MTU_SIZE     9202
+@@ -56,7 +56,7 @@
+     NV_UINT32    uiLength;
+     /* Parameter to OS layer to indicate what type of memory is needed */
+     NV_UINT16    AllocFlags;
+-    NV_UINT16    AlignmentSize; //always power of 2
++    NV_UINT16    AlignmentSize; /*always power of 2 */
+     /* Following three fields used for aligned memory allocation */
+     PNV_VOID   pLogicalOrig;
+     NV_UINT32    pPhysicalOrigLow;
+@@ -65,7 +65,7 @@
  }   MEMORY_BLOCKEX, *PMEMORY_BLOCKEX;
  
  
 -// The typedefs for the OS functions
-+/*  The typedefs for the OS functions */
- typedef int (* PFN_MEMORY_ALLOC) (PVOID pOSCX, PMEMORY_BLOCK pMem);
- typedef int (* PFN_MEMORY_FREE)  (PVOID pOSCX, PMEMORY_BLOCK pMem);
- typedef int (* PFN_MEMORY_ALLOCEX) (PVOID pOSCX, PMEMORY_BLOCKEX pMem);
-@@ -70,14 +70,16 @@
- typedef int (* PFN_LOCK_RELEASE) (PVOID pOSCX, int iLockType, PVOID pvLock);
- typedef PVOID (* PFN_RETURN_BUFFER_VIRTUAL) (PVOID pvContext, PVOID pvADReadData);
++/* The typedefs for the OS functions */
+ typedef NV_API_CALL NV_SINT32 (* PFN_MEMORY_ALLOC) (PNV_VOID pOSCX, PMEMORY_BLOCK pMem);
+ typedef NV_API_CALL NV_SINT32 (* PFN_MEMORY_FREE)  (PNV_VOID pOSCX, PMEMORY_BLOCK pMem);
+ typedef NV_API_CALL NV_SINT32 (* PFN_MEMORY_ALLOCEX) (PNV_VOID pOSCX, PMEMORY_BLOCKEX pMem);
+@@ -92,14 +92,14 @@
+ typedef NV_API_CALL NV_SINT32 (* PFN_LOCK_RELEASE) (PNV_VOID pOSCX, NV_SINT32 iLockType, PNV_VOID pvLock);
+ typedef NV_API_CALL PNV_VOID (* PFN_RETURN_BUFFER_VIRTUAL) (PNV_VOID pvContext, PNV_VOID pvADReadData);
  
 -// Here are the OS functions that those objects below the OS interface
 -// can call up to.
-+/*
-+ * Here are the OS functions that those objects below the OS interface
-+ * can call up to. 
-+ */
++/* Here are the OS functions that those objects below the OS interface
++** can call up to. */
  typedef struct  _OS_API
  {
 -    // OS Context -- this is a parameter to every OS API call
 +    /* OS Context -- this is a parameter to every OS API call */
-     PVOID                       pOSCX;
+     PNV_VOID                       pOSCX;
  
 -    // Basic OS functions
 +    /* Basic OS functions */
      PFN_MEMORY_ALLOC            pfnAllocMemory;
      PFN_MEMORY_FREE             pfnFreeMemory;
      PFN_MEMORY_ALLOCEX          pfnAllocMemoryEx;
-@@ -103,4 +105,4 @@
- 	PFN_RETURN_BUFFER_VIRTUAL	pfnReturnBufferVirtual;
+@@ -125,4 +125,4 @@
+     PFN_RETURN_BUFFER_VIRTUAL    pfnReturnBufferVirtual;
  }   OS_API, *POS_API;
  
 -#endif // _OS_H_