Changes requested by dillon

Diederik de Groot · Diederik de Groot · commit 371ab44d3fd5 · 2018-11-02T01:42:03.000+01:00
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
@@ -78,7 +78,7 @@ will probe for a console and set the
 .Va console
 variable, or set it to serial console
 .Pq Dq comconsole
-if the previous boot stage already used it. If the speed of 
+if the previous boot stage already used it. If the speed of
 the serial connection was already specified in a previous boot
 stage it will set
 .Va comconsole_speed
@@ -524,7 +524,7 @@ The default is
 .Dq Li kernel .
 
 .It Va comconsole_speed
-Defines the speed of the serial console. If the previous boot stage 
+Defines the speed of the serial console. If the previous boot stage
 indicated that a serial console is in use then this variable is initialized
 to the current speed of the console serial port.
 Otherwise it is set to 115200 unless this was overridden using the
diff --git a/sys/boot/common/rbx.h b/sys/boot/common/rbx.h
@@ -29,7 +29,7 @@
 
 static const char optstr[NOPT] = "asrdcvhCgmpqnDM";
 	/* Also 'P':ProbeKeyboard, 'S':SetSerialSpeed */
-	
+
 /* these _LOG2 values are be calculated at compile time */
 static const unsigned char flags[NOPT] = {
 	_LOG2(RB_ASKNAME),
diff --git a/sys/boot/pc32/boot0/boot0.S b/sys/boot/pc32/boot0/boot0.S
@@ -7,7 +7,7 @@
  * 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
@@ -17,7 +17,7 @@
  * 3. Neither the name of The DragonFly Project nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific, prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  * Copyright (c) 2008 Luigi Rizzo (mostly documentation)
  * Copyright (c) 2002 Bruce M. Simpson
  * Copyright (c) 1998 Robert Nordier
@@ -88,7 +88,7 @@
  *
  * This code implements a Master Boot Record (MBR) for an Intel/PC disk.
  * It is 512 bytes long and it is normally loaded by the BIOS (or another
- * bootloader) at 0:0x7c00 (ie: LOAD). This code depends on 
+ * bootloader) at 0:0x7c00 (ie: LOAD). This code depends on
  * %cs:%ip being 0:0x7c00
  *
  * The initial chunk of instructions is used as a signature by external
@@ -123,7 +123,7 @@
  *
  * On entry, the registers contain the following values:
  *
- *	%cs:%ip	0:0x7c00  (ie:LOAD) 
+ *	%cs:%ip	0:0x7c00  (ie:LOAD)
  *	%dl	drive number (0x80, 0x81, ... )
  *	%si	pointer to the partition table from which we were loaded.
  *		Some boot code (e.g. syslinux) use this info to relocate
@@ -565,7 +565,7 @@ putstr.1:	callw putchr			# Display char
 putstr:		lodsb				# Get byte
 		testb $0x80,%al 		# End of string?
 		jz putstr.1			# No
-		andb $~0x80,%al 		# Clear MSB then print last 
+		andb $~0x80,%al 		# Clear MSB then print last
 
 putchr:
 #ifndef SIO
diff --git a/sys/boot/pc32/boot2/boot2.c b/sys/boot/pc32/boot2/boot2.c
@@ -662,7 +662,7 @@ printf(const char *fmt,...)
 				continue;
 #ifdef HAMMER2FS
 			case 'q':
-			case 'x': 
+			case 'x':
 				if (c=='q') {	/* save space */
 					++fmt;	/* skip the 'x' */
 					q = va_arg(ap, uint64_t);
diff --git a/sys/boot/pc32/libi386/comconsole.c b/sys/boot/pc32/libi386/comconsole.c
@@ -33,10 +33,10 @@
 #include <ns16550.h>
 #include "libi386.h"
 
-#define COMC_FMT	0x3		/* 8N1 */
-#define COMC_TXWAIT	0x40000		/* transmit timeout */
-#define COMC_BPS(x)	(115200 / (x))	/* speed to DLAB divisor */
-#define COMC_DIV2BPS(x)	(115200 / (x))	/* DLAB divisor to speed */
+#define COMC_FMT	0x3				/* 8N1 */
+#define COMC_TXWAIT	0x40000				/* transmit timeout */
+#define COMC_BPS(x)     (x ? (115200 / (x)) : 1)	/* speed to DLAB divisor */
+#define COMC_DIV2BPS(x) (x ? (115200 / (x)) : 1)	/* DLAB divisor to speed */
 
 #ifndef	COMPORT
 #define COMPORT		0x3f8
@@ -94,7 +94,7 @@ comc_probe(struct console *cp)
     uint32_t locator;
 #endif
     if (comc_curspeed == 0) {
-	comc_curspeed = 0;
+	comc_curspeed = COMSPEED;
 	/*
 	 * Assume that the speed was set by an earlier boot loader if
 	 * comconsole is already the preferred console.
@@ -377,7 +377,7 @@ comc_setup(int speed, int port)
     outb(comc_port + com_dlbh, COMC_BPS(speed) >> 8);
     outb(comc_port + com_cfcr, COMC_FMT);
     outb(comc_port + com_mcr, MCR_RTS | MCR_DTR);
-    outb(port + com_fifo, FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_DMA_MODE);
+    outb(comc_port + com_fifo, FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_DMA_MODE);
 
     tries = 0;
     do
diff --git a/sys/boot/pc32/loader/main.c b/sys/boot/pc32/loader/main.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2003,2004 The DragonFly Project.  All rights reserved.
- * 
+ *
  * This code is derived from software contributed to The DragonFly Project
  * by Matthew Dillon <dillon@backplane.com>
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -17,7 +17,7 @@
  * 3. Neither the name of The DragonFly Project nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific, prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
@@ -30,7 +30,7 @@
  * 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.
- * 
+ *
  * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *
@@ -79,7 +79,7 @@
 
 #define COMCONSOLE_DEBUG	1
 /* Arguments passed in from the boot1/boot2 loader */
-static struct 
+static struct
 {
     u_int32_t	howto;
     u_int32_t	bootdev;
@@ -173,9 +173,9 @@ main(void)
     bzero(&v86, sizeof(v86));
     v86.efl = PSL_RESERVED_DEFAULT | PSL_I;
 
-    /* 
+    /*
      * Initialize the heap as early as possible.  Once this is done, 
-     * malloc() is usable. 
+     * malloc() is usable.
      *
      * Don't include our stack in the heap.  If the stack is in low
      * user memory use {end,bios_basemem}.  If the stack is in high
@@ -184,7 +184,7 @@ main(void)
      * the heap to bios_basemem.
      *
      * Be sure to use the virtual bios_basemem address rather then
-     * the physical bios_basemem address or we may overwrite BIOS 
+     * the physical bios_basemem address or we may overwrite BIOS
      * data.
      */
     bios_getmem();
@@ -209,8 +209,8 @@ main(void)
 #endif
     setheap((void *)heapbase, (void *)memtop);
 
-    /* 
-     * XXX Chicken-and-egg problem; we want to have console output early, 
+    /*
+     * XXX Chicken-and-egg problem; we want to have console output early,
      * but some console attributes may depend on reading from eg. the boot
      * device, which we can't do yet.
      *
@@ -262,7 +262,7 @@ main(void)
 	    (devsw[i]->dv_init)();
 	/*WDEBUG('M' + i);*/
     }
-    printf("BIOS %dkB/%dkB available memory\n", 
+    printf("BIOS %dkB/%dkB available memory\n",
 	    bios_basemem / 1024, bios_extmem / 1024);
     if (initial_bootinfo != NULL) {
 	initial_bootinfo->bi_basemem = bios_basemem / 1024;
@@ -286,7 +286,7 @@ main(void)
     printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 
 #if COMCONSOLE_DEBUG
-    printf("args at %p initial_howto = %08x bootdev = %08x bootinfo = %p\n", 
+    printf("args at %p initial_howto = %08x bootdev = %08x bootinfo = %p\n",
 	kargs, initial_howto, initial_bootdev, initial_bootinfo);
     if (initial_howto & RB_SERIAL) {
         printf("Serial at Speed:%s on Port:%s\n", getenv("comconsole_speed"), getenv("comconsole_port"));
@@ -296,7 +296,7 @@ main(void)
 
     extract_currdev();				/* set $currdev and $loaddev */
     setenv("LINES", "24", 1);			/* optional */
-    
+
     bios_getsmap();
 
     archsw.arch_autoload = i386_autoload;
@@ -314,7 +314,7 @@ main(void)
 }
 
 /*
- * Set the 'current device' by (if possible) recovering the boot device as 
+ * Set the 'current device' by (if possible) recovering the boot device as
  * supplied by the initial bootstrap.
  *
  * XXX should be extended for netbooting.
@@ -357,14 +357,14 @@ extract_currdev(void)
 	/*
 	 * If we are booted by an old bootstrap, we have to guess at the BIOS
 	 * unit number.  We will loose if there is more than one disk type
-	 * and we are not booting from the lowest-numbered disk type 
+	 * and we are not booting from the lowest-numbered disk type
 	 * (ie. SCSI when IDE also exists).
 	 */
 	if ((biosdev == 0) && (B_TYPE(initial_bootdev) != 2))	/* biosdev doesn't match major */
 	    biosdev = 0x80 + B_UNIT(initial_bootdev);		/* assume harddisk */
     }
     new_currdev.d_type = new_currdev.d_dev->dv_type;
-    
+
     /*
      * If we are booting off of a BIOS disk and we didn't succeed in determining
      * which one we booted off of, just use disk0: as a reasonable default.
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
@@ -42,42 +42,43 @@
  */
 #define	RB_AUTOBOOT	0		/* flags for system auto-booting itself */
 
-#define	RB_ASKNAME	1 << 0		/* ask for file name to reboot from (-a) */
-#define	RB_SINGLE	1 << 1		/* reboot to single user only (-s) */
-#define	RB_NOSYNC	1 << 2		/* dont sync before reboot (unused) */
-#define	RB_HALT		1 << 3		/* don't reboot, just halt */
-#define	RB_INITNAME	1 << 4		/* name given for /etc/init (unused) */
-#define	RB_DFLTROOT	1 << 5		/* use compiled-in rootdev (-r) */
-#define	RB_KDB		1 << 6		/* give control to kernel debugger (-d) */
-#define	RB_RDONLY	1 << 7		/* mount root fs read-only (unused) */
-#define	RB_DUMP		1 << 8		/* dump kernel memory before reboot (unused) */
-#define	RB_MINIROOT	1 << 9		/* mini-root present in memory at boot time (unused) */
-#define RB_CONFIG	1 << 10		/* was: invoke user configuration routing (-c) */
-#define RB_VERBOSE	1 << 11		/* print all potentially useful info (-v) */
-#define	RB_SERIAL	1 << 12		/* user serial port as console (-h) */
-#define	RB_CDROM	1 << 13		/* use cdrom as root (-C) */
-#define	RB_POWEROFF	1 << 14		/* if you can, turn the power off (unused) */
-#define	RB_GDB		1 << 15		/* use GDB remote debugger instead of DDB (-g) */
-#define	RB_MUTE		1 << 16		/* Come up with the console muted (-m) */
-#define	RB_SELFTEST	1 << 17		/* don't boot to normal operation, do selftest (unused) */
-#define RB_RESERVED01	1 << 18		/* reserved for internal use of boot blocks */
-#define RB_RESERVED02	1 << 19		/* reserved for internal use of boot blocks */
-#define	RB_PAUSE	1 << 20		/* pause after each output line during probe (-p) */
-#define RB_QUIET	1 << 21		/* Don't generate output during boot1/boot2 (-q) */
-//#define RB_REROOT	1 << 21		/* unmount the rootfs and mount it again (fbsd)*/
-//#define RB_POWERCYCLE	1 << 22		/* Power cycle if possible (fbsd) */
-//#define RB_UNUSED03	1 << 23
-//#define RB_UNUSED04	1 << 24
-//#define RB_UNUSED05	1 << 25
-#define RB_NOINTR	1 << 26		/* Non Interruptable come up (-n) */
-#define RB_DUAL		1 << 27		/* use comconsole and vidconsole (-D) */
-//#define RB_PROBE	1 << 28		/* Probe multiple consoles (fbsd) */
+#define	RB_ASKNAME	0x00000001	/* ask for file name to reboot from (-a) */
+#define	RB_SINGLE	0x00000002	/* reboot to single user only (-s) */
+#define	RB_NOSYNC	0x00000004	/* dont sync before reboot (unused) */
+#define	RB_HALT		0x00000008	/* don't reboot, just halt */
+#define	RB_INITNAME	0x00000010	/* name given for /etc/init (unused) */
+#define	RB_DFLTROOT	0x00000020	/* use compiled-in rootdev (-r) */
+#define	RB_KDB		0x00000040	/* give control to kernel debugger (-d) */
+#define	RB_RDONLY	0x00000080	/* mount root fs read-only (unused) */
+#define	RB_DUMP		0x00000100	/* dump kernel memory before reboot (unused) */
+#define	RB_MINIROOT	0x00000200	/* mini-root present in memory at boot time (unused) */
+#define RB_CONFIG	0x00000400	/* was: invoke user configuration routing (-c) */
+#define RB_VERBOSE	0x00000800	/* print all potentially useful info (-v) */
+#define	RB_SERIAL	0x00001000	/* user serial port as console (-h) */
+#define	RB_CDROM	0x00002000	/* use cdrom as root (-C) */
+#define	RB_POWEROFF	0x00004000	/* if you can, turn the power off (unused) */
+#define	RB_GDB		0x00008000	/* use GDB remote debugger instead of DDB (-g) */
+#define	RB_MUTE		0x00010000	/* Come up with the console muted (-m) */
+#define	RB_SELFTEST	0x00020000	/* don't boot to normal operation, do selftest (unused) */
+#define RB_RESERVED01	0x00040000	/* reserved for internal use of boot blocks */
+#define RB_RESERVED02	0x00080000	/* reserved for internal use of boot blocks */
+#define	RB_PAUSE	0x00100000	/* pause after each output line during probe (-p) */
+//#define RB_REROOT	0x00200000	/* freebsd */
+#define RB_QUIET	0x00200000	/* Don't generate output during boot1/boot2 (-q) */
+//#define RB_REROOT	0x00400000	/* unmount the rootfs and mount it again (fbsd)*/
+//#define RB_POWERCYCLE	0x00800000	/* Power cycle if possible (fbsd) */
+//#define RB_UNUSED03	0x01000000
+//#define RB_UNUSED04	0x02000000
+//#define RB_UNUSED05	0x04000000
+#define RB_NOINTR	0x08000000	/* Non Interruptable come up (-n) */
+#define RB_DUAL		0x10000000	/* use comconsole and vidconsole (-D) */
+//#define RB_PROBE	0x20000000	/* Probe multiple consoles (fbsd) */
 
 /* temp fixup */
-#define RB_VIDEO	1 << 29		/* use video console */
-#define RB_MULTIPLE	1 << 29		/* use multiple consoles (-D) */
+#define RB_VIDEO	0x40000000	/* use video console */
+#define RB_MULTIPLE	0x40000000	/* use multiple consoles (-D) */
 /* end temp */
 
-#define	RB_BOOTINFO	1 << 31		/* have `struct bootinfo *' arg */
+#define	RB_BOOTINFO	0x8000000	/* have `struct bootinfo *' arg */
 
 #endif
