diff options
author | Michael Brown | 2005-04-08 17:01:17 +0200 |
---|---|---|
committer | Michael Brown | 2005-04-08 17:01:17 +0200 |
commit | 0ff80b477dcff0726ebdbed95e8a93971e59e82b (patch) | |
tree | 860b7150212a07c24a9529ea072f3fb12700974c /src/core/pcmcia.c | |
parent | Merged this file into HEAD (diff) | |
download | ipxe-0ff80b477dcff0726ebdbed95e8a93971e59e82b.tar.gz ipxe-0ff80b477dcff0726ebdbed95e8a93971e59e82b.tar.xz ipxe-0ff80b477dcff0726ebdbed95e8a93971e59e82b.zip |
Merged mcb30-realmode-redesign back to HEAD
Diffstat (limited to 'src/core/pcmcia.c')
-rw-r--r-- | src/core/pcmcia.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/core/pcmcia.c b/src/core/pcmcia.c index 2a7cf2b8..03a96de8 100644 --- a/src/core/pcmcia.c +++ b/src/core/pcmcia.c @@ -1,5 +1,3 @@ -#ifdef CONFIG_PCMCIA - /* * pcmcia.c * @@ -25,13 +23,13 @@ * at some point. If there's anything obvious or better, not-so-obvious, * please contact me by e-mail: anselm (AT) hoffmeister (DOT) be *THANKS* */ -#include "../include/pcmcia.h" -#include "../include/i82365.h" +#include "pcmcia.h" +#include "i82365.h" #define CODE_STATUS "alpha" #define CODE_VERSION "0.1.3" - -#include "../include/pcmcia-opts.h" -#include "../include/pcmcia.h" +#include "pcmcia-opts.h" +#include "console.h" +#include "init.h" int sockets; /* AHTODO: Phase this out! */ u_int pccsocks; @@ -55,7 +53,7 @@ void sleepticks(int numticks ) { return; } -int pcmcia_init_all(void) { +static void pcmcia_init_all(void) { u_int i, j, k, l, m, n, ui, configs = 0; u_int multicard[8]; u_char *uc, upc; @@ -253,17 +251,15 @@ int pcmcia_init_all(void) { getchar(); } - return 0; } -int pcmcia_shutdown_all(void) { +static void pcmcia_shutdown_all(void) { int i; //if ( PDEBUG > 2 ) {printf("<press key to continue>\n" ); getchar(); } for ( i = 0; i < pccsocks; ++i ) { driver[pccsock[i].drivernum].f(SHUTDOWN,pccsock[i].internalid,0,0,0); } printf("Shutdown of PCMCIA subsystem completed"); - return 0; } -#endif /* CONFIG_PCMCIA */ +INIT_FN ( INIT_PCMCIA, pcmcia_init_all, NULL, pcmcia_shutdown_all ); |