From 9a3de5dbe493ca86f3fe0bcc5fe8b74193981d97 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 14 Jul 2010 11:28:20 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 ++--
 patches/refresh-temp | 67 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 95dba8bc..017e45eb 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 5d9c93467fc482871061c31b325f44eee71ef8c2
-Head: b6531362158408bab6f58737c671e616768135ed
+Previous: b330689a7d0b801771e735d9ec7c16f12ec427f3
+Head: d604aaebc120a065105c8ed5dcf2b4365c5e8db7
 Applied:
   wv-rm-ioctl: f1e558769c5840f4359d9026feae0725a00510e3
   wv-ver: b6531362158408bab6f58737c671e616768135ed
+  refresh-temp: d604aaebc120a065105c8ed5dcf2b4365c5e8db7
 Unapplied:
   wv-mr: 5a79437dac61b5154365b08a64da65b204df88ea
   rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..ad53c913
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,67 @@
+Bottom: 8732b993e8afa75d33d86db2a9aef15df922425e
+Top:    ba702b29fc792d060423ec35b3fe62fb4c1613fd
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-07-14 11:28:16 -0700
+
+Refresh of wv-ver
+
+---
+
+diff --git a/trunk/core/winverbs/user/wv_provider.cpp b/trunk/core/winverbs/user/wv_provider.cpp
+index 65b0c87..48e0fb7 100644
+--- a/trunk/core/winverbs/user/wv_provider.cpp
++++ b/trunk/core/winverbs/user/wv_provider.cpp
+@@ -40,6 +40,7 @@ CWVProvider::CWVProvider()
+ {
+ 	InterlockedIncrement(&WvRef);
+ 	m_hFile = INVALID_HANDLE_VALUE;
++	KernelVersion = WV_KERNEL_VERSION;
+ }
+ 
+ CWVProvider::~CWVProvider()
+@@ -81,6 +82,20 @@ GetFileHandle(void)
+ 	return m_hFile;
+ }
+ 
++/*
++ * Version query was not supported in initial version 1 release.
++ */
++void CWVProvider::
++SetKernelVersion(void)
++{
++	DWORD			bytes;
++
++	if (!WvDeviceIoControl(m_hFile, WV_IOCTL_VERSION_QUERY, NULL, 0,
++						   &KernelVersion, sizeof(KernelVersion), &bytes, NULL)
++		KernelVersion = 1;
++	}
++}
++
+ STDMETHODIMP CWVProvider::
+ QueryDeviceList(NET64* pGuidList, SIZE_T* pBufferSize)
+ {
+diff --git a/trunk/core/winverbs/user/wv_provider.h b/trunk/core/winverbs/user/wv_provider.h
+index 5daa4c7..9e98a2a 100644
+--- a/trunk/core/winverbs/user/wv_provider.h
++++ b/trunk/core/winverbs/user/wv_provider.h
+@@ -91,6 +91,7 @@ public:
+ 			hr = HRESULT_FROM_WIN32(GetLastError());
+ 			goto err2;
+ 		}
++		wv->SetKernelVersion();
+ 		*ppProvider = wv;
+ 		return WV_SUCCESS;
+ 
+@@ -100,6 +101,11 @@ public:
+ 		*ppProvider = NULL;
+ 		return hr;
+ 	}
++
++	UINT64 KernelVersion;
++
++private:
++	void SetKernelVersion();
+ };
+ 
+ #endif // _WV_PROVIDER_H_
+\ No newline at end of file
-- 
2.46.0