david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

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.
This commit is contained in:
Michael Brown 2005-04-15 17:03:39 +00:00
parent c41e89af41
commit 8aa3b9d972
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drivers/bus/isapnp.c
View File

@ -372,7 +372,8 @@ static int isapnp_try_isolate ( void ) {
isapnp_wait_for_key ();
/* Return number of cards found */
DBG ( "ISAPnP found %d cards at read port %hx\n", isapnp_read_port );
DBG ( "ISAPnP found %d cards at read port %hx\n",
isapnp_max_csn, isapnp_read_port );
return isapnp_max_csn;
}
@ -407,13 +408,6 @@ static int fill_isapnp_device ( struct isapnp_device *isapnp ) {
unsigned int i;
struct isapnp_logdevid logdevid;
/* Ensure that all ISAPnP cards have CSNs allocated to them,
* if we haven't already done so.
*/
if ( ! isapnp_read_port ) {
isapnp_isolate();
}
/* Wake the card */
isapnp_wait_for_key ();
isapnp_send_key ();
@ -469,6 +463,13 @@ int find_isapnp_device ( struct isapnp_device *isapnp,
isapnp->csn = 1;
}
/* Ensure that all ISAPnP cards have CSNs allocated to them,
* if we haven't already done so.
*/
if ( ! isapnp_read_port ) {
isapnp_isolate();
}
/* Iterate through all possible ISAPNP CSNs, starting where we
* left off.
*/