Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jun 2009 06:39:18 GMT
From:      Alexander Motin <mav@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 164936 for review
Message-ID:  <200906230639.n5N6dIES048277@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=164936

Change 164936 by mav@mav_mavbook on 2009/06/23 06:38:56

	Lower PCI ATA drivers priorities, to allow them been overriden.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#3 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-adaptec.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#5 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#3 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cenatek.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cypress.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cyrix.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-highpoint.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#4 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#3 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#3 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-micron.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-national.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#2 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#4 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#4 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#3 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#3 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#3 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acard.c#3 (text+ko) ====

@@ -93,7 +93,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_acard_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 (text+ko) ====

@@ -94,7 +94,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_ali_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-adaptec.c#2 (text+ko) ====

@@ -75,7 +75,7 @@
     ata_set_desc(dev);
     ctlr->chipinit = ata_marvell_edma_chipinit;
 
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 ATA_DECLARE_DRIVER(ata_adaptec);

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#5 (text+ko) ====


==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#2 (text+ko) ====

@@ -83,7 +83,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_amd_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ati.c#3 (text+ko) ====

@@ -136,7 +136,7 @@
 	ctlr->chipinit = ata_ati_ahci_chipinit;
 	break;
     }
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cenatek.c#2 (text+ko) ====

@@ -69,7 +69,7 @@
 
     ctlr->chipinit = ata_cenatek_chipinit;
     device_set_desc(dev, "Cenatek Rocket Drive controller");
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cypress.c#2 (text+ko) ====

@@ -76,7 +76,7 @@
 	pci_get_subclass(dev) == PCIS_STORAGE_IDE) {
 	device_set_desc(dev, "Cypress 82C693 ATA controller");
 	ctlr->chipinit = ata_cypress_chipinit;
-	return 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-cyrix.c#2 (text+ko) ====

@@ -67,7 +67,7 @@
     if (pci_get_devid(dev) == ATA_CYRIX_5530) {
 	device_set_desc(dev, "Cyrix 5530 ATA33 controller");
 	ctlr->chipinit = ata_cyrix_chipinit;
-	return 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-highpoint.c#2 (text+ko) ====

@@ -104,7 +104,7 @@
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_highpoint_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#4 (text+ko) ====

@@ -146,7 +146,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_intel_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT)
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#2 (text+ko) ====

@@ -78,7 +78,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_ite_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-jmicron.c#3 (text+ko) ====

@@ -94,7 +94,7 @@
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_jmicron_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#3 (text+ko) ====

@@ -125,7 +125,7 @@
 	ctlr->chipinit = ata_marvell_pata_chipinit;
 	break;
     }
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-micron.c#2 (text+ko) ====

@@ -69,7 +69,7 @@
 	device_set_desc(dev,
 	    "RZ 100? ATA controller !WARNING! data loss/corruption risk");
 	ctlr->chipinit = ata_micron_chipinit;
-	return 0;
+	return (BUS_PROBE_DEFAULT);
     }
     else
 	return ENXIO;

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-national.c#2 (text+ko) ====

@@ -68,7 +68,7 @@
     if (pci_get_devid(dev) == ATA_SC1100) {
 	device_set_desc(dev, "National Geode SC1100 ATA33 controller");
 	ctlr->chipinit = ata_national_chipinit;
-	return 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-netcell.c#2 (text+ko) ====

@@ -68,7 +68,7 @@
     if (pci_get_devid(dev) == ATA_NETCELL_SR) {
 	device_set_desc(dev, "Netcell SyncRAID SR3000/5000 RAID Controller");
 	ctlr->chipinit = ata_netcell_chipinit;
-	return 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#4 (text+ko) ====

@@ -138,7 +138,7 @@
 	ctlr->chipinit = ata_ahci_chipinit;
     else
 	ctlr->chipinit = ata_nvidia_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#4 (text+ko) ====

@@ -210,7 +210,7 @@
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_promise_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#3 (text+ko) ====

@@ -98,7 +98,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_serverworks_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 #ifdef __powerpc__

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 (text+ko) ====

@@ -115,7 +115,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_sii_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-sis.c#3 (text+ko) ====

@@ -155,7 +155,7 @@
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_sis_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#3 (text+ko) ====

@@ -120,7 +120,7 @@
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_via_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906230639.n5N6dIES048277>