PERFORCE change 37712 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Sep 6 23:22:43 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=37712
Change 37712 by marcel at marcel_nfs on 2003/09/06 23:22:06
IFC @37710
Affected files ...
.. //depot/projects/uart/alpha/include/db_machdep.h#2 integrate
.. //depot/projects/uart/conf/NOTES#11 integrate
.. //depot/projects/uart/conf/files#22 integrate
.. //depot/projects/uart/conf/files.pc98#8 integrate
.. //depot/projects/uart/dev/uart/uart_cpu.h#9 integrate
.. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#1 branch
.. //depot/projects/uart/dev/uart/uart_dev_i8251.c#1 branch
.. //depot/projects/uart/dev/uart/uart_dev_i8251.h#1 branch
.. //depot/projects/uart/i386/i386/sys_machdep.c#8 integrate
.. //depot/projects/uart/ia64/conf/GENERIC#2 integrate
.. //depot/projects/uart/ia64/conf/GENERIC.hints#2 integrate
.. //depot/projects/uart/kern/init_sysent.c#3 integrate
.. //depot/projects/uart/kern/syscalls.c#3 integrate
.. //depot/projects/uart/kern/syscalls.master#3 integrate
.. //depot/projects/uart/modules/uart/Makefile#6 integrate
.. //depot/projects/uart/sys/syscall.h#3 integrate
.. //depot/projects/uart/sys/syscall.mk#3 integrate
.. //depot/projects/uart/sys/sysproto.h#3 integrate
Differences ...
==== //depot/projects/uart/alpha/include/db_machdep.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.7 2003/02/25 00:42:39 marcel Exp $ */
+/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.8 2003/09/07 05:33:46 marcel Exp $ */
/* $NetBSD: db_machdep.h,v 1.6 1997/09/06 02:02:25 thorpej Exp $ */
/*
@@ -34,8 +34,9 @@
/*
* Machine-dependent defines for new kernel debugger.
*/
-
+#ifndef KLD_MODULE
#include "opt_ddb.h"
+#endif
#include <sys/param.h>
#include <vm/vm.h>
==== //depot/projects/uart/conf/NOTES#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1171 2003/08/24 09:22:25 sos Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1172 2003/09/07 03:45:48 marcel Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1437,8 +1437,45 @@
hint.sio.0.flags="0x10"
hint.sio.0.irq="4"
+# Options for sio:
+options CONSPEED=115200 # speed for serial console
+ # (default 9600)
+options COM_ESP #code for Hayes ESP
+options COM_MULTIPORT #code for some cards with shared IRQs
+
+# `flags' specific to sio(4). See below for flags used by both sio(4) and
+# uart(4).
+# 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.
+# PnP `flags'
+# 0x1 disable probing of this device. Used to prevent your modem
+# from being attached as a PnP modem.
+# 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.
+
#
-# `flags' for serial drivers that support consoles (only for sio now):
+# uart: newbusified driver for serial interfaces. It consolidates the sio(4),
+# sab(4) and zs(4) drivers.
+
+device uart
+
+# The following hint should only be used for pure ISA devices. It is not
+# needed otherwise. Use of hints is strongly discouraged.
+hint.uart.0.at="isa"
+
+# The following 3 hints are used when the UART is a system device (ie console
+# or debug port), but only on platforms that don't have any other means to
+# pass the information to the kernel. The unit number of the hint is only used
+# to bundle the hints together. There's no relation to the unit number of the
+# probed UART.
+hint.uart.0.port="0x3f8"
+hint.uart.0.flags="0x10"
+hint.uart.0.baud="115200"
+
+# `flags' for serial drivers that support consoles like sio(4) and uart(4):
# 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
@@ -1446,36 +1483,18 @@
# 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.
# 0x80 use this port for serial line gdb support in ddb.
#
-# PnP `flags'
-# 0x1 disable probing of this device. Used to prevent your modem
-# from being attached as a PnP modem.
-#
-# Options for serial drivers that support consoles (only for sio now):
+# Options for serial drivers that support consoles:
options BREAK_TO_DEBUGGER #a BREAK on a comconsole goes to
#DDB, if available.
-options CONSPEED=115200 # speed for serial console
- # (default 9600)
# 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
==== //depot/projects/uart/conf/files#22 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.819 2003/09/06 23:23:25 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.820 2003/09/07 05:05:40 imp Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -783,10 +783,12 @@
dev/uart/uart_bus_acpi.c optional uart acpi
dev/uart/uart_bus_ebus.c optional uart ebus
dev/uart/uart_bus_isa.c optional uart isa
+#dev/uart/uart_bus_cbus.c optional uart cbus
dev/uart/uart_bus_pci.c optional uart cardbus
dev/uart/uart_bus_pci.c optional uart pci
dev/uart/uart_bus_puc.c optional uart puc
dev/uart/uart_core.c optional uart
+dev/uart/uart_dev_i8251.c optional uart
dev/uart/uart_dev_ns8250.c optional uart
dev/uart/uart_dev_sab82532.c optional uart
dev/uart/uart_dev_z8530.c optional uart
==== //depot/projects/uart/conf/files.pc98#8 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.278 2003/09/06 23:23:25 marcel Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.279 2003/09/07 05:05:40 imp Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -131,7 +131,7 @@
dev/syscons/scvidctl.c optional sc
dev/syscons/syscons.c optional sc
dev/syscons/sysmouse.c optional sc
-dev/uart/uart_cpu_i386.c optional uart
+dev/uart/uart_cpu_pc98.c optional uart
geom/geom_bsd.c standard
geom/geom_bsd_enc.c standard
geom/geom_pc98.c standard
==== //depot/projects/uart/dev/uart/uart_cpu.h#9 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/dev/uart/uart_cpu.h,v 1.2 2003/09/07 04:59:15 imp Exp $
*/
#ifndef _DEV_UART_CPU_H_
@@ -41,6 +41,7 @@
int (*getc)(struct uart_bas *);
};
+extern struct uart_ops uart_i8251_ops;
extern struct uart_ops uart_ns8250_ops;
extern struct uart_ops uart_sab82532_ops;
extern struct uart_ops uart_z8530_ops;
==== //depot/projects/uart/i386/i386/sys_machdep.c#8 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.90 2003/08/25 09:48:47 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/sys_machdep.c,v 1.91 2003/09/07 05:23:28 davidxu Exp $");
#include "opt_kstack_pages.h"
#include "opt_mac.h"
@@ -409,10 +409,8 @@
return(error);
}
-#ifdef DEBUG
static int ldt_warnings;
#define NUM_LDT_WARNINGS 10
-#endif
static int
i386_set_ldt(td, args)
@@ -464,14 +462,12 @@
}
if (!(uap->start == LDT_AUTO_ALLOC && uap->num == 1)) {
-#ifdef DEBUG
/* complain a for a while if using old methods */
if (ldt_warnings++ < NUM_LDT_WARNINGS) {
printf("Warning: pid %d used static ldt allocation.\n",
td->td_proc->p_pid);
printf("See the i386_set_ldt man page for more info\n");
}
-#endif
/* verify range of descriptors to modify */
largest_ld = uap->start + uap->num;
if (uap->start >= MAX_LD ||
==== //depot/projects/uart/ia64/conf/GENERIC#2 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.54 2003/06/08 02:03:01 jmallett Exp $
+# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.55 2003/09/07 05:47:10 marcel Exp $
machine ia64
cpu ITANIUM
@@ -120,8 +120,8 @@
#device agp # support several AGP chipsets
-# Serial (COM) ports
-device sio
+# Serial ports (UARTs).
+device uart
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
==== //depot/projects/uart/ia64/conf/GENERIC.hints#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.3 2002/11/05 08:23:26 marcel Exp $
+# $FreeBSD: src/sys/ia64/conf/GENERIC.hints,v 1.4 2003/09/07 05:47:10 marcel Exp $
hint.fdc.0.at="isa"
hint.fdc.0.port="0x3F0"
hint.fdc.0.irq="6"
@@ -13,12 +13,8 @@
hint.psm.0.irq="12"
hint.vga.0.at="isa"
hint.sc.0.at="isa"
-hint.sio.0.at="isa"
-hint.sio.0.port="0x3F8"
-hint.sio.0.flags="0x10"
-hint.sio.0.irq="4"
-hint.sio.1.at="isa"
-hint.sio.1.port="0x2F8"
-hint.sio.1.irq="3"
+hint.uart.0.port="0x3F8"
+hint.uart.0.flags="0x10"
+hint.uart.0.baud="115200"
hint.ppc.0.at="isa"
hint.ppc.0.irq="7"
==== //depot/projects/uart/kern/init_sysent.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.155 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.156 2003/09/07 05:42:06 alc Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp
*/
#include "opt_compat.h"
@@ -93,7 +93,7 @@
{ compat(SYF_MPSAFE | AS(ofstat_args),fstat) }, /* 62 = old fstat */
{ compat(SYF_MPSAFE | AS(getkerninfo_args),getkerninfo) }, /* 63 = old getkerninfo */
{ compat(SYF_MPSAFE | 0,getpagesize) }, /* 64 = old getpagesize */
- { AS(msync_args), (sy_call_t *)msync }, /* 65 = msync */
+ { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync }, /* 65 = msync */
{ SYF_MPSAFE | 0, (sy_call_t *)vfork }, /* 66 = vfork */
{ 0, (sy_call_t *)nosys }, /* 67 = obsolete vread */
{ 0, (sy_call_t *)nosys }, /* 68 = obsolete vwrite */
==== //depot/projects/uart/kern/syscalls.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.141 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp
+ * $FreeBSD: src/sys/kern/syscalls.c,v 1.142 2003/09/07 05:42:06 alc Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp
*/
const char *syscallnames[] = {
==== //depot/projects/uart/kern/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp $
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.153 2003/09/07 05:42:06 alc Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
;
; System call name/number master file.
@@ -128,7 +128,7 @@
int arg); } getkerninfo getkerninfo_args int
64 MCOMPAT BSD { int getpagesize(void); } \
getpagesize getpagesize_args int
-65 STD BSD { int msync(void *addr, size_t len, int flags); }
+65 MSTD BSD { int msync(void *addr, size_t len, int flags); }
66 MSTD BSD { int vfork(void); }
67 OBSOL NOHIDE vread
68 OBSOL NOHIDE vwrite
==== //depot/projects/uart/modules/uart/Makefile#6 (text+ko) ====
@@ -1,10 +1,11 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/modules/uart/Makefile,v 1.2 2003/09/07 05:00:32 imp Exp $
.PATH: ${.CURDIR}/../../dev/uart
KMOD= uart
SRCS= uart_bus_acpi.c uart_bus_ebus.c uart_bus_isa.c uart_bus_pci.c \
uart_bus_puc.c uart_core.c uart_cpu_${MACHINE_ARCH}.c \
+ uart_dev_i8251.c \
uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c uart_if.c \
uart_tty.c
SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h
==== //depot/projects/uart/sys/syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/syscall.h,v 1.139 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp
+ * $FreeBSD: src/sys/sys/syscall.h,v 1.140 2003/09/07 05:42:07 alc Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp
*/
#define SYS_syscall 0
==== //depot/projects/uart/sys/syscall.mk#3 (text+ko) ====
@@ -1,7 +1,7 @@
# FreeBSD system call names.
# DO NOT EDIT-- this file is automatically generated.
-# $FreeBSD: src/sys/sys/syscall.mk,v 1.94 2003/07/17 22:45:33 davidxu Exp $
-# created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp
+# $FreeBSD: src/sys/sys/syscall.mk,v 1.95 2003/09/07 05:42:07 alc Exp $
+# created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp
MIASM = \
syscall.o \
exit.o \
==== //depot/projects/uart/sys/sysproto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.135 2003/07/17 22:45:33 davidxu Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.151 2003/06/28 08:29:05 davidxu Exp
+ * $FreeBSD: src/sys/sys/sysproto.h,v 1.136 2003/09/07 05:42:07 alc Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.152 2003/07/17 22:45:33 davidxu Exp
*/
#ifndef _SYS_SYSPROTO_H_
More information about the p4-projects
mailing list