Explorar el Código

Fix up init ordering.

Make init function table name fixed; it's a static variable anyway.
tags/v0.9.3
Michael Brown hace 19 años
padre
commit
d189b84536
Se han modificado 1 ficheros con 6 adiciones y 5 borrados
  1. 6
    5
      src/include/init.h

+ 6
- 5
src/include/init.h Ver fichero

37
 #define INIT_CONSOLE	"01"
37
 #define INIT_CONSOLE	"01"
38
 #define	INIT_CPU	"02"
38
 #define	INIT_CPU	"02"
39
 #define	INIT_TIMERS	"03"
39
 #define	INIT_TIMERS	"03"
40
-#define	INIT_PCMCIA	"04"
41
-#define	INIT_MEMSIZES	"05"
42
-#define	INIT_HEAP	"06"
40
+#define	INIT_MEMSIZES	"04"
41
+#define INIT_RELOCATE	"05"
42
+#define	INIT_PCMCIA	"05"
43
+#define	INIT_HEAP	"07"
43
 
44
 
44
 /* Macro for creating an initialisation function table entry */
45
 /* Macro for creating an initialisation function table entry */
45
 #define INIT_FN( init_order, init_func, reset_func, exit_func )		      \
46
 #define INIT_FN( init_order, init_func, reset_func, exit_func )		      \
46
-	static struct init_fn init_ ## init_func ## _ ## exit_func	      \
47
-	    __attribute__ ((used,__section__(".init_fns." init_order))) = {  \
47
+	static struct init_fn init_functions				      \
48
+	    __attribute__ ((used,__section__(".init_fns." init_order))) = {   \
48
 		.init = init_func,					      \
49
 		.init = init_func,					      \
49
 		.reset = reset_func,					      \
50
 		.reset = reset_func,					      \
50
 		.exit = exit_func,					      \
51
 		.exit = exit_func,					      \

Loading…
Cancelar
Guardar