Author: rpaulo
Date: Mon Jul 27 13:51:55 2009
New Revision: 195907
URL: http://svn.freebsd.org/changeset/base/195907

Log:
  Refine the MacBook hack to only match early models that have Intel ICH.
  
  Discussed with:       kjim
  Approved by:  re (kib)

Modified:
  head/sys/amd64/amd64/machdep.c
  head/sys/i386/i386/machdep.c

Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c      Mon Jul 27 13:41:45 2009        
(r195906)
+++ head/sys/amd64/amd64/machdep.c      Mon Jul 27 13:51:55 2009        
(r195907)
@@ -213,7 +213,10 @@ cpu_startup(dummy)
         */
        sysenv = getenv("smbios.system.product");
        if (sysenv != NULL) {
-               if (strncmp(sysenv, "MacBook", 7) == 0) {
+               if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+                   strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
+                   strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+                   strncmp(sysenv, "Macmini1,1", 10) == 0) {
                        if (bootverbose)
                                printf("Disabling LEGACY_USB_EN bit on "
                                    "Intel ICH.\n");

Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c        Mon Jul 27 13:41:45 2009        
(r195906)
+++ head/sys/i386/i386/machdep.c        Mon Jul 27 13:51:55 2009        
(r195907)
@@ -257,7 +257,10 @@ cpu_startup(dummy)
         */
        sysenv = getenv("smbios.system.product");
        if (sysenv != NULL) {
-               if (strncmp(sysenv, "MacBook", 7) == 0) {
+               if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
+                   strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
+                   strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
+                   strncmp(sysenv, "Macmini1,1", 10) == 0) {
                        if (bootverbose)
                                printf("Disabling LEGACY_USB_EN bit on "
                                    "Intel ICH.\n");
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to