CVS commit: src/distrib
Module Name:src Committed By: martin Date: Sun May 24 09:33:20 UTC 2015 Modified Files: src/distrib/amd64/cdroms: Makefile.cdrom src/distrib/i386/cdroms: Makefile.cdrom Log Message: Add full libexec contents to the CD image - this makes dhcpcd happy. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/distrib/amd64/cdroms/Makefile.cdrom cvs rdiff -u -r1.35 -r1.36 src/distrib/i386/cdroms/Makefile.cdrom Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/cdroms/Makefile.cdrom diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.15 src/distrib/amd64/cdroms/Makefile.cdrom:1.16 --- src/distrib/amd64/cdroms/Makefile.cdrom:1.15 Tue May 19 06:58:52 2015 +++ src/distrib/amd64/cdroms/Makefile.cdrom Sun May 24 09:33:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.15 2015/05/19 06:58:52 martin Exp $ +# $NetBSD: Makefile.cdrom,v 1.16 2015/05/24 09:33:20 martin Exp $ .include @@ -16,10 +16,7 @@ CDRUNTIME+= ./dev/MAKEDEV CDRUNTIME+= ./etc CDRUNTIME+= ./lib CDRUNTIME+= ./libdata -CDRUNTIME+= ./libexec/ld.elf_so -CDRUNTIME+= ./libexec/lfs_cleanerd -CDRUNTIME+= ./libexec/dhcpcd-run-hooks -CDRUNTIME+= ./libexec/resolvconf/ +CDRUNTIME+= ./libexec CDRUNTIME+= ./mnt CDRUNTIME+= ./sbin CDRUNTIME+= ./stand Index: src/distrib/i386/cdroms/Makefile.cdrom diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.35 src/distrib/i386/cdroms/Makefile.cdrom:1.36 --- src/distrib/i386/cdroms/Makefile.cdrom:1.35 Tue May 19 06:58:52 2015 +++ src/distrib/i386/cdroms/Makefile.cdrom Sun May 24 09:33:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.35 2015/05/19 06:58:52 martin Exp $ +# $NetBSD: Makefile.cdrom,v 1.36 2015/05/24 09:33:20 martin Exp $ .include @@ -16,10 +16,7 @@ CDRUNTIME+= ./dev/MAKEDEV CDRUNTIME+= ./etc CDRUNTIME+= ./lib CDRUNTIME+= ./libdata -CDRUNTIME+= ./libexec/ld.elf_so -CDRUNTIME+= ./libexec/lfs_cleanerd -CDRUNTIME+= ./libexec/dhcpcd-run-hooks -CDRUNTIME+= ./libexec/resolvconf/ +CDRUNTIME+= ./libexec CDRUNTIME+= ./mnt CDRUNTIME+= ./sbin CDRUNTIME+= ./stand
CVS commit: [netbsd-7] src/share/man/man4
Module Name:src Committed By: martin Date: Sun May 24 10:39:44 UTC 2015 Modified Files: src/share/man/man4 [netbsd-7]: options.4 Log Message: Pull up following revision(s) (requested by 798 in ticket #snj): share/man/man4/options.4: revision 1.445 the OSI options are long gone (hi joerg!) To generate a diff of this commit: cvs rdiff -u -r1.439.2.2 -r1.439.2.3 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/options.4 diff -u src/share/man/man4/options.4:1.439.2.2 src/share/man/man4/options.4:1.439.2.3 --- src/share/man/man4/options.4:1.439.2.2 Fri May 15 03:44:17 2015 +++ src/share/man/man4/options.4 Sun May 24 10:39:44 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: options.4,v 1.439.2.2 2015/05/15 03:44:17 snj Exp $ +.\" $NetBSD: options.4,v 1.439.2.3 2015/05/24 10:39:44 martin Exp $ .\" .\" Copyright (c) 1996 .\" Perry E. Metzger. All rights reserved. @@ -30,7 +30,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd August 23, 2014 +.Dd May 24, 2015 .Dt OPTIONS 4 .Os .Sh NAME @@ -1911,21 +1911,6 @@ may perform better with .Em MCLSHIFT set to 12 or 13, giving mbuf cluster sizes of 4096 and 8192 bytes, respectively. -.It Cd options ISO,TPIP -Include support for the ubiquitous -.Tn OSI -protocol stack. -See -.Xr iso 4 -for details. -This option assumes -.Em INET . -.It Cd options EON -Include support for tunneling -.Tn OSI -protocols over -.Tn IP . -Known to be broken, or at least very fragile, and undocumented. .It Cd options NETATALK Include support for the .Tn AppleTalk
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sun May 24 11:16:19 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #798 and #799 To generate a diff of this commit: cvs rdiff -u -r1.1.2.306 -r1.1.2.307 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.306 src/doc/CHANGES-7.0:1.1.2.307 --- src/doc/CHANGES-7.0:1.1.2.306 Fri May 22 17:33:15 2015 +++ src/doc/CHANGES-7.0 Sun May 24 11:16:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.306 2015/05/22 17:33:15 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.307 2015/05/24 11:16:19 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -23379,3 +23379,124 @@ sys/external/bsd/drm2/dist/drm/i915/i915 Gets Broadwell booting. [riastradh, ticket #797] +share/man/man4/options.4 1.445 + + The OSI options are long gone. + [798, ticket #snj] + +distrib/notes/Makefile.inc 1.43 +distrib/notes/acorn26/contents 1.2 +distrib/notes/acorn26/legal delete +distrib/notes/acorn32/contents 1.2 +distrib/notes/acorn32/hardware 1.3 +distrib/notes/acorn32/legal delete +distrib/notes/acorn32/prep 1.15 +distrib/notes/acorn32/prep.RISCOS 1.23 +distrib/notes/alpha/contents 1.16 +distrib/notes/alpha/hardware 1.18 +distrib/notes/alpha/legal delete +distrib/notes/amd64/contents 1.4, 1.5 +distrib/notes/amd64/legal delete +distrib/notes/amiga/contents 1.20 +distrib/notes/amiga/legal delete +distrib/notes/arc/contents 1.2 +distrib/notes/arc/legaldelete +distrib/notes/atari/contents 1.20 +distrib/notes/atari/legal delete +distrib/notes/bebox/contents 1.2 +distrib/notes/bebox/hardware 1.2 +distrib/notes/bebox/legal delete +distrib/notes/cats/contents 1.2 +distrib/notes/cats/legal delete +distrib/notes/common/legal.common 1.93-1.96 +distrib/notes/common/list-setsizes.sh delete +distrib/notes/common/macros 1.41, 1.42 +distrib/notes/common/main 1.519-1.521 +distrib/notes/common/netboot 1.36 +distrib/notes/common/postinstall 1.80, 1.81 +distrib/notes/common/sysinst 1.105, 1.106 +distrib/notes/common/upgrade 1.29, 1.30 +distrib/notes/common/xfer 1.74 +distrib/notes/emips/contents 1.2 +distrib/notes/emips/hardware 1.2 +distrib/notes/emips/install 1.2 +distrib/notes/emips/legal delete +distrib/notes/evbarm/contents 1.2 +distrib/notes/evbarm/legal delete +distrib/notes/evbppc/contents 1.3 +distrib/notes/evbppc/legal delete +distrib/notes/ews4800mips/contents 1.2 +distrib/notes/ews4800mips/legal delete +distrib/notes/hp300/contents 1.17 +distrib/notes/hp300/legal delete +distrib/notes/hpcarm/contents 1.3 +distrib/notes/hpcarm/legal delete +distrib/notes/hpcmips/contents 1.10 +distrib/notes/hpcmips/legal delete +distrib/notes/hpcsh/contents 1.3 +distrib/notes/hpcsh/legal delete +distrib/notes/hppa/contents 1.2 +distrib/notes/hppa/legal delete +distrib/notes/i386/contents 1.29 +distrib/notes/i386/legal delete +distrib/notes/landisk/contents 1.3 +distrib/notes/landisk/legal delete +distrib/notes/mac68k/contents 1.20 +distrib/notes/mac68k/hardware 1.25 +distrib/notes/mac68k/legal delete +distrib/notes/mac68k/prep 1.17 +distrib/notes/macppc/contents 1.11 +distrib/notes/macppc/hardware 1.48 +distrib/notes/macppc/legal delete +distrib/notes/macppc/prep.OPENFIRMWARE 1.18 +distrib/notes/mmeye/contents 1.3 +distrib/notes/mmeye/legal delete +distrib/notes/mvme68k/contents 1.13 +distrib/notes/mvme68k/legal delete +distrib/notes/mvme68k/xfer 1.18 +distrib/notes/news68k/contents 1.6 +distrib/notes/news68k/legal delete +distrib/notes/newsmips/contents 1.2 +distrib/notes/newsmips/legal delete +distrib/notes/next68k/contents 1.7 +distrib/notes/next68k/legal delete +distrib/notes/ofppc/contents 1.3 +distrib/notes/ofppc/legal delete +distrib/notes/pmax/contents 1.17 +distrib/notes/pmax/hardware 1.18 +distrib/notes/pmax/legal delete +distrib/notes/prep/contents 1.2 +distrib/notes/prep/hardware 1.5 +distrib/notes/prep/legal delete +distrib/notes/prep/upgrade 1.2 +distrib/notes/rs6000/contents 1.2 +distrib/notes/rs6000/legal delete +distrib/notes/sandpoint/contents 1.2 +distrib/notes/sandpoint/legal delete +distrib/notes/sgimips/contents 1.2 +distrib/notes/sgimips/legal delete +distrib/notes/shark/contents 1.2 +distrib/notes/shark/legal delete +distrib/notes/sparc/contents 1.21 +distrib/notes/sparc/hardware 1.37 +distrib/notes/sparc/legal delete +distrib/notes/sparc/prep 1.27 +distrib/notes/sparc64/Makefile 1.4 +distrib/notes/sparc64/contents 1.5 +distrib/notes/sparc64/hardware 1.28 +distrib/notes/sparc64/legal delete +distrib/notes/sun2/contents 1.2 +distrib/notes/sun2/legal delete +distrib/notes/sun3/contents 1.16 +distrib/notes/sun3/legal dele
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Sun May 24 14:55:12 UTC 2015
Modified Files:
src/sys/dev/pci: auich.c
Log Message:
use aprint consistently; note that we use aprint_normal_dev in debugging
statements instead of aprint_debug_dev because those are controlled by
the driver debugging, not the centralized one.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/pci/auich.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/auich.c
diff -u src/sys/dev/pci/auich.c:1.145 src/sys/dev/pci/auich.c:1.146
--- src/sys/dev/pci/auich.c:1.145 Mon Apr 13 12:33:25 2015
+++ src/sys/dev/pci/auich.c Sun May 24 10:55:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.145 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: auich.c,v 1.146 2015/05/24 14:55:12 christos Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.145 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.146 2015/05/24 14:55:12 christos Exp $");
#include
#include
@@ -237,7 +237,7 @@ struct auich_softc {
/* Debug */
#ifdef AUICH_DEBUG
-#define DPRINTF(l,x) do { if (auich_debug & (l)) printf x; } while(0)
+#define DPRINTF(l,x) do { if (auich_debug & (l)) aprint_normal_dev x; } while(0)
int auich_debug = 0xfffe;
#define ICH_DEBUG_CODECIO 0x0001
#define ICH_DEBUG_DMA 0x0002
@@ -584,8 +584,8 @@ map_done:
sc->pcmo.qptr = sc->pcmi.qptr = sc->mici.qptr = 0;
auich_alloc_cdata(sc);
- DPRINTF(ICH_DEBUG_DMA, ("auich_attach: lists %p %p %p\n",
- sc->pcmo.dmalist, sc->pcmi.dmalist, sc->mici.dmalist));
+ DPRINTF(ICH_DEBUG_DMA, (sc->sc_dev, "%s: lists %p %p %p\n",
+ __func__, sc->pcmo.dmalist, sc->pcmi.dmalist, sc->mici.dmalist));
/* Modem codecs are always the secondary codec on ICH */
sc->sc_codecnum = sc->sc_codectype == AC97_CODEC_TYPE_MODEM ? 1 : 0;
@@ -683,8 +683,7 @@ map_done:
return;
sysctl_err:
- printf("%s: failed to add sysctl nodes. (%d)\n",
- device_xname(self), err);
+ aprint_error_dev(self, "failed to add sysctl nodes. (%d)\n", err);
return; /* failure of sysctl is not fatal. */
}
@@ -793,7 +792,7 @@ auich_read_codec(void *v, uint8_t reg, u
*val = bus_space_read_2(sc->iot, sc->mix_ioh,
reg + (sc->sc_codecnum * ICH_CODEC_OFFSET));
DPRINTF(ICH_DEBUG_CODECIO,
- ("auich_read_codec(%x, %x)\n", reg, *val));
+ (sc->sc_dev, "%s(%x, %x)\n", __func__, reg, *val));
status = bus_space_read_4(sc->iot, sc->aud_ioh,
ICH_GSTS + sc->sc_modem_offset);
if (status & ICH_RCS) {
@@ -802,7 +801,7 @@ auich_read_codec(void *v, uint8_t reg, u
status & ~(ICH_SRI|ICH_PRI|ICH_GSCI));
*val = 0x;
DPRINTF(ICH_DEBUG_CODECIO,
- ("%s: read_codec error\n", device_xname(sc->sc_dev)));
+ (sc->sc_dev, "%s: read_codec error\n", __func__));
if (reg == AC97_REG_GPIO_STATUS)
auich_clear_cas(sc);
return -1;
@@ -824,8 +823,9 @@ auich_write_codec(void *v, uint8_t reg,
struct auich_softc *sc;
int i;
- DPRINTF(ICH_DEBUG_CODECIO, ("auich_write_codec(%x, %x)\n", reg, val));
sc = v;
+ DPRINTF(ICH_DEBUG_CODECIO, (sc->sc_dev, "%s(%x, %x)\n",
+ __func__, reg, val));
/* wait for an access semaphore */
for (i = ICH_SEMATIMO / ICH_CODECIO_INTERVAL; i-- &&
bus_space_read_1(sc->iot, sc->aud_ioh,
@@ -886,11 +886,9 @@ auich_reset_codec(void *v)
}
#ifdef AUICH_DEBUG
if (status & ICH_SCR)
- printf("%s: The 2nd codec is ready.\n",
- device_xname(sc->sc_dev));
+ aprint_normal_dev(sc->sc_dev, "The 2nd codec is ready.\n");
if (status & ICH_S2CR)
- printf("%s: The 3rd codec is ready.\n",
- device_xname(sc->sc_dev));
+ aprint_normal_dev(sc->sc_dev, "The 3rd codec is ready.\n");
#endif
return 0;
}
@@ -1069,7 +1067,8 @@ auich_halt_pipe(struct auich_softc *sc,
#if AUICH_DEBUG
if (i > 0)
- printf("auich_halt_pipe: halt took %d cycles\n", i);
+ aprint_normal_dev(sc->sc_dev, "%s: halt took %d cycles\n",
+ __func__, i);
#endif
}
@@ -1079,7 +1078,7 @@ auich_halt_output(void *v)
struct auich_softc *sc;
sc = v;
- DPRINTF(ICH_DEBUG_DMA, ("%s: halt_output\n", device_xname(sc->sc_dev)));
+ DPRINTF(ICH_DEBUG_DMA, (sc->sc_dev, "%s\n", __func__));
auich_halt_pipe(sc, ICH_PCMO);
sc->pcmo.intr = NULL;
@@ -1093,7 +1092,7 @@ auich_halt_input(void *v)
struct auich_softc *sc;
sc = v;
- DPRINTF(ICH_DEBUG_DMA, ("%s: halt_input\n", device_xname(sc->sc_dev)));
+ DPRINTF(ICH_DEBUG_DMA, (sc->sc_dev, "%s\n", __func__));
auich_halt_pipe(sc, ICH_PCMI);
sc->pcmi.intr = NULL;
@@ -1248,13 +1247,15 @@ auich_intr(void *v)
#ifdef DIAGNOSTIC
csts = pci_conf_read(sc->sc_pc, sc->sc_pt, PCI_COMMAND_STATUS_REG);
if (csts & PCI_STATUS_MASTER_ABORT) {
- printf("auich_intr: PCI master abort\n");
+ aprint_error_dev(sc->sc_dev, "%s: PCI master a
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Sun May 24 14:56:57 UTC 2015
Modified Files:
src/sys/dev/pci: auich.c
Log Message:
PR/49927: Robert Millan: Avoid zerodivide on emulated hardware.
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/pci/auich.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/auich.c
diff -u src/sys/dev/pci/auich.c:1.146 src/sys/dev/pci/auich.c:1.147
--- src/sys/dev/pci/auich.c:1.146 Sun May 24 10:55:12 2015
+++ src/sys/dev/pci/auich.c Sun May 24 10:56:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.146 2015/05/24 14:55:12 christos Exp $ */
+/* $NetBSD: auich.c,v 1.147 2015/05/24 14:56:57 christos Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.146 2015/05/24 14:55:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.147 2015/05/24 14:56:57 christos Exp $");
#include
#include
@@ -1709,6 +1709,13 @@ auich_calibrate(struct auich_softc *sc)
return;
}
+ if (wait_us == 0) {
+ /* Can happen with emulated hardware */
+ aprint_error_dev(sc->sc_dev, "abnormal zero delay during "
+ "calibration\n");
+ return;
+ }
+
rnd_add_data(NULL, &wait_us, sizeof(wait_us), 1);
actual_48k_rate = (bytes * UINT64_C(25)) / wait_us;
CVS commit: src/sys
Module Name:src
Committed By: rtr
Date: Sun May 24 15:43:45 UTC 2015
Modified Files:
src/sys/netinet: in_pcb.c in_pcb.h tcp_input.c
src/sys/netinet6: in6_pcb.c in6_pcb.h
Log Message:
remove transitional functions in{,6}_pcbconnect_m() that were used in
converting protocol user requests to accept sockaddr instead of mbufs.
remove tcp_input copy in to mbuf from sockaddr and just copy to sockaddr
to make it possible for the transitional functions to go away.
no version bump since these functions only existed for a short time and
were commented as adapters (they appeared in 7.99.15).
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.58 -r1.59 src/sys/netinet/in_pcb.h
cvs rdiff -u -r1.340 -r1.341 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.141 -r1.142 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.45 -r1.46 src/sys/netinet6/in6_pcb.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/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.160 src/sys/netinet/in_pcb.c:1.161
--- src/sys/netinet/in_pcb.c:1.160 Sat May 2 17:18:03 2015
+++ src/sys/netinet/in_pcb.c Sun May 24 15:43:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.160 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: in_pcb.c,v 1.161 2015/05/24 15:43:45 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.160 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.161 2015/05/24 15:43:45 rtr Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -443,21 +443,6 @@ in_pcbbind(void *v, struct sockaddr_in *
}
/*
- * adapter function that accepts nam as mbuf for in_pcbconnect()
- */
-int
-in_pcbconnect_m(void *v, struct mbuf *nam, struct lwp *l)
-{
- struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
-
- if (sizeof (*sin) != nam->m_len) {
- return EINVAL;
- }
-
- return in_pcbconnect(v, sin, l);
-}
-
-/*
* Connect from a socket to a specified address.
* Both address and port must be specified in argument sin.
* If don't have a local address for this socket yet,
Index: src/sys/netinet/in_pcb.h
diff -u src/sys/netinet/in_pcb.h:1.58 src/sys/netinet/in_pcb.h:1.59
--- src/sys/netinet/in_pcb.h:1.58 Sat May 2 17:18:03 2015
+++ src/sys/netinet/in_pcb.h Sun May 24 15:43:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.h,v 1.58 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: in_pcb.h,v 1.59 2015/05/24 15:43:45 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -133,7 +133,6 @@ void in_losing(struct inpcb *);
int in_pcballoc(struct socket *, void *);
int in_pcbbind(void *, struct sockaddr_in *, struct lwp *);
int in_pcbconnect(void *, struct sockaddr_in *, struct lwp *);
-int in_pcbconnect_m(void *, struct mbuf *, struct lwp *);
void in_pcbdetach(void *);
void in_pcbdisconnect(void *);
void in_pcbinit(struct inpcbtable *, int, int);
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.340 src/sys/netinet/tcp_input.c:1.341
--- src/sys/netinet/tcp_input.c:1.340 Fri May 15 18:03:45 2015
+++ src/sys/netinet/tcp_input.c Sun May 24 15:43:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.340 2015/05/15 18:03:45 kefren Exp $ */
+/* $NetBSD: tcp_input.c,v 1.341 2015/05/24 15:43:45 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.340 2015/05/15 18:03:45 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.341 2015/05/24 15:43:45 rtr Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -3918,7 +3918,6 @@ syn_cache_get(struct sockaddr *src, stru
struct in6pcb *in6p = NULL;
#endif
struct tcpcb *tp = 0;
- struct mbuf *am;
int s;
struct socket *oso;
@@ -4069,45 +4068,36 @@ syn_cache_get(struct sockaddr *src, stru
}
#endif
- am = m_get(M_DONTWAIT, MT_SONAME); /* XXX */
- if (am == NULL)
- goto resetandabort;
- MCLAIM(am, &tcp_mowner);
- am->m_len = src->sa_len;
- bcopy(src, mtod(am, void *), src->sa_len);
if (inp) {
- if (in_pcbconnect_m(inp, am, &lwp0)) {
- (void) m_free(am);
+ struct sockaddr_in sin;
+ memcpy(&sin, src, src->sa_len);
+ if (in_pcbconnect(inp, &sin, &lwp0)) {
goto resetandabort;
}
}
#ifdef INET6
else if (in6p) {
+ struct sockaddr_in6 sin6;
+ memcpy(&sin6, src, src->sa_len);
if (src->sa_family == AF_INET) {
/* IPv4 packet to AF_INET6 socket */
- struct sockaddr_in6 *sin6;
- sin6 = mtod(am, struct sockaddr_in6 *);
- am->m_len = sizeof(*sin6);
- memset(sin6, 0, sizeof(*sin6));
- sin6->sin6_family = AF_INET6;
- sin6->sin6_len = sizeof(*sin6);
- sin6->sin6_port = ((struct sockaddr_in *)src)->sin_port;
- sin6->sin6_addr.s6_addr16[5] = htons(0x);
+ memset(&sin6, 0, sizeof(sin6));
+ sin6.sin6_family = AF_
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: rtr
Date: Sun May 24 17:07:27 UTC 2015
Modified Files:
src/sys/compat/linux/common: linux_socket.c
Log Message:
convert remaining linux_get_sa() users to use linux_get_sa_sb() and
pass the pointer to the sockaddr in msghdr.msg_name, while removing
the MSG_NAMEMBUF flag.
now that the original linux_get_sa() is unused remove it and to make
function names consistent again rename linux_get_sa_sb() to linux_get_sa().
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/compat/linux/common/linux_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.124 src/sys/compat/linux/common/linux_socket.c:1.125
--- src/sys/compat/linux/common/linux_socket.c:1.124 Sat May 2 17:18:03 2015
+++ src/sys/compat/linux/common/linux_socket.c Sun May 24 17:07:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.124 2015/05/02 17:18:03 rtr Exp $ */
+/* $NetBSD: linux_socket.c,v 1.125 2015/05/24 17:07:26 rtr Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.124 2015/05/02 17:18:03 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.125 2015/05/24 17:07:26 rtr Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -119,9 +119,7 @@ int linux_to_bsd_udp_sockopt(int);
int linux_getifname(struct lwp *, register_t *, void *);
int linux_getifconf(struct lwp *, register_t *, void *);
int linux_getifhwaddr(struct lwp *, register_t *, u_int, void *);
-static int linux_get_sa(struct lwp *, int, struct mbuf **,
- const struct osockaddr *, unsigned int);
-static int linux_get_sa_sb(struct lwp *, int, struct sockaddr_big *,
+static int linux_get_sa(struct lwp *, int, struct sockaddr_big *,
const struct osockaddr *, socklen_t);
static int linux_sa_put(struct osockaddr *osa);
static int linux_to_bsd_msg_flags(int);
@@ -401,7 +399,7 @@ linux_sys_sendto(struct lwp *l, const st
} */
struct msghdr msg;
struct iovecaiov;
- struct mbuf *nam;
+ struct sockaddr_big nam;
int bflags;
int error;
@@ -421,8 +419,7 @@ linux_sys_sendto(struct lwp *l, const st
SCARG(uap, tolen));
if (error)
return (error);
- msg.msg_flags |= MSG_NAMEMBUF;
- msg.msg_name = nam;
+ msg.msg_name = &nam;
msg.msg_namelen = SCARG(uap, tolen);
}
@@ -470,7 +467,7 @@ linux_sys_sendmsg(struct lwp *l, const s
struct linux_msghdr lmsg;
int error;
int bflags;
- struct mbuf *nam;
+ struct sockaddr_big nam;
u_int8_t *control;
struct mbuf *ctl_mbuf = NULL;
@@ -495,8 +492,7 @@ linux_sys_sendmsg(struct lwp *l, const s
msg.msg_namelen);
if (error)
return (error);
- msg.msg_flags |= MSG_NAMEMBUF;
- msg.msg_name = nam;
+ msg.msg_name = &nam;
}
/*
@@ -1404,7 +1400,7 @@ linux_sys_connect(struct lwp *l, const s
int error;
struct sockaddr_big sb;
- error = linux_get_sa_sb(l, SCARG(uap, s), &sb, SCARG(uap, name),
+ error = linux_get_sa(l, SCARG(uap, s), &sb, SCARG(uap, name),
SCARG(uap, namelen));
if (error)
return (error);
@@ -1449,7 +1445,7 @@ linux_sys_bind(struct lwp *l, const stru
int error;
struct sockaddr_big sb;
- error = linux_get_sa_sb(l, SCARG(uap, s), &sb, SCARG(uap, name),
+ error = linux_get_sa(l, SCARG(uap, s), &sb, SCARG(uap, name),
SCARG(uap, namelen));
if (error)
return (error);
@@ -1495,8 +1491,12 @@ linux_sys_getpeername(struct lwp *l, con
return (0);
}
+/*
+ * Copy the osockaddr structure pointed to by name to sb, adjust
+ * family and convert to sockaddr.
+ */
static int
-linux_get_sa_sb(struct lwp *l, int s, struct sockaddr_big *sb,
+linux_get_sa(struct lwp *l, int s, struct sockaddr_big *sb,
const struct osockaddr *name, socklen_t namelen)
{
int error, bdom;
@@ -1566,122 +1566,6 @@ linux_get_sa_sb(struct lwp *l, int s, st
return 0;
}
-/*
- * Copy the osockaddr structure pointed to by osa to mbuf, adjust
- * family and convert to sockaddr.
- */
-static int
-linux_get_sa(struct lwp *l, int s, struct mbuf **mp,
-const struct osockaddr *osa, unsigned int salen)
-{
- int error, bdom;
- struct sockaddr *sa;
- struct osockaddr *kosa;
- struct mbuf *m;
-
- if (salen == 1 || salen > UCHAR_MAX) {
- DPRINTF(("bad osa=%p salen=%d\n", osa, salen));
- return EINVAL;
- }
-
- /* We'll need the address in an mbuf later, so copy into one here */
- m = m_get(M_WAIT, MT_SONAME);
- if (salen > MLEN)
- MEXTMALLOC(m, salen, M_WAITOK);
-
- m->m_len = salen;
-
- if (salen == 0) {
- *mp = m;
- return 0;
- }
-
- kosa = mtod(m, void *);
- if ((error = copyin(osa, kosa, salen))) {
- DPRINTF(("error %d copying osa %p len %d\n",
-error, osa, salen));
- goto bad;
- }
-
- ktrkuser("linux/sockaddr", kosa, salen);
-
- bdom = linux_to_bsd_domain(kosa->sa_family);
-
CVS commit: src/sys/dev/ic
Module Name:src Committed By: matt Date: Sun May 24 17:08:50 UTC 2015 Modified Files: src/sys/dev/ic: arn5008.c arn9003.c Log Message: Use bus_dmamap_load instead of bus_dmamap_load_raw To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/arn5008.c src/sys/dev/ic/arn9003.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/arn5008.c diff -u src/sys/dev/ic/arn5008.c:1.6 src/sys/dev/ic/arn5008.c:1.7 --- src/sys/dev/ic/arn5008.c:1.6 Sun Feb 23 15:29:11 2014 +++ src/sys/dev/ic/arn5008.c Sun May 24 17:08:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: arn5008.c,v 1.6 2014/02/23 15:29:11 christos Exp $ */ +/* $NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $ */ /* $OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.6 2014/02/23 15:29:11 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $"); #include #include @@ -518,8 +518,8 @@ ar5008_tx_alloc(struct athn_softc *sc) if (error != 0) goto fail; - error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_map, &sc->sc_seg, 1, size, - BUS_DMA_NOWAIT); + error = bus_dmamap_load(sc->sc_dmat, sc->sc_map, sc->sc_descs, + size, NULL, BUS_DMA_NOWAIT); if (error != 0) goto fail; @@ -606,8 +606,8 @@ ar5008_rx_alloc(struct athn_softc *sc) if (error != 0) goto fail; - error = bus_dmamap_load_raw(sc->sc_dmat, rxq->map, &rxq->seg, 1, - size, BUS_DMA_NOWAIT); + error = bus_dmamap_load(sc->sc_dmat, rxq->map, &rxq->descs, + size, NULL, BUS_DMA_NOWAIT); if (error != 0) goto fail; Index: src/sys/dev/ic/arn9003.c diff -u src/sys/dev/ic/arn9003.c:1.6 src/sys/dev/ic/arn9003.c:1.7 --- src/sys/dev/ic/arn9003.c:1.6 Sun Feb 23 15:29:12 2014 +++ src/sys/dev/ic/arn9003.c Sun May 24 17:08:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: arn9003.c,v 1.6 2014/02/23 15:29:12 christos Exp $ */ +/* $NetBSD: arn9003.c,v 1.7 2015/05/24 17:08:50 matt Exp $ */ /* $OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.6 2014/02/23 15:29:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.7 2015/05/24 17:08:50 matt Exp $"); #include #include @@ -655,8 +655,8 @@ ar9003_tx_alloc(struct athn_softc *sc) if (error != 0) goto fail; - error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_txsmap, &sc->sc_txsseg, - 1, size, BUS_DMA_NOWAIT | BUS_DMA_READ); + error = bus_dmamap_load(sc->sc_dmat, sc->sc_txsmap, sc->sc_txsring, + size, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ); if (error != 0) goto fail; @@ -681,8 +681,8 @@ ar9003_tx_alloc(struct athn_softc *sc) if (error != 0) goto fail; - error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_map, &sc->sc_seg, 1, size, - BUS_DMA_NOWAIT | BUS_DMA_WRITE); + error = bus_dmamap_load(sc->sc_dmat, sc->sc_map, sc->sc_descs, size, + NULL, BUS_DMA_NOWAIT | BUS_DMA_WRITE); if (error != 0) goto fail;
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: christos
Date: Sun May 24 17:08:21 UTC 2015
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
fix mkubootimage
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/utils/embedded/mkimage
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/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.58 src/distrib/utils/embedded/mkimage:1.59
--- src/distrib/utils/embedded/mkimage:1.58 Sun Apr 19 13:56:57 2015
+++ src/distrib/utils/embedded/mkimage Sun May 24 13:08:21 2015
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.58 2015/04/19 17:56:57 hubertf Exp $
+# $NetBSD: mkimage,v 1.59 2015/05/24 17:08:21 christos Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -56,6 +56,7 @@ FDISK=${TOOL_FDISK:-fdisk}
MAKEFS=${TOOL_MAKEFS:-makefs}
MTREE=${TOOL_MTREE:-mtree}
INSTALLBOOT=${TOOL_INSTALLBOOT:-installboot}
+MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkubootimage}
GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
src="/usr/src"
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Sun May 24 17:11:18 UTC 2015
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
double quote police
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/utils/embedded/conf/armv7.conf
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/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.3 src/distrib/utils/embedded/conf/armv7.conf:1.4
--- src/distrib/utils/embedded/conf/armv7.conf:1.3 Thu May 21 21:18:22 2015
+++ src/distrib/utils/embedded/conf/armv7.conf Sun May 24 13:11:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.3 2015/05/22 01:18:22 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.4 2015/05/24 17:11:18 christos Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -22,7 +22,7 @@ make_fstab() {
customize() {
customize_evbarm
- cat >> ${mnt}/etc/rc.conf << EOF
+ cat >> "${mnt}/etc/rc.conf" << EOF
mdnsd=YES
wscons=YES
devpubd=YES
@@ -36,20 +36,20 @@ populate_beagle() {
bbone_loadaddr=8200
# Create a uEnv.txt to auto boot the correct kernel
- cat >> ${mnt}/boot/uEnv.txt << EOF
+ cat >> "${mnt}/boot/uEnv.txt" << EOF
loaduimage=if test \$board = am335x; then fatload mmc 0 ${bbone_loadaddr} ${bbone_kernelimg}; bootm ${bbone_loadaddr} root=ld0a; else fatload mmc 0 ${bboard_loadaddr} ${bboard_kernelimg}; bootm ${bboard_loadaddr} root=ld0a; fi
EOF
}
populate_awin() {
- cat >> ${mnt}/boot/uEnv.txt << EOF
+ cat >> "${mnt}/boot/uEnv.txt" << EOF
bootargs=root=ld0a console=${console}
uenvcmd=mmc dev 0; mmc rescan; if test \$fdtfile = sun7i-a20-cubieboard2.dtb; then setenv kernel netbsd-CUBIEBOARD2.ub; elif test \$fdtfile = sun7i-a20-cubietruck.dtb; then setenv kernel netbsd-CUBIETRUCK.ub; elif test \$fdtfile = sun6i-a31-hummingbird.dtb; then setenv kernel netbsd-HUMMINGBIRD_A31.ub; elif test \$fdtfile = sun7i-a20-bananapi.dtb; then setenv kernel netbsd-BPI.ub; fi; fatload mmc 0:1 8200 ${kernel}; bootm 8200
EOF
}
populate_rpi() {
- firmwaredir=${src}/external/broadcom/rpi-firmware/dist
+ firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
# RPI2 kernel needs to be installed as kernel7.img
@@ -57,17 +57,17 @@ populate_rpi() {
echo "${bar} renaming netbsd-RPI2.bin to kernel7.img ${bar}"
mv "${mnt}/boot/netbsd-RPI2.bin" "${mnt}/boot/kernel7.img"
- cat > ${mnt}/boot/cmdline.txt << EOF
+ cat > "${mnt}/boot/cmdline.txt" << EOF
root=ld0a console=${console}
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
echo "${bar} installing firmware files ${bar}"
- (cd ${mnt}/boot &&
+ (cd "${mnt}/boot" &&
for f in ${firmwarefiles}; do
echo " $f"
-cp ${firmwaredir}/${f} .
+cp "${firmwaredir}/${f}" .
done
)
@@ -78,7 +78,7 @@ populate_amlogic() {
odroidc1_kernelimg=netbsd-ODROID-C1.ub
# Create a boot.ini for Amlogic U-Boot
- cat >> ${mnt}/boot/boot.ini << EOF
+ cat >> "${mnt}/boot/boot.ini" << EOF
ODROIDC-UBOOT-CONFIG
setenv bootargs "root=ld0f awge0.mac-address=\${ethaddr} console=${console}"
@@ -91,12 +91,12 @@ populate_tegra() {
jetsontk1_kernelimg=netbsd-JETSONTK1.ub
# Create a boot.scr for Jetson TK1 U-Boot
- cat > ${mnt}/boot/boot-JETSONTK1.txt << EOF
+ cat > "${mnt}/boot/boot-JETSONTK1.txt" << EOF
setenv bootargs root=ld1a
fatload mmc 1:1 0x9000 ${jetsontk1_kernelimg}
bootm 0x9000
EOF
- ${MKUBOOTIMAGE} -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" ${mnt}/boot/boot-JETSONTK1.txt ${mnt}/boot/boot-JETSONTK1.scr
+ "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" "${mnt}/boot/boot-JETSONTK1.txt" "${mnt}/boot/boot-JETSONTK1.scr"
}
populate() {
CVS commit: src/sys/dev/ic
Module Name:src Committed By: matt Date: Sun May 24 17:19:29 UTC 2015 Modified Files: src/sys/dev/ic: arn5008.c Log Message: remove errant & To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/arn5008.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/arn5008.c diff -u src/sys/dev/ic/arn5008.c:1.7 src/sys/dev/ic/arn5008.c:1.8 --- src/sys/dev/ic/arn5008.c:1.7 Sun May 24 17:08:50 2015 +++ src/sys/dev/ic/arn5008.c Sun May 24 17:19:29 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $ */ +/* $NetBSD: arn5008.c,v 1.8 2015/05/24 17:19:29 matt Exp $ */ /* $OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.8 2015/05/24 17:19:29 matt Exp $"); #include #include @@ -606,7 +606,7 @@ ar5008_rx_alloc(struct athn_softc *sc) if (error != 0) goto fail; - error = bus_dmamap_load(sc->sc_dmat, rxq->map, &rxq->descs, + error = bus_dmamap_load(sc->sc_dmat, rxq->map, rxq->descs, size, NULL, BUS_DMA_NOWAIT); if (error != 0) goto fail;
CVS commit: src/usr.bin/vis
Module Name:src
Committed By: christos
Date: Sun May 24 19:42:39 UTC 2015
Modified Files:
src/usr.bin/vis: vis.1 vis.c
Log Message:
Add -N (VIS_NOLOCALE), sort.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/vis/vis.1
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/vis/vis.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/vis/vis.1
diff -u src/usr.bin/vis/vis.1:1.22 src/usr.bin/vis/vis.1:1.23
--- src/usr.bin/vis/vis.1:1.22 Thu Sep 25 22:20:39 2014
+++ src/usr.bin/vis/vis.1 Sun May 24 15:42:39 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: vis.1,v 1.22 2014/09/26 02:20:39 wiz Exp $
+.\" $NetBSD: vis.1,v 1.23 2015/05/24 19:42:39 christos Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)vis.1 8.4 (Berkeley) 4/19/94
.\"
-.Dd September 25, 2014
+.Dd May 24, 2015
.Dt VIS 1
.Os
.Sh NAME
@@ -37,7 +37,7 @@
.Nd display non-printable characters in a visual format
.Sh SYNOPSIS
.Nm
-.Op Fl bcfhlMmnoSstw
+.Op Fl bcfhlMmNnoSstw
.Op Fl e Ar extra
.Op Fl F Ar foldwidth
.Op Ar file ...
@@ -99,15 +99,22 @@ Encode using the URI encoding from RFC 1
Mark newlines with the visible sequence
.Ql \e$ ,
followed by the newline.
-.It Fl m
-Encode using the MIME Quoted-Printable encoding from RFC 2045.
-.Pq Dv VIS_MIMESTYLE
.It Fl M
Encode all shell meta characters (implies
.Fl S ,
.Fl w ,
.Fl g )
.Pq Dv VIS_META
+.It Fl m
+Encode using the MIME Quoted-Printable encoding from RFC 2045.
+.Pq Dv VIS_MIMESTYLE
+.It Fl N
+Turn on the
+.Dv VIS_NOLOCALE
+flag which encodes using the
+.Dq C
+locale, removing any encoding dependencies caused by the current
+locale settings specified in the environment.
.It Fl n
Turns off any encoding, except for the fact that backslashes are
still doubled and hidden newline sequences inserted if
@@ -129,14 +136,14 @@ That is, the output can be unfolded by r
Request a format which displays non-printable characters as
an octal number, \eddd.
.Pq Dv VIS_OCTAL
+.It Fl S
+Encode shell meta-characters that are non-white space or glob.
+.Pq Dv VIS_SHELL
.It Fl s
Only characters considered unsafe to send to a terminal are encoded.
This flag allows backspace, bell, and carriage return in addition
to the default space, tab and newline.
.Pq Dv VIS_SAFE
-.It Fl S
-Encode shell meta-characters that are non-white space or glob.
-.Pq Dv VIS_SHELL
.It Fl t
Tabs are also encoded.
.Pq Dv VIS_TAB
Index: src/usr.bin/vis/vis.c
diff -u src/usr.bin/vis/vis.c:1.24 src/usr.bin/vis/vis.c:1.25
--- src/usr.bin/vis/vis.c:1.24 Thu Sep 25 22:20:39 2014
+++ src/usr.bin/vis/vis.c Sun May 24 15:42:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.24 2014/09/26 02:20:39 wiz Exp $ */
+/* $NetBSD: vis.c,v 1.25 2015/05/24 19:42:39 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: vis.c,v 1.24 2014/09/26 02:20:39 wiz Exp $");
+__RCSID("$NetBSD: vis.c,v 1.25 2015/05/24 19:42:39 christos Exp $");
#endif /* not lint */
#include
@@ -70,7 +70,7 @@ main(int argc, char *argv[])
int ch;
int rval;
- while ((ch = getopt(argc, argv, "bcde:F:fhlMmnoSstw")) != -1)
+ while ((ch = getopt(argc, argv, "bcde:F:fhlMmNnoSstw")) != -1)
switch((char)ch) {
case 'b':
eflags |= VIS_NOSLASH;
@@ -102,13 +102,16 @@ main(int argc, char *argv[])
case 'l':
markeol++; /* mark end of line with \$ */
break;
+ case 'M':
+ eflags |= VIS_META;
+ break;
case 'm':
eflags |= VIS_MIMESTYLE;
if (foldwidth == 80)
foldwidth = 76;
break;
- case 'M':
- eflags |= VIS_META;
+ case 'N':
+ eflags |= VIS_NOLOCALE;
break;
case 'n':
none++;
@@ -116,12 +119,12 @@ main(int argc, char *argv[])
case 'o':
eflags |= VIS_OCTAL;
break;
- case 's':
- eflags |= VIS_SAFE;
- break;
case 'S':
eflags |= VIS_SHELL;
break;
+ case 's':
+ eflags |= VIS_SAFE;
+ break;
case 't':
eflags |= VIS_TAB;
break;
@@ -131,7 +134,7 @@ main(int argc, char *argv[])
case '?':
default:
(void)fprintf(stderr,
- "Usage: %s [-bcfhlMmnoSstw] [-e extra]"
+ "Usage: %s [-bcfhlMmNnoSstw] [-e extra]"
" [-F foldwidth] [file ...]\n", getprogname());
return 1;
}
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Sun May 24 22:03:02 UTC 2015
Modified Files:
src/sys/dev/pci: auich.c
Log Message:
PR/49926: Robert Millan: Avoid deadlock condition in auich_read_codec()
and auich_write_codec() when running in userspase.
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/pci/auich.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/auich.c
diff -u src/sys/dev/pci/auich.c:1.147 src/sys/dev/pci/auich.c:1.148
--- src/sys/dev/pci/auich.c:1.147 Sun May 24 10:56:57 2015
+++ src/sys/dev/pci/auich.c Sun May 24 18:03:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.147 2015/05/24 14:56:57 christos Exp $ */
+/* $NetBSD: auich.c,v 1.148 2015/05/24 22:03:02 christos Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.147 2015/05/24 14:56:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.148 2015/05/24 22:03:02 christos Exp $");
#include
#include
@@ -233,6 +233,8 @@ struct auich_softc {
struct audio_format sc_modem_formats[AUICH_MODEM_NFORMATS];
struct audio_encoding_set *sc_encodings;
struct audio_encoding_set *sc_spdif_encodings;
+
+ int sc_cas_been_used;
};
/* Debug */
@@ -788,6 +790,18 @@ auich_read_codec(void *v, uint8_t reg, u
ICH_CAS + sc->sc_modem_offset) & 1;
DELAY(ICH_CODECIO_INTERVAL));
+ /*
+ * Be permissive in first attempt. If previous instances of
+ * this routine were interrupted precisely at this point (after
+ * access is granted by CAS but before a command is sent),
+ * they could have left hardware in an inconsistent state where
+ * a command is expected and therefore semaphore wait would hit
+ * the timeout.
+ */
+ if (!sc->sc_cas_been_used && i <= 0)
+ i = 1;
+ sc->sc_cas_been_used = 1;
+
if (i > 0) {
*val = bus_space_read_2(sc->iot, sc->mix_ioh,
reg + (sc->sc_codecnum * ICH_CODEC_OFFSET));
@@ -832,6 +846,11 @@ auich_write_codec(void *v, uint8_t reg,
ICH_CAS + sc->sc_modem_offset) & 1;
DELAY(ICH_CODECIO_INTERVAL));
+ /* Be permissive in first attempt (see comments in auich_read_codec) */
+ if (!sc->sc_cas_been_used && i <= 0)
+ i = 1;
+ sc->sc_cas_been_used = 1;
+
if (i > 0) {
bus_space_write_2(sc->iot, sc->mix_ioh,
reg + (sc->sc_codecnum * ICH_CODEC_OFFSET), val);
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Sun May 24 22:21:52 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi Log Message: add missing catman pages To generate a diff of this commit: cvs rdiff -u -r1.1958 -r1.1959 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1958 src/distrib/sets/lists/comp/mi:1.1959 --- src/distrib/sets/lists/comp/mi:1.1958 Wed May 13 20:09:54 2015 +++ src/distrib/sets/lists/comp/mi Sun May 24 18:21:51 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1958 2015/05/14 00:09:54 pgoyette Exp $ +# $NetBSD: mi,v 1.1959 2015/05/24 22:21:51 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5726,24 +5726,32 @@ ./usr/share/man/cat3/bzero.0 comp-c-catman .cat ./usr/share/man/cat3/cabs.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cabsf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/cabsl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cacos.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cacosf.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cacosh.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cacoshf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/cacoshl.0 comp-c-catman complex,.cat +./usr/share/man/cat3/cacosl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/calloc.0 comp-c-catman .cat ./usr/share/man/cat3/callrpc.0 comp-c-catman .cat ./usr/share/man/cat3/can_change_color.0 comp-c-catman .cat ./usr/share/man/cat3/can_change_colors.0 comp-obsolete obsolete ./usr/share/man/cat3/carg.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cargf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/cargl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/casin.0 comp-c-catman complex,.cat ./usr/share/man/cat3/casinf.0 comp-c-catman complex,.cat ./usr/share/man/cat3/casinh.0 comp-c-catman complex,.cat ./usr/share/man/cat3/casinhf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/casinhl.0 comp-c-catman complex,.cat +./usr/share/man/cat3/casinl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/catan.0 comp-c-catman complex,.cat ./usr/share/man/cat3/catanf.0 comp-c-catman complex,.cat ./usr/share/man/cat3/catanh.0 comp-c-catman complex,.cat ./usr/share/man/cat3/catanhf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/catanhl.0 comp-c-catman complex,.cat +./usr/share/man/cat3/catanl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/catclose.0 comp-c-catman .cat ./usr/share/man/cat3/catgets.0 comp-c-catman .cat ./usr/share/man/cat3/catopen.0 comp-c-catman .cat @@ -5755,6 +5763,8 @@ ./usr/share/man/cat3/ccosf.0 comp-c-catman complex,.cat ./usr/share/man/cat3/ccosh.0 comp-c-catman complex,.cat ./usr/share/man/cat3/ccoshf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/ccoshl.0 comp-c-catman complex,.cat +./usr/share/man/cat3/ccosl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cdbr.0 comp-c-catman .cat ./usr/share/man/cat3/cdbr_close.0 comp-c-catman .cat ./usr/share/man/cat3/cdbr_entries.0 comp-c-catman .cat @@ -5802,6 +5812,7 @@ ./usr/share/man/cat3/ceill.0 comp-c-catman .cat ./usr/share/man/cat3/cexp.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cexpf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/cexpl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cfgetispeed.0 comp-c-catman .cat ./usr/share/man/cat3/cfgetospeed.0 comp-c-catman .cat ./usr/share/man/cat3/cfmakeraw.0 comp-c-catman .cat @@ -5865,6 +5876,7 @@ ./usr/share/man/cat3/clock.0 comp-c-catman .cat ./usr/share/man/cat3/clog.0 comp-c-catman complex,.cat ./usr/share/man/cat3/clogf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/clogl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/closedir.0 comp-c-catman .cat ./usr/share/man/cat3/closefrom.0 comp-c-catman .cat ./usr/share/man/cat3/closelog.0 comp-c-catman .cat @@ -5892,6 +5904,7 @@ ./usr/share/man/cat3/coshf.0 comp-c-catman .cat ./usr/share/man/cat3/cpow.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cpowf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/cpowl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cproj.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cprojf.0 comp-c-catman complex,.cat ./usr/share/man/cat3/cprojl.0 comp-c-catman complex,.cat @@ -5914,12 +5927,17 @@ ./usr/share/man/cat3/csinf.0 comp-c-catman complex,.cat ./usr/share/man/cat3/csinh.0 comp-c-catman complex,.cat ./usr/share/man/cat3/csinhf.0 comp-c-catman complex,.cat +./usr/share/man/cat3/csinhl.0 comp-c-catman complex,.cat +./usr/share/man/cat3/csinl.0 comp-c-catman complex,.cat ./usr/share/man/cat3/csqrt.0 comp-c-catman complex,.cat ./usr/share/man/cat3/csq
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Sun May 24 22:23:01 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi Log Message: sort To generate a diff of this commit: cvs rdiff -u -r1.1960 -r1.1961 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1960 src/distrib/sets/lists/comp/mi:1.1961 --- src/distrib/sets/lists/comp/mi:1.1960 Sun May 24 18:22:23 2015 +++ src/distrib/sets/lists/comp/mi Sun May 24 18:23:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1960 2015/05/24 22:22:23 christos Exp $ +# $NetBSD: mi,v 1.1961 2015/05/24 22:23:01 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -397,9 +397,9 @@ ./usr/include/dev/eisa/eisavar.h comp-obsolete obsolete ./usr/include/dev/filemon/filemon.h comp-c-include ./usr/include/dev/fssvar.h comp-c-include -./usr/include/dev/hpc/hpcfbio.h comp-c-include ./usr/include/dev/hdaudio/hdaudioio.h comp-c-include ./usr/include/dev/hdaudio/hdaudioreg.h comp-c-include +./usr/include/dev/hpc/hpcfbio.h comp-c-include ./usr/include/dev/i2c/i2c_bus.h comp-obsolete obsolete ./usr/include/dev/i2c/i2c_eeprom.h comp-obsolete obsolete ./usr/include/dev/i2c/i2c_io.h comp-c-include @@ -8788,9 +8788,9 @@ ./usr/share/man/cat3/re_exec.0 comp-c-catman .cat ./usr/share/man/cat3/readdir.0 comp-c-catman .cat ./usr/share/man/cat3/readdir_r.0 comp-c-catman .cat +./usr/share/man/cat3/realloc.0 comp-c-catman .cat ./usr/share/man/cat3/reallocarr.0 comp-c-catman .cat ./usr/share/man/cat3/reallocarray.0 comp-c-catman .cat -./usr/share/man/cat3/realloc.0 comp-c-catman .cat ./usr/share/man/cat3/realpath.0 comp-c-catman .cat ./usr/share/man/cat3/recno.0 comp-c-catman .cat ./usr/share/man/cat3/refresh.0 comp-c-catman .cat @@ -10819,7 +10819,6 @@ ./usr/share/man/cat9/ratecheck.0 comp-sys-catman .cat ./usr/share/man/cat9/readdisklabel.0 comp-sys-catman .cat ./usr/share/man/cat9/realloc.0 comp-sys-catman .cat -./usr/share/man/cat9/realloc.0 comp-sys-catman .cat ./usr/share/man/cat9/relookup.0 comp-sys-catman .cat ./usr/share/man/cat9/remrunqueue.0 comp-obsolete obsolete ./usr/share/man/cat9/resettodr.0 comp-sys-catman .cat @@ -11220,22 +11219,22 @@ ./usr/share/man/cat9/vtruncbuf.0 comp-sys-catman .cat ./usr/share/man/cat9/vwakeup.0 comp-sys-catman .cat ./usr/share/man/cat9/wakeup.0 comp-sys-catman .cat -./usr/share/man/cat9/wdc.0 comp-sys-catman .cat ./usr/share/man/cat9/wapbl.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_start.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_stop.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_add_buf.0 comp-sys-catman .cat ./usr/share/man/cat9/wapbl_begin.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_discard.0 comp-sys-catman .cat ./usr/share/man/cat9/wapbl_end.0 comp-sys-catman .cat ./usr/share/man/cat9/wapbl_flush.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_discard.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_add_buf.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_jlock_assert.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_junlock_assert.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_register_deallocation.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_register_inode.0 comp-sys-catman .cat ./usr/share/man/cat9/wapbl_remove_buf.0 comp-sys-catman .cat ./usr/share/man/cat9/wapbl_resize_buf.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_register_inode.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_start.0 comp-sys-catman .cat +./usr/share/man/cat9/wapbl_stop.0 comp-sys-catman .cat ./usr/share/man/cat9/wapbl_unregister_inode.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_register_deallocation.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_jlock_assert.0 comp-sys-catman .cat -./usr/share/man/cat9/wapbl_junlock_assert.0 comp-sys-catman .cat +./usr/share/man/cat9/wdc.0 comp-sys-catman .cat ./usr/share/man/cat9/workqueue.0 comp-sys-catman .cat ./usr/share/man/cat9/workqueue_create.0 comp-sys-catman .cat ./usr/share/man/cat9/workqueue_destroy.0 comp-sys-catman .cat @@ -15671,9 +15670,9 @@ ./usr/share/man/html3/re_exec.html comp-c-htmlman html ./usr/share/man/html3/readdir.html comp-c-htmlman html ./usr/share/man/html3/readdir_r.html comp-c-htmlman html +./usr/share/man/html3/realloc.html comp-c-htmlman html ./usr/share/man/html3/reallocarr.html comp-c-htmlman html ./usr/share/man/html3/reallocarray.html comp-c-htmlman html -./usr/share/man/html3/realloc.html comp-c-htmlman html ./usr/share/man/html3/realpath.html comp-c-htmlman html ./usr/share/man/html3/recno.html comp-c-htmlman html ./usr/share/man/html3/refresh.html comp-c-htmlman html @@ -17179,7 +17178,6 @@ ./usr/share/man
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sun May 24 22:30:22 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_ahcisata.c
Log Message:
set AHCI_QUIRK_SKIP_RESET quirk
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_ahcisata.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/arm/nvidia/tegra_ahcisata.c
diff -u src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.5 src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.6
--- src/sys/arch/arm/nvidia/tegra_ahcisata.c:1.5 Fri May 15 11:50:30 2015
+++ src/sys/arch/arm/nvidia/tegra_ahcisata.c Sun May 24 22:30:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_ahcisata.c,v 1.5 2015/05/15 11:50:30 jmcneill Exp $ */
+/* $NetBSD: tegra_ahcisata.c,v 1.6 2015/05/24 22:30:22 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.5 2015/05/15 11:50:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.6 2015/05/24 22:30:22 jmcneill Exp $");
#include
#include
@@ -89,7 +89,7 @@ tegra_ahcisata_attach(device_t parent, d
bus_space_subregion(tio->tio_bst, tio->tio_bsh,
loc->loc_offset + TEGRA_AHCISATA_OFFSET,
loc->loc_size - TEGRA_AHCISATA_OFFSET, &sc->sc.sc_ahcih);
- sc->sc.sc_ahci_quirks = AHCI_QUIRK_BADPMP;
+ sc->sc.sc_ahci_quirks = AHCI_QUIRK_SKIP_RESET;
aprint_naive("\n");
aprint_normal(": SATA\n");
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sun May 24 22:30:05 UTC 2015
Modified Files:
src/sys/dev/ic: ahcisata_core.c ahcisatavar.h
Log Message:
Add AHCI_QUIRK_SKIP_RESET quirk to allow for skipping the drive reset
sequence in ahci_do_reset_drive.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/ahcisatavar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.53 src/sys/dev/ic/ahcisata_core.c:1.54
--- src/sys/dev/ic/ahcisata_core.c:1.53 Thu Dec 4 21:50:29 2014
+++ src/sys/dev/ic/ahcisata_core.c Sun May 24 22:30:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.53 2014/12/04 21:50:29 joerg Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.54 2015/05/24 22:30:05 jmcneill Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.53 2014/12/04 21:50:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.54 2015/05/24 22:30:05 jmcneill Exp $");
#include
#include
@@ -708,6 +708,10 @@ again:
if (drive > 0) {
KASSERT(sc->sc_ahci_cap & AHCI_CAP_SPM);
}
+
+ if (sc->sc_ahci_quirks & AHCI_QUIRK_SKIP_RESET)
+ goto skip_reset;
+
/* polled command, assume interrupts are disabled */
/* use slot 0 to send reset, the channel is idle */
cmd_h = &achp->ahcic_cmdh[0];
@@ -759,6 +763,8 @@ again:
default:
break;
}
+
+skip_reset:
/*
* wait 31s for BSY to clear
* This should not be needed, but some controllers clear the
Index: src/sys/dev/ic/ahcisatavar.h
diff -u src/sys/dev/ic/ahcisatavar.h:1.16 src/sys/dev/ic/ahcisatavar.h:1.17
--- src/sys/dev/ic/ahcisatavar.h:1.16 Mon Feb 24 12:19:05 2014
+++ src/sys/dev/ic/ahcisatavar.h Sun May 24 22:30:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisatavar.h,v 1.16 2014/02/24 12:19:05 jmcneill Exp $ */
+/* $NetBSD: ahcisatavar.h,v 1.17 2015/05/24 22:30:05 jmcneill Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -59,6 +59,7 @@ struct ahci_softc {
#define AHCI_PCI_QUIRK_BAD64 __BIT(1) /* broken 64-bit DMA */
#define AHCI_QUIRK_BADPMP __BIT(2) /* broken PMP support, ignore */
#define AHCI_QUIRK_BADPMPRESET __BIT(3) /* broken PMP support for reset */
+#define AHCI_QUIRK_SKIP_RESET __BIT(4) /* skip drive reset sequence */
uint32_t sc_ahci_cap; /* copy of AHCI_CAP */
int sc_ncmds; /* number of command slots */
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: manu
Date: Mon May 25 03:56:20 UTC 2015
Modified Files:
src/usr.bin/netstat: route.c
Log Message:
Make sure netstat builds with -DSMALL
src/usr.bin/netstat relies on code from src/sbin/route. WHen building
with -DSMALL, some functions such as mpls_ntoa() or p_rtrmx() are not
built in src/sbin/route. We therefore have to make sure they are not
used in src/usr.bin/netstat.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/netstat/route.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/netstat/route.c
diff -u src/usr.bin/netstat/route.c:1.83 src/usr.bin/netstat/route.c:1.84
--- src/usr.bin/netstat/route.c:1.83 Thu Nov 6 21:30:09 2014
+++ src/usr.bin/netstat/route.c Mon May 25 03:56:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.83 2014/11/06 21:30:09 christos Exp $ */
+/* $NetBSD: route.c,v 1.84 2015/05/25 03:56:20 manu Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-__RCSID("$NetBSD: route.c,v 1.83 2014/11/06 21:30:09 christos Exp $");
+__RCSID("$NetBSD: route.c,v 1.84 2015/05/25 03:56:20 manu Exp $");
#endif
#endif /* not lint */
@@ -262,6 +262,7 @@ p_krtentry(struct rtentry *rt)
printf("%6s", "-");
putchar((rt->rt_rmx.rmx_locks & RTV_MTU) ? 'L' : ' ');
if (tagflag == 1) {
+#ifndef SMALL
if (rt->rt_tag != NULL) {
const struct sockaddr *tagsa = kgetsa(rt->rt_tag);
char *tagstr;
@@ -276,6 +277,7 @@ p_krtentry(struct rtentry *rt)
else
printf("%7s", "-");
} else
+#endif
printf("%7s", "-");
}
if (rt->rt_ifp) {
@@ -287,8 +289,10 @@ p_krtentry(struct rtentry *rt)
rt->rt_nodes[0].rn_dupedkey ? " =>" : "");
}
putchar('\n');
+#ifndef SMALL
if (vflag)
p_rtrmx(&rt->rt_rmx);
+#endif
}
/*
CVS commit: src/sys/arch/amiga/conf
Module Name:src
Committed By: mlelstv
Date: Mon May 25 05:48:18 UTC 2015
Modified Files:
src/sys/arch/amiga/conf: Makefile.amiga
Log Message:
Don't use conflicting parameters for compiler and assembler.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/amiga/conf/Makefile.amiga
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/amiga/conf/Makefile.amiga
diff -u src/sys/arch/amiga/conf/Makefile.amiga:1.107 src/sys/arch/amiga/conf/Makefile.amiga:1.108
--- src/sys/arch/amiga/conf/Makefile.amiga:1.107 Fri Jan 21 15:59:05 2011
+++ src/sys/arch/amiga/conf/Makefile.amiga Mon May 25 05:48:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.amiga,v 1.107 2011/01/21 15:59:05 joerg Exp $
+# $NetBSD: Makefile.amiga,v 1.108 2015/05/25 05:48:18 mlelstv Exp $
# Makefile for NetBSD
#
@@ -34,7 +34,7 @@ GENASSYM_CONF= ${AMIGA}/amiga/genassym.c
CPPFLAGS+= -Damiga -DFPCOPROC
.if !defined(CMACHFLAGS)
.include "$S/arch/m68k/Makefile.cmachflags"
-CMACHFLAGS+= -Wa,-m68030 -Wa,-m68851
+CMACHFLAGS+= -Wa,-mcpu=68030 -Wa,-m68851
.endif
CFLAGS+= ${CMACHFLAGS} -msoft-float
AFLAGS+= -x assembler-with-cpp
