console.c uses the generic table mechanism

diff --git a/src/arch/i386/scripts/i386.lds b/src/arch/i386/scripts/i386.lds
index 51cfbd333dcb6f1ecb0b3640184274399678148b..89d2f62ab18a902240c08d15cd92b436603e3dc9 100644 (file)
--- a/src/arch/i386/scripts/i386.lds
+++ b/src/arch/i386/scripts/i386.lds
@@ -141,7 +141,10 @@ SECTIONS {
        *(.data)
        *(.data.*)
 
-       /* Various tables */
+       /* Various tables.  See include/tables.h for an explanation. */
+       *(SORT(.tbl.*)) 
+
+
        device_drivers = .;
        *(.drivers.device)
        device_drivers_end = .;
@@ -154,15 +157,9 @@ SECTIONS {
        type_drivers = .;
        *(.drivers.type)
        type_drivers_end = .;
-       console_drivers = .;
-       *(.drivers.console)
-       console_drivers_end = .;
        post_reloc_fns = .;
        *(SORT(.post_reloc_fns.*))
        post_reloc_fns_end = .;
-       init_fns = .;
-       *(SORT(.init_fns.*))
-       init_fns_end = .;
 
        _progbits_end = .;
     }

diff --git a/src/core/console.c b/src/core/console.c
index 6e92cb54fec20b50fab5682d60ac6abce56a6ada..2fbf86380574a1627593723ef10ddafca48fd343 100644 (file)
--- a/src/core/console.c
+++ b/src/core/console.c
@@ -18,8 +18,8 @@
  */
 #include "bios.h"
 
-extern struct console_driver console_drivers[];
-extern struct console_driver console_drivers_end[];
+static struct console_driver console_drivers[0] __table_start ( console );
+static struct console_driver console_drivers_end[0] __table_end ( console );
 
 /*****************************************************************************
  * putchar : write a single character to each console

diff --git a/src/include/console.h b/src/include/console.h
index 55ce730951bac11fbf07a0e4a85f2d31191821d9..146fd9c3e7554356b4d8cafaeddd79916f27ac03 100644 (file)
--- a/src/include/console.h
+++ b/src/include/console.h
@@ -3,6 +3,7 @@
 
 #include "stdint.h"
 #include "vsprintf.h"
+#include "tables.h"
 
 /*
  * Consoles that cannot be used before their INIT_FN() has completed
@@ -18,7 +19,7 @@ struct console_driver {
 };
 
 #define __console_driver \
-       __attribute__ (( used, __section__ ( ".drivers.console" ) ))
+       __attribute__ (( used, __table_section ( console, 01 ) ))
 
 /* Function prototypes */