summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorjiaojinxing <jiaojinxing1987@gmail.com>2014-11-04 06:44:42 (GMT)
committer jiaojinxing <jiaojinxing1987@gmail.com>2014-11-04 06:44:42 (GMT)
commit3a1527e9882cba8f06a8a0fa9b8736ffa35a27bb (patch)
tree7f60140e795df967a7451f5299abdeb8fed8da96
parente2744e65f8bc3c9de98b017917fe1c9f402c6190 (diff)
downloadqemu-mini2440-3a1527e9882cba8f06a8a0fa9b8736ffa35a27bb.zip
qemu-mini2440-3a1527e9882cba8f06a8a0fa9b8736ffa35a27bb.tar.gz
qemu-mini2440-3a1527e9882cba8f06a8a0fa9b8736ffa35a27bb.tar.bz2
Fix virtual net card driver BUG on 32bit system.
-rw-r--r--addtap.bat11
-rw-r--r--deltapall.bat8
-rw-r--r--x64/OemWin2k.inf (renamed from OemWin2k.inf)0
-rw-r--r--x64/tap0901.cat (renamed from tap0901.cat)bin7836 -> 7836 bytes
-rw-r--r--x64/tap0901.sys (renamed from tap0901.sys)bin31232 -> 31232 bytes
-rw-r--r--x64/tapinstall.exe (renamed from tapinstall.exe)bin81920 -> 81920 bytes
-rw-r--r--x86/OemWin2k.inf189
-rw-r--r--x86/tap0901.catbin0 -> 7839 bytes
-rw-r--r--x86/tap0901.sysbin0 -> 26624 bytes
-rw-r--r--x86/tapinstall.exebin0 -> 77824 bytes
10 files changed, 207 insertions, 1 deletions
diff --git a/addtap.bat b/addtap.bat
index 5f405b7..9897809 100644
--- a/addtap.bat
+++ b/addtap.bat
@@ -1,3 +1,12 @@
rem Add a new TAP virtual ethernet adapter
+
+@echo off
+if /i %PROCESSOR_ARCHITECTURE% == x86 (
+ cd x86
+) else (
+ cd x64
+)
+
"tapinstall.exe" install "OemWin2k.inf" tap0901
-pause
+
+pause \ No newline at end of file
diff --git a/deltapall.bat b/deltapall.bat
index 6610ee9..b256325 100644
--- a/deltapall.bat
+++ b/deltapall.bat
@@ -1,4 +1,12 @@
echo WARNING: this script will delete ALL TAP virtual adapters (use the device manager to delete adapters one at a time)
pause
+
+@echo off
+if /i %PROCESSOR_ARCHITECTURE% == x86 (
+ cd x86
+) else (
+ cd x64
+)
+
"tapinstall.exe" remove tap0901
pause
diff --git a/OemWin2k.inf b/x64/OemWin2k.inf
index 2082089..2082089 100644
--- a/OemWin2k.inf
+++ b/x64/OemWin2k.inf
diff --git a/tap0901.cat b/x64/tap0901.cat
index 6d5fc8b..6d5fc8b 100644
--- a/tap0901.cat
+++ b/x64/tap0901.cat
Binary files differ
diff --git a/tap0901.sys b/x64/tap0901.sys
index 2dd6500..2dd6500 100644
--- a/tap0901.sys
+++ b/x64/tap0901.sys
Binary files differ
diff --git a/tapinstall.exe b/x64/tapinstall.exe
index 3386389..3386389 100644
--- a/tapinstall.exe
+++ b/x64/tapinstall.exe
Binary files differ
diff --git a/x86/OemWin2k.inf b/x86/OemWin2k.inf
new file mode 100644
index 0000000..2ea67ab
--- /dev/null
+++ b/x86/OemWin2k.inf
@@ -0,0 +1,189 @@
+; Automatically generated by OpenVPN Windows build system
+
+; ****************************************************************************
+; * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. *
+; * This program is free software; you can redistribute it and/or modify *
+; * it under the terms of the GNU General Public License version 2 *
+; * as published by the Free Software Foundation. *
+; ****************************************************************************
+
+; SYNTAX CHECKER
+; cd \WINDDK\3790\tools\chkinf
+; chkinf c:\src\openvpn\tap-win32\i386\oemwin2k.inf
+; OUTPUT -> file:///c:/WINDDK/3790/tools/chkinf/htm/c%23+src+openvpn+tap-win32+i386+__OemWin2k.htm
+
+; INSTALL/REMOVE DRIVER
+; tapinstall install OemWin2k.inf TAP0901
+; tapinstall update OemWin2k.inf TAP0901
+; tapinstall remove TAP0901
+
+;*********************************************************
+; Note to Developers:
+;
+; If you are bundling the TAP-Win32 driver with your app,
+; you should try to rename it in such a way that it will
+; not collide with other instances of TAP-Win32 defined
+; by other apps. Multiple versions of the TAP-Win32
+; driver, each installed by different apps, can coexist
+; on the same machine if you follow these guidelines.
+; NOTE: these instructions assume you are editing the
+; generated OemWin2k.inf file, not the source
+; OemWin2k.inf.in file which is preprocessed by winconfig
+; and uses macro definitions from settings.in.
+;
+; (1) Rename all tapXXXX instances in this file to
+; something different (use at least 5 characters
+; for this name!)
+; (2) Change the "!define TAP" definition in openvpn.nsi
+; to match what you changed tapXXXX to.
+; (3) Change TARGETNAME in SOURCES to match what you
+; changed tapXXXX to.
+; (4) Change TAP_COMPONENT_ID in common.h to match what
+; you changed tapXXXX to.
+; (5) Change SZDEPENDENCIES in service.h to match what
+; you changed tapXXXX to.
+; (6) Change DeviceDescription and Provider strings.
+; (7) Change PRODUCT_STRING in constants.h to what you
+; set DeviceDescription to.
+;
+;*********************************************************
+
+[Version]
+ Signature = "$Windows NT$"
+ CatalogFile = tap0901.cat
+ ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}
+ Provider = %Provider%
+ Class = Net
+
+; This version number should match the version
+; number given in SOURCES.
+ DriverVer=04/19/2010,9.00.00.8
+
+[Strings]
+ DeviceDescription = "TAP-Win32 Adapter V9"
+ Provider = "TAP-Win32 Provider V9"
+
+;----------------------------------------------------------------
+; Manufacturer + Product Section (Done)
+;----------------------------------------------------------------
+[Manufacturer]
+ %Provider% = tap0901
+
+[tap0901]
+ %DeviceDescription% = tap0901.ndi, tap0901
+
+;---------------------------------------------------------------
+; Driver Section (Done)
+;---------------------------------------------------------------
+
+;----------------- Characteristics ------------
+; NCF_PHYSICAL = 0x04
+; NCF_VIRTUAL = 0x01
+; NCF_SOFTWARE_ENUMERATED = 0x02
+; NCF_HIDDEN = 0x08
+; NCF_NO_SERVICE = 0x10
+; NCF_HAS_UI = 0x80
+;----------------- Characteristics ------------
+
+[tap0901.ndi]
+ CopyFiles = tap0901.driver, tap0901.files
+ AddReg = tap0901.reg
+ AddReg = tap0901.params.reg
+ Characteristics = 0x81
+
+[tap0901.ndi.Services]
+ AddService = tap0901, 2, tap0901.service
+
+[tap0901.reg]
+ HKR, Ndi, Service, 0, "tap0901"
+ HKR, Ndi\Interfaces, UpperRange, 0, "ndis5"
+ HKR, Ndi\Interfaces, LowerRange, 0, "ethernet"
+ HKR, , Manufacturer, 0, "%Provider%"
+ HKR, , ProductName, 0, "%DeviceDescription%"
+
+[tap0901.params.reg]
+ HKR, Ndi\params\MTU, ParamDesc, 0, "MTU"
+ HKR, Ndi\params\MTU, Type, 0, "int"
+ HKR, Ndi\params\MTU, Default, 0, "1500"
+ HKR, Ndi\params\MTU, Optional, 0, "0"
+ HKR, Ndi\params\MTU, Min, 0, "100"
+ HKR, Ndi\params\MTU, Max, 0, "1500"
+ HKR, Ndi\params\MTU, Step, 0, "1"
+ HKR, Ndi\params\MediaStatus, ParamDesc, 0, "Media Status"
+ HKR, Ndi\params\MediaStatus, Type, 0, "enum"
+ HKR, Ndi\params\MediaStatus, Default, 0, "0"
+ HKR, Ndi\params\MediaStatus, Optional, 0, "0"
+ HKR, Ndi\params\MediaStatus\enum, "0", 0, "Application Controlled"
+ HKR, Ndi\params\MediaStatus\enum, "1", 0, "Always Connected"
+ HKR, Ndi\params\MAC, ParamDesc, 0, "MAC Address"
+ HKR, Ndi\params\MAC, Type, 0, "edit"
+ HKR, Ndi\params\MAC, Optional, 0, "1"
+ HKR, Ndi\params\AllowNonAdmin, ParamDesc, 0, "Non-Admin Access"
+ HKR, Ndi\params\AllowNonAdmin, Type, 0, "enum"
+ HKR, Ndi\params\AllowNonAdmin, Default, 0, "1"
+ HKR, Ndi\params\AllowNonAdmin, Optional, 0, "0"
+ HKR, Ndi\params\AllowNonAdmin\enum, "0", 0, "Not Allowed"
+ HKR, Ndi\params\AllowNonAdmin\enum, "1", 0, "Allowed"
+
+;----------------------------------------------------------------
+; Service Section
+;----------------------------------------------------------------
+
+;---------- Service Type -------------
+; SERVICE_KERNEL_DRIVER = 0x01
+; SERVICE_WIN32_OWN_PROCESS = 0x10
+;---------- Service Type -------------
+
+;---------- Start Mode ---------------
+; SERVICE_BOOT_START = 0x0
+; SERVICE_SYSTEM_START = 0x1
+; SERVICE_AUTO_START = 0x2
+; SERVICE_DEMAND_START = 0x3
+; SERVICE_DISABLED = 0x4
+;---------- Start Mode ---------------
+
+[tap0901.service]
+ DisplayName = %DeviceDescription%
+ ServiceType = 1
+ StartType = 3
+ ErrorControl = 1
+ LoadOrderGroup = NDIS
+ ServiceBinary = %12%\tap0901.sys
+
+;-----------------------------------------------------------------
+; File Installation
+;-----------------------------------------------------------------
+
+;----------------- Copy Flags ------------
+; COPYFLG_NOSKIP = 0x02
+; COPYFLG_NOVERSIONCHECK = 0x04
+;----------------- Copy Flags ------------
+
+; SourceDisksNames
+; diskid = description[, [tagfile] [, <unused>, subdir]]
+; 1 = "Intel Driver Disk 1",e100bex.sys,,
+
+[SourceDisksNames]
+ 1 = %DeviceDescription%, tap0901.sys
+
+; SourceDisksFiles
+; filename_on_source = diskID[, [subdir][, size]]
+; e100bex.sys = 1,, ; on distribution disk 1
+
+[SourceDisksFiles]
+tap0901.sys = 1
+
+[DestinationDirs]
+ tap0901.files = 11
+ tap0901.driver = 12
+
+[tap0901.files]
+; TapPanel.cpl,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
+; cipsrvr.exe,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
+
+[tap0901.driver]
+ tap0901.sys,,,6 ; COPYFLG_NOSKIP | COPYFLG_NOVERSIONCHECK
+
+;---------------------------------------------------------------
+; End
+;---------------------------------------------------------------
diff --git a/x86/tap0901.cat b/x86/tap0901.cat
new file mode 100644
index 0000000..f0e1c5b
--- /dev/null
+++ b/x86/tap0901.cat
Binary files differ
diff --git a/x86/tap0901.sys b/x86/tap0901.sys
new file mode 100644
index 0000000..6f7a062
--- /dev/null
+++ b/x86/tap0901.sys
Binary files differ
diff --git a/x86/tapinstall.exe b/x86/tapinstall.exe
new file mode 100644
index 0000000..8934aeb
--- /dev/null
+++ b/x86/tapinstall.exe
Binary files differ