aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKATO Takenori <kato@FreeBSD.org>1997-05-28 09:23:00 +0000
committerKATO Takenori <kato@FreeBSD.org>1997-05-28 09:23:00 +0000
commit8e6361044d0eb8969dfe3e3c46cb1e4cdec8c591 (patch)
treea591438cd499cf298d6a8a96df70b9f17504aef8
parent912c83ac3b417f8c503e4920e976a81175e772a9 (diff)
Notes
-rw-r--r--sys/pc98/boot/biosboot/boot.c6
-rw-r--r--sys/pc98/boot/biosboot/boot.h6
-rw-r--r--sys/pc98/boot/biosboot/disk.c13
-rw-r--r--sys/pc98/boot/biosboot/io.c6
-rw-r--r--sys/pc98/boot/biosboot/sys.c22
5 files changed, 27 insertions, 26 deletions
diff --git a/sys/pc98/boot/biosboot/boot.c b/sys/pc98/boot/biosboot/boot.c
index 079bf7be3dc4..9eb20339f38b 100644
--- a/sys/pc98/boot/biosboot/boot.c
+++ b/sys/pc98/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, [92/04/03 16:51:14 rvb]
- * $Id: boot.c,v 1.10 1997/02/22 09:43:05 peter Exp $
+ * $Id: boot.c,v 1.11 1997/03/13 16:58:15 kato Exp $
*/
@@ -70,8 +70,8 @@ static char boot_config[BOOT_CONFIG_SIZE];
char *dflt_name;
#endif
char *name;
-char namebuf[NAMEBUF_LEN];
-struct bootinfo bootinfo;
+static char namebuf[NAMEBUF_LEN];
+static struct bootinfo bootinfo;
int loadflags;
static void getbootdev(char *ptr, int *howto);
diff --git a/sys/pc98/boot/biosboot/boot.h b/sys/pc98/boot/biosboot/boot.h
index 4a554298b358..b50c27572e0c 100644
--- a/sys/pc98/boot/biosboot/boot.h
+++ b/sys/pc98/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:35:03 rpd
- * $Id$
+ * $Id: boot.h,v 1.8 1997/02/22 09:43:06 peter Exp $
*/
#include <sys/param.h>
@@ -71,13 +71,11 @@ void boot2(void);
/* disk.c */
int devopen(void);
void devread(char *iodest, int sector, int cnt);
-char * Bread(int dosdev, int sector);
/* io.c */
void gateA20(void);
void printf(const char *format, ...);
void putchar(int c);
-int getchar(int in_buf);
void delay1ms(void);
int gets(char *buf);
int strcmp(const char *s1, const char *s2);
@@ -99,8 +97,6 @@ void init_serial(void);
/* sys.c */
void xread(char *addr, int size);
void read(char *buffer, int count);
-int find(char *path);
-int block_map(int file_block);
int openrd(void);
#ifdef PC98
diff --git a/sys/pc98/boot/biosboot/disk.c b/sys/pc98/boot/biosboot/disk.c
index c300f04734df..0d38ebce98c9 100644
--- a/sys/pc98/boot/biosboot/disk.c
+++ b/sys/pc98/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:35:49 rpd
- * $Id$
+ * $Id: disk.c,v 1.8 1997/02/22 09:43:07 peter Exp $
*/
/*
@@ -56,12 +56,12 @@
#define HEADS(di) (((di)>>8)&0xff)
#ifdef DO_BAD144
-struct dkbad dkb;
-int do_bad144;
+static struct dkbad dkb;
+static int do_bad144;
#endif DO_BAD144
-int bsize;
+static int bsize;
-int spt, spc;
+static int spt, spc;
struct fs *fs;
struct inode inode;
@@ -80,6 +80,7 @@ static int ra_end;
static int ra_first;
static int badsect(int sector);
+static char *Bread(int dosdev, int sector);
int
devopen(void)
@@ -233,7 +234,7 @@ devread(char *iodest, int sector, int cnt)
}
-char *
+static char *
Bread(int dosdev, int sector)
{
if (dosdev != ra_dev || sector < ra_first || sector >= ra_end)
diff --git a/sys/pc98/boot/biosboot/io.c b/sys/pc98/boot/biosboot/io.c
index d1133a7db798..400ae9e20c8b 100644
--- a/sys/pc98/boot/biosboot/io.c
+++ b/sys/pc98/boot/biosboot/io.c
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:35:57 rpd
- * $Id$
+ * $Id: io.c,v 1.9 1997/02/22 09:43:08 peter Exp $
*/
#include "boot.h"
@@ -35,6 +35,8 @@
#endif
+static int getchar(int in_buf);
+
/*
* Gate A20 for high memory
*/
@@ -112,7 +114,7 @@ putchar(int c)
putc(c);
}
-int
+static int
getchar(int in_buf)
{
int c;
diff --git a/sys/pc98/boot/biosboot/sys.c b/sys/pc98/boot/biosboot/sys.c
index 410d08acf1a6..78da5494576c 100644
--- a/sys/pc98/boot/biosboot/sys.c
+++ b/sys/pc98/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
* the rights to redistribute these changes.
*
* from: Mach, Revision 2.2 92/04/04 11:36:34 rpd
- * $Id: sys.c,v 1.10 1997/02/22 09:43:10 peter Exp $
+ * $Id: sys.c,v 1.11 1997/03/16 10:57:54 kato Exp $
*/
/*
@@ -35,21 +35,20 @@
#include <sys/dirent.h>
#include <sys/reboot.h>
-#ifdef 0
+#if 0
/* #define BUFSIZE 4096 */
#define BUFSIZE MAXBSIZE
-
-char buf[BUFSIZE], fsbuf[SBSIZE], iobuf[MAXBSIZE];
+static char buf[BUFSIZE], fsbuf[SBSIZE], iobuf[MAXBSIZE];
#endif
static char biosdrivedigit;
#define BUFSIZE 8192
#define MAPBUFSIZE BUFSIZE
-char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE];
+static char buf[BUFSIZE], fsbuf[BUFSIZE], iobuf[BUFSIZE];
-char mapbuf[MAPBUFSIZE];
-int mapblock;
+static char mapbuf[MAPBUFSIZE];
+static int mapblock;
int poff;
@@ -57,6 +56,9 @@ int poff;
#define STARTBYTE 8192 /* Where on the media the kernel starts */
#endif
+static int block_map(int file_block);
+static int find(char *path);
+
void
xread(char *addr, int size)
{
@@ -132,9 +134,9 @@ read(char *buffer, int count)
bcopy(iobuf, buffer, count);
}
}
-
#endif
-int
+
+static int
find(char *path)
{
char *rest, ch;
@@ -182,7 +184,7 @@ loop:
}
-int
+static int
block_map(int file_block)
{
int bnum;