CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: is
Date: Wed Jul 4 06:09:38 UTC 2012
Modified Files:
src/usr.bin/ftp: extern.h fetch.c ftp.c util.c
Log Message:
As discussed on tech-net@: Don't display expected EHOSTUNREACH for all but
the last connect attempts in terse mode.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/ftp/extern.h
cvs rdiff -u -r1.197 -r1.198 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.163 -r1.164 src/usr.bin/ftp/ftp.c
cvs rdiff -u -r1.156 -r1.157 src/usr.bin/ftp/util.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/ftp/extern.h
diff -u src/usr.bin/ftp/extern.h:1.79 src/usr.bin/ftp/extern.h:1.80
--- src/usr.bin/ftp/extern.h:1.79 Fri Sep 16 15:39:26 2011
+++ src/usr.bin/ftp/extern.h Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.79 2011/09/16 15:39:26 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.80 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -239,7 +239,7 @@ void unsetoption(int, char **);
void updatelocalcwd(void);
void updateremotecwd(void);
void user(int, char **);
-int ftp_connect(int, const struct sockaddr *, socklen_t);
+int ftp_connect(int, const struct sockaddr *, socklen_t, int);
int ftp_listen(int, int);
int ftp_poll(struct pollfd *, int, int);
void *ftp_malloc(size_t);
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.197 src/usr.bin/ftp/fetch.c:1.198
--- src/usr.bin/ftp/fetch.c:1.197 Fri Feb 24 19:53:31 2012
+++ src/usr.bin/ftp/fetch.c Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.197 2012/02/24 19:53:31 apb Exp $ */
+/* $NetBSD: fetch.c,v 1.198 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fetch.c,v 1.197 2012/02/24 19:53:31 apb Exp $);
+__RCSID($NetBSD: fetch.c,v 1.198 2012/07/04 06:09:37 is Exp $);
#endif /* not lint */
/*
@@ -734,7 +734,8 @@ fetch_url(const char *url, const char *p
continue;
}
- if (ftp_connect(s, res-ai_addr, res-ai_addrlen) 0) {
+ if (ftp_connect(s, res-ai_addr, res-ai_addrlen,
+ verbose || !res-ai_next) 0) {
close(s);
s = -1;
continue;
Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.163 src/usr.bin/ftp/ftp.c:1.164
--- src/usr.bin/ftp/ftp.c:1.163 Sat Dec 10 05:53:58 2011
+++ src/usr.bin/ftp/ftp.c Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.163 2011/12/10 05:53:58 lukem Exp $ */
+/* $NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
#if 0
static char sccsid[] = @(#)ftp.c 8.6 (Berkeley) 10/27/94;
#else
-__RCSID($NetBSD: ftp.c,v 1.163 2011/12/10 05:53:58 lukem Exp $);
+__RCSID($NetBSD: ftp.c,v 1.164 2012/07/04 06:09:37 is Exp $);
#endif
#endif /* not lint */
@@ -208,7 +208,8 @@ hookup(const char *host, const char *por
hname, sname);
continue;
}
- if (ftp_connect(s, res-ai_addr, res-ai_addrlen) 0) {
+ if (ftp_connect(s, res-ai_addr, res-ai_addrlen,
+ verbose || !res-ai_next) 0) {
close(s);
s = -1;
continue;
@@ -1468,7 +1469,7 @@ initconn(void)
goto bad;
if (ftp_connect(data, (struct sockaddr *)data_addr.si_su,
- data_addr.su_len) 0) {
+ data_addr.su_len, 1) 0) {
if (activefallback) {
(void)close(data);
data = -1;
Index: src/usr.bin/ftp/util.c
diff -u src/usr.bin/ftp/util.c:1.156 src/usr.bin/ftp/util.c:1.157
--- src/usr.bin/ftp/util.c:1.156 Sat Dec 10 05:53:58 2011
+++ src/usr.bin/ftp/util.c Wed Jul 4 06:09:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.156 2011/12/10 05:53:58 lukem Exp $ */
+/* $NetBSD: util.c,v 1.157 2012/07/04 06:09:37 is Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: util.c,v 1.156 2011/12/10 05:53:58 lukem Exp $);
+__RCSID($NetBSD: util.c,v 1.157 2012/07/04 06:09:37 is Exp $);
#endif /* not lint */
/*
@@ -1351,7 +1351,7 @@ get_line(FILE *stream, char *buf, size_t
* error message displayed.)
*/
int
-ftp_connect(int sock, const struct sockaddr *name, socklen_t namelen)
+ftp_connect(int sock, const struct sockaddr *name, socklen_t namelen, int pe)
{
int flags, rv, timeout, error;
socklen_t slen;
@@ -1417,8 +1417,9 @@ ftp_connect(int sock, const struct socka
rv = connect(sock, name, namelen); /* inititate the connection */
if (rv == -1) {/* connection error */
if (errno != EINPROGRESS) { /* error isn't please wait */
+ if (pe || (errno != EHOSTUNREACH))
connecterror:
- warn(Can't connect to `%s:%s', hname, sname);
+warn(Can't connect to `%s:%s', hname, sname);
return -1;
}
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: jdc
Date: Wed Jul 4 07:03:31 UTC 2012
Modified Files:
src/sys/arch/sparc64/sparc64: ipifuncs.c
Log Message:
Appease gcc -Wuninitialized when cross-compiling on amd64. Problem noticed
by Hisashi Fujinaka on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc64/sparc64/ipifuncs.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/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.45 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.46
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.45 Mon Jul 2 15:40:33 2012
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c Wed Jul 4 07:03:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.45 2012/07/02 15:40:33 jdc Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.46 2012/07/04 07:03:30 jdc Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.45 2012/07/02 15:40:33 jdc Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.46 2012/07/04 07:03:30 jdc Exp $);
#include opt_ddb.h
@@ -361,6 +361,8 @@ mp_resume_cpus(void)
int i = 3;
sparc64_cpuset_t cpuset;
+ CPUSET_CLEAR(cpuset); /* XXX: gcc -Wuninitialized */
+
while (i-- 0) {
CPUSET_CLEAR(cpus_resumed);
CPUSET_ASSIGN(cpuset, cpus_paused);
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: wiz Date: Wed Jul 4 07:53:55 UTC 2012 Modified Files: src/share/man/man4/man4.amiga: empb.4 Log Message: New sentence, new line. Use more markup. Fix typo. Improve wording. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.amiga/empb.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/man4.amiga/empb.4 diff -u src/share/man/man4/man4.amiga/empb.4:1.5 src/share/man/man4/man4.amiga/empb.4:1.6 --- src/share/man/man4/man4.amiga/empb.4:1.5 Tue Jul 3 19:09:44 2012 +++ src/share/man/man4/man4.amiga/empb.4 Wed Jul 4 07:53:55 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: empb.4,v 1.5 2012/07/03 19:09:44 rkujawa Exp $ +.\ $NetBSD: empb.4,v 1.6 2012/07/04 07:53:55 wiz Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -57,17 +57,20 @@ driver supports the following hardware: .Sh DIAGNOSTICS .Bl -diag .It empb: linear space mapping might not work -PCI card driver is trying map memory space with BUS_SPACE_MAP_LINEAR flag. -Due to windowed design of Medaitor, it is expected to fail miserably if -normal memory space access methods (e.g. pointer dereference) are used +The PCI card driver is trying map memory space with the +.Dv BUS_SPACE_MAP_LINEAR +flag. +Due to the windowed design of Mediator, it is expected to fail miserably if +normal memory space access methods (e.g., pointer dereference) are used instead of .Xr bus_space 9 methods. .It empb%d: couldn't find memory space, check your WINDOW jumper -PCI memory space access is disabled on a hardware level. The +PCI memory space access is disabled on a hardware level. +The .Nm -driver will work anyway, but only PCI I/O space will be accessible. To enable -memory space set WINDOW jumper to 4MB or 8MB. +driver will work anyway, but only PCI I/O space will be accessible. +To enable memory space set the WINDOW jumper to 4MB or 8MB. .Sh SEE ALSO .Xr mppb 4 , .Xr p5pb 4 ,
CVS commit: src/etc/etc.vax
Module Name:src Committed By: abs Date: Wed Jul 4 08:03:08 UTC 2012 Modified Files: src/etc/etc.vax: MAKEDEV.conf Log Message: Ensure the ramdisk has bpf for dhcpcd To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/etc/etc.vax/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.vax/MAKEDEV.conf diff -u src/etc/etc.vax/MAKEDEV.conf:1.15 src/etc/etc.vax/MAKEDEV.conf:1.16 --- src/etc/etc.vax/MAKEDEV.conf:1.15 Tue Jul 3 21:49:56 2012 +++ src/etc/etc.vax/MAKEDEV.conf Wed Jul 4 08:03:08 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.15 2012/07/03 21:49:56 abs Exp $ +# $NetBSD: MAKEDEV.conf,v 1.16 2012/07/04 08:03:08 abs Exp $ all_md) makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0 @@ -10,7 +10,7 @@ all_md) ;; ramdisk) - makedev std md0 pty0 mt0 st0 rd0 rd1 dz0 dl0 dhu0 + makedev std bpf md0 pty0 mt0 st0 rd0 rd1 dz0 dl0 dhu0 makedev rx0 ra0 ra1 ra2 ra3 hp0 hp1 makedev sd0 sd1 sd2 makedev cd0 cd1 racd0 racd1
CVS commit: src/sys/common/pmap/tlb
Module Name:src
Committed By: matt
Date: Wed Jul 4 11:39:42 UTC 2012
Modified Files:
src/sys/common/pmap/tlb: pmap.c pmap.h pmap_segtab.c
Log Message:
The lockless list can lead to corruption. Instead use a spinlock to control
access to the head of the free segtab list.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/common/pmap/tlb/pmap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/common/pmap/tlb/pmap.h
cvs rdiff -u -r1.4 -r1.5 src/sys/common/pmap/tlb/pmap_segtab.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/common/pmap/tlb/pmap.c
diff -u src/sys/common/pmap/tlb/pmap.c:1.13 src/sys/common/pmap/tlb/pmap.c:1.14
--- src/sys/common/pmap/tlb/pmap.c:1.13 Thu May 17 16:20:19 2012
+++ src/sys/common/pmap/tlb/pmap.c Wed Jul 4 11:39:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.13 2012/05/17 16:20:19 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.14 2012/07/04 11:39:42 matt Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.13 2012/05/17 16:20:19 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.14 2012/07/04 11:39:42 matt Exp $);
/*
* Manages physical address maps.
@@ -456,6 +456,11 @@ pmap_init(void)
UVMHIST_FUNC(__func__); UVMHIST_CALLED(pmaphist);
/*
+ * Initialize the segtab lock.
+ */
+ mutex_init(pmap_segtab_lock, MUTEX_DEFAULT, IPL_HIGH);
+
+ /*
* Set a low water mark on the pv_entry pool, so that we are
* more likely to have these around even in extreme memory
* starvation.
Index: src/sys/common/pmap/tlb/pmap.h
diff -u src/sys/common/pmap/tlb/pmap.h:1.12 src/sys/common/pmap/tlb/pmap.h:1.13
--- src/sys/common/pmap/tlb/pmap.h:1.12 Thu May 17 16:20:19 2012
+++ src/sys/common/pmap/tlb/pmap.h Wed Jul 4 11:39:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.12 2012/05/17 16:20:19 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.13 2012/07/04 11:39:42 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -109,6 +109,7 @@ void pmap_pte_process(struct pmap *, vad
void pmap_segtab_activate(struct pmap *, struct lwp *);
void pmap_segtab_alloc(struct pmap *);
void pmap_segtab_free(struct pmap *);
+extern kmutex_t pmap_segtab_lock;
#endif /* _KERNEL */
/*
Index: src/sys/common/pmap/tlb/pmap_segtab.c
diff -u src/sys/common/pmap/tlb/pmap_segtab.c:1.4 src/sys/common/pmap/tlb/pmap_segtab.c:1.5
--- src/sys/common/pmap/tlb/pmap_segtab.c:1.4 Thu Jun 23 08:11:56 2011
+++ src/sys/common/pmap/tlb/pmap_segtab.c Wed Jul 4 11:39:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_segtab.c,v 1.4 2011/06/23 08:11:56 matt Exp $ */
+/* $NetBSD: pmap_segtab.c,v 1.5 2012/07/04 11:39:42 matt Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_segtab.c,v 1.4 2011/06/23 08:11:56 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_segtab.c,v 1.5 2012/07/04 11:39:42 matt Exp $);
/*
* Manages physical address maps.
@@ -110,7 +110,7 @@ __KERNEL_RCSID(0, $NetBSD: pmap_segtab.
CTASSERT(NBPG = sizeof(struct pmap_segtab));
struct pmap_segtab_info {
- struct pmap_segtab * volatile free_segtab; /* free list kept locally */
+ struct pmap_segtab *free_segtab; /* free list kept locally */
#ifdef DEBUG
uint32_t nget_segtab;
uint32_t nput_segtab;
@@ -121,6 +121,8 @@ struct pmap_segtab_info {
#endif
} pmap_segtab_info;
+kmutex_t pmap_segtab_lock __cacheline_aligned;
+
static inline struct vm_page *
pmap_pte_pagealloc(void)
{
@@ -162,20 +164,16 @@ pmap_segtab_alloc(pmap_t pmap)
{
struct pmap_segtab *stp;
again:
- stp = NULL;
- while (__predict_true(pmap_segtab_info.free_segtab != NULL)) {
- struct pmap_segtab *next_stp;
- stp = pmap_segtab_info.free_segtab;
- next_stp = (struct pmap_segtab *)stp-seg_tab[0];
- if (stp == atomic_cas_ptr(pmap_segtab_info.free_segtab, stp, next_stp)) {
- SEGTAB_ADD(nget, 1);
- break;
- }
+ mutex_spin_enter(pmap_segtab_lock);
+ if (__predict_true((stp = pmap_segtab_info.free_segtab) != NULL)) {
+ pmap_segtab_info.free_segtab =
+ (struct pmap_segtab *)stp-seg_tab[0];
+ stp-seg_tab[0] = NULL;
+ SEGTAB_ADD(nget, 1);
}
+ mutex_spin_exit(pmap_segtab_lock);
- if (__predict_true(stp != NULL)) {
- stp-seg_tab[0] = NULL;
- } else {
+ if (__predict_false(stp == NULL)) {
struct vm_page * const stp_pg = pmap_pte_pagealloc();
if (__predict_false(stp_pg == NULL)) {
@@ -200,13 +198,11 @@ pmap_segtab_alloc(pmap_t pmap)
/*
* Now link the new segtabs into the free segtab list.
*/
- for (;;) {
-void *tmp = pmap_segtab_info.free_segtab;
-stp[n-1].seg_tab[0] = tmp;
-if (tmp == atomic_cas_ptr(pmap_segtab_info.free_segtab, tmp, stp+1))
- break;
- }
+ mutex_spin_enter(pmap_segtab_lock);
+ stp[n-1].seg_tab[0] = (void *)pmap_segtab_info.free_segtab;
+ pmap_segtab_info.free_segtab = stp + 1;
SEGTAB_ADD(nput, n -
CVS commit: src/sys/arch/arm/pic
Module Name:src Committed By: skrll Date: Wed Jul 4 13:34:24 UTC 2012 Modified Files: src/sys/arch/arm/pic: pic.c Log Message: Add a KASSERT To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/pic/pic.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/pic/pic.c diff -u src/sys/arch/arm/pic/pic.c:1.8 src/sys/arch/arm/pic/pic.c:1.9 --- src/sys/arch/arm/pic/pic.c:1.8 Fri Mar 11 03:16:14 2011 +++ src/sys/arch/arm/pic/pic.c Wed Jul 4 13:34:24 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pic.c,v 1.8 2011/03/11 03:16:14 bsh Exp $ */ +/* $NetBSD: pic.c,v 1.9 2012/07/04 13:34:24 skrll Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.8 2011/03/11 03:16:14 bsh Exp $); +__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.9 2012/07/04 13:34:24 skrll Exp $); #define _INTR_PRIVATE #include sys/param.h @@ -412,6 +412,7 @@ pic_add(struct pic_softc *pic, int irqba printf(%s: pic_sourcebase=%zu pic_maxsources=%zu\n, pic-pic_name, pic_sourcebase, pic-pic_maxsources); #endif + KASSERT(pic-pic_maxsources = PIC_MAXSOURCES); KASSERT(pic_sourcebase + pic-pic_maxsources = PIC_MAXMAXSOURCES); pic-pic_sources = pic_sources[pic_sourcebase];
CVS commit: src/etc
Module Name:src Committed By: reinoud Date: Wed Jul 4 13:54:20 UTC 2012 Modified Files: src/etc/etc.amd64: Makefile.inc src/etc/etc.i386: Makefile.inc Log Message: Disable GENERIC_USERMODE kernel auto-build to avoid problems with the current autobuild-system. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/etc/etc.amd64/Makefile.inc cvs rdiff -u -r1.66 -r1.67 src/etc/etc.i386/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.amd64/Makefile.inc diff -u src/etc/etc.amd64/Makefile.inc:1.13 src/etc/etc.amd64/Makefile.inc:1.14 --- src/etc/etc.amd64/Makefile.inc:1.13 Sat Jun 30 15:03:57 2012 +++ src/etc/etc.amd64/Makefile.inc Wed Jul 4 13:54:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.13 2012/06/30 15:03:57 reinoud Exp $ +# $NetBSD: Makefile.inc,v 1.14 2012/07/04 13:54:20 reinoud Exp $ # # etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets # @@ -8,7 +8,7 @@ KERNEL_SETS= GENERIC KERNEL_SETS+= XEN3_DOM0 XEN3_DOMU -KERNEL_SETS+= GENERIC_USERMODE +# KERNEL_SETS+= GENERIC_USERMODE BUILD_KERNELS= INSTALL INSTALL_XEN3_DOMU Index: src/etc/etc.i386/Makefile.inc diff -u src/etc/etc.i386/Makefile.inc:1.66 src/etc/etc.i386/Makefile.inc:1.67 --- src/etc/etc.i386/Makefile.inc:1.66 Sat Jun 30 15:03:57 2012 +++ src/etc/etc.i386/Makefile.inc Wed Jul 4 13:54:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.66 2012/06/30 15:03:57 reinoud Exp $ +# $NetBSD: Makefile.inc,v 1.67 2012/07/04 13:54:20 reinoud Exp $ # # etc.i386/Makefile.inc -- i386-specific etc Makefile targets # @@ -12,7 +12,7 @@ KERNEL_SETS+= XEN3_DOM0 KERNEL_SETS+= XEN3_DOMU KERNEL_SETS+= XEN3PAE_DOM0 KERNEL_SETS+= XEN3PAE_DOMU -KERNEL_SETS+= GENERIC_USERMODE +# KERNEL_SETS+= GENERIC_USERMODE # KERNEL_SETS+= GENERIC_TINY # KERNEL_SETS+= GENERIC_PS2TINY
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Wed Jul 4 19:43:10 UTC 2012
Modified Files:
src/share/man/man4 [netbsd-6]: hme.4
src/sys/dev/ic [netbsd-6]: hme.c
Log Message:
Pull up following revision(s) (requested by jdc in ticket #368):
sys/dev/ic/hme.c: revision 1.88
share/man/man4/hme.4: revision 1.10
PR kern/46424
Revert the part of revision 1.77 that altered the PHY attachment order.
Note that the PHY instance changes when a MII transceiver is connected.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 src/share/man/man4/hme.4
cvs rdiff -u -r1.87 -r1.87.2.1 src/sys/dev/ic/hme.c
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/hme.4
diff -u src/share/man/man4/hme.4:1.9 src/share/man/man4/hme.4:1.9.10.1
--- src/share/man/man4/hme.4:1.9 Fri Jan 15 19:24:49 2010
+++ src/share/man/man4/hme.4 Wed Jul 4 19:43:10 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: hme.4,v 1.9 2010/01/15 19:24:49 joerg Exp $
+.\ $NetBSD: hme.4,v 1.9.10.1 2012/07/04 19:43:10 riz Exp $
.\
.\ Copyright (c) 2001 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd April 28, 2008
+.Dd June 23, 2012
.Dt HME 4
.Os
.Sh NAME
@@ -108,3 +108,7 @@ The
driver was written by
.An Paul Kranenburg
.Aq p...@netbsd.org .
+.Sh BUGS
+Connecting a MII transceiver on those cards that support it will cause the
+RJ45 connector to be detected as PHY instance 1, instead of the default
+instance 0.
Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.87 src/sys/dev/ic/hme.c:1.87.2.1
--- src/sys/dev/ic/hme.c:1.87 Thu Feb 2 19:43:03 2012
+++ src/sys/dev/ic/hme.c Wed Jul 4 19:43:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.87 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: hme.c,v 1.87.2.1 2012/07/04 19:43:10 riz Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hme.c,v 1.87 2012/02/02 19:43:03 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: hme.c,v 1.87.2.1 2012/07/04 19:43:10 riz Exp $);
/* #define HMEDEBUG */
@@ -254,15 +254,8 @@ hme_config(struct hme_softc *sc)
hme_mifinit(sc);
- /*
- * Some HME's have an MII connector, as well as RJ45. Try attaching
- * the RJ45 (internal) PHY first, so that the MII PHY is always
- * instance 1.
- */
- mii_attach(sc-sc_dev, mii, 0x,
- HME_PHYAD_INTERNAL, MII_OFFSET_ANY, MIIF_FORCEANEG);
mii_attach(sc-sc_dev, mii, 0x,
- HME_PHYAD_EXTERNAL, MII_OFFSET_ANY, MIIF_FORCEANEG);
+ MII_PHY_ANY, MII_OFFSET_ANY, MIIF_FORCEANEG);
child = LIST_FIRST(mii-mii_phys);
if (child == NULL) {
CVS commit: [netbsd-6] src/external/public-domain/xz
Module Name:src Committed By: riz Date: Wed Jul 4 19:45:31 UTC 2012 Modified Files: src/external/public-domain/xz [netbsd-6]: prepare-import.sh src/external/public-domain/xz/include [netbsd-6]: config.h Log Message: Pull up following revision(s) (requested by jdc in ticket #378): external/public-domain/xz/prepare-import.sh: revision 1.3 external/public-domain/xz/include/config.h: revision 1.2 Determine WORDS_BIGENDIAN at build time, rather than hardcoding it to 0. Makes liblzma work on sparc64 (and probably other big endian hosts too). Add a note to the import script. To generate a diff of this commit: cvs rdiff -u -r1.1.8.1 -r1.1.8.2 \ src/external/public-domain/xz/prepare-import.sh cvs rdiff -u -r1.1 -r1.1.8.1 src/external/public-domain/xz/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/prepare-import.sh diff -u src/external/public-domain/xz/prepare-import.sh:1.1.8.1 src/external/public-domain/xz/prepare-import.sh:1.1.8.2 --- src/external/public-domain/xz/prepare-import.sh:1.1.8.1 Wed Mar 7 22:33:25 2012 +++ src/external/public-domain/xz/prepare-import.sh Wed Jul 4 19:45:31 2012 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: prepare-import.sh,v 1.1.8.1 2012/03/07 22:33:25 riz Exp $ +# $NetBSD: prepare-import.sh,v 1.1.8.2 2012/07/04 19:45:31 riz Exp $ set -e @@ -31,3 +31,12 @@ done # build-aux/* from autoconf # lib/* # m4/* + +# Changes to config.h +echo Add build-time endian test to include/config.h: +cat EOE +#include sys/endian.h +#if BYTE_ORDER == BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +#endif +EOE Index: src/external/public-domain/xz/include/config.h diff -u src/external/public-domain/xz/include/config.h:1.1 src/external/public-domain/xz/include/config.h:1.1.8.1 --- src/external/public-domain/xz/include/config.h:1.1 Tue Nov 2 16:34:36 2010 +++ src/external/public-domain/xz/include/config.h Wed Jul 4 19:45:31 2012 @@ -286,14 +286,9 @@ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ +#include sys/endian.h +#if BYTE_ORDER == BIG_ENDIAN # define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -/* # undef WORDS_BIGENDIAN */ -# endif #endif /* Number of bits in a file offset, on hosts where this is settable. */
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed Jul 4 19:45:57 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: tickets 367,368,378 To generate a diff of this commit: cvs rdiff -u -r1.1.2.147 -r1.1.2.148 src/doc/CHANGES-6.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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.147 src/doc/CHANGES-6.0:1.1.2.148 --- src/doc/CHANGES-6.0:1.1.2.147 Tue Jul 3 21:27:54 2012 +++ src/doc/CHANGES-6.0 Wed Jul 4 19:45:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.147 2012/07/03 21:27:54 jdc Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.148 2012/07/04 19:45:56 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6033,3 +6033,21 @@ sys/arch/amd64/conf/XEN3_DOM0 1.85 via Disable azalia(4) now that hdaudio(4) was switched on. [khorben, ticket #383] +sys/dev/sbus/qe.c1.61-1.62 + + Fix ifconfig and multicast handling on qe(4). PR#46572. + [jdc, ticket #367] + +share/man/man4/hme.41.10 +sys/dev/ic/hme.c1.88 + + Fix the PHY attachment order for hme(4). PR#46424. + [jdc, ticket #368] + +external/public-domain/xz/include/config.h 1.2 +external/public-domain/xz/prepare-import.sh 1.3 + + Determine WORDS_BIGENDIAN at build time, rather than hardcoding it to 0. + Makes liblzma work on sparc64 (and probably other big endian hosts too). + [jdc, ticket #378] +
CVS commit: [netbsd-6] src/sys/arch/m68k/fpe
Module Name:src
Committed By: jdc
Date: Wed Jul 4 20:30:00 UTC 2012
Modified Files:
src/sys/arch/m68k/fpe [netbsd-6]: fpu_int.c
Log Message:
Pull up revision 1.11 (requested by isaki in ticket #384).
Rewrite fpu_int().
Especially, remove the special treatment when |x| 1
because it forgets to consider FPCR round mode.
See PR/46627 for the detail. Thanks Y.Sugahara for advice.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/sys/arch/m68k/fpe/fpu_int.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/m68k/fpe/fpu_int.c
diff -u src/sys/arch/m68k/fpe/fpu_int.c:1.10 src/sys/arch/m68k/fpe/fpu_int.c:1.10.8.1
--- src/sys/arch/m68k/fpe/fpu_int.c:1.10 Mon Jul 18 14:11:27 2011
+++ src/sys/arch/m68k/fpe/fpu_int.c Wed Jul 4 20:30:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_int.c,v 1.10 2011/07/18 14:11:27 isaki Exp $ */
+/* $NetBSD: fpu_int.c,v 1.10.8.1 2012/07/04 20:30:00 jdc Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fpu_int.c,v 1.10 2011/07/18 14:11:27 isaki Exp $);
+__KERNEL_RCSID(0, $NetBSD: fpu_int.c,v 1.10.8.1 2012/07/04 20:30:00 jdc Exp $);
#include sys/types.h
@@ -78,50 +78,28 @@ struct fpn *
fpu_int(struct fpemu *fe)
{
register struct fpn *x = fe-fe_f2;
- register int rsh, lsh, wsh, i;
+ register int rsh;
/* special cases first */
if (x-fp_class != FPC_NUM) {
return x;
}
- /*
- * even if we have exponent == -1, we still have possiblity
- * that the result = 1.0 when mantissa ~= 1.0 and rounded up
- */
- if (x-fp_exp -1) {
- x-fp_class = FPC_ZERO;
- x-fp_mant[0] = x-fp_mant[1] = x-fp_mant[2] = 0;
- return x;
- }
- /* real work */
rsh = FP_NMANT - 1 - x-fp_exp;
- if (rsh - FP_NG = 0) {
+ if (rsh = FP_NG) {
return x;
}
- fpu_shr(x, rsh - FP_NG); /* shift to the right */
+ /* shift to the right */
+ x-fp_exp = 0;
+ fpu_shr(x, rsh - FP_NG);
- if (fpu_round(fe, x) == 1 /* rounded up */
- x-fp_mant[2 - (FP_NMANT-rsh)/32] (1 ((FP_NMANT-rsh)%32))
- /* x = 2.0 */) {
- rsh--; /* reduce shift count by 1 */
- x-fp_exp++; /* adjust exponent */
- }
+ /* round according to FPCR round mode */
+ fpu_round(fe, x);
/* shift it back to the left */
- wsh = rsh / 32;
- lsh = rsh % 32;
- rsh = 32 - lsh;
- for (i = 0; i + wsh 2; i++) {
- x-fp_mant[i] = (x-fp_mant[i+wsh] lsh) |
- (x-fp_mant[i+wsh+1] rsh);
- }
- x-fp_mant[i] = (x-fp_mant[i+wsh] lsh);
- i++;
- for (; i 3; i++) {
- x-fp_mant[i] = 0;
- }
+ x-fp_exp = FP_NMANT - 1;
+ fpu_norm(x);
return x;
}
CVS commit: [netbsd-6] src
Module Name:src
Committed By: jdc
Date: Wed Jul 4 20:41:47 UTC 2012
Modified Files:
src/distrib/vax/ramdisk [netbsd-6]: Makefile
src/etc/etc.vax [netbsd-6]: MAKEDEV.conf
src/sys/arch/vax/conf [netbsd-6]: GENERIC INSTALL VAX780 majors.vax
src/sys/arch/vax/vax [netbsd-6]: disksubr.c
src/sys/dev [netbsd-6]: DEVNAMES
src/sys/dev/mscp [netbsd-6]: files.mscp mscp_disk.c mscp_subr.c
Log Message:
Pull up revisions:
src/etc/etc.vax/MAKEDEV.conf revision 1.14
src/sys/arch/vax/conf/GENERIC revision 1.182
src/sys/arch/vax/conf/INSTALL revision 1.60
src/sys/arch/vax/conf/VAX780 revision 1.9
src/sys/arch/vax/conf/majors.vax revision 1.24
src/sys/arch/vax/vax/disksubr.c revision 1.53
src/sys/dev/DEVNAMES revision 1.275
src/sys/dev/mscp/files.mscp revision 1.8
src/sys/dev/mscp/mscp_disk.c revision 1.72
src/sys/dev/mscp/mscp_subr.c revision 1.42
src/distrib/vax/ramdisk/Makefile revision 1.29
(requested by abs in ticket #385).
- Add racd* devices for MSCP based CD-ROM drives (RRD40s), as opposed
to mixing them in with the ra* disks, modelled loosely on how MSCP
rx* floppies are handled
- racd* defaults to the same single iso9660 partition as cd*
- Cleanup config option handling slightly so any combination of ra*,
rx* (and now raccd*) can be defined without build errors.
- Avoid ugly printf when disks have all zero disklabel magic number
Include racd0 and racd1 on ramdisk
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.8.1 src/distrib/vax/ramdisk/Makefile
cvs rdiff -u -r1.13 -r1.13.4.1 src/etc/etc.vax/MAKEDEV.conf
cvs rdiff -u -r1.179.2.1 -r1.179.2.2 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/arch/vax/conf/INSTALL
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.23 -r1.23.8.1 src/sys/arch/vax/conf/majors.vax
cvs rdiff -u -r1.52 -r1.52.14.1 src/sys/arch/vax/vax/disksubr.c
cvs rdiff -u -r1.271 -r1.271.2.1 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.7 -r1.7.182.1 src/sys/dev/mscp/files.mscp
cvs rdiff -u -r1.71 -r1.71.18.1 src/sys/dev/mscp/mscp_disk.c
cvs rdiff -u -r1.41 -r1.41.18.1 src/sys/dev/mscp/mscp_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/distrib/vax/ramdisk/Makefile
diff -u src/distrib/vax/ramdisk/Makefile:1.26 src/distrib/vax/ramdisk/Makefile:1.26.8.1
--- src/distrib/vax/ramdisk/Makefile:1.26 Thu Feb 11 09:06:51 2010
+++ src/distrib/vax/ramdisk/Makefile Wed Jul 4 20:41:47 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/02/11 09:06:51 roy Exp $
+# $NetBSD: Makefile,v 1.26.8.1 2012/07/04 20:41:47 jdc Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -15,7 +15,7 @@ LISTS= ${.CURDIR}/list ${DISTRIBDIR}/c
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
MAKEDEVTARGETS= std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \
- sd0 sd1 sd2 md0 pty0 cd0 cd1
+ sd0 sd1 sd2 md0 pty0 cd0 cd1 racd0 racd1
IMAGEDEPENDS= ${CRUNCHBIN} \
dot.profile \
${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \
Index: src/etc/etc.vax/MAKEDEV.conf
diff -u src/etc/etc.vax/MAKEDEV.conf:1.13 src/etc/etc.vax/MAKEDEV.conf:1.13.4.1
--- src/etc/etc.vax/MAKEDEV.conf:1.13 Wed Oct 12 17:03:49 2011
+++ src/etc/etc.vax/MAKEDEV.conf Wed Jul 4 20:41:45 2012
@@ -1,9 +1,9 @@
-# $NetBSD: MAKEDEV.conf,v 1.13 2011/10/12 17:03:49 njoly Exp $
+# $NetBSD: MAKEDEV.conf,v 1.13.4.1 2012/07/04 20:41:45 jdc Exp $
all_md)
makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
makedev ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3 sd0 sd1 sd2 sd3 rd0 rd1 rd2
- makedev dz0 dl0 dhu0 rx0 rx1
+ makedev dz0 dl0 dhu0 racd0 racd1 rx0 rx1
makedev scsibus0 scsibus1 scsibus2 scsibus3
makedev ses0 ses1 ses2 ses3
makedev std_vax
@@ -60,11 +60,12 @@ ht[0-9]*|tm[0-9]*|mt[0-9]*|ts[0-9]*|ut[0
esac
;;
-hp[0-9]*|hk[0-9]*|up[0-9]*|ra[0-9]*|rl[0-9]*|rb[0-9]*|rd[0-9]*|rx[0-9]*)
+hp[0-9]*|hk[0-9]*|up[0-9]*|ra[0-9]*|racd[0-9]*|rl[0-9]*|rb[0-9]*|rd[0-9]*|rx[0-9]*)
case $i in
hp*) name=hp; unit=${i#hp}; blk=0; chr=4;;
hk*) name=hk; unit=${i#hk}; blk=3; chr=11;;
up*) name=up; unit=${i#up}; blk=2; chr=13;;
+ racd*) name=racd; unit=${i#racd}; blk=28; chr=28;; # before ra*
ra*) name=ra; unit=${i#ra}; blk=9; chr=9;;
rb*) name=rb; unit=${i#rb}; blk=11; chr=23;;
rx*) name=rx; unit=${i#rx}; blk=12; chr=30;;
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.179.2.1 src/sys/arch/vax/conf/GENERIC:1.179.2.2
--- src/sys/arch/vax/conf/GENERIC:1.179.2.1 Tue Jun 12 17:47:58 2012
+++ src/sys/arch/vax/conf/GENERIC Wed Jul 4 20:41:45 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.179.2.1 2012/06/12 17:47:58 riz Exp $
+# $NetBSD: GENERIC,v 1.179.2.2 2012/07/04 20:41:45 jdc Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include arch/vax/conf/std.vax
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/com_err
Module Name:src Committed By: jdf Date: Wed Jul 4 20:46:14 UTC 2012 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/com_err: com_err.3 Log Message: Change little wording error (s/associate/associated/) and formatting error. Patch proposal was sent upstream to Heimdal as well. Patch by jklowden in PR lib/46651. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.1.1.2 Thu Apr 14 14:08:23 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 Wed Jul 4 20:46:14 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: com_err.3,v 1.1.1.2 2011/04/14 14:08:23 elric Exp $ +.\ $NetBSD: com_err.3,v 1.2 2012/07/04 20:46:14 jdf Exp $ .\ .\ Copyright (c) 2005 Kungliga Tekniska Högskolan .\ (Royal Institute of Technology, Stockholm, Sweden). @@ -136,10 +136,11 @@ This routine provides an interface, equi which may be used by higher-level variadic functions (functions which accept variable numbers of arguments). .It Fn error_message code -Returns the character string error message associate with +Returns the character string error message associated with .Fa code . If -.Fa code is associated with an unknown error table, or if +.Fa code +is associated with an unknown error table, or if .Fa code is associated with a known error table but is not in the table, a string of the form `Unknown code NN' is returned, where is
CVS commit: [netbsd-6] src/distrib/utils/sysinst
Module Name:src
Committed By: jdc
Date: Wed Jul 4 20:48:56 UTC 2012
Modified Files:
src/distrib/utils/sysinst [netbsd-6]: defs.h disks.c main.c
src/distrib/utils/sysinst/arch/emips [netbsd-6]: md.h
src/distrib/utils/sysinst/arch/i386 [netbsd-6]: md.h
src/distrib/utils/sysinst/arch/vax [netbsd-6]: md.h
Log Message:
Pull up revisions:
src/distrib/utils/sysinst/defs.h revision 1.163
src/distrib/utils/sysinst/disks.c revisions 1.125,1.126
src/distrib/utils/sysinst/main.c revisions 1.65,1.66
src/distrib/utils/sysinst/arch/emips/md.h revision 1.4
src/distrib/utils/sysinst/arch/i386/md.h revision 1.69
src/distrib/utils/sysinst/arch/vax/md.h revision 1.21
(requested by abs in ticket #386).
- Replace the CD_NAME definition with a CD_NAMES comma separate list,
the default remains cd0a, but i386 sets cd0a, mcd0a while vax
takes cd0a, racd0a
- Add get_default_cdrom() to disks.c, which is called in init(). This
checks the contents of hw.disknames against CD_NAMES. The first one
found (minus partition letter) is picked, otherwise the first entry
in CD_NAMES is used
The primary beneficiary is vax systems with an MSCP but no SCSI CD
drive, which now default to (a valid) racd0a rather than an invalid
cd0a. The obvious example being simh-vax
Trying to print a function pointer as a string is likely to cause tears.
While here, don't match on the unit either
Do not assign to a const pointer, but set the value of the target variable
instead. Makes sysinst at least start up again.
To generate a diff of this commit:
cvs rdiff -u -r1.161.2.1 -r1.161.2.2 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.123 -r1.123.2.1 src/distrib/utils/sysinst/disks.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/distrib/utils/sysinst/main.c
cvs rdiff -u -r1.3 -r1.3.6.1 src/distrib/utils/sysinst/arch/emips/md.h
cvs rdiff -u -r1.68 -r1.68.6.1 src/distrib/utils/sysinst/arch/i386/md.h
cvs rdiff -u -r1.20 -r1.20.6.1 src/distrib/utils/sysinst/arch/vax/md.h
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/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.161.2.1 src/distrib/utils/sysinst/defs.h:1.161.2.2
--- src/distrib/utils/sysinst/defs.h:1.161.2.1 Thu May 17 18:57:08 2012
+++ src/distrib/utils/sysinst/defs.h Wed Jul 4 20:48:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.161.2.1 2012/05/17 18:57:08 sborrill Exp $ */
+/* $NetBSD: defs.h,v 1.161.2.2 2012/07/04 20:48:55 jdc Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -171,10 +171,8 @@ enum {
#define PI_ISBSDFS(p) ((p)-pi_fstype == FS_BSDLFS || \
(p)-pi_fstype == FS_BSDFFS)
-/* non-standard cd0 driver */
-#ifndef CD_NAME
-#define CD_NAME cd0a
-#endif
+/* standard cd0 device */
+#define CD_NAMES cd0a
/* Types */
typedef struct distinfo {
@@ -379,6 +377,7 @@ int md_update(void);
void toplevel(void);
/* from disks.c */
+const char *get_default_cdrom(void);
int find_disks(const char *);
struct menudesc;
void fmt_fspart(struct menudesc *, int, void *);
Index: src/distrib/utils/sysinst/disks.c
diff -u src/distrib/utils/sysinst/disks.c:1.123 src/distrib/utils/sysinst/disks.c:1.123.2.1
--- src/distrib/utils/sysinst/disks.c:1.123 Mon Jan 9 01:51:47 2012
+++ src/distrib/utils/sysinst/disks.c Wed Jul 4 20:48:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.123 2012/01/09 01:51:47 riz Exp $ */
+/* $NetBSD: disks.c,v 1.123.2.1 2012/07/04 20:48:55 jdc Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -43,6 +43,7 @@
#include util.h
#include sys/param.h
+#include sys/sysctl.h
#include sys/swap.h
#include ufs/ufs/dinode.h
#include ufs/ffs/fs.h
@@ -305,6 +306,48 @@ done:
strcpy(dd-dd_descr, dd-dd_name);
}
+/* disknames - contains device names without partition letters
+ * cdrom_devices - contains devices including partition letters
+ * returns the first entry in hw.disknames matching a cdrom_device, or
+ * first entry on error or no match
+ */
+const char *
+get_default_cdrom(void)
+{
+ static const char *cdrom_devices[] = { CD_NAMES, 0};
+ static const char mib_name[] = hw.disknames;
+ size_t len;
+ char *disknames;
+ char *last;
+ char *name;
+ const char **arg;
+ const char *cd_dev;
+
+ /* On error just use first entry in cdrom_devices */
+ if (sysctlbyname(mib_name, NULL, len, NULL, 0) == -1)
+ return cdrom_devices[0];
+ if ((disknames = malloc(len + 2)) == 0) /* skip on malloc fail */
+ return cdrom_devices[0];
+
+ (void)sysctlbyname(mib_name, disknames, len, NULL, 0);
+for ((name = strtok_r(disknames, , last)); name;
+ (name = strtok_r(NULL, , last))) {
+ for (arg = cdrom_devices; *arg; ++arg) {
+ cd_dev = *arg;
+ /* skip unit and partition */
+ if (strncmp(cd_dev, name, strlen(cd_dev) - 2) != 0)
+continue;
+ if (name != disknames)
+strcpy(disknames, name);
+ strcat(disknames, a);
+ /* XXX: leaks, but so what? */
CVS commit: src/share/man/man5
Module Name:src Committed By: jdf Date: Wed Jul 4 20:53:30 UTC 2012 Modified Files: src/share/man/man5: rc.conf.5 Log Message: * add entry for lvm(8) * add subsection for block device subsystem setup * s/OPTIONAL:/OPTIONAL: to make mdoclint happier * add missing type specifications of variables To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/share/man/man5/rc.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.152 src/share/man/man5/rc.conf.5:1.153 --- src/share/man/man5/rc.conf.5:1.152 Sun Jun 3 21:42:47 2012 +++ src/share/man/man5/rc.conf.5 Wed Jul 4 20:53:30 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: rc.conf.5,v 1.152 2012/06/03 21:42:47 joerg Exp $ +.\ $NetBSD: rc.conf.5,v 1.153 2012/07/04 20:53:30 jdf Exp $ .\ .\ Copyright (c) 1996 Matthew R. Green .\ All rights reserved. @@ -55,7 +55,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd June 1, 2012 +.Dd July 4, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -282,7 +282,7 @@ which may be required to get the network The default is .Dq OPTIONAL:/var , where the -.Dq OPTIONAL: +.Dq OPTIONAL: prefix means that it's not an error if the file system is not present in .Xr fstab 5 . @@ -295,7 +295,7 @@ that must be available early in the syst The default is .Dq OPTIONAL:/usr , where the -.Dq OPTIONAL: +.Dq OPTIONAL: prefix means that it is not an error if the file system is not present in .Xr fstab 5 . @@ -325,15 +325,8 @@ Boolean value. Remove block-type swap devices at shutdown time. Useful if swapping onto RAIDframe devices. .El -.Ss One-time actions to perform or programs to run on boot-up +.Ss Block device subsystems .Bl -tag -width net_interfaces -.It Sy accounting -Boolean value. -Enables process accounting with -.Xr accton 8 . -Requires -.Pa /var/account/acct -to exist. .It Sy ccd Boolean value. Configures concatenated disk devices according to @@ -346,6 +339,30 @@ Requires See .Xr cgdconfig 8 for additional details. +.It Sy lvm +Boolean value. +Configures the logical volume manager. +See +.Xr lvm 8 +for additional details. +.It Sy raidframe +Boolean value. +Configures +.Xr raid 4 , +RAIDframe disk devices. +See +.Xr raidctl 8 +for additional details. +.El +.Ss One-time actions to perform or programs to run on boot-up +.Bl -tag -width net_interfaces +.It Sy accounting +Boolean value. +Enables process accounting with +.Xr accton 8 . +Requires +.Pa /var/account/acct +to exist. .It Sy clear_tmp Boolean value. Clear @@ -415,14 +432,6 @@ Checks and enables quotas by running .Xr quotacheck 8 and .Xr quotaon 8 . -.It Sy raidframe -Boolean value. -Configures -.Xr raid 4 , -RAIDframe disk devices. -See -.Xr raidctl 8 -for additional details. .It Sy rndctl Boolean value. Runs the @@ -515,12 +524,6 @@ version string in the file to reflect the version of the running kernel. See .Xr motd 5 . -.It Sy veriexec -Boolean value. -Load Veriexec fingerprints during startup. -Read -.Xr veriexecctl 8 -for more information. .It Sy virecover Boolean value. Send notification mail to users if any recoverable files exist in @@ -537,7 +540,7 @@ Refer to .Xr wdogctl 8 for information on how to configure a timer. .El -.Ss System security setting +.Ss System security settings .Bl -tag -width net_interfaces .It Sy securelevel A number. @@ -559,8 +562,15 @@ will raise the level when .Xr rc 8 completes. .It Sy permit_nonalpha +Boolean value. Allow passwords to include non-alpha characters, usually to allow NIS/YP netgroups. +.It Sy veriexec +Boolean value. +Load Veriexec fingerprints during startup. +Read +.Xr veriexecctl 8 +for more information. .It Sy veriexec_strict A number. Controls the strict level of Veriexec. @@ -643,6 +653,7 @@ file in the .Sy dhclient_flags variable - for example, -lf /tmp/dhclient.leases. .It Sy dhcpcd_flags +A string. Additional arguments to pass to .Xr dhcpcd 8 when requesting configuration via @@ -953,6 +964,7 @@ Boolean value. Run .Xr cron 8 . .It Sy ftpd +Boolean value. Runs the .Xr ftpd 8 daemon and passes
CVS commit: [netbsd-6] src/external/bsd/ntp/dist/ntpdc
Module Name:src Committed By: jdc Date: Wed Jul 4 20:55:44 UTC 2012 Modified Files: src/external/bsd/ntp/dist/ntpdc [netbsd-6]: ntpdc.c Log Message: Pull up revision 1.6 (requested by jnemeth in ticket #387). PR/46612 - Lloyd Parkes -- add a terminating newline to error messages To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.2.1 src/external/bsd/ntp/dist/ntpdc/ntpdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ntp/dist/ntpdc/ntpdc.c diff -u src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.5 src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.5.2.1 --- src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.5 Wed Feb 1 22:48:15 2012 +++ src/external/bsd/ntp/dist/ntpdc/ntpdc.c Wed Jul 4 20:55:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ntpdc.c,v 1.5 2012/02/01 22:48:15 kardel Exp $ */ +/* $NetBSD: ntpdc.c,v 1.5.2.1 2012/07/04 20:55:44 jdc Exp $ */ /* * ntpdc - control and monitor your ntpd daemon @@ -1932,7 +1932,7 @@ vwarning(const char *fmt, va_list ap) int serrno = errno; (void) fprintf(stderr, %s: , progname); vfprintf(stderr, fmt, ap); - (void) fprintf(stderr, : %s, strerror(serrno)); + (void) fprintf(stderr, : %s\n, strerror(serrno)); } /*
CVS commit: [netbsd-6] src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: jdc
Date: Wed Jul 4 20:58:27 UTC 2012
Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-6]: vm_machdep.c
Log Message:
Pull up revision 1.97 (requested by matt in ticket #388).
Don't panic if you can't allocate a contiguous stack for system threads.
Just use a mapped a stack.
To generate a diff of this commit:
cvs rdiff -u -r1.94.2.1 -r1.94.2.2 src/sys/arch/powerpc/powerpc/vm_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/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.94.2.1 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.94.2.2
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.94.2.1 Wed May 9 20:09:15 2012
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Wed Jul 4 20:58:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.94.2.1 2012/05/09 20:09:15 riz Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.94.2.2 2012/07/04 20:58:27 jdc Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.94.2.1 2012/05/09 20:09:15 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.94.2.2 2012/07/04 20:58:27 jdc Exp $);
#include opt_altivec.h
#include opt_multiprocessor.h
@@ -300,9 +300,7 @@ cpu_uarea_alloc(bool system)
*/
error = uvm_pglistalloc(USPACE, 0, ~0UL, 0, 0, pglist, 1, 1);
if (error) {
- if (!system)
- return NULL;
- panic(%s: uvm_pglistalloc failed: %d, __func__, error);
+ return NULL;
}
/*
CVS commit: [netbsd-6] src/sys/dev/wsfont
Module Name:src Committed By: jdc Date: Wed Jul 4 21:02:49 UTC 2012 Modified Files: src/sys/dev/wsfont [netbsd-6]: DejaVu_Sans_Mono_12x22.h Droid_Sans_Mono_12x22.h Droid_Sans_Mono_9x18.h Log Message: Pull up revisions: src/sys/dev/wsfont/Droid_Sans_Mono_12x22.h revision 1.2 src/sys/dev/wsfont/Droid_Sans_Mono_9x18.h revision 1.2 src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h revision 1.2 (requested by macallan in ticket #389). add license headers I need to find a way to extract at least the copyright notice from the .ttf file so ttf2wsfont can do this mostly automatically. add license header To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h \ src/sys/dev/wsfont/Droid_Sans_Mono_12x22.h \ src/sys/dev/wsfont/Droid_Sans_Mono_9x18.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/wsfont/DejaVu_Sans_Mono_12x22.h diff -u src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h:1.1 src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h:1.1.2.1 --- src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h:1.1 Thu Dec 22 05:01:15 2011 +++ src/sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h Wed Jul 4 21:02:47 2012 @@ -1,3 +1,88 @@ +/* + * Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. + * Bitstream Vera is a trademark of Bitstream, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of the fonts accompanying this license (Fonts) and associated + * documentation files (the Font Software), to reproduce and distribute the + * Font Software, including without limitation the rights to use, copy, merge, + * publish, distribute, and/or sell copies of the Font Software, and to permit + * persons to whom the Font Software is furnished to do so, subject to the + * following conditions: + * + * - The above copyright and trademark notices and this permission notice shall + * be included in all copies of one or more of the Font Software typefaces. + * + * - The Font Software may be modified, altered, or added to, and in particular + * the designs of glyphs or characters in the Fonts may be modified and + * additional glyphs or characters may be added to the Fonts, only if the + * fonts are renamed to names not containing either the words Bitstream or + * the word Vera. + * + * This License becomes null and void to the extent applicable to Fonts or Font + * Software that has been modified and is distributed under the Bitstream + * Vera names. + * + * The Font Software may be sold as part of a larger software package but no + * copy of one or more of the Font Software typefaces may be sold by itself. + * + * THE FONT SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, + * TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME + * FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING + * ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE + * FONT SOFTWARE. + * + * Except as contained in this notice, the names of Gnome, the Gnome + * Foundation, and Bitstream Inc., shall not be used in advertising or + * otherwise to promote the sale, use or other dealings in this Font Software + * without prior written authorization from the Gnome Foundation or + * Bitstream Inc., respectively. For further information, contact: + * fonts at gnome dot org. + * + * Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of the fonts accompanying this license (Fonts) and associated + * documentation files (the Font Software), to reproduce and distribute the + * modifications to the Bitstream Vera Font Software, including without + * limitation the rights to use, copy, merge, publish, distribute, and/or sell + * copies of the Font Software, and to permit persons to whom the Font Software + * is furnished to do so, subject to the following conditions: + * + * - The above copyright and trademark notices and this permission notice shall + * be included in all copies of one or more of the Font Software typefaces. + * - The Font Software may be modified, altered, or added to, and in particular + * the designs of glyphs or characters in the Fonts may be modified and + * additional glyphs or characters may be added to the Fonts, only if the + * fonts are renamed to names not containing either the words Tavmjong Bah + * or the word Arev. + * + * This License becomes null and void to the extent applicable to Fonts or Font + * Software that has been
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Wed Jul 4 21:05:39 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 384, 385, 386, 387, 388, 389. To generate a diff of this commit: cvs rdiff -u -r1.1.2.148 -r1.1.2.149 src/doc/CHANGES-6.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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.148 src/doc/CHANGES-6.0:1.1.2.149 --- src/doc/CHANGES-6.0:1.1.2.148 Wed Jul 4 19:45:56 2012 +++ src/doc/CHANGES-6.0 Wed Jul 4 21:05:38 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.148 2012/07/04 19:45:56 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.149 2012/07/04 21:05:38 jdc Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6051,3 +6051,56 @@ external/public-domain/xz/prepare-import Makes liblzma work on sparc64 (and probably other big endian hosts too). [jdc, ticket #378] +sys/arch/m68k/fpe/fpu_int.c 1.11 + Rewrite fpu_int(). Especially, remove the special treatment + when |x| 1 because it forgets to consider FPCR round mode. + PR#46627. Thanks Y.Sugahara for advice. + [isaki, ticket #384] + +etc/etc.vax/MAKEDEV.conf 1.14 +sys/arch/vax/conf/GENERIC 1.182 +sys/arch/vax/conf/INSTALL 1.60 +sys/arch/vax/conf/VAX780 1.9 +sys/arch/vax/conf/majors.vax 1.24 +sys/arch/vax/vax/disksubr.c 1.53 +sys/dev/DEVNAMES1.275 +sys/dev/mscp/files.mscp1.8 +sys/dev/mscp/mscp_disk.c 1.72 +sys/dev/mscp/mscp_subr.c 1.42 +distrib/vax/ramdisk/Makefile 1.29 + Add racd* devices for MSCP based CD-ROM drives (RRD40s), and + default to the same single iso9660 partition as cd*. + Cleanup config option handling slightly so any combination of ra*, + rx* (and now raccd*) can be defined without build errors. + Include racd0 and racd1 on ramdisk. + [abs, ticket #385] + +distrib/utils/sysinst/defs.h 1.163 +distrib/utils/sysinst/disks.c 1.125,1.126 +distrib/utils/sysinst/main.c 1.65,1.66 +distrib/utils/sysinst/arch/emips/md.h 1.4 +distrib/utils/sysinst/arch/i386/md.h 1.69 +distrib/utils/sysinst/arch/vax/md.h 1.21 + Replace the CD_NAME definition with a CD_NAMES comma separate list. + Add get_default_cdrom() to disks.c, which is called in init(). + The primary beneficiary is vax systems with an MSCP but no SCSI CD + drive, which now default to (a valid) racd0a rather than an invalid + cd0a. The obvious example being simh-vax. + instead. Makes sysinst at least start up again. + [abs, ticket #386] + +external/bsd/ntp/dist/ntpdc/ntpdc.c 1.6 + PR#46612 - Lloyd Parkes -- add a terminating newline to error messages + [jnemeth, ticket #387] + +sys/arch/powerpc/powerpc/vm_machdep.c 1.97 + Don't panic if you can't allocate a contiguous stack for system + threads. Just use a mapped a stack. + [matt, ticket #388] + +sys/dev/wsfont/Droid_Sans_Mono_12x22.h 1.2 +sys/dev/wsfont/Droid_Sans_Mono_9x18.h 1.2 +sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h 1.2 + Add license headers to WS fonts converted from TTF fonts. + [macallan, ticket #389] +
CVS commit: src/sys/arch/evbppc/obs405
Module Name:src
Committed By: kiyohara
Date: Thu Jul 5 02:56:40 UTC 2012
Modified Files:
src/sys/arch/evbppc/obs405: obs600_machdep.c
Log Message:
Change read_eeprom(). We don't use bus_space(9) here. This is MD-part and,
don't support bus_space_unmap() to a space on reserved space?
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/obs405/obs600_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/evbppc/obs405/obs600_machdep.c
diff -u src/sys/arch/evbppc/obs405/obs600_machdep.c:1.8 src/sys/arch/evbppc/obs405/obs600_machdep.c:1.9
--- src/sys/arch/evbppc/obs405/obs600_machdep.c:1.8 Mon Dec 12 11:31:46 2011
+++ src/sys/arch/evbppc/obs405/obs600_machdep.c Thu Jul 5 02:56:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: obs600_machdep.c,v 1.8 2011/12/12 11:31:46 kiyohara Exp $ */
+/* $NetBSD: obs600_machdep.c,v 1.9 2012/07/05 02:56:40 kiyohara Exp $ */
/* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */
/*
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: obs600_machdep.c,v 1.8 2011/12/12 11:31:46 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: obs600_machdep.c,v 1.9 2012/07/05 02:56:40 kiyohara Exp $);
#include opt_compat_netbsd.h
#include opt_ddb.h
@@ -215,15 +215,15 @@ cpu_startup(void)
*/
board_info_init();
+ read_eeprom(sizeof(buf), buf);
+ macaddr = buf[0];
+ macaddr1 = buf[8];
+
/*
* Now that we have VM, malloc()s are OK in bus_space.
*/
bus_space_mallocok();
- read_eeprom(sizeof(buf), buf);
- macaddr = buf[0];
- macaddr1 = buf[8];
-
pn = prop_number_create_integer(OBS600_CPU_FREQ);
KASSERT(pn != NULL);
if (prop_dictionary_set(board_properties, processor-frequency, pn) ==
@@ -353,51 +353,59 @@ cpu_reboot(int howto, char *what)
#endif
}
-/* This function assume already initialized for I2C... */
+/*
+ * Read EEPROM via I2C. We don't use bus_space(9) here. This is MD-part and,
+ * don't support bus_space_unmap() to a space on reserved space? X-
+ *
+ * : Also this function assume already initialized for I2C...
+ */
static int
read_eeprom(int len, char *buf)
{
- bus_space_tag_t bst = opb_get_bus_space_tag();
- bus_space_handle_t bsh;
- uint8_t mdcntl, sts;
+ volatile uint8_t *iic0;
+#define IIC0_READ(r) (*(iic0 + (r)))
+#define IIC0_WRITE(r, v) (*(iic0 + (r)) = (v))
+ uint8_t sts;
int cnt, i = 0;
#define I2C_EEPROM_ADDR 0x52
- if (bus_space_map(bst, AMCC405EX_IIC0_BASE, IIC_NREG, 0, bsh))
+ if ((iic0 = ppc4xx_tlb_mapiodev(AMCC405EX_IIC0_BASE, IIC_NREG)) == NULL)
return ENOMEM; /* ??? */
/* Clear Stop Complete Bit */
- bus_space_write_1(bst, bsh, IIC_STS, IIC_STS_SCMP);
+ IIC0_WRITE(IIC_STS, IIC_STS_SCMP);
/* Check init */
do {
/* Get status */
- sts = bus_space_read_1(bst, bsh, IIC_STS);
+ sts = IIC0_READ(IIC_STS);
} while ((sts IIC_STS_PT));
- mdcntl = bus_space_read_1(bst, bsh, IIC_MDCNTL);
- bus_space_write_1(bst, bsh, IIC_MDCNTL,
- mdcntl | IIC_MDCNTL_FMDB | IIC_MDCNTL_FSDB);
+ IIC0_WRITE(IIC_MDCNTL,
+ IIC0_READ(IIC_MDCNTL) | IIC_MDCNTL_FMDB | IIC_MDCNTL_FSDB);
/* 7-bit adressing */
- bus_space_write_1(bst, bsh, IIC_HMADR, 0);
- bus_space_write_1(bst, bsh, IIC_LMADR, I2C_EEPROM_ADDR 1);
+ IIC0_WRITE(IIC_HMADR, 0);
+ IIC0_WRITE(IIC_LMADR, I2C_EEPROM_ADDR 1);
- bus_space_write_1(bst, bsh, IIC_MDBUF, 0);
- bus_space_write_1(bst, bsh, IIC_CNTL, IIC_CNTL_PT);
+ IIC0_WRITE(IIC_MDBUF, 0);
+ IIC0_WRITE(IIC_CNTL, IIC_CNTL_PT);
do {
/* Get status */
- sts = bus_space_read_1(bst, bsh, IIC_STS);
+ sts = IIC0_READ(IIC_STS);
} while ((sts IIC_STS_PT) !(sts IIC_STS_ERR));
cnt = 0;
while (cnt len) {
/* always read 4byte */
- bus_space_write_1(bst, bsh, IIC_CNTL,
- IIC_CNTL_PT | IIC_CNTL_RW | IIC_CNTL_TCT);
+ IIC0_WRITE(IIC_CNTL,
+ IIC_CNTL_PT|
+ IIC_CNTL_RW|
+ ((cnt == 0) ? IIC_CNTL_RPST : 0) |
+ IIC_CNTL_TCT);
do {
/* Get status */
- sts = bus_space_read_1(bst, bsh, IIC_STS);
+ sts = IIC0_READ(IIC_STS);
} while ((sts IIC_STS_PT) !(sts IIC_STS_ERR));
if ((sts IIC_STS_PT) || (sts IIC_STS_ERR))
@@ -406,16 +414,11 @@ read_eeprom(int len, char *buf)
delay(1);
/* read 4byte */
for (i = 0; i 4 cnt len; i++, cnt++)
-buf[cnt] =
-bus_space_read_1(bst, bsh, IIC_MDBUF);
+buf[cnt] = IIC0_READ(IIC_MDBUF);
}
}
for ( ; i 4; i++)
- (void) bus_space_read_1(bst, bsh, IIC_MDBUF);
-
-#if 0 /* Ooops, can't unmap here... */
- bus_space_unmap(bst, bsh, IIC_NREG);
-#endif
+ (void) IIC0_READ(IIC_MDBUF);
return (cnt == len) ? 0 : EINVAL;
}
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: kiyohara
Date: Thu Jul 5 03:02:53 UTC 2012
Modified Files:
src/sys/arch/powerpc/powerpc: bus_space.c
Log Message:
Don't call extent_free() in memio_unmap(), if not call extent_alloc() with
defined PPC_IBM4XX and extent_flags.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/powerpc/powerpc/bus_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/bus_space.c
diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.32 src/sys/arch/powerpc/powerpc/bus_space.c:1.33
--- src/sys/arch/powerpc/powerpc/bus_space.c:1.32 Wed Feb 1 09:54:03 2012
+++ src/sys/arch/powerpc/powerpc/bus_space.c Thu Jul 5 03:02:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.32 2012/02/01 09:54:03 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.33 2012/07/05 03:02:53 kiyohara Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.32 2012/02/01 09:54:03 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.33 2012/07/05 03:02:53 kiyohara Exp $);
#define _POWERPC_BUS_SPACE_PRIVATE
@@ -679,6 +679,9 @@ memio_unmap(bus_space_tag_t t, bus_space
bpa = pa - t-pbs_offset;
if (t-pbs_extent != NULL
+#ifdef PPC_IBM4XX
+ extent_flags
+#endif
extent_free(t-pbs_extent, bpa, size,
EX_NOWAIT | extent_flags)) {
printf(memio_unmap: %s 0x%lx, size 0x%lx\n,
