diff options
Diffstat (limited to 'sys/boot/i386/loader/main.c')
| -rw-r--r-- | sys/boot/i386/loader/main.c | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c index dfd1bfffbb98c..b9e93f49b357e 100644 --- a/sys/boot/i386/loader/main.c +++ b/sys/boot/i386/loader/main.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: main.c,v 1.13 1998/10/22 20:23:58 msmith Exp $ + * $Id: main.c,v 1.10 1998/10/03 18:27:50 rnordier Exp $ */ /* @@ -58,8 +58,6 @@ static struct bootinfo *initial_bootinfo; struct arch_switch archsw; /* MI/MD interface boundary */ static void extract_currdev(void); -static int isa_inb(int port); -static void isa_outb(int port, int value); /* from vers.c */ extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[]; @@ -98,11 +96,6 @@ main(void) cons_probe(); /* - * Initialise the block cache - */ - bcache_init(32, 512); /* 16k cache XXX tune this */ - - /* * March through the device switch probing for things. */ for (i = 0; devsw[i] != NULL; i++) @@ -112,6 +105,10 @@ main(void) printf("\n"); printf("%s, Revision %s %d/%dkB\n", bootprog_name, bootprog_rev, getbasemem(), getextmem()); printf("(%s, %s)\n", bootprog_maker, bootprog_date); +#if 0 + printf("recovered args howto = 0x%x bootdev = 0x%x bootinfo = %p\n", + initial_howto, initial_bootdev, initial_bootinfo); +#endif extract_currdev(); /* set $currdev and $loaddev */ setenv("LINES", "24", 1); /* optional */ @@ -121,8 +118,6 @@ main(void) archsw.arch_copyin = i386_copyin; archsw.arch_copyout = i386_copyout; archsw.arch_readin = i386_readin; - archsw.arch_isainb = isa_inb; - archsw.arch_isaoutb = isa_outb; interact(); /* doesn't return */ } @@ -200,34 +195,3 @@ command_heap(int argc, char *argv[]) printf("heap base at %p, top at %p\n", end, sbrk(0)); return(CMD_OK); } - -/* ISA bus access functions for PnP, derived from <machine/cpufunc.h> */ -static int -isa_inb(int port) -{ - u_char data; - - if (__builtin_constant_p(port) && - (((port) & 0xffff) < 0x100) && - ((port) < 0x10000)) { - __asm __volatile("inb %1,%0" : "=a" (data) : "id" ((u_short)(port))); - } else { - __asm __volatile("inb %%dx,%0" : "=a" (data) : "d" (port)); - } - return(data); -} - -static void -isa_outb(int port, int value) -{ - u_char al = value; - - if (__builtin_constant_p(port) && - (((port) & 0xffff) < 0x100) && - ((port) < 0x10000)) { - __asm __volatile("outb %0,%1" : : "a" (al), "id" ((u_short)(port))); - } else { - __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); - } -} - |