PERFORCE change 30415 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=30415

Change 30415 by marcel at marcel_nfs on 2003/05/02 15:33:02

	Update documentation:
	COM_FORCECONSOLE is gone. Use boot -h or set boot_serial=YES.
	COM_LLCONSOLE is gone. Remote GDB support is going to be
	handled like the console support, which makes this flag
	obsolete.
	COM_ESP is gone. This driver is for UARTs. Enhanced serial
	ports are better off with their own driver. The ESP support
	was limited to UART compatibility only anyway.
	COM_MULTIPORT is gone. Multiport cards are going to be handled
	by puc(4). This needs more work of course.
	COM_ST6650* is gone. We'll detect at runtime (now only FIFO
	size, but based on that we can also probe other features).
	
	Document hint.sio.0.baud as a way to set the default baudrate.
	This makes compile-time defaults mostly redundant. Both
	CONSPEED and GDBSPEED have been retained for now.

Affected files ...

.. //depot/projects/sio/sys/conf/NOTES#2 edit

Differences ...

==== //depot/projects/sio/sys/conf/NOTES#2 (text+ko) ====

@@ -1411,23 +1411,22 @@
 
 device		sio
 hint.sio.0.at="isa"
-hint.sio.0.port="0x3F8"
+hint.sio.0.baud="9600"
 hint.sio.0.flags="0x10"
 hint.sio.0.irq="4"
+hint.sio.0.port="0x3F8"
 
 #
-# `flags' for serial drivers that support consoles (only for sio now):
-#	0x10	enable console support for this unit.  The other console flags
-#		are ignored unless this is set.  Enabling console support does
-#		not make the unit the preferred console - boot with -h or set
-#		the 0x20 flag for that.  Currently, at most one unit can have
-#		console support; the first one (in config file order) with
-#		this flag set is preferred.  Setting this flag for sio0 gives
-#		the old behaviour.
-#	0x20	force this unit to be the console (unless there is another
-#		higher priority console).  This replaces the COMCONSOLE option.
-#	0x40	reserve this unit for low level console operations.  Do not
-#		access the device in any normal way.
+# `flags' for serial drivers that support consoles:
+#	0x10	enable console support for this unit.  Enabling console
+#		support does not automaticly make the unit the preferred
+#		console - boot with -h or set boot_serial="YES" in the
+#		loader configuration file.  On some architectures the
+#		firmware will provide the information as to whether there's
+#		a serial port for use as a console.  On those architectures
+#		this flag is only used when the firmware does not provide
+#		the necessary information.  Currently the first sio device
+#		which has this flag set will battle for the console.
 #	0x80	use this port for serial line gdb support in ddb.
 #
 # PnP `flags'
@@ -1438,22 +1437,14 @@
 # Options for serial drivers that support consoles (only for sio now):
 options 	BREAK_TO_DEBUGGER	#a BREAK on a comconsole goes to
 					#DDB, if available.
-options 	CONSPEED=115200		# speed for serial console
-					# (default 9600)
+options 	CONSPEED=9600		# default speed for serial consoles
+options 	GDBSPEED=CONSPEED	# default speed for remote GDB
 
 # Solaris implements a new BREAK which is initiated by a character
 # sequence CR ~ ^b which is similar to a familiar pattern used on
 # Sun servers by the Remote Console.
 options 	ALT_BREAK_TO_DEBUGGER
 
-# Options for sio:
-options 	COM_ESP			#code for Hayes ESP
-options 	COM_MULTIPORT		#code for some cards with shared IRQs
-
-# Other flags for sio that aren't documented in the man page.
-#	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
-#		ST16650A-compatible UARTs.
-
 # PCI Universal Communications driver
 # Supports various single and multi port PCI serial cards. Maybe later
 # also the parallel ports on combination serial/parallel cards. New cards