summaryrefslogtreecommitdiffstats
path: root/sys/boot/pc98
diff options
context:
space:
mode:
authorgleb <gleb@FreeBSD.org>2012-05-25 09:36:39 +0000
committergleb <gleb@FreeBSD.org>2012-05-25 09:36:39 +0000
commit2dc26af4447ddf75f00ee32933b59022bffa31a6 (patch)
treeb96ac54d1a86e70ab6e3af1f4c959eee6dc450ac /sys/boot/pc98
parent02feec4a4507f678cfd5036cbb906dcc9908b6ba (diff)
downloadFreeBSD-src-2dc26af4447ddf75f00ee32933b59022bffa31a6.zip
FreeBSD-src-2dc26af4447ddf75f00ee32933b59022bffa31a6.tar.gz
Use 32-bit ufs_ino_t instead of ino_t to keep boot2 small and prevent
unnecessary 64-bit math on 32-bit machines. Sponsored by: Google Summer of Code 2011
Diffstat (limited to 'sys/boot/pc98')
-rw-r--r--sys/boot/pc98/boot2/boot2.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/boot/pc98/boot2/boot2.c b/sys/boot/pc98/boot2/boot2.c
index 393a460..95384bd 100644
--- a/sys/boot/pc98/boot2/boot2.c
+++ b/sys/boot/pc98/boot2/boot2.c
@@ -140,7 +140,6 @@ static uint8_t ioctrl = IO_KEYBOARD;
void exit(int);
static void load(void);
static int parse(void);
-static int xfsread(ino_t, void *, size_t);
static int dskread(void *, unsigned, unsigned);
static void printf(const char *,...);
static void putchar(int);
@@ -172,7 +171,7 @@ strcmp(const char *s1, const char *s2)
#include "ufsread.c"
static inline int
-xfsread(ino_t inode, void *buf, size_t nbyte)
+xfsread(ufs_ino_t inode, void *buf, size_t nbyte)
{
if ((size_t)fsread(inode, buf, nbyte) != nbyte) {
printf("Invalid %s\n", "format");
@@ -351,7 +350,7 @@ main(void)
int i;
#endif
uint8_t autoboot;
- ino_t ino;
+ ufs_ino_t ino;
size_t nbyte;
dmadat = (void *)(roundup2(__base + (int32_t)&_end, 0x10000) - __base);
@@ -446,7 +445,7 @@ load(void)
static Elf32_Phdr ep[2];
static Elf32_Shdr es[2];
caddr_t p;
- ino_t ino;
+ ufs_ino_t ino;
uint32_t addr;
int i, j;
OpenPOWER on IntegriCloud