diff options
| author | is <is@NetBSD.org> | 1998-11-13 22:12:35 +0000 |
|---|---|---|
| committer | is <is@NetBSD.org> | 1998-11-13 22:12:35 +0000 |
| commit | be4fc8e1b91763c32d594dfa5bd2bc80c2555eb2 (patch) | |
| tree | 0ceaa576291a6550d742f26a12d62c911dc62093 | |
| parent | 78aeeb96c6d4c02954643ea2e94ab77b033ca095 (diff) | |
Simplify program structure to save a few bytes.
| -rw-r--r-- | sys/arch/amiga/stand/bootblock/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/amiga/stand/bootblock/boot/bbstart.s | 8 | ||||
| -rw-r--r-- | sys/arch/amiga/stand/bootblock/boot/configure.c | 46 | ||||
| -rw-r--r-- | sys/arch/amiga/stand/bootblock/boot/main.c | 17 |
4 files changed, 15 insertions, 60 deletions
diff --git a/sys/arch/amiga/stand/bootblock/boot/Makefile b/sys/arch/amiga/stand/bootblock/boot/Makefile index 5ba76dc5080..a7a86a416bf 100644 --- a/sys/arch/amiga/stand/bootblock/boot/Makefile +++ b/sys/arch/amiga/stand/bootblock/boot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 1998/05/08 19:08:18 chopps Exp $ +# $NetBSD: Makefile,v 1.15 1998/11/13 22:12:35 is Exp $ ### what we need: @@ -17,7 +17,7 @@ DIR_KERN_MD= ${DIR_TOP}/lib/libkern/arch/$(MACHINE_ARCH) FILES= xxboot # XXX fdboot BINDIR=/usr/mdec -COBJS = configure.o main.o console.o xd.o twiddle.o bzero.o gets.o +COBJS = main.o console.o xd.o twiddle.o bzero.o gets.o COBJS+= lseek.o open.o read.o close.o dev.o COBJS+= ufs.o diff --git a/sys/arch/amiga/stand/bootblock/boot/bbstart.s b/sys/arch/amiga/stand/bootblock/boot/bbstart.s index c8579c2550c..6d4ecdb1469 100644 --- a/sys/arch/amiga/stand/bootblock/boot/bbstart.s +++ b/sys/arch/amiga/stand/bootblock/boot/bbstart.s @@ -1,5 +1,5 @@ /* - * $NetBSD: bbstart.s,v 1.2 1997/01/21 18:26:10 is Exp $ + * $NetBSD: bbstart.s,v 1.3 1998/11/13 22:12:35 is Exp $ * * Copyright (c) 1996 Ignatios Souvatzis * All rights reserved. @@ -46,7 +46,6 @@ #define Cmd_Rd 2 - .globl _configure .globl _pain .text @@ -170,11 +169,6 @@ Lendtab: movl a6,_SysBase movl a1,sp@- - bsr _configure - addql #4,sp - tstl d0 - jne Lerr - bsr _pain Lerr: diff --git a/sys/arch/amiga/stand/bootblock/boot/configure.c b/sys/arch/amiga/stand/bootblock/boot/configure.c deleted file mode 100644 index b903821b3ca..00000000000 --- a/sys/arch/amiga/stand/bootblock/boot/configure.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * $NetBSD: configure.c,v 1.1.1.1 1996/11/29 23:36:29 is Exp $ - * - * Copyright (c) 1996 Ignatios Souvatzis - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Ignatios Souvatzis - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#include <sys/types.h> - -#include "stand.h" -#include "samachdep.h" - -int -configure(aio) -void *aio; -{ - xdinit(aio); - return (consinit()); -} diff --git a/sys/arch/amiga/stand/bootblock/boot/main.c b/sys/arch/amiga/stand/bootblock/boot/main.c index 84e09b53ac2..da0044860ba 100644 --- a/sys/arch/amiga/stand/bootblock/boot/main.c +++ b/sys/arch/amiga/stand/bootblock/boot/main.c @@ -1,5 +1,5 @@ /* - * $NetBSD: main.c,v 1.9 1998/10/31 22:40:27 is Exp $ + * $NetBSD: main.c,v 1.10 1998/11/13 22:12:35 is Exp $ * * * Copyright (c) 1996 Ignatios Souvatzis @@ -78,11 +78,13 @@ int get_cpuid __P((u_int32_t *)); static long get_number(char **); -const char version[] = "2.0"; +#define VERSION "2.1" + char default_command[] = "netbsd -ASn2"; int -pain() +pain(aio) + void *aio; { long int io = 0; char linebuf[128]; @@ -128,6 +130,11 @@ pain() extern u_int32_t aio_base; + xdinit(aio); + + if (consinit()) + return(1); + /* * we need V36 for: EClock, RDB Bootblocks, CacheClearU */ @@ -138,8 +145,8 @@ pain() goto out; } - printf("\2337mNetBSD/Amiga bootblock %s\2330m\n%s :- ", - version, kernel_name); + printf("\2337mNetBSD/Amiga bootblock " VERSION "\2330m\n%s :- ", + kernel_name); timelimit = 3; gets(linebuf); |
