Debug message fixes.
authorMichael Brown <mcb30@etherboot.org>
Fri, 22 Apr 2005 15:56:57 +0000 (15:56 +0000)
committerMichael Brown <mcb30@etherboot.org>
Fri, 22 Apr 2005 15:56:57 +0000 (15:56 +0000)
src/drivers/bus/eisa.c
src/drivers/bus/isapnp.c
src/drivers/bus/mca.c

index c50d4b2..e8fb569 100644 (file)
@@ -171,4 +171,7 @@ void eisa_device_enabled ( struct eisa_device *eisa, int enabled ) {
        outb ( enabled ? EISA_CMD_ENABLE : 0,
               eisa->ioaddr + EISA_GLOBAL_CONFIG );
        udelay ( 1000 ); /* Must wait 800 */
+
+       DBG ( "EISA %s device %hhx\n", ( enabled ? "enabled" : "disabled" ),
+             eisa->slot );
 }
index 61ee684..335b90b 100644 (file)
@@ -555,7 +555,7 @@ static int isapnp_check_driver ( struct bus_dev *bus_dev,
                              isapnp->prod_id,
                              isa_id_string( isapnp->vendor_id,
                                             isapnp->prod_id ),
-                             id->name, driver->name );
+                             id->name, device_driver->name );
                        isapnp->name = id->name;
                        return 1;
                }
@@ -622,7 +622,8 @@ void isapnp_device_activation ( struct isapnp_device *isapnp,
        /* Return all cards to Wait for Key state */
        isapnp_wait_for_key ();
 
-       DBG ( "ISAPnP activated device %hhx.%hhx\n",
+       DBG ( "ISAPnP %s device %hhx.%hhx\n",
+             ( activation ? "activated" : "deactivated" ),
              isapnp->csn, isapnp->logdev );
 }
 
index 5a9d339..1561fae 100644 (file)
@@ -96,7 +96,7 @@ static int mca_check_driver ( struct bus_dev *bus_dev,
                if ( MCA_ID ( mca ) == id->id ) {
                        DBG ( "MCA found ID %hx (device %s) "
                              "matching driver %s\n",
-                             id->name, id->id, driver->name );
+                             id->name, id->id, device_driver->name );
                        mca->name = id->name;
                        return 1;
                }