Date: Wed, 30 Apr 2003 15:58:02 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30173 for review Message-ID: <200304302258.h3UMw22K037006@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30173 Change 30173 by peter@peter_daintree on 2003/04/30 15:57:41 IFC @30172 Affected files ... .. //depot/projects/hammer/etc/pam.d/ftpd#3 integrate .. //depot/projects/hammer/etc/pam.d/gdm#3 integrate .. //depot/projects/hammer/etc/pam.d/kde#3 integrate .. //depot/projects/hammer/etc/pam.d/login#3 integrate .. //depot/projects/hammer/etc/pam.d/other#3 integrate .. //depot/projects/hammer/etc/pam.d/sshd#3 integrate .. //depot/projects/hammer/etc/pam.d/su#4 integrate .. //depot/projects/hammer/etc/pam.d/telnetd#3 integrate .. //depot/projects/hammer/etc/pam.d/xdm#3 integrate .. //depot/projects/hammer/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/hammer/sys/amd64/include/_limits.h#1 branch .. //depot/projects/hammer/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/hammer/sys/amd64/include/_types.h#1 branch .. //depot/projects/hammer/sys/amd64/include/endian.h#1 branch .. //depot/projects/hammer/sys/amd64/include/limits.h#1 branch .. //depot/projects/hammer/sys/amd64/include/param.h#1 branch .. //depot/projects/hammer/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/hammer/sys/boot/Makefile#4 integrate .. //depot/projects/hammer/sys/conf/kern.mk#7 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#6 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#6 integrate Differences ... ==== //depot/projects/hammer/etc/pam.d/ftpd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.17 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "ftpd" service # @@ -17,5 +17,4 @@ account required pam_unix.so # session -#session required pam_krb5.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/gdm#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/gdm,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "gdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/kde#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/kde,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "kde" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/login#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "login" service # @@ -20,7 +20,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/hammer/etc/pam.d/other#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.9 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "other" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/sshd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "sshd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/hammer/etc/pam.d/su#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.13 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.14 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "su" service # @@ -19,5 +19,4 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so ==== //depot/projects/hammer/etc/pam.d/telnetd#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "telnetd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/hammer/etc/pam.d/xdm#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.7 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.8 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "xdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session required pam_ssh.so want_agent session required pam_permit.so ==== //depot/projects/hammer/sys/boot/Makefile#4 (text+ko) ==== @@ -1,4 +1,9 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.15 2003/02/13 04:35:04 benno Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.16 2003/04/30 22:13:36 peter Exp $ + +.if ${MACHINE_ARCH} == "amd64" +MACHINE_ARCH=i386 +MACHINE=i386 +.endif .if ${MACHINE_ARCH} == "amd64" MACHINE_ARCH=i386 ==== //depot/projects/hammer/sys/conf/kern.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.32 2003/02/28 06:49:59 jake Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.33 2003/04/30 22:22:29 peter Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -54,10 +54,11 @@ # # For AMD64, use a medium model for now. We'll switch to "kernel" -# once pmap is ready. +# once pmap is ready. Be excessively careful to not generate FPU code. # .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -mcmodel=medium -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float +CFLAGS+= -mcmodel=medium -mno-red-zone \ + -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float .endif # ==== //depot/projects/hammer/sys/dev/puc/puc.c#6 (text+ko) ==== @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.22 2003/03/15 16:25:40 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.23 2003/04/30 22:15:47 sobomax Exp $"); /* * PCI "universal" communication card device driver, glues com, lpt, @@ -140,7 +140,7 @@ case PUC_ILR_TYPE_DIGI: sc->ilr_st = rman_get_bustag(res); sc->ilr_sh = rman_get_bushandle(res); - for (i = 0; i < 2; i++) { + for (i = 0; i < 2 && sc->sc_desc->ilr_offset[i] != 0; i++) { t1 = bus_space_read_1(sc->ilr_st, sc->ilr_sh, sc->sc_desc->ilr_offset[i]); t1 = ~t1; @@ -353,7 +353,7 @@ mask = 0; switch (sc->sc_desc->ilr_type) { case PUC_ILR_TYPE_DIGI: - for (i = 1; i >= 0; i--) { + for (i = 1; i >= 0 && sc->sc_desc->ilr_offset[i] != 0; i--) { mask = (mask << 8) | (bus_space_read_1(sc->ilr_st, sc->ilr_sh, sc->sc_desc->ilr_offset[i]) & 0xff); } ==== //depot/projects/hammer/sys/dev/puc/pucdata.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.19 2003/04/07 09:42:45 murray Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.20 2003/04/30 22:15:47 sobomax Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -1008,6 +1008,40 @@ }, }, + { "IC Book Labs Ironclad x8 Lite", + NULL, + { 0xb00c, 0x041c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ } + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + + { "IC Book Labs Ironclad x8 Pro", + NULL, + { 0xb00c, 0x051c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ } + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + { "IC Book Labs Dreadnought x16 Lite", NULL, { 0xb00c, 0x091c, 0, 0 },
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304302258.h3UMw22K037006>