Use twiddle() in libsa (mycroft's changes)
This commit is contained in:
gwr
parent
776a63c347
commit
60212a408a
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: boot.c,v 1.1.1.1 1995/02/14 22:56:37 gwr Exp $ */
|
||||
/* $NetBSD: boot.c,v 1.2 1995/02/24 05:06:43 gwr Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1990, 1993
|
||||
@ -83,7 +83,6 @@ main()
|
||||
printf("boot: ");
|
||||
gets(kernel);
|
||||
}
|
||||
reset_twiddle();
|
||||
|
||||
printf("Booting %s @ 0x%x\n", kernel, LOADADDR);
|
||||
copyunix(io, LOADADDR);
|
||||
@ -104,7 +103,6 @@ copyunix(io, addr)
|
||||
printf("%s: Bad format\n", kernel);
|
||||
return;
|
||||
}
|
||||
reset_twiddle();
|
||||
printf("%d", x.a_text);
|
||||
if (N_GETMAGIC(x) == ZMAGIC) {
|
||||
entry = (void (*)())(addr+sizeof(struct exec));
|
||||
@ -116,12 +114,10 @@ copyunix(io, addr)
|
||||
if (N_GETMAGIC(x) == ZMAGIC || N_GETMAGIC(x) == NMAGIC)
|
||||
while ((int)addr & __LDPGSZ)
|
||||
*addr++ = 0;
|
||||
reset_twiddle();
|
||||
printf("+%d", x.a_data);
|
||||
if (read(io, addr, x.a_data) != x.a_data)
|
||||
goto shread;
|
||||
addr += x.a_data;
|
||||
reset_twiddle();
|
||||
printf("+%d", x.a_bss);
|
||||
for (i = 0; i < x.a_bss; i++)
|
||||
*addr++ = 0;
|
||||
@ -132,11 +128,9 @@ copyunix(io, addr)
|
||||
if (read(io, addr, x.a_syms) != x.a_syms)
|
||||
goto shread;
|
||||
addr += x.a_syms;
|
||||
reset_twiddle();
|
||||
|
||||
if (read(io, &strtablen, sizeof(int)) != sizeof(int))
|
||||
goto shread;
|
||||
reset_twiddle();
|
||||
|
||||
bcopy(&strtablen, addr, sizeof(int));
|
||||
if (i = strtablen) {
|
||||
@ -144,7 +138,6 @@ copyunix(io, addr)
|
||||
addr += sizeof(int);
|
||||
if (read(io, addr, i) != i)
|
||||
goto shread;
|
||||
reset_twiddle();
|
||||
addr += i;
|
||||
}
|
||||
printf("%d]", i);
|
||||
@ -154,7 +147,7 @@ copyunix(io, addr)
|
||||
printf("=0x%x\n", addr);
|
||||
|
||||
#define DDB_MAGIC ( ('D'<<24) | ('D'<<16) | ('B'<<8) | ('0') )
|
||||
(*entry)(romp, esym, DDB_MAGIC);
|
||||
(*entry)(); /* XXX */
|
||||
return;
|
||||
shread:
|
||||
printf("Short read\n");
|
||||
|
||||
@ -1,40 +1,9 @@
|
||||
/* $NetBSD: version.c,v 1.1.1.1 1995/02/14 22:56:37 gwr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 Paul Kranenburg
|
||||
* 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 Paul Kranenburg.
|
||||
* 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.
|
||||
*/
|
||||
/* $NetBSD: version.c,v 1.2 1995/02/24 05:06:45 gwr Exp $ */
|
||||
|
||||
/*
|
||||
* NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.
|
||||
*
|
||||
* 1.1
|
||||
* 1.2 get it to work with V0 bootproms.
|
||||
*/
|
||||
|
||||
char *version = "$Revision: 1.1.1.1 $";
|
||||
char *version = "$Revision: 1.2 $";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bootxx.c,v 1.1.1.1 1995/02/14 22:56:36 gwr Exp $ */
|
||||
/* $NetBSD: bootxx.c,v 1.2 1995/02/24 05:07:00 gwr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Paul Kranenburg
|
||||
@ -58,9 +58,7 @@ struct fs *fs;
|
||||
int maxblocknum = MAXBLOCKNUM;
|
||||
daddr_t blocknum[MAXBLOCKNUM] = { 0 };
|
||||
|
||||
main(argc, argv)
|
||||
int argc;
|
||||
char **argv;
|
||||
main()
|
||||
{
|
||||
char *dummy;
|
||||
int n;
|
||||
@ -124,4 +122,3 @@ copyboot(f, addr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
twiddle() {}
|
||||
|
||||
@ -1,11 +1,10 @@
|
||||
# $NetBSD: Makefile,v 1.1.1.1 1995/02/14 22:56:37 gwr Exp $
|
||||
# $NetBSD: Makefile,v 1.2 1995/02/24 05:07:01 gwr Exp $
|
||||
|
||||
LIB=sa
|
||||
|
||||
SRCS= alloc.c ashrdi3.c bcopy.c bzero.c gets.c \
|
||||
open.c panic.c printf.c promcons.c promdev.c \
|
||||
read.c strcmp.c strerror.c strlen.c strlen.c \
|
||||
twiddle.c ufs.c
|
||||
SRCS= alloc.c ashrdi3.c bcopy.c bzero.c gets.c open.c \
|
||||
panic.c printf.c promcons.c promdev.c read.c \
|
||||
strcmp.c strerror.c strlen.c strlen.c ufs.c
|
||||
|
||||
NOPIC=nopic
|
||||
NOPROFILE=noprofile
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
|
||||
/* This is now in lib/libsa/printf.c */
|
||||
|
||||
static short tw_on;
|
||||
static short tw_pos;
|
||||
static char tw_chars[4] = "|/-\\";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user