Browse Source

Need to do isolation when find_isapnp_device is first called,

otherwise isapnp_max_csn is zero and we never call fill_isapnp_device.

Fix debug message.
tags/v0.9.3
Michael Brown 19 years ago
parent
commit
8aa3b9d972
1 changed files with 9 additions and 8 deletions
  1. 9
    8
      src/drivers/bus/isapnp.c

+ 9
- 8
src/drivers/bus/isapnp.c View File

372
 	isapnp_wait_for_key ();
372
 	isapnp_wait_for_key ();
373
 
373
 
374
 	/* Return number of cards found */
374
 	/* Return number of cards found */
375
-	DBG ( "ISAPnP found %d cards at read port %hx\n", isapnp_read_port );
375
+	DBG ( "ISAPnP found %d cards at read port %hx\n",
376
+	      isapnp_max_csn, isapnp_read_port );
376
 	return isapnp_max_csn;
377
 	return isapnp_max_csn;
377
 }
378
 }
378
 
379
 
407
 	unsigned int i;
408
 	unsigned int i;
408
 	struct isapnp_logdevid logdevid;
409
 	struct isapnp_logdevid logdevid;
409
 	
410
 	
410
-	/* Ensure that all ISAPnP cards have CSNs allocated to them,
411
-	 * if we haven't already done so.
412
-	 */
413
-	if ( ! isapnp_read_port ) {
414
-		isapnp_isolate();
415
-	}
416
-
417
 	/* Wake the card */
411
 	/* Wake the card */
418
 	isapnp_wait_for_key ();
412
 	isapnp_wait_for_key ();
419
 	isapnp_send_key ();
413
 	isapnp_send_key ();
469
 		isapnp->csn = 1;
463
 		isapnp->csn = 1;
470
 	}
464
 	}
471
 
465
 
466
+	/* Ensure that all ISAPnP cards have CSNs allocated to them,
467
+	 * if we haven't already done so.
468
+	 */
469
+	if ( ! isapnp_read_port ) {
470
+		isapnp_isolate();
471
+	}
472
+
472
 	/* Iterate through all possible ISAPNP CSNs, starting where we
473
 	/* Iterate through all possible ISAPNP CSNs, starting where we
473
 	 * left off.
474
 	 * left off.
474
 	 */
475
 	 */

Loading…
Cancel
Save