Merge pull request #83 from jwise/mikhailai_refactor2

Refactoring for New USB API in El Capitan and later + improvements
jwise · Jul 9, 2018 · 1670dd5 · 1670dd5
2 parents b0c18ac + 41476f0
commit 1670dd5
Show file tree

Hide file tree

Showing 15 changed files with 1,159 additions and 1,462 deletions.
diff --git a/HoRNDIS-Info.plist b/HoRNDIS-Info.plist
@@ -11,96 +11,51 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.joshuawise.kexts.HoRNDIS</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>8.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>$(MODULE_VERSION)</string>
 	<key>IOKitPersonalities</key>
 	<dict>
-		<key>MicroDriverDevice3</key>
+		<key>RNDISControlInterface</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.joshuawise.kexts.HoRNDIS</string>
 			<key>IOClass</key>
-			<string>HoRNDISUSBDevice</string>
+			<string>HoRNDIS</string>
 			<key>IOProviderClass</key>
-			<string>IOUSBDevice</string>
-			<key>bDeviceClass</key>
-			<integer>2</integer>
-			<key>bDeviceSubClass</key>
-			<integer>0</integer>
-			<key>bDeviceProtocol</key>
-			<integer>0</integer>
-		</dict>
-		<key>HoRNDISDevice2</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.joshuawise.kexts.HoRNDIS</string>
-			<key>IOClass</key>
-			<string>HoRNDISUSBDevice</string>
-			<key>IOProviderClass</key>
-			<string>IOUSBDevice</string>
-			<key>bDeviceClass</key>
-			<integer>239</integer>
-			<key>bDeviceSubClass</key>
-			<integer>2</integer>
-			<key>bDeviceProtocol</key>
-			<integer>1</integer>
-		</dict>
-		<key>HoRNDISDevice</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.joshuawise.kexts.HoRNDIS</string>
-			<key>IOClass</key>
-			<string>HoRNDISUSBDevice</string>
-			<key>IOProviderClass</key>
-			<string>IOUSBDevice</string>
-			<key>bDeviceClass</key>
+			<string>IOUSBHostInterface</string>
+			<key>bInterfaceClass</key>
 			<integer>224</integer>
-			<key>bDeviceSubClass</key>
-			<integer>0</integer>
-			<key>bDeviceProtocol</key>
-			<integer>0</integer>
-		</dict>
-		<key>HoRNDISDeviceComposite</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.joshuawise.kexts.HoRNDIS</string>
-			<key>IOClass</key>
-			<string>HoRNDISUSBDevice</string>
-			<key>IOProviderClass</key>
-			<string>IOUSBDevice</string>
-			<key>bDeviceClass</key>
-			<integer>0</integer>
-			<key>bDeviceSubClass</key>
-			<integer>0</integer>
-			<key>bDeviceProtocol</key>
-			<integer>0</integer>
+			<key>bInterfaceSubClass</key>
+			<integer>1</integer>
+			<key>bInterfaceProtocol</key>
+			<integer>3</integer>
 		</dict>
 	</dict>
 	<key>OSBundleLibraries</key>
 	<dict>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0</string>
 		<key>com.apple.iokit.IONetworkingFamily</key>
-		<string>1.1</string>
-		<key>com.apple.iokit.IOUSBFamily</key>
-		<string>1.8</string>
+		<string>3.2</string>
+		<key>com.apple.iokit.IOUSBHostFamily</key>
+		<string>1.0.1</string>
+		<key>com.apple.kpi.bsd</key>
+		<string>15.0</string>
+		<key>com.apple.kpi.iokit</key>
+		<string>15.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>15.0</string>
+		<key>com.apple.kpi.mach</key>
+		<string>15.0</string>
+		<key>com.apple.kpi.unsupported</key>
+		<string>15.0</string>
 	</dict>
 </dict>
 </plist>