CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu Oct 27 07:23:24 UTC 2011 Modified Files: src/share/man/man9: ucas.9 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/ucas.9 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/man9/ucas.9 diff -u src/share/man/man9/ucas.9:1.1 src/share/man/man9/ucas.9:1.2 --- src/share/man/man9/ucas.9:1.1 Mon Oct 24 07:31:31 2011 +++ src/share/man/man9/ucas.9 Thu Oct 27 07:23:23 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ucas.9,v 1.1 2011/10/24 07:31:31 yamt Exp $ +.\ $NetBSD: ucas.9,v 1.2 2011/10/27 07:23:23 wiz Exp $ .\ .\ Copyright (c)2011 YAMAMOTO Takashi, .\ All rights reserved. @@ -75,8 +75,8 @@ error code, typically .Dv EFAULT . .\ .Sh SEE ALSO -.Xr intro 9 , -.Xr atomic_cas 3 +.Xr atomic_cas 3 , +.Xr intro 9 .\ .Sh BUGS Conceptually, the
CVS commit: src/doc
Module Name:src Committed By: taca Date: Thu Oct 27 12:50:06 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: - Postfix 2.8.6 is out. - Add 4.2.3 to ISC DHCP. To generate a diff of this commit: cvs rdiff -u -r1.881 -r1.882 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.881 src/doc/3RDPARTY:1.882 --- src/doc/3RDPARTY:1.881 Mon Oct 24 15:44:09 2011 +++ src/doc/3RDPARTY Thu Oct 27 12:50:06 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.881 2011/10/24 15:44:09 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.882 2011/10/27 12:50:06 taca Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -255,7 +255,7 @@ src/lib/libc/db/db2netbsd. Package: dhcp Version: 3.0.3 -Current Vers: 3.1.3/4.0.2/4.1.1-P1 +Current Vers: 3.1.3/4.0.2/4.1.1-P1/4.2.3 Maintainer: mellon Archive Site: ftp://ftp.isc.org/isc/dhcp/ Home Page: http://www.isc.org/software/dhcp/ @@ -904,7 +904,7 @@ and more. Package: postfix Version: 2.8.5 -Current Vers: 2.8.5 +Current Vers: 2.8.6 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/
CVS commit: src/sys/dev/ata
Module Name:src Committed By: jakllsch Date: Thu Oct 27 13:07:37 UTC 2011 Modified Files: src/sys/dev/ata: wd.c Log Message: Attempt to complete the WD_QUIRK_SPLIT_MOD15_WRITE list. Per Seagate Publication number 100221381, Rev. B, the ST360015AS is the only other drive in the Seagate Barracuda Serial ATA V family that was not already listed. Also, correct spelling of globing. To generate a diff of this commit: cvs rdiff -u -r1.388 -r1.389 src/sys/dev/ata/wd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ata/wd.c diff -u src/sys/dev/ata/wd.c:1.388 src/sys/dev/ata/wd.c:1.389 --- src/sys/dev/ata/wd.c:1.388 Wed Oct 5 03:40:18 2011 +++ src/sys/dev/ata/wd.c Thu Oct 27 13:07:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.388 2011/10/05 03:40:18 jakllsch Exp $ */ +/* $NetBSD: wd.c,v 1.389 2011/10/27 13:07:37 jakllsch Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -54,7 +54,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.388 2011/10/05 03:40:18 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.389 2011/10/27 13:07:37 jakllsch Exp $); #include opt_ata.h @@ -199,7 +199,7 @@ static void bad144intern(struct wd_softc /* * Quirk table for IDE drives. Put more-specific matches first, since - * a simple globbing routine is used for matching. + * a simple globing routine is used for matching. */ static const struct wd_quirk { const char *wdq_match; /* inquiry pattern to match */ @@ -216,11 +216,18 @@ static const struct wd_quirk { * XXX more model numbers. If you have trouble with such transfers * XXX (8K is the most common) on Seagate S-ATA drives, please * XXX notify thor...@netbsd.org. + * + * The ST360015AS has not yet been confirmed to have this + * issue, however, it is the only other drive in the + * Seagate Barracuda Serial ATA V family. + * */ { ST3120023AS, WD_QUIRK_SPLIT_MOD15_WRITE }, { ST380023AS, WD_QUIRK_SPLIT_MOD15_WRITE }, + { ST360015AS, + WD_QUIRK_SPLIT_MOD15_WRITE }, { NULL, 0 } };
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Thu Oct 27 14:48:00 UTC 2011 Modified Files: src/lib/libc/time: ctime.3 localtime.c Log Message: Change mktime*(3) so that it does not always return EOVERFLOW when it cannot perform the conversion, but returns EINVAL when the time requested would fall in the DST gap, or is not representable in the timezone requested, and document this. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/lib/libc/time/ctime.3 cvs rdiff -u -r1.59 -r1.60 src/lib/libc/time/localtime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/ctime.3 diff -u src/lib/libc/time/ctime.3:1.43 src/lib/libc/time/ctime.3:1.44 --- src/lib/libc/time/ctime.3:1.43 Sun Oct 16 13:59:32 2011 +++ src/lib/libc/time/ctime.3 Thu Oct 27 10:47:59 2011 @@ -1,8 +1,8 @@ -.\ $NetBSD: ctime.3,v 1.43 2011/10/16 17:59:32 christos Exp $ +.\ $NetBSD: ctime.3,v 1.44 2011/10/27 14:47:59 christos Exp $ .\ -.\ XXX: Lincense missing? +.\ XXX: License missing? .\ -.Dd October 16, 2011 +.Dd October 27, 2011 .Dt CTIME 3 .Os .Sh NAME @@ -401,9 +401,12 @@ is absent, UTC leap seconds are loaded f The described functions may fail with .Bl -tag -width Er .It Bq Er EINVAL -The result cannot be represented. +The result cannot be represented because a parameter is incorrect, or +the conversion failed because no such time exists (for example a time +in the DST gap). .It Bq Er EOVERFLOW -The result cannot be represented. +The result cannot be represented because the time requested is out of bounds +and the time calculation resulted in overflow. .El .Pp All functions that return values, except their Index: src/lib/libc/time/localtime.c diff -u src/lib/libc/time/localtime.c:1.59 src/lib/libc/time/localtime.c:1.60 --- src/lib/libc/time/localtime.c:1.59 Sun Oct 16 13:59:32 2011 +++ src/lib/libc/time/localtime.c Thu Oct 27 10:48:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: localtime.c,v 1.59 2011/10/16 17:59:32 christos Exp $ */ +/* $NetBSD: localtime.c,v 1.60 2011/10/27 14:48:00 christos Exp $ */ /* ** This file is in the public domain, so clarified as of @@ -10,7 +10,7 @@ #if 0 static char elsieid[] = @(#)localtime.c 8.17; #else -__RCSID($NetBSD: localtime.c,v 1.59 2011/10/16 17:59:32 christos Exp $); +__RCSID($NetBSD: localtime.c,v 1.60 2011/10/27 14:48:00 christos Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -1801,25 +1801,25 @@ time2sub(const timezone_t sp, struct tm yourtm = *tmp; if (do_norm_secs) { if (normalize_overflow(yourtm.tm_min, yourtm.tm_sec, - SECSPERMIN)) -return WRONG; + SECSPERMIN)) + goto overflow; } if (normalize_overflow(yourtm.tm_hour, yourtm.tm_min, MINSPERHOUR)) - return WRONG; + goto overflow; if (normalize_overflow(yourtm.tm_mday, yourtm.tm_hour, HOURSPERDAY)) - return WRONG; + goto overflow; y = yourtm.tm_year; if (long_normalize_overflow(y, yourtm.tm_mon, MONSPERYEAR)) - return WRONG; + goto overflow; /* ** Turn y into an actual year number for now. ** It is converted back to an offset from TM_YEAR_BASE later. */ if (long_increment_overflow(y, TM_YEAR_BASE)) - return WRONG; + goto overflow; while (yourtm.tm_mday = 0) { if (long_increment_overflow(y, -1)) - return WRONG; + goto overflow; li = y + (1 yourtm.tm_mon); yourtm.tm_mday += year_lengths[isleap(li)]; } @@ -1827,7 +1827,7 @@ time2sub(const timezone_t sp, struct tm li = y + (1 yourtm.tm_mon); yourtm.tm_mday -= year_lengths[isleap(li)]; if (long_increment_overflow(y, 1)) - return WRONG; + goto overflow; } for ( ; ; ) { i = mon_lengths[isleap(y)][yourtm.tm_mon]; @@ -1837,14 +1837,14 @@ time2sub(const timezone_t sp, struct tm if (++yourtm.tm_mon = MONSPERYEAR) { yourtm.tm_mon = 0; if (long_increment_overflow(y, 1)) -return WRONG; +goto overflow; } } if (long_increment_overflow(y, -TM_YEAR_BASE)) - return WRONG; + goto overflow; yourtm.tm_year = y; if (yourtm.tm_year != y) - return WRONG; + goto overflow; if (yourtm.tm_sec = 0 yourtm.tm_sec SECSPERMIN) saved_seconds = 0; else if (y + TM_YEAR_BASE EPOCH_YEAR) { @@ -1857,7 +1857,7 @@ time2sub(const timezone_t sp, struct tm ** which is a safer assumption than using 58 would be. */ if (increment_overflow(yourtm.tm_sec, 1 - SECSPERMIN)) - return WRONG; + goto overflow; saved_seconds = yourtm.tm_sec; yourtm.tm_sec = SECSPERMIN - 1; } else { @@ -1904,12 +1904,12 @@ time2sub(const timezone_t sp, struct tm if (t == lo) { ++t; if (t = lo) - return WRONG; + goto overflow; ++lo; } else if (t == hi) { --t; if (t = hi) - return WRONG; + goto overflow; --hi; } #ifdef NO_ERROR_IN_DST_GAP @@ -1934,7 +1934,7 @@ time2sub(const timezone_t sp, struct tm } #endif if (lo hi) -return WRONG; +goto invalid; if (dir 0) hi = t;
CVS commit: src/lib/libc/sys
Module Name:src Committed By: christos Date: Thu Oct 27 16:10:37 UTC 2011 Modified Files: src/lib/libc/sys: getitimer.2 Log Message: document ITIMER_MONOTONIC. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/sys/getitimer.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/getitimer.2 diff -u src/lib/libc/sys/getitimer.2:1.27 src/lib/libc/sys/getitimer.2:1.28 --- src/lib/libc/sys/getitimer.2:1.27 Mon Oct 3 11:49:02 2011 +++ src/lib/libc/sys/getitimer.2 Thu Oct 27 12:10:37 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: getitimer.2,v 1.27 2011/10/03 15:49:02 njoly Exp $ +.\ $NetBSD: getitimer.2,v 1.28 2011/10/27 16:10:37 christos Exp $ .\ .\ Copyright (c) 1983, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)getitimer.2 8.3 (Berkeley) 5/16/95 .\ -.Dd October 3, 2011 +.Dd October 27, 2011 .Dt GETITIMER 2 .Os .Sh NAME @@ -93,9 +93,13 @@ is non-zero). The .Fa which parameter specifies the type of the timer: -.Bl -tag -width ITIMER_VIRTUAL -offset indent +.Bl -tag -width ITIMER_MONOTONIC -offset indent .It Dv ITIMER_REAL timer decrements in real time. +This timer is affected by +.Xr adjtime 2 +and +.Xr settimeofday 2 . A .Dv SIGALRM signal is @@ -121,6 +125,16 @@ delivered. Because this signal may interrupt in-progress system calls, programs using this timer must be prepared to restart interrupted system calls. +.It Dv ITIMER_MONOTONIC +timer decrements in monotonic time. +This timer is not affected by +.Xr adjtime 2 +and +.Xr settimeofday 2 . +A +.Dv SIGALRM +signal is +delivered when this timer expires. .El Note that: .Bl -bullet -offset indent @@ -179,3 +193,7 @@ The .Fn getitimer function call appeared in .Bx 4.2 . +The +.Dv ITIMER_MONOTONIC +functionality appeared in +.Nx 6.0 .
CVS commit: src/sys
Module Name:src Committed By: christos Date: Thu Oct 27 16:12:53 UTC 2011 Modified Files: src/sys/kern: kern_time.c src/sys/sys: time.h Log Message: There is no reason not to support CLOCK_MONOTONIC in {g,s}etitimer() since the underlying implementation already supports it, so add it. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/kern/kern_time.c cvs rdiff -u -r1.64 -r1.65 src/sys/sys/time.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_time.c diff -u src/sys/kern/kern_time.c:1.169 src/sys/kern/kern_time.c:1.170 --- src/sys/kern/kern_time.c:1.169 Wed Jul 27 10:35:34 2011 +++ src/sys/kern/kern_time.c Thu Oct 27 12:12:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_time.c,v 1.169 2011/07/27 14:35:34 uebayasi Exp $ */ +/* $NetBSD: kern_time.c,v 1.170 2011/10/27 16:12:52 christos Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_time.c,v 1.169 2011/07/27 14:35:34 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_time.c,v 1.170 2011/10/27 16:12:52 christos Exp $); #include sys/param.h #include sys/resourcevar.h @@ -99,6 +99,7 @@ struct pool ptimer_pool, ptimers_pool; CTASSERT(ITIMER_REAL == CLOCK_REALTIME); CTASSERT(ITIMER_VIRTUAL == CLOCK_VIRTUAL); CTASSERT(ITIMER_PROF == CLOCK_PROF); +CTASSERT(ITIMER_MONOTONIC == CLOCK_MONOTONIC); /* * Initialize timekeeping. @@ -500,9 +501,9 @@ adjtime1(const struct timeval *delta, st * All timers are kept in an array pointed to by p_timers, which is * allocated on demand - many processes don't use timers at all. The * first three elements in this array are reserved for the BSD timers: - * element 0 is ITIMER_REAL, element 1 is ITIMER_VIRTUAL, and element - * 2 is ITIMER_PROF. The rest may be allocated by the timer_create() - * syscall. + * element 0 is ITIMER_REAL, element 1 is ITIMER_VIRTUAL, element + * 2 is ITIMER_PROF, and element 3 is ITIMER_MONOTONIC. The rest may be + * allocated by the timer_create() syscall. * * Realtime timers are kept in the ptimer structure as an absolute * time; virtual time timers are kept as a linked list of deltas. @@ -543,8 +544,7 @@ timer_create1(timer_t *tid, clockid_t id p = l-l_proc; - if (id != CLOCK_REALTIME id != CLOCK_VIRTUAL - id != CLOCK_PROF id != CLOCK_MONOTONIC) + if ((u_int)id CLOCK_MONOTONIC) return (EINVAL); if ((pts = p-p_timers) == NULL) @@ -1063,7 +1063,7 @@ dogetitimer(struct proc *p, int which, s struct ptimer *pt; struct itimerspec its; - if ((u_int)which ITIMER_PROF) + if ((u_int)which ITIMER_MONOTONIC) return (EINVAL); mutex_spin_enter(timer_lock); @@ -1099,7 +1099,7 @@ sys___setitimer50(struct lwp *l, const s struct itimerval aitv; int error; - if ((u_int)which ITIMER_PROF) + if ((u_int)which ITIMER_MONOTONIC) return (EINVAL); itvp = SCARG(uap, itv); if (itvp @@ -1124,8 +1124,7 @@ dosetitimer(struct proc *p, int which, s struct ptimers *pts; struct ptimer *pt, *spare; - KASSERT(which == CLOCK_REALTIME || which == CLOCK_VIRTUAL || - which == CLOCK_PROF); + KASSERT((u_int)which = CLOCK_MONOTONIC); if (itimerfix(itvp-it_value) || itimerfix(itvp-it_interval)) return (EINVAL); @@ -1165,6 +1164,7 @@ dosetitimer(struct proc *p, int which, s switch (which) { case ITIMER_REAL: + case ITIMER_MONOTONIC: pt-pt_ev.sigev_signo = SIGALRM; break; case ITIMER_VIRTUAL: @@ -1180,11 +1180,23 @@ dosetitimer(struct proc *p, int which, s TIMEVAL_TO_TIMESPEC(itvp-it_value, pt-pt_time.it_value); TIMEVAL_TO_TIMESPEC(itvp-it_interval, pt-pt_time.it_interval); - if ((which == ITIMER_REAL) timespecisset(pt-pt_time.it_value)) { + if (timespecisset(pt-pt_time.it_value)) { /* Convert to absolute time */ /* XXX need to wrap in splclock for timecounters case? */ - getnanotime(now); - timespecadd(pt-pt_time.it_value, now, pt-pt_time.it_value); + switch (which) { + case ITIMER_REAL: + getnanotime(now); + timespecadd(pt-pt_time.it_value, now, + pt-pt_time.it_value); + break; + case ITIMER_MONOTONIC: + getnanouptime(now); + timespecadd(pt-pt_time.it_value, now, + pt-pt_time.it_value); + break; + default: + break; + } } timer_settime(pt); mutex_spin_exit(timer_lock); Index: src/sys/sys/time.h diff -u src/sys/sys/time.h:1.64 src/sys/sys/time.h:1.65 --- src/sys/sys/time.h:1.64 Fri Mar 27 07:06:26 2009 +++ src/sys/sys/time.h Thu Oct 27 12:12:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: time.h,v 1.64 2009/03/27 11:06:26 drochner Exp $ */ +/* $NetBSD: time.h,v 1.65 2011/10/27 16:12:52 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -227,10 +227,12 @@ timeval2bintime(const struct timeval *tv /* * Names of the interval timers, and structure * defining a timer setting. + * NB: Must match the CLOCK_
CVS commit: src/lib/libposix
Module Name:src Committed By: christos Date: Thu Oct 27 17:18:10 UTC 2011 Modified Files: src/lib/libposix: Makefile Log Message: HACK: Include _errno.c here for powerpc64 build. Otherwise __errno does not resolve. Why? To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libposix/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libposix/Makefile diff -u src/lib/libposix/Makefile:1.14 src/lib/libposix/Makefile:1.15 --- src/lib/libposix/Makefile:1.14 Sun Oct 26 03:28:49 2008 +++ src/lib/libposix/Makefile Thu Oct 27 13:18:09 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/10/26 07:28:49 mrg Exp $ +# $NetBSD: Makefile,v 1.15 2011/10/27 17:18:09 christos Exp $ LIB= posix @@ -14,6 +14,13 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/sys AFLAGS+=-I${ARCHDIR} +.if ${MACHINE_ARCH} == powerpc64 +# XXX: How come it does not resolve from libc? +.PATH.c: ${NETBSDSRCDIR}/lib/libc/gen +SRCS+= _errno.c +.endif + .include ${.CURDIR}/sys/Makefile.inc +SRCS+=_errno.c .include bsd.lib.mk
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Oct 27 17:21:27 UTC 2011 Modified Files: src/doc: HACKS Log Message: mention ppc64 hack. To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.116 src/doc/HACKS:1.117 --- src/doc/HACKS:1.116 Sun Aug 14 22:29:38 2011 +++ src/doc/HACKS Thu Oct 27 13:21:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.116 2011/08/15 02:29:38 mrg Exp $ +# $NetBSD: HACKS,v 1.117 2011/10/27 17:21:27 christos Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -664,3 +664,17 @@ port powerpc descr see above kcah + +port powerpc64 + + hack include _errno.c in libposix so that __errno resolves. It + should resolve from libc's errno, but somehow it does not. + Linker bug? + cdate Thu Oct 27 13:19:47 EDT 2011 + who christos + file src/lib/libposix/Makefile: 1.15 + descr + workaround for: + libposix_pic.a(cerror.pico)(.text+0x14): unresolvable \ + R_PPC64_REL24 relocation against symbol `.__errno' + kcah
CVS commit: src/lib/librt
Module Name:src Committed By: christos Date: Thu Oct 27 18:45:44 UTC 2011 Modified Files: src/lib/librt: Makefile Log Message: Add the same ppc64 hack that libposix needs. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/librt/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librt/Makefile diff -u src/lib/librt/Makefile:1.13 src/lib/librt/Makefile:1.14 --- src/lib/librt/Makefile:1.13 Mon Jun 7 03:26:21 2010 +++ src/lib/librt/Makefile Thu Oct 27 14:45:44 2011 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2010/06/07 07:26:21 jruoho Exp $ +# $NetBSD: Makefile,v 1.14 2011/10/27 18:45:44 christos Exp $ # -WARNS= 2 +.include bsd.own.mk + +WARNS= 4 LIB= rt SRCS= sem.c @@ -37,7 +39,6 @@ MLINKS+= sched.3 sched_get_priority_min. MLINKS+= sched.3 sched_rr_get_interval.3 MLINKS+= sched.3 sched_yield.3 -.include bsd.own.mk .include ${.CURDIR}/../libc/libcincludes.mk @@ -45,4 +46,11 @@ AFLAGS+=-I${ARCHDIR} .include ${.CURDIR}/sys/Makefile.inc +.if ${MACHINE_ARCH} == powerpc64 +# XXX: How come it does not resolve from libc? +CPPFLAGS+=-I${NETBSDSRCDIR}/lib/libc/include +.PATH.c: ${NETBSDSRCDIR}/lib/libc/gen +SRCS+= _errno.c +.endif + .include bsd.lib.mk
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Oct 27 18:46:43 UTC 2011 Modified Files: src/doc: HACKS Log Message: librt needs the ppc64 hack too. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.117 src/doc/HACKS:1.118 --- src/doc/HACKS:1.117 Thu Oct 27 13:21:27 2011 +++ src/doc/HACKS Thu Oct 27 14:46:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.117 2011/10/27 17:21:27 christos Exp $ +# $NetBSD: HACKS,v 1.118 2011/10/27 18:46:43 christos Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -673,6 +673,7 @@ port powerpc64 cdate Thu Oct 27 13:19:47 EDT 2011 who christos file src/lib/libposix/Makefile: 1.15 + file src/lib/librt/Makefile: 1.14 descr workaround for: libposix_pic.a(cerror.pico)(.text+0x14): unresolvable \
CVS commit: src/lib/libposix
Module Name:src Committed By: christos Date: Thu Oct 27 19:56:50 UTC 2011 Modified Files: src/lib/libposix: Makefile Log Message: remove second _errno.h To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/lib/libposix/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libposix/Makefile diff -u src/lib/libposix/Makefile:1.15 src/lib/libposix/Makefile:1.16 --- src/lib/libposix/Makefile:1.15 Thu Oct 27 13:18:09 2011 +++ src/lib/libposix/Makefile Thu Oct 27 15:56:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2011/10/27 17:18:09 christos Exp $ +# $NetBSD: Makefile,v 1.16 2011/10/27 19:56:50 christos Exp $ LIB= posix @@ -21,6 +21,5 @@ SRCS+= _errno.c .endif .include ${.CURDIR}/sys/Makefile.inc -SRCS+=_errno.c .include bsd.lib.mk
CVS commit: src/sys/net
Module Name:src Committed By: dyoung Date: Thu Oct 27 20:04:57 UTC 2011 Modified Files: src/sys/net: if_gif.c if_gre.c Log Message: Fix gif(4)/gre(4) operation over interfaces such as wm(4) that do IPv4 checksum-offload. Note well: it really is necessary to clear the csum_data. While I'm here, remove the do-nothing case for SIOCSIFDSTADDR and let ifioctl_common() or the protocol handle it. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/net/if_gif.c cvs rdiff -u -r1.146 -r1.147 src/sys/net/if_gre.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/if_gif.c diff -u src/sys/net/if_gif.c:1.78 src/sys/net/if_gif.c:1.79 --- src/sys/net/if_gif.c:1.78 Mon Apr 5 07:22:23 2010 +++ src/sys/net/if_gif.c Thu Oct 27 20:04:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gif.c,v 1.78 2010/04/05 07:22:23 joerg Exp $ */ +/* $NetBSD: if_gif.c,v 1.79 2011/10/27 20:04:57 dyoung Exp $ */ /* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */ /* @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_gif.c,v 1.78 2010/04/05 07:22:23 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: if_gif.c,v 1.79 2011/10/27 20:04:57 dyoung Exp $); #include opt_inet.h #include opt_iso.h @@ -312,6 +312,10 @@ gif_output(struct ifnet *ifp, struct mbu } *mtod(m, int *) = dst-sa_family; + /* Clear checksum-offload flags. */ + m-m_pkthdr.csum_flags = 0; + m-m_pkthdr.csum_data = 0; + s = splnet(); IFQ_ENQUEUE(ifp-if_snd, m, pktattr, error); if (error) { @@ -493,9 +497,6 @@ gif_ioctl(struct ifnet *ifp, u_long cmd, ifp-if_flags |= IFF_UP; break; - case SIOCSIFDSTADDR: - break; - case SIOCADDMULTI: case SIOCDELMULTI: switch (ifr-ifr_addr.sa_family) { Index: src/sys/net/if_gre.c diff -u src/sys/net/if_gre.c:1.146 src/sys/net/if_gre.c:1.147 --- src/sys/net/if_gre.c:1.146 Wed Oct 19 21:59:38 2011 +++ src/sys/net/if_gre.c Thu Oct 27 20:04:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gre.c,v 1.146 2011/10/19 21:59:38 dyoung Exp $ */ +/* $NetBSD: if_gre.c,v 1.147 2011/10/27 20:04:57 dyoung Exp $ */ /* * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.146 2011/10/19 21:59:38 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: if_gre.c,v 1.147 2011/10/27 20:04:57 dyoung Exp $); #include opt_atalk.h #include opt_gre.h @@ -993,6 +993,10 @@ gre_output(struct ifnet *ifp, struct mbu ifp-if_opackets++; ifp-if_obytes += m-m_pkthdr.len; + /* Clear checksum-offload flags. */ + m-m_pkthdr.csum_flags = 0; + m-m_pkthdr.csum_data = 0; + /* send it off */ if ((error = gre_bufq_enqueue(sc-sc_snd, m)) != 0) { sc-sc_oflow_ev.ev_count++; @@ -1265,8 +1269,6 @@ gre_ioctl(struct ifnet *ifp, const u_lon gre_clearconf(sp, false); ifp-if_flags |= IFF_UP; goto mksocket; - case SIOCSIFDSTADDR: - break; case SIOCSIFFLAGS: if ((error = ifioctl_common(ifp, cmd, data)) != 0) break;
CVS commit: src/sys/kern
Module Name:src Committed By: seanb Date: Thu Oct 27 21:10:55 UTC 2011 Modified Files: src/sys/kern: uipc_domain.c Log Message: Use PR_SLOWHZ, PR_FASTHZ defines in a couple spots. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/kern/uipc_domain.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/uipc_domain.c diff -u src/sys/kern/uipc_domain.c:1.86 src/sys/kern/uipc_domain.c:1.87 --- src/sys/kern/uipc_domain.c:1.86 Sun May 29 03:32:46 2011 +++ src/sys/kern/uipc_domain.c Thu Oct 27 21:10:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_domain.c,v 1.86 2011/05/29 03:32:46 manu Exp $ */ +/* $NetBSD: uipc_domain.c,v 1.87 2011/10/27 21:10:55 seanb Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: uipc_domain.c,v 1.86 2011/05/29 03:32:46 manu Exp $); +__KERNEL_RCSID(0, $NetBSD: uipc_domain.c,v 1.87 2011/10/27 21:10:55 seanb Exp $); #include sys/param.h #include sys/socket.h @@ -602,7 +602,7 @@ pfslowtimo(void *arg) if (pr-pr_slowtimo) (*pr-pr_slowtimo)(); } - callout_schedule(pfslowtimo_ch, hz / 2); + callout_schedule(pfslowtimo_ch, hz / PR_SLOWHZ); } void @@ -618,5 +618,5 @@ pffasttimo(void *arg) if (pr-pr_fasttimo) (*pr-pr_fasttimo)(); } - callout_schedule(pffasttimo_ch, hz / 5); + callout_schedule(pffasttimo_ch, hz / PR_FASTHZ); }
CVS commit: src
Module Name:src Committed By: rkujawa Date: Thu Oct 27 22:12:24 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4/man4.amiga: Makefile src/sys/arch/amiga/conf: GENERIC.in files.amiga Added Files: src/share/man/man4/man4.amiga: efa.4 src/sys/arch/amiga/dev: efa.c efareg.h efavar.h Log Message: Add driver for ELBOX FastATA 1200 Mk-III/Mk-IV (and the man page). To generate a diff of this commit: cvs rdiff -u -r1.1350 -r1.1351 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/man4.amiga/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.amiga/efa.4 cvs rdiff -u -r1.84 -r1.85 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.148 -r1.149 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/dev/efa.c \ src/sys/arch/amiga/dev/efareg.h src/sys/arch/amiga/dev/efavar.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/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1350 src/distrib/sets/lists/man/mi:1.1351 --- src/distrib/sets/lists/man/mi:1.1350 Tue Oct 18 10:19:11 2011 +++ src/distrib/sets/lists/man/mi Thu Oct 27 22:12:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1350 2011/10/18 10:19:11 wiz Exp $ +# $NetBSD: mi,v 1.1351 2011/10/27 22:12:24 rkujawa Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -728,6 +728,7 @@ ./usr/share/man/cat4/amiga/bppcsc.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/console.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/ed.0 man-sys-catman .cat +./usr/share/man/cat4/amiga/efa.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/es.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/fdc.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/grf.0 man-sys-catman .cat @@ -3604,6 +3605,7 @@ ./usr/share/man/html4/amiga/bppcsc.html man-sys-htmlman html ./usr/share/man/html4/amiga/console.html man-sys-htmlman html ./usr/share/man/html4/amiga/ed.html man-sys-htmlman html +./usr/share/man/html4/amiga/efa.html man-sys-htmlman html ./usr/share/man/html4/amiga/es.html man-sys-htmlman html ./usr/share/man/html4/amiga/fdc.html man-sys-htmlman html ./usr/share/man/html4/amiga/grf.html man-sys-htmlman html @@ -6177,6 +6179,7 @@ ./usr/share/man/man4/amiga/bppcsc.4 man-sys-man .man ./usr/share/man/man4/amiga/console.4 man-sys-man .man ./usr/share/man/man4/amiga/ed.4 man-sys-man .man +./usr/share/man/man4/amiga/efa.4 man-sys-man .man ./usr/share/man/man4/amiga/es.4 man-sys-man .man ./usr/share/man/man4/amiga/fdc.4 man-sys-man .man ./usr/share/man/man4/amiga/grf.4 man-sys-man .man Index: src/share/man/man4/man4.amiga/Makefile diff -u src/share/man/man4/man4.amiga/Makefile:1.20 src/share/man/man4/man4.amiga/Makefile:1.21 --- src/share/man/man4/man4.amiga/Makefile:1.20 Sat Sep 17 17:04:22 2011 +++ src/share/man/man4/man4.amiga/Makefile Thu Oct 27 22:12:24 2011 @@ -1,8 +1,8 @@ # from: @(#)Makefile 8.2 (Berkeley) 2/16/94 -# $NetBSD: Makefile,v 1.20 2011/09/17 17:04:22 rkujawa Exp $ +# $NetBSD: Makefile,v 1.21 2011/10/27 22:12:24 rkujawa Exp $ MAN= afsc.4 ahsc.4 amidisplaycc.4 atzsc.4 autoconf.4 console.4 bah.4 \ - bppcsc.4 ed.4 es.4 fdc.4 grf.4 \ + bppcsc.4 ed.4 efa.4 es.4 fdc.4 grf.4 \ grfcl.4 grfcv.4 grfcv3d.4 grfet.4 grfrh.4 grfrt.4 grful.4 \ gtsc.4 intro.4 ite.4 mem.4 mfcs.4 mgnsc.4 mppb.4 p5pb.4 \ qn.4 ser.4 wesc.4 zssc.4 Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.84 src/sys/arch/amiga/conf/GENERIC.in:1.85 --- src/sys/arch/amiga/conf/GENERIC.in:1.84 Mon Sep 19 19:15:29 2011 +++ src/sys/arch/amiga/conf/GENERIC.in Thu Oct 27 22:12:23 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.84 2011/09/19 19:15:29 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.85 2011/10/27 22:12:23 rkujawa Exp $ # ## # GENERIC machine description file @@ -57,7 +57,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.84 $ +#ident GENERIC-$Revision: 1.85 $ m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS=-Os @@ -528,8 +528,10 @@ scsibus* at empsc0 wdc0 at mainbus0 # A4000 A1200 IDE bus wdc* at zbus0 # Buddha / Catweasel +#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV atabus* at wdc? channel ? # ATA bus +#atabus* at efa? channel ? # ATA bus wd* at atabus? drive ? # + drives atapibus* at atabus? # ATAPI bus cd* at atapibus? drive ? # ATAPI CD-ROM drives Index: src/sys/arch/amiga/conf/files.amiga diff -u src/sys/arch/amiga/conf/files.amiga:1.148 src/sys/arch/amiga/conf/files.amiga:1.149 --- src/sys/arch/amiga/conf/files.amiga:1.148 Mon Sep 19 19:15:29 2011 +++ src/sys/arch/amiga/conf/files.amiga Thu Oct 27 22:12:23 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.amiga,v 1.148 2011/09/19 19:15:29 rkujawa Exp $ +# $NetBSD:
CVS commit: src/sys/arch/amiga/conf
Module Name:src Committed By: rkujawa Date: Thu Oct 27 22:13:42 UTC 2011 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC INSTALL Log Message: regen kernel configs To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.143 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.272 -r1.273 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amiga/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.142 src/sys/arch/amiga/conf/DRACO:1.143 --- src/sys/arch/amiga/conf/DRACO:1.142 Mon Sep 19 19:15:28 2011 +++ src/sys/arch/amiga/conf/DRACO Thu Oct 27 22:13:41 2011 @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.142 2011/09/19 19:15:28 rkujawa Exp $ +# $NetBSD: DRACO,v 1.143 2011/10/27 22:13:41 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.83 2011/09/17 16:55:34 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.85 2011/10/27 22:12:23 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.142 $ +#ident GENERIC-$Revision: 1.143 $ maxusers 8 Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.272 src/sys/arch/amiga/conf/GENERIC:1.273 --- src/sys/arch/amiga/conf/GENERIC:1.272 Mon Sep 19 19:15:28 2011 +++ src/sys/arch/amiga/conf/GENERIC Thu Oct 27 22:13:41 2011 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.272 2011/09/19 19:15:28 rkujawa Exp $ +# $NetBSD: GENERIC,v 1.273 2011/10/27 22:13:41 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.83 2011/09/17 16:55:34 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.85 2011/10/27 22:12:23 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.272 $ +#ident GENERIC-$Revision: 1.273 $ maxusers 8 @@ -427,8 +427,10 @@ scsibus* at empsc0 wdc0 at mainbus0 # A4000 A1200 IDE bus wdc* at zbus0 # Buddha / Catweasel +#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV atabus* at wdc? channel ? # ATA bus +#atabus* at efa? channel ? # ATA bus wd* at atabus? drive ? # + drives atapibus* at atabus? # ATAPI bus cd* at atapibus? drive ? # ATAPI CD-ROM drives Index: src/sys/arch/amiga/conf/INSTALL diff -u src/sys/arch/amiga/conf/INSTALL:1.94 src/sys/arch/amiga/conf/INSTALL:1.95 --- src/sys/arch/amiga/conf/INSTALL:1.94 Mon Sep 19 19:15:29 2011 +++ src/sys/arch/amiga/conf/INSTALL Thu Oct 27 22:13:42 2011 @@ -1,9 +1,9 @@ -# $NetBSD: INSTALL,v 1.94 2011/09/19 19:15:29 rkujawa Exp $ +# $NetBSD: INSTALL,v 1.95 2011/10/27 22:13:42 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.83 2011/09/17 16:55:34 rkujawa Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.85 2011/10/27 22:12:23 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.94 $ +#ident GENERIC-$Revision: 1.95 $ makeoptions COPTS=-Os @@ -373,8 +373,10 @@ scsibus* at empsc0 wdc0 at mainbus0 # A4000 A1200 IDE bus wdc* at zbus0 # Buddha / Catweasel +#efa0 at mainbus0 # ELBOX FastATA 1200 Mk-III/Mk-IV atabus* at wdc? channel ? # ATA bus +#atabus* at efa? channel ? # ATA bus wd* at atabus? drive ? # + drives atapibus* at atabus? # ATAPI bus cd* at atapibus? drive ? # ATAPI CD-ROM drives
CVS commit: src/doc
Module Name:src Committed By: rkujawa Date: Thu Oct 27 22:18:51 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Mention the new driver for FastATA 1200. To generate a diff of this commit: cvs rdiff -u -r1.1618 -r1.1619 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1618 src/doc/CHANGES:1.1619 --- src/doc/CHANGES:1.1618 Tue Oct 25 06:03:25 2011 +++ src/doc/CHANGES Thu Oct 27 22:18:50 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1618 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1619 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1149,3 +1149,4 @@ Changes from NetBSD 5.0 to NetBSD 6.0: sparc64: Switch to GDB 7.3.1. [mrg 20111024] arm: Switch to GDB 7.3.1. [mrg 20111024] powerpc: Switch to GDB 7.3.1. [mrg 20111024] + efa(4): Add driver for ELBOX FastATA 1200. [rkujawa 20111028]
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: wiz Date: Thu Oct 27 22:56:25 UTC 2011 Modified Files: src/share/man/man4/man4.amiga: efa.4 Log Message: Whitespace. New sentence, new line. Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.amiga/efa.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/efa.4 diff -u src/share/man/man4/man4.amiga/efa.4:1.1 src/share/man/man4/man4.amiga/efa.4:1.2 --- src/share/man/man4/man4.amiga/efa.4:1.1 Thu Oct 27 22:12:24 2011 +++ src/share/man/man4/man4.amiga/efa.4 Thu Oct 27 22:56:25 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: efa.4,v 1.1 2011/10/27 22:12:24 rkujawa Exp $ +.\ $NetBSD: efa.4,v 1.2 2011/10/27 22:56:25 wiz Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -43,27 +43,29 @@ The driver provides support for the FastATA 1200 family of IDE controllers and provides the interface with the hardware for the .Xr ata 4 -driver. PIO modes 0, 3, 4 and 5 are supported. +driver. +PIO modes 0, 3, 4 and 5 are supported. .\.Pp .\The following kernel configuration options are available: .\.Bl -ohang .\.It Cd options EFA_32BIT_IO -.\Use 32-bit data port. +.\Use 32-bit data port. .\.It Cd options EFA_GAYLE_COMPAT -.\Drive FastATA in Gayle IDE compatibility mode. Use if the driver does not -.\work correctly in native (default) mode. Limits operation to PIO0 mode. +.\Drive FastATA in Gayle IDE compatibility mode. +.\Use if the driver does not work correctly in native (default) mode. +.\Limits operation to PIO0 mode. .\.El .Sh HARDWARE The .Nm driver supports the following hardware: .Bl -tag -width ELBOX FastATA 1200 Mk-IV -offset indent -.It Em ELBOX FastATA 1200 Mk-III -.It Em ELBOX FastATA 1200 Mk-IV +.It Em ELBOX FastATA 1200 Mk-III +.It Em ELBOX FastATA 1200 Mk-IV .El .Sh SEE ALSO .Xr ata 4 , -.Xr wdc 4 +.Xr wdc 4 .Sh HISTORY The .Nm @@ -85,26 +87,27 @@ Older versions of FastATA 1200 are NOT s .El .Pp These devices do not generate hardware interrupts and need to be driven in -non-standard polling mode. Code needed to support it is present in driver -but does not work correctly. +non-standard polling mode. +Code needed to support it is present in driver but does not work correctly. .Pp Some of the above devices were also marketed under PowerFlyer and Winner brands. .Pp The .Nm -driver can not coexist with +driver can not coexist with .Xr wdc 4 driver attached to -.Xr mainbus 4 , -because FastATA 1200 hardware uses portions of the on-board Gayle IDE -controller. These -drivers should not be enabled in the same kernel. +.Xr mainbus 4 , +because FastATA 1200 hardware uses portions of the on-board Gayle IDE +controller. +These drivers should not be enabled in the same kernel. .Pp DMA modes are not supported, this is a hardware limitation. .Sh BUGS Performance is worse than with official AmigaOS driver from ELBOX. .Pp -Disks paritioned in split mode, which is specific to official AmigaOS FastATA -driver, are not recognized in NetBSD. +Disks partitioned in split mode, which is specific to official AmigaOS FastATA +driver, are not recognized in +.Nx . .Pp Improved probe procedure should be written.
CVS commit: src/sys/lib/libkern/arch/powerpc
Module Name:src Committed By: christos Date: Fri Oct 28 02:00:50 UTC 2011 Modified Files: src/sys/lib/libkern/arch/powerpc: gprsavrest.S Log Message: shouldn't need .size for ppc64. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libkern/arch/powerpc/gprsavrest.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/powerpc/gprsavrest.S diff -u src/sys/lib/libkern/arch/powerpc/gprsavrest.S:1.3 src/sys/lib/libkern/arch/powerpc/gprsavrest.S:1.4 --- src/sys/lib/libkern/arch/powerpc/gprsavrest.S:1.3 Fri Aug 12 10:48:00 2011 +++ src/sys/lib/libkern/arch/powerpc/gprsavrest.S Thu Oct 27 22:00:50 2011 @@ -29,23 +29,28 @@ #include powerpc/asm.h -__RCSID($NetBSD: gprsavrest.S,v 1.3 2011/08/12 14:48:00 matt Exp $) +__RCSID($NetBSD: gprsavrest.S,v 1.4 2011/10/28 02:00:50 christos Exp $) #ifndef RESTGPR -#define RESTGPR(n) RESTOREXGPR(_restgpr_,n,_x) -#define RESTGPR_END(n) RESTOREXGPR_END(_restgpr_,n,_x) -#define SAVEGPR(n) SAVEXGPR(_savegpr_,n,) -#define SAVEGPR_END(n) SAVEXGPR_END(_savegpr_,n,) +# define RESTGPR(n) RESTOREXGPR(_restgpr_,n,_x) +# define RESTGPR_END(n) RESTOREXGPR_END(_restgpr_,n,_x) +# define SAVEGPR(n) SAVEXGPR(_savegpr_,n,) +# define SAVEGPR_END(n) SAVEXGPR_END(_savegpr_,n,) #endif #define RESTOREXGPR(a,n,b) \ .hidden a##n##b; ENTRY_NOPROFILE(a##n##b); lwz n,(-4*(32-n))(11) -#define RESTOREXGPR_END(a,n,b) \ - .size a##n##b,.-a##n##b #define SAVEXGPR(a,n,b) \ .hidden a##n##b; ENTRY_NOPROFILE(a##n##b); stw n,(-4*(32-n))(11) -#define SAVEXGPR_END(a,n,b) \ +#ifdef _LP64 +# define SAVEXGPR_END(a,n,b) +# define RESTOREXGPR_END(a,n,b) +#else +# define SAVEXGPR_END(a,n,b) \ + .size a##n##b,.-a##n##b +# define RESTOREXGPR_END(a,n,b) \ .size a##n##b,.-a##n##b +#endif RESTGPR(14) RESTGPR(15)
CVS commit: src/external/gpl3/gcc/lib/libgcc/libgcc_s
Module Name:src Committed By: christos Date: Fri Oct 28 02:28:01 UTC 2011 Modified Files: src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile Log Message: Treat emips specially as we did with libgcc. Needs some of the softfloat functions, even if it does not MKSOFTFLOAT. XXX: still bad text relocations in eh_frame. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.3 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.4 --- src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.3 Mon Aug 15 05:19:21 2011 +++ src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Thu Oct 27 22:28:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/08/15 09:19:21 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2011/10/28 02:28:01 christos Exp $ USE_SHLIBDIR= yes REQUIRETOOLS= yes @@ -22,13 +22,14 @@ LDFLAGS+= -nodefaultlibs LDFLAGS+= -Wl,--version-script=${.OBJDIR}/libgcc.map # XXX handle this better? -.if ${MACHINE_CPU} == mips !(${MKSOFTFLOAT} != no) -G_LIB2ADD+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \ - ${GNUHOSTDIST}/gcc/config/floatunsisf.c +.if ${MACHINE} == emips || (${MACHINE_CPU} == mips !(${MKSOFTFLOAT} != no)) +G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \ + ${GNUHOSTDIST}/gcc/config/floatunsisf.c .endif SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \ - ${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS} + ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_HACK:T:S/.asm/.S/} \ + ${LIB1ASMFUNCS} COPTS.unwind-dw2.c = -Wno-stack-protector