Merge branch 'pr/1'

fischerscode · Jul 3, 2020 · 29fe39f · 29fe39f
2 parents 610ed06 + 179a3b3
commit 29fe39f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 IntelMausi Changelog
 ====================
+
+#### v1.0.3
+- Merged changes from 2.5.1d1
+
 #### v1.0.2b
 - Added WOL functionality
 

diff --git a/IntelMausiEthernet.xcodeproj/project.pbxproj b/IntelMausiEthernet.xcodeproj/project.pbxproj
@@ -256,7 +256,7 @@
 		D3CB5B6C1A4394A800A37FAA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1140;
 				ORGANIZATIONNAME = "Laura Müller";
 			};
 			buildConfigurationList = D3CB5B6F1A4394A800A37FAA /* Build configuration list for PBXProject "IntelMausiEthernet" */;
@@ -462,7 +462,7 @@
 					"$(PROJECT_DIR)/IntelMausiEthernet",
 				);
 				MODULE_NAME = "de.maaeps.IntelMausi-WOL";
-				MODULE_VERSION = 1.0.2;
+				MODULE_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.maaeps.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "IntelMausi-WOL";
 				SDKROOT = macosx;
@@ -489,7 +489,7 @@
 					"$(PROJECT_DIR)/IntelMausiEthernet",
 				);
 				MODULE_NAME = "de.maaeps.IntelMausi-WOL";
-				MODULE_VERSION = 1.0.2;
+				MODULE_VERSION = 1.0.3;
 				PRODUCT_BUNDLE_IDENTIFIER = "de.maaeps.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "IntelMausi-WOL";
 				SDKROOT = macosx;

diff --git a/IntelMausiEthernet/IOEthernetController.h b/IntelMausiEthernet/IOEthernetController.h
@@ -25,6 +25,10 @@
 
 #include <IOKit/network/IONetworkController.h>
 
+#ifndef APPLE_KEXT_DEPRECATE
+#define APPLE_KEXT_DEPRECATE
+#endif
+
 /*! @defined kIOEthernetControllerClass
     @abstract kIOEthernetControllerClass is the name of the
         IOEthernetController class. */

diff --git a/IntelMausiEthernet/IntelMausiEthernet-Info.plist b/IntelMausiEthernet/IntelMausiEthernet-Info.plist
@@ -33,7 +33,7 @@
 			<key>IOClass</key>
 			<string>IntelMausi</string>
 			<key>IOPCIMatch</key>
-			<string>0x10EA8086 0x10EB8086 0x10EF8086 0x10F08086 0x15028086 0x15038086 0x153A8086 0x153B8086 0x155A8086 0x15598086 0x15A08086 0x15A18086 0x15A28086 0x15A38086 0x156F8086 0x15708086 0x15B78086 0x15B88086 0x15D78086 0x15D88086 0x15E38086 0x15D68086 0x15BD8086 0x15BE8086 0x15BB8086 0x15BC8086 0x15DF8086 0x15E08086 0x15E18086 0x15E28086 0x15B98086</string>
+			<string>0x10EA8086 0x10EB8086 0x10EF8086 0x10F08086 0x15028086 0x15038086 0x153A8086 0x153B8086 0x155A8086 0x15598086 0x15A08086 0x15A18086 0x15A28086 0x15A38086 0x156F8086 0x15708086 0x15B78086 0x15B88086 0x15D78086 0x15D88086 0x15E38086 0x15D68086 0x15BD8086 0x15BE8086 0x15BB8086 0x15BC8086 0x15DF8086 0x15E08086 0x15E18086 0x15E28086 0x15B98086 0x0D4E8086 0x0D4F8086 0x0D4C8086 0x0D4D8086 0x0D538086 0x0D558086</string>
 			<key>IOProbeScore</key>
 			<integer>1000</integer>
 			<key>IOProviderClass</key>

diff --git a/IntelMausiEthernet/IntelMausiEthernet.cpp b/IntelMausiEthernet/IntelMausiEthernet.cpp
@@ -90,6 +90,12 @@ static const struct intelDevice deviceTable[] = {
     { .pciDevId = E1000_DEV_ID_PCH_ICP_I219_V8, .device = board_pch_cnp, .deviceName = "I219V8", .deviceInfo = &e1000_pch_cnp_info },
     { .pciDevId = E1000_DEV_ID_PCH_ICP_I219_LM9, .device = board_pch_cnp, .deviceName = "I219LM9", .deviceInfo = &e1000_pch_cnp_info },
     { .pciDevId = E1000_DEV_ID_PCH_ICP_I219_V9, .device = board_pch_cnp, .deviceName = "I219V9", .deviceInfo = &e1000_pch_cnp_info },
+    { .pciDevId = E1000_DEV_ID_PCH_CMP_I219_LM10, .device = board_pch_cnp, .deviceName = "I219LM10", .deviceInfo = &e1000_pch_cnp_info },
+    { .pciDevId = E1000_DEV_ID_PCH_CMP_I219_V10, .device = board_pch_cnp, .deviceName = "I219V10", .deviceInfo = &e1000_pch_cnp_info },
+    { .pciDevId = E1000_DEV_ID_PCH_CMP_I219_LM11, .device = board_pch_cnp, .deviceName = "I219LM11", .deviceInfo = &e1000_pch_cnp_info },
+    { .pciDevId = E1000_DEV_ID_PCH_CMP_I219_V11, .device = board_pch_cnp, .deviceName = "I219V11", .deviceInfo = &e1000_pch_cnp_info },
+    { .pciDevId = E1000_DEV_ID_PCH_CMP_I219_LM12, .device = board_pch_spt, .deviceName = "I219LM12", .deviceInfo = &e1000_pch_spt_info },
+    { .pciDevId = E1000_DEV_ID_PCH_CMP_I219_V12, .device = board_pch_spt, .deviceName = "I219V12", .deviceInfo = &e1000_pch_spt_info },
 
     /* end of table */
     { .pciDevId = 0, .device = 0, .deviceName = NULL, .deviceInfo = NULL }

diff --git a/IntelMausiEthernet/hw.h b/IntelMausiEthernet/hw.h
@@ -104,6 +104,12 @@ struct e1000_hw;
 #define E1000_DEV_ID_PCH_ICP_I219_V8		0x15E0
 #define E1000_DEV_ID_PCH_ICP_I219_LM9		0x15E1
 #define E1000_DEV_ID_PCH_ICP_I219_V9		0x15E2
+#define E1000_DEV_ID_PCH_CMP_I219_LM10		0x0D4E
+#define E1000_DEV_ID_PCH_CMP_I219_V10		0x0D4F
+#define E1000_DEV_ID_PCH_CMP_I219_LM11		0x0D4C
+#define E1000_DEV_ID_PCH_CMP_I219_V11		0x0D4D
+#define E1000_DEV_ID_PCH_CMP_I219_LM12		0x0D53
+#define E1000_DEV_ID_PCH_CMP_I219_V12		0x0D55
 
 #define E1000_REVISION_4	4
 

diff --git a/README.md b/README.md
@@ -51,13 +51,19 @@ A few days before Christmas I started my latest project, a new driver for recent
   - I219V2
   - I219LM2
   - I219LM3
+- 200 Series
+  - I219LM
+  - I219V
+- 300 Series
+  - I219LM
+  - I219V
 
 Key Features of the Driver
 - Support for multisegment packets relieving the network stack of unnecessary copy operations when assembling packets for transmission.
 - No-copy receive and transmit. Only small packets are copied on reception because creating a copy is more efficient than allocating a new buffer.
 - TCP, UDP and IPv4 checksum offload (receive and transmit).
 - Support for TCP/IPv6 and UDP/IPv6 checksum offload.
-- Makes use of the chip's TCP Segmentation Offload (TSO) feature with IPv4 and IPv6 in order to reduce CPU load while sending large amounts of data.
+- Makes use of the chip's TCP Segmentation Offload (TSO) feature with IPv4 and IPv6 in order to reduce CPU load while sending large amounts of data (disabled due to hardware bugs).
 - Fully optimized for Yosemite and Mavericks (64bit architecture) but should work with Mountain Lion and Lion too, provided you build from source with the 10.8 or 10.7 SDK.
 - Support for Energy Efficient Ethernet (EEE).
 - VLAN support is implemented but untested as I have no need for it.