CVS commit: src/lib/libpuffs
Module Name:src Committed By: pooka Date: Thu Apr 1 09:57:01 UTC 2010 Modified Files: src/lib/libpuffs: puffs_framebuf.3 Log Message: fix a few pastos To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libpuffs/puffs_framebuf.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpuffs/puffs_framebuf.3 diff -u src/lib/libpuffs/puffs_framebuf.3:1.28 src/lib/libpuffs/puffs_framebuf.3:1.29 --- src/lib/libpuffs/puffs_framebuf.3:1.28 Mon Jan 4 22:04:50 2010 +++ src/lib/libpuffs/puffs_framebuf.3 Thu Apr 1 09:57:00 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: puffs_framebuf.3,v 1.28 2010/01/04 22:04:50 pooka Exp $ +.\ $NetBSD: puffs_framebuf.3,v 1.29 2010/04/01 09:57:00 pooka Exp $ .\ .\ Copyright (c) 2007 Antti Kantee. All rights reserved. .\ @@ -546,12 +546,12 @@ and .Dv PUFFS_FBIO_WRITE . If not specified, the descriptor will be in a disabled state. -.It Fn puffs_framev_enablefd pu fd error +.It Fn puffs_framev_enablefd pu fd what Enable events of type .Ar what for file descriptor .Ar fd . -.It Fn puffs_framev_disablefd pu fd error +.It Fn puffs_framev_disablefd pu fd what Disable events of type .Ar what for file descriptor
CVS commit: xsrc/external/mit/xorg-server/dist/render
Module Name:xsrc Committed By: mrg Date: Thu Apr 1 11:37:56 UTC 2010 Modified Files: xsrc/external/mit/xorg-server/dist/render: glyph.c Log Message: import fdo git change 185185eeb44a277c324be0f58a4b4a469b56b69b, which i've seen twice in the last two days: Fix crash when all glyphs of a given depth are freed, but not all glyphsets This is how the crash can be triggered with only two clients on the system: Client A: (already running) Client B: Connect Client B: CreateGlyphSet(depthN) Client A: Disconnect Server: free globalGlyphs(depthN) Client B: AddGlyphs(depthN) Server: SEGV This crash was introduced with the FindGlyphsByHash function in 516b96387b0e57b524a37a96da22dbeeeb041712. Before that revision, ResizeGlyphSet was always called before FindGlyphRef, which would re-create globalGlyphs(depthN) if necessary. X.Org Bug 20718 http://bugs.freedesktop.org/show_bug.cgi?id=20718 XXX: needs netbsd-5 pullup. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/render/glyph.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/render/glyph.c diff -u xsrc/external/mit/xorg-server/dist/render/glyph.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/render/glyph.c:1.2 --- xsrc/external/mit/xorg-server/dist/render/glyph.c:1.1.1.2 Thu Jun 11 01:52:56 2009 +++ xsrc/external/mit/xorg-server/dist/render/glyph.c Thu Apr 1 11:37:55 2010 @@ -235,6 +235,9 @@ GlyphRefPtr gr; CARD32 signature = *(CARD32 *) sha1; +if (!globalGlyphs[format].hashSet) +return NULL; + gr = FindGlyphRef (globalGlyphs[format], signature, TRUE, sha1);
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Thu Apr 1 12:09:40 UTC 2010 Modified Files: src/sys/arch/hppa/hppa: vm_machdep.c Log Message: Small simplification To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hppa/hppa/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/hppa/vm_machdep.c diff -u src/sys/arch/hppa/hppa/vm_machdep.c:1.42 src/sys/arch/hppa/hppa/vm_machdep.c:1.43 --- src/sys/arch/hppa/hppa/vm_machdep.c:1.42 Tue Mar 16 16:20:19 2010 +++ src/sys/arch/hppa/hppa/vm_machdep.c Thu Apr 1 12:09:39 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.42 2010/03/16 16:20:19 skrll Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.43 2010/04/01 12:09:39 skrll Exp $ */ /* $OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $ */ @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.42 2010/03/16 16:20:19 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.43 2010/04/01 12:09:39 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -60,7 +60,7 @@ struct pcb *pcb = lwp_getpcb(l); #ifdef DIAGNOSTIC vaddr_t uarea = (vaddr_t)pcb; - vaddr_t maxsp = (vaddr_t)pcb + USPACE; + vaddr_t maxsp = uarea + USPACE; #endif KASSERT(tf == (void *)(uarea + PAGE_SIZE));
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Thu Apr 1 12:16:14 UTC 2010
Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c sysmon_envsys_events.c
sysmon_envsysvar.h sysmonvar.h
Log Message:
Permit creation of an event-monitor for alarm limits even if the limits
are not currently set (and, in case of battery capacity sensors, if there
is no value_max). Ensure that such an event-monitor does not trigger the
delivery of any actual events.
Provide a mechanism for sensors to set their limits at time other than
system startup (for example, when a battery is inserted).
This allows us to boot a system with a battery missing, install the
battery some time later, and automatically monitor it without requiring
any user intervention to create the event-monitor. (The actual changes
for battery sensors to use this new capability will come later.)
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/sysmon/sysmon_envsys.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/sysmon/sysmon_envsys_events.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/sysmon/sysmon_envsysvar.h
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/sysmon/sysmonvar.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/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.103 src/sys/dev/sysmon/sysmon_envsys.c:1.104
--- src/sys/dev/sysmon/sysmon_envsys.c:1.103 Sat Mar 27 13:34:16 2010
+++ src/sys/dev/sysmon/sysmon_envsys.c Thu Apr 1 12:16:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.103 2010/03/27 13:34:16 pgoyette Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.104 2010/04/01 12:16:14 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.103 2010/03/27 13:34:16 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys.c,v 1.104 2010/04/01 12:16:14 pgoyette Exp $);
#include sys/param.h
#include sys/types.h
@@ -84,7 +84,8 @@
kmutex_t sme_global_mtx;
-static prop_dictionary_t sme_propd;
+prop_dictionary_t sme_propd;
+
static uint32_t sysmon_envsys_next_sensor_index;
static struct sysmon_envsys *sysmon_envsys_find_40(u_int);
Index: src/sys/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.90 src/sys/dev/sysmon/sysmon_envsys_events.c:1.91
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.90 Wed Mar 24 19:15:00 2010
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Thu Apr 1 12:16:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.90 2010/03/24 19:15:00 njoly Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.91 2010/04/01 12:16:14 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.90 2010/03/24 19:15:00 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.91 2010/04/01 12:16:14 pgoyette Exp $);
#include sys/param.h
#include sys/types.h
@@ -125,10 +125,10 @@
!(edata-flags ENVSYS_FPERCENT) ||
(props PROP_VAL_LIMITS) ||
(edata-upropset PROP_VAL_LIMITS)))
- return ENOTSUP;
+ props = 0;
if ((props PROP_VAL_LIMITS) (edata-upropset PROP_CAP_LIMITS))
- return ENOTSUP;
+ props = 0;
/*
* check if the event is already on the list and return
@@ -452,18 +452,10 @@
sed_t-sed_edata,
lims, props);
/*
- * If no values returned, don't create the event monitor at
- * this time. We'll get another chance later when the user
- * provides us with limits.
- */
- if (props == 0)
- sed_t-sed_edata-flags = ~ENVSYS_FMONLIMITS;
-
- /*
* If driver doesn't provide a way to absorb user-specified
* limit values, we must monitor all limits ourselves
*/
- else if (sed_t-sed_sme-sme_set_limits == NULL)
+ if (sed_t-sed_sme-sme_set_limits == NULL)
props = ~PROP_DRIVER_LIMITS;
/* Register the events that were specified */
@@ -542,6 +534,64 @@
}
/*
+ * sysmon_envsys_update_limits
+ *
+ * + If a driver needs to update the limits that it is providing,
+ * we need to update the dictionary data as well as the limits.
+ * This only makes sense if the driver is capable of providing
+ * its limits, and if there is a limits event-monitor.
+ */
+int
+sysmon_envsys_update_limits(struct sysmon_envsys *sme, envsys_data_t *edata)
+{
+ prop_dictionary_t sdict = NULL;
+ prop_array_t array = NULL;
+ sysmon_envsys_lim_t lims;
+ sme_event_t *see;
+ uint32_t props = 0;
+
+ if (sme-sme_get_limits == NULL ||
+ (edata-flags ENVSYS_FMONLIMITS) == 0)
+ return EINVAL;
+
+ /* Find the dictionary for this sensor */
+ sysmon_envsys_acquire(sme, false);
+ array = prop_dictionary_get(sme_propd, sme-sme_name);
+ if (array == NULL ||
+ prop_object_type(array) != PROP_TYPE_ARRAY) {
+ DPRINTF((%s: array device failed\n, __func__));
+
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Thu Apr 1 12:21:41 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: mainbus.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/hp700/hp700/mainbus.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/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.62 src/sys/arch/hp700/hp700/mainbus.c:1.63
--- src/sys/arch/hp700/hp700/mainbus.c:1.62 Tue Feb 16 16:56:29 2010
+++ src/sys/arch/hp700/hp700/mainbus.c Thu Apr 1 12:21:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.62 2010/02/16 16:56:29 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.63 2010/04/01 12:21:41 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.62 2010/02/16 16:56:29 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.63 2010/04/01 12:21:41 skrll Exp $);
#include locators.h
#include power.h
@@ -1353,7 +1353,7 @@
pmap = vm_map_pmap(vm-vm_map);
lastaddr = *lastaddrp;
- bmask = ~(map-_dm_boundary - 1);
+ bmask = ~(map-_dm_boundary - 1);
for (seg = *segp; buflen 0; ) {
bool ok;
CVS commit: src/external/gpl3
Module Name:src Committed By: reed Date: Thu Apr 1 14:13:25 UTC 2010 Added Files: src/external/gpl3: README Log Message: Add the Statement for The NetBSD Foundation's Position on the GPLv3. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl3/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/gpl3/README diff -u /dev/null src/external/gpl3/README:1.1 --- /dev/null Thu Apr 1 14:13:25 2010 +++ src/external/gpl3/README Thu Apr 1 14:13:25 2010 @@ -0,0 +1,65 @@ +$NetBSD: README,v 1.1 2010/04/01 14:13:25 reed Exp $ + +The code within the src/external/gplv3 directories may have serious +legal impacts if you are a company and redistributing or changing +this code (as a company holding patents). We recommend you contact +your lawyer before using it. + +Please do not import new GPLv3 projects without Board approval. + + + +Statement for The NetBSD Foundation's Position on the GPLv3 + +NetBSD provides source code with the goal for anyone to be able +to use it for whatever they want, as long as they follow the simple +licensing terms. Historically, most of the original code used +Berkeley-style licensing and NetBSD's own code uses a simple +two-clause Berkeley-style license. To summarize: modifications are +allowed, the source code may be redistributed and the binaries (or +executables) may be distributed as long as the copyright and +disclaimer is included. NetBSD's code may be extended and sold +without sharing back the source code changes. + +NetBSD also uses and redistributes source code and binaries from +source code obtained from external third parties. This source code +is segregated by placing it in the src/external and sys/src/external +directories which are categorized per license. Examples of this +include: ISC BIND, Solaris ZFS, CVS, GNU Binutils, Postfix, X.org +X Windowing System, and other software that are primarily maintained +outside of NetBSD. + +In some cases, the third-party software is licensed under terms +that conflict with NetBSD's own goals. For example, the GPLv2 is +a copyleft license -- it requires that anyone who distributes +executable or object code based on the source code, also make the +source code and modifications available to the public. (NetBSD's +own code doesn't require companies to share their changes.) + +The GPLv3 (GNU General Public License Version 3) includes clauses +that may cause additional burdens to developers or companies who +may modify the source code or ship products based on the source +code. The following summarizes some of these issues: + +- The license allows the user to circumvent measures preventing +software changes (#3). This is known as the Tivoization clause. +In addition, this same clause is an anti-DRM, anti-DMCA clause -- +as the developer allows the end-user to attempt to circumvent or +break the technological protection measures. Also, any information +or authorization keys required to install or run modified versions +must also be provided (#6). + +- The patent clause (#11) says the copyright holders grant a +non-exclusive, worldwide, royalty-free patent license. You may be +required to extend the royalty-free patent license(s) to all +recipients or future users and developers who use the code. In +addition, you may not initiate litigation for a patent infringement +(#10). + +We recommend companies redistributing GPLv3 licensed code to +consult their lawyer before using it. + +It is the intent of the NetBSD project to use as little GPL licensed +software as possible to provide maximum freedom for development +and distribution of NetBSD derived products. +
CVS commit: src/sys/netinet
Module Name:src
Committed By: tls
Date: Thu Apr 1 14:31:51 UTC 2010
Modified Files:
src/sys/netinet: tcp_input.c
Log Message:
Oops. Fix LOCKDEBUG panic -- and spurious calls to tcp_output()! -- in
previous. Be careful with that {}, Eugene.
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/netinet/tcp_input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.301 src/sys/netinet/tcp_input.c:1.302
--- src/sys/netinet/tcp_input.c:1.301 Thu Apr 1 00:24:41 2010
+++ src/sys/netinet/tcp_input.c Thu Apr 1 14:31:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.301 2010/04/01 00:24:41 tls Exp $ */
+/* $NetBSD: tcp_input.c,v 1.302 2010/04/01 14:31:51 tls Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -145,7 +145,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.301 2010/04/01 00:24:41 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.302 2010/04/01 14:31:51 tls Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -1786,10 +1786,11 @@
tp-t_rxtcur);
sowwakeup(so);
-if (so-so_snd.sb_cc)
+if (so-so_snd.sb_cc) {
KERNEL_LOCK(1, NULL);
(void) tcp_output(tp);
KERNEL_UNLOCK_ONE(NULL);
+}
if (tcp_saveti)
m_freem(tcp_saveti);
return;
@@ -1884,10 +1885,11 @@
}
sorwakeup(so);
tcp_setup_ack(tp, th);
- if (tp-t_flags TF_ACKNOW)
+ if (tp-t_flags TF_ACKNOW) {
KERNEL_LOCK(1, NULL);
(void) tcp_output(tp);
KERNEL_UNLOCK_ONE(NULL);
+ }
if (tcp_saveti)
m_freem(tcp_saveti);
return;
CVS commit: src/sys/arch/atari/conf
Module Name:src Committed By: tsutsui Date: Thu Apr 1 17:10:06 UTC 2010 Modified Files: src/sys/arch/atari/conf: ATARITT FALCON HADES MILAN-ISAIDE MILAN-PCIIDE SMALL030 Log Message: Regen from GENERIC.in rev 1.85, HADES.in rev 1.10, and MILAN.in rev 1.24: Add support for the EtherNEC. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/arch/atari/conf/ATARITT cvs rdiff -u -r1.94 -r1.95 src/sys/arch/atari/conf/FALCON cvs rdiff -u -r1.86 -r1.87 src/sys/arch/atari/conf/HADES cvs rdiff -u -r1.63 -r1.64 src/sys/arch/atari/conf/MILAN-ISAIDE cvs rdiff -u -r1.67 -r1.68 src/sys/arch/atari/conf/MILAN-PCIIDE cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/conf/SMALL030 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/atari/conf/ATARITT diff -u src/sys/arch/atari/conf/ATARITT:1.97 src/sys/arch/atari/conf/ATARITT:1.98 --- src/sys/arch/atari/conf/ATARITT:1.97 Sat Mar 13 16:31:38 2010 +++ src/sys/arch/atari/conf/ATARITT Thu Apr 1 17:10:06 2010 @@ -1,11 +1,11 @@ # -# $NetBSD: ATARITT,v 1.97 2010/03/13 16:31:38 tsutsui Exp $ +# $NetBSD: ATARITT,v 1.98 2010/04/01 17:10:06 tsutsui Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: GENERIC.in,v 1.84 2010/03/13 16:30:02 tsutsui Exp $ +# NetBSD: GENERIC.in,v 1.85 2010/04/01 17:07:51 tsutsui Exp $ include arch/atari/conf/std.atari options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 @@ -107,6 +107,7 @@ ite2 at grfcc2 # 3rd tty lp0 at mainbus0 # centronics printer ser0 at mainbus0 # UART on first 68901 (ttyB0) +ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot avmebus0 at mainbus0 # VME bus vme0 at avmebus0 le0 at vme0 irq 5 # Lance ethernet (Riebl/PAM). Index: src/sys/arch/atari/conf/FALCON diff -u src/sys/arch/atari/conf/FALCON:1.94 src/sys/arch/atari/conf/FALCON:1.95 --- src/sys/arch/atari/conf/FALCON:1.94 Sat Mar 13 16:31:38 2010 +++ src/sys/arch/atari/conf/FALCON Thu Apr 1 17:10:06 2010 @@ -1,11 +1,11 @@ # -# $NetBSD: FALCON,v 1.94 2010/03/13 16:31:38 tsutsui Exp $ +# $NetBSD: FALCON,v 1.95 2010/04/01 17:10:06 tsutsui Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: GENERIC.in,v 1.84 2010/03/13 16:30:02 tsutsui Exp $ +# NetBSD: GENERIC.in,v 1.85 2010/04/01 17:07:51 tsutsui Exp $ include arch/atari/conf/std.atari options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 @@ -110,6 +110,7 @@ ite2 at grfcc2 # 3rd tty lp0 at mainbus0 # centronics printer ser0 at mainbus0 # UART on first 68901 (ttyB0) +ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot wdc0 at mainbus0 # IDE-bus atabus* at wdc? channel ? wd* at atabus? drive ? Index: src/sys/arch/atari/conf/HADES diff -u src/sys/arch/atari/conf/HADES:1.86 src/sys/arch/atari/conf/HADES:1.87 --- src/sys/arch/atari/conf/HADES:1.86 Sat Mar 13 16:31:38 2010 +++ src/sys/arch/atari/conf/HADES Thu Apr 1 17:10:06 2010 @@ -1,12 +1,12 @@ # -# $NetBSD: HADES,v 1.86 2010/03/13 16:31:38 tsutsui Exp $ +# $NetBSD: HADES,v 1.87 2010/04/01 17:10:06 tsutsui Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: HADES.in,v 1.9 2009/01/24 00:19:47 abs Exp $ -# NetBSD: GENERIC.in,v 1.84 2010/03/13 16:30:02 tsutsui Exp $ +# NetBSD: HADES.in,v 1.10 2010/04/01 17:07:51 tsutsui Exp $ +# NetBSD: GENERIC.in,v 1.85 2010/04/01 17:07:51 tsutsui Exp $ include arch/atari/conf/std.hades options INCLUDE_CONFIG_FILE # embed config file in kernel binary maxusers 16 @@ -114,6 +114,7 @@ nvr0 at mainbus0 # nvram driver lp0 at mainbus0 # centronics printer ser0 at mainbus0 # UART on first 68901 (ttyB0) +ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot grfbus0 at mainbus0 # bitmapped display's grfet0 at grfbus0 # et4000/et6000/et6100 consoles ite0 at grfet0 Index: src/sys/arch/atari/conf/MILAN-ISAIDE diff -u src/sys/arch/atari/conf/MILAN-ISAIDE:1.63 src/sys/arch/atari/conf/MILAN-ISAIDE:1.64 --- src/sys/arch/atari/conf/MILAN-ISAIDE:1.63 Sat Mar 13 16:31:38 2010 +++ src/sys/arch/atari/conf/MILAN-ISAIDE Thu Apr 1 17:10:06 2010 @@ -1,12 +1,12 @@ # -# $NetBSD: MILAN-ISAIDE,v 1.63 2010/03/13 16:31:38 tsutsui Exp $ +# $NetBSD: MILAN-ISAIDE,v 1.64 2010/04/01 17:10:06 tsutsui Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: MILAN.in,v 1.23 2009/12/23 09:17:41 mbalmer Exp $ -# NetBSD: GENERIC.in,v 1.84 2010/03/13 16:30:02 tsutsui Exp $ +# NetBSD: MILAN.in,v 1.24 2010/04/01 17:07:51 tsutsui Exp $ +# NetBSD: GENERIC.in,v 1.85 2010/04/01 17:07:51 tsutsui Exp $ include arch/atari/conf/std.milan options INCLUDE_CONFIG_FILE # embed config file in kernel
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Thu Apr 1 17:15:02 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Mention EtherNEC support for atari. To generate a diff of this commit: cvs rdiff -u -r1.1374 -r1.1375 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1374 src/doc/CHANGES:1.1375 --- src/doc/CHANGES:1.1374 Thu Apr 1 05:08:46 2010 +++ src/doc/CHANGES Thu Apr 1 17:15:02 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1374 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1375 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -574,3 +574,5 @@ dhcpcd(8): Import dhcpcd-5.2.2. [roy 20100331] dbcool(4): Added support for ADM1031 therman sensor / fan controller [macallan 20100401] + atari: Add support for the EtherNEC, ISA NE2000 based Ethernet + connected to Atari ROM cartridge slot. [tsutsui 20100401]
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src Committed By: matt Date: Thu Apr 1 18:25:16 UTC 2010 Modified Files: src/sys/arch/powerpc/include/booke: spr.h Log Message: Fix some TCR definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/booke/spr.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/booke/spr.h diff -u src/sys/arch/powerpc/include/booke/spr.h:1.1 src/sys/arch/powerpc/include/booke/spr.h:1.2 --- src/sys/arch/powerpc/include/booke/spr.h:1.1 Tue Mar 9 22:39:32 2010 +++ src/sys/arch/powerpc/include/booke/spr.h Thu Apr 1 18:25:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.1 2010/03/09 22:39:32 matt Exp $ */ +/* $NetBSD: spr.h,v 1.2 2010/04/01 18:25:16 matt Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -143,14 +143,20 @@ #define TSR_FIS 0x0400 /* Fixed-interval Interrupt Status (W1C) */ #define SPR_TCR 340 /* E... Timer Control Register */ #define TCR_WP 0xc000 /* Watchdog Period */ +#define TCR_WP_2_N(n) 64 - (n)) 3) 30) | (((64 - (n)) 0x3c0) 15)) +#define TCR_WP_2_64 0x +#define TCR_WP_2_1 0xc01e #define TCR_WRC 0x3000 /* Watchdog Timer Reset Control */ #define TCR_WIE 0x0800 /* Watchdog Time Interrupt Enable */ #define TCR_DIE 0x0400 /* Decremnter Interrupt Enable */ #define TCR_FP 0x0300 /* Fixed-interval Timer Period */ +#define TCR_FP_2_N(n) 64 - (n)) 3) 24) | (((64 - (n)) 0x3c0) 11)) +#define TCR_FP_2_64 0x +#define TCR_FP_2_1 0x0301e000 #define TCR_FIE 0x0080 /* Fixed-interval Interrupt Enable */ #define TCR_ARE 0x0040 /* Auto-reload Enable */ -#define TCR_WPEXT 0x8000 /* Watchdog Period Extension */ -#define TCR_FPEXT 0x8000 /* Fixed-interval Period Extension */ +#define TCR_WPEXT 0x001e /* Watchdog Period Extension */ +#define TCR_FPEXT 0x0001e000 /* Fixed-interval Period Extension */ #define SPR_IVOR0 400 /* E... Critical input interrupt offset */ #define SPR_IVOR1 401 /* E... Machine check interrupt offset */
CVS commit: src/doc
Module Name:src Committed By: jakllsch Date: Thu Apr 1 18:47:20 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Mention Domex DMX-3191D support in nca(4). To generate a diff of this commit: cvs rdiff -u -r1.1375 -r1.1376 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1375 src/doc/CHANGES:1.1376 --- src/doc/CHANGES:1.1375 Thu Apr 1 17:15:02 2010 +++ src/doc/CHANGES Thu Apr 1 18:47:19 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1375 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1376 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -572,6 +572,8 @@ cgtwelve: A driver for Sun CG12 / Matrox SG3 graphics boards [macallan 20100323] dhcpcd(8): Import dhcpcd-5.2.2. [roy 20100331] + nca(4): Added PCI attachment for Domex DMX-3191D SCSI board. + [jakllsch 20100401] dbcool(4): Added support for ADM1031 therman sensor / fan controller [macallan 20100401] atari: Add support for the EtherNEC, ISA NE2000 based Ethernet
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src Committed By: matt Date: Thu Apr 1 18:58:12 UTC 2010 Added Files: src/sys/arch/powerpc/include/booke: openpicreg.h Log Message: OpenPIC register defintions used by e500 booke. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/booke/openpicreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/powerpc/include/booke/openpicreg.h diff -u /dev/null src/sys/arch/powerpc/include/booke/openpicreg.h:1.1 --- /dev/null Thu Apr 1 18:58:12 2010 +++ src/sys/arch/powerpc/include/booke/openpicreg.h Thu Apr 1 18:58:12 2010 @@ -0,0 +1,282 @@ +/*- + * Copyright (c) 2010 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * + * 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. + */ + +#ifndef _POWERPC_BOOKE_OPENPICREG_H_ +#define _POWERPC_BOOKE_OPENPICREG_H_ + +/* + * Common definition of VPR registers (IPIVPR, GTVPR, ...) + */ +#define VPR_MSK 0x8000 /* Mask */ +#define VPR_A 0x4000 /* Activity */ +#define VPR_P 0x0080 /* Polatity */ +#define VPR_P_HIGH 0x0080 /* Active High */ +#define VPR_S 0x0040 /* Sense */ +#define VPR_S_LEVEL 0x0040 /* Level Sensitive */ +#define VPR_PRIORITY 0x000f /* Priority */ +#define VPR_PRIORITY_GET(n) (((n) 16) 0x000f) +#define VPR_PRIORITY_MAKE(n) (((n) 0x000f) 16) +#define VPR_VECTOR 0x /* Vector */ +#define VPR_VECTOR_GET(n) (((n) 0) 0x) +#define VPR_VECTOR_MAKE(n) (((n) 0x) 0) + +#define VPR_LEVEL_LOW (VPR_S_LEVEL) +#define VPR_LEVEL_HIGH (VPR_S_LEVEL | VPR_P_HIGH) + +/* + * Common definition of DR registers (IPIVPR, GTVPR, ...) + */ +#define DR_EP 0x8000 /* external signal */ +#define DR_CI(n) (1 (30 - (n))) /* critical intr cpu n */ +#define DR_P(n) (1 (n)) /* intr cpu n */ + + +#define OPENPIC_BRR1 0x /* Block Revision 1 */ +#define BRR1_IPID(n) (((n) 16) 0x) +#define BRR1_IPMJ(n) (((n) 8) 0x00ff) +#define BRR1_IPMN(n) (((n) 0) 0x00ff) +#define OPENPIC_BRR2 0x0010 /* Block Revision 2 */ +#define BRR2_IPINT0(n) (((n) 16) 0xff) +#define BRR2_IPCFG0(n) (((n) 0) 0xff) + +#define OPENPIC_IPIDR(n) (0x0040 + 0x10 * (n)) + +#define OPENPIC_CTPR 0x0080 +#define OPENPIC_WHOAMI 0x0090 +#define OPENPIC_IACK 0x00a0 +#define OPENPIC_EOI 0x00b0 + +#define OPENPIC_FRR 0x1000 /* Feature Reporting */ +#define FRR_NIRQ(n) (((n) 16) 0x7ff) /* intr sources - 1 */ +#define FRR_NCPU(n) (((n) 8) 0x01f) /* cpus - 1 */ +#define FRR_VID(n) (((n) 0) 0x0ff) /* version id */ +#define OPENPIC_GCR 0x1020 /* Global Configuration */ +#define GCR_RST 0x8000 /* Reset */ +#define GCR_M 0x2000 /* Mixed Mode */ +#define OPENPIC_VIR 0x1080 /* Vendor Identification */ +#define OPENPIC_PIR 0x1090 /* Processor Initialization */ + +#define OPENPIC_IPIVPR(n) (0x10a0 + 0x10 * (n)) +#define OPENPIC_SVR 0x10e0 +#define SVR_VECTOR 0x /* Vector */ +#define SVR_VECTOR_GET(n) (((n) 0) 0x) +#define SVR_VECTOR_MAKE(n) (((n) 0x) 0) + +#define OPENPIC_TFRR 0x10f0 +#define OPENPIC_GTCCR(n) (0x1100 + 0x40 * (n)) +#define GTCCR_TOG 0x8000 +#define GTCCR_COUNT 0x7fff +#define OPENPIC_GTBCR(n) (0x1110 + 0x40 * (n)) +#define GTBCR_CI 0x8000 /* Count Inhibit */ +#define GTBCR_BASECNT 0x7fff /* Base Count */ +#define OPENPIC_GTVPR(n) (0x1120 + 0x40 * (n)) +#define OPENPIC_GTDR(n) (0x1130 + 0x40 * (n)) +#define OPENPIC_TCR 0x1300 +#define TCR_ROVR(n) (1 (24 + (n)))
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src
Committed By: matt
Date: Thu Apr 1 18:59:27 UTC 2010
Added Files:
src/sys/arch/powerpc/include/booke: intr.h
Removed Files:
src/sys/arch/powerpc/include/booke: booke_intr.h
Log Message:
Change booke_intr.h to intr.h since powerpc/booke/intr.h will be unique
enough.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 src/sys/arch/powerpc/include/booke/booke_intr.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/booke/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/powerpc/include/booke/intr.h
diff -u /dev/null src/sys/arch/powerpc/include/booke/intr.h:1.1
--- /dev/null Thu Apr 1 18:59:27 2010
+++ src/sys/arch/powerpc/include/booke/intr.h Thu Apr 1 18:59:27 2010
@@ -0,0 +1,163 @@
+/* $NetBSD: intr.h,v 1.1 2010/04/01 18:59:27 matt Exp $ */
+
+/*-
+ * Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * 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.
+ */
+
+#ifndef _BOOKE_INTR_H_
+#define _BOOKE_INTR_H_
+
+/* Interrupt priority `levels'. */
+#define IPL_NONE 0 /* nothing */
+#define IPL_SOFTCLOCK 1 /* software clock interrupt */
+#define IPL_SOFTBIO 2 /* software block i/o interrupt */
+#define IPL_SOFTNET 3 /* software network interrupt */
+#define IPL_SOFTSERIAL 4 /* software serial interrupt */
+#define IPL_VM 5 /* memory allocation */
+#define IPL_SCHED 6 /* clock */
+#define IPL_HIGH 7 /* everything */
+#define NIPL 8
+
+/* Interrupt sharing types. */
+#define IST_NONE 0 /* none */
+#define IST_EDGE 1 /* edge-triggered */
+#define IST_LEVEL 2 /* level-triggered active-low */
+#define IST_LEVEL_LOW IST_LEVEL
+#define IST_LEVEL_HIGH 3 /* level-triggered active-high */
+#define IST_MSI 4 /* message signaling interrupt (PCI) */
+#define IST_ONCHIP 5 /* on-chip device */
+#ifdef __INTR_PRIVATE
+#define IST_MSIGROUP 6 /* openpic msi groups */
+#define IST_TIMER 7 /* openpic timers */
+#define IST_IPI 8 /* openpic ipi */
+#define IST_MI 9 /* openpic message */
+#endif
+
+#ifndef _LOCORE
+
+void *intr_establish(int, int, int, int (*)(void *), void *);
+void intr_disestablish(void *);
+int spl0(void);
+int splraise(int);
+void splx(int);
+
+typedef int ipl_t;
+typedef struct {
+ ipl_t _ipl;
+} ipl_cookie_t;
+
+#ifdef __INTR_PRIVATE
+#include sys/lwp.h
+
+struct intrsw {
+ void *(*intrsw_establish)(int, int, int, int (*)(void *), void *);
+ void (*intrsw_disestablish)(void *);
+ void (*intrsw_cpu_init)(struct cpu_info *);
+ void (*intrsw_init)(void);
+ void (*intrsw_critintr)(struct trapframe *);
+ void (*intrsw_decrintr)(struct trapframe *);
+ void (*intrsw_extintr)(struct trapframe *);
+ void (*intrsw_fitintr)(struct trapframe *);
+ void (*intrsw_wdogintr)(struct trapframe *);
+ int (*intrsw_splraise)(int);
+ int (*intrsw_spl0)(void);
+ void (*intrsw_splx)(int);
+#ifdef __HAVE_FAST_SOFTINTS
+ void (*intrsw_softint_init_md)(lwp_t *, u_int, uintptr_t *);
+ void (*intrsw_softint_trigger)(uintptr_t);
+#endif
+};
+
+extern struct intrsw powerpc_intrsw;
+#endif /* __INTR_PRIVATE */
+
+static inline int
+splhigh(void)
+{
+
+ return splraise(IPL_HIGH);
+}
+
+static inline int
+splsched(void)
+{
+
+ return splraise(IPL_SCHED);
+}
+
+static inline int
+splvm(void)
+{
+
+ return splraise(IPL_VM);
+}
+
+static inline int
+splsoftserial(void)
+{
+
+ return splraise(IPL_SOFTSERIAL);
+}
+
+static inline int
+splsoftnet(void)
+{
+
+ return splraise(IPL_SOFTNET);
+}
+
+static inline int
+splsoftbio(void)
+{
+
+ return splraise(IPL_SOFTBIO);
+}
+
+static inline
CVS commit: src/bin/ls
Module Name:src
Committed By: christos
Date: Thu Apr 1 22:23:27 UTC 2010
Modified Files:
src/bin/ls: print.c
Log Message:
handle ctime returning NULL
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/bin/ls/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ls/print.c
diff -u src/bin/ls/print.c:1.45 src/bin/ls/print.c:1.46
--- src/bin/ls/print.c:1.45 Sat Feb 14 03:02:04 2009
+++ src/bin/ls/print.c Thu Apr 1 18:23:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.45 2009/02/14 08:02:04 lukem Exp $ */
+/* $NetBSD: print.c,v 1.46 2010/04/01 22:23:27 christos Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)print.c 8.5 (Berkeley) 7/28/94;
#else
-__RCSID($NetBSD: print.c,v 1.45 2009/02/14 08:02:04 lukem Exp $);
+__RCSID($NetBSD: print.c,v 1.46 2010/04/01 22:23:27 christos Exp $);
#endif
#endif /* not lint */
@@ -353,9 +353,13 @@
printtime(time_t ftime)
{
int i;
- char *longstring;
+ const char *longstring;
longstring = ctime(ftime);
+ if (longstring == NULL) {
+ /* 012345678901234567890123 */
+ longstring = ;
+ }
for (i = 4; i 11; ++i)
(void)putchar(longstring[i]);
CVS commit: src/sys/net80211
Module Name:src
Committed By: dyoung
Date: Fri Apr 2 03:46:50 UTC 2010
Modified Files:
src/sys/net80211: ieee80211.c
Log Message:
Delete ieee80211_setbasicrates(). It's buggy, and we drivers can get
along fine without it.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/net80211/ieee80211.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/net80211/ieee80211.c
diff -u src/sys/net80211/ieee80211.c:1.51 src/sys/net80211/ieee80211.c:1.52
--- src/sys/net80211/ieee80211.c:1.51 Fri Mar 26 17:18:05 2010
+++ src/sys/net80211/ieee80211.c Fri Apr 2 03:46:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.c,v 1.51 2010/03/26 17:18:05 dyoung Exp $ */
+/* $NetBSD: ieee80211.c,v 1.52 2010/04/02 03:46:50 dyoung Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID($FreeBSD: src/sys/net80211/ieee80211.c,v 1.22 2005/08/10 16:22:29 sam Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ieee80211.c,v 1.51 2010/03/26 17:18:05 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211.c,v 1.52 2010/04/02 03:46:50 dyoung Exp $);
#endif
/*
@@ -92,8 +92,6 @@
SLIST_HEAD_INITIALIZER(ieee80211_list);
static u_int8_t ieee80211_vapmap[32]; /* enough for 256 */
-static void ieee80211_setbasicrates(struct ieee80211com *);
-
static void
ieee80211_add_vap(struct ieee80211com *ic)
{
@@ -216,7 +214,6 @@
if (ic-ic_caps IEEE80211_C_WME)
ic-ic_flags |= IEEE80211_F_WME;
#endif
- ieee80211_setbasicrates(ic);
(void) ieee80211_setmode(ic, ic-ic_curmode);
if (ic-ic_bintval == 0)
@@ -809,41 +806,6 @@
{ 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
/*
- * Mark the basic rates for the 11g rate table based on the
- * operating mode. For real 11g we mark all the 11b rates
- * and 6, 12, and 24 OFDM. For 11b compatibility we mark only
- * 11b rates. There's also a pseudo 11a-mode used to mark only
- * the basic OFDM rates.
- */
-static void
-ieee80211_setbasicrates(struct ieee80211com *ic)
-{
- static const struct ieee80211_rateset basic[] = {
- { 0, { } }, /* IEEE80211_MODE_AUTO */
- { 3, { 12, 24, 48 } }, /* IEEE80211_MODE_11A */
- { 2, { 2, 4 } },/* IEEE80211_MODE_11B */
- { 4, { 2, 4, 11, 22 } },/* IEEE80211_MODE_11G */
- { 0, { } }, /* IEEE80211_MODE_TURBO */
- };
- enum ieee80211_phymode mode;
- struct ieee80211_rateset *rs;
- int i, j;
-
- for (mode = 0; mode IEEE80211_MODE_MAX; mode++) {
- rs = ic-ic_sup_rates[mode];
- for (i = 0; i rs-rs_nrates; i++) {
- rs-rs_rates[i] = IEEE80211_RATE_VAL;
- for (j = 0; j basic[mode].rs_nrates; j++) {
-if (basic[mode].rs_rates[j] != rs-rs_rates[i])
- continue;
-rs-rs_rates[i] |= IEEE80211_RATE_BASIC;
-break;
- }
- }
- }
-}
-
-/*
* Set the current phy mode and recalculate the active channel
* set based on the available channels for this mode. Also
* select a new default/current channel if the current one is
CVS commit: src/lib/libpuffs
Module Name:src Committed By: pooka Date: Thu Apr 1 09:57:01 UTC 2010 Modified Files: src/lib/libpuffs: puffs_framebuf.3 Log Message: fix a few pastos To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libpuffs/puffs_framebuf.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xorg-server/dist/render
Module Name:xsrc Committed By: mrg Date: Thu Apr 1 11:37:56 UTC 2010 Modified Files: xsrc/external/mit/xorg-server/dist/render: glyph.c Log Message: import fdo git change 185185eeb44a277c324be0f58a4b4a469b56b69b, which i've seen twice in the last two days: Fix crash when all glyphs of a given depth are freed, but not all glyphsets This is how the crash can be triggered with only two clients on the system: Client A: (already running) Client B: Connect Client B: CreateGlyphSet(depthN) Client A: Disconnect Server: free globalGlyphs(depthN) Client B: AddGlyphs(depthN) Server: SEGV This crash was introduced with the FindGlyphsByHash function in 516b96387b0e57b524a37a96da22dbeeeb041712. Before that revision, ResizeGlyphSet was always called before FindGlyphRef, which would re-create globalGlyphs(depthN) if necessary. X.Org Bug 20718 http://bugs.freedesktop.org/show_bug.cgi?id=20718 XXX: needs netbsd-5 pullup. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/render/glyph.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/hppa/hppa
Module Name:src Committed By: skrll Date: Thu Apr 1 12:09:40 UTC 2010 Modified Files: src/sys/arch/hppa/hppa: vm_machdep.c Log Message: Small simplification To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hppa/hppa/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3
Module Name:src Committed By: reed Date: Thu Apr 1 14:13:25 UTC 2010 Added Files: src/external/gpl3: README Log Message: Add the Statement for The NetBSD Foundation's Position on the GPLv3. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl3/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/atari
Module Name:src Committed By: tsutsui Date: Thu Apr 1 17:07:52 UTC 2010 Modified Files: src/sys/arch/atari/atari: autoconf.c src/sys/arch/atari/conf: GENERIC.in HADES.in MILAN.in files.atari Added Files: src/sys/arch/atari/dev: if_ne_mb.c Log Message: Add support for the EtherNEC. The EtherNEC is yet another user designed device for Atari machines, an NE2000 based ISA board connected to Atari's ROM cartridge slot with simple but ingenious interface and cartridge port adapter, and it's the most available network solution for the old Atari machines. See following pages for more details about EtherNEC: http://hardware.atari.org/ether/ http://home.arcor.de/thomas.redelberger/prj/atari/etherne/ http://www.freemint.org/ethernec/ethernec.html To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/atari/atari/autoconf.c cvs rdiff -u -r1.84 -r1.85 src/sys/arch/atari/conf/GENERIC.in cvs rdiff -u -r1.9 -r1.10 src/sys/arch/atari/conf/HADES.in cvs rdiff -u -r1.23 -r1.24 src/sys/arch/atari/conf/MILAN.in cvs rdiff -u -r1.116 -r1.117 src/sys/arch/atari/conf/files.atari cvs rdiff -u -r0 -r1.1 src/sys/arch/atari/dev/if_ne_mb.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: tsutsui Date: Thu Apr 1 17:15:02 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Mention EtherNEC support for atari. To generate a diff of this commit: cvs rdiff -u -r1.1374 -r1.1375 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/sys/arch/powerpc/include/booke
Module Name:src Committed By: matt Date: Thu Apr 1 18:59:27 UTC 2010 Added Files: src/sys/arch/powerpc/include/booke: intr.h Removed Files: src/sys/arch/powerpc/include/booke: booke_intr.h Log Message: Change booke_intr.h to intr.h since powerpc/booke/intr.h will be unique enough. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/sys/arch/powerpc/include/booke/booke_intr.h cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/booke/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net80211
Module Name:src Committed By: dyoung Date: Fri Apr 2 03:46:50 UTC 2010 Modified Files: src/sys/net80211: ieee80211.c Log Message: Delete ieee80211_setbasicrates(). It's buggy, and we drivers can get along fine without it. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/net80211/ieee80211.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
