r336 - in openbios-devel: config/examples drivers

Author: blueswirl
Date: 2008-12-31 19:16:01 +0100 (Wed, 31 Dec 2008)
New Revision: 336

Modified:
   openbios-devel/config/examples/cross-sparc32_config.xml
   openbios-devel/config/examples/cross-sparc64_config.xml
   openbios-devel/config/examples/sparc32_config.xml
   openbios-devel/config/examples/sparc64_config.xml
   openbios-devel/config/examples/x86_config.xml
   openbios-devel/drivers/floppy.c
Log:
Suppress floppy debug and info messages by default

Modified: openbios-devel/config/examples/cross-sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc32_config.xml	2008-12-31 18:01:53 UTC (rev
335)
+++ openbios-devel/config/examples/cross-sparc32_config.xml	2008-12-31 18:16:01 UTC (rev
336)
@@ -72,5 +72,6 @@
   <option name="CONFIG_DRIVER_OBIO" type="boolean"
value="true"/>
   <option name="CONFIG_DRIVER_ESP" type="boolean"
value="true"/>
   <option name="CONFIG_DRIVER_FLOPPY" type="boolean"
value="true"/>
+  <option name="CONFIG_DEBUG_FLOPPY" type="boolean"
value="false"/>
 
 </config>

Modified: openbios-devel/config/examples/cross-sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_config.xml	2008-12-31 18:01:53 UTC (rev
335)
+++ openbios-devel/config/examples/cross-sparc64_config.xml	2008-12-31 18:16:01 UTC (rev
336)
@@ -71,6 +71,7 @@
   <option name="CONFIG_IDE_NUM_CHANNELS" type="integer"
value="4"/>
   <option name="CONFIG_DEBUG_IDE" type="boolean"
value="false"/>
   <option name="CONFIG_DRIVER_FLOPPY" type="boolean"
value="true"/>
+  <option name="CONFIG_DEBUG_FLOPPY" type="boolean"
value="false"/>
   <option name="CONFIG_DRIVER_VGA" type="boolean"
value="true"/>
 
 </config>

Modified: openbios-devel/config/examples/sparc32_config.xml
===================================================================
--- openbios-devel/config/examples/sparc32_config.xml	2008-12-31 18:01:53 UTC (rev 335)
+++ openbios-devel/config/examples/sparc32_config.xml	2008-12-31 18:16:01 UTC (rev 336)
@@ -72,5 +72,6 @@
   <option name="CONFIG_DRIVER_OBIO" type="boolean"
value="true"/>
   <option name="CONFIG_DRIVER_ESP" type="boolean"
value="true"/>
   <option name="CONFIG_DRIVER_FLOPPY" type="boolean"
value="true"/>
+  <option name="CONFIG_DEBUG_FLOPPY" type="boolean"
value="false"/>
 
 </config>

Modified: openbios-devel/config/examples/sparc64_config.xml
===================================================================
--- openbios-devel/config/examples/sparc64_config.xml	2008-12-31 18:01:53 UTC (rev 335)
+++ openbios-devel/config/examples/sparc64_config.xml	2008-12-31 18:16:01 UTC (rev 336)
@@ -71,6 +71,7 @@
   <option name="CONFIG_IDE_NUM_CHANNELS" type="integer"
value="4"/>
   <option name="CONFIG_DEBUG_IDE" type="boolean"
value="false"/>
   <option name="CONFIG_DRIVER_FLOPPY" type="boolean"
value="true"/>
+  <option name="CONFIG_DEBUG_FLOPPY" type="boolean"
value="false"/>
   <option name="CONFIG_DRIVER_VGA" type="boolean"
value="true"/>
 
 </config>

Modified: openbios-devel/config/examples/x86_config.xml
===================================================================
--- openbios-devel/config/examples/x86_config.xml	2008-12-31 18:01:53 UTC (rev 335)
+++ openbios-devel/config/examples/x86_config.xml	2008-12-31 18:16:01 UTC (rev 336)
@@ -69,5 +69,6 @@
   <option name="CONFIG_IDE_NUM_CHANNELS" type="integer"
value="4"/>
   <option name="CONFIG_DEBUG_IDE" type="boolean"
value="false"/>
   <option name="CONFIG_DRIVER_FLOPPY" type="boolean"
value="false"/>
+  <option name="CONFIG_DEBUG_FLOPPY" type="boolean"
value="false"/>
 
 </config>

Modified: openbios-devel/drivers/floppy.c
===================================================================
--- openbios-devel/drivers/floppy.c	2008-12-31 18:01:53 UTC (rev 335)
+++ openbios-devel/drivers/floppy.c	2008-12-31 18:16:01 UTC (rev 336)
@@ -11,8 +11,13 @@
 /* DECLARE data structures for the nodes.  */
 DECLARE_UNNAMED_NODE( ob_floppy, INSTALL_OPEN, 2*sizeof(int) );
 
+#ifdef CONFIG_DEBUG_FLOPPY
 #define printk_info printk
 #define printk_debug printk
+#else
+#define printk_info(x ...)
+#define printk_debug(x ...)
+#endif
 #define printk_err printk
 
 #ifndef FD_BASE