summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshihiro Takahashi <nyan@FreeBSD.org>2000-08-08 04:03:19 +0000
committerYoshihiro Takahashi <nyan@FreeBSD.org>2000-08-08 04:03:19 +0000
commit5d7132fc3c4f6bc8b3d8a36639f7daf035cf2d08 (patch)
tree8d628c53194a9ff833cbd9080cd4b00d29ea7c8e
parent03982f57228ede2c8acf3be79ccdbf2e74606fec (diff)
Notes
-rw-r--r--lib/libdisk/disk.c5
-rw-r--r--lib/libdisk/write_disk.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 3b61766c1b7a..312038285a5d 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -44,12 +44,14 @@ Open_Disk(const char *name)
return Int_Open_Disk(name,0);
}
+#ifndef PC98
static u_int32_t
Read_Int32(u_int32_t *p)
{
u_int8_t *bp = (u_int8_t *)p;
return bp[0] | (bp[1] << 8) | (bp[2] << 16) | (bp[3] << 24);
}
+#endif
struct disk *
Int_Open_Disk(const char *name, u_long size)
@@ -155,7 +157,7 @@ Int_Open_Disk(const char *name, u_long size)
#ifdef __i386__
#ifdef PC98
/* XXX -- Quick Hack!
- * Check MS-DOG MO
+ * Check MS-DOS MO
*/
if ((*p == 0xf0 || *p == 0xf8) &&
(*(p+1) == 0xff) &&
@@ -186,6 +188,7 @@ Int_Open_Disk(const char *name, u_long size)
case 0x21:
case 0x22:
case 0x23:
+ case 0x24:
ce = fat;
break;
#else /* IBM-PC */
diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c
index 80ef12ab052c..83c17b12f3e4 100644
--- a/lib/libdisk/write_disk.c
+++ b/lib/libdisk/write_disk.c
@@ -153,6 +153,7 @@ Write_Extended(int fd, struct disk *new, struct disk *old, struct chunk *c1)
return 0;
}
+#ifndef PC98
static void
Write_Int32(u_int32_t *p, u_int32_t v)
{
@@ -162,6 +163,7 @@ Write_Int32(u_int32_t *p, u_int32_t v)
bp[2] = (v >> 16) & 0xff;
bp[3] = (v >> 24) & 0xff;
}
+#endif
int
Write_Disk(struct disk *d1)