Browse Source

We don't actually use the reset functions anywhere, and nothing really

provides them.
tags/v0.9.3
Michael Brown 17 years ago
parent
commit
fae10a7ca1

+ 1
- 1
src/arch/i386/core/cpu.c View File

85
 	identify_cpu(&cpu_info);
85
 	identify_cpu(&cpu_info);
86
 }
86
 }
87
 
87
 
88
-INIT_FN ( INIT_CPU, cpu_setup, NULL, NULL );
88
+INIT_FN ( INIT_CPU, cpu_setup, NULL );
89
 
89
 
90
 #endif /* CONFIG_X86_64 */
90
 #endif /* CONFIG_X86_64 */

+ 1
- 1
src/arch/i386/core/gdbsym.c View File

28
 	getkey();
28
 	getkey();
29
 }
29
 }
30
 
30
 
31
-INIT_FN ( INIT_GDBSYM, gdb_symbol_line, NULL, NULL );
31
+INIT_FN ( INIT_GDBSYM, gdb_symbol_line, NULL );

+ 1
- 1
src/arch/i386/core/i386_timer.c View File

191
 
191
 
192
 #endif /* RTC_CURRTICKS */
192
 #endif /* RTC_CURRTICKS */
193
 
193
 
194
-INIT_FN ( INIT_TIMERS, setup_timers, NULL, NULL );
194
+INIT_FN ( INIT_TIMERS, setup_timers, NULL );

+ 1
- 1
src/arch/i386/core/video_subr.c View File

99
 	.disabled = 1,
99
 	.disabled = 1,
100
 };
100
 };
101
 
101
 
102
-INIT_FN ( INIT_CONSOLE, video_init, NULL, NULL );
102
+INIT_FN ( INIT_CONSOLE, video_init, NULL );

+ 1
- 1
src/core/btext.c View File

417
 	.disabled = 1,
417
 	.disabled = 1,
418
 };
418
 };
419
 
419
 
420
-INIT_FN ( INIT_CONSOLE, btext_init, NULL, NULL );
420
+INIT_FN ( INIT_CONSOLE, btext_init, NULL );
421
 
421
 
422
 
422
 
423
 //come from linux/drivers/video/font-8x16.c
423
 //come from linux/drivers/video/font-8x16.c

+ 0
- 9
src/core/init.c View File

23
 	}
23
 	}
24
 }
24
 }
25
 
25
 
26
-void call_reset_fns ( void ) {
27
-	struct init_fn *init_fn;
28
-
29
-	for ( init_fn = init_fns; init_fn < init_fns_end ; init_fn++ ) {
30
-		if ( init_fn->reset )
31
-			init_fn->reset ();
32
-	}
33
-}
34
-
35
 void call_exit_fns ( void ) {
26
 void call_exit_fns ( void ) {
36
 	struct init_fn *init_fn;
27
 	struct init_fn *init_fn;
37
 
28
 

+ 1
- 1
src/core/pcmcia.c View File

264
 	printf("Shutdown of PCMCIA subsystem completed");
264
 	printf("Shutdown of PCMCIA subsystem completed");
265
 }
265
 }
266
 
266
 
267
-INIT_FN ( INIT_PCMCIA, pcmcia_init_all, NULL, pcmcia_shutdown_all );
267
+INIT_FN ( INIT_PCMCIA, pcmcia_init_all, pcmcia_shutdown_all );
268
 
268
 
269
 #endif
269
 #endif

+ 1
- 1
src/core/serial.c View File

250
 	.disabled = 1,
250
 	.disabled = 1,
251
 };
251
 };
252
 
252
 
253
-INIT_FN ( INIT_CONSOLE, serial_init, NULL, serial_fini );
253
+INIT_FN ( INIT_CONSOLE, serial_init, serial_fini );
254
 
254
 

+ 1
- 4
src/include/gpxe/init.h View File

30
 
30
 
31
 struct init_fn {
31
 struct init_fn {
32
 	void ( *init ) ( void );
32
 	void ( *init ) ( void );
33
-	void ( *reset ) ( void );
34
 	void ( *exit ) ( void );
33
 	void ( *exit ) ( void );
35
 };
34
 };
36
 
35
 
44
 #define	INIT_RPC	11
43
 #define	INIT_RPC	11
45
 
44
 
46
 /* Macro for creating an initialisation function table entry */
45
 /* Macro for creating an initialisation function table entry */
47
-#define INIT_FN( init_order, init_func, reset_func, exit_func )	\
46
+#define INIT_FN( init_order, init_func, exit_func )	\
48
 	struct init_fn PREFIX_OBJECT(init_fn__)			\
47
 	struct init_fn PREFIX_OBJECT(init_fn__)			\
49
 	    __table ( struct init_fn, init_fn, init_order ) = {	\
48
 	    __table ( struct init_fn, init_fn, init_order ) = {	\
50
 		.init = init_func,				\
49
 		.init = init_func,				\
51
-		.reset = reset_func,				\
52
 		.exit = exit_func,				\
50
 		.exit = exit_func,				\
53
 	};
51
 	};
54
 
52
 
55
 /* Function prototypes */
53
 /* Function prototypes */
56
 
54
 
57
 void call_init_fns ( void );
55
 void call_init_fns ( void );
58
-void call_reset_fns ( void );
59
 void call_exit_fns ( void );
56
 void call_exit_fns ( void );
60
 
57
 
61
 #endif /* _GPXE_INIT_H */
58
 #endif /* _GPXE_INIT_H */

+ 1
- 1
src/proto/nfs.c View File

608
 	return 1;
608
 	return 1;
609
 }
609
 }
610
 
610
 
611
-INIT_FN ( INIT_RPC, rpc_init, nfs_reset, nfs_reset );
611
+INIT_FN ( INIT_RPC, rpc_init, nfs_reset );
612
 
612
 
613
 struct protocol nfs_protocol __protocol = {
613
 struct protocol nfs_protocol __protocol = {
614
 	.name = "nfs",
614
 	.name = "nfs",

Loading…
Cancel
Save