Author: blueswirl Date: 2008-12-31 16:43:34 +0100 (Wed, 31 Dec 2008) New Revision: 331
Modified: openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/drivers/ide.c Log: Remove debug printk when IDE debugging is disabled (Laurent Vivier)
Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-12-28 16:35:39 UTC (rev 330) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-31 15:43:34 UTC (rev 331) @@ -64,7 +64,7 @@
<!-- Drivers --> <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/>
Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-28 16:35:39 UTC (rev 330) +++ openbios-devel/drivers/ide.c 2008-12-31 15:43:34 UTC (rev 331) @@ -1364,9 +1364,11 @@ snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, current_channel); REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); +#ifdef CONFIG_DEBUG_IDE printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", current_channel, chan->io_regs[0], chan->io_regs[0] + 7, chan->io_regs[8]); +#endif
for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; @@ -1375,7 +1377,10 @@ if (!drive->present) continue;
- printk(" drive%d [ATA%s ", j, drive->type == ide_type_atapi ? "PI" : ""); +#ifdef CONFIG_DEBUG_IDE + printk(" drive%d [ATA%s ", j, + drive->type == ide_type_atapi ? "PI" : ""); +#endif switch (drive->media) { case ide_media_floppy: media = "floppy"; @@ -1390,7 +1395,9 @@ media = "disk"; break; } +#ifdef CONFIG_DEBUG_IDE printk("%s]: %s\n", media, drive->model); +#endif snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media);