CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Thu Sep 3 06:45:24 UTC 2009 Modified Files: src/usr.bin/make: main.c Log Message: Use the W* macros to test wait results. (Mentioned by Joerg in chat a few days ago.) To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/main.c diff -u src/usr.bin/make/main.c:1.171 src/usr.bin/make/main.c:1.172 --- src/usr.bin/make/main.c:1.171 Wed Aug 26 23:17:11 2009 +++ src/usr.bin/make/main.c Thu Sep 3 06:45:23 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.171 2009/08/26 23:17:11 sjg Exp $ */ +/* $NetBSD: main.c,v 1.172 2009/09/03 06:45:23 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,7 +69,7 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: main.c,v 1.171 2009/08/26 23:17:11 sjg Exp $; +static char rcsid[] = $NetBSD: main.c,v 1.172 2009/09/03 06:45:23 dholland Exp $; #else #include sys/cdefs.h #ifndef lint @@ -81,7 +81,7 @@ #if 0 static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94; #else -__RCSID($NetBSD: main.c,v 1.171 2009/08/26 23:17:11 sjg Exp $); +__RCSID($NetBSD: main.c,v 1.172 2009/09/03 06:45:23 dholland Exp $); #endif #endif /* not lint */ #endif @@ -1557,7 +1557,9 @@ if (cc == 0) *errnum = Couldn't read shell's output for \%s\; - if (status) + if (WIFSIGNALED(status)) + *errnum = \%s\ exited on a signal; + else if (WEXITSTATUS(status) != 0) *errnum = \%s\ returned non-zero status; /*
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips
Module Name:src Committed By: matt Date: Thu Sep 3 06:57:11 UTC 2009 Modified Files: src/lib/libc/arch/mips [matt-nb5-mips64]: genassym.cf Log Message: Make sure STACK_T_SIZE is dual-register_t aligned. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/lib/libc/arch/mips/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/genassym.cf diff -u src/lib/libc/arch/mips/genassym.cf:1.1.2.2 src/lib/libc/arch/mips/genassym.cf:1.1.2.3 --- src/lib/libc/arch/mips/genassym.cf:1.1.2.2 Tue Aug 18 06:57:52 2009 +++ src/lib/libc/arch/mips/genassym.cf Thu Sep 3 06:57:11 2009 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.1.2.2 2009/08/18 06:57:52 matt Exp $ +# $NetBSD: genassym.cf,v 1.1.2.3 2009/09/03 06:57:11 matt Exp $ # # Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ define SIGINFO_SIZE sizeof(siginfo_t) -define STACK_T_SIZE sizeof(stack_t) +define STACK_T_SIZE ((sizeof(stack_t) + 2 * sizeof(register_t) - 1) -(2 * sizeof(register_t))) define _OFFSETOF_STACK_T_SP offsetof(stack_t, ss_sp) define _OFFSETOF_STACK_T_SIZE offsetof(stack_t, ss_size) define _OFFSETOF_STACK_T_FLAGS offsetof(stack_t, ss_flags)
CVS commit: [matt-nb5-mips64] src/libexec/ld.elf_so/arch/mips
Module Name:src Committed By: matt Date: Thu Sep 3 07:25:45 UTC 2009 Modified Files: src/libexec/ld.elf_so/arch/mips [matt-nb5-mips64]: rtld_start.S Log Message: Make sure N32/N64 stack is qword aligned. To generate a diff of this commit: cvs rdiff -u -r1.9.44.4 -r1.9.44.5 \ src/libexec/ld.elf_so/arch/mips/rtld_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/arch/mips/rtld_start.S diff -u src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.9.44.4 src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.9.44.5 --- src/libexec/ld.elf_so/arch/mips/rtld_start.S:1.9.44.4 Thu Sep 3 00:04:27 2009 +++ src/libexec/ld.elf_so/arch/mips/rtld_start.S Thu Sep 3 07:25:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld_start.S,v 1.9.44.4 2009/09/03 00:04:27 matt Exp $ */ +/* $NetBSD: rtld_start.S,v 1.9.44.5 2009/09/03 07:25:45 matt Exp $ */ /* * Copyright 1997 Michael L. Hitch mhi...@montana.edu @@ -73,7 +73,7 @@ END(rtld_start) -#define XCALLFRAME_SIZ (11*SZREG) +#define XCALLFRAME_SIZ (12*SZREG) #define XCALLFRAME_RA (10*SZREG) #define XCALLFRAME_GP (9*SZREG) #define XCALLFRAME_S0 (8*SZREG)
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Thu Sep 3 07:27:21 UTC 2009 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: vmparam.h Log Message: Double the default stack size to 4MB (since N32/N64 will use double the stack space). To generate a diff of this commit: cvs rdiff -u -r1.41.28.1 -r1.41.28.2 src/sys/arch/mips/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/vmparam.h diff -u src/sys/arch/mips/include/vmparam.h:1.41.28.1 src/sys/arch/mips/include/vmparam.h:1.41.28.2 --- src/sys/arch/mips/include/vmparam.h:1.41.28.1 Fri Aug 21 17:26:23 2009 +++ src/sys/arch/mips/include/vmparam.h Thu Sep 3 07:27:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.41.28.1 2009/08/21 17:26:23 matt Exp $ */ +/* $NetBSD: vmparam.h,v 1.41.28.2 2009/09/03 07:27:21 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -116,7 +116,7 @@ #define MAXDSIZ (512*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ -#define DFLSSIZ (2*1024*1024) /* initial stack size limit */ +#define DFLSSIZ (4*1024*1024) /* initial stack size limit */ #endif #ifndef MAXSSIZ #define MAXSSIZ (32*1024*1024) /* max stack size */
CVS commit: [matt-nb5-mips64] src/lib/libc/softfloat
Module Name:src Committed By: uebayasi Date: Thu Sep 3 07:43:38 UTC 2009 Modified Files: src/lib/libc/softfloat [matt-nb5-mips64]: softfloat-for-gcc.h Log Message: Add missing function aliases that could be generated by GCC for 64-bit softfloat binaries. Reviewed by:matt To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.40.1 src/lib/libc/softfloat/softfloat-for-gcc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/softfloat/softfloat-for-gcc.h diff -u src/lib/libc/softfloat/softfloat-for-gcc.h:1.7 src/lib/libc/softfloat/softfloat-for-gcc.h:1.7.40.1 --- src/lib/libc/softfloat/softfloat-for-gcc.h:1.7 Sun Sep 26 21:13:27 2004 +++ src/lib/libc/softfloat/softfloat-for-gcc.h Thu Sep 3 07:43:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: softfloat-for-gcc.h,v 1.7 2004/09/26 21:13:27 jmmv Exp $ */ +/* $NetBSD: softfloat-for-gcc.h,v 1.7.40.1 2009/09/03 07:43:38 uebayasi Exp $ */ /* * Move private identifiers with external linkage into implementation @@ -8,6 +8,7 @@ #define float_exception_mask _softfloat_float_exception_mask #define float_rounding_mode _softfloat_float_rounding_mode #define float_raise _softfloat_float_raise + /* The following batch are called by GCC through wrappers */ #define float32_eq _softfloat_float32_eq #define float32_le _softfloat_float32_le @@ -15,6 +16,9 @@ #define float64_eq _softfloat_float64_eq #define float64_le _softfloat_float64_le #define float64_lt _softfloat_float64_lt +#define float128_eq _softfloat_float128_eq +#define float128_le _softfloat_float128_le +#define float128_lt _softfloat_float128_lt /* * Macros to define functions with the GCC expected names @@ -23,36 +27,143 @@ #define float32_add __addsf3 #define float64_add __adddf3 #define floatx80_add __addxf3 +#define float128_add __addtf3 + #define float32_sub __subsf3 #define float64_sub __subdf3 #define floatx80_sub __subxf3 +#define float128_sub __subtf3 + #define float32_mul __mulsf3 #define float64_mul __muldf3 #define floatx80_mul __mulxf3 +#define float128_mul __multf3 + #define float32_div __divsf3 #define float64_div __divdf3 #define floatx80_div __divxf3 +#define float128_div __divtf3 + +#if 0 +#define float32_neg __negsf2 +#define float64_neg __negdf2 +#define floatx80_neg __negxf2 +#define float128_neg __negtf2 +#endif + #define int32_to_float32 __floatsisf #define int32_to_float64 __floatsidf #define int32_to_floatx80 __floatsixf +#define int32_to_float128 __floatsitf + #define int64_to_float32 __floatdisf #define int64_to_float64 __floatdidf #define int64_to_floatx80 __floatdixf +#define int64_to_float128 __floatditf + +#define int128_to_float32 __floattisf +#define int128_to_float64 __floattidf +#define int128_to_floatx80 __floattixf +#define int128_to_float128 __floattitf + +#define uint32_to_float32 __floatunsisf +#define uint32_to_float64 __floatunsidf +#define uint32_to_floatx80 __floatunsixf +#define uint32_to_float128 __floatunsitf + +#define uint64_to_float32 __floatundisf +#define uint64_to_float64 __floatundidf +#define uint64_to_floatx80 __floatundixf +#define uint64_to_float128 __floatunditf + +#define uint128_to_float32 __floatuntisf +#define uint128_to_float64 __floatuntidf +#define uint128_to_floatx80 __floatuntixf +#define uint128_to_float128 __floatuntitf + #define float32_to_int32_round_to_zero __fixsfsi #define float64_to_int32_round_to_zero __fixdfsi #define floatx80_to_int32_round_to_zero __fixxfsi +#define float128_to_int32_round_to_zero __fixtfsi + #define float32_to_int64_round_to_zero __fixsfdi #define float64_to_int64_round_to_zero __fixdfdi -#define floatx80_to_int64_round_to_zero __fixxfdi +#define floatx80_to_int64_round_to_zero __fixxfdi +#define float128_to_int64_round_to_zero __fixtfdi + +#define float32_to_int128_round_to_zero __fixsfti +#define float64_to_int128_round_to_zero __fixdfti +#define floatx80_to_int128_round_to_zero __fixxfti +#define float128_to_int128_round_to_zero __fixtfti + #define float32_to_uint32_round_to_zero __fixunssfsi #define float64_to_uint32_round_to_zero __fixunsdfsi +#define floatx80_to_uint32_round_to_zero __fixunsxfsi +#define float128_to_uint32_round_to_zero __fixunstfsi + +#define float32_to_uint64_round_to_zero __fixunssfdi +#define float64_to_uint64_round_to_zero __fixunsdfdi +#define floatx80_to_uint64_round_to_zero __fixunsxfdi +#define float128_to_uint64_round_to_zero __fixunstfdi + +#define float32_to_uint128_round_to_zero __fixunssfti +#define float64_to_uint128_round_to_zero __fixunsdfti +#define floatx80_to_uint128_round_to_zero __fixunsxfti +#define float128_to_uint128_round_to_zero __fixunstfti + #define float32_to_float64 __extendsfdf2 -#define float64_to_floatx80 __extenddfxf2 #define float32_to_floatx80 __extendsfxf2 -#define float64_to_float32 __truncdfsf2 +#define
CVS commit: src/external/gpl3/binutils/lib
Module Name:src
Committed By: skrll
Date: Thu Sep 3 08:24:06 UTC 2009
Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/binutils/lib/libopcodes: Makefile
Log Message:
Bump majors.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/binutils/lib/libopcodes/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.1 src/external/gpl3/binutils/lib/libbfd/Makefile:1.2
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.1 Tue Aug 18 20:21:59 2009
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Thu Sep 3 08:24:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:21:59 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/03 08:24:06 skrll Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -24,7 +24,7 @@
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
-SHLIB_MAJOR= 10
+SHLIB_MAJOR= 11
SHLIB_MINOR= 0
DPADD= ${LIBZ}
Index: src/external/gpl3/binutils/lib/libopcodes/Makefile
diff -u src/external/gpl3/binutils/lib/libopcodes/Makefile:1.1 src/external/gpl3/binutils/lib/libopcodes/Makefile:1.2
--- src/external/gpl3/binutils/lib/libopcodes/Makefile:1.1 Tue Aug 18 20:22:05 2009
+++ src/external/gpl3/binutils/lib/libopcodes/Makefile Thu Sep 3 08:24:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 20:22:05 skrll Exp $
+# $NetBSD: Makefile,v 1.2 2009/09/03 08:24:06 skrll Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -16,7 +16,7 @@
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
-SHLIB_MAJOR= 3
+SHLIB_MAJOR= 4
SHLIB_MINOR= 0
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Thu Sep 3 09:29:07 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: admin.c handler.c handler.h
isakmp.c isakmp_var.h pfkey.c
Log Message:
When rekeying phase2 use phase1 used to negotiate phase2 as a hint to
select the phase1 for rekeying the new phase2.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/crypto/dist/ipsec-tools/src/racoon/admin.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/dist/ipsec-tools/src/racoon/handler.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/dist/ipsec-tools/src/racoon/handler.h
cvs rdiff -u -r1.59 -r1.60 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_var.h
cvs rdiff -u -r1.50 -r1.51 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/admin.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.31 src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.32
--- src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.31 Fri Jul 3 06:41:46 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/admin.c Thu Sep 3 09:29:07 2009
@@ -1,11 +1,11 @@
-/* $NetBSD: admin.c,v 1.31 2009/07/03 06:41:46 tteras Exp $ */
+/* $NetBSD: admin.c,v 1.32 2009/09/03 09:29:07 tteras Exp $ */
/* Id: admin.c,v 1.25 2006/04/06 14:31:04 manubsd Exp */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
- *
+ *
* 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 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 PROJECT AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -341,7 +341,7 @@
user[len] = 0;
found = purgeph1bylogin(user);
- plog(LLV_INFO, LOCATION, NULL,
+ plog(LLV_INFO, LOCATION, NULL,
deleted %d SA for user \%s\\n, found, user);
break;
@@ -360,7 +360,7 @@
rem = racoon_strdup(saddrwop2str(dst));
STRDUP_FATAL(rem);
- plog(LLV_INFO, LOCATION, NULL,
+ plog(LLV_INFO, LOCATION, NULL,
Flushing all SAs for peer %s\n, rem);
while ((iph1 = getph1bydstaddr(dst)) != NULL) {
@@ -373,7 +373,7 @@
racoon_free(loc);
}
-
+
racoon_free(rem);
break;
}
@@ -383,14 +383,14 @@
char *data;
acp = (struct admin_com_psk *)
- ((char *)com + sizeof(*com) +
+ ((char *)com + sizeof(*com) +
sizeof(struct admin_com_indexes));
idtype = acp-id_type;
if ((id = vmalloc(acp-id_len)) == NULL) {
plog(LLV_ERROR, LOCATION, NULL,
- cannot allocate memory: %s\n,
+ cannot allocate memory: %s\n,
strerror(errno));
break;
}
@@ -399,7 +399,7 @@
if ((key = vmalloc(acp-key_len)) == NULL) {
plog(LLV_ERROR, LOCATION, NULL,
- cannot allocate memory: %s\n,
+ cannot allocate memory: %s\n,
strerror(errno));
vfree(id);
id = NULL;
@@ -474,7 +474,7 @@
rmconf-xauth-pass = key;
}
#endif
-
+
plog(LLV_INFO, LOCATION, NULL,
accept a request to establish IKE-SA:
%s\n, saddrwop2str(dst));
@@ -577,7 +577,7 @@
}
insph2(iph2);
- if (isakmp_post_acquire(iph2) 0) {
+ if (isakmp_post_acquire(iph2, NULL) 0) {
remph2(iph2);
delph2(iph2);
break;
@@ -710,17 +710,17 @@
}
if (chown(sunaddr.sun_path, adminsock_owner, adminsock_group) != 0) {
- plog(LLV_ERROR, LOCATION, NULL,
- chown(%s, %d, %d): %s\n,
- sunaddr.sun_path, adminsock_owner,
+ plog(LLV_ERROR, LOCATION, NULL,
+ chown(%s, %d, %d): %s\n,
+ sunaddr.sun_path, adminsock_owner,
adminsock_group, strerror(errno));
(void)close(lcconf-sock_admin);
return -1;
}
if (chmod(sunaddr.sun_path, adminsock_mode) != 0) {
- plog(LLV_ERROR, LOCATION, NULL,
- chmod(%s, 0%03o): %s\n,
+ plog(LLV_ERROR, LOCATION, NULL,
+ chmod(%s, 0%03o): %s\n,
sunaddr.sun_path, adminsock_mode, strerror(errno));
(void)close(lcconf-sock_admin);
return -1;
Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.29 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.30
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.29 Fri Jul 3 06:41:46 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Thu Sep 3 09:29:07 2009
@@ -1,11 +1,11 @@
-/* $NetBSD: handler.c,v 1.29 2009/07/03 06:41:46 tteras Exp $ */
+/* $NetBSD: handler.c,v 1.30 2009/09/03 09:29:07 tteras Exp $ */
/* Id:
CVS commit: src/sys/kern
Module Name:src
Committed By: jmcneill
Date: Thu Sep 3 11:42:21 UTC 2009
Modified Files:
src/sys/kern: subr_devsw.c
Log Message:
In bdev_strategy, return ENXIO instead of panicing if the block device has
disappeared. ok pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/subr_devsw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.27 src/sys/kern/subr_devsw.c:1.28
--- src/sys/kern/subr_devsw.c:1.27 Tue Aug 18 02:44:37 2009
+++ src/sys/kern/subr_devsw.c Thu Sep 3 11:42:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.27 2009/08/18 02:44:37 yamt Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.28 2009/09/03 11:42:21 jmcneill Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_devsw.c,v 1.27 2009/08/18 02:44:37 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_devsw.c,v 1.28 2009/09/03 11:42:21 jmcneill Exp $);
#include sys/param.h
#include sys/conf.h
@@ -733,8 +733,12 @@
const struct bdevsw *d;
int mpflag;
- if ((d = bdevsw_lookup(bp-b_dev)) == NULL)
- panic(bdev_strategy);
+ if ((d = bdevsw_lookup(bp-b_dev)) == NULL) {
+ bp-b_error = ENXIO;
+ bp-b_resid = bp-b_bcount;
+ biodone(bp);
+ return;
+ }
DEV_LOCK(d);
(*d-d_strategy)(bp);
CVS commit: src
Module Name:src
Committed By: pooka
Date: Thu Sep 3 12:04:50 UTC 2009
Modified Files:
src/distrib/sets/lists/comp: mi
src/sbin/mount_smbfs: Makefile
src/sys/fs/smbfs: Makefile
src/sys/netsmb: Makefile
Log Message:
Install smb headers relevant for userspace and make mount_smbfs
use installed headers instead of src/sys.
To generate a diff of this commit:
cvs rdiff -u -r1.1295 -r1.1296 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.6 -r1.7 src/sbin/mount_smbfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/smbfs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/netsmb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1295 src/distrib/sets/lists/comp/mi:1.1296
--- src/distrib/sets/lists/comp/mi:1.1295 Thu Sep 3 01:17:29 2009
+++ src/distrib/sets/lists/comp/mi Thu Sep 3 12:04:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1295 2009/09/03 01:17:29 joerg Exp $
+# $NetBSD: mi,v 1.1296 2009/09/03 12:04:50 pooka Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -635,6 +635,7 @@
./usr/include/fs/nilfs/nilfs_fs.h comp-c-include
./usr/include/fs/nilfs/nilfs_mount.h comp-c-include
./usr/include/fs/puffs/puffs_msgif.h comp-puffs-include
+./usr/include/fs/smbfs/smbfs.h comp-c-include
./usr/include/fs/sysvbfs/bfs.h comp-c-include
./usr/include/fs/sysvbfs/sysvbfs_args.h comp-c-include
./usr/include/fs/tmpfs/tmpfs_args.h comp-c-include
@@ -1631,6 +1632,11 @@
./usr/include/netns/spp_debug.h comp-obsolete obsolete
./usr/include/netns/spp_timer.h comp-obsolete obsolete
./usr/include/netns/spp_var.h comp-obsolete obsolete
+./usr/include/netsmb/iconv.h comp-c-include
+./usr/include/netsmb/netbios.h comp-c-include
+./usr/include/netsmb/smb.h comp-c-include
+./usr/include/netsmb/smb_conn.h comp-c-include
+./usr/include/netsmb/smb_dev.h comp-c-include
./usr/include/netpgp.hcomp-c-include crypto
./usr/include/nfs/krpc.h comp-c-include
./usr/include/nfs/nfs.hcomp-c-include
Index: src/sbin/mount_smbfs/Makefile
diff -u src/sbin/mount_smbfs/Makefile:1.6 src/sbin/mount_smbfs/Makefile:1.7
--- src/sbin/mount_smbfs/Makefile:1.6 Sat Apr 11 07:58:12 2009
+++ src/sbin/mount_smbfs/Makefile Thu Sep 3 12:04:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/11 07:58:12 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/03 12:04:50 pooka Exp $
WARNS?= 3 # XXX: sign-compare issues
@@ -12,7 +12,7 @@
SMBDIST=${NETBSDSRCDIR}/dist/smbfs
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${SMBDIST}/include
+CPPFLAGS+= -I${SMBDIST}/include
.PATH: ${SMBDIST}/mount_smbfs ${SMBDIST}/lib/smb
Index: src/sys/fs/smbfs/Makefile
diff -u src/sys/fs/smbfs/Makefile:1.2 src/sys/fs/smbfs/Makefile:1.3
--- src/sys/fs/smbfs/Makefile:1.2 Tue Nov 26 23:30:35 2002
+++ src/sys/fs/smbfs/Makefile Thu Sep 3 12:04:50 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/11/26 23:30:35 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/03 12:04:50 pooka Exp $
INCSDIR= /usr/include/fs/smbfs
-#INCS= smbfs.h smbfs_node.h smbfs_subr.h
+INCS= smbfs.h
.include bsd.kinc.mk
Index: src/sys/netsmb/Makefile
diff -u src/sys/netsmb/Makefile:1.5 src/sys/netsmb/Makefile:1.6
--- src/sys/netsmb/Makefile:1.5 Tue Nov 26 23:30:34 2002
+++ src/sys/netsmb/Makefile Thu Sep 3 12:04:50 2009
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/11/26 23:30:34 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2009/09/03 12:04:50 pooka Exp $
INCSDIR= /usr/include/netsmb
-#INCS= iconv.h netbios.h smb.h smb_conn.h smb_dev.h smb_rq.h smb_subr.h \
-# smb_tran.h smb_trantcp.h
+INCS= iconv.h netbios.h smb.h smb_conn.h smb_dev.h
.include bsd.kinc.mk
CVS commit: src/sys/rump/librump
Module Name:src Committed By: pooka Date: Thu Sep 3 12:35:19 UTC 2009 Modified Files: src/sys/rump/librump: Makefile Log Message: descend into librumpcrypto for a local build To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/Makefile diff -u src/sys/rump/librump/Makefile:1.4 src/sys/rump/librump/Makefile:1.5 --- src/sys/rump/librump/Makefile:1.4 Wed Nov 19 14:10:49 2008 +++ src/sys/rump/librump/Makefile Thu Sep 3 12:35:19 2009 @@ -1,6 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2008/11/19 14:10:49 pooka Exp $ +# $NetBSD: Makefile,v 1.5 2009/09/03 12:35:19 pooka Exp $ # -SUBDIR= rumpkern rumpnet rumpuser rumpvfs +SUBDIR= rumpkern +SUBDIR+= rumpuser + +SUBDIR+= rumpcrypto rumpnet rumpvfs .include bsd.subdir.mk
CVS commit: src
Module Name:src
Committed By: pooka
Date: Thu Sep 3 12:55:10 UTC 2009
Modified Files:
src/distrib/sets/lists/base: shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/sys/rump/fs: Makefile.rumpfs
Log Message:
install librumpfs_fdesc
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.486 -r1.487 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1297 -r1.1298 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/fs/Makefile.rumpfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.180 src/distrib/sets/lists/base/shl.elf:1.181
--- src/distrib/sets/lists/base/shl.elf:1.180 Thu Sep 3 12:33:54 2009
+++ src/distrib/sets/lists/base/shl.elf Thu Sep 3 12:55:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.180 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: shl.elf,v 1.181 2009/09/03 12:55:10 pooka Exp $
#
# Note: Do not mark old major and major.minor shared libraries as
# obsolete; just remove the entry, as third-party applications
@@ -230,6 +230,8 @@
./usr/lib/librumpfs_efs.so.0 base-rump-shlib
./usr/lib/librumpfs_ext2fs.so base-rump-shlib
./usr/lib/librumpfs_ext2fs.so.0 base-rump-shlib
+./usr/lib/librumpfs_fdesc.so base-rump-shlib
+./usr/lib/librumpfs_fdesc.so.0 base-rump-shlib
./usr/lib/librumpfs_ffs.so base-rump-shlib
./usr/lib/librumpfs_ffs.so.0 base-rump-shlib
./usr/lib/librumpfs_hfs.so base-rump-shlib
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.486 src/distrib/sets/lists/base/shl.mi:1.487
--- src/distrib/sets/lists/base/shl.mi:1.486 Thu Sep 3 12:33:54 2009
+++ src/distrib/sets/lists/base/shl.mi Thu Sep 3 12:55:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.486 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: shl.mi,v 1.487 2009/09/03 12:55:10 pooka Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -122,6 +122,7 @@
./usr/lib/librumpfs_cd9660.so.0.0 base-rump-shlib
./usr/lib/librumpfs_efs.so.0.0 base-rump-shlib
./usr/lib/librumpfs_ext2fs.so.0.0 base-rump-shlib
+./usr/lib/librumpfs_fdesc.so.0.0 base-rump-shlib
./usr/lib/librumpfs_ffs.so.0.0 base-rump-shlib
./usr/lib/librumpfs_hfs.so.0.0 base-rump-shlib
./usr/lib/librumpfs_lfs.so.0.0 base-rump-shlib
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1297 src/distrib/sets/lists/comp/mi:1.1298
--- src/distrib/sets/lists/comp/mi:1.1297 Thu Sep 3 12:33:54 2009
+++ src/distrib/sets/lists/comp/mi Thu Sep 3 12:55:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1297 2009/09/03 12:33:54 pooka Exp $
+# $NetBSD: mi,v 1.1298 2009/09/03 12:55:10 pooka Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -2539,6 +2539,9 @@
./usr/lib/librumpfs_ext2fs.a comp-c-lib
./usr/lib/librumpfs_ext2fs_g.a -unknown- debuglib
./usr/lib/librumpfs_ext2fs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_fdesc.a comp-c-lib
+./usr/lib/librumpfs_fdesc_g.a -unknown- debuglib
+./usr/lib/librumpfs_fdesc_p.a comp-c-proflib profile
./usr/lib/librumpfs_ffs.a comp-c-lib
./usr/lib/librumpfs_ffs_g.a -unknown- debuglib
./usr/lib/librumpfs_ffs_p.a comp-c-proflib profile
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.83 src/distrib/sets/lists/comp/shl.mi:1.84
--- src/distrib/sets/lists/comp/shl.mi:1.83 Thu Sep 3 12:33:55 2009
+++ src/distrib/sets/lists/comp/shl.mi Thu Sep 3 12:55:10 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.83 2009/09/03 12:33:55 pooka Exp $
+# $NetBSD: shl.mi,v 1.84 2009/09/03 12:55:10 pooka Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -85,6 +85,7 @@
./usr/lib/librumpfs_cd9660_pic.a comp-c-piclib
./usr/lib/librumpfs_efs_pic.a comp-c-piclib
./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib
+./usr/lib/librumpfs_fdesc_pic.a comp-c-piclib
./usr/lib/librumpfs_ffs_pic.a comp-c-piclib
./usr/lib/librumpfs_hfs_pic.a comp-c-piclib
./usr/lib/librumpfs_lfs_pic.a comp-c-piclib
Index: src/sys/rump/fs/Makefile.rumpfs
diff -u src/sys/rump/fs/Makefile.rumpfs:1.14 src/sys/rump/fs/Makefile.rumpfs:1.15
--- src/sys/rump/fs/Makefile.rumpfs:1.14 Sat Jul 18 16:31:43 2009
+++ src/sys/rump/fs/Makefile.rumpfs Thu Sep 3 12:55:10 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpfs,v 1.14 2009/07/18 16:31:43 reinoud Exp $
+# $NetBSD: Makefile.rumpfs,v 1.15 2009/09/03 12:55:10 pooka Exp $
#
-RUMPFSLIST= cd9660 efs ext2fs ffs hfs lfs msdos nfs nilfs ntfs
+RUMPFSLIST= cd9660 efs ext2fs fdesc ffs hfs lfs msdos nfs nilfs ntfs
RUMPFSLIST+= syspuffs sysvbfs tmpfs udf
.for var in ${RUMPFSLIST}
CVS commit: src
Module Name:src Committed By: pooka Date: Thu Sep 3 12:33:55 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.elf shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi src/lib: Makefile Added Files: src/compat/lib/librumpcrypto: Makefile src/lib/librumpcrypto: Makefile Log Message: install librumpcrypto component: kernel crypto routines To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/compat/lib/librumpcrypto/Makefile cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.179 -r1.180 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.485 -r1.486 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1296 -r1.1297 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.82 -r1.83 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.141 -r1.142 src/lib/Makefile cvs rdiff -u -r0 -r1.1 src/lib/librumpcrypto/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.64 src/distrib/sets/lists/base/md.amd64:1.65 --- src/distrib/sets/lists/base/md.amd64:1.64 Tue Aug 18 23:43:31 2009 +++ src/distrib/sets/lists/base/md.amd64 Thu Sep 3 12:33:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.64 2009/08/18 23:43:31 jmcneill Exp $ +# $NetBSD: md.amd64,v 1.65 2009/09/03 12:33:54 pooka Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -172,6 +172,8 @@ ./usr/lib/i386/librt.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/librump.so.0 base-compat-shlib compat,pic ./usr/lib/i386/librump.so.0.0 base-compat-shlib compat,pic +./usr/lib/i386/librumpcrypto.so.0 base-compat-shlib compat,pic +./usr/lib/i386/librumpcrypto.so.0.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpuser.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.57 src/distrib/sets/lists/base/md.sparc64:1.58 --- src/distrib/sets/lists/base/md.sparc64:1.57 Sun Aug 16 19:33:38 2009 +++ src/distrib/sets/lists/base/md.sparc64 Thu Sep 3 12:33:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.57 2009/08/16 19:33:38 christos Exp $ +# $NetBSD: md.sparc64,v 1.58 2009/09/03 12:33:54 pooka Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -168,6 +168,8 @@ ./usr/lib/sparc/librt.so.1.0 base-compat-shlib compat,pic ./usr/lib/sparc/librump.so.0 base-compat-shlib compat,pic ./usr/lib/sparc/librump.so.0.0 base-compat-shlib compat,pic +./usr/lib/sparc/librumpcrypto.so.0 base-compat-shlib compat,pic +./usr/lib/sparc/librumpcrypto.so.0.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpuser.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.179 src/distrib/sets/lists/base/shl.elf:1.180 --- src/distrib/sets/lists/base/shl.elf:1.179 Mon Jul 20 17:30:52 2009 +++ src/distrib/sets/lists/base/shl.elf Thu Sep 3 12:33:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.179 2009/07/20 17:30:52 christos Exp $ +# $NetBSD: shl.elf,v 1.180 2009/09/03 12:33:54 pooka Exp $ # # Note: Do not mark old major and major.minor shared libraries as # obsolete; just remove the entry, as third-party applications @@ -222,6 +222,8 @@ ./usr/lib/librt.so.1base-sys-shlib ./usr/lib/librump.sobase-rump-shlib ./usr/lib/librump.so.0base-rump-shlib +./usr/lib/librumpcrypto.so base-rump-shlib +./usr/lib/librumpcrypto.so.0 base-rump-shlib ./usr/lib/librumpfs_cd9660.so base-rump-shlib ./usr/lib/librumpfs_cd9660.so.0 base-rump-shlib ./usr/lib/librumpfs_efs.so base-rump-shlib Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.485 src/distrib/sets/lists/base/shl.mi:1.486 --- src/distrib/sets/lists/base/shl.mi:1.485 Sun Aug 16 19:33:38 2009 +++ src/distrib/sets/lists/base/shl.mi Thu Sep 3 12:33:54 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.485 2009/08/16 19:33:38 christos Exp $ +# $NetBSD: shl.mi,v 1.486 2009/09/03 12:33:54 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -118,6 +118,7 @@ ./usr/lib/librpcsvc.so.1.0 base-net-shlib ./usr/lib/librt.so.1.0base-sys-shlib
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Thu Sep 3 14:13:16 UTC 2009
Modified Files:
src/sys/dev/ic: smc83c170.c smc83c170var.h
Log Message:
Replace shutdownhook_establish(9) with pmf_device_register1().
Tested EtherPower II 10/100 (SMC9432TX) on macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/ic/smc83c170.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/smc83c170var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/smc83c170.c
diff -u src/sys/dev/ic/smc83c170.c:1.76 src/sys/dev/ic/smc83c170.c:1.77
--- src/sys/dev/ic/smc83c170.c:1.76 Sun Jul 6 14:32:56 2008
+++ src/sys/dev/ic/smc83c170.c Thu Sep 3 14:13:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170.c,v 1.76 2008/07/06 14:32:56 tsutsui Exp $ */
+/* $NetBSD: smc83c170.c,v 1.77 2009/09/03 14:13:16 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smc83c170.c,v 1.76 2008/07/06 14:32:56 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: smc83c170.c,v 1.77 2009/09/03 14:13:16 tsutsui Exp $);
#include bpfilter.h
@@ -77,7 +77,7 @@
int epic_init(struct ifnet *);
void epic_stop(struct ifnet *, int);
-void epic_shutdown(void *);
+bool epic_shutdown(device_t, int);
void epic_reset(struct epic_softc *);
void epic_rxdrain(struct epic_softc *);
@@ -301,10 +301,12 @@
/*
* Make sure the interface is shutdown during reboot.
*/
- sc-sc_sdhook = shutdownhook_establish(epic_shutdown, sc);
- if (sc-sc_sdhook == NULL)
+ if (pmf_device_register1(sc-sc_dev, NULL, NULL, epic_shutdown))
+ pmf_class_network_register(sc-sc_dev, ifp);
+ else
aprint_error_dev(sc-sc_dev,
- WARNING: unable to establish shutdown hook\n);
+ couldn't establish power handler\n);
+
return;
/*
@@ -340,12 +342,14 @@
/*
* Shutdown hook. Make sure the interface is stopped at reboot.
*/
-void
-epic_shutdown(void *arg)
+bool
+epic_shutdown(device_t self, int howto)
{
- struct epic_softc *sc = arg;
+ struct epic_softc *sc = device_private(self);
epic_stop(sc-sc_ethercom.ec_if, 1);
+
+ return true;
}
/*
Index: src/sys/dev/ic/smc83c170var.h
diff -u src/sys/dev/ic/smc83c170var.h:1.13 src/sys/dev/ic/smc83c170var.h:1.14
--- src/sys/dev/ic/smc83c170var.h:1.13 Sun Jul 6 14:32:56 2008
+++ src/sys/dev/ic/smc83c170var.h Thu Sep 3 14:13:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170var.h,v 1.13 2008/07/06 14:32:56 tsutsui Exp $ */
+/* $NetBSD: smc83c170var.h,v 1.14 2009/09/03 14:13:16 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -98,7 +98,6 @@
bus_space_handle_t sc_sh; /* bus space handle */
bus_dma_tag_t sc_dmat; /* bus DMA tag */
struct ethercom sc_ethercom; /* ethernet common data */
- void *sc_sdhook; /* shutdown hook */
int sc_hwflags; /* info about board */
#define EPIC_HAS_BNC 0x01 /* BNC on serial interface */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: sborrill
Date: Thu Sep 3 14:29:42 UTC 2009
Modified Files:
src/sys/dev/pci: auich.c auichreg.h
Log Message:
SiS 7012 uses different multichannel control bits compared to other codecs
(data from linux via OpenBSD).
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/dev/pci/auich.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/auichreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.129 src/sys/dev/pci/auich.c:1.130
--- src/sys/dev/pci/auich.c:1.129 Tue Mar 17 19:38:34 2009
+++ src/sys/dev/pci/auich.c Thu Sep 3 14:29:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.129 2009/03/17 19:38:34 dyoung Exp $ */
+/* $NetBSD: auich.c,v 1.130 2009/09/03 14:29:42 sborrill Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auich.c,v 1.129 2009/03/17 19:38:34 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: auich.c,v 1.130 2009/09/03 14:29:42 sborrill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -185,6 +185,12 @@
enum ac97_host_flags sc_codecflags;
bool sc_spdif;
+ /* multi-channel control bits */
+ int sc_pcm246_mask;
+ int sc_pcm2;
+ int sc_pcm4;
+ int sc_pcm6;
+
/* DMA scatter-gather lists. */
bus_dmamap_t sc_cddmamap;
#define sc_cddma sc_cddmamap-dm_segs[0].ds_addr
@@ -551,6 +557,10 @@
if (d-id == PCIID_SIS7012) {
sc-sc_sts_reg = ICH_PICB;
sc-sc_sample_shift = 0;
+ sc-sc_pcm246_mask = ICH_SIS_PCM246_MASK;
+ sc-sc_pcm2 = ICH_SIS_PCM2;
+ sc-sc_pcm4 = ICH_SIS_PCM4;
+ sc-sc_pcm6 = ICH_SIS_PCM6;
/* Un-mute output. From Linux. */
bus_space_write_4(sc-iot, sc-aud_ioh, ICH_SIS_NV_CTL,
bus_space_read_4(sc-iot, sc-aud_ioh, ICH_SIS_NV_CTL) |
@@ -558,6 +568,10 @@
} else {
sc-sc_sts_reg = ICH_STS;
sc-sc_sample_shift = 1;
+ sc-sc_pcm246_mask = ICH_PCM246_MASK;
+ sc-sc_pcm2 = ICH_PCM2;
+ sc-sc_pcm4 = ICH_PCM4;
+ sc-sc_pcm6 = ICH_PCM6;
}
/* Workaround for a 440MX B-stepping erratum */
@@ -859,7 +873,7 @@
control = bus_space_read_4(sc-iot, sc-aud_ioh,
ICH_GCTRL + sc-sc_modem_offset);
if (sc-sc_codectype == AC97_CODEC_TYPE_AUDIO) {
- control = ~(ICH_ACLSO | ICH_PCM246_MASK);
+ control = ~(ICH_ACLSO | sc-sc_pcm246_mask);
} else {
control = ~ICH_ACLSO;
control |= ICH_GIE;
@@ -1021,11 +1035,11 @@
sc-sc_codectype == AC97_CODEC_TYPE_AUDIO) {
control = bus_space_read_4(sc-iot, sc-aud_ioh,
ICH_GCTRL + sc-sc_modem_offset);
-control = ~ICH_PCM246_MASK;
+control = ~sc-sc_pcm246_mask;
if (p-channels == 4) {
-control |= ICH_PCM4;
+control |= sc-sc_pcm4;
} else if (p-channels == 6) {
-control |= ICH_PCM6;
+control |= sc-sc_pcm6;
}
bus_space_write_4(sc-iot, sc-aud_ioh,
ICH_GCTRL + sc-sc_modem_offset, control);
Index: src/sys/dev/pci/auichreg.h
diff -u src/sys/dev/pci/auichreg.h:1.11 src/sys/dev/pci/auichreg.h:1.12
--- src/sys/dev/pci/auichreg.h:1.11 Mon Jan 14 21:33:04 2008
+++ src/sys/dev/pci/auichreg.h Thu Sep 3 14:29:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: auichreg.h,v 1.11 2008/01/14 21:33:04 martin Exp $ */
+/* $NetBSD: auichreg.h,v 1.12 2009/09/03 14:29:42 sborrill Exp $ */
/*
* Copyright (c) 2000 Michael Shalayeff
@@ -85,6 +85,10 @@
#define ICH_PCM2 0x00 /* 2ch output */
#define ICH_PCM4 0x10 /* 4ch output */
#define ICH_PCM6 0x20 /* 6ch output */
+#define ICH_SIS_PCM246_MASK 0xc0
+#define ICH_SIS_PCM2 0x00 /* 2ch output */
+#define ICH_SIS_PCM4 0x40 /* 4ch output */
+#define ICH_SIS_PCM6 0x80 /* 6ch output */
#define ICH_S2RIE 0x40 /* int when tertiary codec resume */
#define ICH_SRIE 0x20 /* int when 2ndary codec resume */
#define ICH_PRIE 0x10 /* int when primary codec resume */
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Thu Sep 3 14:37:58 UTC 2009
Modified Files:
src/sys/dev/ic: aic7xxx.c
Log Message:
Misc cosmetics:
- remove c++ style comment
- wrap long lines
- remove unnecessary casts against void pointers
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/ic/aic7xxx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.128 src/sys/dev/ic/aic7xxx.c:1.129
--- src/sys/dev/ic/aic7xxx.c:1.128 Sat Mar 14 21:04:19 2009
+++ src/sys/dev/ic/aic7xxx.c Thu Sep 3 14:37:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.128 2009/03/14 21:04:19 dsl Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.128 2009/03/14 21:04:19 dsl Exp $
+ * $Id: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aic7xxx.c,v 1.128 2009/03/14 21:04:19 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $);
#include dev/ic/aic7xxx_osm.h
#include dev/ic/aic7xxx_inline.h
@@ -211,7 +211,9 @@
struct scb *scb);
#endif
-//static bus_dmamap_callback_t ahc_dmamap_cb;
+#if 0
+static bus_dmamap_callback_t ahc_dmamap_cb;
+#endif
static void ahc_build_free_scb_list(struct ahc_softc *ahc);
static int ahc_init_scbdata(struct ahc_softc *ahc);
static void ahc_fini_scbdata(struct ahc_softc *ahc);
@@ -341,7 +343,8 @@
*/
modnext = ahc-qoutfifonext ~0x3;
*((uint32_t *)(ahc-qoutfifo[modnext])) = 0xUL;
- ahc_dmamap_sync(ahc, ahc-parent_dmat /*shared_data_dmat*/,
+ ahc_dmamap_sync(ahc,
+ ahc-parent_dmat /*shared_data_dmat*/,
ahc-shared_data_dmamap,
/*offset*/modnext, /*len*/4,
BUS_DMASYNC_PREREAD);
@@ -517,7 +520,8 @@
tstate);
tinfo = targ_info-curr;
sg = scb-sg_list;
- sc = (struct scsi_request_sense *)(hscb-shared_data.cdb);
+ sc = (struct scsi_request_sense *)
+ (hscb-shared_data.cdb);
/*
* Save off the residual if there is one.
*/
@@ -1277,7 +1281,8 @@
CAM_LUN_WILDCARD,
SCB_LIST_NULL,
ROLE_INITIATOR)) {
- ahc_set_transaction_status(scb, CAM_REQ_CMP);
+ ahc_set_transaction_status(scb,
+ CAM_REQ_CMP);
}
#endif
ahc_compile_devinfo(devinfo,
@@ -1568,8 +1573,7 @@
ahc-enabled_targets[scsi_id] != master_tstate)
panic(%s: ahc_alloc_tstate - Target already allocated,
ahc_name(ahc));
- tstate = (struct ahc_tmode_tstate*)malloc(sizeof(*tstate),
- M_DEVBUF, M_NOWAIT);
+ tstate = malloc(sizeof(*tstate), M_DEVBUF, M_NOWAIT);
if (tstate == NULL)
return (NULL);
@@ -3920,8 +3924,10 @@
case 1:
bus_dmamap_unload(ahc-parent_dmat, ahc-shared_data_dmamap);
bus_dmamap_destroy(ahc-parent_dmat, ahc-shared_data_dmamap);
- bus_dmamem_unmap(ahc-parent_dmat, (void *)ahc-qoutfifo, ahc-shared_data_size);
- bus_dmamem_free(ahc-parent_dmat, ahc-shared_data_seg, ahc-shared_data_nseg);
+ bus_dmamem_unmap(ahc-parent_dmat, (void *)ahc-qoutfifo,
+ ahc-shared_data_size);
+ bus_dmamem_free(ahc-parent_dmat, ahc-shared_data_seg,
+ ahc-shared_data_nseg);
break;
case 0:
break;
@@ -3973,7 +3979,7 @@
struct ahc_softc *ahc;
int i;
- ahc = (struct ahc_softc *)arg;
+ ahc = arg;
/* This will reset most registers to 0, but not all */
ahc_reset(ahc);
@@ -4062,7 +4068,8 @@
ahc-features |= AHC_TWIN;
break;
default:
- printf( Unsupported adapter type (0x%x). Ignoring\n, sblkctl);
+ printf( Unsupported adapter type (0x%x). Ignoring\n,
+ sblkctl);
return(-1);
}
@@ -4176,9 +4183,8 @@
SLIST_INIT(scb_data-sg_maps);
/* Allocate SCB resources */
- scb_data-scbarray =
- (struct scb *)malloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC,
- M_DEVBUF, M_NOWAIT);
+ scb_data-scbarray = malloc(sizeof(struct scb) * AHC_SCB_MAX_ALLOC,
+ M_DEVBUF, M_NOWAIT);
if (scb_data-scbarray == NULL)
return (ENOMEM);
memset(scb_data-scbarray, 0, sizeof(struct scb) * AHC_SCB_MAX_ALLOC);
@@ -4330,7 +4336,8 @@
if (ahc_createdmamem(ahc-parent_dmat, PAGE_SIZE, ahc-sc_dmaflags,
sg_map-sg_dmamap,
(void **)sg_map-sg_vaddr, sg_map-sg_physaddr,
- sg_map-sg_dmasegs, sg_map-sg_nseg, ahc_name(ahc),
+ sg_map-sg_dmasegs, sg_map-sg_nseg,
+ ahc_name(ahc),
SG space) 0) {
free(sg_map, M_DEVBUF);
return (0);
@@ -4347,8 +4354,7 @@
struct scb_platform_data *pdata;
int error;
- pdata = (struct scb_platform_data *)malloc(sizeof(*pdata),
- M_DEVBUF, M_WAITOK);
+ pdata =
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Thu Sep 3 14:40:43 UTC 2009
Modified Files:
src/sys/dev/ic: aic7xxx.c
Log Message:
Remove whitespaces between tabs.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/dev/ic/aic7xxx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic7xxx.c
diff -u src/sys/dev/ic/aic7xxx.c:1.129 src/sys/dev/ic/aic7xxx.c:1.130
--- src/sys/dev/ic/aic7xxx.c:1.129 Thu Sep 3 14:37:58 2009
+++ src/sys/dev/ic/aic7xxx.c Thu Sep 3 14:40:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.130 2009/09/03 14:40:43 tsutsui Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $
+ * $Id: aic7xxx.c,v 1.130 2009/09/03 14:40:43 tsutsui Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx.c#112 $
*
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aic7xxx.c,v 1.129 2009/09/03 14:37:58 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: aic7xxx.c,v 1.130 2009/09/03 14:40:43 tsutsui Exp $);
#include dev/ic/aic7xxx_osm.h
#include dev/ic/aic7xxx_inline.h
@@ -991,7 +991,7 @@
if (status == 0 status0 == 0) {
if ((ahc-features AHC_TWIN) != 0) {
/* Try the other channel */
- ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) ^ SELBUSB);
+ ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) ^ SELBUSB);
status = ahc_inb(ahc, SSTAT1)
(SELTO|SCSIRSTI|BUSFREE|SCSIPERR);
intr_channel = (cur_channel == 'A') ? 'B' : 'A';
@@ -1037,7 +1037,7 @@
printf(%s: Someone reset channel %c\n,
ahc_name(ahc), intr_channel);
if (intr_channel != cur_channel)
- ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) ^ SELBUSB);
+ ahc_outb(ahc, SBLKCTL, ahc_inb(ahc, SBLKCTL) ^ SELBUSB);
ahc_reset_channel(ahc, intr_channel, /*Initiate Reset*/FALSE);
} else if ((status SCSIPERR) != 0) {
/*
@@ -1509,7 +1509,7 @@
CLRREQINIT);
ahc_flush_device_writes(ahc);
ahc_outb(ahc, CLRSINT0, CLRSELDO|CLRSELDI|CLRSELINGO);
- ahc_flush_device_writes(ahc);
+ ahc_flush_device_writes(ahc);
ahc_outb(ahc, CLRINT, CLRSCSIINT);
ahc_flush_device_writes(ahc);
}
@@ -1733,7 +1733,7 @@
* At some speeds, we only support
* ST transfers.
*/
- if ((syncrate-sxfr_u2 ST_SXFR) != 0)
+ if ((syncrate-sxfr_u2 ST_SXFR) != 0)
*ppr_options = ~MSG_EXT_PPR_DT_REQ;
break;
}
@@ -2077,7 +2077,7 @@
ahc_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
ahc_queue_alg alg)
{
- ahc_platform_set_tags(ahc, devinfo, alg);
+ ahc_platform_set_tags(ahc, devinfo, alg);
}
/*
@@ -2178,7 +2178,7 @@
if (role == ROLE_TARGET
(ahc-features AHC_MULTI_TID) != 0
(ahc_inb(ahc, SEQ_FLAGS)
- (CMDPHASE_PENDING|TARG_CMD_PENDING|NO_DISCONNECT)) != 0) {
+ (CMDPHASE_PENDING|TARG_CMD_PENDING|NO_DISCONNECT)) != 0) {
/* We were selected, so pull our id from TARGIDIN */
our_id = ahc_inb(ahc, TARGIDIN) OID;
} else if ((ahc-features AHC_ULTRA2) != 0)
@@ -3514,7 +3514,7 @@
*/
ahc_outb(ahc, SCB_CONTROL,
ahc_inb(ahc, SCB_CONTROL) mask);
- scb-hscb-control = mask;
+ scb-hscb-control = mask;
ahc_set_transaction_tag(scb, /*enabled*/FALSE,
/*type*/MSG_SIMPLE_TASK);
ahc_outb(ahc, MSG_OUT, MSG_IDENTIFYFLAG);
@@ -4399,7 +4399,7 @@
ahc_chip_names[ahc-chip AHC_CHIPID_MASK]);
tbuf += len;
if ((ahc-features AHC_TWIN) != 0)
- len = snprintf(tbuf, ep - tbuf, Twin Channel, A SCSI Id=%d,
+ len = snprintf(tbuf, ep - tbuf, Twin Channel, A SCSI Id=%d,
B SCSI Id=%d, primary %c, ,
ahc-our_id, ahc-our_id_b,
(ahc-flags AHC_PRIMARY_CHANNEL) + 'A');
@@ -4740,7 +4740,7 @@
(ultraenb mask) != 0) {
/* Treat 10MHz as a non-ultra speed */
scsirate = ~SXFR;
- ultraenb = ~mask;
+ ultraenb = ~mask;
}
tinfo-user.period =
ahc_find_period(ahc, scsirate,
@@ -6346,7 +6346,7 @@
if (begin_set[cs_count] == TRUE
end_set[cs_count] == FALSE) {
cs_table[cs_count].end = downloaded;
- end_set[cs_count] = TRUE;
+ end_set[cs_count] = TRUE;
cs_count++;
}
continue;
@@ -6874,7 +6874,7 @@
if ((ahc-features AHC_MULTIROLE) != 0) {
if ((ahc-features AHC_MULTI_TID) != 0
- (ahc-flags AHC_INITIATORROLE) != 0) {
+ (ahc-flags AHC_INITIATORROLE) != 0) {
/*
* Only allow additional targets if
* the initiator role is disabled.
@@ -7131,7 +7131,7 @@
targid_mask = ~target_mask;
ahc_outb(ahc, TARGID, targid_mask);
ahc_outb(ahc, TARGID+1,
- (targid_mask 8));
+ (targid_mask 8));
ahc_update_scsiid(ahc, targid_mask);
}
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Thu Sep 3 14:52:22 UTC 2009
Modified Files:
src/sys/dev/ic: aic79xx.c
Log Message:
- wrap long lines
- remove unnecessary casts against void pointers
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ic/aic79xx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic79xx.c
diff -u src/sys/dev/ic/aic79xx.c:1.43 src/sys/dev/ic/aic79xx.c:1.44
--- src/sys/dev/ic/aic79xx.c:1.43 Wed Sep 2 17:08:12 2009
+++ src/sys/dev/ic/aic79xx.c Thu Sep 3 14:52:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.c,v 1.43 2009/09/02 17:08:12 tsutsui Exp $ */
+/* $NetBSD: aic79xx.c,v 1.44 2009/09/03 14:52:22 tsutsui Exp $ */
/*
* Core routines and tables shareable across OS platforms.
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: aic79xx.c,v 1.43 2009/09/02 17:08:12 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: aic79xx.c,v 1.44 2009/09/03 14:52:22 tsutsui Exp $);
#include dev/ic/aic79xx_osm.h
#include dev/ic/aic79xx_inline.h
@@ -1672,7 +1672,8 @@
ahd_name(ahd), scbid1, mode);
packetized = 0;
} else
-packetized = (scb1-flags SCB_PACKETIZED) != 0;
+packetized =
+(scb1-flags SCB_PACKETIZED) != 0;
clear_fifo = 1;
break;
}
@@ -5167,10 +5168,14 @@
TAILQ_REMOVE(ahd_tailq, ahd, links);
/* FALLTHROUGH */
case 1:
- bus_dmamap_unload(ahd-parent_dmat, ahd-shared_data_map.dmamap);
- bus_dmamap_destroy(ahd-parent_dmat, ahd-shared_data_map.dmamap);
- bus_dmamem_unmap(ahd-parent_dmat, (void *)ahd-qoutfifo, ahd-shared_data_size);
- bus_dmamem_free(ahd-parent_dmat, ahd-shared_data_map.dmasegs, ahd-shared_data_map.nseg);
+ bus_dmamap_unload(ahd-parent_dmat,
+ ahd-shared_data_map.dmamap);
+ bus_dmamap_destroy(ahd-parent_dmat,
+ ahd-shared_data_map.dmamap);
+ bus_dmamem_unmap(ahd-parent_dmat, (void *)ahd-qoutfifo,
+ ahd-shared_data_size);
+ bus_dmamem_free(ahd-parent_dmat,
+ ahd-shared_data_map.dmasegs, ahd-shared_data_map.nseg);
break;
case 0:
break;
@@ -5220,7 +5225,7 @@
{
struct ahd_softc *ahd;
- ahd = (struct ahd_softc *)arg;
+ ahd = arg;
#ifdef AHD_DEBUG
printf(%s: ahd_shutdown\n, ahd_name(ahd));
@@ -5276,8 +5281,10 @@
* spurious SERR or PERR assertion. Disble
* PERR and SERR responses during the CHIPRST.
*/
- mod_cmd = cmd ~(PCI_COMMAND_PARITY_ENABLE|PCI_COMMAND_SERR_ENABLE);
- pci_conf_write(bd-pc, bd-tag, PCI_COMMAND_STATUS_REG, mod_cmd);
+ mod_cmd = cmd
+ ~(PCI_COMMAND_PARITY_ENABLE|PCI_COMMAND_SERR_ENABLE);
+ pci_conf_write(bd-pc, bd-tag,
+ PCI_COMMAND_STATUS_REG, mod_cmd);
}
ahd_outb(ahd, HCNTRL, CHIPRST | ahd-pause);
@@ -5366,13 +5373,15 @@
ahd_outb(ahd, SCB_CONTROL, MK_MESSAGE);
ret = ahd_inw_scbram(ahd, SCB_BASE);
if (ret != i) {
- printf(%s: ahd_probe_scbs (!=%d): returned 0x%x\n, ahd_name(ahd), i, ret);
+ printf(%s: ahd_probe_scbs (!=%d): returned 0x%x\n,
+ ahd_name(ahd), i, ret);
break;
}
ahd_set_scbptr(ahd, 0);
ret = ahd_inw_scbram(ahd, SCB_BASE);
if (ret != 0) {
- printf(ahd_probe_scbs (non zero): returned 0x%x\n, ret);
+ printf(ahd_probe_scbs (non zero): returned 0x%x\n,
+ ret);
break;
}
}
@@ -5516,7 +5525,8 @@
while ((sg_map = SLIST_FIRST(scb_data-sg_maps)) != NULL) {
SLIST_REMOVE_HEAD(scb_data-sg_maps, links);
- ahd_freedmamem(ahd-parent_dmat, ahd_sglist_allocsize(ahd),
+ ahd_freedmamem(ahd-parent_dmat,
+ ahd_sglist_allocsize(ahd),
sg_map-dmamap, (void *)sg_map-vaddr,
sg_map-dmasegs, sg_map-nseg);
free(sg_map, M_DEVBUF);
@@ -5530,7 +5540,8 @@
while ((hscb_map = SLIST_FIRST(scb_data-hscb_maps)) != NULL) {
SLIST_REMOVE_HEAD(scb_data-hscb_maps, links);
ahd_freedmamem(ahd-parent_dmat, PAGE_SIZE,
- hscb_map-dmamap, (void *)hscb_map-vaddr,
+ hscb_map-dmamap,
+ (void *)hscb_map-vaddr,
hscb_map-dmasegs, hscb_map-nseg);
free(hscb_map, M_DEVBUF);
}
@@ -5767,8 +5778,10 @@
memset(hscb_map, 0, sizeof(*hscb_map));
/* Allocate the next batch of hardware SCBs */
- if (ahd_createdmamem(ahd-parent_dmat, PAGE_SIZE, ahd-sc_dmaflags,
- hscb_map-dmamap, (void **)hscb_map-vaddr,
+ if (ahd_createdmamem(ahd-parent_dmat, PAGE_SIZE,
+ ahd-sc_dmaflags,
+ hscb_map-dmamap,
+ (void **)hscb_map-vaddr,
hscb_map-physaddr, hscb_map-dmasegs,
hscb_map-nseg, ahd_name(ahd),
hardware SCB structures) 0) {
@@ -5802,7 +5815,9 @@
memset(sg_map, 0, sizeof(*sg_map));
/* Allocate the next batch of S/G lists */
- if (ahd_createdmamem(ahd-parent_dmat, ahd_sglist_allocsize(ahd), ahd-sc_dmaflags,
+ if (ahd_createdmamem(ahd-parent_dmat,
+ ahd_sglist_allocsize(ahd),
+ ahd-sc_dmaflags,
sg_map-dmamap, (void **)sg_map-vaddr,
sg_map-physaddr,
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tsutsui Date: Thu Sep 3 14:55:29 UTC 2009 Modified Files: src/sys/dev/ic: aic79xxvar.h Log Message: Remove now unused *shutdown_hook from softc. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/aic79xxvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/aic79xxvar.h diff -u src/sys/dev/ic/aic79xxvar.h:1.25 src/sys/dev/ic/aic79xxvar.h:1.26 --- src/sys/dev/ic/aic79xxvar.h:1.25 Wed Sep 2 17:08:12 2009 +++ src/sys/dev/ic/aic79xxvar.h Thu Sep 3 14:55:29 2009 @@ -1071,7 +1071,6 @@ bus_space_tag_t tags[2]; bus_space_handle_tbshs[2]; - void *shutdown_hook; struct scb_data scb_data; struct hardware_scb *next_queued_hscb;
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Thu Sep 3 15:20:08 UTC 2009
Modified Files:
src/sys/kern: init_main.c subr_autoconf.c
src/sys/sys: device.h
Log Message:
Move configure() and configure2() from subr_autoconf.c to init_main.c,
since they are only peripherially related to the autoconf subsystem
and more related to boot initialization. Also, apply _KERNEL_OPT
to autoconf where necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/sys/kern/init_main.c
cvs rdiff -u -r1.179 -r1.180 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.120 -r1.121 src/sys/sys/device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.397 src/sys/kern/init_main.c:1.398
--- src/sys/kern/init_main.c:1.397 Wed Sep 2 08:07:05 2009
+++ src/sys/kern/init_main.c Thu Sep 3 15:20:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.397 2009/09/02 08:07:05 pooka Exp $ */
+/* $NetBSD: init_main.c,v 1.398 2009/09/03 15:20:08 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.397 2009/09/02 08:07:05 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.398 2009/09/03 15:20:08 pooka Exp $);
#include opt_ddb.h
#include opt_ipsec.h
@@ -233,6 +233,13 @@
struct timeval50 boottime50;
#endif
+#ifdef _KERNEL_OPT
+#include opt_userconf.h
+#endif
+#ifdef USERCONF
+#include sys/userconf.h
+#endif
+
extern struct proc proc0;
extern struct lwp lwp0;
extern struct cwdinfo cwdi0;
@@ -252,6 +259,8 @@
static void check_console(struct lwp *l);
static void start_init(void *);
+static void configure(void);
+static void configure2(void);
void main(void);
void __secmodel_none(void);
@@ -686,6 +695,93 @@
/* NOTREACHED */
}
+/*
+ * Configure the system's hardware.
+ */
+static void
+configure(void)
+{
+
+ /* Initialize autoconf data structures. */
+ config_init();
+ /*
+ * XXX
+ * callout_setfunc() requires mutex(9) so it can't be in config_init()
+ * on amiga and atari which use config_init() and autoconf(9) fucntions
+ * to initialize console devices.
+ */
+ config_twiddle_init();
+
+ pmf_init();
+#if NDRVCTL 0
+ drvctl_init();
+#endif
+
+#ifdef USERCONF
+ if (boothowto RB_USERCONF)
+ user_config();
+#endif
+
+ if ((boothowto (AB_SILENT|AB_VERBOSE)) == AB_SILENT) {
+ printf_nolog(Detecting hardware...);
+ }
+
+ /*
+ * Do the machine-dependent portion of autoconfiguration. This
+ * sets the configuration machinery here in motion by finding
+ * the root bus. When this function returns, we expect interrupts
+ * to be enabled.
+ */
+ cpu_configure();
+}
+
+static void
+configure2(void)
+{
+ CPU_INFO_ITERATOR cii;
+ struct cpu_info *ci;
+ int s;
+
+ /*
+ * Now that we've found all the hardware, start the real time
+ * and statistics clocks.
+ */
+ initclocks();
+
+ cold = 0; /* clocks are running, we're warm now! */
+ s = splsched();
+ curcpu()-ci_schedstate.spc_flags |= SPCF_RUNNING;
+ splx(s);
+
+ /* Boot the secondary processors. */
+ for (CPU_INFO_FOREACH(cii, ci)) {
+ uvm_cpu_attach(ci);
+ }
+ mp_online = true;
+#if defined(MULTIPROCESSOR)
+ cpu_boot_secondary_processors();
+#endif
+
+ /* Setup the runqueues and scheduler. */
+ runq_init();
+ sched_init();
+
+ /*
+ * Bus scans can make it appear as if the system has paused, so
+ * twiddle constantly while config_interrupts() jobs are running.
+ */
+ config_twiddle_fn(NULL);
+
+ /*
+ * Create threads to call back and finish configuration for
+ * devices that want interrupts enabled.
+ */
+ config_create_interruptthreads();
+
+ /* Get the threads going and into any sleeps before continuing. */
+ yield();
+}
+
static void
check_console(struct lwp *l)
{
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.179 src/sys/kern/subr_autoconf.c:1.180
--- src/sys/kern/subr_autoconf.c:1.179 Tue Jul 14 13:24:00 2009
+++ src/sys/kern/subr_autoconf.c Thu Sep 3 15:20:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.179 2009/07/14 13:24:00 tsutsui Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.180 2009/09/03 15:20:08 pooka Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,10 +77,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.179 2009/07/14 13:24:00 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.180 2009/09/03 15:20:08 pooka Exp $);
+#ifdef _KERNEL_OPT
#include opt_ddb.h
#include drvctl.h
+#endif
#include sys/param.h
#include sys/device.h
@@ -112,12 +114,7 @@
#include machine/limits.h
-#include opt_userconf.h
-#ifdef USERCONF
-#include sys/userconf.h
-#endif
-
-#ifdef __i386__
+#if defined(__i386__) defined(_KERNEL_OPT)
#include opt_splash.h
#if defined(SPLASHSCREEN) defined(SPLASHSCREEN_PROGRESS)
#include dev/splash/splash.h
@@
CVS commit: src
Module Name:src Committed By: pooka Date: Thu Sep 3 15:35:59 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.elf shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi src/lib: Makefile src/sys/rump/librump: Makefile Added Files: src/compat/lib/librumpdev: Makefile src/lib/librumpdev: Makefile Log Message: Build install rumpdev, a device component for rump. It currently supports autoconf and is required for example by pseudo-device rump components. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/compat/lib/librumpdev/Makefile cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.181 -r1.182 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.487 -r1.488 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1298 -r1.1299 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.142 -r1.143 src/lib/Makefile cvs rdiff -u -r0 -r1.1 src/lib/librumpdev/Makefile cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.65 src/distrib/sets/lists/base/md.amd64:1.66 --- src/distrib/sets/lists/base/md.amd64:1.65 Thu Sep 3 12:33:54 2009 +++ src/distrib/sets/lists/base/md.amd64 Thu Sep 3 15:35:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.65 2009/09/03 12:33:54 pooka Exp $ +# $NetBSD: md.amd64,v 1.66 2009/09/03 15:35:59 pooka Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -174,6 +174,8 @@ ./usr/lib/i386/librump.so.0.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpcrypto.so.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpcrypto.so.0.0 base-compat-shlib compat,pic +./usr/lib/i386/librumpdev.so.0 base-compat-shlib compat,pic +./usr/lib/i386/librumpdev.so.0.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/i386/librumpuser.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.58 src/distrib/sets/lists/base/md.sparc64:1.59 --- src/distrib/sets/lists/base/md.sparc64:1.58 Thu Sep 3 12:33:54 2009 +++ src/distrib/sets/lists/base/md.sparc64 Thu Sep 3 15:35:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.58 2009/09/03 12:33:54 pooka Exp $ +# $NetBSD: md.sparc64,v 1.59 2009/09/03 15:35:59 pooka Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -170,6 +170,8 @@ ./usr/lib/sparc/librump.so.0.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpcrypto.so.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpcrypto.so.0.0 base-compat-shlib compat,pic +./usr/lib/sparc/librumpdev.so.0 base-compat-shlib compat,pic +./usr/lib/sparc/librumpdev.so.0.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpnet.so.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpnet.so.0.0 base-compat-shlib compat,pic ./usr/lib/sparc/librumpuser.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.181 src/distrib/sets/lists/base/shl.elf:1.182 --- src/distrib/sets/lists/base/shl.elf:1.181 Thu Sep 3 12:55:10 2009 +++ src/distrib/sets/lists/base/shl.elf Thu Sep 3 15:35:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.181 2009/09/03 12:55:10 pooka Exp $ +# $NetBSD: shl.elf,v 1.182 2009/09/03 15:35:59 pooka Exp $ # # Note: Do not mark old major and major.minor shared libraries as # obsolete; just remove the entry, as third-party applications @@ -224,6 +224,8 @@ ./usr/lib/librump.so.0base-rump-shlib ./usr/lib/librumpcrypto.so base-rump-shlib ./usr/lib/librumpcrypto.so.0 base-rump-shlib +./usr/lib/librumpdev.sobase-rump-shlib +./usr/lib/librumpdev.so.0 base-rump-shlib ./usr/lib/librumpfs_cd9660.so base-rump-shlib ./usr/lib/librumpfs_cd9660.so.0 base-rump-shlib ./usr/lib/librumpfs_efs.so base-rump-shlib Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.487 src/distrib/sets/lists/base/shl.mi:1.488 --- src/distrib/sets/lists/base/shl.mi:1.487 Thu Sep 3 12:55:10 2009 +++ src/distrib/sets/lists/base/shl.mi Thu Sep 3 15:35:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.487 2009/09/03 12:55:10 pooka Exp $ +# $NetBSD: shl.mi,v 1.488 2009/09/03 15:35:59 pooka Exp $ # # Note: Don't delete entries from
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Thu Sep 3 16:53:10 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Add unzip. To generate a diff of this commit: cvs rdiff -u -r1.1282 -r1.1283 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1282 src/doc/CHANGES:1.1283 --- src/doc/CHANGES:1.1282 Mon Aug 31 19:06:25 2009 +++ src/doc/CHANGES Thu Sep 3 16:53:10 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1282 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1283 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -377,3 +377,5 @@ suntcx(4): imported the xf86-video-suntcx driver and added hardware acceleration [macallan 20090827] postfix(1): Import version 2.6.5 [tron 20090831] + unzip(1): A libarchive-based unzip frontend, emulating most of + infozip's command line. [joerg 20090903]
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: njoly
Date: Thu Sep 3 17:15:17 UTC 2009
Modified Files:
src/sys/compat/linux/common: linux_sched.c
Log Message:
Use correct sched_setscheduler syscall 3rd argument type.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/compat/linux/common/linux_sched.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_sched.c
diff -u src/sys/compat/linux/common/linux_sched.c:1.60 src/sys/compat/linux/common/linux_sched.c:1.61
--- src/sys/compat/linux/common/linux_sched.c:1.60 Tue Jun 23 13:18:59 2009
+++ src/sys/compat/linux/common/linux_sched.c Thu Sep 3 17:15:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.c,v 1.60 2009/06/23 13:18:59 njoly Exp $ */
+/* $NetBSD: linux_sched.c,v 1.61 2009/09/03 17:15:17 njoly Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.60 2009/06/23 13:18:59 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.61 2009/09/03 17:15:17 njoly Exp $);
#include sys/param.h
#include sys/mount.h
@@ -351,7 +351,7 @@
/* {
syscallarg(linux_pid_t) pid;
syscallarg(int) policy;
- syscallarg(cont struct linux_sched_scheduler *) sp;
+ syscallarg(cont struct linux_sched_param *) sp;
} */
int error, policy;
struct linux_sched_param lp;
CVS commit: src/share/man/man5
Module Name:src Committed By: apb Date: Thu Sep 3 20:06:39 UTC 2009 Modified Files: src/share/man/man5: rc.conf.5 Log Message: * Boolean values may be specified with any of YES/TRUE/ON/1 or NO/FALSE/OFF/0, so explain that. * Change all Foo: YES or NO. If not set to YES then ... to Foo: Boolean value. If false then * Some rewording for clarity. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.131 src/share/man/man5/rc.conf.5:1.132 --- src/share/man/man5/rc.conf.5:1.131 Sat Jul 25 21:21:20 2009 +++ src/share/man/man5/rc.conf.5 Thu Sep 3 20:06:39 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: rc.conf.5,v 1.131 2009/07/25 21:21:20 wiz Exp $ +.\ $NetBSD: rc.conf.5,v 1.132 2009/09/03 20:06:39 apb Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -55,7 +55,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd July 25, 2009 +.Dd September 3, 2009 .Dt RC.CONF 5 .Os .Sh NAME @@ -86,25 +86,6 @@ relevant manual pages. Third party packages may test for additional variables. .Pp -Most variables are one of two types: enabling variables or flags -variables. -Enabling variables, such as -.Sy inetd , -are generally named after the program or the system they enable, -and are set to -.Sq YES -or -.Sq NO . -Flags variables, such as -.Sy inetd_flags -have the same name with _flags appended, and determine what -arguments are passed to the program if it is enabled. -.Pp -If a variable that -.Xr rc 8 -expects to be set is not set, or the value is not one of the allowed -values, a warning will be printed. -.Pp By default, .Nm reads @@ -135,14 +116,39 @@ .Xr rc.d 8 control variables, and thus changing the operation of the script without requiring editing of the script. +.Ss Variable naming conventions and data types +Most variables are one of two types: enabling variables or flags +variables. +Enabling variables, such as +.Sy inetd , +are generally named after the program or the system they enable, +and have boolean values (specified using +.Sq Ic YES , +.Sq Ic TRUE , +.Sq Ic ON +or +.Sq Ic 1 +for true, and +.Sq Ic NO , +.Sq Ic FALSE , +.Sq Ic OFF +or +.Sq Ic 0 +for false, with the values being case insensitive). +Flags variables, such as +.Sy inetd_flags +have the same name with _flags appended, and determine what +arguments are passed to the program if it is enabled. +.Pp +If a variable that +.Xr rc 8 +expects to be set is not set, or the value is not one of the allowed +values, a warning will be printed. .Ss Overall control .Bl -tag -width net_interfaces .It Sy do_rcshutdown -.Sq YES -or -.Sq NO . -If set to -.Sq NO , +Boolean value. +If false, .Xr shutdown 8 will not run .Pa /etc/rc.shutdown . @@ -159,12 +165,8 @@ .Pa /etc/rc.shutdown if the timer expires before the shutdown script completes. .It Sy rc_configured -.Sq YES -or -.Sq NO . -If not set to -.Sq YES -then the system will drop into single-user mode during boot. +Boolean value. +If false then the system will drop into single-user mode during boot. .It Sy rc_fast_and_loose If set to a non-empty string, each script in @@ -273,45 +275,28 @@ access to the console and an unsuccessful shutdown must not make the host unbootable even if the file system checks would fail in preen mode. .It Sy no_swap -.Sq YES -or -.Sq NO . -Set the -.Sy no_swap -variable to -.Sq YES -if you have configured your system with no swap on purpose. -If not set to -.Sq YES , -and no swap devices -are configured, the system will warn you. +Boolean value. +Should be true if you have deliberately configured your system with no swap. +If false and no swap devices are configured, the system will warn you. .It Sy swapoff -.Sq YES -or -.Sq NO . +Boolean value. Remove block-type swap devices at shutdown time. Useful if swapping onto RAIDframe devices. .El .Ss One-time actions to perform or programs to run on boot-up .Bl -tag -width net_interfaces .It Sy accounting -.Sq YES -or -.Sq NO . +Boolean value. Enables process accounting with .Xr accton 8 . Requires .Pa /var/account/acct to exist. .It Sy clear_tmp -.Sq YES -or -.Sq NO . +Boolean value. Clear /tmp after reboot. .It Sy dmesg -.Sq YES -or -.Sq NO . +Boolean value. Create .Pa /var/run/dmesg.boot from the output of @@ -319,18 +304,14 @@ Passes .Sy dmesg_flags . .It Sy gpio -.Sq YES -or -.Sq NO . +Boolean value. Configure .Xr gpio 4 devices . See .Xr gpio.conf 5 . .It Sy mixerctl -.Sq YES -or -.Sq NO . +Boolean value. Read .Xr mixerctl.conf 5 for how to set mixer values. @@ -339,9 +320,7 @@ the devices whose settings are to be saved at shutdown and restored at start-up. .It Sy newsyslog -.Sq YES -or -.Sq NO . +Boolean value. Run .Nm newsyslog
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: dyoung
Date: Thu Sep 3 20:54:03 UTC 2009
Modified Files:
src/sys/dev/usb: uhub.c usb_subr.c
Log Message:
Expand some of the portability macros from sys/dev/usb/usb_port.h.
There is no change in the generated assembly.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/usb/uhub.c
cvs rdiff -u -r1.163 -r1.164 src/sys/dev/usb/usb_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.104 src/sys/dev/usb/uhub.c:1.105
--- src/sys/dev/usb/uhub.c:1.104 Tue Apr 7 18:15:45 2009
+++ src/sys/dev/usb/uhub.c Thu Sep 3 20:54:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.104 2009/04/07 18:15:45 dyoung Exp $ */
+/* $NetBSD: uhub.c,v 1.105 2009/09/03 20:54:03 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.104 2009/04/07 18:15:45 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.105 2009/09/03 20:54:03 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -106,7 +106,8 @@
CFATTACH_DECL2_NEW(uroothub, sizeof(struct uhub_softc), uhub_match,
uhub_attach, uhub_detach, uhub_activate, uhub_rescan, uhub_childdet);
-USB_MATCH(uhub)
+int
+uhub_match(device_t parent, cfdata_t match, void *aux)
{
USB_MATCH_START(uhub, uaa);
@@ -120,7 +121,8 @@
return (UMATCH_NONE);
}
-USB_ATTACH(uhub)
+void
+uhub_attach(device_t parent, device_t self, void *aux)
{
USB_ATTACH_START(uhub, sc, uaa);
usbd_device_handle dev = uaa-device;
@@ -155,7 +157,7 @@
err = usbd_set_config_index(dev, 0, 1);
if (err) {
DPRINTF((%s: configuration failed, error=%s\n,
- USBDEVNAME(sc-sc_dev), usbd_errstr(err)));
+ device_xname(sc-sc_dev), usbd_errstr(err)));
USB_ATTACH_ERROR_RETURN;
}
@@ -181,7 +183,7 @@
}
if (err) {
DPRINTF((%s: getting hub descriptor failed, error=%s\n,
- USBDEVNAME(sc-sc_dev), usbd_errstr(err)));
+ device_xname(sc-sc_dev), usbd_errstr(err)));
USB_ATTACH_ERROR_RETURN;
}
@@ -254,7 +256,7 @@
/* Wait with power off for a while. */
usbd_delay_ms(dev, USB_POWER_DOWN_TIME);
- usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, USBDEV(sc-sc_dev));
+ usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, sc-sc_dev);
/*
* To have the best chance of success we do things in the exact same
@@ -467,7 +469,7 @@
/* Disconnected */
DPRINTF((uhub_explore: device addr=%d disappeared
on port %d\n, up-device-address, port));
- usb_disconnect_port(up, USBDEV(sc-sc_dev));
+ usb_disconnect_port(up, sc-sc_dev);
usbd_clear_port_feature(dev, port,
UHF_C_PORT_CONNECTION);
}
@@ -519,7 +521,7 @@
else
speed = USB_SPEED_FULL;
/* Get device info and set its address. */
- err = usbd_new_device(USBDEV(sc-sc_dev), dev-bus,
+ err = usbd_new_device(sc-sc_dev, dev-bus,
dev-depth + 1, speed, port, up);
/* XXX retry a few times? */
if (err) {
@@ -584,7 +586,8 @@
* Called from process context when the hub is gone.
* Detach all devices on active ports.
*/
-USB_DETACH(uhub)
+int
+uhub_detach(device_t self, int flags)
{
USB_DETACH_START(uhub, sc);
struct usbd_hub *hub = sc-sc_hub-hub;
@@ -607,8 +610,7 @@
usb_disconnect_port(rup, self);
}
- usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc-sc_hub,
- USBDEV(sc-sc_dev));
+ usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc-sc_hub, sc-sc_dev);
#if 0
if (hub-ports[0].tt)
@@ -636,8 +638,7 @@
dev = hub-ports[port].device;
if (dev == NULL)
continue;
- err = usbd_reattach_device(USBDEV(sc-sc_dev), dev,
- port, locators);
+ err = usbd_reattach_device(sc-sc_dev, dev, port, locators);
}
return 0;
}
@@ -679,8 +680,7 @@
* to be explored again.
*/
void
-uhub_intr(usbd_xfer_handle xfer, usbd_private_handle addr,
-usbd_status status)
+uhub_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status)
{
struct uhub_softc *sc = addr;
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.163 src/sys/dev/usb/usb_subr.c:1.164
--- src/sys/dev/usb/usb_subr.c:1.163 Sun Aug 16 13:06:32 2009
+++ src/sys/dev/usb/usb_subr.c Thu Sep 3 20:54:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.163 2009/08/16 13:06:32 martin Exp $ */
+/* $NetBSD: usb_subr.c,v 1.164 2009/09/03 20:54:03 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.163 2009/08/16 13:06:32 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.164 2009/09/03 20:54:03 dyoung Exp $);
#include opt_compat_netbsd.h
#include opt_usbverbose.h
@@ -78,8 +78,8 @@
Static void usbd_free_iface_data(usbd_device_handle dev, int ifcno);
Static void
CVS commit: src/sys/nfs
Module Name:src
Committed By: tls
Date: Thu Sep 3 20:59:13 UTC 2009
Modified Files:
src/sys/nfs: nfs_srvsocket.c
Log Message:
Missed this file in previous commit, accidentally checked in fix to local
repository copy! Sorry about that, folks.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/nfs/nfs_srvsocket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_srvsocket.c
diff -u src/sys/nfs/nfs_srvsocket.c:1.3 src/sys/nfs/nfs_srvsocket.c:1.4
--- src/sys/nfs/nfs_srvsocket.c:1.3 Sat Mar 14 15:36:24 2009
+++ src/sys/nfs/nfs_srvsocket.c Thu Sep 3 20:59:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_srvsocket.c,v 1.3 2009/03/14 15:36:24 dsl Exp $ */
+/* $NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_srvsocket.c,v 1.3 2009/03/14 15:36:24 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_srvsocket.c,v 1.4 2009/09/03 20:59:12 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -110,7 +110,7 @@
* The void *arg is a pointer to the struct nfssvc_sock.
*/
void
-nfsrv_soupcall(struct socket *so, void *arg, int waitflag)
+nfsrv_soupcall(struct socket *so, void *arg, int events, int waitflag)
{
struct nfssvc_sock *slp = (struct nfssvc_sock *)arg;
CVS commit: src/sys/nfs
Module Name:src Committed By: tls Date: Thu Sep 3 21:06:21 UTC 2009 Modified Files: src/sys/nfs: nfs_var.h Log Message: ...and one more missed in the earlier commit (sigh). Kernels should build again now. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/nfs/nfs_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/nfs/nfs_var.h diff -u src/sys/nfs/nfs_var.h:1.88 src/sys/nfs/nfs_var.h:1.89 --- src/sys/nfs/nfs_var.h:1.88 Tue Jul 7 14:09:05 2009 +++ src/sys/nfs/nfs_var.h Thu Sep 3 21:06:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_var.h,v 1.88 2009/07/07 14:09:05 christos Exp $ */ +/* $NetBSD: nfs_var.h,v 1.89 2009/09/03 21:06:21 tls Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -183,7 +183,7 @@ int nfs_sigintr(struct nfsmount *, struct nfsreq *, struct lwp *); int nfs_getreq(struct nfsrv_descript *, struct nfsd *, int); int nfs_msg(struct lwp *, const char *, const char *); -void nfsrv_soupcall(struct socket *, void *, int); +void nfsrv_soupcall(struct socket *, void *, int, int); void nfsrv_rcv(struct nfssvc_sock *); int nfsrv_getstream(struct nfssvc_sock *, int); int nfsrv_dorec(struct nfssvc_sock *, struct nfsd *, struct nfsrv_descript **,
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: jmcneill
Date: Thu Sep 3 23:25:04 UTC 2009
Modified Files:
src/sys/arch/x86/x86: bus_space.c
Log Message:
Fix a bug where mapping the very end of iomem accidentally returns an
address in the ISA hole (because addr+size calculations wrap to 0). Fixes
ohci on VirtualPC 7 for Mac, which places OHCI at base address 0xf000
size 0x1000.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/bus_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.23 src/sys/arch/x86/x86/bus_space.c:1.24
--- src/sys/arch/x86/x86/bus_space.c:1.23 Wed Jul 29 12:02:06 2009
+++ src/sys/arch/x86/x86/bus_space.c Thu Sep 3 23:25:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.23 2009/07/29 12:02:06 cegger Exp $ */
+/* $NetBSD: bus_space.c,v 1.24 2009/09/03 23:25:04 jmcneill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.23 2009/07/29 12:02:06 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.24 2009/09/03 23:25:04 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -174,7 +174,7 @@
}
#ifndef XEN
- if (bpa = IOM_BEGIN (bpa + size) = IOM_END) {
+ if (bpa = IOM_BEGIN (bpa + size) != 0 (bpa + size) = IOM_END) {
*bshp = (bus_space_handle_t)ISA_HOLE_VADDR(bpa);
return(0);
}
@@ -299,12 +299,12 @@
endpa = x86_round_page(bpa + size);
#ifdef DIAGNOSTIC
- if (endpa = pa)
+ if (endpa != 0 endpa = pa)
panic(x86_mem_add_mapping: overflow);
#endif
#ifdef XEN
- if (bpa = IOM_BEGIN (bpa + size) = IOM_END) {
+ if (bpa = IOM_BEGIN (bpa + size) != 0 (bpa + size) = IOM_END) {
sva = (vaddr_t)ISA_HOLE_VADDR(pa);
} else
#endif /* XEN */
@@ -319,7 +319,7 @@
va = sva;
xpte = 0;
- for (; pa endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
+ for (; pa != endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
/*
* PG_N doesn't exist on 386's, so we assume that
* the mainboard has wired up device space non-cacheable
@@ -372,7 +372,8 @@
if (t == X86_BUS_SPACE_IO) {
bpa = bsh;
} else if (t == X86_BUS_SPACE_MEM) {
- if (bsh = atdevbase (bsh + size) = (atdevbase + IOM_SIZE)) {
+ if (bsh = atdevbase (bsh + size) != 0
+ (bsh + size) = (atdevbase + IOM_SIZE)) {
bpa = (bus_addr_t)ISA_PHYSADDR(bsh);
} else {
@@ -423,7 +424,7 @@
} else if (t == X86_BUS_SPACE_MEM) {
ex = iomem_ex;
- if (bsh = atdevbase
+ if (bsh = atdevbase (bsh + size) != 0
(bsh + size) = (atdevbase + IOM_SIZE)) {
bpa = (bus_addr_t)ISA_PHYSADDR(bsh);
goto ok;
CVS commit: src/external/bsd/pcc/dist
Module Name:src Committed By: gmcgarry Date: Fri Sep 4 00:27:48 UTC 2009 Update of /cvsroot/src/external/bsd/pcc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27069 Log Message: Import pcc 0.9.9 090902 Status: Vendor Tag: ragge Release Tags: pcc-090902 U src/external/bsd/pcc/dist/pcc/config.guess U src/external/bsd/pcc/dist/pcc/config.h.in U src/external/bsd/pcc/dist/pcc/config.sub U src/external/bsd/pcc/dist/pcc/configure U src/external/bsd/pcc/dist/pcc/configure.ac U src/external/bsd/pcc/dist/pcc/install-sh U src/external/bsd/pcc/dist/pcc/Makefile.in N src/external/bsd/pcc/dist/pcc/arch/amd64/code.c N src/external/bsd/pcc/dist/pcc/arch/amd64/local.c N src/external/bsd/pcc/dist/pcc/arch/amd64/local2.c N src/external/bsd/pcc/dist/pcc/arch/amd64/macdefs.h N src/external/bsd/pcc/dist/pcc/arch/amd64/order.c N src/external/bsd/pcc/dist/pcc/arch/amd64/table.c U src/external/bsd/pcc/dist/pcc/arch/arm/code.c U src/external/bsd/pcc/dist/pcc/arch/arm/local.c U src/external/bsd/pcc/dist/pcc/arch/arm/local2.c U src/external/bsd/pcc/dist/pcc/arch/arm/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/arm/order.c U src/external/bsd/pcc/dist/pcc/arch/arm/table.c U src/external/bsd/pcc/dist/pcc/arch/hppa/code.c U src/external/bsd/pcc/dist/pcc/arch/hppa/local.c U src/external/bsd/pcc/dist/pcc/arch/hppa/local2.c U src/external/bsd/pcc/dist/pcc/arch/hppa/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/hppa/order.c U src/external/bsd/pcc/dist/pcc/arch/hppa/table.c U src/external/bsd/pcc/dist/pcc/arch/i386/code.c U src/external/bsd/pcc/dist/pcc/arch/i386/flocal.c U src/external/bsd/pcc/dist/pcc/arch/i386/local.c U src/external/bsd/pcc/dist/pcc/arch/i386/local2.c U src/external/bsd/pcc/dist/pcc/arch/i386/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/i386/order.c U src/external/bsd/pcc/dist/pcc/arch/i386/table.c U src/external/bsd/pcc/dist/pcc/arch/m16c/code.c U src/external/bsd/pcc/dist/pcc/arch/m16c/local.c U src/external/bsd/pcc/dist/pcc/arch/m16c/local2.c U src/external/bsd/pcc/dist/pcc/arch/m16c/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/m16c/order.c U src/external/bsd/pcc/dist/pcc/arch/m16c/table.c U src/external/bsd/pcc/dist/pcc/arch/m16c/TODO U src/external/bsd/pcc/dist/pcc/arch/mips/code.c U src/external/bsd/pcc/dist/pcc/arch/mips/local.c U src/external/bsd/pcc/dist/pcc/arch/mips/local2.c U src/external/bsd/pcc/dist/pcc/arch/mips/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/mips/order.c U src/external/bsd/pcc/dist/pcc/arch/mips/table.c U src/external/bsd/pcc/dist/pcc/arch/mips/TODO U src/external/bsd/pcc/dist/pcc/arch/nova/code.c U src/external/bsd/pcc/dist/pcc/arch/nova/local.c U src/external/bsd/pcc/dist/pcc/arch/nova/local2.c U src/external/bsd/pcc/dist/pcc/arch/nova/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/nova/order.c U src/external/bsd/pcc/dist/pcc/arch/nova/README U src/external/bsd/pcc/dist/pcc/arch/nova/table.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/code.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/local.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/local2.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/pdp10/order.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/README U src/external/bsd/pcc/dist/pcc/arch/pdp10/table.c N src/external/bsd/pcc/dist/pcc/arch/pdp11/code.c N src/external/bsd/pcc/dist/pcc/arch/pdp11/local.c N src/external/bsd/pcc/dist/pcc/arch/pdp11/local2.c N src/external/bsd/pcc/dist/pcc/arch/pdp11/macdefs.h N src/external/bsd/pcc/dist/pcc/arch/pdp11/order.c N src/external/bsd/pcc/dist/pcc/arch/pdp11/table.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/code.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/local.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/local2.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/powerpc/order.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/README U src/external/bsd/pcc/dist/pcc/arch/powerpc/table.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/code.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/local.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/local2.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/sparc64/order.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/table.c U src/external/bsd/pcc/dist/pcc/arch/vax/code.c U src/external/bsd/pcc/dist/pcc/arch/vax/local.c U src/external/bsd/pcc/dist/pcc/arch/vax/local2.c U src/external/bsd/pcc/dist/pcc/arch/vax/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/vax/order.c U src/external/bsd/pcc/dist/pcc/arch/vax/table.c U src/external/bsd/pcc/dist/pcc/cc/Makefile.in U src/external/bsd/pcc/dist/pcc/cc/cc/cc.1 U src/external/bsd/pcc/dist/pcc/cc/cc/cc.c U src/external/bsd/pcc/dist/pcc/cc/cc/Makefile.in U src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1 U src/external/bsd/pcc/dist/pcc/cc/ccom/cgram.y U src/external/bsd/pcc/dist/pcc/cc/ccom/gcc_compat.c U src/external/bsd/pcc/dist/pcc/cc/ccom/init.c U src/external/bsd/pcc/dist/pcc/cc/ccom/inline.c U
CVS commit: src/external/bsd/pcc
Module Name:src
Committed By: gmcgarry
Date: Fri Sep 4 00:50:06 UTC 2009
Modified Files:
src/external/bsd/pcc: config.h
src/external/bsd/pcc/dist/pcc/cc/ccom: pftn.c
src/external/bsd/pcc/lib/libpcc: Makefile
src/external/bsd/pcc/libexec/ccom: Makefile
src/external/bsd/pcc/libexec/cpp: Makefile
Log Message:
Update build system and merge changes for pcc 0.9.9 090902.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/config.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/pcc/lib/libpcc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/libexec/ccom/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/libexec/cpp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/config.h
diff -u src/external/bsd/pcc/config.h:1.2 src/external/bsd/pcc/config.h:1.3
--- src/external/bsd/pcc/config.h:1.2 Wed Aug 27 12:22:37 2008
+++ src/external/bsd/pcc/config.h Fri Sep 4 00:50:04 2009
@@ -189,6 +189,12 @@
/* Version string */
#define VERSSTR pcc 0.9.9 for i386-pc-netbsdelf, g...@sparky Wed Aug 13 22:19:18 EST 2008
+/* Size of wide character type */
+#define WCHAR_SIZE 4
+
+/* Type to use for wide characters */
+#define WCHAR_TYPE UNSIGNED
+
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
#define YYTEXT_POINTER 1
Index: src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c
diff -u src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c:1.3 src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c:1.4
--- src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c:1.3 Fri Sep 12 14:40:46 2008
+++ src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c Fri Sep 4 00:50:05 2009
@@ -1,4 +1,4 @@
-/* $Id: pftn.c,v 1.3 2008/09/12 14:40:46 christos Exp $ */
+/* $Id: pftn.c,v 1.4 2009/09/04 00:50:05 gmcgarry Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ra...@ludd.luth.se).
* All rights reserved.
@@ -11,8 +11,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in the
*documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -100,6 +98,7 @@
int rstr;
struct symtab *rsym;
struct symtab *rb;
+ NODE *rgp;
int flags;
#define LASTELM 1
} *rpole;
@@ -115,20 +114,22 @@
/* defines used for getting things off of the initialization stack */
-static NODE *arrstk[10];
-static int arrstkp;
+NODE *arrstk[10];
+int arrstkp;
static int intcompare;
static NODE *parlink;
void fixtype(NODE *p, int class);
int fixclass(int class, TWORD type);
-int falloc(struct symtab *p, int w, int new, NODE *pty);
static void dynalloc(struct symtab *p, int *poff);
void inforce(OFFSZ n);
void vfdalign(int n);
static void ssave(struct symtab *);
static void alprint(union arglist *al, int in);
static void lcommadd(struct symtab *sp);
+static NODE *mkcmplx(NODE *p, TWORD dt);
+extern int fun_inline;
+struct suedef *sueget(struct suedef *p);
int ddebug = 0;
@@ -138,19 +139,23 @@
*/
void
-defid(NODE *q, int class)
+defid(NODE *ap, int class)
{
- extern int fun_inline;
struct symtab *p;
TWORD type, qual;
TWORD stp, stq;
int scl;
union dimfun *dsym, *ddef;
int slev, temp, changed;
+ NODE *q = ap;
if (q == NIL)
return; /* an error was detected */
+#ifdef GCC_COMPAT
+ if (q-n_op == CM)
+ q = q-n_left;
+#endif
p = q-n_sp;
if (p-sname == NULL)
@@ -245,8 +250,12 @@
#endif
/* check that redeclarations are to the same structure */
- if ((temp == STRTY || temp == UNIONTY) p-ssue != q-n_sue) {
- goto mismatch;
+ if (temp == STRTY || temp == UNIONTY) {
+ struct suedef *sue1, *sue2;
+ GETSUE(sue1, p-ssue);
+ GETSUE(sue2, q-n_sue);
+ if (sue1 != sue2)
+ goto mismatch;
}
scl = p-sclass;
@@ -256,6 +265,15 @@
printf( previous class: %s\n, scnames(scl));
#endif
+#ifdef GCC_COMPAT
+ /* Its allowed to add attributes to existing declarations */
+ if (ap != q) {
+ p-ssue = sueget(p-ssue);
+p-ssue-suega = gcc_attr_parse(ap-n_right);
+ap-n_right = bcon(0);
+}
+#endif
+
if (class FIELD)
return;
switch(class) {
@@ -272,7 +290,14 @@
case FORTRAN:
case UFORTRAN:
goto done;
+ case SNULL:
+ if (p-sflags SINLINE) {
+p-sclass = EXTDEF;
+inline_ref(p);
+goto done;
}
+ break;
+ }
break;
case STATIC:
@@ -318,6 +343,15 @@
case USTATIC:
p-sclass = STATIC;
goto done;
+ case SNULL:
+ /*
+ * Handle redeclarations of inlined
CVS commit: src/sys/netsmb
Module Name:src
Committed By: tls
Date: Fri Sep 4 01:41:06 UTC 2009
Modified Files:
src/sys/netsmb: smb_trantcp.c
Log Message:
Grr. One last thing from the upcall-direction patch which I failed to
check in correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/netsmb/smb_trantcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netsmb/smb_trantcp.c
diff -u src/sys/netsmb/smb_trantcp.c:1.42 src/sys/netsmb/smb_trantcp.c:1.43
--- src/sys/netsmb/smb_trantcp.c:1.42 Sun Mar 29 19:21:20 2009
+++ src/sys/netsmb/smb_trantcp.c Fri Sep 4 01:41:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_trantcp.c,v 1.42 2009/03/29 19:21:20 christos Exp $ */
+/* $NetBSD: smb_trantcp.c,v 1.43 2009/09/04 01:41:06 tls Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_trantcp.c,v 1.42 2009/03/29 19:21:20 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_trantcp.c,v 1.43 2009/09/04 01:41:06 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -127,7 +127,7 @@
}
static void
-nb_upcall(struct socket *so, void *arg, int waitflag)
+nb_upcall(struct socket *so, void *arg, int events, int waitflag)
{
struct nbpcb *nbp = (void *)arg;
