CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Fri Sep 13 06:21:43 UTC 2013
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Update Intel processors' brand names and model names (e.g. Atom C2000 and
E3000) from the latest document.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/cpuctl/arch/i386.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.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.40 src/usr.sbin/cpuctl/arch/i386.c:1.41
--- src/usr.sbin/cpuctl/arch/i386.c:1.40 Tue Jul 16 09:54:30 2013
+++ src/usr.sbin/cpuctl/arch/i386.c Fri Sep 13 06:21:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.40 2013/07/16 09:54:30 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.41 2013/09/13 06:21:43 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: i386.c,v 1.40 2013/07/16 09:54:30 msaitoh Exp $);
+__RCSID($NetBSD: i386.c,v 1.41 2013/09/13 06:21:43 msaitoh Exp $);
#endif /* not lint */
#include sys/types.h
@@ -151,7 +151,9 @@ static const struct x86_cache_info intel
/*
* Map Brand ID from cpuid instruction to brand name.
- * Source: Intel Processor Identification and the CPUID Instruction, AP-485
+ * Source: Table 3-24, Mapping of Brand Indices; and Intel 64 and IA-32
+ * Processor Brand Strings, Chapter 3 in Intel (R) 64 and IA-32
+ * Architectures Software Developer's Manual, Volume 2A.
*/
static const char * const i386_intel_brand[] = {
, /* Unsupported */
@@ -159,7 +161,7 @@ static const char * const i386_intel_bra
Pentium III, /* Intel (R) Pentium (R) III processor */
Pentium III Xeon, /* Intel (R) Pentium (R) III Xeon (TM) processor */
Pentium III, /* Intel (R) Pentium (R) III processor */
- , /* Reserved */
+ , /* 0x05: Reserved */
Mobile Pentium III, /* Mobile Intel (R) Pentium (R) III processor-M */
Mobile Celeron, /* Mobile Intel (R) Celeron (R) processor */
Pentium 4, /* Intel (R) Pentium (R) 4 processor */
@@ -167,9 +169,17 @@ static const char * const i386_intel_bra
Celeron, /* Intel (R) Celeron (TM) processor */
Xeon, /* Intel (R) Xeon (TM) processor */
Xeon MP, /* Intel (R) Xeon (TM) processor MP */
- , /* Reserved */
+ , /* 0x0d: Reserved */
Mobile Pentium 4, /* Mobile Intel (R) Pentium (R) 4 processor-M */
Mobile Celeron, /* Mobile Intel (R) Celeron (R) processor */
+ , /* 0x10: Reserved */
+ Mobile Genuine, /* Moblie Genuine Intel (R) processor */
+ Celeron M,/* Intel (R) Celeron (R) M processor */
+ Mobile Celeron, /* Mobile Intel (R) Celeron (R) processor */
+ Celeron, /* Intel (R) Celeron (R) processor */
+ Mobile Genuine, /* Moblie Genuine Intel (R) processor */
+ Pentium M,/* Intel (R) Pentium (R) M processor */
+ Mobile Celeron, /* Mobile Intel (R) Celeron (R) processor */
};
/*
@@ -246,6 +256,11 @@ const char *modifiers[] = {
const struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
{
+ /*
+ * For Intel processors, check Chapter 35Model-specific
+ * registers (MSRS), in Intel (R) 64 and IA-32 Architectures
+ * Software Developer's Manual, Volume 3C.
+ */
GenuineIntel,
CPUVENDOR_INTEL,
Intel,
@@ -281,7 +296,6 @@ const struct cpu_cpuid_nameclass i386_cp
{
CPUCLASS_686,
{
-/* Updated from intel_x86_325486.pdf Aug 2012 */
[0x00] = Pentium Pro (A-step),
[0x01] = Pentium Pro,
[0x03] = Pentium II (Klamath),
@@ -320,17 +334,20 @@ const struct cpu_cpuid_nameclass i386_cp
[0x2e] = Xeon 75xx 65xx,
[0x2f] = Xeon E7 family,
[0x35] = Atom Family,
-[0x36] = Atom S,
+[0x36] = Atom S1000,
+[0x37] = Atom C2000, E3000,
[0x3a] = Xeon E3-1200v2 and 3rd gen core,
Ivy bridge,
[0x3c] = 4th gen Core, Xeon E3-12xx v3
(Haswell),
+[0x3d] = Next gen Core,
[0x3e] = Next gen Xeon E5/E7, Ivy bridge,
[0x3f] = Future gen Xeon,
[0x45] = 4th gen Core, Xeon E3-12xx v3
(Haswell),
[0x46] = 4th gen Core, Xeon E3-12xx v3
(Haswell),
+[0x4d] = Atom C2000, E3000,
},
Pentium Pro, II or III, /* Default */
NULL,
CVS commit: src/sys/kern
Module Name:src Committed By: jnemeth Date: Fri Sep 13 07:18:34 UTC 2013 Modified Files: src/sys/kern: kern_module.c Log Message: fix compilation error; hi christos! To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/kern/kern_module.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/kern_module.c diff -u src/sys/kern/kern_module.c:1.92 src/sys/kern/kern_module.c:1.93 --- src/sys/kern/kern_module.c:1.92 Thu Sep 12 19:02:05 2013 +++ src/sys/kern/kern_module.c Fri Sep 13 07:18:34 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_module.c,v 1.92 2013/09/12 19:02:05 christos Exp $ */ +/* $NetBSD: kern_module.c,v 1.93 2013/09/13 07:18:34 jnemeth Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.92 2013/09/12 19:02:05 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.93 2013/09/13 07:18:34 jnemeth Exp $); #define _MODULE_INTERNAL @@ -932,7 +932,7 @@ module_do_load(const char *name, bool is * available for each architecture, so we don't * print an error if they are missing. */ - if (class != MODULE_CLASS_EXEC || errno != ENOENT) + if (class != MODULE_CLASS_EXEC || error != ENOENT) module_error(vfs load failed for `%s', error %d, name, error); #endif
CVS commit: src/lib/libc
Module Name:src
Committed By: joerg
Date: Fri Sep 13 13:13:32 UTC 2013
Modified Files:
src/lib/libc/citrus: citrus_lc_ctype.c
src/lib/libc/compat/locale: compat_setlocale1.c
src/lib/libc/locale: global_locale.c localeconv.c nb_lc_messages_misc.h
nb_lc_monetary_misc.h nb_lc_numeric_misc.h nb_lc_template.h
nb_lc_template_decl.h nb_lc_time_misc.h newlocale.c setlocale.c
setlocale_local.h
Log Message:
Redo the locale cache to be constant. It now contains the localeconv()
data and which LC_MONETARY and LC_NUMERIC values it is derived from.
In newlocale(3) and setlocale(3), check for the existing entries and on
miss, create a new entry. This is currently not using a lock for the
list as the worst case is a small memory leak.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/citrus/citrus_lc_ctype.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/locale/compat_setlocale1.c
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/locale/localeconv.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/locale/nb_lc_messages_misc.h \
src/lib/libc/locale/nb_lc_monetary_misc.h \
src/lib/libc/locale/nb_lc_numeric_misc.h
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/locale/nb_lc_template.h \
src/lib/libc/locale/nb_lc_time_misc.h
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/nb_lc_template_decl.h
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/locale/newlocale.c
cvs rdiff -u -r1.63 -r1.64 src/lib/libc/locale/setlocale.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/locale/setlocale_local.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/citrus/citrus_lc_ctype.c
diff -u src/lib/libc/citrus/citrus_lc_ctype.c:1.14 src/lib/libc/citrus/citrus_lc_ctype.c:1.15
--- src/lib/libc/citrus/citrus_lc_ctype.c:1.14 Tue Aug 20 19:58:30 2013
+++ src/lib/libc/citrus/citrus_lc_ctype.c Fri Sep 13 13:13:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_lc_ctype.c,v 1.14 2013/08/20 19:58:30 joerg Exp $ */
+/* $NetBSD: citrus_lc_ctype.c,v 1.15 2013/09/13 13:13:32 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: citrus_lc_ctype.c,v 1.14 2013/08/20 19:58:30 joerg Exp $);
+__RCSID($NetBSD: citrus_lc_ctype.c,v 1.15 2013/09/13 13:13:32 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include reentrant.h
@@ -96,14 +96,6 @@ _citrus_LC_CTYPE_create_impl(const char
}
static __inline void
-_PREFIX(build_cache)(struct _locale_cache_t * __restrict cache,
-_RuneLocale * __restrict data)
-{
- _DIAGASSERT(cache != NULL);
- _DIAGASSERT(data != NULL);
-}
-
-static __inline void
_PREFIX(update_global)(_RuneLocale *data)
{
_DIAGASSERT(data != NULL);
Index: src/lib/libc/compat/locale/compat_setlocale1.c
diff -u src/lib/libc/compat/locale/compat_setlocale1.c:1.1 src/lib/libc/compat/locale/compat_setlocale1.c:1.2
--- src/lib/libc/compat/locale/compat_setlocale1.c:1.1 Mon Jun 7 13:52:30 2010
+++ src/lib/libc/compat/locale/compat_setlocale1.c Fri Sep 13 13:13:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setlocale1.c,v 1.1 2010/06/07 13:52:30 tnozaki Exp $ */
+/* $NetBSD: compat_setlocale1.c,v 1.2 2013/09/13 13:13:32 joerg Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -30,7 +30,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: compat_setlocale1.c,v 1.1 2010/06/07 13:52:30 tnozaki Exp $);
+__RCSID($NetBSD: compat_setlocale1.c,v 1.2 2013/09/13 13:13:32 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
#include sys/types.h
@@ -38,6 +38,8 @@ __RCSID($NetBSD: compat_setlocale1.c,v
#include setlocale_local.h
+#undef setlocale
+
__warn_references(setlocale,
warning: reference to compatibility setlocale();
include locale.h for correct reference)
@@ -47,7 +49,10 @@ __warn_references(setlocale,
* This function will ensure binary compatibility for old executables.
*/
char *
-setlocale(int category, const char *locale)
+compat_setlocale(int category, const char *locale) __RENAME(setlocale);
+
+char *
+compat_setlocale(int category, const char *locale)
{
/* locale may be NULL */
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.20 src/lib/libc/locale/global_locale.c:1.21
--- src/lib/libc/locale/global_locale.c:1.20 Tue Aug 20 19:58:30 2013
+++ src/lib/libc/locale/global_locale.c Fri Sep 13 13:13:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.20 2013/08/20 19:58:30 joerg Exp $ */
+/* $NetBSD: global_locale.c,v 1.21 2013/09/13 13:13:32 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: global_locale.c,v 1.20 2013/08/20 19:58:30 joerg Exp $);
+__RCSID($NetBSD: global_locale.c,v 1.21 2013/09/13 13:13:32 joerg
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: christos Date: Fri Sep 13 15:00:47 UTC 2013 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: disable more stuff. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/zaurus/conf/INSTALL 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/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.19 src/sys/arch/zaurus/conf/INSTALL:1.20 --- src/sys/arch/zaurus/conf/INSTALL:1.19 Fri Jun 28 15:24:28 2013 +++ src/sys/arch/zaurus/conf/INSTALL Fri Sep 13 11:00:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.19 2013/06/28 19:24:28 he Exp $ +# $NetBSD: INSTALL,v 1.20 2013/09/13 15:00:47 christos Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -32,6 +32,8 @@ no file-system PROCFS no file-system PTYFS no file-system TMPFS +no options WAPBL + no options COMPAT_13 no options COMPAT_14 no options COMPAT_15 @@ -45,6 +47,8 @@ no options COMPAT_43 no options COMPAT_OSSAUDIO +no options DKWEDGE_AUTODISCOVER + no options SYSVMSG no options SYSVSEM no options SYSVSHM
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: joerg
Date: Fri Sep 13 17:38:17 UTC 2013
Modified Files:
src/external/bsd/byacc/dist: skeleton.c
Log Message:
Mark yysccsid as used when compiling with GCC 3.1 or compatible.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/skeleton.c
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/byacc/dist/skeleton.c
diff -u src/external/bsd/byacc/dist/skeleton.c:1.11 src/external/bsd/byacc/dist/skeleton.c:1.12
--- src/external/bsd/byacc/dist/skeleton.c:1.11 Sat Apr 6 14:52:24 2013
+++ src/external/bsd/byacc/dist/skeleton.c Fri Sep 13 17:38:17 2013
@@ -1,11 +1,11 @@
-/* $NetBSD: skeleton.c,v 1.11 2013/04/06 14:52:24 christos Exp $ */
+/* $NetBSD: skeleton.c,v 1.12 2013/09/13 17:38:17 joerg Exp $ */
/* Id: skeleton.c,v 1.32 2013/03/04 23:19:39 tom Exp */
#include defs.h
#include sys/cdefs.h
-__RCSID($NetBSD: skeleton.c,v 1.11 2013/04/06 14:52:24 christos Exp $);
+__RCSID($NetBSD: skeleton.c,v 1.12 2013/09/13 17:38:17 joerg Exp $);
/* The definition of yysccsid in the banner should be replaced with */
/* a #pragma ident directive if the target C compiler supports */
@@ -22,6 +22,9 @@ __RCSID($NetBSD: skeleton.c,v 1.11 2013
const char *const banner[] =
{
#ifndef lint,
+#if __GNUC__ - 0 = 4 || (__GNUC__ 0 == 3 __GNUC_MINOR__ = 1),
+__attribute__((__used__)),
+#endif,
static const char yysccsid[] = \@(#)yaccpar 1.9 (Berkeley) 02/21/93\;,
#endif,
,
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: joerg
Date: Fri Sep 13 18:53:29 UTC 2013
Modified Files:
src/external/bsd/byacc/dist: skeleton.c
Log Message:
Add missing minus.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/byacc/dist/skeleton.c
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/byacc/dist/skeleton.c
diff -u src/external/bsd/byacc/dist/skeleton.c:1.12 src/external/bsd/byacc/dist/skeleton.c:1.13
--- src/external/bsd/byacc/dist/skeleton.c:1.12 Fri Sep 13 17:38:17 2013
+++ src/external/bsd/byacc/dist/skeleton.c Fri Sep 13 18:53:29 2013
@@ -1,11 +1,11 @@
-/* $NetBSD: skeleton.c,v 1.12 2013/09/13 17:38:17 joerg Exp $ */
+/* $NetBSD: skeleton.c,v 1.13 2013/09/13 18:53:29 joerg Exp $ */
/* Id: skeleton.c,v 1.32 2013/03/04 23:19:39 tom Exp */
#include defs.h
#include sys/cdefs.h
-__RCSID($NetBSD: skeleton.c,v 1.12 2013/09/13 17:38:17 joerg Exp $);
+__RCSID($NetBSD: skeleton.c,v 1.13 2013/09/13 18:53:29 joerg Exp $);
/* The definition of yysccsid in the banner should be replaced with */
/* a #pragma ident directive if the target C compiler supports */
@@ -22,7 +22,7 @@ __RCSID($NetBSD: skeleton.c,v 1.12 2013
const char *const banner[] =
{
#ifndef lint,
-#if __GNUC__ - 0 = 4 || (__GNUC__ 0 == 3 __GNUC_MINOR__ = 1),
+#if __GNUC__ - 0 = 4 || (__GNUC__ - 0 == 3 __GNUC_MINOR__ = 1),
__attribute__((__used__)),
#endif,
static const char yysccsid[] = \@(#)yaccpar 1.9 (Berkeley) 02/21/93\;,
CVS commit: src/lib/libresolv
Module Name:src Committed By: joerg Date: Fri Sep 13 19:29:47 UTC 2013 Modified Files: src/lib/libresolv: ns_verify.c Log Message: Use __RCSID. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libresolv/ns_verify.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libresolv/ns_verify.c diff -u src/lib/libresolv/ns_verify.c:1.2 src/lib/libresolv/ns_verify.c:1.3 --- src/lib/libresolv/ns_verify.c:1.2 Fri Nov 16 02:16:38 2012 +++ src/lib/libresolv/ns_verify.c Fri Sep 13 19:29:47 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ns_verify.c,v 1.2 2012/11/16 02:16:38 christos Exp $ */ +/* $NetBSD: ns_verify.c,v 1.3 2013/09/13 19:29:47 joerg Exp $ */ /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. (ISC) @@ -17,9 +17,8 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = Id: ns_verify.c,v 1.5 2006/03/09 23:57:56 marka Exp ; -#endif +#include sys/cdefs.h +__RCSID(Id: ns_verify.c,v 1.5 2006/03/09 23:57:56 marka Exp ); /* Import. */
CVS commit: src/sys/sys
Module Name:src
Committed By: joerg
Date: Fri Sep 13 19:43:39 UTC 2013
Modified Files:
src/sys/sys: tree.h
Log Message:
Mark the splay MIN_MAX helper function as potentially unused.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/tree.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/sys/tree.h
diff -u src/sys/sys/tree.h:1.18 src/sys/sys/tree.h:1.19
--- src/sys/sys/tree.h:1.18 Fri Mar 29 21:24:31 2013
+++ src/sys/sys/tree.h Fri Sep 13 19:43:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.h,v 1.18 2013/03/29 21:24:31 christos Exp $ */
+/* $NetBSD: tree.h,v 1.19 2013/09/13 19:43:38 joerg Exp $ */
/* $OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $ */
/*
* Copyright 2002 Niels Provos pro...@citi.umich.edu
@@ -144,7 +144,7 @@ name##_SPLAY_NEXT(struct name *head, str
return (elm); \
} \
\
-static __inline struct type * \
+static __unused __inline struct type * \
name##_SPLAY_MIN_MAX(struct name *head, int val) \
{ \
name##_SPLAY_MINMAX(head, val); \
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: joerg
Date: Fri Sep 13 20:38:04 UTC 2013
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
Remove busversion.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/rump/net/lib/libshmif/if_shmem.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/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.57 src/sys/rump/net/lib/libshmif/if_shmem.c:1.58
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.57 Mon Jul 22 21:12:03 2013
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Fri Sep 13 20:38:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.57 2013/07/22 21:12:03 pooka Exp $ */
+/* $NetBSD: if_shmem.c,v 1.58 2013/09/13 20:38:04 joerg Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.57 2013/07/22 21:12:03 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.58 2013/09/13 20:38:04 joerg Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -99,8 +99,6 @@ struct shmif_sc {
bool sc_dying;
};
-static const uint32_t busversion = SHMIF_VERSION;
-
static void shmif_rcv(void *);
#define LOCK_UNLOCKED 0
CVS commit: src/sys/rump/dev/lib/libugenhc
Module Name:src
Committed By: joerg
Date: Fri Sep 13 20:38:39 UTC 2013
Modified Files:
src/sys/rump/dev/lib/libugenhc: ugenhc.c
Log Message:
GC rumpusb_device_intr_methods.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/dev/lib/libugenhc/ugenhc.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/rump/dev/lib/libugenhc/ugenhc.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.15 src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.16
--- src/sys/rump/dev/lib/libugenhc/ugenhc.c:1.15 Tue Apr 30 00:03:52 2013
+++ src/sys/rump/dev/lib/libugenhc/ugenhc.c Fri Sep 13 20:38:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc.c,v 1.15 2013/04/30 00:03:52 pooka Exp $ */
+/* $NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.15 2013/04/30 00:03:52 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ugenhc.c,v 1.16 2013/09/13 20:38:39 joerg Exp $);
#include sys/param.h
#include sys/bus.h
@@ -913,15 +913,6 @@ static const struct usbd_pipe_methods ru
.done = rumpusb_device_bulk_done,
};
-static const struct usbd_pipe_methods rumpusb_device_intr_methods = {
- .transfer = rumpusb_root_intr_transfer,
- .start = rumpusb_root_intr_start,
- .abort = rumpusb_root_intr_abort,
- .close = rumpusb_root_intr_close,
- .cleartoggle = rumpusb_root_intr_cleartoggle,
- .done = rumpusb_root_intr_done,
-};
-
static usbd_status
ugenhc_open(struct usbd_pipe *pipe)
{
CVS commit: src/sys
Module Name:src
Committed By: joerg
Date: Fri Sep 13 20:19:53 UTC 2013
Modified Files:
src/sys/net80211: files.net80211 ieee80211_crypto.c ieee80211_input.c
src/sys/rump/net/lib/libnet80211: Makefile
Log Message:
GC unused functions. Don't bother building ieee80211_acl.c, nothing in
it is non-static.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/net80211/files.net80211
cvs rdiff -u -r1.15 -r1.16 src/sys/net80211/ieee80211_crypto.c
cvs rdiff -u -r1.76 -r1.77 src/sys/net80211/ieee80211_input.c
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnet80211/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/net80211/files.net80211
diff -u src/sys/net80211/files.net80211:1.2 src/sys/net80211/files.net80211:1.3
--- src/sys/net80211/files.net80211:1.2 Tue Oct 31 21:53:41 2006
+++ src/sys/net80211/files.net80211 Fri Sep 13 20:19:53 2013
@@ -1,7 +1,6 @@
-# $NetBSD: files.net80211,v 1.2 2006/10/31 21:53:41 joerg Exp $
+# $NetBSD: files.net80211,v 1.3 2013/09/13 20:19:53 joerg Exp $
file net80211/ieee80211.c wlan
-file net80211/ieee80211_acl.c wlan
file net80211/ieee80211_amrr.c wlan
file net80211/ieee80211_crypto.c wlan
file net80211/ieee80211_crypto_ccmp.c wlan
Index: src/sys/net80211/ieee80211_crypto.c
diff -u src/sys/net80211/ieee80211_crypto.c:1.15 src/sys/net80211/ieee80211_crypto.c:1.16
--- src/sys/net80211/ieee80211_crypto.c:1.15 Mon May 23 15:37:36 2011
+++ src/sys/net80211/ieee80211_crypto.c Fri Sep 13 20:19:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_crypto.c,v 1.15 2011/05/23 15:37:36 drochner Exp $ */
+/* $NetBSD: ieee80211_crypto.c,v 1.16 2013/09/13 20:19:53 joerg Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.12 2005/08/08 18:46:35 sam Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ieee80211_crypto.c,v 1.15 2011/05/23 15:37:36 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_crypto.c,v 1.16 2013/09/13 20:19:53 joerg Exp $);
#endif
#include opt_inet.h
@@ -128,12 +128,6 @@ cipher_detach(struct ieee80211_key *key)
key-wk_cipher-ic_detach(key);
}
-static __inline void *
-cipher_attach(struct ieee80211com *ic, struct ieee80211_key *key)
-{
- return key-wk_cipher-ic_attach(ic, key);
-}
-
/*
* Wrappers for driver key management methods.
*/
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.76 src/sys/net80211/ieee80211_input.c:1.77
--- src/sys/net80211/ieee80211_input.c:1.76 Sat Mar 30 19:03:02 2013
+++ src/sys/net80211/ieee80211_input.c Fri Sep 13 20:19:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.76 2013/03/30 19:03:02 christos Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.77 2013/09/13 20:19:53 joerg Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ieee80211_input.c,v 1.76 2013/03/30 19:03:02 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_input.c,v 1.77 2013/09/13 20:19:53 joerg Exp $);
#endif
#include opt_inet.h
@@ -1378,12 +1378,6 @@ iswmeinfo(const u_int8_t *frm)
frm[6] == WME_INFO_OUI_SUBTYPE;
}
-static __inline int
-isatherosoui(const u_int8_t *frm)
-{
- return frm[1] 3 LE_READ_4(frm+2) == ((ATH_OUI_TYPE24)|ATH_OUI);
-}
-
/*
* Convert a WPA cipher selector OUI to an internal
* cipher algorithm. Where appropriate we also
Index: src/sys/rump/net/lib/libnet80211/Makefile
diff -u src/sys/rump/net/lib/libnet80211/Makefile:1.2 src/sys/rump/net/lib/libnet80211/Makefile:1.3
--- src/sys/rump/net/lib/libnet80211/Makefile:1.2 Tue Feb 16 20:42:47 2010
+++ src/sys/rump/net/lib/libnet80211/Makefile Fri Sep 13 20:19:53 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/02/16 20:42:47 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/13 20:19:53 joerg Exp $
#
.PATH: ${.CURDIR}/../../../../net80211
LIB= rumpnet_net80211
-SRCS= ieee80211.c ieee80211_acl.c ieee80211_amrr.c ieee80211_crypto.c \
+SRCS= ieee80211.c ieee80211_amrr.c ieee80211_crypto.c \
ieee80211_crypto_ccmp.c ieee80211_crypto_none.c \
ieee80211_crypto_tkip.c ieee80211_crypto_wep.c ieee80211_input.c\
ieee80211_ioctl.c ieee80211_netbsd.c ieee80211_node.c \
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: joerg
Date: Fri Sep 13 20:15:33 UTC 2013
Modified Files:
src/sys/ufs/ffs: ffs_snapshot.c
Log Message:
Kill unused function ib_assign.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/ufs/ffs/ffs_snapshot.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/ufs/ffs/ffs_snapshot.c
diff -u src/sys/ufs/ffs/ffs_snapshot.c:1.127 src/sys/ufs/ffs/ffs_snapshot.c:1.128
--- src/sys/ufs/ffs/ffs_snapshot.c:1.127 Sun Jun 23 22:03:34 2013
+++ src/sys/ufs/ffs/ffs_snapshot.c Fri Sep 13 20:15:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_snapshot.c,v 1.127 2013/06/23 22:03:34 dholland Exp $ */
+/* $NetBSD: ffs_snapshot.c,v 1.128 2013/09/13 20:15:33 joerg Exp $ */
/*
* Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.127 2013/06/23 22:03:34 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_snapshot.c,v 1.128 2013/09/13 20:15:33 joerg Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -124,7 +124,6 @@ static inline bool is_active_snapshot(st
static inline daddr_t db_get(struct inode *, int);
static inline void db_assign(struct inode *, int, daddr_t);
static inline daddr_t ib_get(struct inode *, int);
-static inline void ib_assign(struct inode *, int, daddr_t);
static inline daddr_t idb_get(struct inode *, void *, int);
static inline void idb_assign(struct inode *, void *, int, daddr_t);
@@ -2307,15 +2306,6 @@ ib_get(struct inode *ip, int loc)
return ufs_rw64(ip-i_ffs2_ib[loc], UFS_IPNEEDSWAP(ip));
}
-static inline void
-ib_assign(struct inode *ip, int loc, daddr_t val)
-{
- if (ip-i_ump-um_fstype == UFS1)
- ip-i_ffs1_ib[loc] = ufs_rw32(val, UFS_IPNEEDSWAP(ip));
- else
- ip-i_ffs2_ib[loc] = ufs_rw64(val, UFS_IPNEEDSWAP(ip));
-}
-
static inline daddr_t
idb_get(struct inode *ip, void *bf, int loc)
{
CVS commit: src/games/backgammon
Module Name:src
Committed By: joerg
Date: Fri Sep 13 20:46:50 UTC 2013
Modified Files:
src/games/backgammon/common_source: subs.c
src/games/backgammon/teachgammon: teach.c
Log Message:
GC descr and helpm.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/games/backgammon/common_source/subs.c
cvs rdiff -u -r1.23 -r1.24 src/games/backgammon/teachgammon/teach.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/common_source/subs.c
diff -u src/games/backgammon/common_source/subs.c:1.19 src/games/backgammon/common_source/subs.c:1.20
--- src/games/backgammon/common_source/subs.c:1.19 Sat Oct 13 19:19:39 2012
+++ src/games/backgammon/common_source/subs.c Fri Sep 13 20:46:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subs.c,v 1.19 2012/10/13 19:19:39 dholland Exp $ */
+/* $NetBSD: subs.c,v 1.20 2013/09/13 20:46:50 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)subs.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: subs.c,v 1.19 2012/10/13 19:19:39 dholland Exp $);
+__RCSID($NetBSD: subs.c,v 1.20 2013/09/13 20:46:50 joerg Exp $);
#endif
#endif /* not lint */
@@ -47,19 +47,6 @@ static const char plred[] = Player is r
static const char plwhite[] = Player is white, computer is red.;
static const char nocomp[] = (No computer play.);
-static const char *const descr[] = {
- Usage: backgammon [-] [n r w b pr pw pb t3a]\n,
- \t-\tgets this list\n\tn\tdon't ask for rules or instructions,
- \tr\tplayer is red (implies n)\n\tw\tplayer is white (implies n),
- \tb\ttwo players, red and white (implies n),
- \tpr\tprint the board before red's turn,
- \tpw\tprint the board before white's turn,
- \tpb\tprint the board before both player's turn,
- \tterm\tterminal is a term,
- \tsfile\trecover saved game from file,
- 0
-};
-
void
errexit(const char *s)
{
Index: src/games/backgammon/teachgammon/teach.c
diff -u src/games/backgammon/teachgammon/teach.c:1.23 src/games/backgammon/teachgammon/teach.c:1.24
--- src/games/backgammon/teachgammon/teach.c:1.23 Sat Oct 13 19:25:22 2012
+++ src/games/backgammon/teachgammon/teach.c Fri Sep 13 20:46:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: teach.c,v 1.23 2012/10/13 19:25:22 dholland Exp $ */
+/* $NetBSD: teach.c,v 1.24 2013/09/13 20:46:50 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,21 +39,13 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)teach.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: teach.c,v 1.23 2012/10/13 19:25:22 dholland Exp $);
+__RCSID($NetBSD: teach.c,v 1.24 2013/09/13 20:46:50 joerg Exp $);
#endif
#endif/* not lint */
#include back.h
#include tutor.h
-static const char *const helpm[] = {
- \nEnter a space or newline to roll, or,
- b to display the board,
- d to double,
- q to quit\n,
- 0
-};
-
static const char *const contin[] = {
,
0
CVS commit: src/usr.bin/deroff
Module Name:src Committed By: joerg Date: Fri Sep 13 20:51:20 UTC 2013 Modified Files: src/usr.bin/deroff: deroff.c Log Message: Remove copyright, use __RCSID. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/deroff/deroff.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/deroff/deroff.c diff -u src/usr.bin/deroff/deroff.c:1.9 src/usr.bin/deroff/deroff.c:1.10 --- src/usr.bin/deroff/deroff.c:1.9 Wed Aug 31 13:38:19 2011 +++ src/usr.bin/deroff/deroff.c Fri Sep 13 20:51:20 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: deroff.c,v 1.9 2011/08/31 13:38:19 joerg Exp $ */ +/* $NetBSD: deroff.c,v 1.10 2013/09/13 20:51:20 joerg Exp $ */ /* taken from: OpenBSD: deroff.c,v 1.6 2004/06/02 14:58:46 tom Exp */ @@ -64,21 +64,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -@(#) Copyright (c) 1988, 1993\n\ - The Regents of the University of California. All rights reserved.\n; -#endif /* not lint */ - -#ifndef lint -#if 0 -static const char sccsid[] = @(#)deroff.c 8.1 (Berkeley) 6/6/93; -#else -static const char rcsid[] = $NetBSD: deroff.c,v 1.9 2011/08/31 13:38:19 joerg Exp $; -#endif -#endif /* not lint */ - #include sys/cdefs.h +__RCSID($NetBSD: deroff.c,v 1.10 2013/09/13 20:51:20 joerg Exp $); + #include err.h #include limits.h #include stddef.h
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Sep 13 20:54:14 UTC 2013
Modified Files:
src/sys/dev/pci: if_bnx.c
Log Message:
#ifdef variable declarations/initializations like their use
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_bnx.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/pci/if_bnx.c
diff -u src/sys/dev/pci/if_bnx.c:1.48 src/sys/dev/pci/if_bnx.c:1.49
--- src/sys/dev/pci/if_bnx.c:1.48 Sat Mar 30 03:21:03 2013
+++ src/sys/dev/pci/if_bnx.c Fri Sep 13 20:54:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bnx.c,v 1.48 2013/03/30 03:21:03 christos Exp $ */
+/* $NetBSD: if_bnx.c,v 1.49 2013/09/13 20:54:14 martin Exp $ */
/* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */
/*-
@@ -35,7 +35,7 @@
#if 0
__FBSDID($FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $);
#endif
-__KERNEL_RCSID(0, $NetBSD: if_bnx.c,v 1.48 2013/03/30 03:21:03 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bnx.c,v 1.49 2013/09/13 20:54:14 martin Exp $);
/*
* The following controllers are supported by this driver:
@@ -5006,7 +5006,9 @@ bnx_start(struct ifnet *ifp)
struct bnx_softc *sc = ifp-if_softc;
struct mbuf *m_head = NULL;
int count = 0;
- u_int16_t tx_prod, tx_chain_prod;
+#ifdef BNX_DEBUG
+ u_int16_t tx_chain_prod;
+#endif
/* If there's no link or the transmit queue is empty then just exit. */
if ((ifp-if_flags (IFF_OACTIVE|IFF_RUNNING)) != IFF_RUNNING) {
@@ -5016,13 +5018,14 @@ bnx_start(struct ifnet *ifp)
}
/* prod points to the next free tx_bd. */
- tx_prod = sc-tx_prod;
- tx_chain_prod = TX_CHAIN_IDX(tx_prod);
+#ifdef BNX_DEBUG
+ tx_chain_prod = TX_CHAIN_IDX(sc-tx_prod);
+#endif
DBPRINT(sc, BNX_INFO_SEND, %s(): Start: tx_prod = 0x%04X,
tx_chain_prod = %04X, tx_prod_bseq = 0x%08X,
used_tx %d max_tx %d\n,
- __func__, tx_prod, tx_chain_prod, sc-tx_prod_bseq,
+ __func__, sc-tx_prod, tx_chain_prod, sc-tx_prod_bseq,
sc-used_tx_bd, sc-max_tx_bd);
/*
@@ -5062,10 +5065,12 @@ bnx_start(struct ifnet *ifp)
}
/* Update the driver's counters. */
+#ifdef BNX_DEBUG
tx_chain_prod = TX_CHAIN_IDX(sc-tx_prod);
+#endif
DBPRINT(sc, BNX_INFO_SEND, %s(): End: tx_prod = 0x%04X, tx_chain_prod
- = 0x%04X, tx_prod_bseq = 0x%08X\n, __func__, tx_prod,
+ = 0x%04X, tx_prod_bseq = 0x%08X\n, __func__, sc-tx_prod,
tx_chain_prod, sc-tx_prod_bseq);
/* Start the transmit. */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Sep 13 20:56:17 UTC 2013
Modified Files:
src/sys/dev/pci: if_cas.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/if_cas.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/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.19 src/sys/dev/pci/if_cas.c:1.20
--- src/sys/dev/pci/if_cas.c:1.19 Sat Mar 30 03:21:04 2013
+++ src/sys/dev/pci/if_cas.c Fri Sep 13 20:56:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.19 2013/03/30 03:21:04 christos Exp $ */
+/* $NetBSD: if_cas.c,v 1.20 2013/09/13 20:56:17 martin Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_cas.c,v 1.19 2013/03/30 03:21:04 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_cas.c,v 1.20 2013/09/13 20:56:17 martin Exp $);
#ifndef _MODULE
#include opt_inet.h
@@ -963,10 +963,7 @@ cas_disable_tx(struct cas_softc *sc)
int
cas_meminit(struct cas_softc *sc)
{
- struct cas_rxsoft *rxs;
- int i, error;
-
- rxs = (void *)error;
+ int i;
/*
* Initialize the transmit descriptor ring.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Sep 13 21:03:04 UTC 2013 Modified Files: src/sys/dev/pci: if_ex_pci.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/if_ex_pci.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/pci/if_ex_pci.c diff -u src/sys/dev/pci/if_ex_pci.c:1.55 src/sys/dev/pci/if_ex_pci.c:1.56 --- src/sys/dev/pci/if_ex_pci.c:1.55 Sat Mar 30 03:21:05 2013 +++ src/sys/dev/pci/if_ex_pci.c Fri Sep 13 21:03:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ex_pci.c,v 1.55 2013/03/30 03:21:05 christos Exp $ */ +/* $NetBSD: if_ex_pci.c,v 1.56 2013/09/13 21:03:04 martin Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_ex_pci.c,v 1.55 2013/03/30 03:21:05 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: if_ex_pci.c,v 1.56 2013/09/13 21:03:04 martin Exp $); #include sys/param.h #include sys/systm.h @@ -327,7 +327,6 @@ ex_d3tod0(pci_chipset_tag_t pc, pcitag_t uint32_t base0; uint32_t base1; uint32_t romaddr; - uint32_t pci_command; uint32_t pci_int_lat; uint32_t pci_cache_lat; @@ -336,7 +335,8 @@ ex_d3tod0(pci_chipset_tag_t pc, pcitag_t aprint_normal_dev(self, found in power state D%d, attempting to recover.\n, state); - pci_command = pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG); + /* XXX is this needed? */ + (void)pci_conf_read(pc, tag, PCI_COMMAND_STATUS_REG); base0 = pci_conf_read(pc, tag, PCI_BAR0); base1 = pci_conf_read(pc, tag, PCI_BAR1); romaddr = pci_conf_read(pc, tag, PCI_EXP_ROM_BAR);
CVS commit: src/sbin/mount_chfs
Module Name:src
Committed By: joerg
Date: Fri Sep 13 21:03:29 UTC 2013
Modified Files:
src/sbin/mount_chfs: mount_chfs.c
Log Message:
GC mopts.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/mount_chfs/mount_chfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_chfs/mount_chfs.c
diff -u src/sbin/mount_chfs/mount_chfs.c:1.1 src/sbin/mount_chfs/mount_chfs.c:1.2
--- src/sbin/mount_chfs/mount_chfs.c:1.1 Thu Nov 24 15:54:55 2011
+++ src/sbin/mount_chfs/mount_chfs.c Fri Sep 13 21:03:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mount_chfs.c,v 1.1 2011/11/24 15:54:55 ahoka Exp $ */
+/* $NetBSD: mount_chfs.c,v 1.2 2013/09/13 21:03:29 joerg Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -55,14 +55,6 @@
/* - */
-static const struct mntopt mopts[] = {
- MOPT_STDOPTS,
- MOPT_GETARGS,
- MOPT_NULL,
-};
-
-/* - */
-
static void usage(void) __dead;
/* - */
CVS commit: src/sys/net
Module Name:src
Committed By: martin
Date: Fri Sep 13 21:05:02 UTC 2013
Modified Files:
src/sys/net: if_gre.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/net/if_gre.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/net/if_gre.c
diff -u src/sys/net/if_gre.c:1.151 src/sys/net/if_gre.c:1.152
--- src/sys/net/if_gre.c:1.151 Thu Aug 29 17:49:21 2013
+++ src/sys/net/if_gre.c Fri Sep 13 21:05:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gre.c,v 1.151 2013/08/29 17:49:21 rmind Exp $ */
+/* $NetBSD: if_gre.c,v 1.152 2013/09/13 21:05:02 martin Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.151 2013/08/29 17:49:21 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.152 2013/09/13 21:05:02 martin Exp $);
#include opt_atalk.h
#include opt_gre.h
@@ -491,7 +491,6 @@ out:
static int
gre_sosend(struct socket *so, struct mbuf *top)
{
- struct mbuf **mp;
struct proc *p;
long space, resid;
int error;
@@ -526,7 +525,6 @@ gre_sosend(struct socket *so, struct mbu
snderr(EMSGSIZE);
if (space resid)
snderr(EWOULDBLOCK);
- mp = top;
/*
* Data is prepackaged in top.
*/
@@ -534,7 +532,6 @@ gre_sosend(struct socket *so, struct mbu
snderr(EPIPE);
error = (*so-so_proto-pr_usrreq)(so, PRU_SEND, top, NULL, NULL, l);
top = NULL;
- mp = top;
release:
sbunlock(so-so_snd);
out:
CVS commit: src/dist/pppd/pppd
Module Name:src
Committed By: joerg
Date: Fri Sep 13 21:07:54 UTC 2013
Modified Files:
src/dist/pppd/pppd: eap.c
Log Message:
wkmodulus is only used with USE_SRP, so conditionalize it.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/dist/pppd/pppd/eap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pppd/pppd/eap.c
diff -u src/dist/pppd/pppd/eap.c:1.3 src/dist/pppd/pppd/eap.c:1.4
--- src/dist/pppd/pppd/eap.c:1.3 Sun Sep 12 16:03:39 2010
+++ src/dist/pppd/pppd/eap.c Fri Sep 13 21:07:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.3 2010/09/12 16:03:39 drochner Exp $ */
+/* $NetBSD: eap.c,v 1.4 2013/09/13 21:07:54 joerg Exp $ */
/*
* eap.c - Extensible Authentication Protocol for PPP (RFC 2284)
@@ -50,7 +50,7 @@
#if 0
#define RCSID Id: eap.c,v 1.4 2004/11/09 22:39:25 paulus Exp
#else
-__RCSID($NetBSD: eap.c,v 1.3 2010/09/12 16:03:39 drochner Exp $);
+__RCSID($NetBSD: eap.c,v 1.4 2013/09/13 21:07:54 joerg Exp $);
#endif
#endif
@@ -153,6 +153,7 @@ struct protent eap_protent = {
/*
* A well-known 2048 bit modulus.
*/
+#ifdef USE_SRP
static const u_char wkmodulus[] = {
0xAC, 0x6B, 0xDB, 0x41, 0x32, 0x4A, 0x9A, 0x9B,
0xF1, 0x66, 0xDE, 0x5E, 0x13, 0x89, 0x58, 0x2F,
@@ -187,6 +188,7 @@ static const u_char wkmodulus[] = {
0x9B, 0x65, 0xE3, 0x72, 0xFC, 0xD6, 0x8E, 0xF2,
0x0F, 0xA7, 0x11, 0x1F, 0x9E, 0x4A, 0xFF, 0x73
};
+#endif
/* Local forward declarations. */
static void eap_server_timeout __P((void *arg));
CVS commit: src/sys/net
Module Name:src
Committed By: martin
Date: Fri Sep 13 21:09:40 UTC 2013
Modified Files:
src/sys/net: if_pppoe.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/net/if_pppoe.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/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.100 src/sys/net/if_pppoe.c:1.101
--- src/sys/net/if_pppoe.c:1.100 Wed Jul 17 10:16:58 2013
+++ src/sys/net/if_pppoe.c Fri Sep 13 21:09:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.100 2013/07/17 10:16:58 oki Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.101 2013/09/13 21:09:40 martin Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_pppoe.c,v 1.100 2013/07/17 10:16:58 oki Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_pppoe.c,v 1.101 2013/09/13 21:09:40 martin Exp $);
#include pppoe.h
#include opt_pppoe.h
@@ -1003,9 +1003,8 @@ pppoe_get_mbuf(size_t len)
if (len + sizeof(struct ether_header) MHLEN) {
MCLGET(m, M_DONTWAIT);
if ((m-m_flags M_EXT) == 0) {
- struct mbuf *n;
- MFREE(m, n);
- return 0;
+ m_free(m);
+ return NULL;
}
}
m-m_data += sizeof(struct ether_header);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Sep 13 21:13:08 UTC 2013
Modified Files:
src/sys/dev/pci: if_sk.c
Log Message:
#ifdef a variable like their use
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/if_sk.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/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.74 src/sys/dev/pci/if_sk.c:1.75
--- src/sys/dev/pci/if_sk.c:1.74 Tue Jun 11 16:37:10 2013
+++ src/sys/dev/pci/if_sk.c Fri Sep 13 21:13:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.74 2013/06/11 16:37:10 msaitoh Exp $ */
+/* $NetBSD: if_sk.c,v 1.75 2013/09/13 21:13:08 martin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_sk.c,v 1.74 2013/06/11 16:37:10 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_sk.c,v 1.75 2013/09/13 21:13:08 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2304,9 +2304,12 @@ sk_intr_xmac(struct sk_if_softc *sc_if)
void
sk_intr_yukon(struct sk_if_softc *sc_if)
{
+#ifdef SK_DEBUG
int status;
- status = SK_IF_READ_2(sc_if, 0, SK_GMAC_ISR);
+ status =
+#endif
+ SK_IF_READ_2(sc_if, 0, SK_GMAC_ISR);
DPRINTFN(3, (sk_intr_yukon status=%#x\n, status));
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Sep 13 21:14:58 UTC 2013
Modified Files:
src/sys/dev/pci: if_vge.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/if_vge.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/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.54 src/sys/dev/pci/if_vge.c:1.55
--- src/sys/dev/pci/if_vge.c:1.54 Sat Mar 30 03:21:08 2013
+++ src/sys/dev/pci/if_vge.c Fri Sep 13 21:14:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.54 2013/03/30 03:21:08 christos Exp $ */
+/* $NetBSD: if_vge.c,v 1.55 2013/09/13 21:14:58 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vge.c,v 1.54 2013/03/30 03:21:08 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vge.c,v 1.55 2013/09/13 21:14:58 martin Exp $);
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -2027,11 +2027,9 @@ static int
vge_ioctl(struct ifnet *ifp, u_long command, void *data)
{
struct vge_softc *sc;
- struct ifreq *ifr;
int s, error;
sc = ifp-if_softc;
- ifr = (struct ifreq *)data;
error = 0;
s = splnet();
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: martin Date: Fri Sep 13 21:36:38 UTC 2013 Modified Files: src/sys/arch/sparc64/include: cpu.h Log Message: Make CPU_INFO_FOREACH more gcc 4.8.1 friendly To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sparc64/include/cpu.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/sparc64/include/cpu.h diff -u src/sys/arch/sparc64/include/cpu.h:1.103 src/sys/arch/sparc64/include/cpu.h:1.104 --- src/sys/arch/sparc64/include/cpu.h:1.103 Tue Aug 20 19:19:23 2013 +++ src/sys/arch/sparc64/include/cpu.h Fri Sep 13 21:36:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.103 2013/08/20 19:19:23 macallan Exp $ */ +/* $NetBSD: cpu.h,v 1.104 2013/09/13 21:36:38 martin Exp $ */ /* * Copyright (c) 1992, 1993 @@ -221,7 +221,7 @@ extern struct pool_cache *fpstate_cache; #define CPU_IS_PRIMARY(ci) ((ci)-ci_flags CPUF_PRIMARY) #define CPU_INFO_ITERATOR int -#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = cpus; ci != NULL; \ +#define CPU_INFO_FOREACH(cii, ci) (void)cii, ci = cpus; ci != NULL; \ ci = ci-ci_next #define curlwp curcpu()-ci_curlwp
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Sep 13 21:22:10 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.263 src/sys/dev/pci/if_wm.c:1.264
--- src/sys/dev/pci/if_wm.c:1.263 Sun Sep 8 03:17:02 2013
+++ src/sys/dev/pci/if_wm.c Fri Sep 13 21:22:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.263 2013/09/08 03:17:02 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.264 2013/09/13 21:22:10 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.263 2013/09/08 03:17:02 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.264 2013/09/13 21:22:10 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -5355,9 +5355,11 @@ wm_read_eeprom_spi(struct wm_softc *sc,
static int
wm_validate_eeprom_checksum(struct wm_softc *sc)
{
- uint16_t checksum, valid_checksum;
+ uint16_t checksum;
uint16_t eeprom_data;
- uint16_t csum_wordaddr;
+#ifdef WM_DEBUG
+ uint16_t csum_wordaddr, valid_checksum;
+#endif
int i;
checksum = 0;
@@ -5366,6 +5368,7 @@ wm_validate_eeprom_checksum(struct wm_so
if (sc-sc_type == WM_T_I211)
return 0;
+#ifdef WM_DEBUG
if (sc-sc_type == WM_T_PCH_LPT) {
csum_wordaddr = NVM_COMPAT;
valid_checksum = NVM_COMPAT_VALID_CHECKSUM;
@@ -5374,7 +5377,6 @@ wm_validate_eeprom_checksum(struct wm_so
valid_checksum = NVM_FUTURE_INIT_WORD1_VALID_CHECKSUM;
}
-#ifdef WM_DEBUG
/* Dump EEPROM image for debug */
if ((sc-sc_type == WM_T_ICH8) || (sc-sc_type == WM_T_ICH9)
|| (sc-sc_type == WM_T_ICH10) || (sc-sc_type == WM_T_PCH)
@@ -6073,12 +6075,13 @@ wm_tbi_check_link(struct wm_softc *sc)
{
struct ifnet *ifp = sc-sc_ethercom.ec_if;
struct ifmedia_entry *ife = sc-sc_mii.mii_media.ifm_cur;
- uint32_t rxcw, ctrl, status;
+ uint32_t status;
status = CSR_READ(sc, WMREG_STATUS);
- rxcw = CSR_READ(sc, WMREG_RXCW);
- ctrl = CSR_READ(sc, WMREG_CTRL);
+ /* XXX is this needed? */
+ (void)CSR_READ(sc, WMREG_RXCW);
+ (void)CSR_READ(sc, WMREG_CTRL);
/* set link status */
if ((status STATUS_LU) == 0) {
CVS commit: src/sys/dev/flash
Module Name:src
Committed By: joerg
Date: Fri Sep 13 22:18:42 UTC 2013
Modified Files:
src/sys/dev/flash: flash.c
Log Message:
GC flash_get_part_offset.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/flash/flash.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/flash/flash.c
diff -u src/sys/dev/flash/flash.c:1.9 src/sys/dev/flash/flash.c:1.10
--- src/sys/dev/flash/flash.c:1.9 Fri Jul 29 20:48:33 2011
+++ src/sys/dev/flash/flash.c Fri Sep 13 22:18:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.9 2011/07/29 20:48:33 ahoka Exp $ */
+/* $NetBSD: flash.c,v 1.10 2013/09/13 22:18:42 joerg Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: flash.c,v 1.9 2011/07/29 20:48:33 ahoka Exp $);
+__KERNEL_RCSID(0, $NetBSD: flash.c,v 1.10 2013/09/13 22:18:42 joerg Exp $);
#include sys/param.h
#include sys/types.h
@@ -535,12 +535,6 @@ flash_get_size(dev_t dev)
return sc-sc_partinfo.part_size;
}
-static inline flash_off_t
-flash_get_part_offset(struct flash_softc * const sc, size_t poffset)
-{
- return sc-sc_partinfo.part_offset + poffset;
-}
-
int
flash_erase(device_t self, struct flash_erase_instruction * const ei)
{
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Fri Sep 13 23:30:47 UTC 2013
Modified Files:
src/sys/dev/usb: usb.h
Log Message:
A few more USB 3.0 constants.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/usb/usb.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/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.104 src/sys/dev/usb/usb.h:1.105
--- src/sys/dev/usb/usb.h:1.104 Wed Aug 21 17:25:58 2013
+++ src/sys/dev/usb/usb.h Fri Sep 13 23:30:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.104 2013/08/21 17:25:58 jakllsch Exp $ */
+/* $NetBSD: usb.h,v 1.105 2013/09/13 23:30:47 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -269,6 +269,8 @@ typedef struct {
#define USB_2_MAX_CTRL_PACKET 64
#define USB_2_MAX_BULK_PACKET 512
+#define USB_3_MAX_CTRL_PACKET 512
+
typedef struct {
uByte bLength;
uByte bDescriptorType;
@@ -759,6 +761,7 @@ struct usb_device_info {
#define USB_SPEED_LOW 1
#define USB_SPEED_FULL 2
#define USB_SPEED_HIGH 3
+#define USB_SPEED_SUPER 4
int udi_power; /* power consumption in mA, 0 if selfpowered */
int udi_nports;
char udi_devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN];
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Fri Sep 13 23:42:12 UTC 2013
Modified Files:
src/sys/dev/usb: usb.c
Log Message:
Establish host controller softint earlier, in usb_attach rather than
usb_doattach.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/dev/usb/usb.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/usb.c
diff -u src/sys/dev/usb/usb.c:1.142 src/sys/dev/usb/usb.c:1.143
--- src/sys/dev/usb/usb.c:1.142 Wed Aug 21 18:11:31 2013
+++ src/sys/dev/usb/usb.c Fri Sep 13 23:42:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.142 2013/08/21 18:11:31 jakllsch Exp $ */
+/* $NetBSD: usb.c,v 1.143 2013/09/13 23:42:12 jakllsch Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.142 2013/08/21 18:11:31 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb.c,v 1.143 2013/09/13 23:42:12 jakllsch Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -202,6 +202,17 @@ usb_attach(device_t parent, device_t sel
}
aprint_normal(\n);
+ /* XXX we should have our own level */
+ sc-sc_bus-soft = softint_establish(
+ SOFTINT_NET | (mpsafe ? SOFTINT_MPSAFE : 0),
+ usb_soft_intr, sc-sc_bus);
+ if (sc-sc_bus-soft == NULL) {
+ aprint_error(%s: can't register softintr\n,
+ device_xname(self));
+ sc-sc_dying = 1;
+ return;
+ }
+
if (mpsafe)
sc-sc_bus-methods-get_lock(sc-sc_bus, sc-sc_bus-lock);
else
@@ -254,7 +265,6 @@ usb_doattach(device_t self)
usbd_status err;
int speed;
struct usb_event *ue;
- const bool mpsafe = sc-sc_bus-methods-get_lock ? true : false;
DPRINTF((usbd_doattach\n));
@@ -279,17 +289,6 @@ usb_doattach(device_t self)
ue-u.ue_ctrlr.ue_bus = device_unit(self);
usb_add_event(USB_EVENT_CTRLR_ATTACH, ue);
- /* XXX we should have our own level */
- sc-sc_bus-soft = softint_establish(
- SOFTINT_NET | (mpsafe ? SOFTINT_MPSAFE : 0),
- usb_soft_intr, sc-sc_bus);
- if (sc-sc_bus-soft == NULL) {
- aprint_error(%s: can't register softintr\n,
- device_xname(self));
- sc-sc_dying = 1;
- return;
- }
-
err = usbd_new_device(self, sc-sc_bus, 0, speed, 0,
sc-sc_port);
if (!err) {
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Sat Sep 14 00:42:21 UTC 2013 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add xhci(4). To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/sys/arch/i386/conf/ALL 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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.362 src/sys/arch/i386/conf/ALL:1.363 --- src/sys/arch/i386/conf/ALL:1.362 Sun Jun 30 21:38:57 2013 +++ src/sys/arch/i386/conf/ALL Sat Sep 14 00:42:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.362 2013/06/30 21:38:57 rmind Exp $ +# $NetBSD: ALL,v 1.363 2013/09/14 00:42:21 jakllsch Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.362 $ +#ident ALL-$Revision: 1.363 $ maxusers 64 # estimated number of users @@ -1187,6 +1187,7 @@ ehci* at pci? dev ? function ? # Enhance gcscehci* at pci? dev ? function ? # Enhanced Host Controller (Geode CSC) ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) +xhci* at pci? dev ? function ? # eXtensible Host Controller # CardBus USB controllers ehci* at cardbus? function ? # Enhanced Host Controller @@ -1205,6 +1206,7 @@ usb* at gcscehci? usb* at ohci? usb* at slhci? usb* at uhci? +usb* at xhci? # USB Hubs uhub* at usb?
CVS commit: src/lib/libc/arch/sparc64
Module Name:src Committed By: nakayama Date: Sat Sep 14 05:38:00 UTC 2013 Modified Files: src/lib/libc/arch/sparc64/gen: sigsetjmp.S src/lib/libc/arch/sparc64/sys: cerror.S sbrk.S Log Message: Redo previous to fix build break. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/sparc64/gen/sigsetjmp.S cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/sparc64/sys/cerror.S cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/sparc64/sys/sbrk.S 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/sparc64/gen/sigsetjmp.S diff -u src/lib/libc/arch/sparc64/gen/sigsetjmp.S:1.11 src/lib/libc/arch/sparc64/gen/sigsetjmp.S:1.12 --- src/lib/libc/arch/sparc64/gen/sigsetjmp.S:1.11 Thu Sep 12 15:36:16 2013 +++ src/lib/libc/arch/sparc64/gen/sigsetjmp.S Sat Sep 14 05:38:00 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: sigsetjmp.S,v 1.11 2013/09/12 15:36:16 joerg Exp $ */ +/* $NetBSD: sigsetjmp.S,v 1.12 2013/09/14 05:38:00 nakayama Exp $ */ /* * Copyright (c) 1995 Paul Kranenburg * All rights reserved. @@ -68,7 +68,7 @@ ENTRY(__siglongjmp14) nop unimp 0 -#if __PIC__ - 0 = 1 +#elif __PIC__ - 0 = 1 ENTRY(__sigsetjmp14) PIC_PROLOGUE(%g1,%o2) ! %g1 = _GLOBAL_OFFSET_TABLE Index: src/lib/libc/arch/sparc64/sys/cerror.S diff -u src/lib/libc/arch/sparc64/sys/cerror.S:1.7 src/lib/libc/arch/sparc64/sys/cerror.S:1.8 --- src/lib/libc/arch/sparc64/sys/cerror.S:1.7 Thu Sep 12 15:36:16 2013 +++ src/lib/libc/arch/sparc64/sys/cerror.S Sat Sep 14 05:38:00 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cerror.S,v 1.7 2013/09/12 15:36:16 joerg Exp $ */ +/* $NetBSD: cerror.S,v 1.8 2013/09/14 05:38:00 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ #if 0 .asciz @(#)cerror.s 8.1 (Berkeley) 6/4/93 #else - RCSID($NetBSD: cerror.S,v 1.7 2013/09/12 15:36:16 joerg Exp $) + RCSID($NetBSD: cerror.S,v 1.8 2013/09/14 05:38:00 nakayama Exp $) #endif #endif /* LIBC_SCCS and not lint */ @@ -69,7 +69,7 @@ FUNC(__cerror) retl mov -1, %o1 -#if __PIC__ - 0 = 1 +#elif __PIC__ - 0 = 1 FUNC(__cerror) PIC_PROLOGUE(%g1, %o3) Index: src/lib/libc/arch/sparc64/sys/sbrk.S diff -u src/lib/libc/arch/sparc64/sys/sbrk.S:1.10 src/lib/libc/arch/sparc64/sys/sbrk.S:1.11 --- src/lib/libc/arch/sparc64/sys/sbrk.S:1.10 Thu Sep 12 15:36:16 2013 +++ src/lib/libc/arch/sparc64/sys/sbrk.S Sat Sep 14 05:38:00 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: sbrk.S,v 1.10 2013/09/12 15:36:16 joerg Exp $ */ +/* $NetBSD: sbrk.S,v 1.11 2013/09/14 05:38:00 nakayama Exp $ */ /* * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ #if 0 .asciz @(#)sbrk.s 8.1 (Berkeley) 6/4/93 #else - RCSID($NetBSD: sbrk.S,v 1.10 2013/09/12 15:36:16 joerg Exp $) + RCSID($NetBSD: sbrk.S,v 1.11 2013/09/14 05:38:00 nakayama Exp $) #endif #endif /* SYSLIBC_SCCS and not lint */ @@ -77,7 +77,7 @@ ENTRY(_sbrk) retl /* and update curbrk */ stx %o4, [%o2] -#if __PIC__ - 0 = 1 +#elif __PIC__ - 0 = 1 ENTRY(_sbrk) PIC_PROLOGUE(%o5,%o4)
