xnu-344.34.tar.gz

diff --git a/bsd/conf/version.minor b/bsd/conf/version.minor
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/bsd/conf/version.minor
+++ b/bsd/conf/version.minor
@@ -1 +1 @@
-5
+6

diff --git a/bsd/netinet/tcp_input.c b/bsd/netinet/tcp_input.c
index 74493fdb740ded65aa26b04a76e5748172ecf82c..b3b12b6f558a7f2a87c48929f3124551a42e3e40 100644 (file)
--- a/bsd/netinet/tcp_input.c
+++ b/bsd/netinet/tcp_input.c
@@ -466,7 +466,7 @@ tcp_input(m, off0)
                }
        } else
 #endif /* INET6 */
                }
        } else
 #endif /* INET6 */

-      {
+       {

        /*
         * Get IP and TCP header together in first mbuf.
         * Note: IP leaves IP header in first mbuf.
        /*
         * Get IP and TCP header together in first mbuf.
         * Note: IP leaves IP header in first mbuf.


@@ -496,10 +496,20 @@ tcp_input(m, off0)
        if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) {
                if (apple_hwcksum_rx && (m->m_pkthdr.csum_flags & CSUM_TCP_SUM16)) {
                        u_short pseudo;
        if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) {
                if (apple_hwcksum_rx && (m->m_pkthdr.csum_flags & CSUM_TCP_SUM16)) {
                        u_short pseudo;

+                       char b[9];
+                       *(uint32_t*)&b[0] = *(uint32_t*)&ipov->ih_x1[0];
+                       *(uint32_t*)&b[4] = *(uint32_t*)&ipov->ih_x1[4];
+                       *(uint8_t*)&b[8] = *(uint8_t*)&ipov->ih_x1[8];
+                       

                        bzero(ipov->ih_x1, sizeof(ipov->ih_x1));
                        ipov->ih_len = (u_short)tlen;
                        HTONS(ipov->ih_len);
                        pseudo = in_cksum(m, sizeof (struct ip));
                        bzero(ipov->ih_x1, sizeof(ipov->ih_x1));
                        ipov->ih_len = (u_short)tlen;
                        HTONS(ipov->ih_len);
                        pseudo = in_cksum(m, sizeof (struct ip));

+                       
+                       *(uint32_t*)&ipov->ih_x1[0] = *(uint32_t*)&b[0];
+                       *(uint32_t*)&ipov->ih_x1[4] = *(uint32_t*)&b[4];
+                       *(uint8_t*)&ipov->ih_x1[8] = *(uint8_t*)&b[8];
+                       

                        th->th_sum = in_addword(pseudo, (m->m_pkthdr.csum_data & 0xFFFF));
                } else {
                        if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
                        th->th_sum = in_addword(pseudo, (m->m_pkthdr.csum_data & 0xFFFF));
                } else {
                        if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)


@@ -511,14 +521,23 @@ tcp_input(m, off0)
                }
                th->th_sum ^= 0xffff;
        } else {
                }
                th->th_sum ^= 0xffff;
        } else {

+               char b[9];

                /*
                 * Checksum extended TCP header and data.
                 */
                /*
                 * Checksum extended TCP header and data.
                 */

+               *(uint32_t*)&b[0] = *(uint32_t*)&ipov->ih_x1[0];
+               *(uint32_t*)&b[4] = *(uint32_t*)&ipov->ih_x1[4];
+               *(uint8_t*)&b[8] = *(uint8_t*)&ipov->ih_x1[8];
+               

                len = sizeof (struct ip) + tlen;
                bzero(ipov->ih_x1, sizeof(ipov->ih_x1));
                ipov->ih_len = (u_short)tlen;
                HTONS(ipov->ih_len);
                th->th_sum = in_cksum(m, len);
                len = sizeof (struct ip) + tlen;
                bzero(ipov->ih_x1, sizeof(ipov->ih_x1));
                ipov->ih_len = (u_short)tlen;
                HTONS(ipov->ih_len);
                th->th_sum = in_cksum(m, len);

+               
+               *(uint32_t*)&ipov->ih_x1[0] = *(uint32_t*)&b[0];
+               *(uint32_t*)&ipov->ih_x1[4] = *(uint32_t*)&b[4];
+               *(uint8_t*)&ipov->ih_x1[8] = *(uint8_t*)&b[8];

        }
        if (th->th_sum) {
                tcpstat.tcps_rcvbadsum++;
        }
        if (th->th_sum) {
                tcpstat.tcps_rcvbadsum++;


@@ -528,7 +547,7 @@ tcp_input(m, off0)
        /* Re-initialization for later version check */
        ip->ip_v = IPVERSION;
 #endif
        /* Re-initialization for later version check */
        ip->ip_v = IPVERSION;
 #endif

-      }
+       }

 
        /*
         * Check that TCP offset makes sense,
 
        /*
         * Check that TCP offset makes sense,

diff --git a/bsd/netinet/udp_usrreq.c b/bsd/netinet/udp_usrreq.c
index 4dde880cef51ad2fb5cddd37526c2f0ecf9c51a1..31ee4fb845d6eea68490defbbe8125e43e67cb39 100644 (file)
--- a/bsd/netinet/udp_usrreq.c
+++ b/bsd/netinet/udp_usrreq.c
@@ -289,17 +289,26 @@ udp_input(m, iphlen)
         * Checksum extended UDP header and data.
         */
        if (uh->uh_sum) {
         * Checksum extended UDP header and data.
         */
        if (uh->uh_sum) {

-               if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) {
-                        if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
-                                uh->uh_sum = m->m_pkthdr.csum_data;
-                        else
-                           goto doudpcksum;
-                      uh->uh_sum ^= 0xffff;
-                } else {
+               if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) {
+                       if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
+                               uh->uh_sum = m->m_pkthdr.csum_data;
+                       else
+                               goto doudpcksum;
+                       uh->uh_sum ^= 0xffff;
+               } else {
+                       char b[9];

 doudpcksum:
 doudpcksum:

+                       *(uint32_t*)&b[0] = *(uint32_t*)&((struct ipovly *)ip)->ih_x1[0];
+                       *(uint32_t*)&b[4] = *(uint32_t*)&((struct ipovly *)ip)->ih_x1[4];
+                       *(uint8_t*)&b[8] = *(uint8_t*)&((struct ipovly *)ip)->ih_x1[8];
+                       

                        bzero(((struct ipovly *)ip)->ih_x1, 9);
                        ((struct ipovly *)ip)->ih_len = uh->uh_ulen;
                        uh->uh_sum = in_cksum(m, len + sizeof (struct ip));
                        bzero(((struct ipovly *)ip)->ih_x1, 9);
                        ((struct ipovly *)ip)->ih_len = uh->uh_ulen;
                        uh->uh_sum = in_cksum(m, len + sizeof (struct ip));

+                       
+                       *(uint32_t*)&((struct ipovly *)ip)->ih_x1[0] = *(uint32_t*)&b[0];
+                       *(uint32_t*)&((struct ipovly *)ip)->ih_x1[4] = *(uint32_t*)&b[4];
+                       *(uint8_t*)&((struct ipovly *)ip)->ih_x1[8] = *(uint8_t*)&b[8];

                }
                if (uh->uh_sum) {
                        udpstat.udps_badsum++;
                }
                if (uh->uh_sum) {
                        udpstat.udps_badsum++;

diff --git a/config/System.kext/Contents/Info.plist b/config/System.kext/Contents/Info.plist
index bcb99c4b7fb7bca3ddabb75ed2e58c0fa6ea2399..12f8074dbf43f256cc6ae19b3f32fdf41c8fd31a 100644 (file)
--- a/config/System.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>System Resource Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>System Resource Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,13 +15,13 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <key>OSBundleCompatibleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleRequired</key>
        <string>Root</string>
        <key>OSKernelResource</key>
        <key>OSBundleRequired</key>
        <string>Root</string>
        <key>OSKernelResource</key>

diff --git a/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist
index e0f769f9bd357a895c6229c69ffb026d4edbc481..d41931cc5cc9a3d6d6a1ef4858fd7dbfb4e97ac1 100644 (file)
--- a/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.driver.AppleNMI</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.driver.AppleNMI</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleRequired</key>
        <string>Root</string>
        <key>OSKernelResource</key>
        <key>OSBundleRequired</key>
        <string>Root</string>
        <key>OSKernelResource</key>

diff --git a/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist
index dbc9902034abf3179650fd9e2ded830060af1d81..206d511806eb153483d1aa7110f65d8f7dbf4384 100644 (file)
--- a/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>Apple Platform Family Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>Apple Platform Family Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.ApplePlatformFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.ApplePlatformFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.0</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist
index 83b9aa7905fd35b13aef4b68f44ed9038f8d6aed..894cab676c600ca8fd2642087523d037a9f208f4 100644 (file)
--- a/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>BSD Kernel Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>BSD Kernel Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.bsd</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.bsd</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.1</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist
index 5fea1efd9f623ae983e81ae5e7c5394c718fa85c..61364e081342fd36178cce8fc00d0e5a2c89338c 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>ADB Family Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>ADB Family Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IOADBFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IOADBFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist
index 779252504e7582b3c2bd0966fd0ebec81c9caa75..e175b0a946dee495c9c120fb0ea452253fbede0b 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>I/O Kit Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>I/O Kit Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.iokit</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.iokit</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist
index 513e2a627111f07ed4b54dd949d674cb7f2df3d0..fd154a8c812ba1cb351bd7101fce30278e5f579a 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IONVRAMFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IONVRAMFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.1</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist
index 896ae740835c077eb40d5ede89b393013523e3d3..ab8c968e7ab8926f14fd949fe6904dfbc9881e8e 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>System Management Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>System Management Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IOSystemManagementFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IOSystemManagementFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist
index 2f2f4c55f54a0b7fd096ebbd07b78747e65c5d5f..76d9004f823f5429e5777bc4e4d428930650dd33 100644 (file)
--- a/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>Libkern Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>Libkern Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.libkern</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.libkern</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist
index 69ed2ddb8eecd5aa2ad5605deb2be0b453615b2b..62df08afac4d46be4bf41ebc0c582cfa759069ad 100644 (file)
--- a/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>

-       <string>Mach Kernel Pseudoextension, Apple Computer Inc, 6.5</string>
+       <string>Mach Kernel Pseudoextension, Apple Computer Inc, 6.6</string>

        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.mach</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.mach</string>
        <key>CFBundleInfoDictionaryVersion</key>


@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>

-       <string>6.5</string>
+       <string>6.6</string>

        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/iokit/Kernel/IOInterruptController.cpp b/iokit/Kernel/IOInterruptController.cpp
index bd3baa04db7b7bee1065f6d56543537177d2aa28..438d93d87f460cf228589ccde81d12f2e53c4878 100644 (file)
--- a/iokit/Kernel/IOInterruptController.cpp
+++ b/iokit/Kernel/IOInterruptController.cpp
@@ -96,10 +96,10 @@ IOReturn IOInterruptController::registerInterrupt(IOService *nub, int source,
       originalNub = vector->nub;
       originalSource = vector->source;
       
       originalNub = vector->nub;
       originalSource = vector->source;
       

-      // Save the dis/enable state for the original consumer's interrupt.
-      // Then disable the source
-      wasDisabledSoft = vector->interruptDisabledSoft;
-      disableInterrupt(originalNub, originalSource);
+      // Physically disable the interrupt, but mark it as being enables in the hardware.
+      // The interruptDisabledSoft now indicates the driver's request for enablement.
+      disableVectorHard(vectorNumber, vector);
+      vector->interruptDisabledHard = 0;

       
       // Initialize the new shared interrupt controller.
       error = vector->sharedController->initInterruptController(this,
       
       // Initialize the new shared interrupt controller.
       error = vector->sharedController->initInterruptController(this,


@@ -125,7 +125,17 @@ IOReturn IOInterruptController::registerInterrupt(IOService *nub, int source,
       // put the original consumor's interrupt back to normal and
       // get rid of whats left of the shared controller.
       if (error != kIOReturnSuccess) {
       // put the original consumor's interrupt back to normal and
       // get rid of whats left of the shared controller.
       if (error != kIOReturnSuccess) {

+       // Save the driver's interrupt enablement state.
+       wasDisabledSoft = vector->interruptDisabledSoft;
+       
+       // Make the interrupt really hard disabled.
+       vector->interruptDisabledSoft = 1;
+       vector->interruptDisabledHard = 1;
+       
+       // Enable the original consumer's interrupt if needed.
+       if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);

         enableInterrupt(originalNub, originalSource);
         enableInterrupt(originalNub, originalSource);

+       

         vector->sharedController->release();
         vector->sharedController = 0;
         IOUnlock(vector->interruptLock);
         vector->sharedController->release();
         vector->sharedController = 0;
         IOUnlock(vector->interruptLock);


@@ -139,6 +149,13 @@ IOReturn IOInterruptController::registerInterrupt(IOService *nub, int source,
       vector->target  = vector->sharedController;
       vector->refCon  = 0;
       
       vector->target  = vector->sharedController;
       vector->refCon  = 0;
       

+      // Save the driver's interrupt enablement state.
+      wasDisabledSoft = vector->interruptDisabledSoft;
+      
+      // Make the interrupt really hard disabled.
+      vector->interruptDisabledSoft = 1;
+      vector->interruptDisabledHard = 1;
+      

       // Enable the original consumer's interrupt if needed.
       if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
     }
       // Enable the original consumer's interrupt if needed.
       if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
     }


@@ -399,7 +416,7 @@ IOReturn IOSharedInterruptController::initInterruptController(IOInterruptControl
   }
   
   // Allocate the memory for the vectors
   }
   
   // Allocate the memory for the vectors

-  numVectors = 8; // For now a constant number.
+  numVectors = 32; // For now a constant number.

   vectors = (IOInterruptVector *)IOMalloc(numVectors * sizeof(IOInterruptVector));
   if (vectors == NULL) {
     IOFree(_interruptSources, sizeof(IOInterruptSource));
   vectors = (IOInterruptVector *)IOMalloc(numVectors * sizeof(IOInterruptVector));
   if (vectors == NULL) {
     IOFree(_interruptSources, sizeof(IOInterruptSource));

diff --git a/iokit/Kernel/IONVRAM.cpp b/iokit/Kernel/IONVRAM.cpp
index 738a03cfabd3c321a9a87bbad62e8bff3057a526..085d154b45318ef58ce2e51ccb881a746526c137 100644 (file)
--- a/iokit/Kernel/IONVRAM.cpp
+++ b/iokit/Kernel/IONVRAM.cpp
@@ -1421,18 +1421,23 @@ IOReturn IODTNVRAM::readNVRAMPropertyType1(IORegistryEntry *entry,
       nvPath = start;
     else if (nvName == 0)
       nvName = start;
       nvPath = start;
     else if (nvName == 0)
       nvName = start;

-    else if (entry ==
-            IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane)) {
-      *name = OSSymbol::withCString((const char *) nvName);
-      *value = unescapeBytesToData(start, where - start - 1);
-      if ((*name != 0) && (*value != 0))
-        err = kIOReturnSuccess;
-      else
-        err = kIOReturnNoMemory;
-      break;
-    } else
+    else {
+      IORegistryEntry * compareEntry = IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane);
+      if (entry == compareEntry) {
+        if (compareEntry)
+          compareEntry->release();
+       *name = OSSymbol::withCString((const char *) nvName);
+       *value = unescapeBytesToData(start, where - start - 1);
+       if ((*name != 0) && (*value != 0))
+         err = kIOReturnSuccess;
+       else
+         err = kIOReturnNoMemory;
+       break;
+      }
+      if (compareEntry)
+        compareEntry->release();

       nvPath = nvName = 0;
       nvPath = nvName = 0;

-    
+    }

     start = where;
   }
 
     start = where;
   }
 


@@ -1475,15 +1480,21 @@ IOReturn IODTNVRAM::writeNVRAMPropertyType1(IORegistryEntry *entry,
         nvPath = start;
       else if (nvName == 0)
         nvName = start;
         nvPath = start;
       else if (nvName == 0)
         nvName = start;

-      else if (entry ==
-                IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane)) {
-        // delete old property (nvPath -> where)
-        data = OSData::withBytes(propStart, nvPath - propStart);
-        if (data)
-          ok &= data->appendBytes(where, end - where);
-        break;
-      } else
+      else {
+        IORegistryEntry * compareEntry = IORegistryEntry::fromPath((const char *) nvPath, gIODTPlane);
+        if (entry == compareEntry) {
+          if (compareEntry)
+             compareEntry->release();
+           // delete old property (nvPath -> where)
+           data = OSData::withBytes(propStart, nvPath - propStart);
+           if (data)
+             ok &= data->appendBytes(where, end - where);
+          break;
+        }
+        if (compareEntry)
+          compareEntry->release();

         nvPath = nvName = 0;
         nvPath = nvName = 0;

+      }

         
       start = where;
     }
         
       start = where;
     }

diff --git a/iokit/KernelConfigTables.cpp b/iokit/KernelConfigTables.cpp
index 85db1be743793e7b11552d62289a61061af9fda3..ca1e4e91d213b75f1b96fb36cf028f23eb258d38 100644 (file)
--- a/iokit/KernelConfigTables.cpp
+++ b/iokit/KernelConfigTables.cpp
@@ -28,16 +28,16 @@
  */
 const char * gIOKernelKmods =
 "{
  */
 const char * gIOKernelKmods =
 "{

-    'com.apple.kernel'                         = '6.5';
-    'com.apple.kernel.bsd'                     = '6.5';
-    'com.apple.kernel.iokit'                   = '6.5';
-    'com.apple.kernel.libkern'                 = '6.5';
-    'com.apple.kernel.mach'                    = '6.5';
-    'com.apple.iokit.IOADBFamily'              = '6.5';
-    'com.apple.iokit.IONVRAMFamily'            = '6.5';
-    'com.apple.iokit.IOSystemManagementFamily' = '6.5';
-    'com.apple.iokit.ApplePlatformFamily'      = '6.5';
-    'com.apple.driver.AppleNMI'                = '6.5';
+    'com.apple.kernel'                         = '6.6';
+    'com.apple.kernel.bsd'                     = '6.6';
+    'com.apple.kernel.iokit'                   = '6.6';
+    'com.apple.kernel.libkern'                 = '6.6';
+    'com.apple.kernel.mach'                    = '6.6';
+    'com.apple.iokit.IOADBFamily'              = '6.6';
+    'com.apple.iokit.IONVRAMFamily'            = '6.6';
+    'com.apple.iokit.IOSystemManagementFamily' = '6.6';
+    'com.apple.iokit.ApplePlatformFamily'      = '6.6';
+    'com.apple.driver.AppleNMI'                = '6.6';

 }";
 
 
 }";
 
 

diff --git a/iokit/conf/version.minor b/iokit/conf/version.minor
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/iokit/conf/version.minor
+++ b/iokit/conf/version.minor
@@ -1 +1 @@
-5
+6

diff --git a/libkern/conf/version.minor b/libkern/conf/version.minor
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/libkern/conf/version.minor
+++ b/libkern/conf/version.minor
@@ -1 +1 @@
-5
+6

diff --git a/libsa/conf/version.minor b/libsa/conf/version.minor
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/libsa/conf/version.minor
+++ b/libsa/conf/version.minor
@@ -1 +1 @@
-5
+6

diff --git a/osfmk/conf/kernelversion.minor b/osfmk/conf/kernelversion.minor
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/osfmk/conf/kernelversion.minor
+++ b/osfmk/conf/kernelversion.minor
@@ -1 +1 @@
-5
+6

diff --git a/osfmk/conf/version.minor b/osfmk/conf/version.minor
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/osfmk/conf/version.minor
+++ b/osfmk/conf/version.minor
@@ -1 +1 @@
-5
+6

diff --git a/pexpert/conf/version.minor b/pexpert/conf/version.minor
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/pexpert/conf/version.minor
+++ b/pexpert/conf/version.minor
@@ -1 +1 @@
-5
+6