CVS commit: src/sys/arch
Module Name:src
Committed By: uebayasi
Date: Wed Oct 30 06:47:18 UTC 2013
Modified Files:
src/sys/arch/evbarm/mini2440: mini2440_machdep.c
src/sys/arch/mips/mips: mips_machdep.c
Log Message:
G/C struct user *proc0paddr.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.256 -r1.257 src/sys/arch/mips/mips/mips_machdep.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/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.6 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.7
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.6 Sat Sep 22 00:33:40 2012
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Wed Oct 30 06:47:18 2013
@@ -131,7 +131,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mini2440_machdep.c,v 1.6 2012/09/22 00:33:40 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: mini2440_machdep.c,v 1.7 2013/10/30 06:47:18 uebayasi Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -248,8 +248,6 @@ extern int pmap_debug_level;
pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
-struct user *proc0paddr;
-
/* Prototypes */
void consinit(void);
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.256 src/sys/arch/mips/mips/mips_machdep.c:1.257
--- src/sys/arch/mips/mips/mips_machdep.c:1.256 Thu Feb 28 12:44:38 2013
+++ src/sys/arch/mips/mips/mips_machdep.c Wed Oct 30 06:47:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.256 2013/02/28 12:44:38 macallan Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.257 2013/10/30 06:47:18 uebayasi Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -111,7 +111,7 @@
*/
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.256 2013/02/28 12:44:38 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: mips_machdep.c,v 1.257 2013/10/30 06:47:18 uebayasi Exp $);
#define __INTR_PRIVATE
#include opt_cputype.h
@@ -260,8 +260,6 @@ struct mips_options mips_options = {
.mips_fpu_id = 0x,
};
-struct user *proc0paddr;
-
void * msgbufaddr;
/* the following is used externally (sysctl_hw) */
CVS commit: src/sys/fs/efs
Module Name:src
Committed By: mrg
Date: Wed Oct 30 08:27:01 UTC 2013
Modified Files:
src/sys/fs/efs: efs_subr.c
Log Message:
use __diagused where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/fs/efs/efs_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/fs/efs/efs_subr.c
diff -u src/sys/fs/efs/efs_subr.c:1.9 src/sys/fs/efs/efs_subr.c:1.10
--- src/sys/fs/efs/efs_subr.c:1.9 Sun Oct 20 21:12:08 2013
+++ src/sys/fs/efs/efs_subr.c Wed Oct 30 08:27:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: efs_subr.c,v 1.9 2013/10/20 21:12:08 christos Exp $ */
+/* $NetBSD: efs_subr.c,v 1.10 2013/10/30 08:27:01 mrg Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble rum...@ephemeral.org
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: efs_subr.c,v 1.9 2013/10/20 21:12:08 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: efs_subr.c,v 1.10 2013/10/30 08:27:01 mrg Exp $);
#include sys/param.h
#include sys/kauth.h
@@ -269,7 +269,7 @@ efs_dirblk_lookup(struct efs_dirblk *dir
ino_t *inode)
{
struct efs_dirent *de;
- int i, slot, offset;
+ int i, slot __diagused, offset;
KASSERT(cn-cn_namelen = EFS_DIRENT_NAMELEN_MAX);
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: mrg
Date: Wed Oct 30 08:39:01 UTC 2013
Modified Files:
src/distrib/utils/sysinst: disks.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/distrib/utils/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.127 src/distrib/utils/sysinst/disks.c:1.128
--- src/distrib/utils/sysinst/disks.c:1.127 Sat Nov 17 20:34:24 2012
+++ src/distrib/utils/sysinst/disks.c Wed Oct 30 08:39:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.127 2012/11/17 20:34:24 tsutsui Exp $ */
+/* $NetBSD: disks.c,v 1.128 2013/10/30 08:39:01 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -494,13 +494,11 @@ fmt_fspart(menudesc *m, int ptn, void *a
{
unsigned int poffset, psize, pend;
const char *desc;
- static const char *Yes, *No;
+ static const char *Yes;
partinfo *p = bsdlabel + ptn;
- if (Yes == NULL) {
+ if (Yes == NULL)
Yes = msg_string(MSG_Yes);
- No = msg_string(MSG_No);
- }
poffset = p-pi_offset / sizemult;
psize = p-pi_size / sizemult;
CVS commit: src/bin/sh
Module Name:src
Committed By: mrg
Date: Wed Oct 30 08:38:40 UTC 2013
Modified Files:
src/bin/sh: input.c
Log Message:
#ifdef a variable decl/setting with it's use.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/bin/sh/input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/input.c
diff -u src/bin/sh/input.c:1.45 src/bin/sh/input.c:1.46
--- src/bin/sh/input.c:1.45 Wed Mar 28 20:11:25 2012
+++ src/bin/sh/input.c Wed Oct 30 08:38:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: input.c,v 1.45 2012/03/28 20:11:25 christos Exp $ */
+/* $NetBSD: input.c,v 1.46 2013/10/30 08:38:40 mrg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)input.c 8.3 (Berkeley) 6/9/95;
#else
-__RCSID($NetBSD: input.c,v 1.45 2012/03/28 20:11:25 christos Exp $);
+__RCSID($NetBSD: input.c,v 1.46 2013/10/30 08:38:40 mrg Exp $);
#endif
#endif /* not lint */
@@ -238,7 +238,9 @@ preadbuffer(void)
{
char *p, *q;
int more;
+#ifndef SMALL
int something;
+#endif
char savec;
if (parsefile-strpush) {
@@ -262,7 +264,9 @@ again:
q = p = parsenextc;
/* delete nul characters */
+#ifndef SMALL
something = 0;
+#endif
for (more = 1; more;) {
switch (*p) {
case '\0':
@@ -279,7 +283,9 @@ again:
break;
default:
+#ifndef SMALL
something = 1;
+#endif
break;
}
CVS commit: src/sys/dev/ic
Module Name:src Committed By: gson Date: Wed Oct 30 08:40:32 UTC 2013 Modified Files: src/sys/dev/ic: esiop.c siop.c Log Message: Fix incorrect function names in panic message strings. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/ic/esiop.c cvs rdiff -u -r1.98 -r1.99 src/sys/dev/ic/siop.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/esiop.c diff -u src/sys/dev/ic/esiop.c:1.55 src/sys/dev/ic/esiop.c:1.56 --- src/sys/dev/ic/esiop.c:1.55 Sat Nov 13 13:52:01 2010 +++ src/sys/dev/ic/esiop.c Wed Oct 30 08:40:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: esiop.c,v 1.55 2010/11/13 13:52:01 uebayasi Exp $ */ +/* $NetBSD: esiop.c,v 1.56 2013/10/30 08:40:32 gson Exp $ */ /* * Copyright (c) 2002 Manuel Bouyer. @@ -28,7 +28,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: esiop.c,v 1.55 2010/11/13 13:52:01 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: esiop.c,v 1.56 2013/10/30 08:40:32 gson Exp $); #include sys/param.h #include sys/systm.h @@ -1000,7 +1000,7 @@ scintr: return 1; default: panic(invalid retval from - siop_wdtr_neg()); + siop_ppr_neg()); } return 1; } @@ -1042,7 +1042,7 @@ scintr: return 1; default: panic(invalid retval from - siop_wdtr_neg()); + siop_sdtr_neg()); } return 1; } @@ -1101,7 +1101,7 @@ scintr: return 1; } /* We just should't get there */ - panic(siop_intr: I shouldn't be there !); + panic(esiop_intr: I shouldn't be there !); end: /* Index: src/sys/dev/ic/siop.c diff -u src/sys/dev/ic/siop.c:1.98 src/sys/dev/ic/siop.c:1.99 --- src/sys/dev/ic/siop.c:1.98 Sat Nov 13 13:52:02 2010 +++ src/sys/dev/ic/siop.c Wed Oct 30 08:40:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: siop.c,v 1.98 2010/11/13 13:52:02 uebayasi Exp $ */ +/* $NetBSD: siop.c,v 1.99 2013/10/30 08:40:32 gson Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -28,7 +28,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: siop.c,v 1.98 2010/11/13 13:52:02 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: siop.c,v 1.99 2013/10/30 08:40:32 gson Exp $); #include sys/param.h #include sys/systm.h @@ -884,7 +884,7 @@ scintr: return(1); default: panic(invalid retval from - siop_wdtr_neg()); + siop_sdtr_neg()); } return(1); }
CVS commit: src/sys
Module Name:src
Committed By: mrg
Date: Wed Oct 30 08:41:38 UTC 2013
Modified Files:
src/sys/fs/udf: udf_allocation.c udf_strat_direct.c udf_strat_rmw.c
src/sys/net/npf: npf_inet.c
Log Message:
used __diagused where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/udf/udf_allocation.c
cvs rdiff -u -r1.11 -r1.12 src/sys/fs/udf/udf_strat_direct.c
cvs rdiff -u -r1.23 -r1.24 src/sys/fs/udf/udf_strat_rmw.c
cvs rdiff -u -r1.24 -r1.25 src/sys/net/npf/npf_inet.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/fs/udf/udf_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.35 src/sys/fs/udf/udf_allocation.c:1.36
--- src/sys/fs/udf/udf_allocation.c:1.35 Fri Oct 18 19:56:55 2013
+++ src/sys/fs/udf/udf_allocation.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.35 2013/10/18 19:56:55 christos Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.36 2013/10/30 08:41:38 mrg Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.35 2013/10/18 19:56:55 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.36 2013/10/30 08:41:38 mrg Exp $);
#endif /* not lint */
@@ -1157,7 +1157,7 @@ udf_allocate_space(struct udf_mount *ump
struct logvol_int_desc *lvid;
uint64_t *lmappos;
uint32_t ptov, lb_num, *freepos, free_lbs;
- int lb_size, alloc_num_lb;
+ int lb_size __diagused, alloc_num_lb;
int alloc_type, error;
int is_node;
@@ -1307,7 +1307,7 @@ udf_free_allocated_space(struct udf_moun
uint32_t lb_map, udf_rw32_lbmap;
uint32_t *freepos, free_lbs;
int phys_part;
- int error;
+ int error __diagused;
DPRINTF(ALLOC, (udf_free_allocated_space: freeing virt lbnum %d
part %d + %d sect\n, lb_num, vpart_num, num_lb));
@@ -1473,7 +1473,7 @@ udf_trunc_metadatapart(struct udf_mount
uint32_t *freepos, *sizepos;
uint32_t unit, lb_size;
uint16_t meta_vpart_num, data_vpart_num, num_vpart;
- int err;
+ int err __diagused;
unit = ump-metadata_alloc_unit_size;
lb_size = udf_rw32(ump-logical_vol-lb_size);
Index: src/sys/fs/udf/udf_strat_direct.c
diff -u src/sys/fs/udf/udf_strat_direct.c:1.11 src/sys/fs/udf/udf_strat_direct.c:1.12
--- src/sys/fs/udf/udf_strat_direct.c:1.11 Fri Oct 18 19:56:55 2013
+++ src/sys/fs/udf/udf_strat_direct.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_direct.c,v 1.11 2013/10/18 19:56:55 christos Exp $ */
+/* $NetBSD: udf_strat_direct.c,v 1.12 2013/10/30 08:41:38 mrg Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_strat_direct.c,v 1.11 2013/10/18 19:56:55 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_strat_direct.c,v 1.12 2013/10/30 08:41:38 mrg Exp $);
#endif /* not lint */
@@ -193,7 +193,7 @@ udf_write_nodedscr_direct(struct udf_str
struct long_ad *icb = args-icb;
int waitfor = args-waitfor;
uint32_t logsector, sector, dummy;
- int error, vpart;
+ int error, vpart __diagused;
/*
* we have to decide if we write it out sequential or at its fixed
@@ -255,7 +255,7 @@ udf_queue_buf_direct(struct udf_strat_ar
int sector_size = ump-discinfo.sector_size;
int len, buf_len, sector, sectors, run_length;
int blks = sector_size / DEV_BSIZE;
- int what, class, queue;
+ int what, class __diagused, queue;
KASSERT(ump);
KASSERT(buf);
Index: src/sys/fs/udf/udf_strat_rmw.c
diff -u src/sys/fs/udf/udf_strat_rmw.c:1.23 src/sys/fs/udf/udf_strat_rmw.c:1.24
--- src/sys/fs/udf/udf_strat_rmw.c:1.23 Fri Oct 18 19:56:55 2013
+++ src/sys/fs/udf/udf_strat_rmw.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_rmw.c,v 1.23 2013/10/18 19:56:55 christos Exp $ */
+/* $NetBSD: udf_strat_rmw.c,v 1.24 2013/10/30 08:41:38 mrg Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_strat_rmw.c,v 1.23 2013/10/18 19:56:55 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_strat_rmw.c,v 1.24 2013/10/30 08:41:38 mrg Exp $);
#endif /* not lint */
@@ -345,7 +345,7 @@ udf_pop_eccline(struct strat_private *pr
static void
udf_unqueue_eccline(struct strat_private *priv, struct udf_eccline *eccline)
{
- struct buf *ret;
+ struct buf *ret __diagused;
UDF_LOCK_ECCLINE(eccline);
if (eccline-queued_on == 0) {
Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.24 src/sys/net/npf/npf_inet.c:1.25
--- src/sys/net/npf/npf_inet.c:1.24 Fri Oct 25 11:35:55 2013
+++ src/sys/net/npf/npf_inet.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.24 2013/10/25 11:35:55 martin Exp $ */
+/* $NetBSD: npf_inet.c,v 1.25 2013/10/30 08:41:38 mrg Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation,
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: mrg
Date: Wed Oct 30 08:42:16 UTC 2013
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
avoid uninitialised variable use.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 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.46 src/usr.sbin/cpuctl/arch/i386.c:1.47
--- src/usr.sbin/cpuctl/arch/i386.c:1.46 Mon Oct 28 05:41:49 2013
+++ src/usr.sbin/cpuctl/arch/i386.c Wed Oct 30 08:42:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.46 2013/10/28 05:41:49 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.47 2013/10/30 08:42:16 mrg 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.46 2013/10/28 05:41:49 msaitoh Exp $);
+__RCSID($NetBSD: i386.c,v 1.47 2013/10/30 08:42:16 mrg Exp $);
#endif /* not lint */
#include sys/types.h
@@ -1986,7 +1986,7 @@ cache_info_lookup(const struct x86_cache
static void
x86_print_cacheinfo(struct cpu_info *ci)
{
- const char *sep;
+ const char *sep = NULL;
if (ci-ci_cinfo[CAI_ICACHE].cai_totalsize != 0 ||
ci-ci_cinfo[CAI_DCACHE].cai_totalsize != 0) {
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: mrg
Date: Wed Oct 30 08:41:57 UTC 2013
Modified Files:
src/usr.sbin/ldpd: socketops.c
Log Message:
ensure variables are initialised
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/ldpd/socketops.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/ldpd/socketops.c
diff -u src/usr.sbin/ldpd/socketops.c:1.32 src/usr.sbin/ldpd/socketops.c:1.33
--- src/usr.sbin/ldpd/socketops.c:1.32 Thu Oct 17 18:10:23 2013
+++ src/usr.sbin/ldpd/socketops.c Wed Oct 30 08:41:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: socketops.c,v 1.32 2013/10/17 18:10:23 kefren Exp $ */
+/* $NetBSD: socketops.c,v 1.33 2013/10/30 08:41:57 mrg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -336,6 +336,7 @@ bind_socket(int s, int stype)
assert (stype == AF_INET || stype == AF_INET6);
+ memset(su, 0, sizeof su);
if (stype == AF_INET) {
su.sin.sin_len = sizeof(su.sin);
su.sin.sin_family = AF_INET;
CVS commit: src/sys/rump/include/machine
Module Name:src Committed By: mrg Date: Wed Oct 30 08:42:46 UTC 2013 Modified Files: src/sys/rump/include/machine: cpu.h Log Message: mark rump's CPU_INFO_ITERATOR as being __unused. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/rump/include/machine/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/rump/include/machine/cpu.h diff -u src/sys/rump/include/machine/cpu.h:1.16 src/sys/rump/include/machine/cpu.h:1.17 --- src/sys/rump/include/machine/cpu.h:1.16 Thu May 2 19:15:00 2013 +++ src/sys/rump/include/machine/cpu.h Wed Oct 30 08:42:45 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.16 2013/05/02 19:15:00 pooka Exp $ */ +/* $NetBSD: cpu.h,v 1.17 2013/10/30 08:42:45 mrg Exp $ */ /* * Copyright (c) 2008-2011 Antti Kantee. All Rights Reserved. @@ -80,7 +80,7 @@ struct lwp *rumpuser_curlwp(void); #define cpu_number() (cpu_index(curcpu)) extern struct cpu_info *rumpcpu_info_list; -#define CPU_INFO_ITERATOR int +#define CPU_INFO_ITERATOR int __unused #define CPU_INFO_FOREACH(_cii_, _ci_) _cii_ = 0, _ci_ = rumpcpu_info_list; \ _ci_ != NULL; _ci_ = _ci_-ci_next #define CPU_IS_PRIMARY(_ci_) (_ci_-ci_index == 0)
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Wed Oct 30 12:30:32 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser_dl.c
Log Message:
glibc on MIPS uses the same DYN d_ptr variant as NetBSD and musl.
from Justin Cormack
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/librumpuser/rumpuser_dl.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/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.22 src/lib/librumpuser/rumpuser_dl.c:1.23
--- src/lib/librumpuser/rumpuser_dl.c:1.22 Sun Oct 27 16:39:46 2013
+++ src/lib/librumpuser/rumpuser_dl.c Wed Oct 30 12:30:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_dl.c,v 1.22 2013/10/27 16:39:46 rmind Exp $ */
+/* $NetBSD: rumpuser_dl.c,v 1.23 2013/10/30 12:30:32 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -40,7 +40,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser_dl.c,v 1.22 2013/10/27 16:39:46 rmind Exp $);
+__RCSID($NetBSD: rumpuser_dl.c,v 1.23 2013/10/30 12:30:32 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -150,8 +150,7 @@ do { \
* On Solaris and DragonFly / FreeBSD, the main object works differently
* ... h.
*/
-#if defined(__GLIBC__)
-/* XXX: not true for e.g. MIPS, but we'll cross that hurdle later */
+#if defined(__GLIBC__) !defined(__mips__)
#define adjptr(_map_, _ptr_) ((void *)(_ptr_))
#elif defined(__sun__) || defined(__DragonFly__) || defined(__FreeBSD__)
#define adjptr(_map_, _ptr_) \
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Wed Oct 30 12:55:53 UTC 2013 Modified Files: src/lib/librumpuser: rumpuser_dl.c Log Message: need to include stdint.h before rump/rumpuser.h To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/librumpuser/rumpuser_dl.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/librumpuser/rumpuser_dl.c diff -u src/lib/librumpuser/rumpuser_dl.c:1.23 src/lib/librumpuser/rumpuser_dl.c:1.24 --- src/lib/librumpuser/rumpuser_dl.c:1.23 Wed Oct 30 12:30:32 2013 +++ src/lib/librumpuser/rumpuser_dl.c Wed Oct 30 12:55:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_dl.c,v 1.23 2013/10/30 12:30:32 pooka Exp $ */ +/* $NetBSD: rumpuser_dl.c,v 1.24 2013/10/30 12:55:53 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -40,7 +40,7 @@ #include rumpuser_port.h #if !defined(lint) -__RCSID($NetBSD: rumpuser_dl.c,v 1.23 2013/10/30 12:30:32 pooka Exp $); +__RCSID($NetBSD: rumpuser_dl.c,v 1.24 2013/10/30 12:55:53 pooka Exp $); #endif /* !lint */ #include sys/types.h @@ -50,6 +50,7 @@ __RCSID($NetBSD: rumpuser_dl.c,v 1.23 2 #include dlfcn.h #include errno.h #include fcntl.h +#include stdint,h #include stdio.h #include stdlib.h #include string.h
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Wed Oct 30 13:08:14 UTC 2013 Modified Files: src/lib/librumpuser: rumpuser_dl.c Log Message: Oh, stdint.h isn't written with a comma ... To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/lib/librumpuser/rumpuser_dl.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/librumpuser/rumpuser_dl.c diff -u src/lib/librumpuser/rumpuser_dl.c:1.24 src/lib/librumpuser/rumpuser_dl.c:1.25 --- src/lib/librumpuser/rumpuser_dl.c:1.24 Wed Oct 30 12:55:53 2013 +++ src/lib/librumpuser/rumpuser_dl.c Wed Oct 30 13:08:14 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_dl.c,v 1.24 2013/10/30 12:55:53 pooka Exp $ */ +/* $NetBSD: rumpuser_dl.c,v 1.25 2013/10/30 13:08:14 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -40,7 +40,7 @@ #include rumpuser_port.h #if !defined(lint) -__RCSID($NetBSD: rumpuser_dl.c,v 1.24 2013/10/30 12:55:53 pooka Exp $); +__RCSID($NetBSD: rumpuser_dl.c,v 1.25 2013/10/30 13:08:14 pooka Exp $); #endif /* !lint */ #include sys/types.h @@ -50,7 +50,7 @@ __RCSID($NetBSD: rumpuser_dl.c,v 1.24 2 #include dlfcn.h #include errno.h #include fcntl.h -#include stdint,h +#include stdint.h #include stdio.h #include stdlib.h #include string.h
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src Committed By: christos Date: Wed Oct 30 14:25:47 UTC 2013 Modified Files: src/external/gpl2/xcvs/dist/src: exithandle.c Log Message: Ignore SIGPIPE; this is silly, we are getting EOF from a client, then while processing the error SIGPIPE comes because the client closed the connection, and then we end up calling error() while processing the error which prints silly messages on the console because it logs with LOG_EMERG. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/xcvs/dist/src/exithandle.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/gpl2/xcvs/dist/src/exithandle.c diff -u src/external/gpl2/xcvs/dist/src/exithandle.c:1.1.1.1 src/external/gpl2/xcvs/dist/src/exithandle.c:1.2 --- src/external/gpl2/xcvs/dist/src/exithandle.c:1.1.1.1 Tue Apr 7 18:10:26 2009 +++ src/external/gpl2/xcvs/dist/src/exithandle.c Wed Oct 30 10:25:47 2013 @@ -30,7 +30,7 @@ signals_register (RETSIGTYPE (*handler)( (void) SIG_register (SIGQUIT, handler); #endif #ifdef SIGPIPE - (void) SIG_register (SIGPIPE, handler); + (void) SIG_register (SIGPIPE, SIG_IGN); #endif #ifdef SIGTERM (void) SIG_register (SIGTERM, handler);
CVS commit: src/etc
Module Name:src
Committed By: apb
Date: Wed Oct 30 15:15:12 UTC 2013
Modified Files:
src/etc: Makefile.params
Log Message:
Instead of stupid postprocessor tricks, use redirect tricks
to ensure that the output from ${PRINT_PARAMS} contains only
the desired information without any debugging noise.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.3 src/etc/Makefile.params:1.4
--- src/etc/Makefile.params:1.3 Fri Oct 18 11:42:59 2013
+++ src/etc/Makefile.params Wed Oct 30 15:15:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.3 2013/10/18 11:42:59 njoly Exp $
+# $NetBSD: Makefile.params,v 1.4 2013/10/30 15:15:12 apb Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -7,7 +7,8 @@
# List of variables whose value should be printed.
#
# PRINT_PARAMS
-# A command to print the desired variables and values.
+# A command to print the desired variables and values
+# to stdout, without any additional debugging information.
# Values are printed as single-quoted strings, with
# embedded quotes and newlines escaped in a way that's
# acceptable to sh(1). Undefined values are printed
@@ -15,15 +16,18 @@
#
# Internal targets:
# _params:
-# Prints the names and values of all the variables
-# listed in ${RELEASEVARS}. The output may be intermixed
-# with debugging information, which can be removed by the
-# ${_PARAMS_POSTPROCESS} command.
+# Prints the names and values of all the variables
+# listed in ${RELEASEVARS}. The desired results may be
+# redirected somewhere other than stdout, for example by
+# setting _params_redirect='3'. stdout and stderr may
+# contain unwanted debugging information, from make and
+# the shell.
#
# Internal variables:
-# _PARAMS_POSTPROCESS
-# A command to postprocess the output from make _params,
-# to remove debugging information and other noise.
+# _params_redirect:
+# If set, this should be a shell redirection specification, such
+# as '3', controlling where the output from make _params will
+# be sent.
#
# Example:
# . ${NETBSDSRCDIR}/etc/Makefile.params
@@ -31,8 +35,6 @@
# @${PRINT_PARAMS}
#
-.include bsd.sys.mk # for TOOL_AWK, ...
-
RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \
DESTDIR DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \
@@ -59,23 +61,25 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID
USETOOLS USR_OBJMACHINE \
X11SRCDIR X11FLAVOUR
-PRINT_PARAMS= (cd ${.CURDIR}; ${MAKE} _params) | ${_PARAMS_POSTPROCESS}
+_params_redirect?= # empty
_params: .PHONY
.for var in ${RELEASEVARS}
.if defined(${var})
- @printf %20s = '%-s'\n ${var} ${${var}:C/'/'''/gW:Q}
+ @printf %20s = '%-s'\n ${var} ${${var}:C/'/'''/gW:Q} \
+ ${_params_redirect}
.else
- @printf %20s = (undefined)\n ${var}
+ @printf 3 %20s = (undefined)\n ${var} \
+ ${_params_redirect}
.endif
.endfor
-# _PARAMS_POSTPROCESS:
+# PRINT_PARAMS:
#
# The output from the make _params can include the following types of
# unwanted lines:
#
-# make -j prints --- params ---;
+# make -j prints --- _params ---;
#
# if MAKEVERBOSE is set to 3 or more then make prints each printf
# command in addition to executing it;
@@ -85,7 +89,7 @@ _params: .PHONY
#
# So the resulting output can look like this:
#
-# --- params ---
+# --- _params ---
# + echo 'printf %20s = '\''%-s'\''\n BSDOBJDIR /usr/obj'
# printf %20s = '%-s'\n BSDOBJDIR /usr/obj
# + printf '%20s = '\''%-s'\''\n' BSDOBJDIR /usr/obj
@@ -102,49 +106,11 @@ _params: .PHONY
# BSDSRCDIR = '/usr/src'
# [...]
#
-# The awk program in ${PARAMS_POSTPROCESS} removes the unwanted noise,
-# taking care with variables whose values contain embedded newlines
-# (assuming that embedded newlines appear only inside single quotes).
-#
-_PARAMS_POSTPROCESS= ${TOOL_AWK} '\
- BEGIN { single_quote = '\''; \
- NORMAL = 0; \
- SKIP_HEADING = 1; \
- SKIP_MULTILINE = 2; \
- PRINT_MULTILINE = 3; \
- state = SKIP_HEADING; \
- } \
- function quotes_balanced_p(line) { \
- return (line ~ /^([^\\'\'']|\\.|'\''[^'\'']*'\''|(\\.|[^\\])*)*$$/); \
- } \
- state == SKIP_MULTILINE { \
- if (quotes_balanced_p(single_quote $$0)) { \
- state = NORMAL; \
- } \
- next; \
- } \
- state == PRINT_MULTILINE { \
- if (quotes_balanced_p(single_quote $$0)) { \
- state = NORMAL; \
- } \
- print; next; \
- } \
- state == SKIP_HEADING $$0 ~ /^--- .* ---$$/ { next; } \
- state == SKIP_HEADING $$0 ~ / === / { next; } \
- /^(\+ )?(echo ['\''])?printf.* = / { \
- if (quotes_balanced_p($$0)) { \
- state = NORMAL; \
- } else { \
- state = SKIP_MULTILINE; \
- } \
- next; \
- } \
- // { \
- if (quotes_balanced_p($$0)) { \
- state = NORMAL; \
- } else { \
- state =
CVS commit: src/distrib/sets
Module Name:src
Committed By: apb
Date: Wed Oct 30 15:17:01 UTC 2013
Modified Files:
src/distrib/sets: Makefile
Log Message:
In make sortlists, if the file was already sorted then don't
change its timestamp.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/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/Makefile
diff -u src/distrib/sets/Makefile:1.89 src/distrib/sets/Makefile:1.90
--- src/distrib/sets/Makefile:1.89 Sun Oct 27 09:29:42 2013
+++ src/distrib/sets/Makefile Wed Oct 30 15:17:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2013/10/27 09:29:42 apb Exp $
+# $NetBSD: Makefile,v 1.90 2013/10/30 15:17:01 apb Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -314,8 +314,13 @@ sortlists: .PHONY
${_MKSHMSG} sorting $${f#${.CURDIR}/} ; \
{ grep '^#' $$f ; \
grep -v '^#' $$f | sort ; \
- } $$f.tmp \
- mv $$f.tmp $$f ; \
+ } $$f.tmp; \
+ if cmp $$f $$f.tmp /dev/null; then \
+ : $$f is unchanged ; \
+ rm $$f.tmp ; \
+ else \
+ mv $$f.tmp $$f ; \
+ fi ; \
done
#
CVS commit: src
Module Name:src
Committed By: drochner
Date: Wed Oct 30 15:37:49 UTC 2013
Modified Files:
src/distrib/utils/sysinst: disks.c
src/sbin/atactl: atactl.c
src/sys/dev/ata: atareg.h
src/sys/dev/usb: umass_isdata.c
Log Message:
-recognize CF cards by the magic value in inquiry data
-kill CFG_ATAPI_MASK, didn't see anything in the specs supporting
that it exists
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.71 -r1.72 src/sbin/atactl/atactl.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ata/atareg.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/umass_isdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.128 src/distrib/utils/sysinst/disks.c:1.129
--- src/distrib/utils/sysinst/disks.c:1.128 Wed Oct 30 08:39:01 2013
+++ src/distrib/utils/sysinst/disks.c Wed Oct 30 15:37:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.128 2013/10/30 08:39:01 mrg Exp $ */
+/* $NetBSD: disks.c,v 1.129 2013/10/30 15:37:49 drochner Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -259,7 +259,8 @@ get_descr_ata(struct disk_desc *dd, int
* Mitsumi ATAPI devices
*/
- if (!((inqbuf-atap_config WDC_CFG_ATAPI_MASK) == WDC_CFG_ATAPI
+ if (!(inqbuf-atap_config != WDC_CFG_CFA_MAGIC
+ (inqbuf-atap_config WDC_CFG_ATAPI)
((inqbuf-atap_model[0] == 'N'
inqbuf-atap_model[1] == 'E') ||
(inqbuf-atap_model[0] == 'F'
Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.71 src/sbin/atactl/atactl.c:1.72
--- src/sbin/atactl/atactl.c:1.71 Tue Aug 6 19:13:13 2013
+++ src/sbin/atactl/atactl.c Wed Oct 30 15:37:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atactl.c,v 1.71 2013/08/06 19:13:13 soren Exp $ */
+/* $NetBSD: atactl.c,v 1.72 2013/10/30 15:37:49 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: atactl.c,v 1.71 2013/08/06 19:13:13 soren Exp $);
+__RCSID($NetBSD: atactl.c,v 1.72 2013/10/30 15:37:49 drochner Exp $);
#endif
@@ -947,7 +947,8 @@ device_identify(int argc, char *argv[])
* Mitsumi ATAPI devices
*/
- if (!((inqbuf-atap_config WDC_CFG_ATAPI_MASK) == WDC_CFG_ATAPI
+ if (!(inqbuf-atap_config != WDC_CFG_CFA_MAGIC
+ (inqbuf-atap_config WDC_CFG_ATAPI)
((inqbuf-atap_model[0] == 'N'
inqbuf-atap_model[1] == 'E') ||
(inqbuf-atap_model[0] == 'F'
@@ -980,9 +981,13 @@ device_identify(int argc, char *argv[])
((uint64_t)inqbuf-atap_wwn[2] 16) |
((uint64_t)inqbuf-atap_wwn[3] 0));
- printf(Device type: %s, %s\n, inqbuf-atap_config WDC_CFG_ATAPI ?
- ATAPI : ATA, inqbuf-atap_config ATA_CFG_FIXED ? fixed :
- removable);
+ printf(Device type: %s,
+ inqbuf-atap_config == WDC_CFG_CFA_MAGIC ? CF-ATA :
+ (inqbuf-atap_config WDC_CFG_ATAPI ? ATAPI : ATA));
+ if (inqbuf-atap_config != WDC_CFG_CFA_MAGIC)
+ printf(, %s,
+ inqbuf-atap_config ATA_CFG_FIXED ? fixed : removable);
+ printf(\n);
compute_capacity(inqbuf, capacity, sectors, secsize);
Index: src/sys/dev/ata/atareg.h
diff -u src/sys/dev/ata/atareg.h:1.42 src/sys/dev/ata/atareg.h:1.43
--- src/sys/dev/ata/atareg.h:1.42 Wed Jan 9 17:55:04 2013
+++ src/sys/dev/ata/atareg.h Wed Oct 30 15:37:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atareg.h,v 1.42 2013/01/09 17:55:04 riastradh Exp $ */
+/* $NetBSD: atareg.h,v 1.43 2013/10/30 15:37:49 drochner Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -284,7 +284,7 @@ atacmd_tostatq(int cmd32)
struct ataparams {
/* drive info */
uint16_t atap_config; /* 0: general configuration */
-#define WDC_CFG_ATAPI_MASK 0xc000
+#define WDC_CFG_CFA_MAGIC 0x848a
#define WDC_CFG_ATAPI 0x8000
#define ATA_CFG_REMOVABLE 0x0080
#define ATA_CFG_FIXED 0x0040
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.28 src/sys/dev/usb/umass_isdata.c:1.29
--- src/sys/dev/usb/umass_isdata.c:1.28 Wed Apr 3 17:15:07 2013
+++ src/sys/dev/usb/umass_isdata.c Wed Oct 30 15:37:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.28 2013/04/03 17:15:07 bouyer Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.29 2013/10/30 15:37:49 drochner Exp $ */
/*
* TODO:
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass_isdata.c,v 1.28 2013/04/03 17:15:07 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass_isdata.c,v 1.29 2013/10/30 15:37:49 drochner Exp $);
#ifdef _KERNEL_OPT
#include opt_umass.h
@@ -546,8 +546,8 @@ uisdata_get_params(struct ata_drive_data
* Shuffle string byte order.
* ATAPI Mitsumi and NEC drives don't need this.
*/
- if ((prms-atap_config WDC_CFG_ATAPI_MASK) ==
- WDC_CFG_ATAPI
+ if (prms-atap_config != WDC_CFG_CFA_MAGIC
+ (prms-atap_config
CVS commit: src/sys/dev/ata
Module Name:src
Committed By: drochner
Date: Wed Oct 30 15:41:14 UTC 2013
Modified Files:
src/sys/dev/ata: wd.c
Log Message:
play the addref/delref game on suspend, prevents crash if the disk/CF Card
is eg. in a PCMCIA adapter and not mounted
To generate a diff of this commit:
cvs rdiff -u -r1.405 -r1.406 src/sys/dev/ata/wd.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/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.405 src/sys/dev/ata/wd.c:1.406
--- src/sys/dev/ata/wd.c:1.405 Mon Aug 19 14:58:57 2013
+++ src/sys/dev/ata/wd.c Wed Oct 30 15:41:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.405 2013/08/19 14:58:57 skrll Exp $ */
+/* $NetBSD: wd.c,v 1.406 2013/10/30 15:41:14 drochner Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.405 2013/08/19 14:58:57 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.406 2013/10/30 15:41:14 drochner Exp $);
#include opt_ata.h
@@ -405,8 +405,14 @@ wd_suspend(device_t dv, const pmf_qual_t
{
struct wd_softc *sc = device_private(dv);
+ /* the adapter needs to be enabled */
+ if (sc-atabus-ata_addref(sc-drvp))
+ return true; /* no need to complain */
+
wd_flushcache(sc, AT_WAIT);
wd_standby(sc, AT_WAIT);
+
+ sc-atabus-ata_delref(sc-drvp);
return true;
}
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Wed Oct 30 20:27:40 UTC 2013
Modified Files:
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/include: Makefile
src/external/bsd/llvm/lib/libLLVMTransformsUtils: Makefile
src/external/bsd/llvm/lib/liblldDriver: Makefile
src/external/bsd/llvm/lib/liblldPasses: Makefile
src/external/bsd/llvm/lib/liblldReaderWriterELF: Makefile
src/external/bsd/llvm/lib/liblldReaderWriterELFX86_64: Makefile
src/external/bsd/llvm/lib/liblldbPluginSymbolFileDWARF: Makefile
Log Message:
Update LLVM/Clang snapshot to r193633. Fixes an old and somewhat amusing
bug involving a source file foo.c, a function foo and a static
function-local variable c in the direct object writer.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/liblldDriver/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/liblldPasses/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/lib/liblldReaderWriterELF/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/lib/liblldReaderWriterELFX86_64/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/llvm/lib/liblldbPluginSymbolFileDWARF/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/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.60 src/external/bsd/llvm/Makefile.inc:1.61
--- src/external/bsd/llvm/Makefile.inc:1.60 Mon Oct 21 19:27:55 2013
+++ src/external/bsd/llvm/Makefile.inc Wed Oct 30 20:27:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.60 2013/10/21 19:27:55 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.61 2013/10/30 20:27:39 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -7,7 +7,7 @@ LLVM_TOPLEVEL_MK=
SVN_ROOT= http://llvm.org/svn/llvm-project
-COMMON_REVISION= 193064
+COMMON_REVISION= 193633
CLANG_REVISION= ${COMMON_REVISION}
COMPILER_RT_REVISION= ${COMMON_REVISION}
LLD_REVISION= ${COMMON_REVISION}
Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.23 src/external/bsd/llvm/include/Makefile:1.24
--- src/external/bsd/llvm/include/Makefile:1.23 Mon Oct 14 01:47:50 2013
+++ src/external/bsd/llvm/include/Makefile Wed Oct 30 20:27:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/10/14 01:47:50 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2013/10/30 20:27:39 joerg Exp $
.include bsd.init.mk
@@ -71,7 +71,7 @@ CLANG_TABLEGEN_OUTPUT.Attr.td= \
clang/AST/AttrImpl.inc|-gen-clang-attr-impl \
clang/Basic/AttrList.inc|-gen-clang-attr-list \
clang/Lex/AttrSpellings.inc|-gen-clang-attr-spelling-list \
- clang/Parse/AttrExprArgs.inc|-gen-clang-attr-expr-args-list \
+ clang/Parse/AttrIdentifierArg.inc|-gen-clang-attr-identifier-arg-list \
clang/Parse/AttrLateParsed.inc|-gen-clang-attr-late-parsed-list \
clang/Sema/AttrParsedAttrImpl.inc|-gen-clang-attr-parsed-attr-impl \
clang/Sema/AttrParsedAttrKinds.inc|-gen-clang-attr-parsed-attr-kinds \
Index: src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.12 src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.13
--- src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile:1.12 Mon Sep 2 14:34:56 2013
+++ src/external/bsd/llvm/lib/libLLVMTransformsUtils/Makefile Wed Oct 30 20:27:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/09/02 14:34:56 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2013/10/30 20:27:39 joerg Exp $
LIB= LLVMTransformsUtils
@@ -16,6 +16,7 @@ SRCS+= BasicBlockUtils.cpp \
CodeExtractor.cpp \
DemoteRegToStack.cpp \
FlattenCFG.cpp \
+ GlobalStatus.cpp \
InlineFunction.cpp \
InstructionNamer.cpp \
IntegerDivision.cpp \
Index: src/external/bsd/llvm/lib/liblldDriver/Makefile
diff -u src/external/bsd/llvm/lib/liblldDriver/Makefile:1.2 src/external/bsd/llvm/lib/liblldDriver/Makefile:1.3
--- src/external/bsd/llvm/lib/liblldDriver/Makefile:1.2 Sat Sep 21 22:28:12 2013
+++ src/external/bsd/llvm/lib/liblldDriver/Makefile Wed Oct 30 20:27:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/21 22:28:12 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2013/10/30 20:27:39 joerg Exp $
LIB= lldDriver
@@ -14,8 +14,11 @@ SRCS+= CoreDriver.cpp \
UniversalDriver.cpp \
WinLinkDriver.cpp
-TABLEGEN_SRC= CoreOptions.td DarwinLdOptions.td GnuLdOptions.td WinLinkOptions.td
+TABLEGEN_SRC= CoreOptions.td DarwinLdOptions.td GnuLdOptions.td \
+ UniversalDriverOptions.td WinLinkOptions.td
+TABLEGEN_OUTPUT.UniversalDriverOptions.td= \
+ UniversalDriverOptions.inc|-gen-opt-parser-defs
TABLEGEN_OUTPUT.CoreOptions.td= \
CVS commit: src/sys
Module Name:src
Committed By: joerg
Date: Wed Oct 30 23:32:30 UTC 2013
Modified Files:
src/sys/kern: exec_elf.c
src/sys/sys: exec.h
Log Message:
Preserve NetBSD version from the ABI tag for compat use.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.140 -r1.141 src/sys/sys/exec.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.47 src/sys/kern/exec_elf.c:1.48
--- src/sys/kern/exec_elf.c:1.47 Tue Sep 10 21:30:21 2013
+++ src/sys/kern/exec_elf.c Wed Oct 30 23:32:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.47 2013/09/10 21:30:21 matt Exp $ */
+/* $NetBSD: exec_elf.c,v 1.48 2013/10/30 23:32:30 joerg Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.47 2013/09/10 21:30:21 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.48 2013/10/30 23:32:30 joerg Exp $);
#ifdef _KERNEL_OPT
#include opt_pax.h
@@ -902,6 +902,9 @@ netbsd_elf_signature(struct lwp *l, stru
np-n_descsz == ELF_NOTE_NETBSD_DESCSZ
memcmp(ndata, ELF_NOTE_NETBSD_NAME,
ELF_NOTE_NETBSD_NAMESZ) == 0) {
+memcpy(epp-ep_osversion,
+ndata + ELF_NOTE_NETBSD_NAMESZ + 1,
+ELF_NOTE_NETBSD_DESCSZ);
isnetbsd = 1;
break;
}
Index: src/sys/sys/exec.h
diff -u src/sys/sys/exec.h:1.140 src/sys/sys/exec.h:1.141
--- src/sys/sys/exec.h:1.140 Tue Sep 10 21:30:21 2013
+++ src/sys/sys/exec.h Wed Oct 30 23:32:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.h,v 1.140 2013/09/10 21:30:21 matt Exp $ */
+/* $NetBSD: exec.h,v 1.141 2013/10/30 23:32:30 joerg Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -216,6 +216,7 @@ struct exec_package {
char *ep_path; /* absolute path of executable */
void (*ep_emul_arg_free)(void *);
/* free ep_emul_arg */
+ uint32_t ep_osversion; /* OS version */
char ep_machine_arch[12]; /* from MARCH note */
};
#define EXEC_INDIR 0x0001 /* script handling already done */
CVS commit: src/lib/libc/net
Module Name:src Committed By: wiz Date: Thu Oct 31 00:30:14 UTC 2013 Modified Files: src/lib/libc/net: inet6_getscopeid.3 Log Message: Try improving the description. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/net/inet6_getscopeid.3 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/net/inet6_getscopeid.3 diff -u src/lib/libc/net/inet6_getscopeid.3:1.2 src/lib/libc/net/inet6_getscopeid.3:1.3 --- src/lib/libc/net/inet6_getscopeid.3:1.2 Sat Oct 19 23:34:48 2013 +++ src/lib/libc/net/inet6_getscopeid.3 Thu Oct 31 00:30:14 2013 @@ -1,6 +1,6 @@ -.\ $NetBSD: inet6_getscopeid.3,v 1.2 2013/10/19 23:34:48 wiz Exp $ +.\ $NetBSD: inet6_getscopeid.3,v 1.3 2013/10/31 00:30:14 wiz Exp $ .\- -.\ Copyright (c) 2003 The NetBSD Foundation, Inc. +.\ Copyright (c) 2013 The NetBSD Foundation, Inc. .\ All rights reserved. .\ .\ This code is derived from software contributed to The NetBSD Foundation @@ -28,7 +28,7 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd October 19, 2013 +.Dd October 31, 2013 .Dt INET6_GETSCOPEID 3 .Os .\ @@ -48,6 +48,9 @@ These functions implement a KAME-specific extension that encodes and decodes the scope id inside in the 3rd and 4th byte of the address, for link-local, site-local, and multicast-link-local addresses. +The scope id helps deciding which interface is used for packets of +that type. +.Pp Typically those two bytes are .Dv 0 for these kinds of addresses. @@ -55,7 +58,11 @@ The scope id is stored in network byte o .Pp The .Fn inet6_getscopeid -function retrieves the scope id from the 3rd and the 4th address bytes, +function retrieves the scope id from the 3rd and the 4th address bytes +(from the +.Va sin6_addr +member of +.Fa sin6 ) , and sets the .Ft sin6_scope_id from them. @@ -65,19 +72,28 @@ The .Fn inet6putscopeid function stores the scope id found in .Ft sin6_scope_id -into the 3rd and 4th byte of the address. +into the 3rd and 4th byte of the address +(into the +.Va sin6_addr +member of +.Fa sin6 ) . It then clears the -.Ft sin6_scope_id . +.Va sin6_scope_id +member of +.Fa sin6 . .Pp The .Fa flags argument controls for which addresses this action is performed. It can be a combination of: -.Bl -tag -width INET6_IS_ADDR_MC_LINKLOCAL -.It Dv INET6_IS_ADDR_LINKLOCAL -.It Dv INET6_IS_ADDR_MC_LINKLOCAL -.It Dv INET6_IS_ADDR_SITELOCAL +.Bl -bullet +.It +.Dv INET6_IS_ADDR_LINKLOCAL +.It +.Dv INET6_IS_ADDR_MC_LINKLOCAL +.It +.Dv INET6_IS_ADDR_SITELOCAL .El .Sh HISTORY These functions first appeared in
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: rmind
Date: Thu Oct 31 00:59:17 UTC 2013
Modified Files:
src/sys/fs/tmpfs: tmpfs_subr.c tmpfs_vnops.c
Log Message:
tmpfs_alloc_node: it is less error-prone to store the link path with
the NIL terminator included. Adjust tmpfs_readlink() to exclude NIL.
Also, remove the check for zero-length and add some asserts.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/fs/tmpfs/tmpfs_subr.c
cvs rdiff -u -r1.103 -r1.104 src/sys/fs/tmpfs/tmpfs_vnops.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/fs/tmpfs/tmpfs_subr.c
diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.80 src/sys/fs/tmpfs/tmpfs_subr.c:1.81
--- src/sys/fs/tmpfs/tmpfs_subr.c:1.80 Fri Oct 4 15:14:11 2013
+++ src/sys/fs/tmpfs/tmpfs_subr.c Thu Oct 31 00:59:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_subr.c,v 1.80 2013/10/04 15:14:11 rmind Exp $ */
+/* $NetBSD: tmpfs_subr.c,v 1.81 2013/10/31 00:59:17 rmind Exp $ */
/*
* Copyright (c) 2005-2011 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.80 2013/10/04 15:14:11 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_subr.c,v 1.81 2013/10/31 00:59:17 rmind Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -166,13 +166,13 @@ tmpfs_alloc_node(tmpfs_mount_t *tmp, enu
break;
case VLNK:
/* Symbolic link. Target specifies the file name. */
- KASSERT(target strlen(target) MAXPATHLEN);
+ KASSERT(target != NULL);
nnode-tn_size = strlen(target);
- if (nnode-tn_size == 0) {
- nnode-tn_spec.tn_lnk.tn_link = NULL;
- break;
- }
+ KASSERT(nnode-tn_size 0);
+ KASSERT(nnode-tn_size MAXPATHLEN);
+ nnode-tn_size++; /* include the NIL */
+
nnode-tn_spec.tn_lnk.tn_link =
tmpfs_strname_alloc(tmp, nnode-tn_size);
if (nnode-tn_spec.tn_lnk.tn_link == NULL) {
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.103 src/sys/fs/tmpfs/tmpfs_vnops.c:1.104
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.103 Fri Oct 4 15:14:11 2013
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Thu Oct 31 00:59:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.103 2013/10/04 15:14:11 rmind Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.104 2013/10/31 00:59:17 rmind Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.103 2013/10/04 15:14:11 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.104 2013/10/31 00:59:17 rmind Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -1030,16 +1030,17 @@ tmpfs_readlink(void *v)
} */ *ap = v;
vnode_t *vp = ap-a_vp;
struct uio *uio = ap-a_uio;
- tmpfs_node_t *node;
+ tmpfs_node_t *node = VP_TO_TMPFS_NODE(vp);
int error;
KASSERT(VOP_ISLOCKED(vp));
KASSERT(uio-uio_offset == 0);
KASSERT(vp-v_type == VLNK);
+ KASSERT(node-tn_size 0);
- node = VP_TO_TMPFS_NODE(vp);
+ /* Note: readlink(2) returns the path without NIL. */
error = uiomove(node-tn_spec.tn_lnk.tn_link,
- MIN(node-tn_size, uio-uio_resid), uio);
+ MIN(node-tn_size - 1, uio-uio_resid), uio);
node-tn_status |= TMPFS_NODE_ACCESSED;
return error;
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Oct 31 01:55:03 UTC 2013
Modified Files:
src/share/mk: bsd.dep.mk
Log Message:
create mkdep output with a temporary file so that failures in
complation during .d creation don't leave an empty (stale) .d
file around to break future builds.
(hmm, probably could use .PRECIOUS here.)
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/share/mk/bsd.dep.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.78 src/share/mk/bsd.dep.mk:1.79
--- src/share/mk/bsd.dep.mk:1.78 Mon Oct 28 01:47:13 2013
+++ src/share/mk/bsd.dep.mk Thu Oct 31 01:55:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.78 2013/10/28 01:47:13 mrg Exp $
+# $NetBSD: bsd.dep.mk,v 1.79 2013/10/31 01:55:03 mrg Exp $
# Basic targets
realdepend: beforedepend .depend afterdepend
@@ -60,37 +60,41 @@ _MKDEP_FILEFLAGS=
.c.d:
${_MKTARGET_CREATE}
- ${MKDEP} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
+ ${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${CFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
- ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+ ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} \
+ mv ${.TARGET}.tmp ${.TARGET}
.m.d:
${_MKTARGET_CREATE}
- ${MKDEP} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
+ ${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${OBJCFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
- ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+ ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} \
+ mv ${.TARGET}.tmp ${.TARGET}
.s.d .S.d:
${_MKTARGET_CREATE}
- ${MKDEP} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
+ ${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${AFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS} ${AFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} \
- ${__acpp_flags} ${.IMPSRC}
+ ${__acpp_flags} ${.IMPSRC} \
+ mv ${.TARGET}.tmp ${.TARGET}
.C.d .cc.d .cpp.d .cxx.d:
${_MKTARGET_CREATE}
- ${MKDEPCXX} -f ${.TARGET} ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
+ ${MKDEPCXX} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
${CXXFLAGS:C/-([IDU])[ ]*/-\1/Wg:M-[IDU]*} \
${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
- ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
+ ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} \
+ mv ${.TARGET}.tmp ${.TARGET}
.endif # defined(SRCS) !empty(SRCS) # }
# Clean rules
.if defined(SRCS) !empty(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${.CURDIR}/tags ${CLEANDEPEND}
+CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
.endif
# Custom rules
CVS commit: src/sys/dev
Module Name:src
Committed By: msaitoh
Date: Thu Oct 31 04:26:40 UTC 2013
Modified Files:
src/sys/dev/mii: brgphy.c
src/sys/dev/pci: if_bge.c if_bgereg.h if_bgevar.h
Log Message:
Cleanup flag setting. No functional change.
- Split flags into bge_flags and bge_phy_flags.
- Rename flags. PHY related flags are prefixed with BGEPHYF_*.
Other flags are prefixed with BGEF_*.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.260 -r1.261 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pci/if_bgereg.h
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/if_bgevar.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/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.67 src/sys/dev/mii/brgphy.c:1.68
--- src/sys/dev/mii/brgphy.c:1.67 Fri Jun 21 04:25:51 2013
+++ src/sys/dev/mii/brgphy.c Thu Oct 31 04:26:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.67 2013/06/21 04:25:51 msaitoh Exp $ */
+/* $NetBSD: brgphy.c,v 1.68 2013/10/31 04:26:40 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.67 2013/06/21 04:25:51 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.68 2013/10/31 04:26:40 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -711,19 +711,19 @@ brgphy_reset(struct mii_softc *sc)
if (bsc-sc_isbge) {
if (!(sc-mii_flags MIIF_HAVEFIBER)) {
- if (bsc-sc_phyflags BGE_PHY_ADC_BUG)
+ if (bsc-sc_phyflags BGEPHYF_ADC_BUG)
brgphy_adc_bug(sc);
- if (bsc-sc_phyflags BGE_PHY_5704_A0_BUG)
+ if (bsc-sc_phyflags BGEPHYF_5704_A0_BUG)
brgphy_5704_a0_bug(sc);
- if (bsc-sc_phyflags BGE_PHY_BER_BUG)
+ if (bsc-sc_phyflags BGEPHYF_BER_BUG)
brgphy_ber_bug(sc);
- else if (bsc-sc_phyflags BGE_PHY_JITTER_BUG) {
+ else if (bsc-sc_phyflags BGEPHYF_JITTER_BUG) {
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00);
PHY_WRITE(sc, BRGPHY_MII_DSP_ADDR_REG,
0x000a);
if (bsc-sc_phyflags
- BGE_PHY_ADJUST_TRIM) {
+ BGEPHYF_ADJUST_TRIM) {
PHY_WRITE(sc, BRGPHY_MII_DSP_RW_PORT,
0x110b);
PHY_WRITE(sc, BRGPHY_TEST1,
@@ -735,11 +735,11 @@ brgphy_reset(struct mii_softc *sc)
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0400);
}
- if (bsc-sc_phyflags BGE_PHY_CRC_BUG)
+ if (bsc-sc_phyflags BGEPHYF_CRC_BUG)
brgphy_crc_bug(sc);
/* Set Jumbo frame settings in the PHY. */
- if (bsc-sc_phyflags BGE_JUMBO_CAPABLE)
+ if (bsc-sc_phyflags BGEPHYF_JUMBO_CAPABLE)
brgphy_jumbo_settings(sc);
/* Adjust output voltage */
@@ -748,12 +748,12 @@ brgphy_reset(struct mii_softc *sc)
PHY_WRITE(sc, BRGPHY_MII_EPHY_PTEST, 0x12);
/* Enable Ethernet@Wirespeed */
- if (!(bsc-sc_phyflags BGE_PHY_NO_WIRESPEED))
+ if (!(bsc-sc_phyflags BGEPHYF_NO_WIRESPEED))
brgphy_eth_wirespeed(sc);
#if 0
/* Enable Link LED on Dell boxes */
- if (bsc-sc_phyflags BGE_PHY_NO_3LED) {
+ if (bsc-sc_phyflags BGEPHYF_NO_3LED) {
PHY_WRITE(sc, BRGPHY_MII_PHY_EXTCTL,
PHY_READ(sc, BRGPHY_MII_PHY_EXTCTL)
~BRGPHY_PHY_EXTCTL_3_LED);
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.260 src/sys/dev/pci/if_bge.c:1.261
--- src/sys/dev/pci/if_bge.c:1.260 Mon Oct 28 05:37:24 2013
+++ src/sys/dev/pci/if_bge.c Thu Oct 31 04:26:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.260 2013/10/28 05:37:24 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.261 2013/10/31 04:26:40 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.260 2013/10/28 05:37:24 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.261 2013/10/31 04:26:40 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -671,15 +671,15 @@ static const struct bge_product {
NULL },
};
-#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)-bge_flags BGE_JUMBO_CAPABLE)
-#define BGE_IS_5700_FAMILY(sc) ((sc)-bge_flags BGE_5700_FAMILY)
-#define BGE_IS_5705_PLUS(sc) ((sc)-bge_flags BGE_5705_PLUS)
-#define BGE_IS_5714_FAMILY(sc) ((sc)-bge_flags BGE_5714_FAMILY)
-#define BGE_IS_575X_PLUS(sc) ((sc)-bge_flags BGE_575X_PLUS)
-#define BGE_IS_5755_PLUS(sc) ((sc)-bge_flags BGE_5755_PLUS)
-#define BGE_IS_57765_FAMILY(sc) ((sc)-bge_flags BGE_57765_FAMILY)
-#define BGE_IS_57765_PLUS(sc) ((sc)-bge_flags BGE_57765_PLUS)
-#define BGE_IS_5717_PLUS(sc) ((sc)-bge_flags BGE_5717_PLUS)
+#define BGE_IS_JUMBO_CAPABLE(sc) ((sc)-bge_flags BGEF_JUMBO_CAPABLE)
+#define BGE_IS_5700_FAMILY(sc) ((sc)-bge_flags BGEF_5700_FAMILY)
+#define BGE_IS_5705_PLUS(sc) ((sc)-bge_flags BGEF_5705_PLUS)
+#define BGE_IS_5714_FAMILY(sc) ((sc)-bge_flags BGEF_5714_FAMILY)
+#define BGE_IS_575X_PLUS(sc) ((sc)-bge_flags BGEF_575X_PLUS)
+#define
