Re: CVS commit: src/sys/arch/amd64/conf
On Wed, Feb 16, 2011 at 03:16:58AM +, Jean-Yves Migeon wrote: Module Name: src Committed By: jym Date: Wed Feb 16 03:16:58 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC INSTALL Log Message: Build certain file-systems and options(7) as module(7). 32 and 64 bits support are still builtin, as well as FFS, NFS, TMPFS, and most COMPAT code. Saves approx. 750kiB. Reflect this in INSTALL kernel, where we have to support more file systems statically. See http://mail-index.netbsd.org/port-amd64/2011/02/13/msg001318.html Are you going to add a MONOLITHIC kernel to match i386? Bernd
Re: CVS commit: src/sys/arch/amd64/conf
On Feb,Saturday 19 2011, at 11:27 AM, Bernd Ernesti wrote: On Wed, Feb 16, 2011 at 03:16:58AM +, Jean-Yves Migeon wrote: Module Name: src Committed By:jym Date:Wed Feb 16 03:16:58 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC INSTALL Log Message: Build certain file-systems and options(7) as module(7). 32 and 64 bits support are still builtin, as well as FFS, NFS, TMPFS, and most COMPAT code. Saves approx. 750kiB. Reflect this in INSTALL kernel, where we have to support more file systems statically. See http://mail-index.netbsd.org/port-amd64/2011/02/13/msg001318.html Are you going to add a MONOLITHIC kernel to match i386? I object against such change so I hope that we are not going to repeat such move. Regards Adam.
Re: CVS commit: src/sys/arch/amd64/conf
On 19.02.2011 10:27, Bernd Ernesti wrote: On Wed, Feb 16, 2011 at 03:16:58AM +, Jean-Yves Migeon wrote: Module Name: src Committed By:jym Date:Wed Feb 16 03:16:58 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC INSTALL Log Message: Build certain file-systems and options(7) as module(7). 32 and 64 bits support are still builtin, as well as FFS, NFS, TMPFS, and most COMPAT code. Saves approx. 750kiB. Reflect this in INSTALL kernel, where we have to support more file systems statically. See http://mail-index.netbsd.org/port-amd64/2011/02/13/msg001318.html Are you going to add a MONOLITHIC kernel to match i386? No. And honestly, I can't see why MONOLITHIC is needed in the first place: it was introduced as a quick fix for those that wanted to bluntly replace their old kernel with a new one, without risking crippling their system on reboot because ELF and FFS kmods were gone missing. I dare say that MONOLITHIC was a step in the wrong direction: instead of cutting down MODULAR options(4) from GENERIC, it would have been better to include everything as builtin modules, while still offering modular support. I can't see the difference of having MONOLITHIC instead of GENERIC with modules as builtins, except for cases where you want to block module loading, for security purposes. But there, you are better off removing most COMPAT code also, which means a new kernel build, anyway. I perfectly know that the question of what should be in, and what should stay as a third party kmod? is entirely debatable. I notified core@ about that, and wait for their answer. We could have the bare minimum builtin inside GENERIC, or provide most options(7) as kmods by default. -- Jean-Yves Migeon jeanyves.mig...@free.fr
Re: CVS commit: src/sys/arch/amd64/conf
jeanyves.mig...@free.fr said: I can't see why MONOLITHIC is needed in the first place I think before modular kernels are forced onto the masses, at least 2 design problems should be fixed: 1. Autoloading needs to be done differently: The kernel doesn't have the smarts to know which module is needed in which situation, and there is no fine-grained administrative control. I've complained in some other mail about the idiotic behavior in case of exec format loaders. 2. I don't want tons of modules which I'll never need installed into my root file system. As it was common in good old times (tm), my root filesystems are as small as possible. Now, with modules being added to the build, I have to squeeze out stuff after each update to keep some percent free space in /. best regards Matthias Forschungszentrum Juelich GmbH 52425 Juelich Sitz der Gesellschaft: Juelich Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498 Vorsitzender des Aufsichtsrats: MinDirig Dr. Karl Eugen Huthmacher Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender), Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt, Prof. Dr. Sebastian M. Schmidt
Re: CVS commit: src/sys/arch/amd64/conf
On Sat, Feb 19, 2011 at 05:13:58PM +0100, Matthias Drochner wrote: 2. I don't want tons of modules which I'll never need installed into my root file system. As it was common in good old times (tm), my root filesystems are as small as possible. Now, with modules being added to the build, I have to squeeze out stuff after each update to keep some percent free space in /. Have you measured how much modules supposedly increase the size compared to compiling things directly to the kernel? This seems like a rather silly point to me (without numbers, at least). - Jukka.
Re: CVS commit: src/sys/arch/amd64/conf
jruoho...@iki.fi said: Have you measured how much modules supposedly increase the size compared to compiling things directly to the kernel? This seems like a rather silly point to me (without numbers, at least). The difference is that I can control what is built into my kernel, but I can't control what modules are installed. best regards Matthias Forschungszentrum Juelich GmbH 52425 Juelich Sitz der Gesellschaft: Juelich Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498 Vorsitzender des Aufsichtsrats: MinDirig Dr. Karl Eugen Huthmacher Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender), Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt, Prof. Dr. Sebastian M. Schmidt
Re: CVS commit: src/sys/arch/amd64/conf
On 19.02.2011 17:13, Matthias Drochner wrote: jeanyves.mig...@free.fr said: I can't see why MONOLITHIC is needed in the first place I think before modular kernels are forced onto the masses, at least 2 design problems should be fixed: 1. Autoloading needs to be done differently: The kernel doesn't have the smarts to know which module is needed in which situation, and there is no fine-grained administrative control. I've complained in some other mail about the idiotic behavior in case of exec format loaders. 2. I don't want tons of modules which I'll never need installed into my root file system. As it was common in good old times (tm), my root filesystems are as small as possible. Now, with modules being added to the build, I have to squeeze out stuff after each update to keep some percent free space in /. 1. modules can be turned into builtins, and so you will end up in the same situation as MONOLITHIC, without sacrificing MODULAR. You can preserve monolithic behavior, but still load modules if you want to. 2. issue is the same as with monolithic-like kernels: instead of having code provided as third party files, code is directly embedded in. So what you are gaining as space in one place, you are losing it in another. Smaller file-system, bigger kernel, or the other way around. Granted, kernel does not necessarily reside under / . As said, it's all a matter of choice (which I cannot make). i386 GENERIC was a PITA as all options(4) were modules, thereby affecting boot at the smallest occasion. MONOLITHIC was brought back. On the contrary, amd64 GENERIC was monolithic in nature (most modules are builtins), mimicking i386 MONOLITHIC (but still having modules as possibility), and that did not seem to bother people. So either way, it's fine; but please -- i386 and amd64 should share common grounds. If some want a MONOLITHIC amd64, it's even possible, although I can't see the point given the arguments above. That would also save us a kernel build for i386 release. -- Jean-Yves Migeon jeanyves.mig...@free.fr
Re: CVS commit: src/lib/librumphijack
On Sat Feb 19 2011 at 14:58:45 +0100, Joerg Sonnenberger wrote: On Sat, Feb 19, 2011 at 01:10:36PM +, Antti Kantee wrote: Module Name:src Committed By: pooka Date: Sat Feb 19 13:10:35 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: hijack __getcwd() Why? to make it work -- älä karot toivorikkauttas, kyl rätei ja lumpui piisaa
Re: CVS commit: src/sys/arch
On Sat, Feb 19, 2011 at 01:52:29PM +, Jared D. McNeill wrote: Log Message: modularize VIA PadLock support - retire options VIA_PADLOCK, replace with 'padlock0 at cpu0' - driver supports attach detach - support building as a module Nice! Dave -- David Young OJC Technologies dyo...@ojctech.com Urbana, IL * (217) 344-0444 x24
Re: CVS commit: src/sys
On Sat, Feb 19, 2011 at 08:19:54PM +, Matt Thomas wrote: Log Message: Default PCU_UNIT_COUNT to 0. If 0, don't compile the contents of subr_pcu.c and don't include the pcu related members into struct lwp. Making a structure layout depend on an option is probably not a good idea! At least not unless the structure ends with a series of 'optional' sub-stuctures that are found by access functions (which may be #defines for things built into the kernel itself). David -- David Laight: da...@l8s.co.uk
Re: CVS commit: src/lib/librumphijack
On Sat, Feb 19, 2011 at 01:10:36PM +, Antti Kantee wrote: Module Name: src Committed By: pooka Date: Sat Feb 19 13:10:35 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: hijack __getcwd() Why? Joerg
Re: CVS commit: src/sys/arch
Any chance we get a padlock(4) man page for this? :) On Sat, 19 Feb 2011, Jared D. McNeill wrote: Module Name:src Committed By: jmcneill Date: Sat Feb 19 13:52:29 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC src/sys/arch/i386/i386: autoconf.c src/sys/arch/x86/conf: files.x86 src/sys/arch/x86/include: cpu.h cpuvar.h via_padlock.h src/sys/arch/x86/x86: cpu.c identcpu.c via_padlock.c Log Message: modularize VIA PadLock support - retire options VIA_PADLOCK, replace with 'padlock0 at cpu0' - driver supports attach detach - support building as a module To generate a diff of this commit: cvs rdiff -u -r1.288 -r1.289 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1017 -r1.1018 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/i386/autoconf.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/include/cpuvar.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/include/via_padlock.h cvs rdiff -u -r1.80 -r1.81 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/x86/via_padlock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. !DSPAM:4d5fcb2a2279290418422! - | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com| | Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net | | Kernel Developer | | pgoyette at netbsd.org | -
Re: CVS commit: src/lib/librumphijack
On Sat, Feb 19, 2011 at 07:54:25PM +0200, Antti Kantee wrote: On Sat Feb 19 2011 at 14:58:45 +0100, Joerg Sonnenberger wrote: On Sat, Feb 19, 2011 at 01:10:36PM +, Antti Kantee wrote: Module Name: src Committed By: pooka Date: Sat Feb 19 13:10:35 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: hijack __getcwd() Why? to make it work To make *what* work. What is using __getcwd directly and not the frontends. If this is yet another hack to deal with SSP, please apply the patch I send to tech-userlevel and test with that first. Joerg
Re: CVS commit: src/sys/arch/amd64/conf
On 2/19/2011 8:13 AM, Matthias Drochner wrote: I think before modular kernels are forced onto the masses, at least 2 design problems should be fixed: 1. Autoloading needs to be done differently: The kernel doesn't have the smarts to know which module is needed in which situation, and there is no fine-grained administrative control. I've complained in some other mail about the idiotic behavior in case of exec format loaders. Do you mean (for example) a more direct relationship between the kernel and the modules of the same vintage? (My major issue with modules is that a non-essential, but used module that is installed in an otherwise working system is a PITA to revert...boot with modules disabled, find the manually-backed-up version of the broken module, restore it, then reboot again...and cross your fingers there are no unforeseen inter-dependencies). If that's not what you mean, can you elaborate?
CVS commit: src/sys/net
Module Name:src
Committed By: enami
Date: Sat Feb 19 08:46:41 UTC 2011
Modified Files:
src/sys/net: bpf_filter.c
Log Message:
Fix userland build.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/net/bpf_filter.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/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.44 src/sys/net/bpf_filter.c:1.45
--- src/sys/net/bpf_filter.c:1.44 Sat Feb 19 04:10:47 2011
+++ src/sys/net/bpf_filter.c Sat Feb 19 08:46:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.44 2011/02/19 04:10:47 christos Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.45 2011/02/19 08:46:41 enami Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.44 2011/02/19 04:10:47 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.45 2011/02/19 08:46:41 enami Exp $);
#if 0
#if !(defined(lint) || defined(KERNEL))
@@ -467,9 +467,10 @@
int
bpf_validate(const struct bpf_insn *f, int signed_len)
{
- u_int i, from, len, ok = 0, size;
+ u_int i, from, len, ok = 0;
const struct bpf_insn *p;
#if defined(KERNEL) || defined(_KERNEL)
+ u_int size;
uint16_t *mem, invalid;
#endif
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sat Feb 19 09:52:32 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi.c acpi_wakedev.c acpi_wakedev.h
Log Message:
Revisit the wake-device code once more.
1. Remove the AcpiEnableGpe() call. This was wrong.
2. Only call _PSW or _DSW for devices that are scheduled for wake.
This was an old bug.
3. Only enable wake GPEs during suspend. Disabling these for
devices not setup for wake was causing problems.
4. No wake GPEs should be enabled at runtime.
Unconditionally disable these during resume.
This should make the wake-device code work again. Note that waking via
pckbd(4) has always been unreliable; the _PRW object is not typically located
under the PC keyboard object, but in the parent of it (e.g. the LPC bridge).
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_wakedev.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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.236 src/sys/dev/acpi/acpi.c:1.237
--- src/sys/dev/acpi/acpi.c:1.236 Thu Feb 17 19:36:49 2011
+++ src/sys/dev/acpi/acpi.c Sat Feb 19 09:52:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.236 2011/02/17 19:36:49 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.237 2011/02/19 09:52:32 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.236 2011/02/17 19:36:49 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.237 2011/02/19 09:52:32 jruoho Exp $);
#include opt_acpi.h
#include opt_pcifixup.h
@@ -1389,6 +1389,7 @@
(void)pmf_system_resume(PMF_Q_NONE);
}
+ acpi_wakedev_commit(sc, ACPI_STATE_S0);
break;
case ACPI_STATE_S5:
Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.23 src/sys/dev/acpi/acpi_wakedev.c:1.24
--- src/sys/dev/acpi/acpi_wakedev.c:1.23 Fri Feb 18 13:56:03 2011
+++ src/sys/dev/acpi/acpi_wakedev.c Sat Feb 19 09:52:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.23 2011/02/18 13:56:03 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.24 2011/02/19 09:52:32 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010, 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_wakedev.c,v 1.23 2011/02/18 13:56:03 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_wakedev.c,v 1.24 2011/02/19 09:52:32 jruoho Exp $);
#include sys/param.h
#include sys/device.h
@@ -54,8 +54,8 @@
static int32_t acpi_wakedev_acpinode = CTL_EOL;
static int32_t acpi_wakedev_wakenode = CTL_EOL;
-static void acpi_wakedev_power(struct acpi_devnode *, ACPI_OBJECT *);
-static void acpi_wakedev_set(struct acpi_devnode *, int);
+static void acpi_wakedev_power_add(struct acpi_devnode *, ACPI_OBJECT *);
+static void acpi_wakedev_power_set(struct acpi_devnode *, bool);
static void acpi_wakedev_method(struct acpi_devnode *, int);
void
@@ -143,13 +143,13 @@
elm = obj-Package.Elements[1];
if (elm-Type == ACPI_TYPE_INTEGER)
- ad-ad_wakedev-aw_sleep = elm-Integer.Value;
+ ad-ad_wakedev-aw_state = elm-Integer.Value;
/*
* The rest of the elements are reference
* handles to power resources. Store these.
*/
- acpi_wakedev_power(ad, obj);
+ acpi_wakedev_power_add(ad, obj);
/*
* Last but not least, mark the GPE for wake.
@@ -166,7 +166,7 @@
}
static void
-acpi_wakedev_power(struct acpi_devnode *ad, ACPI_OBJECT *obj)
+acpi_wakedev_power_add(struct acpi_devnode *ad, ACPI_OBJECT *obj)
{
struct acpi_wakedev *aw = ad-ad_wakedev;
uint32_t i, j, n;
@@ -194,6 +194,21 @@
}
}
+static void
+acpi_wakedev_power_set(struct acpi_devnode *ad, bool enable)
+{
+ struct acpi_wakedev *aw = ad-ad_wakedev;
+ uint8_t i;
+
+ for (i = 0; i __arraycount(aw-aw_power); i++) {
+
+ if (aw-aw_power[i] == NULL)
+ continue;
+
+ (void)acpi_power_res(aw-aw_power[i], ad-ad_handle, enable);
+ }
+}
+
void
acpi_wakedev_add(struct acpi_devnode *ad)
{
@@ -277,77 +292,39 @@
acpi_wakedev_commit(struct acpi_softc *sc, int state)
{
struct acpi_devnode *ad;
+ ACPI_INTEGER val;
+ ACPI_HANDLE hdl;
/*
* To prepare a device for wakeup:
*
- * 1. Set appropriate GPEs.
+ * 1. Set the wake GPE.
*
- * 2. Enable all power resources in _PRW.
+ * 2. Turn on power resources.
*
- * 3. If present, execute _DSW/_PSW method.
+ * 3. Execute _DSW or _PSW method.
*/
SIMPLEQ_FOREACH(ad, sc-ad_head, ad_list) {
if (ad-ad_wakedev == NULL)
continue;
- acpi_wakedev_set(ad, state);
- acpi_wakedev_method(ad, state);
- }
-}
-
-static void
-acpi_wakedev_set(struct acpi_devnode *ad, int state)
-{
- struct acpi_wakedev *aw = ad-ad_wakedev;
- ACPI_INTEGER val = aw-aw_number;
- ACPI_HANDLE hdl =
CVS commit: src/sys/sys
Module Name:src Committed By: jruoho Date: Sat Feb 19 09:54:01 UTC 2011 Modified Files: src/sys/sys: param.h Log Message: Bump kernel due recent ACPICA changes. (ACPI modules may panic, etc.). To generate a diff of this commit: cvs rdiff -u -r1.381 -r1.382 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.381 src/sys/sys/param.h:1.382 --- src/sys/sys/param.h:1.381 Tue Feb 1 01:40:00 2011 +++ src/sys/sys/param.h Sat Feb 19 09:54:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.381 2011/02/01 01:40:00 matt Exp $ */ +/* $NetBSD: param.h,v 1.382 2011/02/19 09:54:01 jruoho Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 599004500 /* NetBSD 5.99.45 */ +#define __NetBSD_Version__ 599004600 /* NetBSD 5.99.46 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: src/tests/rump/rumpkern/h_client
Module Name:src Committed By: pooka Date: Sat Feb 19 09:56:45 UTC 2011 Modified Files: src/tests/rump/rumpkern/h_client: h_reconcli.c Log Message: set reconnect property now that it's off by default To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/h_client/h_reconcli.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/rump/rumpkern/h_client/h_reconcli.c diff -u src/tests/rump/rumpkern/h_client/h_reconcli.c:1.1 src/tests/rump/rumpkern/h_client/h_reconcli.c:1.2 --- src/tests/rump/rumpkern/h_client/h_reconcli.c:1.1 Mon Jan 24 17:51:29 2011 +++ src/tests/rump/rumpkern/h_client/h_reconcli.c Sat Feb 19 09:56:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: h_reconcli.c,v 1.1 2011/01/24 17:51:29 pooka Exp $ */ +/* $NetBSD: h_reconcli.c,v 1.2 2011/02/19 09:56:45 pooka Exp $ */ #include sys/types.h #include sys/sysctl.h @@ -93,6 +93,7 @@ srandom(time(NULL)); + rumpclient_setconnretry(RUMPCLIENT_RETRYCONN_INFTIME); if (rumpclient_init() == -1) err(1, init);
CVS commit: src/tests/lib/librumpclient
Module Name:src
Committed By: pooka
Date: Sat Feb 19 09:59:12 UTC 2011
Modified Files:
src/tests/lib/librumpclient: t_exec.sh
Log Message:
Run sockstat with -n so that difference in /etc/services don't
affect the test outcome.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/librumpclient/t_exec.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumpclient/t_exec.sh
diff -u src/tests/lib/librumpclient/t_exec.sh:1.6 src/tests/lib/librumpclient/t_exec.sh:1.7
--- src/tests/lib/librumpclient/t_exec.sh:1.6 Wed Feb 16 19:31:31 2011
+++ src/tests/lib/librumpclient/t_exec.sh Sat Feb 19 09:59:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_exec.sh,v 1.6 2011/02/16 19:31:31 pooka Exp $
+# $NetBSD: t_exec.sh,v 1.7 2011/02/19 09:59:12 pooka Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -40,7 +40,7 @@
atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
atf_check -s exit:0 env $(atf_get_srcdir)/h_exec
- atf_check -s exit:0 -o save:sstat.out rump.sockstat
+ atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
atf_check -s exit:0 -o match:'^root.*h_exec.*tcp.*\*\.1234' \
sed -n 2p sstat.out
atf_check -s exit:0 -o match:'^root.*h_exec.*tcp.*\*\.2345' \
@@ -63,7 +63,7 @@
atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
atf_check -s exit:0 $(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec
- atf_check -s exit:0 -o save:sstat.out rump.sockstat
+ atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.1234' \
sed -n 2p sstat.out
atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.2345' \
@@ -87,7 +87,7 @@
atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
atf_check -s exit:0 \
$(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec cloexec1
- atf_check -s exit:0 -o save:sstat.out rump.sockstat
+ atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
atf_check -s exit:0 -o inline:'2\n' sed -n '$=' sstat.out
atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.2345' \
sed -n 2p sstat.out
@@ -110,7 +110,7 @@
atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
atf_check -s exit:0 \
$(atf_get_srcdir)/h_exec $(atf_get_srcdir)/h_exec vfork_please
- atf_check -s exit:0 -o save:sstat.out rump.sockstat
+ atf_check -s exit:0 -o save:sstat.out rump.sockstat -n
atf_check -s exit:0 -o inline:'5\n' sed -n '$=' sstat.out
atf_check -s exit:0 -o match:'^root.*h_ution.*tcp.*\*\.1234' \
cat sstat.out
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Sat Feb 19 10:54:31 UTC 2011 Modified Files: src/share/man/man4: aac.4 Log Message: add Adaptec RAID 3405 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/aac.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/aac.4 diff -u src/share/man/man4/aac.4:1.13 src/share/man/man4/aac.4:1.14 --- src/share/man/man4/aac.4:1.13 Thu May 8 19:09:33 2008 +++ src/share/man/man4/aac.4 Sat Feb 19 10:54:31 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: aac.4,v 1.13 2008/05/08 19:09:33 sborrill Exp $ +.\ $NetBSD: aac.4,v 1.14 2011/02/19 10:54:31 jmcneill Exp $ .\ .\ Copyright (c) 2000 Scott Long .\ All rights reserved. @@ -25,7 +25,7 @@ .\ SUCH DAMAGE. .\ .\ from FreeBSD: aac.4,v 1.18 2001/09/27 21:52:42 scottl Exp -.Dd March 10, 2007 +.Dd February 19, 2011 .Dt AAC 4 .Os .Sh NAME @@ -55,6 +55,8 @@ .It Adaptec SATA RAID 2410SA .It +Adaptec SATA RAID 3405 +.It Adaptec SCSI RAID 5400S .It Dell PERC 2/Si
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Sat Feb 19 13:07:53 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
support PF_OROUTE and PF_MPLS where available
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.54 src/lib/librumphijack/hijack.c:1.55
--- src/lib/librumphijack/hijack.c:1.54 Fri Feb 18 19:27:06 2011
+++ src/lib/librumphijack/hijack.c Sat Feb 19 13:07:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.54 2011/02/18 19:27:06 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.55 2011/02/19 13:07:53 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.54 2011/02/18 19:27:06 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.55 2011/02/19 13:07:53 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -325,8 +325,14 @@
{ PF_LOCAL, local },
{ PF_INET, inet },
{ PF_LINK, link },
+#ifdef PF_OROUTE
+ { PF_OROUTE, oroute },
+#endif
{ PF_ROUTE, route },
{ PF_INET6, inet6 },
+#ifdef PF_MPLS
+ { PF_MPLS, mpls },
+#endif
{ -1, NULL }
};
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Sat Feb 19 13:09:40 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
and now with less crazy whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.55 src/lib/librumphijack/hijack.c:1.56
--- src/lib/librumphijack/hijack.c:1.55 Sat Feb 19 13:07:53 2011
+++ src/lib/librumphijack/hijack.c Sat Feb 19 13:09:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.55 2011/02/19 13:07:53 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.56 2011/02/19 13:09:40 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.55 2011/02/19 13:07:53 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.56 2011/02/19 13:09:40 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -326,8 +326,8 @@
{ PF_INET, inet },
{ PF_LINK, link },
#ifdef PF_OROUTE
- { PF_OROUTE, oroute },
-#endif
+ { PF_OROUTE, oroute },
+#endif
{ PF_ROUTE, route },
{ PF_INET6, inet6 },
#ifdef PF_MPLS
CVS commit: src/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Sat Feb 19 13:10:35 UTC 2011
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
hijack __getcwd()
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.56 src/lib/librumphijack/hijack.c:1.57
--- src/lib/librumphijack/hijack.c:1.56 Sat Feb 19 13:09:40 2011
+++ src/lib/librumphijack/hijack.c Sat Feb 19 13:10:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.56 2011/02/19 13:09:40 pooka Exp $ */
+/* $NetBSD: hijack.c,v 1.57 2011/02/19 13:10:35 pooka Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: hijack.c,v 1.56 2011/02/19 13:09:40 pooka Exp $);
+__RCSID($NetBSD: hijack.c,v 1.57 2011/02/19 13:10:35 pooka Exp $);
#define __ssp_weak_name(fun) _hijack_ ## fun
@@ -87,6 +87,7 @@
DUALCALL_TRUNCATE, DUALCALL_FTRUNCATE,
DUALCALL_FSYNC, DUALCALL_FSYNC_RANGE,
DUALCALL_MOUNT, DUALCALL_UNMOUNT,
+ DUALCALL___GETCWD,
DUALCALL__NUM
};
@@ -138,6 +139,7 @@
int REALFUTIMES(int, const struct timeval [2]);
int REALMOUNT(const char *, const char *, int, void *, size_t);
off_t REALLSEEK(int, off_t, int);
+int __getcwd(char *, size_t);
#define S(a) __STRING(a)
struct sysnames {
@@ -200,6 +202,7 @@
{ DUALCALL_FSYNC_RANGE, fsync_range, RSYS_NAME(FSYNC_RANGE) },
{ DUALCALL_MOUNT, S(REALMOUNT), RSYS_NAME(MOUNT) },
{ DUALCALL_UNMOUNT, unmount, RSYS_NAME(UNMOUNT) },
+ { DUALCALL___GETCWD, __getcwd, RSYS_NAME(__GETCWD) },
};
#undef S
@@ -376,8 +379,15 @@
pathparser(char *buf)
{
+ /* sanity-check */
if (*buf != '/')
errx(1, hijack path specifier must begin with ``/'');
+ rumpprefixlen = strlen(buf);
+ if (rumpprefixlen 2)
+ errx(1, invalid hijack prefix: %s, buf);
+ if (buf[rumpprefixlen-1] == '/' strspn(buf, /) != rumpprefixlen)
+ errx(1, hijack prefix may end in slash only if pure
+ slash, gave %s, buf);
if ((rumpprefix = strdup(buf)) == NULL)
err(1, strdup);
@@ -698,6 +708,52 @@
}
int
+__getcwd(char *bufp, size_t len)
+{
+ int (*op___getcwd)(char *, size_t);
+ int rv;
+
+ if (pwdinrump) {
+ size_t prefixgap;
+ bool iamslash;
+
+ if (rumpprefix[rumpprefixlen-1] == '/')
+ iamslash = true;
+ else
+ iamslash = false;
+
+ if (iamslash)
+ prefixgap = rumpprefixlen - 1; /* ``//+path'' */
+ else
+ prefixgap = rumpprefixlen; /* ``/pfx+/path'' */
+ if (len = prefixgap) {
+ return ERANGE;
+ }
+
+ op___getcwd = GETSYSCALL(rump, __GETCWD);
+ rv = op___getcwd(bufp + prefixgap, len - prefixgap);
+ if (rv == -1)
+ return rv;
+
+ /* augment the / part only for a non-root path */
+ memcpy(bufp, rumpprefix, rumpprefixlen);
+
+ /* append / only to non-root cwd */
+ if (rv != 2)
+ bufp[prefixgap] = '/';
+
+ /* don't append extra slash in the purely-slash case */
+ if (rv == 2 !iamslash)
+ bufp[rumpprefixlen] = '\0';
+
+ return rv;
+ } else {
+ op___getcwd = GETSYSCALL(host, __GETCWD);
+ return op___getcwd(bufp, len);
+ }
+}
+
+int
rename(const char *from, const char *to)
{
int (*op_rename)(const char *, const char *);
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Sat Feb 19 13:19:53 UTC 2011
Modified Files:
src/tests/lib/librumphijack: Makefile
Added Files:
src/tests/lib/librumphijack: h_cwd.c t_cwd.sh
Log Message:
a basic getcwd() test
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/librumphijack/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/librumphijack/h_cwd.c \
src/tests/lib/librumphijack/t_cwd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/Makefile
diff -u src/tests/lib/librumphijack/Makefile:1.3 src/tests/lib/librumphijack/Makefile:1.4
--- src/tests/lib/librumphijack/Makefile:1.3 Mon Feb 14 15:14:00 2011
+++ src/tests/lib/librumphijack/Makefile Sat Feb 19 13:19:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/14 15:14:00 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2011/02/19 13:19:52 pooka Exp $
#
.include bsd.own.mk
@@ -6,9 +6,11 @@
TESTSDIR= ${TESTSBASE}/lib/librumphijack
TESTS_SH= t_asyncio
+TESTS_SH+= t_cwd
TESTS_SH+= t_tcpip
TESTS_C= h_client
TESTS_C+= h_netget
+TESTS_C+= h_cwd
FILES= netstat.expout index.html
FILESDIR= ${TESTSDIR}
Added files:
Index: src/tests/lib/librumphijack/h_cwd.c
diff -u /dev/null src/tests/lib/librumphijack/h_cwd.c:1.1
--- /dev/null Sat Feb 19 13:19:53 2011
+++ src/tests/lib/librumphijack/h_cwd.c Sat Feb 19 13:19:52 2011
@@ -0,0 +1,90 @@
+/* $NetBSD: h_cwd.c,v 1.1 2011/02/19 13:19:52 pooka Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
+ * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/types.h
+#include sys/stat.h
+
+#include err.h
+#include errno.h
+#include string.h
+#include unistd.h
+
+int
+main(void)
+{
+ char pwd[1024];
+
+ if (chdir(/rump) == -1)
+ err(1, chdir1);
+ if (getcwd(pwd, sizeof(pwd)) == NULL)
+ err(1, getcwd1);
+ if (strcmp(pwd, /rump) != 0)
+ errx(1, strcmp1);
+
+ if (mkdir(dir, 0777) == -1)
+ err(1, mkdir2);
+ if (chdir(dir) == -1)
+ err(1, chdir2);
+ if (getcwd(pwd, sizeof(pwd)) == NULL)
+ err(1, getcwd2);
+ if (strcmp(pwd, /rump/dir) != 0)
+ errx(1, strcmp2);
+
+ if (mkdir(dir, 0777) == -1)
+ err(1, mkdir3);
+ if (chdir(dir) == -1)
+ err(1, chdir3);
+ if (getcwd(pwd, sizeof(pwd)) == NULL)
+ err(1, getcwd3);
+ if (strcmp(pwd, /rump/dir/dir) != 0)
+ errx(1, strcmp3);
+
+ if (chdir(..) == -1)
+ err(1, chdir4);
+ if (getcwd(pwd, sizeof(pwd)) == NULL)
+ err(1, getcwd4);
+ if (strcmp(pwd, /rump/dir) != 0)
+ errx(1, strcmp4);
+
+ if (chdir(../../../../../../..) == -1)
+ err(1, chdir5);
+ if (getcwd(pwd, sizeof(pwd)) == NULL)
+ err(1, getcwd5);
+ if (strcmp(pwd, /rump) != 0)
+ errx(1, strcmp5);
+
+ if (chdir(/) == -1)
+ err(1, chdir6);
+ if (getcwd(pwd, sizeof(pwd)) == NULL)
+ err(1, getcwd6);
+ if (strcmp(pwd, /) != 0)
+ errx(1, strcmp6);
+
+ return 0;
+}
Index: src/tests/lib/librumphijack/t_cwd.sh
diff -u /dev/null src/tests/lib/librumphijack/t_cwd.sh:1.1
--- /dev/null Sat Feb 19 13:19:53 2011
+++ src/tests/lib/librumphijack/t_cwd.sh Sat Feb 19 13:19:52 2011
@@ -0,0 +1,53 @@
+# $NetBSD: t_cwd.sh,v 1.1 2011/02/19 13:19:52 pooka Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Sat Feb 19 13:21:05 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: new test To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.250 src/distrib/sets/lists/tests/mi:1.251 --- src/distrib/sets/lists/tests/mi:1.250 Fri Feb 18 13:10:04 2011 +++ src/distrib/sets/lists/tests/mi Sat Feb 19 13:21:05 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.250 2011/02/18 13:10:04 pooka Exp $ +# $NetBSD: mi,v 1.251 2011/02/19 13:21:05 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -477,6 +477,7 @@ ./usr/libdata/debug/usr/tests/lib/librumpclient/t_fd.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/librumphijack tests-lib-debug ./usr/libdata/debug/usr/tests/lib/librumphijack/h_client.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/librumphijack/h_cwd.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/librumphijack/h_netget.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libskeytests-lib-debug ./usr/libdata/debug/usr/tests/lib/libskey/t_algorithms.debug tests-lib-debug debug,atf,skey @@ -1914,10 +1915,12 @@ ./usr/tests/lib/librumphijack tests-lib-tests atf ./usr/tests/lib/librumphijack/Atffile tests-lib-tests atf ./usr/tests/lib/librumphijack/h_client tests-lib-tests atf +./usr/tests/lib/librumphijack/h_cwd tests-lib-tests atf ./usr/tests/lib/librumphijack/h_netget tests-lib-tests atf ./usr/tests/lib/librumphijack/index.html tests-lib-tests atf ./usr/tests/lib/librumphijack/netstat.expout tests-lib-tests atf ./usr/tests/lib/librumphijack/t_asyncio tests-lib-tests atf +./usr/tests/lib/librumphijack/t_cwd tests-lib-tests atf ./usr/tests/lib/librumphijack/t_tcpip tests-lib-tests atf ./usr/tests/lib/librumphijack/ssh_config.in tests-lib-tests atf ./usr/tests/lib/librumphijack/ssh_host_key tests-lib-tests atf
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: jmcneill
Date: Sat Feb 19 13:34:38 UTC 2011
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
fix printing of padlock features
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.23 src/usr.sbin/cpuctl/arch/i386.c:1.24
--- src/usr.sbin/cpuctl/arch/i386.c:1.23 Wed Dec 15 17:09:07 2010
+++ src/usr.sbin/cpuctl/arch/i386.c Sat Feb 19 13:34:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.23 2010/12/15 17:09:07 cegger Exp $ */
+/* $NetBSD: i386.c,v 1.24 2011/02/19 13:34:38 jmcneill Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: i386.c,v 1.23 2010/12/15 17:09:07 cegger Exp $);
+__RCSID($NetBSD: i386.c,v 1.24 2011/02/19 13:34:38 jmcneill Exp $);
#endif /* not lint */
#include sys/types.h
@@ -742,7 +742,7 @@
ci-ci_feat_val[2] |= descs[3];
}
- if (model 0x9)
+ if (model 0x9 || (model == 0x9 stepping 3))
return;
/* Nehemiah or Esther */
@@ -753,11 +753,7 @@
x86_cpuid(0xc001, descs);
lfunc = descs[3];
- if (model 0x9 || stepping = 8) { /* ACE */
- if (lfunc CPUID_VIA_HAS_ACE) {
- ci-ci_feat_val[4] = lfunc;
- }
- }
+ ci-ci_feat_val[4] = lfunc;
}
static const char *
@@ -1414,9 +1410,9 @@
feature_str[2] = CPUID_INTEL_EXT_FLAGS;
feature_str[3] = CPUID_INTEL_FLAGS4;
break;
- case CPUVENDOR_CYRIX:
+ case CPUVENDOR_IDT:
feature_str[4] = CPUID_FLAGS_PADLOCK;
- /* FALLTHRU */
+ break;
default:
break;
}
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Sat Feb 19 13:52:29 UTC 2011
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/i386/i386: autoconf.c
src/sys/arch/x86/conf: files.x86
src/sys/arch/x86/include: cpu.h cpuvar.h via_padlock.h
src/sys/arch/x86/x86: cpu.c identcpu.c via_padlock.c
Log Message:
modularize VIA PadLock support
- retire options VIA_PADLOCK, replace with 'padlock0 at cpu0'
- driver supports attach detach
- support building as a module
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1017 -r1.1018 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/include/cpuvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/include/via_padlock.h
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/x86/via_padlock.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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.288 src/sys/arch/i386/conf/ALL:1.289
--- src/sys/arch/i386/conf/ALL:1.288 Wed Feb 16 07:30:27 2011
+++ src/sys/arch/i386/conf/ALL Sat Feb 19 13:52:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.288 2011/02/16 07:30:27 jruoho Exp $
+# $NetBSD: ALL,v 1.289 2011/02/19 13:52:27 jmcneill Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident ALL-$Revision: 1.288 $
+#ident ALL-$Revision: 1.289 $
maxusers 64 # estimated number of users
@@ -40,7 +40,7 @@
options POWERNOW_K8
# VIA PadLock
-options VIA_PADLOCK
+padlock0 at cpu0
# Intel(R) On Demand Clock Modulation (aka ODCM)
options INTEL_ONDEMAND_CLOCKMOD
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1017 src/sys/arch/i386/conf/GENERIC:1.1018
--- src/sys/arch/i386/conf/GENERIC:1.1017 Sat Feb 19 00:13:55 2011
+++ src/sys/arch/i386/conf/GENERIC Sat Feb 19 13:52:27 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1017 2011/02/19 00:13:55 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.1018 2011/02/19 13:52:27 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident GENERIC-$Revision: 1.1017 $
+#ident GENERIC-$Revision: 1.1018 $
maxusers 64 # estimated number of users
@@ -48,7 +48,7 @@
options POWERNOW_K8
# VIA PadLock
-#options VIA_PADLOCK
+#padlock0 at cpu0
# Intel(R) On Demand Clock Modulation (aka ODCM)
#options INTEL_ONDEMAND_CLOCKMOD
Index: src/sys/arch/i386/i386/autoconf.c
diff -u src/sys/arch/i386/i386/autoconf.c:1.95 src/sys/arch/i386/i386/autoconf.c:1.96
--- src/sys/arch/i386/i386/autoconf.c:1.95 Sat Nov 21 03:11:00 2009
+++ src/sys/arch/i386/i386/autoconf.c Sat Feb 19 13:52:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.95 2009/11/21 03:11:00 rmind Exp $ */
+/* $NetBSD: autoconf.c,v 1.96 2011/02/19 13:52:28 jmcneill Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -46,7 +46,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.95 2009/11/21 03:11:00 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.96 2011/02/19 13:52:28 jmcneill Exp $);
#include opt_compat_oldboot.h
#include opt_intrdebug.h
@@ -94,8 +94,6 @@
#include machine/kvm86.h
#endif
-#include opt_viapadlock.h
-
/*
* Determine i/o configuration for a machine.
*/
@@ -140,8 +138,4 @@
#if NLAPIC 0
lapic_tpr = 0;
#endif
-
-#if defined(VIA_PADLOCK)
- via_padlock_attach();
-#endif
}
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.57 src/sys/arch/x86/conf/files.x86:1.58
--- src/sys/arch/x86/conf/files.x86:1.57 Sat Feb 5 14:00:34 2011
+++ src/sys/arch/x86/conf/files.x86 Sat Feb 19 13:52:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.57 2011/02/05 14:00:34 yamt Exp $
+# $NetBSD: files.x86,v 1.58 2011/02/19 13:52:28 jmcneill Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -29,24 +29,25 @@
# VIA C7 Temperature sensor
defflag opt_via_c7temp.h VIA_C7TEMP: sysmon_envsys
-# VIA PadLock support
-defflag opt_viapadlock.h VIA_PADLOCK: opencrypto
-file arch/x86/x86/via_padlock.c via_padlock
-
# To be able to test for NetBSD/xen in shared files
defflag opt_xen.h DO_NOT_DEFINE
define cpubus { [apid = -1] }
+define cpufeaturebus {}
define ioapicbus { [apid = -1] }
define ipmibus {}
#
# CPUs
#
-device cpu
+device cpu: cpufeaturebus
attach cpu at cpubus
file
CVS commit: src/sys/modules/padlock
Module Name:src
Committed By: jmcneill
Date: Sat Feb 19 14:25:30 UTC 2011
Added Files:
src/sys/modules/padlock: Makefile padlock.ioconf
Log Message:
add padlock module glue
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/padlock/Makefile \
src/sys/modules/padlock/padlock.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/padlock/Makefile
diff -u /dev/null src/sys/modules/padlock/Makefile:1.1
--- /dev/null Sat Feb 19 14:25:30 2011
+++ src/sys/modules/padlock/Makefile Sat Feb 19 14:25:30 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/02/19 14:25:30 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/arch/x86/x86
+
+KMOD= padlock
+IOCONF= padlock.ioconf
+SRCS= via_padlock.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/padlock/padlock.ioconf
diff -u /dev/null src/sys/modules/padlock/padlock.ioconf:1.1
--- /dev/null Sat Feb 19 14:25:30 2011
+++ src/sys/modules/padlock/padlock.ioconf Sat Feb 19 14:25:30 2011
@@ -0,0 +1,10 @@
+# $NetBSD: padlock.ioconf,v 1.1 2011/02/19 14:25:30 jmcneill Exp $
+
+ioconf padlock
+
+include conf/files
+include arch/x86/conf/files.x86
+
+pseudo-root cpufeaturebus*
+
+padlock0 at cpufeaturebus?
CVS commit: src
Module Name:src
Committed By: jmcneill
Date: Sat Feb 19 14:28:08 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.i386
src/sys/modules: Makefile
Log Message:
build padlock module on i386
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.61 -r1.62 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.15 src/distrib/sets/lists/modules/md.i386:1.16
--- src/distrib/sets/lists/modules/md.i386:1.15 Mon Feb 7 09:09:47 2011
+++ src/distrib/sets/lists/modules/md.i386 Sat Feb 19 14:28:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.15 2011/02/07 09:09:47 pooka Exp $
+# $NetBSD: md.i386,v 1.16 2011/02/19 14:28:08 jmcneill Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -57,6 +57,8 @@
./@MODULEDIR@/radeondrm/radeondrm.kmod base-kernel-modules kmod
./@MODULEDIR@/padbase-kernel-modules kmod
./@MODULEDIR@/pad/pad.kmod base-kernel-modules kmod
+./@MODULEDIR@/padlockbase-kernel-modules kmod
+./@MODULEDIR@/padlock/padlock.kmod base-kernel-modules kmod
./@MODULEDIR@/thinkpadbase-kernel-modules kmod
./@MODULEDIR@/thinkpad/thinkpad.kmod base-kernel-modules kmod
#./@MODULEDIR@/tprof_amdpmi base-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.61 src/sys/modules/Makefile:1.62
--- src/sys/modules/Makefile:1.61 Sat Feb 5 22:40:49 2011
+++ src/sys/modules/Makefile Sat Feb 19 14:28:07 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2011/02/05 22:40:49 christos Exp $
+# $NetBSD: Makefile,v 1.62 2011/02/19 14:28:07 jmcneill Exp $
.include bsd.own.mk
@@ -139,6 +139,7 @@
SUBDIR+= radeondrm
SUBDIR+= viadrm
SUBDIR+= pad
+SUBDIR+= padlock
.endif
.if ${MACHINE_ARCH} == i386 || \
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: drochner
Date: Sat Feb 19 16:26:34 UTC 2011
Modified Files:
src/sys/opencrypto: cryptodev.c files.opencrypto ocryptodev.c
ocryptodev.h
Added Files:
src/sys/opencrypto: cryptodev_internal.h
Log Message:
make the compatibility code conditional on COMPAT_50
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r0 -r1.1 src/sys/opencrypto/cryptodev_internal.h
cvs rdiff -u -r1.20 -r1.21 src/sys/opencrypto/files.opencrypto
cvs rdiff -u -r1.2 -r1.3 src/sys/opencrypto/ocryptodev.c
cvs rdiff -u -r1.1 -r1.2 src/sys/opencrypto/ocryptodev.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.54 src/sys/opencrypto/cryptodev.c:1.55
--- src/sys/opencrypto/cryptodev.c:1.54 Fri Feb 18 19:56:01 2011
+++ src/sys/opencrypto/cryptodev.c Sat Feb 19 16:26:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.54 2011/02/18 19:56:01 drochner Exp $ */
+/* $NetBSD: cryptodev.c,v 1.55 2011/02/19 16:26:34 drochner Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.54 2011/02/18 19:56:01 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.55 2011/02/19 16:26:34 drochner Exp $);
#include sys/param.h
#include sys/systm.h
@@ -87,8 +87,9 @@
#include sys/stat.h
#include opt_ocf.h
+#include opt_compat_netbsd.h
#include opencrypto/cryptodev.h
-#include opencrypto/ocryptodev.h
+#include opencrypto/cryptodev_internal.h
#include opencrypto/xform.h
struct csession {
@@ -184,7 +185,9 @@
int);
static int cryptodev_getstatus(struct fcrypt *, struct crypt_result *);
+#ifdef COMPAT_50
extern int ocryptof_ioctl(struct file *, u_long, void *);
+#endif
/*
* sysctl-able control variables for /dev/crypto now defined in crypto.c:
@@ -399,8 +402,12 @@
error = cryptodev_getstatus(fcr, (struct crypt_result *)data);
break;
default:
+#ifdef COMPAT_50
/* Check for backward compatible commands */
error = ocryptof_ioctl(fp, cmd, data);
+#else
+ return EINVAL;
+#endif
}
return error;
}
Index: src/sys/opencrypto/files.opencrypto
diff -u src/sys/opencrypto/files.opencrypto:1.20 src/sys/opencrypto/files.opencrypto:1.21
--- src/sys/opencrypto/files.opencrypto:1.20 Wed Mar 25 01:26:13 2009
+++ src/sys/opencrypto/files.opencrypto Sat Feb 19 16:26:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.opencrypto,v 1.20 2009/03/25 01:26:13 darran Exp $
+# $NetBSD: files.opencrypto,v 1.21 2011/02/19 16:26:34 drochner Exp $
#
#
@@ -23,6 +23,6 @@
# (and thus crypto hardware accelerators).
defpseudo crypto: opencrypto
file opencrypto/cryptodev.c crypto
-file opencrypto/ocryptodev.c crypto
+file opencrypto/ocryptodev.c crypto compat_50
defflag opt_ocf.h CRYPTO_DEBUG CRYPTO_TIMING
Index: src/sys/opencrypto/ocryptodev.c
diff -u src/sys/opencrypto/ocryptodev.c:1.2 src/sys/opencrypto/ocryptodev.c:1.3
--- src/sys/opencrypto/ocryptodev.c:1.2 Thu Mar 26 01:52:24 2009
+++ src/sys/opencrypto/ocryptodev.c Sat Feb 19 16:26:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.c,v 1.2 2009/03/26 01:52:24 mrg Exp $ */
+/* $NetBSD: ocryptodev.c,v 1.3 2011/02/19 16:26:34 drochner Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -69,7 +69,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ocryptodev.c,v 1.2 2009/03/26 01:52:24 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ocryptodev.c,v 1.3 2011/02/19 16:26:34 drochner Exp $);
#include sys/param.h
#include sys/systm.h
@@ -92,6 +92,7 @@
#include opt_ocf.h
#include opencrypto/cryptodev.h
+#include opencrypto/cryptodev_internal.h
#include opencrypto/ocryptodev.h
#include opencrypto/xform.h
Index: src/sys/opencrypto/ocryptodev.h
diff -u src/sys/opencrypto/ocryptodev.h:1.1 src/sys/opencrypto/ocryptodev.h:1.2
--- src/sys/opencrypto/ocryptodev.h:1.1 Wed Mar 25 01:26:13 2009
+++ src/sys/opencrypto/ocryptodev.h Sat Feb 19 16:26:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ocryptodev.h,v 1.1 2009/03/25 01:26:13 darran Exp $ */
+/* $NetBSD: ocryptodev.h,v 1.2 2011/02/19 16:26:34 drochner Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -163,20 +163,11 @@
struct ocrypt_n_op * reqs; /* where to get them */
};
-struct csession;
-struct fcrypt;
-
#define OCIOCGSESSION _IOWR('c', 101, struct osession_op)
#define OCIOCNGSESSION _IOWR('c', 106, struct ocrypt_sgop)
#define OCIOCCRYPT _IOWR('c', 103, struct ocrypt_op)
#define OCIOCNCRYPTM _IOWR('c', 107, struct
CVS commit: src/sys/net
Module Name:src
Committed By: christos
Date: Sat Feb 19 17:21:48 UTC 2011
Modified Files:
src/sys/net: bpf_filter.c
Log Message:
delint.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/net/bpf_filter.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/bpf_filter.c
diff -u src/sys/net/bpf_filter.c:1.45 src/sys/net/bpf_filter.c:1.46
--- src/sys/net/bpf_filter.c:1.45 Sat Feb 19 03:46:41 2011
+++ src/sys/net/bpf_filter.c Sat Feb 19 12:21:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf_filter.c,v 1.45 2011/02/19 08:46:41 enami Exp $ */
+/* $NetBSD: bpf_filter.c,v 1.46 2011/02/19 17:21:48 christos Exp $ */
/*-
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.45 2011/02/19 08:46:41 enami Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpf_filter.c,v 1.46 2011/02/19 17:21:48 christos Exp $);
#if 0
#if !(defined(lint) || defined(KERNEL))
@@ -149,8 +149,7 @@
A = 0;
X = 0;
--pc;
- /* CONSTCOND */
- while (1) {
+ for (;;) {
++pc;
switch (pc-code) {
@@ -159,6 +158,7 @@
return 0;
#else
abort();
+ /*NOTREACHED*/
#endif
case BPF_RET|BPF_K:
return (u_int)pc-k;
@@ -470,8 +470,8 @@
u_int i, from, len, ok = 0;
const struct bpf_insn *p;
#if defined(KERNEL) || defined(_KERNEL)
- u_int size;
uint16_t *mem, invalid;
+ size_t size;
#endif
len = (u_int)signed_len;
CVS commit: src/share/misc
Module Name:src
Committed By: jruoho
Date: Sat Feb 19 18:02:32 UTC 2011
Modified Files:
src/share/misc: acronyms.comp
Log Message:
AA, AAT, AC, ACK, ACL, AI, AL, AM, AMT, AOL, AP, ASIC, AT, BAL, BBS, BD, BP,
BTS, BW, CF, CLR, CMS, CN, CNC, CPS, CRC, CTM, CUA, DAO, DAP, DAT, DC, DDE,
DL, DSL, EPIC, ATL, EULA, FDC, FDD, FPR, FWS, GPR, GPT, HAT, HCL, HF, HMI,
HTT, ICE, IHV, IM, ISV, JGI, KB, KBD, LF, LTR, MB, MBS, MIMD, MISD, MPI,
MPP, MS, MT, MTBF, MTTF, MX, NACK, NAN, NC, PD, PLC, PME, PNP, PPI, PSW, PU,
RAD, RDM, RDMA, SAAS, SBU, SFC, SISD, SLOC, SOL, SP, SPMD, SPR, SSI, TAO,
TSO, TSP, UAC, UL, UMA, URN, VR, WOL, WOR, ZIF, ZMA.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.119 src/share/misc/acronyms.comp:1.120
--- src/share/misc/acronyms.comp:1.119 Sat Feb 12 19:33:16 2011
+++ src/share/misc/acronyms.comp Sat Feb 19 18:02:32 2011
@@ -1,9 +1,15 @@
-$NetBSD: acronyms.comp,v 1.119 2011/02/12 19:33:16 dholland Exp $
+$NetBSD: acronyms.comp,v 1.120 2011/02/19 18:02:32 jruoho Exp $
3WHS three-way handshake
+AA anti-aliasing
+AAT average access time
ABI application binary interface
+AC alternating current
ACID atomicity, consistency, isolation, durability
+ACK acknowledgement
+ACK Amsterdam compiler kit
ACL access control list
+ACL active current loop
ACPI advanced configuration and power interface
ADB Apple desktop bus
ADC analog [to] digital converter
@@ -13,12 +19,19 @@
AES Advanced Encryption Standard
AFS Andrew File System
AGP accelerated graphics port
+AI artificial intelligence
+AL access list
+AL active link
ALE address latch enable
ALU arithmetic and logical unit
+AM access method
AM amplitude modulation
AMI alternate mark inversion
+AMT active management technology
ANSI American National Standards Institute
+AOL alert on LAN
AP access point
+AP application processor
API application programming interface
APIC advanced programmable interrupt controller
ARAT always running APIC timer
@@ -29,10 +42,12 @@
ARQ automatic repeat request
AS autonomous system
ASCII American standard code for information interchange
+ASIC application-specific integrated circuit
ASLR address space layout randomization
ASN autonomous system number
AST abstract syntax tree
AST asynchronous trap
+AT access time
AT advanced technology
ATA advanced technology attachment
ATAPI advanced technology attachment packet interface
@@ -40,13 +55,16 @@
ATM asynchronous transfer mode
ATX advanced technology extended
AWK Aho, Werner, and Kernighan
+BAL basic assembly language
BAR base address register
+BBS bulletin board system
BCD binary coded decimal
BCS base configuration space
+BD baud
BEDO burst extended data output
BER basic encoding rules
BER bit error rate
-BFD binary formats descriptor
+BFD binary {file, format} descriptor
BFKL big fscking kernel lock
BFS breadth-first search
BGA ball grid array
@@ -59,6 +77,7 @@
BLOB binary large object
BMC baseboard management controller
BP base pointer
+BP boot processor
BPF Berkeley packet filter
BPS bits per second
BQS Berkeley quality software
@@ -69,6 +88,8 @@
BSS block started by symbol
BT Bluetooth
BT BitTorrent
+BTS bits per second
+BW bandwidth
CAD computer-aided design
CAM computer assisted manufacturing
CAM content addressable memory
@@ -82,6 +103,7 @@
CDDA compact disc digital audio
CDRAM cache dynamic random access memory
CER canonical encoding rules
+CF compact flash
CFG context-free grammar
CFG control-flow graph
CG control gate
@@ -95,19 +117,25 @@
CIS contact image sensor
CJK Chinese, Japanese, and Korean
CLI command line interface
+CLR common language runtime
CLUT color look-up table
CLV constant linear velocity (as opposed to CAV)
CMI control management interface
CMI control method interface
CMOS complementary metal-oxide-semiconductor
+CMS content management system
CMYK cyan magenta yellow black
+CN {common, canonical} name
+CNC computer numerical control
COF current operating frequency
COFF common object file format
COMA cache-only memory architecture
COW copy-on-write
CPL current privilege level
+CPS characters per second
CPU central processing unit
CR carriage return
+CRC cyclic redundancy check
CRLF carriage return line feed
CRT cathode ray tube
CS computer science
@@ -119,17 +147,24 @@
CSMA/CA carrier sense multiple access with collision avoidance
CSMA/CD carrier sense multiple access with collision detection
CSS cascading style sheets
+CTM close to metal
CTS clear to send
+CUA common user access
CVS concurrent versions system
DAC discretionary access control
DAC digital [to] analog converter
+DAO disk at once
+DAP directory access protocol
+DAT digital audio tape
DB database
DBMS database management system
+DC
CVS commit: src/sys/netipsec
Module Name:src
Committed By: degroote
Date: Sat Feb 19 18:26:51 UTC 2011
Modified Files:
src/sys/netipsec: xform_esp.c
Log Message:
Fix a missing const in FAST_IPSEC IPSEC_DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/netipsec/xform_esp.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/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.28 src/sys/netipsec/xform_esp.c:1.29
--- src/sys/netipsec/xform_esp.c:1.28 Fri Feb 18 20:40:58 2011
+++ src/sys/netipsec/xform_esp.c Sat Feb 19 18:26:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.28 2011/02/18 20:40:58 drochner Exp $ */
+/* $NetBSD: xform_esp.c,v 1.29 2011/02/19 18:26:50 degroote Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.28 2011/02/18 20:40:58 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: xform_esp.c,v 1.29 2011/02/19 18:26:50 degroote Exp $);
#include opt_inet.h
#ifdef __FreeBSD__
@@ -993,7 +993,7 @@
/* Emulate man-in-the-middle attack when ipsec_integrity is TRUE. */
if (ipsec_integrity) {
static unsigned char ipseczeroes[AH_HMAC_HASHLEN];
- struct auth_hash *esph;
+ const struct auth_hash *esph;
/*
* Corrupt HMAC if we want to test integrity verification of
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 19 19:17:34 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: fix symlink pathname examination (rationale-to-joerg: so that it works) To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/lib/librumphijack/hijack.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/librumphijack/hijack.c diff -u src/lib/librumphijack/hijack.c:1.57 src/lib/librumphijack/hijack.c:1.58 --- src/lib/librumphijack/hijack.c:1.57 Sat Feb 19 13:10:35 2011 +++ src/lib/librumphijack/hijack.c Sat Feb 19 19:17:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hijack.c,v 1.57 2011/02/19 13:10:35 pooka Exp $ */ +/* $NetBSD: hijack.c,v 1.58 2011/02/19 19:17:33 pooka Exp $ */ /*- * Copyright (c) 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: hijack.c,v 1.57 2011/02/19 13:10:35 pooka Exp $); +__RCSID($NetBSD: hijack.c,v 1.58 2011/02/19 19:17:33 pooka Exp $); #define __ssp_weak_name(fun) _hijack_ ## fun @@ -1695,9 +1695,9 @@ (path)) PATHCALL(int, symlink, DUALCALL_SYMLINK,\ - (const char *path, const char *target),\ + (const char *target, const char *path),\ (const char *, const char *), \ - (path, target)) + (target, path)) PATHCALL(ssize_t, readlink, DUALCALL_READLINK,\ (const char *path, char *buf, size_t bufsiz), \
CVS commit: src/sys/arch/powerpc/include
Module Name:src
Committed By: matt
Date: Sat Feb 19 19:18:11 UTC 2011
Modified Files:
src/sys/arch/powerpc/include: userret.h
Log Message:
Compare ci_veclwp against lwp0, not NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/userret.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/userret.h
diff -u src/sys/arch/powerpc/include/userret.h:1.18 src/sys/arch/powerpc/include/userret.h:1.19
--- src/sys/arch/powerpc/include/userret.h:1.18 Thu Feb 17 13:53:32 2011
+++ src/sys/arch/powerpc/include/userret.h Sat Feb 19 19:18:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: userret.h,v 1.18 2011/02/17 13:53:32 matt Exp $ */
+/* $NetBSD: userret.h,v 1.19 2011/02/19 19:18:11 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -91,7 +91,7 @@
* CPU, we need to stop any data streams that are active (since
* it will be a different address space).
*/
- if (ci-ci_veclwp != NULL ci-ci_veclwp != l) {
+ if (ci-ci_veclwp != lwp0 ci-ci_veclwp != l) {
__asm volatile(dssall;sync);
}
#endif
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sat Feb 19 19:39:28 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_ec.c Log Message: After the GPE handler has finished, inform ACPICA that the interrupt has been handled and it is safe to re-enable the GPE. Should fix all problems introduced during the merge of ACPICA 20110211. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/dev/acpi/acpi_ec.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/acpi/acpi_ec.c diff -u src/sys/dev/acpi/acpi_ec.c:1.69 src/sys/dev/acpi/acpi_ec.c:1.70 --- src/sys/dev/acpi/acpi_ec.c:1.69 Thu Feb 17 10:49:29 2011 +++ src/sys/dev/acpi/acpi_ec.c Sat Feb 19 19:39:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_ec.c,v 1.69 2011/02/17 10:49:29 jruoho Exp $ */ +/* $NetBSD: acpi_ec.c,v 1.70 2011/02/19 19:39:28 jruoho Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org. @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.69 2011/02/17 10:49:29 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.70 2011/02/19 19:39:28 jruoho Exp $); #include sys/param.h #include sys/callout.h @@ -853,7 +853,7 @@ acpiec_gpe_state_machine(dv); mutex_exit(sc-sc_mtx); - return 0; + return ACPI_INTERRUPT_HANDLED | ACPI_REENABLE_GPE; } ACPI_STATUS
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Sat Feb 19 19:42:07 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note ACPICA 20110211. To generate a diff of this commit: cvs rdiff -u -r1.813 -r1.814 src/doc/3RDPARTY cvs rdiff -u -r1.1507 -r1.1508 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/3RDPARTY diff -u src/doc/3RDPARTY:1.813 src/doc/3RDPARTY:1.814 --- src/doc/3RDPARTY:1.813 Fri Feb 18 22:45:46 2011 +++ src/doc/3RDPARTY Sat Feb 19 19:42:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.813 2011/02/18 22:45:46 aymeric Exp $ +# $NetBSD: 3RDPARTY,v 1.814 2011/02/19 19:42:07 jruoho Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -25,14 +25,14 @@ # remaining lines until the end of the record are notes. Package: acpica -Version: 20100528 +Version: 20110211 Current Vers: 20110211 -Maintainer: INTEL -Archive Site: http://www.acpica.org/downloads/unix_source_code.php +Maintainer: Intel +Archive Site: http://www.acpica.org/downloads/unix2_source_code.php Home Page: http://www.acpica.org/ Mailing List: de...@acpica.org -License: http://developer.intel.com/technology/iapc/acpi/license2.htm -Responsible: jmcneill +License: BSD +Responsible: jmcneill, jruoho Notes: The sources were integrated into src/sys/dev/acpi/acpica/Subsystem. Please read src/sys/dev/acpi/acpica/README before any modification. Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1507 src/doc/CHANGES:1.1508 --- src/doc/CHANGES:1.1507 Wed Feb 16 07:30:27 2011 +++ src/doc/CHANGES Sat Feb 19 19:42:07 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1507 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1508 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -858,3 +858,4 @@ hp700: Add support for HIL devices. From OpenBSD. [tsutsui 20110215] bind: Update to 9.8.0rc1: Response policy zones (RPZ) and DNS64 support. [christos 20110215] + acpi(4): Updated ACPICA to 20110211. [jruoho 20110217]
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Sat Feb 19 19:57:28 UTC 2011
Modified Files:
src/tests/lib/librumphijack: h_cwd.c t_cwd.sh
Log Message:
more test cases:
* // prefix
* fchdir
* cd-via-symlink
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumphijack/h_cwd.c \
src/tests/lib/librumphijack/t_cwd.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/h_cwd.c
diff -u src/tests/lib/librumphijack/h_cwd.c:1.1 src/tests/lib/librumphijack/h_cwd.c:1.2
--- src/tests/lib/librumphijack/h_cwd.c:1.1 Sat Feb 19 13:19:52 2011
+++ src/tests/lib/librumphijack/h_cwd.c Sat Feb 19 19:57:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: h_cwd.c,v 1.1 2011/02/19 13:19:52 pooka Exp $ */
+/* $NetBSD: h_cwd.c,v 1.2 2011/02/19 19:57:28 pooka Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,59 +32,136 @@
#include err.h
#include errno.h
+#include fcntl.h
#include string.h
#include unistd.h
-int
-main(void)
+static const char *prefix;
+static size_t prefixlen;
+static char buf[1024];
+static char pwd[1024];
+
+static const char *
+makepath(const char *tail)
+{
+
+ strcpy(buf, prefix);
+ if (prefix[prefixlen-1] != '/')
+ strcat(buf, /);
+ strcat(buf, tail);
+
+ return buf;
+}
+
+static void
+dochdir(const char *path, const char *errmsg)
+{
+
+ if (chdir(path) == -1)
+ err(1, %s, errmsg);
+}
+
+static void
+dofchdir(const char *path, const char *errmsg)
+{
+ int fd;
+
+ fd = open(path, O_RDONLY);
+ if (fd == -1)
+ err(1, open %s, errmsg);
+ if (fchdir(fd) == -1)
+ err(1, fchdir %s, errmsg);
+ close(fd);
+}
+static void (*thechdir)(const char *, const char *);
+
+static void
+simple(void)
{
- char pwd[1024];
- if (chdir(/rump) == -1)
- err(1, chdir1);
+ thechdir(prefix, chdir1);
if (getcwd(pwd, sizeof(pwd)) == NULL)
err(1, getcwd1);
- if (strcmp(pwd, /rump) != 0)
+ if (strcmp(pwd, prefix) != 0)
errx(1, strcmp1);
if (mkdir(dir, 0777) == -1)
err(1, mkdir2);
- if (chdir(dir) == -1)
- err(1, chdir2);
+ thechdir(dir, chdir2);
if (getcwd(pwd, sizeof(pwd)) == NULL)
err(1, getcwd2);
- if (strcmp(pwd, /rump/dir) != 0)
+ if (strcmp(pwd, makepath(dir)) != 0)
errx(1, strcmp2);
if (mkdir(dir, 0777) == -1)
err(1, mkdir3);
- if (chdir(dir) == -1)
- err(1, chdir3);
+ thechdir(dir, chdir3);
if (getcwd(pwd, sizeof(pwd)) == NULL)
err(1, getcwd3);
- if (strcmp(pwd, /rump/dir/dir) != 0)
+ if (strcmp(pwd, makepath(dir/dir)) != 0)
errx(1, strcmp3);
- if (chdir(..) == -1)
- err(1, chdir4);
+ thechdir(.., chdir4);
if (getcwd(pwd, sizeof(pwd)) == NULL)
err(1, getcwd4);
- if (strcmp(pwd, /rump/dir) != 0)
+ if (strcmp(pwd, makepath(dir)) != 0)
errx(1, strcmp4);
- if (chdir(../../../../../../..) == -1)
- err(1, chdir5);
+
+ thechdir(../../../../../../.., chdir5);
if (getcwd(pwd, sizeof(pwd)) == NULL)
err(1, getcwd5);
- if (strcmp(pwd, /rump) != 0)
+ if (strcmp(pwd, prefix) != 0)
errx(1, strcmp5);
- if (chdir(/) == -1)
- err(1, chdir6);
+ thechdir(/, chdir6);
if (getcwd(pwd, sizeof(pwd)) == NULL)
err(1, getcwd6);
if (strcmp(pwd, /) != 0)
errx(1, strcmp6);
+}
+
+static void
+symlinktest(void)
+{
+
+ thechdir(prefix, chdir1);
+ if (mkdir(adir, 0777) == -1)
+ err(1, mkdir1);
+ if (mkdir(anotherdir, 0777) == -1)
+ err(1, mkdir2);
+
+ if (symlink(/adir, anotherdir/lincthesink) == -1)
+ err(1, symlink);
+
+ thechdir(anotherdir/lincthesink, chdir2);
+ if (getcwd(pwd, sizeof(pwd)) == NULL)
+ err(1, getcwd);
+ if (strcmp(pwd, makepath(adir)) != 0)
+ errx(1, strcmp);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+ if (argc != 4)
+ errx(1, usage);
+
+ prefix = argv[1];
+ prefixlen = strlen(argv[1]);
+
+ if (strcmp(argv[3], chdir) == 0)
+ thechdir = dochdir;
+ else if (strcmp(argv[3], fchdir) == 0)
+ thechdir = dofchdir;
+ else
+ errx(1, invalid chdir type);
+
+ if (strcmp(argv[2], simple) == 0)
+ simple();
+ if (strcmp(argv[2], symlink) == 0)
+ symlinktest();
return 0;
}
Index: src/tests/lib/librumphijack/t_cwd.sh
diff -u src/tests/lib/librumphijack/t_cwd.sh:1.1 src/tests/lib/librumphijack/t_cwd.sh:1.2
--- src/tests/lib/librumphijack/t_cwd.sh:1.1 Sat Feb 19 13:19:52 2011
+++ src/tests/lib/librumphijack/t_cwd.sh Sat Feb 19 19:57:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_cwd.sh,v 1.1 2011/02/19 13:19:52 pooka Exp $
+# $NetBSD: t_cwd.sh,v 1.2 2011/02/19 19:57:28 pooka Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -28,26 +28,45 @@
rumpsrv='rump_server -lrumpvfs'
export RUMP_SERVER=unix://csock
-atf_test_case basic cleanup
-basic_head()
-{
-atf_set descr basic cwd test
-}
-
-basic_body()
+test_case()
{
+ local name=${1}; shift
- atf_check -s exit:0 ${rumpsrv} ${RUMP_SERVER}
- atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
- $(atf_get_srcdir)/h_cwd
+ atf_test_case ${name} cleanup
+ eval
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Sat Feb 19 20:07:02 UTC 2011
Modified Files:
src/sys/dev/pci: agp_via.c
Log Message:
more AGP v3 fixes from FreeBSD:
- fix a typo when enabling the aperture (read wrong register)
- get_aperture/set_aperture: handle AGP v3 APSIZE register layout
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/agp_via.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/agp_via.c
diff -u src/sys/dev/pci/agp_via.c:1.20 src/sys/dev/pci/agp_via.c:1.21
--- src/sys/dev/pci/agp_via.c:1.20 Tue Feb 15 08:56:11 2011
+++ src/sys/dev/pci/agp_via.c Sat Feb 19 20:07:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_via.c,v 1.20 2011/02/15 08:56:11 jmcneill Exp $ */
+/* $NetBSD: agp_via.c,v 1.21 2011/02/19 20:07:02 jmcneill Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_via.c,v 1.20 2011/02/15 08:56:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_via.c,v 1.21 2011/02/19 20:07:02 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -154,7 +154,7 @@
gatt-ag_physical);
/* Enable the aperture. */
gartctrl = pci_conf_read(pa-pa_pc, pa-pa_tag,
- asc-regs[REG_ATTBASE]);
+ asc-regs[REG_GARTCTRL]);
pci_conf_write(pa-pa_pc, pa-pa_tag, asc-regs[REG_GARTCTRL],
gartctrl | (3 7));
}
@@ -188,41 +188,118 @@
struct agp_via_softc *asc = sc-as_chipc;
u_int32_t apsize;
- apsize = pci_conf_read(sc-as_pc, sc-as_tag, asc-regs[REG_APSIZE])
- 0x1f;
+ if (asc-regs == via_v2_regs) {
+ apsize = pci_conf_read(sc-as_pc, sc-as_tag,
+asc-regs[REG_APSIZE]) 0xff;
- /*
- * The size is determined by the number of low bits of
- * register APBASE which are forced to zero. The low 20 bits
- * are always forced to zero and each zero bit in the apsize
- * field just read forces the corresponding bit in the 27:20
- * to be zero. We calculate the aperture size accordingly.
- */
- return (((apsize ^ 0xff) 20) | ((1 20) - 1)) + 1;
+ /*
+ * The size is determined by the number of low bits of
+ * register APBASE which are forced to zero. The low 20 bits
+ * are always forced to zero and each zero bit in the apsize
+ * field just read forces the corresponding bit in the 27:20
+ * to be zero. We calculate the aperture size accordingly.
+ */
+ return (((apsize ^ 0xff) 20) | ((1 20) - 1)) + 1;
+ } else {
+ apsize = pci_conf_read(sc-as_pc, sc-as_tag,
+asc-regs[REG_APSIZE]) 0xfff;
+ switch (apsize) {
+ case 0x800:
+ return 0x8000;
+ case 0xc00:
+ return 0x4000;
+ case 0xe00:
+ return 0x2000;
+ case 0xf00:
+ return 0x1000;
+ case 0xf20:
+ return 0x0800;
+ case 0xf30:
+ return 0x0400;
+ case 0xf38:
+ return 0x0200;
+ case 0xf3c:
+ return 0x0100;
+ case 0xf3e:
+ return 0x0080;
+ case 0xf3f:
+ return 0x0040;
+ default:
+ aprint_error_dev(sc-as_dev,
+ invalid aperture setting 0x%x\n, apsize);
+ return 0;
+ }
+ }
}
static int
agp_via_set_aperture(struct agp_softc *sc, u_int32_t aperture)
{
struct agp_via_softc *asc = sc-as_chipc;
- u_int32_t apsize;
+ u_int32_t apsize, key;
pcireg_t reg;
- /*
- * Reverse the magic from get_aperture.
- */
- apsize = ((aperture - 1) 20) ^ 0xff;
-
- /*
- * Double check for sanity.
- */
- if apsize ^ 0xff) 20) | ((1 20) - 1)) + 1 != aperture)
- return EINVAL;
+ if (asc-regs == via_v2_regs) {
+ /*
+ * Reverse the magic from get_aperture.
+ */
+ apsize = ((aperture - 1) 20) ^ 0xff;
+
+ /*
+ * Double check for sanity.
+ */
+ if apsize ^ 0xff) 20) | ((1 20) - 1)) + 1 != aperture)
+ return EINVAL;
- reg = pci_conf_read(sc-as_pc, sc-as_tag, asc-regs[REG_APSIZE]);
- reg = ~0xff;
- reg |= apsize;
- pci_conf_write(sc-as_pc, sc-as_tag, asc-regs[REG_APSIZE], reg);
+ reg = pci_conf_read(sc-as_pc, sc-as_tag,
+ asc-regs[REG_APSIZE]);
+ reg = ~0xff;
+ reg |= apsize;
+ pci_conf_write(sc-as_pc, sc-as_tag,
+ asc-regs[REG_APSIZE], reg);
+ } else {
+ switch (aperture) {
+ case 0x8000:
+ key = 0x800;
+ break;
+ case 0x4000:
+ key = 0xc00;
+ break;
+ case 0x2000:
+ key = 0xe00;
+ break;
+ case 0x1000:
+ key = 0xf00;
+ break;
+ case 0x0800:
+ key = 0xf20;
+ break;
+ case 0x0400:
+ key = 0xf30;
+ break;
+ case 0x0200:
+ key = 0xf38;
+ break;
+ case 0x0100:
+ key = 0xf3c;
+ break;
+ case 0x0080:
+ key = 0xf3e;
+ break;
+ case 0x0040:
+ key = 0xf3f;
+ break;
+ default:
+ aprint_error_dev(sc-as_dev,
+ invalid aperture size (%dMB)\n,
+ aperture / 1024 / 1024);
+ return EINVAL;
+ }
+ reg = pci_conf_read(sc-as_pc, sc-as_tag, asc-regs[REG_APSIZE]);
+ reg = ~0xfff;
+ reg |= key;
+ pci_conf_write(sc-as_pc, sc-as_tag, asc-regs[REG_APSIZE], reg);
+ }
return 0;
}
CVS commit: src/sys
Module Name:src Committed By: matt Date: Sat Feb 19 20:19:54 UTC 2011 Modified Files: src/sys/conf: files src/sys/kern: subr_pcu.c src/sys/sys: lwp.h pcu.h Log Message: Default PCU_UNIT_COUNT to 0. If 0, don't compile the contents of subr_pcu.c and don't include the pcu related members into struct lwp. To generate a diff of this commit: cvs rdiff -u -r1.1000 -r1.1001 src/sys/conf/files cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_pcu.c cvs rdiff -u -r1.147 -r1.148 src/sys/sys/lwp.h cvs rdiff -u -r1.3 -r1.4 src/sys/sys/pcu.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/conf/files diff -u src/sys/conf/files:1.1000 src/sys/conf/files:1.1001 --- src/sys/conf/files:1.1000 Fri Feb 18 22:49:03 2011 +++ src/sys/conf/files Sat Feb 19 20:19:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1000 2011/02/18 22:49:03 rmind Exp $ +# $NetBSD: files,v 1.1001 2011/02/19 20:19:54 matt Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -1533,7 +1533,7 @@ file kern/subr_lwp_specificdata.c file kern/subr_once.c file kern/subr_optstr.c -file kern/subr_pcu.c pcu +file kern/subr_pcu.c file kern/subr_percpu.c file kern/subr_pool.c file kern/subr_prf.c Index: src/sys/kern/subr_pcu.c diff -u src/sys/kern/subr_pcu.c:1.2 src/sys/kern/subr_pcu.c:1.3 --- src/sys/kern/subr_pcu.c:1.2 Thu Feb 17 18:44:54 2011 +++ src/sys/kern/subr_pcu.c Sat Feb 19 20:19:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pcu.c,v 1.2 2011/02/17 18:44:54 matt Exp $ */ +/* $NetBSD: subr_pcu.c,v 1.3 2011/02/19 20:19:54 matt Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_pcu.c,v 1.2 2011/02/17 18:44:54 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_pcu.c,v 1.3 2011/02/19 20:19:54 matt Exp $); #include sys/param.h #include sys/cpu.h @@ -65,6 +65,8 @@ #include sys/pcu.h #include sys/xcall.h +#if PCU_UNIT_COUNT 0 + #define PCU_SAVE 0x01 /* Save PCU state to the LWP. */ #define PCU_RELEASE 0x02 /* Release PCU state on the CPU. */ @@ -256,3 +258,5 @@ return l-l_pcu_used (1 id); } + +#endif /* PCU_UNIT_COUNT 0 */ Index: src/sys/sys/lwp.h diff -u src/sys/sys/lwp.h:1.147 src/sys/sys/lwp.h:1.148 --- src/sys/sys/lwp.h:1.147 Sat Feb 19 00:22:50 2011 +++ src/sys/sys/lwp.h Sat Feb 19 20:19:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lwp.h,v 1.147 2011/02/19 00:22:50 jakllsch Exp $ */ +/* $NetBSD: lwp.h,v 1.148 2011/02/19 20:19:54 matt Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010 @@ -125,8 +125,10 @@ callout_t l_timeout_ch; /* !: callout for tsleep */ u_int l_emap_gen; /* !: emap generation number */ +#if PCU_UNIT_COUNT 0 struct cpu_info * volatile l_pcu_cpu[PCU_UNIT_COUNT]; uint32_t l_pcu_used; +#endif /* Process level and global state, misc. */ LIST_ENTRY(lwp) l_list; /* a: entry on list of all LWPs */ Index: src/sys/sys/pcu.h diff -u src/sys/sys/pcu.h:1.3 src/sys/sys/pcu.h:1.4 --- src/sys/sys/pcu.h:1.3 Thu Feb 17 19:58:34 2011 +++ src/sys/sys/pcu.h Sat Feb 19 20:19:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcu.h,v 1.3 2011/02/17 19:58:34 rmind Exp $ */ +/* $NetBSD: pcu.h,v 1.4 2011/02/19 20:19:54 matt Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -33,10 +33,10 @@ #define _SYS_PCU_H_ /* - * Default: one PCU for MD. + * Default: no PCU for MD. */ #ifndef PCU_UNIT_COUNT -#define PCU_UNIT_COUNT 1 +#define PCU_UNIT_COUNT 0 #endif #if defined(_KERNEL)
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riz Date: Sun Feb 20 01:26:23 UTC 2011 Modified Files: src/sys/dev/ic: mvsata.c Log Message: Use PRId64 instead of lld, and PRIx64 instead of llx when compiling with MVSATA_DEBUG. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/mvsata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/mvsata.c diff -u src/sys/dev/ic/mvsata.c:1.6 src/sys/dev/ic/mvsata.c:1.7 --- src/sys/dev/ic/mvsata.c:1.6 Tue Jul 13 12:57:22 2010 +++ src/sys/dev/ic/mvsata.c Sun Feb 20 01:26:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsata.c,v 1.6 2010/07/13 12:57:22 kiyohara Exp $ */ +/* $NetBSD: mvsata.c,v 1.7 2011/02/20 01:26:22 riz Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvsata.c,v 1.6 2010/07/13 12:57:22 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: mvsata.c,v 1.7 2011/02/20 01:26:22 riz Exp $); #include opt_mvsata.h @@ -492,9 +492,9 @@ struct atac_softc *atac = chp-ch_atac; struct ata_xfer *xfer; - DPRINTFN(1, (%s:%d: mvsata_bio: drive=%d, blkno=%lld, bcount=%ld\n, - device_xname(atac-atac_dev), chp-ch_channel, drvp-drive, - ata_bio-blkno, ata_bio-bcount)); + DPRINTFN(1, (%s:%d: mvsata_bio: drive=%d, blkno=% PRId64 + , bcount=%ld\n, device_xname(atac-atac_dev), chp-ch_channel, + drvp-drive, ata_bio-blkno, ata_bio-bcount)); xfer = ata_get_xfer(ATAXF_NOSLEEP); if (xfer == NULL) @@ -2330,7 +2330,7 @@ int quetag, erqqip, erqqop, next, rv, i; DPRINTFN(2, (%s:%d:%d: mvsata_edma_inqueue: - blkno=0x%llx, nbytes=%d, flags=0x%x\n, + blkno=0x% PRIx64 , nbytes=%d, flags=0x%x\n, device_xname(MVSATA_DEV2(mvport)), mvport-port_hc-hc, mvport-port, ata_bio-blkno, ata_bio-nbytes, ata_bio-flags));
CVS commit: src/crypto/external/bsd/libsaslc/dist
Module Name:src
Committed By: christos
Date: Sun Feb 20 01:59:46 UTC 2011
Modified Files:
src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3
src/crypto/external/bsd/libsaslc/dist/src: list.c list.h
mech_digestmd5.c mech_gssapi.c xsess.c
Log Message:
improve error handling, from Anon Ymous
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/dist/src/list.c
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/libsaslc/dist/src/list.h
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c \
src/crypto/external/bsd/libsaslc/dist/src/xsess.c
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/libsaslc/dist/man/libsaslc.3
diff -u src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.9 src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.10
--- src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3:1.9 Tue Feb 15 21:14:22 2011
+++ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 Sat Feb 19 20:59:46 2011
@@ -1,4 +1,4 @@
-.\ $NetBSD: libsaslc.3,v 1.9 2011/02/16 02:14:22 christos Exp $
+.\ $NetBSD: libsaslc.3,v 1.10 2011/02/20 01:59:46 christos Exp $
.\
.\ Copyright (c) 2010 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -34,7 +34,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd February 14, 2011
+.Dd February 18, 2011
.Dt LIBSASLC 3
.Os
.Sh NAME
@@ -778,6 +778,10 @@
authentication with a
.Xr postfix 1
SMTP server using the cyrus-sasl library.
+LOGIN, PLAIN, CRAM-MD5, and DIGEST-MD5 have also been tested and shown
+to work with a
+.Xr postfix 1
+SMTP server using a dovecot backend for authentication.
The DIGEST-MD5 and GSSAPI specs also provide for integrity and
confidentiality layers via the
.Fn saslc_sess_encode
Index: src/crypto/external/bsd/libsaslc/dist/src/list.c
diff -u src/crypto/external/bsd/libsaslc/dist/src/list.c:1.2 src/crypto/external/bsd/libsaslc/dist/src/list.c:1.3
--- src/crypto/external/bsd/libsaslc/dist/src/list.c:1.2 Sat Feb 12 18:21:32 2011
+++ src/crypto/external/bsd/libsaslc/dist/src/list.c Sat Feb 19 20:59:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: list.c,v 1.2 2011/02/12 23:21:32 christos Exp $ */
+/* $NetBSD: list.c,v 1.3 2011/02/20 01:59:46 christos Exp $ */
/* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: list.c,v 1.2 2011/02/12 23:21:32 christos Exp $);
+__RCSID($NetBSD: list.c,v 1.3 2011/02/20 01:59:46 christos Exp $);
#include stdio.h
#include stdlib.h
@@ -164,11 +164,14 @@
/**
* @brief Parse a list of the following format:
* ( *LWS element *( *LWS , *LWS element ))
+ * @param lp pointer to list_t type for returned list. Cannot be NULL.
* @param p string to parse
- * @return allocated list.
+ * @return 0 on success, -1 on error (no memory).
+ *
+ * Note: the list is allocated. Use saslc__list_free() to free it.
*/
-list_t *
-saslc__list_parse(const char *p)
+int
+saslc__list_parse(list_t **lp, const char *p)
{
const char *e, *n;
list_t *l, *t, **tp;
@@ -189,7 +192,7 @@
t = alloc_list(p, (size_t)(e - p));
if (t == NULL) {
saslc__list_free(l);
- return NULL;
+ return -1;
}
if (tp != NULL)
*tp = t;
@@ -197,7 +200,8 @@
l = t;
tp = t-next;
}
- return l;
+ *lp = l;
+ return 0;
}
/**
Index: src/crypto/external/bsd/libsaslc/dist/src/list.h
diff -u src/crypto/external/bsd/libsaslc/dist/src/list.h:1.1 src/crypto/external/bsd/libsaslc/dist/src/list.h:1.2
--- src/crypto/external/bsd/libsaslc/dist/src/list.h:1.1 Fri Feb 11 18:44:43 2011
+++ src/crypto/external/bsd/libsaslc/dist/src/list.h Sat Feb 19 20:59:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: list.h,v 1.1 2011/02/11 23:44:43 christos Exp $ */
+/* $NetBSD: list.h,v 1.2 2011/02/20 01:59:46 christos Exp $ */
/* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -49,6 +49,6 @@
uint32_t saslc__list_flags(list_t *, const named_flag_t *);
void saslc__list_free(list_t *);
void saslc__list_log(list_t *, const char *);
-list_t * saslc__list_parse(const char *);
+int saslc__list_parse(list_t **, const char *);
#endif /* ! _LIST_H_ */
Index: src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c
diff -u src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.9 src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.10
--- src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c:1.9 Tue Feb 15 21:14:22 2011
+++ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c Sat Feb 19 20:59:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD:
CVS commit: src/crypto/external/bsd/libsaslc
Module Name:src Committed By: christos Date: Sun Feb 20 02:12:31 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc: Makefile Added Files: src/crypto/external/bsd/libsaslc/etc: ANONYMOUS.conf CRAM-MD5.conf DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf Makefile PLAIN.conf README saslc.conf Log Message: Add example configuration file from Anon Ymous and a README file from me. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/libsaslc/Makefile cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf \ src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf \ src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf \ src/crypto/external/bsd/libsaslc/etc/LOGIN.conf \ src/crypto/external/bsd/libsaslc/etc/Makefile \ src/crypto/external/bsd/libsaslc/etc/PLAIN.conf \ src/crypto/external/bsd/libsaslc/etc/README \ src/crypto/external/bsd/libsaslc/etc/saslc.conf 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/libsaslc/Makefile diff -u src/crypto/external/bsd/libsaslc/Makefile:1.1.1.1 src/crypto/external/bsd/libsaslc/Makefile:1.2 --- src/crypto/external/bsd/libsaslc/Makefile:1.1.1.1 Sat Nov 27 16:23:57 2010 +++ src/crypto/external/bsd/libsaslc/Makefile Sat Feb 19 21:12:31 2011 @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/11/27 21:23:57 agc Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/20 02:12:31 christos Exp $ -SUBDIR+= lib +SUBDIR+= etc lib .include bsd.subdir.mk Added files: Index: src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf:1.1 --- /dev/null Sat Feb 19 21:12:31 2011 +++ src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf Sat Feb 19 21:12:31 2011 @@ -0,0 +1,8 @@ +# $NetBSD: ANONYMOUS.conf,v 1.1 2011/02/20 02:12:31 christos Exp $ +# +# The properties used by this mechanism are listed below. Usually no +# settings are needed. +# +# key value + +# AUTHCID authentication ID Index: src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf:1.1 --- /dev/null Sat Feb 19 21:12:31 2011 +++ src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf Sat Feb 19 21:12:31 2011 @@ -0,0 +1,9 @@ +# $NetBSD: CRAM-MD5.conf,v 1.1 2011/02/20 02:12:31 christos Exp $ +# +# The properties used by this mechanism are listed below. Usually no +# settings are needed. +# +# key value + +# AUTHCID username # usually passed by the caller +# PASSWD password # usually passed by the caller Index: src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf:1.1 --- /dev/null Sat Feb 19 21:12:31 2011 +++ src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf Sat Feb 19 21:12:31 2011 @@ -0,0 +1,17 @@ +# $NetBSD: DIGEST-MD5.conf,v 1.1 2011/02/20 02:12:31 christos Exp $ +# +# The properties used by this mechanism are listed below. Usually no +# settings are needed. +# +# key value + +# AUTHCID username # usually passed by the caller +# AUTHZID authorization ID # typically not used +# CIPHERMASK 3des,aes,des,rc4,rc4-40,rc4-56 # optional +# HOSTNAME hostname # usually passed by the caller +# MAXBUF 0x1# optional +# PASSWD password # usually passed by the caller +# QOPMASK auth,auth-int,auth-conf # optional +# REALM [hostname:]realm[,...] # for multiple realms +# SERVICE service to use, e.g., SMTP # usually passed by the caller +# SERVNAME [hostname:]serv-name[,...] # typically not used Index: src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf:1.1 --- /dev/null Sat Feb 19 21:12:31 2011 +++ src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf Sat Feb 19 21:12:31 2011 @@ -0,0 +1,8 @@ +# $NetBSD: EXTERNAL.conf,v 1.1 2011/02/20 02:12:31 christos Exp $ +# +# The properties used by this mechanism are listed below. Usually no +# settings are needed. +# +# key value + +# AUTHZID authorization ID # the server may need this Index: src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf:1.1 --- /dev/null Sat Feb 19 21:12:31 2011 +++ src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf Sat Feb 19 21:12:31 2011 @@ -0,0 +1,11 @@ +# $NetBSD: GSSAPI.conf,v 1.1 2011/02/20 02:12:31 christos Exp $ +# +# The properties used by this mechanism are listed below. Usually no +# settings are needed. +# +# key value + +# AUTHCID username # usually passed by the caller +# HOSTNAME hostname # usually passed by the caller +# QOPMASK auth,auth-int,auth-conf # optional +# SERVICE service to use, e.g., SMTP # usually passed by the caller Index:
CVS commit: src/crypto/external/bsd/libsaslc/etc
Module Name:src
Committed By: christos
Date: Sun Feb 20 02:14:43 UTC 2011
Modified Files:
src/crypto/external/bsd/libsaslc/etc: Makefile
Log Message:
don't install dirs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/libsaslc/etc/Makefile
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/libsaslc/etc/Makefile
diff -u src/crypto/external/bsd/libsaslc/etc/Makefile:1.1 src/crypto/external/bsd/libsaslc/etc/Makefile:1.2
--- src/crypto/external/bsd/libsaslc/etc/Makefile:1.1 Sat Feb 19 21:12:31 2011
+++ src/crypto/external/bsd/libsaslc/etc/Makefile Sat Feb 19 21:14:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/20 02:12:31 christos Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/20 02:14:42 christos Exp $
.include bsd.own.mk
@@ -16,7 +16,7 @@
CFG_MECH+= PLAIN.conf
install:
- ${INSTALL_FILE} -d -o root -g wheel -m 444 \
+ ${INSTALL_FILE} -o root -g wheel -m 444 \
${CFG_FILE} ${DESTDIR}${CFG_DIR}
- ${INSTALL_FILE} -d -o root -g wheel -m 444 \
+ ${INSTALL_FILE} -o root -g wheel -m 444 \
${CFG_MECH} ${DESTDIR}${CFG_DIR}/mech
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sun Feb 20 02:16:05 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Add the libsaslc example dir. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.74 src/etc/mtree/NetBSD.dist.base:1.75 --- src/etc/mtree/NetBSD.dist.base:1.74 Wed Jan 26 10:00:56 2011 +++ src/etc/mtree/NetBSD.dist.base Sat Feb 19 21:16:05 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.74 2011/01/26 15:00:56 pooka Exp $ +# $NetBSD: NetBSD.dist.base,v 1.75 2011/02/20 02:16:05 christos Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -51,6 +51,9 @@ ./etc/racoon ./etc/rc.conf.d ./etc/rc.d +./etc/saslc.d +./etc/saslc.d/postfix +./etc/saslc.d/postfix/mech ./etc/skel ./etc/sliphome ./etc/ssh @@ -320,6 +323,8 @@ ./usr/share/examples/ipf ./usr/share/examples/isdn ./usr/share/examples/kerberos +./usr/share/examples/libsaslc +./usr/share/examples/libsaslc/mech ./usr/share/examples/mount_portal ./usr/share/examples/openssl ./usr/share/examples/pf
CVS commit: src/distrib/sets
Module Name:src Committed By: christos Date: Sun Feb 20 02:26:40 UTC 2011 Modified Files: src/distrib/sets: comments deps descrs src/distrib/sets/lists/misc: mi Log Message: Add libsaslc examples. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/comments cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/deps cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/descrs cvs rdiff -u -r1.170 -r1.171 src/distrib/sets/lists/misc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/comments diff -u src/distrib/sets/comments:1.15 src/distrib/sets/comments:1.16 --- src/distrib/sets/comments:1.15 Mon Nov 30 11:13:23 2009 +++ src/distrib/sets/comments Sat Feb 19 21:26:40 2011 @@ -46,6 +46,7 @@ base-krb5-examples example configuration files for the Kerberos V network authentication system base-krb5-root root file system support for the Kerberos V network authentication system base-krb5-shlib root file system support for the Kerberos V network authentication system +base-libsaslc-examples example configuration files for the SASL C library base-locale-Pig igPey atinLey ocaleley upportsey (Pig-Latin locale support) base-locale-bin utilities for working with locales base-locale-ca Catalan language locale support @@ -441,6 +442,7 @@ misc-ipf-examples example configuration files for IPfilter misc-isdn-examples example configuration files for isdn misc-krb5-examples example configuration files for Kerberos5 +misc-libsaslc-examples example configuration files for libsaslc misc-netutil-examples example configuration files for network software misc-ntp-htmldoc HTML documentation for ntp(8) software misc-pf-examples Index: src/distrib/sets/deps diff -u src/distrib/sets/deps:1.12 src/distrib/sets/deps:1.13 --- src/distrib/sets/deps:1.12 Thu Dec 3 07:22:58 2009 +++ src/distrib/sets/deps Sat Feb 19 21:26:40 2011 @@ -43,6 +43,7 @@ base-krb5-examples base-sys-share base-krb5-root base-sys-root base-krb5-shlib base-sys-usr +base-libsaslc-examples base-sys-share base-locale-Pig base-locale-share base-locale-bg base-locale-share base-locale-bin base-sys-usr @@ -466,6 +467,7 @@ misc-fstab-examples base-fstab-examples misc-isdn-examples base-isdn-examples misc-krb5-examples base-krb5-examples +misc-libsaslc-examples base-libsaslc-examples misc-netutil-examples base-netutil-examples misc-ntp-htmldoc base-man-share misc-postfix-examples base-postfix-examples Index: src/distrib/sets/descrs diff -u src/distrib/sets/descrs:1.16 src/distrib/sets/descrs:1.17 --- src/distrib/sets/descrs:1.16 Mon Nov 30 11:13:23 2009 +++ src/distrib/sets/descrs Sat Feb 19 21:26:40 2011 @@ -45,6 +45,7 @@ base-krb5-examples example configuration files for the Kerberos V network authentication system base-krb5-root root file system support for the Kerberos V network authentication system base-krb5-shlib root file system support for the Kerberos V network authentication system +base-libsaslc-examples example configuration files for the SASL C library base-locale-Pig igPey atinLey ocaleley upportsey base-locale-af Afghan language locale support base-locale-be Belgian language locale support @@ -701,6 +702,7 @@ misc-ipf-examples example configuration files for IPfilter misc-isdn-examples example configuration files for isdn misc-krb5-examples example configuration files for Kerberos5 +misc-libsaslc-examples example configuration files for libsaslc misc-netutil-examples example configuration files for network software misc-ntp-htmldoc HTML documentation for ntp(8) software misc-pf-examples example configuration files for the PF packet filter Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.170 src/distrib/sets/lists/misc/mi:1.171 --- src/distrib/sets/lists/misc/mi:1.170 Sat Sep 25 06:35:59 2010 +++ src/distrib/sets/lists/misc/mi Sat Feb 19 21:26:40 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.170 2010/09/25 10:35:59 wiz Exp $ +# $NetBSD: mi,v 1.171 2011/02/20 02:26:40 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -732,6 +732,16 @@ ./usr/share/examples/isdn/isdnd.rates.UK.BT misc-isdn-examples share ./usr/share/examples/isdn/isdnd.rc.sample misc-isdn-examples share ./usr/share/examples/kerberos/krb5.conf misc-krb5-examples kerberos,share +./usr/share/examples/libsaslc/README misc-libsaslc-examples share +./usr/share/examples/libsaslc/mech misc-libsaslc-examples share +./usr/share/examples/libsaslc/saslc.conf misc-libsaslc-examples share +./usr/share/examples/libsaslc/mech/ANONYMOUS.conf misc-libsaslc-examples share +./usr/share/examples/libsaslc/mech/CRAM-MD5.conf misc-libsaslc-examples share +./usr/share/examples/libsaslc/mech/DIGEST-MD5.conf misc-libsaslc-examples share +./usr/share/examples/libsaslc/mech/EXTERNAL.conf misc-libsaslc-examples share +./usr/share/examples/libsaslc/mech/GSSAPI.conf
CVS commit: src/sys/external/isc/atheros_hal/ic
Module Name:src
Committed By: jmcneill
Date: Sun Feb 20 03:55:19 UTC 2011
Modified Files:
src/sys/external/isc/atheros_hal/ic: ah_osdep.c opt_ah.h
Log Message:
support building as a module
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/isc/atheros_hal/ic/ah_osdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/isc/atheros_hal/ic/opt_ah.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/external/isc/atheros_hal/ic/ah_osdep.c
diff -u src/sys/external/isc/atheros_hal/ic/ah_osdep.c:1.3 src/sys/external/isc/atheros_hal/ic/ah_osdep.c:1.4
--- src/sys/external/isc/atheros_hal/ic/ah_osdep.c:1.3 Fri Aug 7 21:01:48 2009
+++ src/sys/external/isc/atheros_hal/ic/ah_osdep.c Sun Feb 20 03:55:18 2011
@@ -26,13 +26,15 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: ah_osdep.c,v 1.3 2009/08/07 21:01:48 sborrill Exp $
+ * $Id: ah_osdep.c,v 1.4 2011/02/20 03:55:18 jmcneill Exp $
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ah_osdep.c,v 1.3 2009/08/07 21:01:48 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: ah_osdep.c,v 1.4 2011/02/20 03:55:18 jmcneill Exp $);
+#ifdef _KERNEL_OPT
#include opt_athhal.h
+#endif
#include sys/param.h
#include sys/systm.h
@@ -41,6 +43,7 @@
#include sys/malloc.h
#include sys/proc.h
#include sys/kauth.h
+#include sys/module.h
#include machine/stdarg.h
@@ -437,3 +440,17 @@
{
return memcpy(dst, src, n);
}
+
+MODULE(MODULE_CLASS_MISC, ath_hal, NULL);
+
+static int
+ath_hal_modcmd(modcmd_t cmd, void *opaque)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ case MODULE_CMD_FINI:
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/external/isc/atheros_hal/ic/opt_ah.h
diff -u src/sys/external/isc/atheros_hal/ic/opt_ah.h:1.1 src/sys/external/isc/atheros_hal/ic/opt_ah.h:1.2
--- src/sys/external/isc/atheros_hal/ic/opt_ah.h:1.1 Thu Dec 11 05:37:40 2008
+++ src/sys/external/isc/atheros_hal/ic/opt_ah.h Sun Feb 20 03:55:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_ah.h,v 1.1 2008/12/11 05:37:40 alc Exp $ */
+/* $NetBSD: opt_ah.h,v 1.2 2011/02/20 03:55:18 jmcneill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,9 @@
#ifndef OPT_AH_H
#define OPT_AH_H
+#ifdef _KERNEL_OPT
#include opt_athhal.h
+#endif
#ifdef ATHHAL_ASSERT
#define AH_ASSERT 1
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sun Feb 20 03:55:56 UTC 2011
Modified Files:
src/sys/dev/ic: ath.c ath_netbsd.c athrate-sample.c
Log Message:
support building as a module
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ic/ath.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/ath_netbsd.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/athrate-sample.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.109 src/sys/dev/ic/ath.c:1.110
--- src/sys/dev/ic/ath.c:1.109 Mon Apr 5 07:19:33 2010
+++ src/sys/dev/ic/ath.c Sun Feb 20 03:55:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.109 2010/04/05 07:19:33 joerg Exp $ */
+/* $NetBSD: ath.c,v 1.110 2011/02/20 03:55:56 jmcneill Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID($FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ath.c,v 1.109 2010/04/05 07:19:33 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ath.c,v 1.110 2011/02/20 03:55:56 jmcneill Exp $);
#endif
/*
@@ -51,7 +51,9 @@
* is greatly appreciated.
*/
+#ifdef _KERNEL_OPT
#include opt_inet.h
+#endif
#include sys/param.h
#include sys/reboot.h
Index: src/sys/dev/ic/ath_netbsd.c
diff -u src/sys/dev/ic/ath_netbsd.c:1.18 src/sys/dev/ic/ath_netbsd.c:1.19
--- src/sys/dev/ic/ath_netbsd.c:1.18 Fri Jan 21 17:46:19 2011
+++ src/sys/dev/ic/ath_netbsd.c Sun Feb 20 03:55:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ath_netbsd.c,v 1.18 2011/01/21 17:46:19 dyoung Exp $ */
+/* $NetBSD: ath_netbsd.c,v 1.19 2011/02/20 03:55:56 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ath_netbsd.c,v 1.18 2011/01/21 17:46:19 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ath_netbsd.c,v 1.19 2011/02/20 03:55:56 jmcneill Exp $);
#include sys/param.h
#include sys/types.h
@@ -44,6 +44,7 @@
#include machine/stdarg.h
#include sys/endian.h
#include sys/device.h
+#include sys/module.h
#include net/if.h
#include net/if_dl.h
@@ -521,3 +522,17 @@
err:
printf(%s: sysctl_createv failed, rc = %d\n, __func__, rc);
}
+
+MODULE(MODULE_CLASS_MISC, ath, ath_hal);
+
+static int
+ath_modcmd(modcmd_t cmd, void *opaque)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ case MODULE_CMD_FINI:
+ return 0;
+ default:
+ return ENOTTY;
+ }
+}
Index: src/sys/dev/ic/athrate-sample.c
diff -u src/sys/dev/ic/athrate-sample.c:1.17 src/sys/dev/ic/athrate-sample.c:1.18
--- src/sys/dev/ic/athrate-sample.c:1.17 Thu Dec 11 05:45:29 2008
+++ src/sys/dev/ic/athrate-sample.c Sun Feb 20 03:55:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: athrate-sample.c,v 1.17 2008/12/11 05:45:29 alc Exp $ */
+/* $NetBSD: athrate-sample.c,v 1.18 2011/02/20 03:55:56 jmcneill Exp $ */
/*-
* Copyright (c) 2005 John Bicket
@@ -41,14 +41,16 @@
__FBSDID($FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.9 2005/07/22 16:50:17 sam Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: athrate-sample.c,v 1.17 2008/12/11 05:45:29 alc Exp $);
+__KERNEL_RCSID(0, $NetBSD: athrate-sample.c,v 1.18 2011/02/20 03:55:56 jmcneill Exp $);
#endif
/*
* John Bicket's SampleRate control algorithm.
*/
+#ifdef _KERNEL_OPT
#include opt_inet.h
+#endif
#include sys/param.h
#include sys/systm.h
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: agc Date: Sun Feb 20 03:56:36 UTC 2011 Modified Files: src/external/bsd/iscsi/dist/src/lib: libiscsi.3 Log Message: manual page improvements, from enami tsugutomo, with thanks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/iscsi/dist/src/lib/libiscsi.3 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/iscsi/dist/src/lib/libiscsi.3 diff -u src/external/bsd/iscsi/dist/src/lib/libiscsi.3:1.3 src/external/bsd/iscsi/dist/src/lib/libiscsi.3:1.4 --- src/external/bsd/iscsi/dist/src/lib/libiscsi.3:1.3 Wed Jul 15 09:50:08 2009 +++ src/external/bsd/iscsi/dist/src/lib/libiscsi.3 Sun Feb 20 03:56:36 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: libiscsi.3,v 1.3 2009/07/15 09:50:08 joerg Exp $ +.\ $NetBSD: libiscsi.3,v 1.4 2011/02/20 03:56:36 agc Exp $ .\ .\ Copyright (c) 2009 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 June 24, 2009 +.Dd February 19, 2011 .Dt LIBISCSI 3 .Os .Sh NAME @@ -148,7 +148,7 @@ are serving up block storage according to the variables which have already been set. .Sh SEE ALSO -.Xr iscsi-initiator 8 +.Xr iscsi-initiator 8 , .Xr iscsi-target 8 .Sh HISTORY The @@ -156,7 +156,8 @@ library first appeared in .Nx 4.0 . This programmatic interface to the -.Nm library first appeared in +iSCSI subsystem +first appeared in .Nx 6.0 . .Sh AUTHOR .An Alistair Crooks Aq a...@netbsd.org .
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Sun Feb 20 03:56:45 UTC 2011
Modified Files:
src/sys/dev/pci: if_ath_pci.c
Log Message:
support building as a module
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/if_ath_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ath_pci.c
diff -u src/sys/dev/pci/if_ath_pci.c:1.39 src/sys/dev/pci/if_ath_pci.c:1.40
--- src/sys/dev/pci/if_ath_pci.c:1.39 Wed Jan 26 00:08:30 2011
+++ src/sys/dev/pci/if_ath_pci.c Sun Feb 20 03:56:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.39 2011/01/26 00:08:30 dyoung Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.40 2011/02/20 03:56:45 jmcneill Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ath_pci.c,v 1.39 2011/01/26 00:08:30 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ath_pci.c,v 1.40 2011/02/20 03:56:45 jmcneill Exp $);
/*
* PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
@@ -48,6 +48,7 @@
#include sys/kernel.h
#include sys/errno.h
#include sys/device.h
+#include sys/module.h
#include external/isc/atheros_hal/dist/ah.h
@@ -274,3 +275,32 @@
}
return true;
}
+
+MODULE(MODULE_CLASS_DRIVER, if_ath_pci, ath);
+
+#ifdef _MODULE
+#include ioconf.c
+#endif
+
+static int
+if_ath_pci_modcmd(modcmd_t cmd, void *opaque)
+{
+ int error = 0;
+
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+#ifdef _MODULE
+ error = config_init_component(cfdriver_ioconf_if_ath_pci,
+ cfattach_ioconf_if_ath_pci, cfdata_ioconf_if_ath_pci);
+#endif
+ return error;
+ case MODULE_CMD_FINI:
+#ifdef _MODULE
+ error = config_fini_component(cfdriver_ioconf_if_ath_pci,
+ cfattach_ioconf_if_ath_pci, cfdata_ioconf_if_ath_pci);
+#endif
+ return error;
+ default:
+ return ENOTTY;
+ }
+}
CVS commit: src/sys/modules
Module Name:src
Committed By: jmcneill
Date: Sun Feb 20 03:58:33 UTC 2011
Added Files:
src/sys/modules/ath: Makefile
src/sys/modules/ath_hal: Makefile Makefile.inc ath_hal.ldscript
src/sys/modules/if_ath_pci: Makefile if_ath_pci.ioconf
Log Message:
add module glue for ath_hal, ath, and if_ath_pci
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/ath/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/ath_hal/Makefile \
src/sys/modules/ath_hal/Makefile.inc \
src/sys/modules/ath_hal/ath_hal.ldscript
cvs rdiff -u -r0 -r1.1 src/sys/modules/if_ath_pci/Makefile \
src/sys/modules/if_ath_pci/if_ath_pci.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/ath/Makefile
diff -u /dev/null src/sys/modules/ath/Makefile:1.1
--- /dev/null Sun Feb 20 03:58:33 2011
+++ src/sys/modules/ath/Makefile Sun Feb 20 03:58:33 2011
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2011/02/20 03:58:33 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/ic
+
+KMOD= ath
+
+SRCS= ath.c \
+ ath_netbsd.c \
+ athrate-sample.c
+
+WARNS= 3
+CPPFLAGS+= -DINET
+
+.include ../ath_hal/Makefile.inc
+.include bsd.kmodule.mk
Index: src/sys/modules/ath_hal/Makefile
diff -u /dev/null src/sys/modules/ath_hal/Makefile:1.1
--- /dev/null Sun Feb 20 03:58:33 2011
+++ src/sys/modules/ath_hal/Makefile Sun Feb 20 03:58:33 2011
@@ -0,0 +1,96 @@
+# $NetBSD: Makefile,v 1.1 2011/02/20 03:58:33 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/external/isc/atheros_hal/dist
+.PATH: ${S}/external/isc/atheros_hal/dist/ar5210
+.PATH: ${S}/external/isc/atheros_hal/dist/ar5211
+.PATH: ${S}/external/isc/atheros_hal/dist/ar5212
+.PATH: ${S}/external/isc/atheros_hal/dist/ar5312
+.PATH: ${S}/external/isc/atheros_hal/dist/ar5312
+.PATH: ${S}/external/isc/atheros_hal/dist/ar5416
+.PATH: ${S}/external/isc/atheros_hal/ic
+
+KMOD= ath_hal
+
+SRCS= ah.c \
+ ah_eeprom_v1.c \
+ ah_eeprom_v3.c \
+ ah_eeprom_v14.c \
+ ah_regdomain.c
+SRCS+= ah_osdep.c
+SRCS+= ar5210_attach.c \
+ ar5210_beacon.c \
+ ar5210_interrupts.c \
+ ar5210_keycache.c \
+ ar5210_misc.c \
+ ar5210_phy.c \
+ ar5210_power.c \
+ ar5210_recv.c \
+ ar5210_reset.c \
+ ar5210_xmit.c
+SRCS+= ar5211_attach.c \
+ ar5211_beacon.c \
+ ar5211_interrupts.c \
+ ar5211_keycache.c \
+ ar5211_misc.c \
+ ar5211_phy.c \
+ ar5211_power.c \
+ ar5211_recv.c \
+ ar5211_reset.c \
+ ar5211_xmit.c
+SRCS+= ar2316.c \
+ ar2317.c \
+ ar2413.c \
+ ar2425.c \
+ ar5111.c \
+ ar5112.c \
+ ar5413.c
+SRCS+= ar5212_ani.c \
+ ar5212_attach.c \
+ ar5212_beacon.c \
+ ar5212_eeprom.c \
+ ar5212_gpio.c \
+ ar5212_interrupts.c \
+ ar5212_keycache.c \
+ ar5212_misc.c \
+ ar5212_phy.c \
+ ar5212_power.c \
+ ar5212_recv.c \
+ ar5212_reset.c \
+ ar5212_rfgain.c \
+ ar5212_xmit.c
+SRCS+= ar5312_attach.c \
+ ar5312_eeprom.c \
+ ar5312_gpio.c \
+ ar5312_interrupts.c \
+ ar5312_misc.c \
+ ar5312_power.c \
+ ar5312_reset.c \
+ ar5315_gpio.c
+SRCS+= ar2133.c \
+ ar5416_ani.c \
+ ar5416_attach.c \
+ ar5416_beacon.c \
+ ar5416_cal.c \
+ ar5416_cal_adcdc.c \
+ ar5416_cal_adcgain.c \
+ ar5416_cal_iq.c \
+ ar5416_eeprom.c \
+ ar5416_gpio.c \
+ ar5416_interrupts.c \
+ ar5416_keycache.c \
+ ar5416_misc.c \
+ ar5416_phy.c \
+ ar5416_power.c \
+ ar5416_recv.c \
+ ar5416_reset.c \
+ ar5416_xmit.c \
+ ar9160_attach.c
+
+WARNS= 3
+
+.include Makefile.inc
+
+.include bsd.kmodule.mk
+KMODSCRIPT= ${S}/modules/ath_hal/ath_hal.ldscript
Index: src/sys/modules/ath_hal/Makefile.inc
diff -u /dev/null src/sys/modules/ath_hal/Makefile.inc:1.1
--- /dev/null Sun Feb 20 03:58:33 2011
+++ src/sys/modules/ath_hal/Makefile.inc Sun Feb 20 03:58:33 2011
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.inc,v 1.1 2011/02/20 03:58:33 jmcneill Exp $
+
+CPPFLAGS+= -I${S}/external/isc/atheros_hal/dist
+CPPFLAGS+= -I${S}/external/isc/atheros_hal/ic
+CPPFLAGS+= -DATHHAL_AR5210 -DATHHAL_AR5211 -DATHHAL_AR5212 \
+ -DATHHAL_AR5311 -DATHHAL_AR5312 -DATHHAL_AR5416
+CPPFLAGS+= -DATHHAL_RF2316 -DATHHAL_RF2317 -DATHHAL_RF2413 \
+ -DATHHAL_RF2425 -DATHHAL_RF5111 -DATHHAL_RF5112 \
+ -DATHHAL_RF5413
Index: src/sys/modules/ath_hal/ath_hal.ldscript
diff -u /dev/null src/sys/modules/ath_hal/ath_hal.ldscript:1.1
--- /dev/null Sun Feb 20 03:58:33 2011
+++ src/sys/modules/ath_hal/ath_hal.ldscript Sun Feb 20 03:58:33 2011
@@ -0,0 +1,38 @@
+/* $NetBSD: ath_hal.ldscript,v 1.1 2011/02/20 03:58:33 jmcneill Exp $ */
+
+SECTIONS
+{
+ /* Pre-loaded modules must have merged BSS and data. */
+ .data 0 :
+ {
+ *(.data)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ }
+
+ link_set_ah_rfs :
+ {
+ __start_link_set_ah_rfs = .;
+ *(link_set_ah_rfs);
+ __stop_link_set_ah_rfs = .;
+ }
+
+ link_set_ah_chips :
+ {
+ __start_link_set_ah_chips = .;
+ *(link_set_ah_chips);
+ __stop_link_set_ah_chips = .;
+ }
+
+ . = ALIGN(64); /* COHERENCY_UNIT */
+ .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+
CVS commit: src/share/mk
Module Name:src
Committed By: jmcneill
Date: Sun Feb 20 04:05:14 UTC 2011
Modified Files:
src/share/mk: bsd.klinks.mk
Log Message:
add 'i386' to CLEANFILES on amd64, thanks mrg!
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/share/mk/bsd.klinks.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.klinks.mk
diff -u src/share/mk/bsd.klinks.mk:1.7 src/share/mk/bsd.klinks.mk:1.8
--- src/share/mk/bsd.klinks.mk:1.7 Sat Mar 13 22:05:49 2010
+++ src/share/mk/bsd.klinks.mk Sun Feb 20 04:05:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.klinks.mk,v 1.7 2010/03/13 22:05:49 christos Exp $
+# $NetBSD: bsd.klinks.mk,v 1.8 2011/02/20 04:05:14 jmcneill Exp $
#
.include bsd.own.mk
@@ -22,7 +22,7 @@
.elif ${MACHINE} == i386
CLEANFILES+= x86
.elif ${MACHINE} == amd64
-CLEANFILES+= x86
+CLEANFILES+= x86 i386
.endif
.if defined(XEN_BUILD) || ${MACHINE} == xen
CVS commit: src/crypto/external/bsd/libsaslc/etc
Module Name:src
Committed By: christos
Date: Sun Feb 20 05:17:47 UTC 2011
Modified Files:
src/crypto/external/bsd/libsaslc/etc: Makefile
Added Files:
src/crypto/external/bsd/libsaslc/etc/mech: ANONYMOUS.conf CRAM-MD5.conf
DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf Makefile
PLAIN.conf
Removed Files:
src/crypto/external/bsd/libsaslc/etc: ANONYMOUS.conf CRAM-MD5.conf
DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf PLAIN.conf
Log Message:
Re-do using bsd.files.mk
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf \
src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf \
src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf \
src/crypto/external/bsd/libsaslc/etc/LOGIN.conf \
src/crypto/external/bsd/libsaslc/etc/PLAIN.conf
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/etc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf \
src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf \
src/crypto/external/bsd/libsaslc/etc/mech/EXTERNAL.conf \
src/crypto/external/bsd/libsaslc/etc/mech/GSSAPI.conf \
src/crypto/external/bsd/libsaslc/etc/mech/LOGIN.conf \
src/crypto/external/bsd/libsaslc/etc/mech/Makefile \
src/crypto/external/bsd/libsaslc/etc/mech/PLAIN.conf
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/libsaslc/etc/Makefile
diff -u src/crypto/external/bsd/libsaslc/etc/Makefile:1.2 src/crypto/external/bsd/libsaslc/etc/Makefile:1.3
--- src/crypto/external/bsd/libsaslc/etc/Makefile:1.2 Sat Feb 19 21:14:42 2011
+++ src/crypto/external/bsd/libsaslc/etc/Makefile Sun Feb 20 00:17:47 2011
@@ -1,11 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/02/20 02:14:42 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/20 05:17:47 christos Exp $
.include bsd.own.mk
-CFG_DIR=/usr/share/examples/libsaslc
+SUBDIR=mech
-CFG_FILE= saslc.conf
-CFG_FILE+= README
+FILESDIR=/usr/share/examples/libsaslc
+FILESOWN=root
+FILESGRP=wheel
+FILESMODE=444
+
+FILES= saslc.conf
+FILES+= README
CFG_MECH=
CFG_MECH+= ANONYMOUS.conf
CFG_MECH+= CRAM-MD5.conf
@@ -15,8 +20,5 @@
CFG_MECH+= LOGIN.conf
CFG_MECH+= PLAIN.conf
-install:
- ${INSTALL_FILE} -o root -g wheel -m 444 \
- ${CFG_FILE} ${DESTDIR}${CFG_DIR}
- ${INSTALL_FILE} -o root -g wheel -m 444 \
- ${CFG_MECH} ${DESTDIR}${CFG_DIR}/mech
+.include bsd.files.mk
+.include bsd.subdir.mk
Added files:
Index: src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,8 @@
+# $NetBSD: ANONYMOUS.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID authentication ID
Index: src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,9 @@
+# $NetBSD: CRAM-MD5.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID username # usually passed by the caller
+# PASSWD password # usually passed by the caller
Index: src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf
diff -u /dev/null src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf:1.1
--- /dev/null Sun Feb 20 00:17:47 2011
+++ src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf Sun Feb 20 00:17:47 2011
@@ -0,0 +1,17 @@
+# $NetBSD: DIGEST-MD5.conf,v 1.1 2011/02/20 05:17:47 christos Exp $
+#
+# The properties used by this mechanism are listed below. Usually no
+# settings are needed.
+#
+# key value
+
+# AUTHCID username # usually passed by the caller
+# AUTHZID authorization ID # typically not used
+# CIPHERMASK 3des,aes,des,rc4,rc4-40,rc4-56 # optional
+# HOSTNAME hostname # usually passed by the caller
+# MAXBUF 0x1# optional
+# PASSWD password # usually passed by the caller
+# QOPMASK auth,auth-int,auth-conf # optional
+# REALM [hostname:]realm[,...] # for multiple realms
+# SERVICE service to use, e.g., SMTP # usually passed by the caller
+# SERVNAME [hostname:]serv-name[,...] # typically not used
Index: src/crypto/external/bsd/libsaslc/etc/mech/EXTERNAL.conf
diff -u /dev/null
CVS commit: src/crypto/external/bsd/libsaslc/etc/mech
Module Name:src Committed By: joerg Date: Sun Feb 20 05:42:34 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/etc/mech: Makefile Log Message: Include bsd.prog.mk to ensure that make includes actually works. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/libsaslc/etc/mech/Makefile 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/libsaslc/etc/mech/Makefile diff -u src/crypto/external/bsd/libsaslc/etc/mech/Makefile:1.1 src/crypto/external/bsd/libsaslc/etc/mech/Makefile:1.2 --- src/crypto/external/bsd/libsaslc/etc/mech/Makefile:1.1 Sun Feb 20 05:17:47 2011 +++ src/crypto/external/bsd/libsaslc/etc/mech/Makefile Sun Feb 20 05:42:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/02/20 05:17:47 christos Exp $ +# $NetBSD: Makefile,v 1.2 2011/02/20 05:42:34 joerg Exp $ .include bsd.own.mk @@ -16,4 +16,4 @@ FILES+= LOGIN.conf FILES+= PLAIN.conf -.include bsd.files.mk +.include bsd.prog.mk
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: jakllsch Date: Sun Feb 20 05:45:48 UTC 2011 Modified Files: src/sys/arch/i386/stand/lib: biosmemps2.S Log Message: %bl is part of %bx, %bx contains the address we requested from the BIOS. Thus, use %cl instead of %bl for return value storage. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/lib/biosmemps2.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/arch/i386/stand/lib/biosmemps2.S diff -u src/sys/arch/i386/stand/lib/biosmemps2.S:1.4 src/sys/arch/i386/stand/lib/biosmemps2.S:1.5 --- src/sys/arch/i386/stand/lib/biosmemps2.S:1.4 Sat Nov 21 11:52:57 2009 +++ src/sys/arch/i386/stand/lib/biosmemps2.S Sun Feb 20 05:45:48 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: biosmemps2.S,v 1.4 2009/11/21 11:52:57 dsl Exp $ */ +/* $NetBSD: biosmemps2.S,v 1.5 2011/02/20 05:45:48 jakllsch Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ # do int15, function 0xc0 call to discover if C7h is supported movb $0xc0, %ah int $0x15 - setc %bl + setc %cl jc out # 0xc0 not supported if carry set # check feature byte 2, bit 4 to see if return memory map is supported @@ -64,8 +64,8 @@ andb $0x10, %al jnz getmem # 0xc7 supported - # set %bl to indicate failure, and exit - movb $2, %bl + # set %cl to indicate failure, and exit + movb $2, %cl jmp out getmem: @@ -81,15 +81,14 @@ # actually call int15, function 0xc7 now movb $0xc7, %ah int $0x15 - setc %bl # save carry + setc %cl # save carry pop %ds out: calll _C_LABEL(real_to_prot) .code32 - xorl %eax, %eax - movb %bl, %al # return value in %ax + movzbl %cl, %eax # return value in %eax pop %edi pop %esi
CVS commit: src/sys/external/bsd/acpica/dist/tables
Module Name:src Committed By: jruoho Date: Sun Feb 20 06:09:16 UTC 2011 Modified Files: src/sys/external/bsd/acpica/dist/tables: tbxface.c Log Message: Fix wrong note in a comment. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/tables/tbxface.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/external/bsd/acpica/dist/tables/tbxface.c diff -u src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.3 src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.4 --- src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.3 Thu Feb 17 10:09:42 2011 +++ src/sys/external/bsd/acpica/dist/tables/tbxface.c Sun Feb 20 06:09:16 2011 @@ -257,9 +257,6 @@ * * DESCRIPTION: Finds an ACPI table header. * - * NOTE:Caller is responsible in unmapping the header with - * AcpiOsUnmapMemory - * **/ ACPI_STATUS
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sun Feb 20 06:45:32 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi.c acpi_quirks.c acpivar.h
Log Message:
Add quirk support for _OSI strings introduced in ACPICA 20110211. While
here, clean up acpi_probe() and the quirk code. Remove #ifdef ACPI_DEBUGGER.
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/acpi_quirks.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/acpi/acpivar.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/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.237 src/sys/dev/acpi/acpi.c:1.238
--- src/sys/dev/acpi/acpi.c:1.237 Sat Feb 19 09:52:32 2011
+++ src/sys/dev/acpi/acpi.c Sun Feb 20 06:45:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.237 2011/02/19 09:52:32 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.238 2011/02/20 06:45:32 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.237 2011/02/19 09:52:32 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.238 2011/02/20 06:45:32 jruoho Exp $);
#include opt_acpi.h
#include opt_pcifixup.h
@@ -138,16 +138,6 @@
#include machine/acpi_machdep.h
-#ifdef ACPI_DEBUGGER
-#define ACPI_DBGR_INIT 0x01
-#define ACPI_DBGR_TABLES 0x02
-#define ACPI_DBGR_ENABLE 0x04
-#define ACPI_DBGR_PROBE 0x08
-#define ACPI_DBGR_RUNNING 0x10
-
-static int acpi_dbgr = 0x00;
-#endif
-
/*
* The acpi_active variable is set when the ACPI subsystem is active.
* Machine-dependent code may wish to skip other steps (such as attaching
@@ -159,7 +149,7 @@
int acpi_force_load = 0;
int acpi_verbose_loaded = 0;
-struct acpi_softc *acpi_softc;
+struct acpi_softc *acpi_softc = NULL;
static uint64_t acpi_root_pointer;
extern kmutex_t acpi_interrupt_list_mtx;
extern struct cfdriver acpi_cd;
@@ -260,42 +250,25 @@
acpi_probe(void)
{
ACPI_TABLE_HEADER *rsdt;
- const char *func;
- static int once;
- bool initialized;
ACPI_STATUS rv;
+ int quirks;
- if (once != 0)
+ if (acpi_softc != NULL)
panic(%s: already probed, __func__);
- once = 1;
- func = NULL;
- acpi_softc = NULL;
- initialized = false;
-
mutex_init(acpi_interrupt_list_mtx, MUTEX_DEFAULT, IPL_NONE);
/*
* Start up ACPICA.
*/
-#ifdef ACPI_DEBUGGER
- if (acpi_dbgr ACPI_DBGR_INIT)
- acpi_osd_debugger();
-#endif
-
- CTASSERT(TRUE == true);
- CTASSERT(FALSE == false);
-
AcpiGbl_AllMethodsSerialized = false;
AcpiGbl_EnableInterpreterSlack = true;
rv = AcpiInitializeSubsystem();
- if (ACPI_SUCCESS(rv))
- initialized = true;
- else {
- func = AcpiInitializeSubsystem();
- goto fail;
+ if (ACPI_FAILURE(rv)) {
+ aprint_error(%s: failed to initialize subsystem\n, __func__);
+ return 0;
}
/*
@@ -305,49 +278,47 @@
rv = AcpiInitializeTables(NULL, 2, true);
if (ACPI_FAILURE(rv)) {
- func = AcpiInitializeTables();
+ aprint_error(%s: failed to initialize tables\n, __func__);
goto fail;
}
-#ifdef ACPI_DEBUGGER
- if (acpi_dbgr ACPI_DBGR_TABLES)
- acpi_osd_debugger();
-#endif
-
rv = AcpiLoadTables();
if (ACPI_FAILURE(rv)) {
- func = AcpiLoadTables();
+ aprint_error(%s: failed to load tables\n, __func__);
goto fail;
}
rsdt = acpi_map_rsdt();
if (rsdt == NULL) {
- func = acpi_map_rsdt();
- rv = AE_ERROR;
+ aprint_error(%s: failed to map RSDT\n, __func__);
goto fail;
}
- if (acpi_force_load == 0 (acpi_find_quirks() ACPI_QUIRK_BROKEN)) {
+ quirks = acpi_find_quirks();
+
+ if (acpi_force_load == 0 (quirks ACPI_QUIRK_BROKEN) != 0) {
+
aprint_normal(ACPI: BIOS is listed as broken:\n);
aprint_normal(ACPI: X/RSDT: OemId %6.6s,%8.8s,%08x,
- AslId %4.4s,%08x\n,
- rsdt-OemId, rsdt-OemTableId,
- rsdt-OemRevision,
- rsdt-AslCompilerId,
+ AslId %4.4s,%08x\n, rsdt-OemId, rsdt-OemTableId,
+ rsdt-OemRevision, rsdt-AslCompilerId,
rsdt-AslCompilerRevision);
aprint_normal(ACPI: Not used. Set acpi_force_load to use.\n);
+
acpi_unmap_rsdt(rsdt);
- AcpiTerminate();
- return 0;
+ goto fail;
}
- if (acpi_force_load == 0 (acpi_find_quirks() ACPI_QUIRK_OLDBIOS)) {
- aprint_normal(ACPI: BIOS is too old (%s). Set acpi_force_load to use.\n,
+
+ if (acpi_force_load == 0 (quirks ACPI_QUIRK_OLDBIOS) != 0) {
+
+ aprint_normal(ACPI: BIOS is too old (%s).
+ Set acpi_force_load to use.\n,
pmf_get_platform(firmware-date));
+
acpi_unmap_rsdt(rsdt);
- AcpiTerminate();
- return 0;
+ goto fail;
}
acpi_unmap_rsdt(rsdt);
@@ -355,24 +326,14 @@
rv = AcpiEnableSubsystem(~(ACPI_NO_HARDWARE_INIT|ACPI_NO_ACPI_ENABLE));
if (ACPI_FAILURE(rv)) {
- func = AcpiEnableSubsystem();
+ aprint_error(%s: failed to enable subsystem\n, __func__);
goto fail;
}
- /*
- * Looks like we have ACPI!
- */
return 1;
fail:
-
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sun Feb 20 06:59:53 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_button.c
Log Message:
Always explicitly enable the wake GPE for acpibut(4). This follows FreeBSD
and Linux, although it is somewhat unclear why this is necessary. But better
safe than sorry.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/acpi/acpi_button.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/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.40 src/sys/dev/acpi/acpi_button.c:1.41
--- src/sys/dev/acpi/acpi_button.c:1.40 Wed Feb 16 08:35:51 2011
+++ src/sys/dev/acpi/acpi_button.c Sun Feb 20 06:59:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.40 2011/02/16 08:35:51 jruoho Exp $ */
+/* $NetBSD: acpi_button.c,v 1.41 2011/02/20 06:59:53 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_button.c,v 1.40 2011/02/16 08:35:51 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_button.c,v 1.41 2011/02/20 06:59:53 jruoho Exp $);
#include sys/param.h
#include sys/device.h
@@ -49,6 +49,7 @@
#include dev/acpi/acpireg.h
#include dev/acpi/acpivar.h
+#include dev/acpi/acpi_wakedev.h
#define _COMPONENT ACPI_BUTTON_COMPONENT
ACPI_MODULE_NAME (acpi_button)
@@ -111,6 +112,7 @@
{
struct acpibut_softc *sc = device_private(self);
struct acpi_attach_args *aa = aux;
+ struct acpi_wakedev *aw;
const char *desc;
sc-sc_smpsw.smpsw_name = device_xname(self);
@@ -128,6 +130,13 @@
aprint_normal(: ACPI %s Button\n, desc);
sc-sc_node = aa-aa_node;
+ aw = sc-sc_node-ad_wakedev;
+
+ /*
+ * This GPE should always be enabled.
+ */
+ if (aw != NULL)
+ (void)AcpiEnableGpe(aw-aw_handle, aw-aw_number);
(void)pmf_device_register(self, NULL, NULL);
(void)sysmon_pswitch_register(sc-sc_smpsw);
CVS commit: [matt-nb5-pq3] src/sys
Module Name:src
Committed By: matt
Date: Sun Feb 20 07:04:15 UTC 2011
Modified Files:
src/sys/kern [matt-nb5-pq3]: kern_kthread.c
src/sys/sys [matt-nb5-pq3]: kthread.h
Log Message:
Pullup http://mail-index.netbsd.org/source-changes/2010/05/11/msg009810.html
to this branch because the new flash framework will need it.
To generate a diff of this commit:
cvs rdiff -u -r1.24.10.2 -r1.24.10.2.8.1 src/sys/kern/kern_kthread.c
cvs rdiff -u -r1.7.10.1 -r1.7.10.1.8.1 src/sys/sys/kthread.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_kthread.c
diff -u src/sys/kern/kern_kthread.c:1.24.10.2 src/sys/kern/kern_kthread.c:1.24.10.2.8.1
--- src/sys/kern/kern_kthread.c:1.24.10.2 Mon Feb 2 22:02:24 2009
+++ src/sys/kern/kern_kthread.c Sun Feb 20 07:04:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_kthread.c,v 1.24.10.2 2009/02/02 22:02:24 snj Exp $ */
+/* $NetBSD: kern_kthread.c,v 1.24.10.2.8.1 2011/02/20 07:04:15 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_kthread.c,v 1.24.10.2 2009/02/02 22:02:24 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_kthread.c,v 1.24.10.2.8.1 2011/02/20 07:04:15 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -52,6 +52,12 @@
/*
* Fork a kernel thread. Any process can request this to be done.
+ *
+ * With joinable kthreads KTHREAD_JOINABLE flag this should be known.
+ * 1. If you specify KTHREAD_JOINABLE, you must call kthread_join() to reap the thread.
+ *It will not be automatically reaped by the system.
+ * 2. For any given call to kthread_create(KTHREAD_JOINABLE), you may call kthread_join()
+ *only once on the returned lwp_t *.
*/
int
kthread_create(pri_t pri, int flag, struct cpu_info *ci,
@@ -61,9 +67,10 @@
lwp_t *l;
vaddr_t uaddr;
bool inmem;
- int error;
+ int error, lc, lwp_flags;
va_list ap;
- int lc;
+
+ lwp_flags = LWP_DETACHED;
inmem = uvm_uarea_alloc(uaddr);
if (uaddr == 0)
@@ -73,7 +80,10 @@
} else {
lc = SCHED_RR;
}
- error = lwp_create(lwp0, proc0, uaddr, inmem, LWP_DETACHED, NULL,
+ if ((flag KTHREAD_JOINABLE) != 0) {
+ lwp_flags = ~LWP_DETACHED;
+ }
+ error = lwp_create(lwp0, proc0, uaddr, inmem, lwp_flags, NULL,
0, func, arg, l, lc);
if (error) {
uvm_uarea_free(uaddr, curcpu());
@@ -83,7 +93,7 @@
if (fmt != NULL) {
l-l_name = kmem_alloc(MAXCOMLEN, KM_SLEEP);
if (l-l_name == NULL) {
- lwp_exit(l);
+ kthread_destroy(l);
return ENOMEM;
}
va_start(ap, fmt);
@@ -98,6 +108,11 @@
KASSERT((flag KTHREAD_MPSAFE) != 0);
}
+ /* Joinable kthread can't be NULL. */
+ if ((flag KTHREAD_JOINABLE) != 0) {
+ KASSERT(l != NULL);
+ }
+
if (pri == PRI_NONE) {
if ((flag KTHREAD_TS) != 0) {
/* Maximum user priority level. */
@@ -183,9 +198,39 @@
void
kthread_destroy(lwp_t *l)
{
-
+ proc_t *p;
+
KASSERT((l-l_flag LW_SYSTEM) != 0);
KASSERT(l-l_stat == LSIDL);
+ p = l-l_proc;
+
+ /* Add LRP_DETACHED flag because we can have joinable kthread now. */
+ mutex_enter(p-p_lock);
+ l-l_prflag |= LPR_DETACHED;
+ mutex_exit(p-p_lock);
+
lwp_exit(l);
}
+
+/*
+ * Wait for a kthread to exit, as pthread_join().
+ */
+int
+kthread_join(lwp_t *l)
+{
+ lwpid_t departed;
+ proc_t *p;
+ int error;
+
+ KASSERT((l-l_flag LW_SYSTEM) != 0);
+ KASSERT((l-l_prflag LPR_DETACHED) == 0);
+
+ p = l-l_proc;
+
+ mutex_enter(p-p_lock);
+ error = lwp_wait1(curlwp, l-l_lid, departed, LWPWAIT_EXITCONTROL);
+ mutex_exit(p-p_lock);
+
+ return error;
+}
Index: src/sys/sys/kthread.h
diff -u src/sys/sys/kthread.h:1.7.10.1 src/sys/sys/kthread.h:1.7.10.1.8.1
--- src/sys/sys/kthread.h:1.7.10.1 Mon Feb 2 22:01:34 2009
+++ src/sys/sys/kthread.h Sun Feb 20 07:04:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kthread.h,v 1.7.10.1 2009/02/02 22:01:34 snj Exp $ */
+/* $NetBSD: kthread.h,v 1.7.10.1.8.1 2011/02/20 07:04:15 matt Exp $ */
/*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@
#define KTHREAD_MPSAFE 0x02 /* does not need kernel_lock */
#define KTHREAD_INTR 0x04 /* interrupt handler */
#define KTHREAD_TS 0x08 /* timeshared */
+#define KTHREAD_JOINABLE 0x10 /* joinable thread */
int kthread_create(pri_t, int, struct cpu_info *,
void (*)(void *), void *,
@@ -51,6 +52,7 @@
__attribute__((__format__(__printf__,7,8)));
void kthread_exit(int) __dead;
void kthread_destroy(lwp_t *);
+int kthread_join(lwp_t *);
#endif /* _KERNEL */
#endif /* _SYS_KTHREAD_H_ */
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: macallan
Date: Sun Feb 20 07:40:24 UTC 2011
Modified Files:
src/sys/arch/macppc/dev: awacs.c
Log Message:
bus_spacify, while there explicitly un-mute the headphone output when using
the beige G3's external mixer
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/macppc/dev/awacs.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/macppc/dev/awacs.c
diff -u src/sys/arch/macppc/dev/awacs.c:1.39 src/sys/arch/macppc/dev/awacs.c:1.40
--- src/sys/arch/macppc/dev/awacs.c:1.39 Wed Dec 22 07:24:10 2010
+++ src/sys/arch/macppc/dev/awacs.c Sun Feb 20 07:40:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: awacs.c,v 1.39 2010/12/22 07:24:10 macallan Exp $ */
+/* $NetBSD: awacs.c,v 1.40 2011/02/20 07:40:24 macallan Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awacs.c,v 1.39 2010/12/22 07:24:10 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: awacs.c,v 1.40 2011/02/20 07:40:24 macallan Exp $);
#include sys/param.h
#include sys/audioio.h
@@ -64,7 +64,10 @@
struct awacs_softc {
device_t sc_dev;
int sc_flags;
-
+ bus_space_tag_t sc_tag;
+ bus_space_handle_t sc_regh;
+ bus_space_handle_t sc_idmah;
+ bus_space_handle_t sc_odmah;
void (*sc_ointr)(void *); /* DMA completion intr handler */
void *sc_oarg; /* arg for sc_ointr() */
int sc_opages; /* # of output pages */
@@ -89,7 +92,6 @@
device_t sc_sgsmix;
#endif
- char *sc_reg;
u_int sc_codecctl0;
u_int sc_codecctl1;
u_int sc_codecctl2;
@@ -313,7 +315,7 @@
awacs_attach(device_t parent, device_t self, void *aux)
{
struct awacs_softc *sc;
- struct confargs *ca;
+ struct confargs *ca = aux;
int cirq, oirq, iirq, cirq_type, oirq_type, iirq_type;
int len = -1, perch;
int root_node;
@@ -321,15 +323,21 @@
sc = device_private(self);
sc-sc_dev = self;
- ca = aux;
+ sc-sc_tag = ca-ca_tag;
- sc-sc_reg = mapiodev(ca-ca_baseaddr + ca-ca_reg[0], ca-ca_reg[1]);
+ if (bus_space_map(sc-sc_tag, ca-ca_baseaddr + ca-ca_reg[0],
+ ca-ca_reg[1], 0, sc-sc_regh) != 0)
+ printf(couldn't map codec registers\n);
+ if (bus_space_map(sc-sc_tag, ca-ca_baseaddr + ca-ca_reg[2],
+ ca-ca_reg[3], BUS_SPACE_MAP_LINEAR, sc-sc_odmah) != 0)
+ printf(couldn't map DMA out registers\n);
+ if (bus_space_map(sc-sc_tag, ca-ca_baseaddr + ca-ca_reg[4],
+ ca-ca_reg[5], BUS_SPACE_MAP_LINEAR, sc-sc_idmah) != 0)
+ printf(couldn't map DMA in registers\n);
- /* out */
- sc-sc_odma = mapiodev(ca-ca_baseaddr + ca-ca_reg[2], ca-ca_reg[3]);
+ sc-sc_odma = bus_space_vaddr(sc-sc_tag, sc-sc_odmah);
+ sc-sc_idma = bus_space_vaddr(sc-sc_tag, sc-sc_idmah);
sc-sc_odmacmd = dbdma_alloc(20 * sizeof(struct dbdma_command));
- /* in */
- sc-sc_idma = mapiodev(ca-ca_baseaddr + ca-ca_reg[4], ca-ca_reg[5]);
sc-sc_idmacmd = dbdma_alloc(20 * sizeof(struct dbdma_command));
if (strcmp(ca-ca_name, i2s) == 0) {
@@ -464,7 +472,7 @@
sc-sc_need_parallel_output = 1;
sc-sc_codecctl1 |= AWACS_PARALLEL_OUTPUT;
}
-
+
if (awacs_check_headphones(sc)) {
/* default output to headphones */
@@ -559,6 +567,9 @@
printf(%s: using %s\n, device_xname(sc-sc_dev),
device_xname(sc-sc_sgsmix));
+ sc-sc_codecctl1 = ~AWACS_MUTE_HEADPHONE;
+ awacs_write_codec(sc, sc-sc_codecctl1);
+
awacs_select_output(sc, sc-sc_output_mask);
awacs_set_volume(sc, sc-vol_l, sc-vol_r);
awacs_set_bass(sc, 128);
@@ -572,19 +583,15 @@
static inline u_int
awacs_read_reg(struct awacs_softc *sc, int reg)
{
- char *addr;
- addr = sc-sc_reg;
- return in32rb(addr + reg);
+ return bus_space_read_4(sc-sc_tag, sc-sc_regh, reg);
}
static inline void
awacs_write_reg(struct awacs_softc *sc, int reg, int val)
{
- char *addr;
- addr = sc-sc_reg;
- out32rb(addr + reg, val);
+ bus_space_write_4(sc-sc_tag, sc-sc_regh, reg, val);
}
static void
CVS commit: src/sys/net
Module Name:src Committed By: enami Date: Sat Feb 19 08:46:41 UTC 2011 Modified Files: src/sys/net: bpf_filter.c Log Message: Fix userland build. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/net/bpf_filter.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sat Feb 19 09:52:32 UTC 2011 Modified Files: src/sys/dev/acpi: acpi.c acpi_wakedev.c acpi_wakedev.h Log Message: Revisit the wake-device code once more. 1. Remove the AcpiEnableGpe() call. This was wrong. 2. Only call _PSW or _DSW for devices that are scheduled for wake. This was an old bug. 3. Only enable wake GPEs during suspend. Disabling these for devices not setup for wake was causing problems. 4. No wake GPEs should be enabled at runtime. Unconditionally disable these during resume. This should make the wake-device code work again. Note that waking via pckbd(4) has always been unreliable; the _PRW object is not typically located under the PC keyboard object, but in the parent of it (e.g. the LPC bridge). To generate a diff of this commit: cvs rdiff -u -r1.236 -r1.237 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.23 -r1.24 src/sys/dev/acpi/acpi_wakedev.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_wakedev.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: jruoho Date: Sat Feb 19 09:54:01 UTC 2011 Modified Files: src/sys/sys: param.h Log Message: Bump kernel due recent ACPICA changes. (ACPI modules may panic, etc.). To generate a diff of this commit: cvs rdiff -u -r1.381 -r1.382 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/rumpkern/h_client
Module Name:src Committed By: pooka Date: Sat Feb 19 09:56:45 UTC 2011 Modified Files: src/tests/rump/rumpkern/h_client: h_reconcli.c Log Message: set reconnect property now that it's off by default To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/h_client/h_reconcli.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/librumpclient
Module Name:src Committed By: pooka Date: Sat Feb 19 09:59:12 UTC 2011 Modified Files: src/tests/lib/librumpclient: t_exec.sh Log Message: Run sockstat with -n so that difference in /etc/services don't affect the test outcome. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/lib/librumpclient/t_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: kiyohara Date: Sat Feb 19 10:46:29 UTC 2011 Modified Files: src/sys/arch/mmeye/conf: GENERIC MMEYE MMTA MMTAICE MMTANEW MMTAROMNEW files.mmeye std.mmeye src/sys/arch/mmeye/dev: com_mainbus.c mmeyepcmcia.c src/sys/arch/mmeye/include: intr.h loadfile_machdep.h mmeye.h src/sys/arch/mmeye/mmeye: autoconf.c clock_machdep.c locore.S machdep.c mainbus.c src/sys/arch/sh3/sh3: disksubr.c Added Files: src/sys/arch/mmeye/conf: MMEYE_WLF src/sys/arch/mmeye/dev: if_ne_mainbus.c rtciic.c wdc_mainbus.c src/sys/arch/mmeye/include: bootinfo.h Log Message: Support mmEye-WLF. Also maybe support mmEye-WL, mmEye2, mmEye2-HS. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/arch/mmeye/conf/GENERIC cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mmeye/conf/MMEYE cvs rdiff -u -r0 -r1.1 src/sys/arch/mmeye/conf/MMEYE_WLF cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mmeye/conf/MMTA cvs rdiff -u -r1.45 -r1.46 src/sys/arch/mmeye/conf/MMTAICE cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mmeye/conf/MMTANEW cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mmeye/conf/MMTAROMNEW cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mmeye/conf/files.mmeye cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mmeye/conf/std.mmeye cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mmeye/dev/com_mainbus.c cvs rdiff -u -r0 -r1.1 src/sys/arch/mmeye/dev/if_ne_mainbus.c \ src/sys/arch/mmeye/dev/rtciic.c src/sys/arch/mmeye/dev/wdc_mainbus.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mmeye/dev/mmeyepcmcia.c cvs rdiff -u -r0 -r1.3 src/sys/arch/mmeye/include/bootinfo.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mmeye/include/intr.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mmeye/include/loadfile_machdep.h \ src/sys/arch/mmeye/include/mmeye.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mmeye/mmeye/autoconf.c \ src/sys/arch/mmeye/mmeye/mainbus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mmeye/mmeye/clock_machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mmeye/mmeye/locore.S cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mmeye/mmeye/machdep.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sh3/sh3/disksubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Sat Feb 19 10:54:31 UTC 2011 Modified Files: src/share/man/man4: aac.4 Log Message: add Adaptec RAID 3405 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/aac.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 19 13:07:53 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: support PF_OROUTE and PF_MPLS where available To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 19 13:09:40 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: and now with less crazy whitespace To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 19 13:10:35 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: hijack __getcwd() To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 19 13:19:53 UTC 2011 Modified Files: src/tests/lib/librumphijack: Makefile Added Files: src/tests/lib/librumphijack: h_cwd.c t_cwd.sh Log Message: a basic getcwd() test To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/lib/librumphijack/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/librumphijack/h_cwd.c \ src/tests/lib/librumphijack/t_cwd.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pooka Date: Sat Feb 19 13:21:05 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: new test To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: jmcneill Date: Sat Feb 19 13:34:38 UTC 2011 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: fix printing of padlock features To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Sat Feb 19 13:52:29 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC src/sys/arch/i386/i386: autoconf.c src/sys/arch/x86/conf: files.x86 src/sys/arch/x86/include: cpu.h cpuvar.h via_padlock.h src/sys/arch/x86/x86: cpu.c identcpu.c via_padlock.c Log Message: modularize VIA PadLock support - retire options VIA_PADLOCK, replace with 'padlock0 at cpu0' - driver supports attach detach - support building as a module To generate a diff of this commit: cvs rdiff -u -r1.288 -r1.289 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1017 -r1.1018 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/i386/autoconf.c cvs rdiff -u -r1.57 -r1.58 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/include/cpuvar.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/include/via_padlock.h cvs rdiff -u -r1.80 -r1.81 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/x86/via_padlock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/padlock
Module Name:src Committed By: jmcneill Date: Sat Feb 19 14:25:30 UTC 2011 Added Files: src/sys/modules/padlock: Makefile padlock.ioconf Log Message: add padlock module glue To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/padlock/Makefile \ src/sys/modules/padlock/padlock.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jmcneill Date: Sat Feb 19 14:28:08 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.i386 src/sys/modules: Makefile Log Message: build padlock module on i386 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.61 -r1.62 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/opencrypto
Module Name:src Committed By: drochner Date: Sat Feb 19 16:26:34 UTC 2011 Modified Files: src/sys/opencrypto: cryptodev.c files.opencrypto ocryptodev.c ocryptodev.h Added Files: src/sys/opencrypto: cryptodev_internal.h Log Message: make the compatibility code conditional on COMPAT_50 To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/opencrypto/cryptodev.c cvs rdiff -u -r0 -r1.1 src/sys/opencrypto/cryptodev_internal.h cvs rdiff -u -r1.20 -r1.21 src/sys/opencrypto/files.opencrypto cvs rdiff -u -r1.2 -r1.3 src/sys/opencrypto/ocryptodev.c cvs rdiff -u -r1.1 -r1.2 src/sys/opencrypto/ocryptodev.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Sat Feb 19 17:21:48 UTC 2011 Modified Files: src/sys/net: bpf_filter.c Log Message: delint. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/net/bpf_filter.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jruoho Date: Sat Feb 19 18:02:32 UTC 2011 Modified Files: src/share/misc: acronyms.comp Log Message: AA, AAT, AC, ACK, ACL, AI, AL, AM, AMT, AOL, AP, ASIC, AT, BAL, BBS, BD, BP, BTS, BW, CF, CLR, CMS, CN, CNC, CPS, CRC, CTM, CUA, DAO, DAP, DAT, DC, DDE, DL, DSL, EPIC, ATL, EULA, FDC, FDD, FPR, FWS, GPR, GPT, HAT, HCL, HF, HMI, HTT, ICE, IHV, IM, ISV, JGI, KB, KBD, LF, LTR, MB, MBS, MIMD, MISD, MPI, MPP, MS, MT, MTBF, MTTF, MX, NACK, NAN, NC, PD, PLC, PME, PNP, PPI, PSW, PU, RAD, RDM, RDMA, SAAS, SBU, SFC, SISD, SLOC, SOL, SP, SPMD, SPR, SSI, TAO, TSO, TSP, UAC, UL, UMA, URN, VR, WOL, WOR, ZIF, ZMA. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netipsec
Module Name:src Committed By: degroote Date: Sat Feb 19 18:26:51 UTC 2011 Modified Files: src/sys/netipsec: xform_esp.c Log Message: Fix a missing const in FAST_IPSEC IPSEC_DEBUG To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/netipsec/xform_esp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 19 19:17:34 UTC 2011 Modified Files: src/lib/librumphijack: hijack.c Log Message: fix symlink pathname examination (rationale-to-joerg: so that it works) To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/lib/librumphijack/hijack.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: matt Date: Sat Feb 19 19:18:11 UTC 2011 Modified Files: src/sys/arch/powerpc/include: userret.h Log Message: Compare ci_veclwp against lwp0, not NULL. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/userret.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sat Feb 19 19:39:28 UTC 2011 Modified Files: src/sys/dev/acpi: acpi_ec.c Log Message: After the GPE handler has finished, inform ACPICA that the interrupt has been handled and it is safe to re-enable the GPE. Should fix all problems introduced during the merge of ACPICA 20110211. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/dev/acpi/acpi_ec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Sat Feb 19 19:42:07 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note ACPICA 20110211. To generate a diff of this commit: cvs rdiff -u -r1.813 -r1.814 src/doc/3RDPARTY cvs rdiff -u -r1.1507 -r1.1508 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/librumphijack
Module Name:src Committed By: pooka Date: Sat Feb 19 19:57:28 UTC 2011 Modified Files: src/tests/lib/librumphijack: h_cwd.c t_cwd.sh Log Message: more test cases: * // prefix * fchdir * cd-via-symlink To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumphijack/h_cwd.c \ src/tests/lib/librumphijack/t_cwd.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmcneill Date: Sat Feb 19 20:07:02 UTC 2011 Modified Files: src/sys/dev/pci: agp_via.c Log Message: more AGP v3 fixes from FreeBSD: - fix a typo when enabling the aperture (read wrong register) - get_aperture/set_aperture: handle AGP v3 APSIZE register layout To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/agp_via.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: matt Date: Sat Feb 19 20:19:54 UTC 2011 Modified Files: src/sys/conf: files src/sys/kern: subr_pcu.c src/sys/sys: lwp.h pcu.h Log Message: Default PCU_UNIT_COUNT to 0. If 0, don't compile the contents of subr_pcu.c and don't include the pcu related members into struct lwp. To generate a diff of this commit: cvs rdiff -u -r1.1000 -r1.1001 src/sys/conf/files cvs rdiff -u -r1.2 -r1.3 src/sys/kern/subr_pcu.c cvs rdiff -u -r1.147 -r1.148 src/sys/sys/lwp.h cvs rdiff -u -r1.3 -r1.4 src/sys/sys/pcu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: riz Date: Sun Feb 20 01:26:23 UTC 2011 Modified Files: src/sys/dev/ic: mvsata.c Log Message: Use PRId64 instead of lld, and PRIx64 instead of llx when compiling with MVSATA_DEBUG. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/mvsata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/libsaslc/dist
Module Name:src Committed By: christos Date: Sun Feb 20 01:59:46 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/dist/man: libsaslc.3 src/crypto/external/bsd/libsaslc/dist/src: list.c list.h mech_digestmd5.c mech_gssapi.c xsess.c Log Message: improve error handling, from Anon Ymous To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/libsaslc/dist/man/libsaslc.3 cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/dist/src/list.c cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/libsaslc/dist/src/list.h cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/libsaslc/dist/src/mech_digestmd5.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/libsaslc/dist/src/mech_gssapi.c \ src/crypto/external/bsd/libsaslc/dist/src/xsess.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/libsaslc
Module Name:src Committed By: christos Date: Sun Feb 20 02:12:31 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc: Makefile Added Files: src/crypto/external/bsd/libsaslc/etc: ANONYMOUS.conf CRAM-MD5.conf DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf Makefile PLAIN.conf README saslc.conf Log Message: Add example configuration file from Anon Ymous and a README file from me. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/crypto/external/bsd/libsaslc/Makefile cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf \ src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf \ src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf \ src/crypto/external/bsd/libsaslc/etc/LOGIN.conf \ src/crypto/external/bsd/libsaslc/etc/Makefile \ src/crypto/external/bsd/libsaslc/etc/PLAIN.conf \ src/crypto/external/bsd/libsaslc/etc/README \ src/crypto/external/bsd/libsaslc/etc/saslc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/libsaslc/etc
Module Name:src Committed By: christos Date: Sun Feb 20 02:14:43 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/etc: Makefile Log Message: don't install dirs. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/libsaslc/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sun Feb 20 02:16:05 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Add the libsaslc example dir. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src Committed By: christos Date: Sun Feb 20 02:26:40 UTC 2011 Modified Files: src/distrib/sets: comments deps descrs src/distrib/sets/lists/misc: mi Log Message: Add libsaslc examples. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/comments cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/deps cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/descrs cvs rdiff -u -r1.170 -r1.171 src/distrib/sets/lists/misc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/ic
Module Name:src Committed By: jmcneill Date: Sun Feb 20 03:55:19 UTC 2011 Modified Files: src/sys/external/isc/atheros_hal/ic: ah_osdep.c opt_ah.h Log Message: support building as a module To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/isc/atheros_hal/ic/ah_osdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/external/isc/atheros_hal/ic/opt_ah.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jmcneill Date: Sun Feb 20 03:55:56 UTC 2011 Modified Files: src/sys/dev/ic: ath.c ath_netbsd.c athrate-sample.c Log Message: support building as a module To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ic/ath.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/ath_netbsd.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/athrate-sample.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: agc Date: Sun Feb 20 03:56:36 UTC 2011 Modified Files: src/external/bsd/iscsi/dist/src/lib: libiscsi.3 Log Message: manual page improvements, from enami tsugutomo, with thanks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/iscsi/dist/src/lib/libiscsi.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmcneill Date: Sun Feb 20 03:56:45 UTC 2011 Modified Files: src/sys/dev/pci: if_ath_pci.c Log Message: support building as a module To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/if_ath_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: jmcneill Date: Sun Feb 20 03:58:33 UTC 2011 Added Files: src/sys/modules/ath: Makefile src/sys/modules/ath_hal: Makefile Makefile.inc ath_hal.ldscript src/sys/modules/if_ath_pci: Makefile if_ath_pci.ioconf Log Message: add module glue for ath_hal, ath, and if_ath_pci To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/modules/ath/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/ath_hal/Makefile \ src/sys/modules/ath_hal/Makefile.inc \ src/sys/modules/ath_hal/ath_hal.ldscript cvs rdiff -u -r0 -r1.1 src/sys/modules/if_ath_pci/Makefile \ src/sys/modules/if_ath_pci/if_ath_pci.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: jmcneill Date: Sun Feb 20 04:05:14 UTC 2011 Modified Files: src/share/mk: bsd.klinks.mk Log Message: add 'i386' to CLEANFILES on amd64, thanks mrg! To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/mk/bsd.klinks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/libsaslc/etc
Module Name:src Committed By: christos Date: Sun Feb 20 05:17:47 UTC 2011 Modified Files: src/crypto/external/bsd/libsaslc/etc: Makefile Added Files: src/crypto/external/bsd/libsaslc/etc/mech: ANONYMOUS.conf CRAM-MD5.conf DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf Makefile PLAIN.conf Removed Files: src/crypto/external/bsd/libsaslc/etc: ANONYMOUS.conf CRAM-MD5.conf DIGEST-MD5.conf EXTERNAL.conf GSSAPI.conf LOGIN.conf PLAIN.conf Log Message: Re-do using bsd.files.mk To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/libsaslc/etc/ANONYMOUS.conf \ src/crypto/external/bsd/libsaslc/etc/CRAM-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/DIGEST-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/EXTERNAL.conf \ src/crypto/external/bsd/libsaslc/etc/GSSAPI.conf \ src/crypto/external/bsd/libsaslc/etc/LOGIN.conf \ src/crypto/external/bsd/libsaslc/etc/PLAIN.conf cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/libsaslc/etc/Makefile cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/libsaslc/etc/mech/ANONYMOUS.conf \ src/crypto/external/bsd/libsaslc/etc/mech/CRAM-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/mech/DIGEST-MD5.conf \ src/crypto/external/bsd/libsaslc/etc/mech/EXTERNAL.conf \ src/crypto/external/bsd/libsaslc/etc/mech/GSSAPI.conf \ src/crypto/external/bsd/libsaslc/etc/mech/LOGIN.conf \ src/crypto/external/bsd/libsaslc/etc/mech/Makefile \ src/crypto/external/bsd/libsaslc/etc/mech/PLAIN.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
