Don't pretend to support ix86's with 16-bit ints by using longs just

to ensure 32-bit variables.  Doing so broke i386's with 64-bit longs.

This also fixes printf format errors.

3 files changed, 11 insertions, 11 deletions

diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index e1ff4f9..394f86e 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/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.72 1998/10/01 18:22:46 msmith Exp $
+ *	$Id: boot.c,v 1.73 1998/10/10 14:02:06 bde Exp $
  */
 
 
@@ -196,9 +196,9 @@ static void
 loadprog(void)
 {
 	struct exec head;
-	long int startaddr;
-	long int addr;	/* physical address.. not directly useable */
-	long int bootdev;
+	int startaddr;
+	int addr;	/* physical address.. not directly useable */
+	int bootdev;
 	int i;
 	unsigned pad;
 	char *s, *t;
@@ -340,9 +340,9 @@ loadprog(void)
 	readfile(kernel_config_namebuf, kernel_config, KERNEL_CONFIG_SIZE);
 	pcpy(kernel_config, (char *)&disklabel + ouraddr, KERNEL_CONFIG_SIZE);
 
-	printf("total=0x%x entry point=0x%x\n", (int)addr, (int)startaddr);
-	startprog((int)startaddr, loadflags | RB_BOOTINFO, bootdev,
-		  (int)&bootinfo + ouraddr);
+	printf("total=0x%x entry point=0x%x\n", addr, startaddr);
+	startprog(startaddr, loadflags | RB_BOOTINFO, bootdev,
+		  (unsigned)&bootinfo + ouraddr);
 }
 
 static void
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index 366dbfc..e107b47 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/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: boot.h,v 1.22 1997/09/24 07:44:34 phk Exp $
+ *	$Id: boot.h,v 1.23 1997/12/04 21:52:42 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -42,7 +42,7 @@ extern char *name;
 extern struct fs *fs;
 extern struct inode inode;
 extern int dosdev, unit, slice, part, maj, boff, poff;
-extern unsigned long tw_chars;
+extern unsigned tw_chars;
 extern int loadflags;
 extern struct disklabel disklabel;
 
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index b13b7f0..ad81d79 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.15 1997/02/22 09:30:15 peter Exp $
+ *	$Id: table.c,v 1.16 1998/09/15 09:59:58 gibbs Exp $
  */
 
 /*
@@ -137,4 +137,4 @@ struct pseudo_desc Idtr_real = { 0x400 - 1, 0x0, 0x0 };
  * fragmentation.
  */
 char *devs[] = { "wd", "dk", "fd", "wt", "da", 0 };
-unsigned long tw_chars = 0x5C2D2F7C;	/* "\-/|" */
+unsigned tw_chars = 0x5C2D2F7C;	/* "\-/|" */