lots of probe_all nuking

10 files changed, 20 insertions, 21 deletions

diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c
index 049d83d79..46985ffba 100644
--- a/loader2/driverdisk.c
+++ b/loader2/driverdisk.c
@@ -157,9 +157,9 @@ int getRemovableDevices(char *** devNames) {
     int i = 0, j = 0;
 
     floppies = probeDevices(CLASS_FLOPPY, 
-                            BUS_IDE | BUS_SCSI | BUS_MISC, PROBE_ALL);
+                            BUS_IDE | BUS_SCSI | BUS_MISC, 0);
     cdroms = probeDevices(CLASS_CDROM, 
-                          BUS_IDE | BUS_SCSI | BUS_MISC, PROBE_ALL);
+                          BUS_IDE | BUS_SCSI | BUS_MISC, 0);
 
     /* we should probably take detached into account here, but it just
      * means we use a little bit more memory than we really need to */
@@ -298,7 +298,7 @@ int loadDriverFromMedia(int class, moduleList modLoaded,
             int found = 0, before = 0;
             struct device ** devices;
 
-            devices = probeDevices(class, BUS_UNSPEC, PROBE_ALL);
+            devices = probeDevices(class, BUS_UNSPEC, 0);
             if (devices)
                 for(; devices[before]; before++);
 
@@ -322,7 +322,7 @@ int loadDriverFromMedia(int class, moduleList modLoaded,
 
             busProbe(modInfo, modLoaded, *modDepsPtr, 0, flags);
 
-            devices = probeDevices(class, BUS_UNSPEC, PROBE_ALL);
+            devices = probeDevices(class, BUS_UNSPEC, 0);
             if (devices)
                 for(; devices[before]; found++);
 
diff --git a/loader2/firewire.c b/loader2/firewire.c
index 126a01395..86f3febac 100644
--- a/loader2/firewire.c
+++ b/loader2/firewire.c
@@ -33,7 +33,7 @@ int firewireInitialize(moduleList modLoaded, moduleDeps modDeps,
 
     if (FL_NOIEEE1394(flags)) return 0;
 
-    devices = probeDevices(CLASS_FIREWIRE, BUS_PCI, PROBE_ALL);
+    devices = probeDevices(CLASS_FIREWIRE, BUS_PCI, 0);
 
     if (!devices) {
 	logMessage("no firewire controller found");
@@ -66,7 +66,7 @@ int firewireInitialize(moduleList modLoaded, moduleDeps modDeps,
     sleep(3);
 
     logMessage("probing for firewire scsi devices");
-    devices = probeDevices(CLASS_SCSI, BUS_FIREWIRE, PROBE_ALL);
+    devices = probeDevices(CLASS_SCSI, BUS_FIREWIRE, 0);
 
     if (!devices) {
 	logMessage("no firewire scsi devices found");
diff --git a/loader2/hardware.c b/loader2/hardware.c
index 090b58b30..4eddd828d 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -125,7 +125,7 @@ int agpgartInitialize(moduleList modLoaded, moduleDeps modDeps,
 
     logMessage("looking for video cards requiring agpgart module");
     
-    devices = probeDevices(CLASS_VIDEO, BUS_UNSPEC, PROBE_ALL);
+    devices = probeDevices(CLASS_VIDEO, BUS_UNSPEC, 0);
     
     if (!devices) {
         logMessage("no video cards found");
@@ -167,7 +167,7 @@ int scsiTapeInitialize(moduleList modLoaded, moduleDeps modDeps,
 
     logMessage("looking for scsi tape devices");
     
-    devices = probeDevices(CLASS_TAPE, BUS_SCSI, PROBE_ALL);
+    devices = probeDevices(CLASS_TAPE, BUS_SCSI, 0);
     
     if (!devices) {
         logMessage("no scsi tape devices found");
@@ -319,7 +319,7 @@ void ideSetup(moduleList modLoaded, moduleDeps modDeps,
      */
     if (FL_ENABLECDDMA(flags))
         return;
-    devices = probeDevices(CLASS_CDROM, BUS_IDE, PROBE_ALL);
+    devices = probeDevices(CLASS_CDROM, BUS_IDE, 0);
     if (!devices)
         return;
 
diff --git a/loader2/kickstart.c b/loader2/kickstart.c
index 809841389..6bbd279fd 100644
--- a/loader2/kickstart.c
+++ b/loader2/kickstart.c
@@ -225,8 +225,7 @@ int kickstartFromFloppy(char *kssrc, int flags) {
     int i, rc;
 
     logMessage("doing kickstart from floppy");
-    devices = probeDevices(CLASS_FLOPPY, BUS_MISC | BUS_IDE | BUS_SCSI, 
-                           PROBE_ALL);
+    devices = probeDevices(CLASS_FLOPPY, BUS_MISC | BUS_IDE | BUS_SCSI, 0);
     if (!devices) {
         logMessage("no floppy devices");
         return 1;
diff --git a/loader2/loader.c b/loader2/loader.c
index 58fe478f5..89c7fa895 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -362,7 +362,7 @@ static void checkForHardDrives(int * flagsPtr) {
     int i;
     struct device ** devices;
     
-    devices = probeDevices(CLASS_HD, BUS_UNSPEC, PROBE_ALL);
+    devices = probeDevices(CLASS_HD, BUS_UNSPEC, 0);
     if (devices)
         return;
 
@@ -633,7 +633,7 @@ static void checkForRam(int flags) {
 static int haveDeviceOfType(int type) {
     struct device ** devices;
 
-    devices = probeDevices(type, BUS_UNSPEC, PROBE_ALL);
+    devices = probeDevices(type, BUS_UNSPEC, 0);
     if (devices)
         return 1;
     return 0;
diff --git a/loader2/modules.c b/loader2/modules.c
index 289d1a624..74637bb15 100644
--- a/loader2/modules.c
+++ b/loader2/modules.c
@@ -92,13 +92,13 @@ static int scsiDiskCount(void) {
     struct device ** devices;
     int i = 0;
 
-    devices = probeDevices(CLASS_HD, BUS_SCSI, PROBE_ALL);
+    devices = probeDevices(CLASS_HD, BUS_SCSI, 0);
     if (devices) {
         for (; devices[i]; i++);
         free(devices);
     }
     /* have to probe for usb floppies too */
-    devices = probeDevices(CLASS_FLOPPY, BUS_SCSI, PROBE_ALL);
+    devices = probeDevices(CLASS_FLOPPY, BUS_SCSI, 0);
     if (devices) {
         for (; devices[i]; i++);
         free(devices);
diff --git a/loader2/pcmcia.c b/loader2/pcmcia.c
index 9bcaba3f0..bda60c2d8 100644
--- a/loader2/pcmcia.c
+++ b/loader2/pcmcia.c
@@ -39,12 +39,12 @@ char * getPcicController() {
     if (!probed) {
         probed = 1;
  
-        devices = probeDevices(CLASS_SOCKET, BUS_PCI, PROBE_ALL);
+        devices = probeDevices(CLASS_SOCKET, BUS_PCI, 0);
         if (devices) {
             logMessage("found cardbus pci adapter");
             pcic = "yenta_socket";
         } else {
-            devices = probeDevices(CLASS_SOCKET, BUS_MISC, PROBE_ALL);
+            devices = probeDevices(CLASS_SOCKET, BUS_MISC, 0);
             if (devices && strcmp (devices[0]->driver, "ignore") &&
                 strcmp(devices[0]->driver, "unknown") && 
                 strcmp(devices[0]->driver, "disabled")) {
diff --git a/loader2/pcmciatest.c b/loader2/pcmciatest.c
index 19e2bc1e9..26b5400b6 100644
--- a/loader2/pcmciatest.c
+++ b/loader2/pcmciatest.c
@@ -145,12 +145,12 @@ char * getPcicController() {
     if (!probed) {
         probed = 1;
  
-        devices = probeDevices(CLASS_SOCKET, BUS_PCI, PROBE_ALL);
+        devices = probeDevices(CLASS_SOCKET, BUS_PCI, 0);
         if (devices) {
             logMessage("found cardbus pci adapter");
             pcic = "yenta_socket";
         } else {
-            devices = probeDevices(CLASS_SOCKET, BUS_MISC, PROBE_ALL);
+            devices = probeDevices(CLASS_SOCKET, BUS_MISC, 0);
             if (devices && strcmp (devices[0]->driver, "ignore") &&
                 strcmp(devices[0]->driver, "unknown") && 
                 strcmp(devices[0]->driver, "disabled")) {
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c
index d67bec1ee..db2e23dee 100644
--- a/loader2/urlinstall.c
+++ b/loader2/urlinstall.c
@@ -366,7 +366,7 @@ int getFileFromUrl(char * url, char * dest,
         struct device ** devices;
 
 	hdrlen = 0;
-        devices = probeDevices(CLASS_NETWORK, BUS_UNSPEC, PROBE_ALL);
+        devices = probeDevices(CLASS_NETWORK, BUS_UNSPEC, 0);
 	for (i = 0; devices && devices[i]; i++) {
 	    dev = devices[i]->device;
 	    mac = getMacAddr(dev);
diff --git a/loader2/usb.c b/loader2/usb.c
index 1b2a8f18c..d05c96db9 100644
--- a/loader2/usb.c
+++ b/loader2/usb.c
@@ -71,7 +71,7 @@ int usbInitialize(moduleList modLoaded, moduleDeps modDeps,
 
     logMessage("looking for usb controllers");
 
-    devices = probeDevices(CLASS_USB, BUS_PCI, PROBE_ALL);
+    devices = probeDevices(CLASS_USB, BUS_PCI, 0);
 
     if (!devices) {
 	logMessage("no usb controller found");