=================================================================== RCS file: /cvs/prex-old/dev/core/main.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- prex-old/dev/core/main.c 2008/08/08 13:37:11 1.2 +++ prex-old/dev/core/main.c 2008/08/13 17:19:28 1.2.2.1 @@ -34,11 +34,15 @@ #include #include +#ifdef DEBUG +#define DPRINTF(a) printf a +#else +#define DPRINTF(a) +#endif + #define MAXDRIVER 100 -#ifndef CONFIG_AUTOCONF extern struct driver *driver_table[]; -#endif /* * Entry point of driver module @@ -49,7 +53,7 @@ struct driver *drv; int order, i, err; - printk("Prex driver module built: " __DATE__ "\n"); + DPRINTF(("Prex driver module built: " __DATE__ "\n")); /* * Initialize platform hardware. @@ -57,7 +61,6 @@ if (machine_init()) panic("driver_main: init failed"); -#ifndef CONFIG_AUTOCONF /* * Call init routine for all device drivers with init order. * Smaller value will be run first. @@ -70,23 +73,11 @@ ASSERT(drv->order < 16); if (drv->order == order) { if (drv->init) { - printk("Initializing %s\n", drv->name); + DPRINTF(("Initializing %s\n", + drv->name)); err = drv->init(); } } } } -#else - /* - * Enter autoconfiguration machinery. - * Attach 'root' pseudo device, which will then search for its children. - */ - printk("Entering autoconfiguration phase.\n"); - - config_attach_rootdev(); - - printk("Exiting autoconfiguration phase.\n"); - -#endif /* !CONFIG_AUTOCONF */ - }