Staging: hv: remove WAITEVENT typedef

[firefly-linux-kernel-4.4.55.git] / drivers / staging / hv / NetVsc.h

diff --git a/drivers/staging/hv/NetVsc.h b/drivers/staging/hv/NetVsc.h
index e92cfc177facbe7d8467d499f66c5b5924fb7a0e..7636654c252800194c1462c759a2c4f8ed6679e2 100644 (file)
--- a/drivers/staging/hv/NetVsc.h
+++ b/drivers/staging/hv/NetVsc.h
@@ -30,62 +30,62 @@
 #include "include/List.h"
 
 #include "include/NetVscApi.h"
-//
-// #defines
-//
-//#define NVSC_MIN_PROTOCOL_VERSION                       1
-//#define NVSC_MAX_PROTOCOL_VERSION                       1
 
-#define NETVSC_SEND_BUFFER_SIZE                                64*1024 // 64K
+/* #defines */
+
+/* #define NVSC_MIN_PROTOCOL_VERSION                       1 */
+/* #define NVSC_MAX_PROTOCOL_VERSION                       1 */
+
+#define NETVSC_SEND_BUFFER_SIZE                                64*1024 /* 64K */
 #define NETVSC_SEND_BUFFER_ID                          0xface
 
 
-#define NETVSC_RECEIVE_BUFFER_SIZE                     1024*1024 // 1MB
+#define NETVSC_RECEIVE_BUFFER_SIZE                     1024*1024 /* 1MB */
 
 #define NETVSC_RECEIVE_BUFFER_ID                       0xcafe
 
 #define NETVSC_RECEIVE_SG_COUNT                                1
 
-// Preallocated receive packets
+/* Preallocated receive packets */
 #define NETVSC_RECEIVE_PACKETLIST_COUNT                256
 
-//
-// Data types
-//
 
-// Per netvsc channel-specific
-typedef struct _NETVSC_DEVICE {
-       DEVICE_OBJECT                                   *Device;
+/* Data types */
+
+
+/* Per netvsc channel-specific */
+struct NETVSC_DEVICE {
+       struct hv_device *Device;
 
        int                                                             RefCount;
 
        int                                                             NumOutstandingSends;
-       // List of free preallocated NETVSC_PACKET to represent receive packet
+       /* List of free preallocated NETVSC_PACKET to represent receive packet */
        LIST_ENTRY                                              ReceivePacketList;
-       HANDLE                                                  ReceivePacketListLock;
-
-       // Send buffer allocated by us but manages by NetVSP
-       PVOID                                                   SendBuffer;
-       UINT32                                                  SendBufferSize;
-       UINT32                                                  SendBufferGpadlHandle;
-       UINT32                                                  SendSectionSize;
-
-       // Receive buffer allocated by us but manages by NetVSP
-       PVOID                                                   ReceiveBuffer;
-       UINT32                                                  ReceiveBufferSize;
-       UINT32                                                  ReceiveBufferGpadlHandle;
-       UINT32                                                  ReceiveSectionCount;
+       spinlock_t receive_packet_list_lock;
+
+       /* Send buffer allocated by us but manages by NetVSP */
+       void *                                                  SendBuffer;
+       u32                                                     SendBufferSize;
+       u32                                                     SendBufferGpadlHandle;
+       u32                                                     SendSectionSize;
+
+       /* Receive buffer allocated by us but manages by NetVSP */
+       void *                                                  ReceiveBuffer;
+       u32                                                     ReceiveBufferSize;
+       u32                                                     ReceiveBufferGpadlHandle;
+       u32                                                     ReceiveSectionCount;
        PNVSP_1_RECEIVE_BUFFER_SECTION  ReceiveSections;
 
-       // Used for NetVSP initialization protocol
-       HANDLE                                                  ChannelInitEvent;
+       /* Used for NetVSP initialization protocol */
+       struct osd_waitevent *ChannelInitEvent;
        NVSP_MESSAGE                                    ChannelInitPacket;
 
        NVSP_MESSAGE                                    RevokePacket;
-       //UCHAR                                                 HwMacAddr[HW_MACADDR_LEN];
+       /* unsigned char                                                        HwMacAddr[HW_MACADDR_LEN]; */
 
-       // Holds rndis device info
+       /* Holds rndis device info */
        void                                                    *Extension;
-} NETVSC_DEVICE;
+};
 
-#endif // _NETVSC_H_
+#endif /* _NETVSC_H_ */