CVS commit: src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Mar 29 10:34:13 UTC 2013
Modified Files:
src/sys/kern: kern_time.c subr_time.c
Log Message:
Move clock_gettime1() to subr_time.c (which is included in rump kernels)
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/kern/kern_time.c
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/subr_time.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.176 src/sys/kern/kern_time.c:1.177
--- src/sys/kern/kern_time.c:1.176 Fri Mar 29 01:08:17 2013
+++ src/sys/kern/kern_time.c Fri Mar 29 10:34:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.176 2013/03/29 01:08:17 christos Exp $ */
+/* $NetBSD: kern_time.c,v 1.177 2013/03/29 10:34:12 martin Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_time.c,v 1.176 2013/03/29 01:08:17 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_time.c,v 1.177 2013/03/29 10:34:12 martin Exp $);
#include sys/param.h
#include sys/resourcevar.h
@@ -190,24 +190,6 @@ sys___clock_gettime50(struct lwp *l,
return copyout(ats, SCARG(uap, tp), sizeof(ats));
}
-int
-clock_gettime1(clockid_t clock_id, struct timespec *ts)
-{
-
- switch (clock_id) {
- case CLOCK_REALTIME:
- nanotime(ts);
- break;
- case CLOCK_MONOTONIC:
- nanouptime(ts);
- break;
- default:
- return EINVAL;
- }
-
- return 0;
-}
-
/* ARGSUSED */
int
sys___clock_settime50(struct lwp *l,
Index: src/sys/kern/subr_time.c
diff -u src/sys/kern/subr_time.c:1.10 src/sys/kern/subr_time.c:1.11
--- src/sys/kern/subr_time.c:1.10 Fri Mar 29 01:08:17 2013
+++ src/sys/kern/subr_time.c Fri Mar 29 10:34:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_time.c,v 1.10 2013/03/29 01:08:17 christos Exp $ */
+/* $NetBSD: subr_time.c,v 1.11 2013/03/29 10:34:12 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_time.c,v 1.10 2013/03/29 01:08:17 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_time.c,v 1.11 2013/03/29 10:34:12 martin Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -212,6 +212,24 @@ gettimeleft(struct timespec *ts, struct
return tstohz(ts);
}
+int
+clock_gettime1(clockid_t clock_id, struct timespec *ts)
+{
+
+ switch (clock_id) {
+ case CLOCK_REALTIME:
+ nanotime(ts);
+ break;
+ case CLOCK_MONOTONIC:
+ nanouptime(ts);
+ break;
+ default:
+ return EINVAL;
+ }
+
+ return 0;
+}
+
/*
* Calculate delta and convert from struct timespec to the ticks.
*/
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Fri Mar 29 13:27:09 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix pmap_flush_page to also flush the secondary cache, if there is one.
This solves a bus_dma problem with DMA from uncached pages.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 src/sys/arch/arm/arm32/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.253 src/sys/arch/arm/arm32/pmap.c:1.254
--- src/sys/arch/arm/arm32/pmap.c:1.253 Wed Feb 13 23:14:35 2013
+++ src/sys/arch/arm/arm32/pmap.c Fri Mar 29 13:27:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.253 2013/02/13 23:14:35 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.254 2013/03/29 13:27:08 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -212,7 +212,7 @@
#include arm/cpuconf.h
#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.253 2013/02/13 23:14:35 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.254 2013/03/29 13:27:08 matt Exp $);
#ifdef PMAP_DEBUG
@@ -2502,7 +2502,7 @@ void
pmap_flush_page(struct vm_page_md *md, paddr_t pa, enum pmap_flush_op flush)
{
vsize_t va_offset, end_va;
- void (*cf)(vaddr_t, vsize_t);
+ bool wbinv_p;
if (arm_cache_prefer_mask == 0)
return;
@@ -2523,19 +2523,19 @@ pmap_flush_page(struct vm_page_md *md, p
* Mark that the page is no longer dirty.
*/
md-pvh_attrs = ~PVF_DIRTY;
- cf = cpufuncs.cf_idcache_wbinv_range;
+ wbinv_p = true;
break;
case PMAP_FLUSH_SECONDARY:
va_offset = 0;
end_va = arm_cache_prefer_mask;
- cf = cpufuncs.cf_idcache_wbinv_range;
+ wbinv_p = true;
md-pvh_attrs = ~PVF_MULTCLR;
PMAPCOUNT(vac_flush_lots);
break;
case PMAP_CLEAN_PRIMARY:
va_offset = md-pvh_attrs arm_cache_prefer_mask;
end_va = va_offset;
- cf = cpufuncs.cf_dcache_wb_range;
+ wbinv_p = false;
/*
* Mark that the page is no longer dirty.
*/
@@ -2552,6 +2552,8 @@ pmap_flush_page(struct vm_page_md *md, p
NPDEBUG(PDB_VAC, printf(pmap_flush_page: md=%p (attrs=%#x)\n,
md, md-pvh_attrs));
+ const size_t scache_line_size = arm_scache.dcache_line_size;
+
for (; va_offset = end_va; va_offset += PAGE_SIZE) {
const size_t pte_offset = va_offset PGSHIFT;
pt_entry_t * const ptep = cdst_pte[pte_offset];
@@ -2575,7 +2577,22 @@ pmap_flush_page(struct vm_page_md *md, p
/*
* Flush it.
*/
- (*cf)(cdstp + va_offset, PAGE_SIZE);
+vaddr_t va = cdstp + va_offset;
+ if (scache_line_size != 0) {
+ cpu_dcache_wb_range(va, PAGE_SIZE);
+ if (wbinv_p) {
+cpu_sdcache_wbinv_range(va, pa, PAGE_SIZE);
+cpu_dcache_inv_range(va, PAGE_SIZE);
+ } else {
+cpu_sdcache_wb_range(va, pa, PAGE_SIZE);
+ }
+ } else {
+ if (wbinv_p) {
+cpu_dcache_wbinv_range(va, PAGE_SIZE);
+ } else {
+cpu_dcache_wb_range(va, PAGE_SIZE);
+ }
+ }
/*
* Restore the page table entry since we might have interrupted
CVS commit: src/share/terminfo
Module Name:src Committed By: uwe Date: Fri Mar 29 14:31:48 UTC 2013 Modified Files: src/share/terminfo: terminfo Log Message: Pull in fix for PR misc/47674 from ncurses: # 2013-03-23 # * change initialization for vt220, similar entries for consistency # with cursor-key strings (NetBSD #47674) -TD To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/terminfo/terminfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/terminfo/terminfo diff -u src/share/terminfo/terminfo:1.5 src/share/terminfo/terminfo:1.6 --- src/share/terminfo/terminfo:1.5 Fri Jun 1 14:47:06 2012 +++ src/share/terminfo/terminfo Fri Mar 29 14:31:48 2013 @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncur...@gnu.org # -# $Revision: 1.5 $ -# $Date: 2012/06/01 14:47:06 $ +# $Revision: 1.6 $ +# $Date: 2013/03/29 14:31:48 $ # # The original header is preserved below for reference. It is noted that there # is a newer version which differs in some cosmetic details (but actually @@ -2418,7 +2418,7 @@ vt220|vt200|dec vt220, flash=\E[?5h$200/\E[?5l, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L, ind=\ED, - is2=\E[?7h\E[\E[?1h\E F\E[?4l, kbs=^H, kcub1=\E[D, + is2=\E[?7h\E[\E[?1l\E F\E[?4l, kbs=^H, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ, @@ -2448,7 +2448,7 @@ vt220-8bit|vt220-8|vt200-8bit|vt200-8|de flash=\233?5h$200/\233?5l, home=\233H, ht=^I, hts=\EH, ich=\233%p1%d@, if=/usr/share/tabset/vt100, il=\233%p1%dL, il1=\233L, ind=\ED, - is2=\233?7h\233\233?1h\E F\233?4l, kbs=^H, + is2=\233?7h\233\233?1l\E F\233?4l, kbs=^H, kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A, kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~, kf13=\23325~, kf14=\23326~, kf17=\23331~, kf18=\23332~, @@ -2503,7 +2503,7 @@ vt200-js|vt220-js|dec vt200 series with cub1=^H, cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch1=\E[P, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, il1=\E[L, ind=\ED, - is2=\E[61p\E[H\E[?3l\E[?4l\E[?1l\E[?5l\E[?6l\E[?7h\E[?8h\E[?25h\E\E[m, + is2=\E[61p\E[H\E[?3l\E[?4l\E[?1h\E[?5l\E[?6l\E[?7h\E[?8h\E[?25h\E\E[m, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=^M\ED, rc=\E8, rf=/usr/share/tabset/vt100, ri=\EM, rmdc=, rmir=\E[4l, @@ -5231,7 +5231,7 @@ news-unk|SONY NEWS vt100 emulator common cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, home=\E[H, ht=^I, if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L, - is2=\E[?7h\E[?1l\E[?3l\E7\E8, kbs=^H, kcub1=\EOD, + is2=\E[?7h\E[?1h\E[?3l\E7\E8, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf0=\EOY, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW, kf9=\EOX, rc=\E8, rev=\E[7m, ri=\EM, @@ -5279,7 +5279,7 @@ news-old-unk|SONY NEWS vt100 emulator co cr=^M, csr=\E[%i%p1%d;%p2%dr, cub1=^H, cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, ed=\E[J, el=\E[K, home=\E[H, ht=^I, if=/usr/share/tabset/vt100, kbs=^H, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP, + kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, rc=\E8, rev=\E[7m, ri=\EM, rmkx=\E[?1l\E, rmso=\E[m, rmul=\E[m, rs2=\E\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7, @@ -9727,7 +9727,7 @@ vt320-k3|MS-Kermit 3.00's vt320 emulatio flash=\E[?5h\E[?5l\E[?5h\E[?5l\E[?5h\E[?5l, fsl=\E[0$}, home=\E[H, hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, - is2=\E\E F\E[?1l\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD, + is2=\E\E F\E[?1h\E[?7h\E[r\E[2$~, kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdl1=\E[3~, kf0=\E[21~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kich1=\E[2~, knp=\E[6~, @@ -22357,4 +22357,8 @@ v3220|LANPAR Vision II model 3220/3221/3 # 2011-02-20 # * add cons25-debian entry (Brian M Carlson, Debina #607662). # +# 2013-03-23 +# * change initialization for vt220, similar entries for consistency +# with cursor-key strings (NetBSD #47674) -TD +# SHANTIH! SHANTIH! SHANTIH!
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Fri Mar 29 14:52:54 UTC 2013 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5751 Log Message: from openbsd Status: Vendor Tag: OPENSSH Release Tags: v62-20130321 U src/crypto/external/bsd/openssh/dist/LICENCE C src/crypto/external/bsd/openssh/dist/PROTOCOL.agent U src/crypto/external/bsd/openssh/dist/OVERVIEW C src/crypto/external/bsd/openssh/dist/PROTOCOL U src/crypto/external/bsd/openssh/dist/cipher-3des1.c U src/crypto/external/bsd/openssh/dist/PROTOCOL.certkeys N src/crypto/external/bsd/openssh/dist/PROTOCOL.krl U src/crypto/external/bsd/openssh/dist/PROTOCOL.mux U src/crypto/external/bsd/openssh/dist/README U src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-chall.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/auth-options.c U src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c U src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c U src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth-rsa.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h C src/crypto/external/bsd/openssh/dist/auth1.c C src/crypto/external/bsd/openssh/dist/auth2-chall.c C src/crypto/external/bsd/openssh/dist/auth2-gss.c U src/crypto/external/bsd/openssh/dist/auth2-hostbased.c C src/crypto/external/bsd/openssh/dist/auth2-jpake.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c U src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c C src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/authfd.c U src/crypto/external/bsd/openssh/dist/authfd.h C src/crypto/external/bsd/openssh/dist/authfile.c U src/crypto/external/bsd/openssh/dist/authfile.h U src/crypto/external/bsd/openssh/dist/bufaux.c U src/crypto/external/bsd/openssh/dist/bufbn.c U src/crypto/external/bsd/openssh/dist/bufec.c U src/crypto/external/bsd/openssh/dist/buffer.c U src/crypto/external/bsd/openssh/dist/buffer.h U src/crypto/external/bsd/openssh/dist/crc32.c U src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/channels.c U src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/groupaccess.c U src/crypto/external/bsd/openssh/dist/cipher-bf1.c C src/crypto/external/bsd/openssh/dist/cipher.c C src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c C src/crypto/external/bsd/openssh/dist/clientloop.h C src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/compress.c U src/crypto/external/bsd/openssh/dist/compress.h U src/crypto/external/bsd/openssh/dist/crc32.h U src/crypto/external/bsd/openssh/dist/deattack.c U src/crypto/external/bsd/openssh/dist/deattack.h U src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h U src/crypto/external/bsd/openssh/dist/dns.c U src/crypto/external/bsd/openssh/dist/dns.h U src/crypto/external/bsd/openssh/dist/fatal.c C src/crypto/external/bsd/openssh/dist/monitor.c U src/crypto/external/bsd/openssh/dist/match.h U src/crypto/external/bsd/openssh/dist/groupaccess.h U src/crypto/external/bsd/openssh/dist/jpake.c U src/crypto/external/bsd/openssh/dist/gss-genr.c U src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c U src/crypto/external/bsd/openssh/dist/gss-serv.c U src/crypto/external/bsd/openssh/dist/hostfile.c U src/crypto/external/bsd/openssh/dist/hostfile.h U src/crypto/external/bsd/openssh/dist/jpake.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h U src/crypto/external/bsd/openssh/dist/kexdh.c U src/crypto/external/bsd/openssh/dist/kexdhc.c U src/crypto/external/bsd/openssh/dist/kexdhs.c U src/crypto/external/bsd/openssh/dist/kexecdh.c U src/crypto/external/bsd/openssh/dist/kexecdhc.c U src/crypto/external/bsd/openssh/dist/kexecdhs.c U src/crypto/external/bsd/openssh/dist/kexgex.c U src/crypto/external/bsd/openssh/dist/kexgexc.c U src/crypto/external/bsd/openssh/dist/kexgexs.c C src/crypto/external/bsd/openssh/dist/key.c C src/crypto/external/bsd/openssh/dist/key.h N src/crypto/external/bsd/openssh/dist/krl.c N src/crypto/external/bsd/openssh/dist/krl.h C src/crypto/external/bsd/openssh/dist/log.c C
CVS commit: [agc-symver] src/external/public-domain
Module Name:src
Committed By: agc
Date: Fri Mar 29 15:12:46 UTC 2013
Added Files:
src/external/public-domain/sqlite/lib [agc-symver]: Version.map
src/external/public-domain/xz/lib [agc-symver]: Version.map
Log Message:
add versioning info for libsqlite3 and liblzma (xz)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/external/public-domain/sqlite/lib/Version.map
cvs rdiff -u -r0 -r1.1.2.1 src/external/public-domain/xz/lib/Version.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/public-domain/sqlite/lib/Version.map
diff -u /dev/null src/external/public-domain/sqlite/lib/Version.map:1.1.2.1
--- /dev/null Fri Mar 29 15:12:46 2013
+++ src/external/public-domain/sqlite/lib/Version.map Fri Mar 29 15:12:46 2013
@@ -0,0 +1,210 @@
+LIBSQLITE3_1.1.0.0 {
+global:
+ sqlite3_aggregate_context;
+ sqlite3_aggregate_count;
+ sqlite3_auto_extension;
+ sqlite3_backup_finish;
+ sqlite3_backup_init;
+ sqlite3_backup_pagecount;
+ sqlite3_backup_remaining;
+ sqlite3_backup_step;
+ sqlite3_bind_blob;
+ sqlite3_bind_double;
+ sqlite3_bind_int;
+ sqlite3_bind_int64;
+ sqlite3_bind_null;
+ sqlite3_bind_parameter_count;
+ sqlite3_bind_parameter_index;
+ sqlite3_bind_parameter_name;
+ sqlite3_bind_text;
+ sqlite3_bind_text16;
+ sqlite3_bind_value;
+ sqlite3_bind_zeroblob;
+ sqlite3_blob_bytes;
+ sqlite3_blob_close;
+ sqlite3_blob_open;
+ sqlite3_blob_read;
+ sqlite3_blob_reopen;
+ sqlite3_blob_write;
+ sqlite3_busy_handler;
+ sqlite3_busy_timeout;
+ sqlite3_changes;
+ sqlite3_clear_bindings;
+ sqlite3_close;
+ sqlite3_collation_needed;
+ sqlite3_collation_needed16;
+ sqlite3_column_blob;
+ sqlite3_column_bytes;
+ sqlite3_column_bytes16;
+ sqlite3_column_count;
+ sqlite3_column_database_name;
+ sqlite3_column_database_name16;
+ sqlite3_column_decltype;
+ sqlite3_column_decltype16;
+ sqlite3_column_double;
+ sqlite3_column_int;
+ sqlite3_column_int64;
+ sqlite3_column_name;
+ sqlite3_column_name16;
+ sqlite3_column_origin_name;
+ sqlite3_column_origin_name16;
+ sqlite3_column_table_name;
+ sqlite3_column_table_name16;
+ sqlite3_column_text;
+ sqlite3_column_text16;
+ sqlite3_column_type;
+ sqlite3_column_value;
+ sqlite3_commit_hook;
+ sqlite3_compileoption_get;
+ sqlite3_compileoption_used;
+ sqlite3_complete;
+ sqlite3_complete16;
+ sqlite3_config;
+ sqlite3_context_db_handle;
+ sqlite3_create_collation;
+ sqlite3_create_collation16;
+ sqlite3_create_collation_v2;
+ sqlite3_create_function;
+ sqlite3_create_function16;
+ sqlite3_create_function_v2;
+ sqlite3_create_module;
+ sqlite3_create_module_v2;
+ sqlite3_data_count;
+ sqlite3_db_config;
+ sqlite3_db_filename;
+ sqlite3_db_handle;
+ sqlite3_db_mutex;
+ sqlite3_db_release_memory;
+ sqlite3_db_status;
+ sqlite3_declare_vtab;
+ sqlite3_enable_load_extension;
+ sqlite3_enable_shared_cache;
+ sqlite3_errcode;
+ sqlite3_errmsg;
+ sqlite3_errmsg16;
+ sqlite3_exec;
+ sqlite3_expired;
+ sqlite3_extended_errcode;
+ sqlite3_extended_result_codes;
+ sqlite3_file_control;
+ sqlite3_finalize;
+ sqlite3_free;
+ sqlite3_free_table;
+ sqlite3_get_autocommit;
+ sqlite3_get_auxdata;
+ sqlite3_get_table;
+ sqlite3_global_recover;
+ sqlite3_initialize;
+ sqlite3_interrupt;
+ sqlite3_last_insert_rowid;
+ sqlite3_libversion;
+ sqlite3_libversion_number;
+ sqlite3_limit;
+ sqlite3_load_extension;
+ sqlite3_log;
+ sqlite3_malloc;
+ sqlite3_memory_alarm;
+ sqlite3_memory_highwater;
+ sqlite3_memory_used;
+ sqlite3_mprintf;
+ sqlite3_mutex_alloc;
+ sqlite3_mutex_enter;
+ sqlite3_mutex_free;
+ sqlite3_mutex_leave;
+ sqlite3_mutex_try;
+ sqlite3_next_stmt;
+ sqlite3_open;
+ sqlite3_open16;
+ sqlite3_open_v2;
+ sqlite3_os_end;
+ sqlite3_os_init;
+ sqlite3_overload_function;
+ sqlite3_prepare;
+ sqlite3_prepare16;
+ sqlite3_prepare16_v2;
+ sqlite3_prepare_v2;
+ sqlite3_profile;
+ sqlite3_progress_handler;
+ sqlite3_randomness;
+ sqlite3_realloc;
+ sqlite3_release_memory;
+ sqlite3_reset;
+ sqlite3_reset_auto_extension;
+ sqlite3_result_blob;
+ sqlite3_result_double;
+ sqlite3_result_error;
+ sqlite3_result_error16;
+ sqlite3_result_error_code;
+ sqlite3_result_error_nomem;
+ sqlite3_result_error_toobig;
+ sqlite3_result_int;
+ sqlite3_result_int64;
+ sqlite3_result_null;
+ sqlite3_result_text;
+ sqlite3_result_text16;
+ sqlite3_result_text16be;
+ sqlite3_result_text16le;
+ sqlite3_result_value;
+ sqlite3_result_zeroblob;
+ sqlite3_rollback_hook;
+ sqlite3_set_authorizer;
+ sqlite3_set_auxdata;
+ sqlite3_shutdown;
+ sqlite3_sleep;
+ sqlite3_snprintf;
+ sqlite3_soft_heap_limit;
+ sqlite3_soft_heap_limit64;
+ sqlite3_sourceid;
+ sqlite3_sql;
+ sqlite3_status;
+ sqlite3_step;
+ sqlite3_stmt_busy;
+ sqlite3_stmt_readonly;
+ sqlite3_stmt_status;
+ sqlite3_strnicmp;
+ sqlite3_table_column_metadata;
+ sqlite3_test_control;
+ sqlite3_thread_cleanup;
+ sqlite3_threadsafe;
+ sqlite3_total_changes;
+ sqlite3_trace;
+ sqlite3_transfer_bindings;
+
CVS commit: [agc-symver] src/lib/libquota
Module Name:src
Committed By: agc
Date: Fri Mar 29 15:12:48 UTC 2013
Added Files:
src/lib/libquota [agc-symver]: Version.map
Log Message:
add versioning info for libquota
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/lib/libquota/Version.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/libquota/Version.map
diff -u /dev/null src/lib/libquota/Version.map:1.1.2.1
--- /dev/null Fri Mar 29 15:12:48 2013
+++ src/lib/libquota/Version.map Fri Mar 29 15:12:48 2013
@@ -0,0 +1,72 @@
+LIBQUOTA_private_1.0.0.0 {
+};
+
+LIBQUOTA_1.0.0.0 {
+global:
+ quota_opencursor;
+ quotacursor_atend;
+ quotacursor_close;
+ quotacursor_get;
+ quotacursor_getn;
+ quotacursor_rewind;
+ quotacursor_skipidtype;
+ quota_delete;
+ quota_put;
+ quota_getimplname;
+ quota_getnumidtypes;
+ quota_getnumobjtypes;
+ quota_getrestrictions;
+ quota_idtype_getname;
+ quota_objtype_getname;
+ quota_objtype_isbytes;
+ quota_close;
+ quota_getmountdevice;
+ quota_getmountpoint;
+ quota_open;
+ quota_quotaoff;
+ quota_quotaon;
+ __quota_kernel_cursor_atend;
+ __quota_kernel_cursor_create;
+ __quota_kernel_cursor_destroy;
+ __quota_kernel_cursor_get;
+ __quota_kernel_cursor_getn;
+ __quota_kernel_cursor_rewind;
+ __quota_kernel_cursor_skipidtype;
+ __quota_kernel_delete;
+ __quota_kernel_get;
+ __quota_kernel_getimplname;
+ __quota_kernel_getnumidtypes;
+ __quota_kernel_getnumobjtypes;
+ __quota_kernel_getrestrictions;
+ __quota_kernel_idtype_getname;
+ __quota_kernel_objtype_getname;
+ __quota_kernel_objtype_isbytes;
+ __quota_kernel_put;
+ __quota_kernel_quotaoff;
+ __quota_kernel_quotaon;
+ __quota_oldfiles_cursor_atend;
+ __quota_oldfiles_cursor_create;
+ __quota_oldfiles_cursor_destroy;
+ __quota_oldfiles_cursor_get;
+ __quota_oldfiles_cursor_getn;
+ __quota_oldfiles_cursor_rewind;
+ __quota_oldfiles_cursor_skipidtype;
+ __quota_oldfiles_delete;
+ __quota_oldfiles_get;
+ __quota_oldfiles_getimplname;
+ __quota_oldfiles_getquotafile;
+ __quota_oldfiles_infstab;
+ __quota_oldfiles_initialize;
+ __quota_oldfiles_load_fstab;
+ __quota_oldfiles_put;
+ __quota_oldfiles_quotaon;
+ __quota_nfs_get;
+ quota_get;
+ quotaval_clear;
+};
+
+NetBSD_6.99.18.0 {
+local:
+ *;
+} LIBQUOTA_1.0.0.0;
+
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Mar 29 16:21:59 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssh To generate a diff of this commit: cvs rdiff -u -r1.1021 -r1.1022 src/doc/3RDPARTY cvs rdiff -u -r1.1807 -r1.1808 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.1021 src/doc/3RDPARTY:1.1022 --- src/doc/3RDPARTY:1.1021 Thu Mar 28 05:36:11 2013 +++ src/doc/3RDPARTY Fri Mar 29 12:21:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1021 2013/03/28 09:36:11 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1022 2013/03/29 16:21:59 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -904,8 +904,8 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 6.1 -Current Vers: 6.1 / portable 6.1p1 +Version: 6.2 +Current Vers: 6.2 / portable 6.2p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1807 src/doc/CHANGES:1.1808 --- src/doc/CHANGES:1.1807 Mon Mar 25 19:04:53 2013 +++ src/doc/CHANGES Fri Mar 29 12:21:59 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1807 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1808 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -218,3 +218,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [jmcneill 20130325] vcaudio(4): Add support for Broadcom VideoCore IV audio service. [jmcneill 20130325] + openssh: Import 6.2. [christos 20120329]
CVS commit: src/sys/arch/evbarm/stand/boot2440
Module Name:src
Committed By: matt
Date: Fri Mar 29 17:01:00 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/boot2440: Makefile
Log Message:
Make sure CPUFLAGS remains empty.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/stand/boot2440/Makefile
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/evbarm/stand/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.7 src/sys/arch/evbarm/stand/boot2440/Makefile:1.8
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.7 Wed Feb 6 07:19:19 2013
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Fri Mar 29 17:01:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/02/06 07:19:19 matt Exp $
+# $NetBSD: Makefile,v 1.8 2013/03/29 17:01:00 matt Exp $
S= ${.CURDIR}/../../../..
@@ -15,6 +15,7 @@ CPPFLAGS+= -DDM9000MAC=0x08,0x08,0x11,0
CPPFLAGS+= -DDEFAULT_BOOTFILE=ld0a:netbsd;net:
CPPFLAGS+= -nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= -march=armv4 -mabi=apcs-gnu -mfloat-abi=soft
+CPUFLAGS=
DBG=
LIBCRT0= # nothing
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Mar 29 18:32:34 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: tmux-1.8 out. To generate a diff of this commit: cvs rdiff -u -r1.1022 -r1.1023 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1022 src/doc/3RDPARTY:1.1023 --- src/doc/3RDPARTY:1.1022 Fri Mar 29 16:21:59 2013 +++ src/doc/3RDPARTY Fri Mar 29 18:32:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1022 2013/03/29 16:21:59 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1023 2013/03/29 18:32:34 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1208,7 +1208,7 @@ for the import. Package: tmux Version: 1.5 -Current Vers: 1.7 +Current Vers: 1.8 Maintainer: Nicholas Marriott n...@users.sourceforge.net Archive site: http://downloads.sourceforge.net/tmux/ Home page: http://tmux.sourceforge.net/
CVS commit: src/usr.bin/tftp
Module Name:src Committed By: rkujawa Date: Fri Mar 29 18:53:21 UTC 2013 Modified Files: src/usr.bin/tftp: Makefile Log Message: Work around variable might be clobbered by longjmp gcc warning when compiling with CPUFLAGS=-march=armv7. Should be fixed properly one day... To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.bin/tftp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/tftp/Makefile diff -u src/usr.bin/tftp/Makefile:1.10 src/usr.bin/tftp/Makefile:1.11 --- src/usr.bin/tftp/Makefile:1.10 Tue Apr 14 22:15:27 2009 +++ src/usr.bin/tftp/Makefile Fri Mar 29 18:53:21 2013 @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2009/04/14 22:15:27 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2013/03/29 18:53:21 rkujawa Exp $ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +WARNS?=2 + USE_FORT?= yes # network client PROG= tftp
CVS commit: src/usr.sbin/makemandb
Module Name:src
Committed By: christos
Date: Fri Mar 29 20:07:32 UTC 2013
Modified Files:
src/usr.sbin/makemandb: apropos-utils.c apropos-utils.h apropos.1
apropos.c
Log Message:
- If the stdout is not a tty, prevent formatting unless forced with -i
- Don't ever page unless asked for with -p
- Introduce legacy mode (-l)
1. searches only name and name_desc, prints name(section) - name_description
2. turns off escape formatting (can be forced on with -i)
3. turns off context printing (can be forced on with -c)
- Parse the environment $APROPOS variable as an argument vector.
With these changes one can simply 'export APROPOS=-l' and get the old apropos
behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makemandb/apropos-utils.h \
src/usr.sbin/makemandb/apropos.1
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/makemandb/apropos.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/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.11 src/usr.sbin/makemandb/apropos-utils.c:1.12
--- src/usr.sbin/makemandb/apropos-utils.c:1.11 Sun Feb 10 18:58:27 2013
+++ src/usr.sbin/makemandb/apropos-utils.c Fri Mar 29 16:07:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.11 2013/02/10 23:58:27 christos Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.12 2013/03/29 20:07:31 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: apropos-utils.c,v 1.11 2013/02/10 23:58:27 christos Exp $);
+__RCSID($NetBSD: apropos-utils.c,v 1.12 2013/03/29 20:07:31 christos Exp $);
#include sys/queue.h
#include sys/stat.h
@@ -549,18 +549,42 @@ run_query(sqlite3 *db, const char *snipp
default_snippet_args[2] = ...;
snippet_args = default_snippet_args;
}
- query = sqlite3_mprintf(SELECT section, name, name_desc, machine,
- snippet(mandb, %Q, %Q, %Q, -1, 40 ),
- rank_func(matchinfo(mandb, \pclxn\)) AS rank
- FROM mandb
- WHERE mandb MATCH %Q %s
- %s
- ORDER BY rank DESC
- %s,
- snippet_args[0], snippet_args[1], snippet_args[2], args-search_str,
- machine_clause ? machine_clause : ,
- section_clause ? section_clause : ,
- limit_clause ? limit_clause : );
+ if (args-legacy) {
+ query = sqlite3_mprintf(SELECT section, name, name_desc, machine,
+ snippet(mandb, %Q, %Q, %Q, -1, 40 ),
+ rank_func(matchinfo(mandb, \pclxn\)) AS rank
+ FROM mandb
+ WHERE name MATCH %Q
+ %s
+ UNION SELECT section, name, name_desc, machine,
+ snippet(mandb, %Q, %Q, %Q, -1, 40 ),
+ rank_func(matchinfo(mandb, \pclxn\)) AS rank
+ FROM mandb
+ WHERE name_desc MATCH %Q
+ %s
+ ORDER BY rank DESC
+ %s,
+ snippet_args[0], snippet_args[1], snippet_args[2],
+ args-search_str,
+ section_clause ? section_clause : ,
+ snippet_args[0], snippet_args[1], snippet_args[2],
+ args-search_str,
+ section_clause ? section_clause : ,
+ limit_clause ? limit_clause : );
+ } else {
+ query = sqlite3_mprintf(SELECT section, name, name_desc, machine,
+ snippet(mandb, %Q, %Q, %Q, -1, 40 ),
+ rank_func(matchinfo(mandb, \pclxn\)) AS rank
+ FROM mandb
+ WHERE mandb MATCH %Q %s
+ %s
+ ORDER BY rank DESC
+ %s,
+ snippet_args[0], snippet_args[1], snippet_args[2],
+ args-search_str, machine_clause ? machine_clause : ,
+ section_clause ? section_clause : ,
+ limit_clause ? limit_clause : );
+ }
free(machine_clause);
free(section_clause);
@@ -862,7 +886,15 @@ run_query_pager(sqlite3 *db, query_args
struct orig_callback_data orig_data;
orig_data.callback = args-callback;
orig_data.data = args-callback_data;
- const char *snippet_args[] = {\002, \003, ...};
+ const char *snippet_args[3];
+
+ if (args-flags APROPOS_NOFORMAT) {
+ snippet_args[0] = snippet_args[1] = ;
+ } else {
+ snippet_args[0] = \002;
+ snippet_args[1] = \003;
+ }
+ snippet_args[2] = ...;
args-callback = callback_pager;
args-callback_data = (void *) orig_data;
return run_query(db, snippet_args, args);
Index: src/usr.sbin/makemandb/apropos-utils.h
diff -u src/usr.sbin/makemandb/apropos-utils.h:1.7 src/usr.sbin/makemandb/apropos-utils.h:1.8
--- src/usr.sbin/makemandb/apropos-utils.h:1.7 Sun Feb 10 18:58:27 2013
+++ src/usr.sbin/makemandb/apropos-utils.h Fri Mar 29 16:07:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.h,v 1.7 2013/02/10 23:58:27 christos Exp $ */
+/* $NetBSD: apropos-utils.h,v 1.8 2013/03/29 20:07:31 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* All rights reserved.
@@ -74,6 +74,7 @@ typedef struct query_args {
int *sec_nums; // Section in which to do the search
int nrec; // number of records to fetch
int offset; //From which position to start
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: christos Date: Fri Mar 29 20:17:19 UTC 2013 Modified Files: src/usr.sbin/makemandb: apropos.1 Log Message: Don't enumerate all the digit sections Explain limitations in legacy mode To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makemandb/apropos.1 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/makemandb/apropos.1 diff -u src/usr.sbin/makemandb/apropos.1:1.8 src/usr.sbin/makemandb/apropos.1:1.9 --- src/usr.sbin/makemandb/apropos.1:1.8 Fri Mar 29 16:07:31 2013 +++ src/usr.sbin/makemandb/apropos.1 Fri Mar 29 16:17:19 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: apropos.1,v 1.8 2013/03/29 20:07:31 christos Exp $ +.\ $NetBSD: apropos.1,v 1.9 2013/03/29 20:17:19 christos Exp $ .\ .\ Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com .\ All rights reserved. @@ -66,24 +66,8 @@ Quotes are optional for specifying multi .Pp It supports the following options: .Bl -tag -width indent -.It Fl 1 -Search only within section 1 manual pages. -.It Fl 2 -Search only within section 2 manual pages. -.It Fl 3 -Search only within section 3 manual pages. -.It Fl 4 -Search only within section 4 manual pages. -.It Fl 5 -Search only within section 5 manual pages. -.It Fl 6 -Search only within section 6 manual pages. -.It Fl 7 -Search only within section 7 manual pages. -.It Fl 8 -Search only within section 8 manual pages. -.It Fl 9 -Search only within section 9 manual pages. +.It Fl [1-9] +Search only within the specified section manual pages. .It Fl C Do not show the context of the match. .It Fl c @@ -93,6 +77,21 @@ Turn on escape code formatting. .It Fl l Legacy mode: Only searches name and name description. Does not print context, or escape format the text. +Note that this still does not behave exactly like the old +.Nm +did because FTS can only search for words, not partial words. +For example +.Nm +used to return +.Dq xlsfonts +when searching for +.Dq ls , +but now it cannot. +One can approximate the behavior better by searching for +.Dq ls* +and this works because the index is sorted, but unfortunately +.Dq *ls* +does not work. .It Fl n Output up to the specified number of search results. The default limit is infinity.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Fri Mar 29 20:20:22 UTC 2013 Modified Files: src/sys/sys: tree.h Log Message: Add some missing macros from FreeBSD. man page changes incoming. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/sys/tree.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/tree.h diff -u src/sys/sys/tree.h:1.16 src/sys/sys/tree.h:1.17 --- src/sys/sys/tree.h:1.16 Fri Mar 21 09:07:15 2008 +++ src/sys/sys/tree.h Fri Mar 29 16:20:22 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: tree.h,v 1.16 2008/03/21 13:07:15 ad Exp $ */ +/* $NetBSD: tree.h,v 1.17 2013/03/29 20:20:22 christos Exp $ */ /* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */ /* * Copyright 2002 Niels Provos pro...@citi.umich.edu @@ -733,9 +733,29 @@ name##_RB_MINMAX(struct name *head, int (x) != NULL; \ (x) = name##_RB_NEXT(x)) +#define RB_FOREACH_FROM(x, name, y) \ + for ((x) = (y); \ + ((x) != NULL) ((y) = name##_RB_NEXT(x), (x) != NULL); \ + (x) = (y)) + +#define RB_FOREACH_SAFE(x, name, head, y)\ + for ((x) = RB_MIN(name, head); \ + ((x) != NULL) ((y) = name##_RB_NEXT(x), (x) != NULL); \ + (x) = (y)) + #define RB_FOREACH_REVERSE(x, name, head)\ for ((x) = RB_MAX(name, head); \ (x) != NULL; \ (x) = name##_RB_PREV(x)) +#define RB_FOREACH_REVERSE_FROM(x, name, y)\ + for ((x) = (y); \ + ((x) != NULL) ((y) = name##_RB_PREV(x), (x) != NULL); \ + (x) = (y)) + +#define RB_FOREACH_REVERSE_SAFE(x, name, head, y) \ + for ((x) = RB_MAX(name, head); \ + ((x) != NULL) ((y) = name##_RB_PREV(x), (x) != NULL); \ + (x) = (y)) + #endif /* _SYS_TREE_H_ */
CVS commit: src/usr.sbin/makemandb
Module Name:src
Committed By: christos
Date: Fri Mar 29 20:37:00 UTC 2013
Modified Files:
src/usr.sbin/makemandb: apropos-utils.c apropos.1 apropos.c
Log Message:
- Fix legacy mode to use like instead of match. This loses ranking.
- default to unlimited lines
- fix formatting of legacy mode
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/makemandb/apropos.1
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makemandb/apropos.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/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.12 src/usr.sbin/makemandb/apropos-utils.c:1.13
--- src/usr.sbin/makemandb/apropos-utils.c:1.12 Fri Mar 29 16:07:31 2013
+++ src/usr.sbin/makemandb/apropos-utils.c Fri Mar 29 16:37:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.12 2013/03/29 20:07:31 christos Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.13 2013/03/29 20:37:00 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: apropos-utils.c,v 1.12 2013/03/29 20:07:31 christos Exp $);
+__RCSID($NetBSD: apropos-utils.c,v 1.13 2013/03/29 20:37:00 christos Exp $);
#include sys/queue.h
#include sys/stat.h
@@ -550,27 +550,21 @@ run_query(sqlite3 *db, const char *snipp
snippet_args = default_snippet_args;
}
if (args-legacy) {
+ char *wild;
+ easprintf(wild, %%%s%%, args-search_str);
query = sqlite3_mprintf(SELECT section, name, name_desc, machine,
- snippet(mandb, %Q, %Q, %Q, -1, 40 ),
- rank_func(matchinfo(mandb, \pclxn\)) AS rank
+ snippet(mandb, %Q, %Q, %Q, -1, 40 )
FROM mandb
- WHERE name MATCH %Q
+ WHERE name LIKE %Q OR name_desc LIKE %Q
%s
- UNION SELECT section, name, name_desc, machine,
- snippet(mandb, %Q, %Q, %Q, -1, 40 ),
- rank_func(matchinfo(mandb, \pclxn\)) AS rank
- FROM mandb
- WHERE name_desc MATCH %Q
- %s
- ORDER BY rank DESC
%s,
snippet_args[0], snippet_args[1], snippet_args[2],
- args-search_str,
+ wild,
section_clause ? section_clause : ,
snippet_args[0], snippet_args[1], snippet_args[2],
- args-search_str,
section_clause ? section_clause : ,
limit_clause ? limit_clause : );
+ free(wild);
} else {
query = sqlite3_mprintf(SELECT section, name, name_desc, machine,
snippet(mandb, %Q, %Q, %Q, -1, 40 ),
Index: src/usr.sbin/makemandb/apropos.1
diff -u src/usr.sbin/makemandb/apropos.1:1.9 src/usr.sbin/makemandb/apropos.1:1.10
--- src/usr.sbin/makemandb/apropos.1:1.9 Fri Mar 29 16:17:19 2013
+++ src/usr.sbin/makemandb/apropos.1 Fri Mar 29 16:37:00 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: apropos.1,v 1.9 2013/03/29 20:17:19 christos Exp $
+.\ $NetBSD: apropos.1,v 1.10 2013/03/29 20:37:00 christos Exp $
.\
.\ Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
.\ All rights reserved.
@@ -77,21 +77,6 @@ Turn on escape code formatting.
.It Fl l
Legacy mode: Only searches name and name description.
Does not print context, or escape format the text.
-Note that this still does not behave exactly like the old
-.Nm
-did because FTS can only search for words, not partial words.
-For example
-.Nm
-used to return
-.Dq xlsfonts
-when searching for
-.Dq ls ,
-but now it cannot.
-One can approximate the behavior better by searching for
-.Dq ls*
-and this works because the index is sorted, but unfortunately
-.Dq *ls*
-does not work.
.It Fl n
Output up to the specified number of search results.
The default limit is infinity.
Index: src/usr.sbin/makemandb/apropos.c
diff -u src/usr.sbin/makemandb/apropos.c:1.13 src/usr.sbin/makemandb/apropos.c:1.14
--- src/usr.sbin/makemandb/apropos.c:1.13 Fri Mar 29 16:07:31 2013
+++ src/usr.sbin/makemandb/apropos.c Fri Mar 29 16:37:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos.c,v 1.13 2013/03/29 20:07:31 christos Exp $ */
+/* $NetBSD: apropos.c,v 1.14 2013/03/29 20:37:00 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: apropos.c,v 1.13 2013/03/29 20:07:31 christos Exp $);
+__RCSID($NetBSD: apropos.c,v 1.14 2013/03/29 20:37:00 christos Exp $);
#include err.h
#include search.h
@@ -204,7 +204,7 @@ main(int argc, char *argv[])
args.search_str = query;
args.sec_nums = aflags.sec_nums;
args.legacy = aflags.legacy;
- args.nrec = aflags.nresults ? aflags.nresults : 10;
+ args.nrec = aflags.nresults ? aflags.nresults : -1;
args.offset = 0;
args.machine = aflags.machine;
args.callback = query_callback;
@@ -252,7 +252,7 @@ query_callback(void *data, const char *s
callback_data *cbdata = (callback_data *) data;
FILE *out = cbdata-out;
cbdata-count++;
- fprintf(out, cbdata-aflags-legacy ? %s(%s)\t-
CVS commit: src/usr.sbin/makemandb
Module Name:src
Committed By: christos
Date: Fri Mar 29 20:46:07 UTC 2013
Modified Files:
src/usr.sbin/makemandb: apropos-utils.c
Log Message:
fix legacy mode in pager filter. (don't ul format if we are not formatting).
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makemandb/apropos-utils.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/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.13 src/usr.sbin/makemandb/apropos-utils.c:1.14
--- src/usr.sbin/makemandb/apropos-utils.c:1.13 Fri Mar 29 16:37:00 2013
+++ src/usr.sbin/makemandb/apropos-utils.c Fri Mar 29 16:46:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.13 2013/03/29 20:37:00 christos Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.14 2013/03/29 20:46:07 christos Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: apropos-utils.c,v 1.13 2013/03/29 20:37:00 christos Exp $);
+__RCSID($NetBSD: apropos-utils.c,v 1.14 2013/03/29 20:46:07 christos Exp $);
#include sys/queue.h
#include sys/stat.h
@@ -735,11 +735,14 @@ run_query_html(sqlite3 *db, query_args *
* underline a string, pager style.
*/
static char *
-ul_pager(const char *s)
+ul_pager(int ul, const char *s)
{
size_t len;
char *dst, *d;
+ if (!ul)
+ return estrdup(s);
+
// a - _\ba
len = strlen(s) * 3 + 1;
@@ -767,7 +770,7 @@ callback_pager(void *data, const char *s
char *psnippet;
const char *temp = snippet;
int count = 0;
- int i = 0;
+ int i = 0, did;
size_t sz = 0;
size_t psnippet_length;
@@ -792,6 +795,7 @@ callback_pager(void *data, const char *s
* 2. The bytes after \002 need to be overstriked till we encounter \003.
* 3. To overstrike a byte 'A' we need to write 'A\bA'
*/
+ did = 0;
while (*snippet) {
sz = strcspn(snippet, \002);
memcpy(psnippet[i], snippet, sz);
@@ -804,6 +808,7 @@ callback_pager(void *data, const char *s
if (*snippet == '\002')
snippet++;
while (*snippet *snippet != '\003') {
+ did = 1;
psnippet[i++] = *snippet;
psnippet[i++] = '\b';
psnippet[i++] = *snippet++;
@@ -813,9 +818,9 @@ callback_pager(void *data, const char *s
}
psnippet[i] = 0;
- char *ul_section = ul_pager(section);
- char *ul_name = ul_pager(name);
- char *ul_name_desc = ul_pager(name_desc);
+ char *ul_section = ul_pager(did, section);
+ char *ul_name = ul_pager(did, name);
+ char *ul_name_desc = ul_pager(did, name_desc);
(orig_data-callback)(orig_data-data, ul_section, ul_name,
ul_name_desc, psnippet, psnippet_length);
free(ul_section);
CVS commit: src/share/man/man3
Module Name:src Committed By: pgoyette Date: Fri Mar 29 20:58:58 UTC 2013 Modified Files: src/share/man/man3: tree.3 Log Message: Minor typo To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man3/tree.3 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/man3/tree.3 diff -u src/share/man/man3/tree.3:1.7 src/share/man/man3/tree.3:1.8 --- src/share/man/man3/tree.3:1.7 Tue Dec 21 18:05:05 2010 +++ src/share/man/man3/tree.3 Fri Mar 29 20:58:58 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: tree.3,v 1.7 2010/12/21 18:05:05 njoly Exp $ +.\ $NetBSD: tree.3,v 1.8 2013/03/29 20:58:58 pgoyette Exp $ .\ $OpenBSD: tree.3,v 1.9 2003/05/20 09:13:38 jmc Exp $ .\/* .\ * Copyright 2002 Niels Provos pro...@citi.umich.edu @@ -228,7 +228,7 @@ macro, but should be used only once. Finally, the .Fa CMP -argument is the name of a function used to compare trees noded +argument is the name of a function used to compare tree nodes with each other. The function takes two arguments of type .Fa struct TYPE * .
CVS commit: src/share/man/man3
Module Name:src Committed By: christos Date: Fri Mar 29 21:16:31 UTC 2013 Modified Files: src/share/man/man3: tree.3 Log Message: sync with OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man3/tree.3 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/man3/tree.3 diff -u src/share/man/man3/tree.3:1.8 src/share/man/man3/tree.3:1.9 --- src/share/man/man3/tree.3:1.8 Fri Mar 29 16:58:58 2013 +++ src/share/man/man3/tree.3 Fri Mar 29 17:16:31 2013 @@ -1,5 +1,5 @@ -.\ $NetBSD: tree.3,v 1.8 2013/03/29 20:58:58 pgoyette Exp $ -.\ $OpenBSD: tree.3,v 1.9 2003/05/20 09:13:38 jmc Exp $ +.\ $NetBSD: tree.3,v 1.9 2013/03/29 21:16:31 christos Exp $ +.\ $OpenBSD: tree.3,v 1.23 2011/07/09 08:43:01 jmc Exp $ .\/* .\ * Copyright 2002 Niels Provos pro...@citi.umich.edu .\ * All rights reserved. @@ -12,11 +12,6 @@ .\ * 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. -.\ * 3. All advertising materials mentioning features or use of this software -.\ *must display the following acknowledgement: -.\ * This product includes software developed by Niels Provos. -.\ * 4. The name of the author may not be used to endorse or promote products -.\ *derived from this software without specific prior written permission. .\ * .\ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR .\ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -29,7 +24,7 @@ .\ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ */ -.Dd May 5, 2010 +.Dd July 9 2011 .Dt TREE 3 .Os .Sh NAME @@ -51,20 +46,27 @@ .Nm SPLAY_INSERT , .Nm SPLAY_REMOVE , .Nm RB_PROTOTYPE , +.Nm RB_PROTOTYPE_STATIC , .Nm RB_GENERATE , +.Nm RB_GENERATE_STATIC , .Nm RB_ENTRY , .Nm RB_HEAD , .Nm RB_INITIALIZER , .Nm RB_ROOT , .Nm RB_EMPTY , .Nm RB_NEXT , +.Nm RB_PREV , .Nm RB_MIN , .Nm RB_MAX , .Nm RB_FIND , +.Nm RB_NFIND , .Nm RB_LEFT , .Nm RB_RIGHT , .Nm RB_PARENT , .Nm RB_FOREACH , +.Nm RB_FOREACH_SAFE , +.Nm RB_FOREACH_REVERSE , +.Nm RB_FOREACH_REVERSE_SAFE , .Nm RB_INIT , .Nm RB_INSERT , .Nm RB_REMOVE @@ -78,7 +80,7 @@ .Ft struct TYPE * .Fn SPLAY_INITIALIZER SPLAY_HEAD *head .Fn SPLAY_ROOT SPLAY_HEAD *head -.Ft bool +.Ft int .Fn SPLAY_EMPTY SPLAY_HEAD *head .Ft struct TYPE * .Fn SPLAY_NEXT NAME SPLAY_HEAD *head struct TYPE *elm @@ -101,29 +103,38 @@ .Fn SPLAY_REMOVE NAME SPLAY_HEAD *head struct TYPE *elm .Pp .Fn RB_PROTOTYPE NAME TYPE FIELD CMP +.Fn RB_PROTOTYPE_STATIC NAME TYPE FIELD CMP .Fn RB_GENERATE NAME TYPE FIELD CMP +.Fn RB_GENERATE_STATIC NAME TYPE FIELD CMP .Fn RB_ENTRY TYPE .Fn RB_HEAD HEADNAME TYPE .Fn RB_INITIALIZER RB_HEAD *head .Ft struct TYPE * .Fn RB_ROOT RB_HEAD *head -.Ft bool +.Ft int .Fn RB_EMPTY RB_HEAD *head .Ft struct TYPE * .Fn RB_NEXT NAME RB_HEAD *head struct TYPE *elm .Ft struct TYPE * +.Fn RB_PREV NAME RB_HEAD *head struct TYPE *elm +.Ft struct TYPE * .Fn RB_MIN NAME RB_HEAD *head .Ft struct TYPE * .Fn RB_MAX NAME RB_HEAD *head .Ft struct TYPE * .Fn RB_FIND NAME RB_HEAD *head struct TYPE *elm .Ft struct TYPE * +.Fn RB_NFIND NAME RB_HEAD *head struct TYPE *elm +.Ft struct TYPE * .Fn RB_LEFT struct TYPE *elm RB_ENTRY NAME .Ft struct TYPE * .Fn RB_RIGHT struct TYPE *elm RB_ENTRY NAME .Ft struct TYPE * .Fn RB_PARENT struct TYPE *elm RB_ENTRY NAME .Fn RB_FOREACH VARNAME NAME RB_HEAD *head +.Fn RB_FOREACH_SAFE VARNAME NAME RB_HEAD *head TEMP_VARNAME +.Fn RB_FOREACH_REVERSE VARNAME NAME RB_HEAD *head +.Fn RB_FOREACH_REVERSE_SAFE VARNAME NAME RB_HEAD *head TEMP_VARNAME .Ft void .Fn RB_INIT RB_HEAD *head .Ft struct TYPE * @@ -142,12 +153,12 @@ splay trees and red-black trees. .Pp In the macro definitions, .Fa TYPE -is the name tag of a user defined structure that must contain a field of type -.Li SPLAY_ENTRY , +is the name tag of a user defined structure that must contain a field named +.Fa FIELD , +of type +.Li SPLAY_ENTRY or -.Li RB_ENTRY , -named -.Fa ENTRYNAME . +.Li RB_ENTRY . The argument .Fa HEADNAME is the name tag of a user defined structure that must be declared @@ -159,14 +170,16 @@ The argument .Fa NAME has to be a unique name prefix for every tree that is defined. .Pp -The function prototypes are declared with either -.Li SPLAY_PROTOTYPE +The function prototypes are declared with +.Li SPLAY_PROTOTYPE , +.Li RB_PROTOTYPE , or -.Li RB_PROTOTYPE . -The function bodies are generated with either -.Li SPLAY_GENERATE +.Li RB_PROTOTYPE_STATIC . +The function bodies are generated with +.Li SPLAY_GENERATE , +.Li RB_GENERATE , or -.Li RB_GENERATE . +.Li RB_GENERATE_STATIC . See the examples below for further
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Fri Mar 29 21:24:31 UTC 2013
Modified Files:
src/sys/sys: tree.h
Log Message:
sync with OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/tree.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/tree.h
diff -u src/sys/sys/tree.h:1.17 src/sys/sys/tree.h:1.18
--- src/sys/sys/tree.h:1.17 Fri Mar 29 16:20:22 2013
+++ src/sys/sys/tree.h Fri Mar 29 17:24:31 2013
@@ -1,5 +1,5 @@
-/* $NetBSD: tree.h,v 1.17 2013/03/29 20:20:22 christos Exp $ */
-/* $OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $ */
+/* $NetBSD: tree.h,v 1.18 2013/03/29 21:24:31 christos Exp $ */
+/* $OpenBSD: tree.h,v 1.13 2011/07/09 00:19:45 pirofti Exp $ */
/*
* Copyright 2002 Niels Provos pro...@citi.umich.edu
* All rights reserved.
@@ -330,7 +330,7 @@ struct {\
} while (/*CONSTCOND*/ 0)
#ifndef RB_AUGMENT
-#define RB_AUGMENT(x) (void)(x)
+#define RB_AUGMENT(x) do {} while (/*CONSTCOND*/ 0)
#endif
#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: wiz Date: Fri Mar 29 21:39:09 UTC 2013 Modified Files: src/usr.sbin/makemandb: apropos.1 Log Message: Use Ev for environment variables. Improve -n description. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/makemandb/apropos.1 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/makemandb/apropos.1 diff -u src/usr.sbin/makemandb/apropos.1:1.10 src/usr.sbin/makemandb/apropos.1:1.11 --- src/usr.sbin/makemandb/apropos.1:1.10 Fri Mar 29 20:37:00 2013 +++ src/usr.sbin/makemandb/apropos.1 Fri Mar 29 21:39:09 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: apropos.1,v 1.10 2013/03/29 20:37:00 christos Exp $ +.\ $NetBSD: apropos.1,v 1.11 2013/03/29 21:39:09 wiz Exp $ .\ .\ Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com .\ All rights reserved. @@ -38,7 +38,7 @@ .Sh SYNOPSIS .Nm .Op Fl 123456789Ccilpr -.Op Fl n Ar Number of results +.Op Fl n Ar results .Op Fl S Ar machine .Op Fl s Ar section .Ar query @@ -77,7 +77,7 @@ Turn on escape code formatting. .It Fl l Legacy mode: Only searches name and name description. Does not print context, or escape format the text. -.It Fl n +.It Fl n Ar results Output up to the specified number of search results. The default limit is infinity. .It Fl p @@ -105,7 +105,7 @@ tag. .El .Sh ENVIRONMENT VARIABLES The -.Dv APROPOS +.Ev APROPOS environment variables is white-space tokenized as an argument vector and the options in it are parsed and set. Command line options override the environment options.
CVS commit: src/usr.sbin/makemandb
Module Name:src
Committed By: wiz
Date: Fri Mar 29 21:39:16 UTC 2013
Modified Files:
src/usr.sbin/makemandb: apropos.c
Log Message:
Sync usage with man page.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/makemandb/apropos.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/makemandb/apropos.c
diff -u src/usr.sbin/makemandb/apropos.c:1.14 src/usr.sbin/makemandb/apropos.c:1.15
--- src/usr.sbin/makemandb/apropos.c:1.14 Fri Mar 29 20:37:00 2013
+++ src/usr.sbin/makemandb/apropos.c Fri Mar 29 21:39:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos.c,v 1.14 2013/03/29 20:37:00 christos Exp $ */
+/* $NetBSD: apropos.c,v 1.15 2013/03/29 21:39:16 wiz Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: apropos.c,v 1.14 2013/03/29 20:37:00 christos Exp $);
+__RCSID($NetBSD: apropos.c,v 1.15 2013/03/29 21:39:16 wiz Exp $);
#include err.h
#include search.h
@@ -313,8 +313,8 @@ remove_stopwords(const char *query)
static void
usage(void)
{
- fprintf(stderr, Usage: %s [-123456789Ccilpr] [-n results]
- [-s section] [-S machine] query\n,
+ fprintf(stderr, Usage: %s [-123456789Ccilpr] [-n results]
+ [-S machine] [-s section] query\n,
getprogname());
exit(1);
}
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Fri Mar 29 21:45:27 UTC 2013 Modified Files: src/share/man/man3: tree.3 Log Message: Fix date and conflict; use Dv for NULL. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man3/tree.3 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/man3/tree.3 diff -u src/share/man/man3/tree.3:1.9 src/share/man/man3/tree.3:1.10 --- src/share/man/man3/tree.3:1.9 Fri Mar 29 21:16:31 2013 +++ src/share/man/man3/tree.3 Fri Mar 29 21:45:27 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: tree.3,v 1.9 2013/03/29 21:16:31 christos Exp $ +.\ $NetBSD: tree.3,v 1.10 2013/03/29 21:45:27 wiz Exp $ .\ $OpenBSD: tree.3,v 1.23 2011/07/09 08:43:01 jmc Exp $ .\/* .\ * Copyright 2002 Niels Provos pro...@citi.umich.edu @@ -24,7 +24,7 @@ .\ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ */ -.Dd July 9 2011 +.Dd July 9, 2011 .Dt TREE 3 .Os .Sh NAME @@ -241,11 +241,7 @@ macro, but should be used only once. Finally, the .Fa CMP - tree.3 argument is the name of a function used to compare trees' nodes -=== -argument is the name of a function used to compare tree nodes - 1.8 with each other. The function takes two arguments of type .Fa struct TYPE * . @@ -273,7 +269,7 @@ macro inserts the new element .Fa elm into the tree. Upon success, -.Va NULL +.Dv NULL is returned. If a matching element already exists in the tree, the insertion is aborted, and a pointer to the existing element is returned. @@ -285,7 +281,7 @@ macro removes the element from the tree pointed by .Fa head . Upon success, a pointer to the removed element is returned. -.Va NULL +.Dv NULL is returned if .Fa elm is not present in the tree. @@ -418,7 +414,7 @@ macro inserts the new element .Fa elm into the tree. Upon success, -.Va NULL +.Dv NULL is returned. If a matching element already exists in the tree, the insertion is aborted, and a pointer to the existing element is returned. @@ -455,7 +451,7 @@ The .Fn RB_ROOT , .Fn RB_MIN , .Fn RB_MAX , -.Fn RB_NEXT, +.Fn RB_NEXT , and .Fn RB_PREV macros can be used to traverse the tree:
CVS commit: src/sbin/scsictl
Module Name:src Committed By: christos Date: Fri Mar 29 21:46:32 UTC 2013 Modified Files: src/sbin/scsictl: scsictl.8 Log Message: Document debug To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sbin/scsictl/scsictl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/scsictl/scsictl.8 diff -u src/sbin/scsictl/scsictl.8:1.25 src/sbin/scsictl/scsictl.8:1.26 --- src/sbin/scsictl/scsictl.8:1.25 Wed Apr 30 09:10:53 2008 +++ src/sbin/scsictl/scsictl.8 Fri Mar 29 17:46:32 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: scsictl.8,v 1.25 2008/04/30 13:10:53 martin Exp $ +.\ $NetBSD: scsictl.8,v 1.26 2013/03/29 21:46:32 christos Exp $ .\ .\ Copyright (c) 1998, 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 22, 2007 +.Dd March 29, 2013 .Dt SCSICTL 8 .Os .Sh NAME @@ -61,6 +61,26 @@ and displayed to the standard output. .Sh DEVICE COMMANDS The following commands are supported for SCSI devices: .Pp +.Nm debug +.Ar level +.Pp +Set the debugging level for the given device; the following flags are +supported: +.Pp +.Bl -tag -compact -width xx -offset indent +.It Ar 1 +Show scsi commands, errors, data. +.It Ar 2 +Routine flow tracking. +.It Ar 4 +Internal info from routine flows. +.It Ar 8 +Device specific debugging. +.El +.Pp +This option is only supported with kernels compiled with +.Dv SCSIPI_DEBUG . +.Pp .Nm defects .Op primary .Op grown
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Fri Mar 29 21:59:52 UTC 2013 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi Log Message: bump libssh To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.198 -r1.199 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.185 -r1.186 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.656 -r1.657 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/debug/ad.mips64eb \ src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug/ad.mips64el \ src/distrib/sets/lists/debug/md.sparc64 \ src/distrib/sets/lists/debug/shl.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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.120 src/distrib/sets/lists/base/ad.mips64eb:1.121 --- src/distrib/sets/lists/base/ad.mips64eb:1.120 Sun Mar 24 15:56:06 2013 +++ src/distrib/sets/lists/base/ad.mips64eb Fri Mar 29 17:59:51 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.120 2013/03/24 19:56:06 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.121 2013/03/29 21:59:51 christos Exp $ ./lib/64 base-compat-shlib compat ./lib/64/npf base-npf-shlib compat ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic @@ -281,8 +281,8 @@ ./usr/lib/64/libsqlite3.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libss.so.6base-compat-shlib obsolete ./usr/lib/64/libss.so.6.0 base-compat-shlib obsolete -./usr/lib/64/libssh.so.20 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssh.so.20.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.21 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.21.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.10 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.10.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds @@ -597,8 +597,8 @@ ./usr/lib/o32/libsqlite3.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libss.so.6 base-compat-shlib obsolete ./usr/lib/o32/libss.so.6.0 base-compat-shlib obsolete -./usr/lib/o32/libssh.so.20 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssh.so.20.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.21 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.21.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.10 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.10.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.120 src/distrib/sets/lists/base/ad.mips64el:1.121 --- src/distrib/sets/lists/base/ad.mips64el:1.120 Sun Mar 24 15:56:06 2013 +++ src/distrib/sets/lists/base/ad.mips64el Fri Mar 29 17:59:51 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.120 2013/03/24 19:56:06 christos Exp $ +# $NetBSD: ad.mips64el,v 1.121 2013/03/29 21:59:51 christos Exp $ ./lib/64 base-compat-shlib compat ./lib/64/npf base-npf-shlib compat ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic @@ -279,8 +279,8 @@ ./usr/lib/64/libsqlite3.so.1.1 base-compat-shlib compat,pic ./usr/lib/64/libss.so.6base-compat-shlib obsolete ./usr/lib/64/libss.so.6.0 base-compat-shlib obsolete -./usr/lib/64/libssh.so.20 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssh.so.20.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.21 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.21.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.10 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.10.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds @@ -597,8 +597,8 @@ ./usr/lib/o32/libsqlite3.so.1.1 base-compat-shlib compat,pic ./usr/lib/o32/libss.so.6 base-compat-shlib obsolete ./usr/lib/o32/libss.so.6.0 base-compat-shlib obsolete -./usr/lib/o32/libssh.so.20 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssh.so.20.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.21 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.21.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.10 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.10.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.198
CVS commit: src/share/man/man3
Module Name:src Committed By: christos Date: Fri Mar 29 22:51:05 UTC 2013 Modified Files: src/share/man/man3: tree.3 Log Message: fix merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man3/tree.3 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/man3/tree.3 diff -u src/share/man/man3/tree.3:1.10 src/share/man/man3/tree.3:1.11 --- src/share/man/man3/tree.3:1.10 Fri Mar 29 17:45:27 2013 +++ src/share/man/man3/tree.3 Fri Mar 29 18:51:04 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: tree.3,v 1.10 2013/03/29 21:45:27 wiz Exp $ +.\ $NetBSD: tree.3,v 1.11 2013/03/29 22:51:04 christos Exp $ .\ $OpenBSD: tree.3,v 1.23 2011/07/09 08:43:01 jmc Exp $ .\/* .\ * Copyright 2002 Niels Provos pro...@citi.umich.edu @@ -241,7 +241,7 @@ macro, but should be used only once. Finally, the .Fa CMP -argument is the name of a function used to compare trees' nodes +argument is the name of a function used to compare tree nodes with each other. The function takes two arguments of type .Fa struct TYPE * .
CVS commit: src/sys/net80211
Module Name:src
Committed By: christos
Date: Sat Mar 30 01:05:49 UTC 2013
Modified Files:
src/sys/net80211: ieee80211.h ieee80211_proto.h
Log Message:
EDCA and QOS additions from OpenBSD
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/net80211/ieee80211.h
cvs rdiff -u -r1.19 -r1.20 src/sys/net80211/ieee80211_proto.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/net80211/ieee80211.h
diff -u src/sys/net80211/ieee80211.h:1.22 src/sys/net80211/ieee80211.h:1.23
--- src/sys/net80211/ieee80211.h:1.22 Mon Aug 20 03:30:10 2012
+++ src/sys/net80211/ieee80211.h Fri Mar 29 21:05:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.h,v 1.22 2012/08/20 07:30:10 christos Exp $ */
+/* $NetBSD: ieee80211.h,v 1.23 2013/03/30 01:05:48 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -149,6 +149,21 @@ struct ieee80211_qosframe_addr4 {
#define IEEE80211_FC0_SUBTYPE_QOS 0x80
#define IEEE80211_FC0_SUBTYPE_QOS_NULL 0xc0
+/*
+ * DS bit usage
+ *
+ * TA = transmitter address
+ * RA = receiver address
+ * DA = destination address
+ * SA = source address
+ *
+ * ToDSFromDS A1(RA) A2(TA) A3 A4 Use
+ * -
+ * 0 0 DA SA BSSID - IBSS/DLS
+ * 0 1 DA BSSID SA - AP - STA
+ * 1 0 BSSID SA DA - AP - STA
+ * 1 1 RA TA DA SA unspecified (WDS)
+ */
#define IEEE80211_FC1_DIR_MASK 0x03
#define IEEE80211_FC1_DIR_NODS 0x00 /* STA-STA */
#define IEEE80211_FC1_DIR_TODS 0x01 /* STA-AP */
@@ -188,12 +203,24 @@ struct ieee80211_qosframe_addr4 {
#define IEEE80211_QOS_TID 0x000f
/* does frame have QoS sequence control data */
+/* XXX: use ieee80211_has_qos() instead */
#define IEEE80211_QOS_HAS_SEQ(wh) \
(((wh)-i_fc[0] \
(IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
(IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
/*
+ * EDCA Access Categories.
+ */
+enum ieee80211_edca_ac {
+ EDCA_AC_BK = 1, /* Background */
+ EDCA_AC_BE = 0, /* Best Effort */
+ EDCA_AC_VI = 2, /* Video */
+ EDCA_AC_VO = 3 /* Voice */
+};
+#define EDCA_NUM_AC 4
+
+/*
* WME/802.11e information element.
*/
struct ieee80211_wme_info {
@@ -346,6 +373,50 @@ struct ieee80211_frame_cfend { /* NB: a
/* FCS */
} __packed;
+static __inline int
+ieee80211_has_seq(const struct ieee80211_frame *wh)
+{
+ return (wh-i_fc[0] IEEE80211_FC0_TYPE_MASK) !=
+ IEEE80211_FC0_TYPE_CTL;
+}
+
+static __inline int
+ieee80211_has_addr4(const struct ieee80211_frame *wh)
+{
+ return (wh-i_fc[1] IEEE80211_FC1_DIR_MASK) ==
+ IEEE80211_FC1_DIR_DSTODS;
+}
+
+static __inline int
+ieee80211_has_qos(const struct ieee80211_frame *wh)
+{
+ return (wh-i_fc[0]
+ (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) ==
+ (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS);
+}
+
+static __inline int
+ieee80211_has_htc(const struct ieee80211_frame *wh)
+{
+ return (wh-i_fc[1] IEEE80211_FC1_ORDER)
+ (ieee80211_has_qos(wh) ||
+ (wh-i_fc[0] IEEE80211_FC0_TYPE_MASK) ==
+ IEEE80211_FC0_TYPE_MGT);
+}
+
+static __inline u_int16_t
+ieee80211_get_qos(const struct ieee80211_frame *wh)
+{
+ const u_int8_t *frm;
+
+ if (ieee80211_has_addr4(wh))
+ frm = ((const struct ieee80211_qosframe_addr4 *)wh)-i_qos;
+ else
+ frm = ((const struct ieee80211_qosframe *)wh)-i_qos;
+
+ return le16toh(*(const u_int16_t *)frm);
+}
+
/*
* BEACON management packets
*
Index: src/sys/net80211/ieee80211_proto.h
diff -u src/sys/net80211/ieee80211_proto.h:1.19 src/sys/net80211/ieee80211_proto.h:1.20
--- src/sys/net80211/ieee80211_proto.h:1.19 Thu Jan 10 12:40:10 2013
+++ src/sys/net80211/ieee80211_proto.h Fri Mar 29 21:05:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_proto.h,v 1.19 2013/01/10 17:40:10 christos Exp $ */
+/* $NetBSD: ieee80211_proto.h,v 1.20 2013/03/30 01:05:48 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -223,7 +223,7 @@ void ieee80211_wme_updateparams_locked(s
#define ieee80211_new_state(_ic, _nstate, _arg) \
(((_ic)-ic_newstate)((_ic), (_nstate), (_arg)))
-extern int ieee80211_compute_duration(const struct ieee80211_frame_min *,
+int ieee80211_compute_duration(const struct ieee80211_frame_min *,
const struct ieee80211_key *, int,
uint32_t, int, int, struct ieee80211_duration *,
struct ieee80211_duration *, int *, int);
@@ -263,4 +263,5 @@ void ieee80211_notify_node_join(struct i
void ieee80211_notify_node_leave(struct ieee80211com *,
struct ieee80211_node *);
void ieee80211_notify_scan_done(struct ieee80211com *);
+
#endif /* !_NET80211_IEEE80211_PROTO_H_ */
CVS commit: src/sys/net80211
Module Name:src
Committed By: christos
Date: Sat Mar 30 01:06:38 UTC 2013
Modified Files:
src/sys/net80211: ieee80211.h ieee80211_proto.h
Log Message:
remove trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/net80211/ieee80211.h
cvs rdiff -u -r1.20 -r1.21 src/sys/net80211/ieee80211_proto.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/net80211/ieee80211.h
diff -u src/sys/net80211/ieee80211.h:1.23 src/sys/net80211/ieee80211.h:1.24
--- src/sys/net80211/ieee80211.h:1.23 Fri Mar 29 21:05:48 2013
+++ src/sys/net80211/ieee80211.h Fri Mar 29 21:06:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.h,v 1.23 2013/03/30 01:05:48 christos Exp $ */
+/* $NetBSD: ieee80211.h,v 1.24 2013/03/30 01:06:37 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -52,7 +52,7 @@ struct ieee80211_plcp_hdr {
u_int16_t i_crc;
} __packed;
-#define IEEE80211_PLCP_SFD 0xF3A0
+#define IEEE80211_PLCP_SFD 0xF3A0
#define IEEE80211_PLCP_SERVICE 0x00
/*
@@ -723,7 +723,7 @@ enum {
#define IEEE80211_AID(b) ((b) ~ 0xc000)
-/*
+/*
* RTS frame length parameters. The default is specified in
* the 802.11 spec as 512; we treat it as implementation-dependent
* so it's defined in ieee80211_var.h. The max may be wrong
@@ -732,7 +732,7 @@ enum {
#define IEEE80211_RTS_MIN 1
#define IEEE80211_RTS_MAX 2346
-/*
+/*
* TX fragmentation parameters. As above for RTS, we treat
* default as implementation-dependent so define it elsewhere.
*/
Index: src/sys/net80211/ieee80211_proto.h
diff -u src/sys/net80211/ieee80211_proto.h:1.20 src/sys/net80211/ieee80211_proto.h:1.21
--- src/sys/net80211/ieee80211_proto.h:1.20 Fri Mar 29 21:05:48 2013
+++ src/sys/net80211/ieee80211_proto.h Fri Mar 29 21:06:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_proto.h,v 1.20 2013/03/30 01:05:48 christos Exp $ */
+/* $NetBSD: ieee80211_proto.h,v 1.21 2013/03/30 01:06:37 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -82,7 +82,7 @@ struct mbuf *ieee80211_get_rts(struct ie
const struct ieee80211_frame *, uint16_t);
struct mbuf *ieee80211_get_cts_to_self(struct ieee80211com *,
uint16_t);
-void ieee80211_pwrsave(struct ieee80211com *, struct ieee80211_node *,
+void ieee80211_pwrsave(struct ieee80211com *, struct ieee80211_node *,
struct mbuf *);
void ieee80211_reset_erp(struct ieee80211com *);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 01:10:00 UTC 2013
Modified Files:
src/sys/dev/usb: if_otusvar.h
Log Message:
Use the EDCA and QOS stuff from net80211 instead of a home grown copy.
(now that more than one driver needs it, duplicating would be gross)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_otusvar.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/usb/if_otusvar.h
diff -u src/sys/dev/usb/if_otusvar.h:1.6 src/sys/dev/usb/if_otusvar.h:1.7
--- src/sys/dev/usb/if_otusvar.h:1.6 Tue Jan 29 08:54:26 2013
+++ src/sys/dev/usb/if_otusvar.h Fri Mar 29 21:10:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otusvar.h,v 1.6 2013/01/29 13:54:26 christos Exp $ */
+/* $NetBSD: if_otusvar.h,v 1.7 2013/03/30 01:10:00 christos Exp $ */
/* $OpenBSD: if_otusreg.h,v 1.6 2009/04/06 18:17:01 damien Exp $ */
/*-
@@ -20,10 +20,6 @@
#ifndef _IF_OTUSVAR_H_
#define _IF_OTUSVAR_H_
-#ifdef EDCA_NUM_AC
-#define HAVE_EDCA
-#endif
-
#ifndef HAVE_EDCA
/
* XXX: This block belongs in sys/net80211/ieee80211_var.h.
@@ -41,56 +37,6 @@ struct ieee80211_edca_ac_params {
//
#endif /* ! HAVE_EDCA */
-#ifndef HAVE_EDCA
-/
- * XXX: This block belongs in sys/net80211/ieee80211.h.
- */
-
-/*
- * EDCA Access Categories.
- */
-enum ieee80211_edca_ac {
- EDCA_AC_BK = 1, /* Background */
- EDCA_AC_BE = 0, /* Best Effort */
- EDCA_AC_VI = 2, /* Video */
- EDCA_AC_VO = 3 /* Voice */
-};
-#define EDCA_NUM_AC 4
-
-/* XXX: OpenBSD has more of these defined with the standard referenced */
-#define IEEE80211_QOS_ACK_POLICY_NOACK 0x0020
-#define IEEE80211_QOS_ACK_POLICY_MASK 0x0060
-
-static __inline int
-ieee80211_has_addr4(const struct ieee80211_frame *wh)
-{
- return (wh-i_fc[1] IEEE80211_FC1_DIR_MASK) ==
- IEEE80211_FC1_DIR_DSTODS;
-}
-
-static __inline int
-ieee80211_has_qos(const struct ieee80211_frame *wh)
-{
- return (wh-i_fc[0]
- (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) ==
- (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS);
-}
-
-static __inline u_int16_t
-ieee80211_get_qos(const struct ieee80211_frame *wh)
-{
- const u_int8_t *frm;
-
- if (ieee80211_has_addr4(wh))
- frm = ((const struct ieee80211_qosframe_addr4 *)wh)-i_qos;
- else
- frm = ((const struct ieee80211_qosframe *)wh)-i_qos;
-
- return le16toh(*(const u_int16_t *)frm);
-}
-//
-#endif /* ! HAVE_EDCA */
-
/* Default EDCA parameters for when QoS is disabled. */
static const struct ieee80211_edca_ac_params otus_edca_def[] = {
{ 4, 10, 3, 0, 0 },
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 02:37:19 UTC 2013
Modified Files:
src/sys/dev/usb: files.usb usbdevs
Log Message:
new devices
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.641 -r1.642 src/sys/dev/usb/usbdevs
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/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.127 src/sys/dev/usb/files.usb:1.128
--- src/sys/dev/usb/files.usb:1.127 Sat Jan 12 20:15:02 2013
+++ src/sys/dev/usb/files.usb Fri Mar 29 22:37:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.127 2013/01/13 01:15:02 jakllsch Exp $
+# $NetBSD: files.usb,v 1.128 2013/03/30 02:37:18 christos Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -8,8 +8,10 @@ defflag USBVERBOSE
defflag opt_usb.h USB_FRAG_DMA_WORKAROUND
defflag opt_usb.h EHCI_DEBUG OHCI_DEBUG UHCI_DEBUG UHUB_DEBUG USB_DEBUG
+defflag opt_umodem.h UMODEM_DEBUG
defflag opt_uvideo.h UVIDEO_DEBUG
defflag opt_umass.h UMASS_DEBUG
+defflag opt_uatp.h UATP_DEBUG
define usbroothubif { }
define usbdevif { [port = -1], [configuration = -1], [interface = -1],
@@ -441,3 +443,13 @@ file dev/usb/if_urtw.c urtw
device run: ether, ifnet, arp, wlan, firmload
attach run at usbdevif
file dev/usb/if_run.c run
+
+# Atheros AR9002U
+attach athn at usbdevif with athn_usb: firmload
+file dev/usb/if_athn_usb.c athn_usb needs-flag
+
+# XXX: ljt
+# Realtek RTL8188SU/RTL8191SU/RTL8192SU
+device rsu: arp, ether, firmload, ifnet, wlan
+attach rsu at usbdevif
+file dev/usb/if_rsu.c rsu
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.641 src/sys/dev/usb/usbdevs:1.642
--- src/sys/dev/usb/usbdevs:1.641 Thu Mar 28 00:05:17 2013
+++ src/sys/dev/usb/usbdevs Fri Mar 29 22:37:18 2013
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp $
+$NetBSD: usbdevs,v 1.642 2013/03/30 02:37:18 christos Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -73,6 +73,7 @@ vendor ACERLABS 0x0402 Acer Labs
vendor FTDI 0x0403 Future Technology Devices
vendor NEC 0x0409 NEC
vendor KODAK 0x040a Eastman Kodak
+vendor VIA 0x040d VIA
vendor MELCO 0x0411 Melco
vendor CREATIVE 0x041e Creative Labs
vendor NOKIA 0x0421 Nokia
@@ -496,6 +497,7 @@ vendor CONCEPTRONIC 0x14b2 Conceptronic
vendor SUPERTOP 0x14cd SuperTop
vendor PLANEX3 0x14ea Planex Communications
vendor SILICONPORTALS 0x1527 Silicon Portals
+vendor JMICRON 0x152d JMicron
vendor OQO 0x1557 OQO
vendor UMEDIA 0x157e U-MEDIA Communications
vendor FIBERLINE 0x1582 Fiberline
@@ -657,6 +659,7 @@ product ACCTON RT2870_4 0xa618 RT2870
product ACCTON RT3070_1 0xa701 RT3070
product ACCTON RT3070_2 0xa702 RT3070
product ACCTON RT3070_6 0xa703 RT3070
++product ACCTON AR9280 0xa704 AR9280+AR7010
product ACCTON RT2870_1 0xb522 RT2870
product ACCTON RTL8192SU 0xc512 RTL8192SU
product ACCTON RT3070_3 0xc522 RT3070
@@ -687,6 +690,7 @@ product ACERW WARPLINK 0x0204 Warplink
/* Actiontec products */
product ACTIONTEC PRISM_25 0x0408 Prism2.5 WLAN
product ACTIONTEC PRISM_25A 0x0421 Prism2.5 WLAN A
+product ACTIONTEC AR9287 0x1200 AR9287+AR7010
product ACTIONTEC FREELAN 0x6106 ROPEX FreeLan 802.11b
product ACTIONTEC UAT1 0x7605 UAT1 Wireless Ethernet adapter
@@ -871,6 +875,7 @@ product ASIX AX88772B 0x772b AX88772B U
product ASIX AX88772B_1 0x7e2b AX88772B1 USB 2.0 10/100 Ethernet adapter
/* ASUSTeK computer products */
+product ASUSTEK RT2570 0x1706 RT2570
product ASUSTEK WL167G 0x1707 WL-167g USB2.0 WLAN Adapter
product ASUSTEK WL159G 0x170c WL-159g
product ASUSTEK A9T_WIFI 0x171b A9T wireless
@@ -912,10 +917,14 @@ product ATHEROS2 AR5523_3 0x0005 AR5523
product ATHEROS2 AR5523_3_NF 0x0006 AR5523
product ATHEROS2 TG121N 0x1001 TG121N
product ATHEROS2 WN821NV2 0x1002 WN821NV2
+product ATHEROS2 AR9271_1 0x1006 AR9271
product ATHEROS2 3CRUSBN275 0x1010 3CRUSBN275
product ATHEROS2 WN612 0x1011 WN612
product ATHEROS2 AR3011 0x3000 AR3011
+product ATHEROS2 AR9280 0x7010 AR9280+AR7010
+product ATHEROS2 AR9287 0x7015 AR9287+AR7010
product ATHEROS2 AR9170 0x9170 AR9170
+product ATHEROS2 AR9271_3 0xb003 AR9271
/* ATI products */
product ATI2 205 0xa001 USB Cable 205
@@ -961,6 +970,12 @@ product AZUREWAVE RTL8192SU_3 0x3310 RTL
product AZUREWAVE RTL8192SU_4 0x3311 RTL8192SU
product AZUREWAVE RT3070_5 0x3321 RT3070
product AZUREWAVE RTL8192SU_5 0x3325 RTL8192SU
+product AZUREWAVE AR9271_1 0x3327 AR9271
+product AZUREWAVE AR9271_2 0x3328 AR9271
+product AZUREWAVE AR9271_3 0x3346 AR9271
+product AZUREWAVE AR9271_4 0x3348 AR9271
+product AZUREWAVE AR9271_5 0x3349 AR9271
+product AZUREWAVE AR9271_6 0x3350 AR9271
product AZUREWAVE RTL8188CU 0x3357 RTL8188CU
product AZUREWAVE RTL8188CE_1 0x3358 RTL8188CE
product AZUREWAVE
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Sat Mar 30 02:37:48 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.634 -r1.635 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.635 -r1.636 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.634 src/sys/dev/usb/usbdevs.h:1.635 --- src/sys/dev/usb/usbdevs.h:1.634 Thu Mar 28 00:07:55 2013 +++ src/sys/dev/usb/usbdevs.h Fri Mar 29 22:37:47 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.634 2013/03/28 04:07:55 garbled Exp $ */ +/* $NetBSD: usbdevs.h,v 1.635 2013/03/30 02:37:47 christos Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp + * NetBSD: usbdevs,v 1.642 2013/03/30 02:37:18 christos Exp */ /* @@ -80,6 +80,7 @@ #define USB_VENDOR_FTDI 0x0403 /* Future Technology Devices */ #define USB_VENDOR_NEC 0x0409 /* NEC */ #define USB_VENDOR_KODAK 0x040a /* Eastman Kodak */ +#define USB_VENDOR_VIA 0x040d /* VIA */ #define USB_VENDOR_MELCO 0x0411 /* Melco */ #define USB_VENDOR_CREATIVE 0x041e /* Creative Labs */ #define USB_VENDOR_NOKIA 0x0421 /* Nokia */ @@ -503,6 +504,7 @@ #define USB_VENDOR_SUPERTOP 0x14cd /* SuperTop */ #define USB_VENDOR_PLANEX3 0x14ea /* Planex Communications */ #define USB_VENDOR_SILICONPORTALS 0x1527 /* Silicon Portals */ +#define USB_VENDOR_JMICRON 0x152d /* JMicron */ #define USB_VENDOR_OQO 0x1557 /* OQO */ #define USB_VENDOR_UMEDIA 0x157e /* U-MEDIA Communications */ #define USB_VENDOR_FIBERLINE 0x1582 /* Fiberline */ @@ -664,6 +666,7 @@ #define USB_PRODUCT_ACCTON_RT3070_1 0xa701 /* RT3070 */ #define USB_PRODUCT_ACCTON_RT3070_2 0xa702 /* RT3070 */ #define USB_PRODUCT_ACCTON_RT3070_6 0xa703 /* RT3070 */ ++product ACCTON AR9280 0xa704 AR9280+AR7010 #define USB_PRODUCT_ACCTON_RT2870_1 0xb522 /* RT2870 */ #define USB_PRODUCT_ACCTON_RTL8192SU 0xc512 /* RTL8192SU */ #define USB_PRODUCT_ACCTON_RT3070_3 0xc522 /* RT3070 */ @@ -694,6 +697,7 @@ /* Actiontec products */ #define USB_PRODUCT_ACTIONTEC_PRISM_25 0x0408 /* Prism2.5 WLAN */ #define USB_PRODUCT_ACTIONTEC_PRISM_25A 0x0421 /* Prism2.5 WLAN A */ +#define USB_PRODUCT_ACTIONTEC_AR9287 0x1200 /* AR9287+AR7010 */ #define USB_PRODUCT_ACTIONTEC_FREELAN 0x6106 /* ROPEX FreeLan 802.11b */ #define USB_PRODUCT_ACTIONTEC_UAT1 0x7605 /* UAT1 Wireless Ethernet adapter */ @@ -878,6 +882,7 @@ #define USB_PRODUCT_ASIX_AX88772B_1 0x7e2b /* AX88772B1 USB 2.0 10/100 Ethernet adapter */ /* ASUSTeK computer products */ +#define USB_PRODUCT_ASUSTEK_RT2570 0x1706 /* RT2570 */ #define USB_PRODUCT_ASUSTEK_WL167G 0x1707 /* WL-167g USB2.0 WLAN Adapter */ #define USB_PRODUCT_ASUSTEK_WL159G 0x170c /* WL-159g */ #define USB_PRODUCT_ASUSTEK_A9T_WIFI 0x171b /* A9T wireless */ @@ -919,10 +924,14 @@ #define USB_PRODUCT_ATHEROS2_AR5523_3_NF 0x0006 /* AR5523 */ #define USB_PRODUCT_ATHEROS2_TG121N 0x1001 /* TG121N */ #define USB_PRODUCT_ATHEROS2_WN821NV2 0x1002 /* WN821NV2 */ +#define USB_PRODUCT_ATHEROS2_AR9271_1 0x1006 /* AR9271 */ #define USB_PRODUCT_ATHEROS2_3CRUSBN275 0x1010 /* 3CRUSBN275 */ #define USB_PRODUCT_ATHEROS2_WN612 0x1011 /* WN612 */ #define USB_PRODUCT_ATHEROS2_AR3011 0x3000 /* AR3011 */ +#define USB_PRODUCT_ATHEROS2_AR9280 0x7010 /* AR9280+AR7010 */ +#define USB_PRODUCT_ATHEROS2_AR9287 0x7015 /* AR9287+AR7010 */ #define USB_PRODUCT_ATHEROS2_AR9170 0x9170 /* AR9170 */ +#define USB_PRODUCT_ATHEROS2_AR9271_3 0xb003 /* AR9271 */ /* ATI products */ #define USB_PRODUCT_ATI2_205 0xa001 /* USB Cable 205 */ @@ -968,6 +977,12 @@ #define USB_PRODUCT_AZUREWAVE_RTL8192SU_4 0x3311 /* RTL8192SU */ #define USB_PRODUCT_AZUREWAVE_RT3070_5 0x3321 /* RT3070 */ #define USB_PRODUCT_AZUREWAVE_RTL8192SU_5 0x3325 /* RTL8192SU */ +#define USB_PRODUCT_AZUREWAVE_AR9271_1 0x3327 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_2 0x3328 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_3 0x3346 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_4 0x3348 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_5 0x3349 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_6 0x3350 /* AR9271 */ #define USB_PRODUCT_AZUREWAVE_RTL8188CU 0x3357 /* RTL8188CU */ #define USB_PRODUCT_AZUREWAVE_RTL8188CE_1 0x3358 /* RTL8188CE */ #define USB_PRODUCT_AZUREWAVE_RTL8188CE_2 0x3359 /* RTL8188CE */ @@ -1322,8 +1337,11 @@ #define USB_PRODUCT_DLINK2_RTL8192SU_1 0x3300 /* RTL8192SU */ #define USB_PRODUCT_DLINK2_RTL8192SU_2 0x3302 /* RTL8192SU */ #define USB_PRODUCT_DLINK2_DWA131A1 0x3303 /* DWA-131 A1 */ +#define USB_PRODUCT_DLINK2_WUA2340 0x3a07 /* WUA-2340 */ +#define USB_PRODUCT_DLINK2_WUA2340_NF 0x3a08 /* WUA-2340 */ #define USB_PRODUCT_DLINK2_DWA160A2 0x3a09
CVS commit: src
Module Name:src Committed By: christos Date: Sat Mar 30 02:39:00 UTC 2013 Modified Files: src/external/bsd/wpa/bin/hostapd: hostapd.8 src/share/man/man4: Makefile src/sys/arch/amd64/conf: GENERIC src/sys/conf: files src/sys/dev/cardbus: files.cardbus src/sys/dev/pci: files.pci Log Message: patches for new wifi devices. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/hostapd/hostapd.8 cvs rdiff -u -r1.596 -r1.597 src/share/man/man4/Makefile cvs rdiff -u -r1.368 -r1.369 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1065 -r1.1066 src/sys/conf/files cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/files.cardbus cvs rdiff -u -r1.363 -r1.364 src/sys/dev/pci/files.pci 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/wpa/bin/hostapd/hostapd.8 diff -u src/external/bsd/wpa/bin/hostapd/hostapd.8:1.1 src/external/bsd/wpa/bin/hostapd/hostapd.8:1.2 --- src/external/bsd/wpa/bin/hostapd/hostapd.8:1.1 Wed Aug 4 13:12:33 2010 +++ src/external/bsd/wpa/bin/hostapd/hostapd.8 Fri Mar 29 22:38:58 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: hostapd.8,v 1.1 2010/08/04 17:12:33 christos Exp $ +.\ $NetBSD: hostapd.8,v 1.2 2013/03/30 02:38:58 christos Exp $ .\ .\ Copyright (c) 2005 Sam Leffler s...@errno.com .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/usr.sbin/wpa/hostapd/hostapd.8,v 1.2 2005/06/27 06:40:43 ru Exp $ .\ -.Dd June 16, 2005 +.Dd March 21, 2013 .Dt HOSTAPD 8 .Os .Sh NAME @@ -107,9 +107,16 @@ Include key information in debugging out .El .Sh SEE ALSO .Xr ath 4 , +.Xr athn 4 , +.Xr atw 4 , +.Xr awi 4 , +.Xr bwi 4 , .Xr ipw 4 , .Xr iwi 4 , .Xr ral 4 , +.Xr rtw 4 , +.Xr rum 4 , +.Xr run 4 , ??? .Xr wi 4 , .Xr hostapd.conf 5 , .Xr hostapd_cli 8 , Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.596 src/share/man/man4/Makefile:1.597 --- src/share/man/man4/Makefile:1.596 Fri Mar 1 13:25:26 2013 +++ src/share/man/man4/Makefile Fri Mar 29 22:38:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.596 2013/03/01 18:25:26 joerg Exp $ +# $NetBSD: Makefile,v 1.597 2013/03/30 02:38:58 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -8,7 +8,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a aibs.4 alc.4 ale.4 alipm.4 altmem.4 altq.4 amdpm.4 amdtemp.4 amhphy.4 \ amr.4 aps.4 \ an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \ - ath.4 atphy.4 atppc.4 attimer.4 atw.4 \ + ath.4 athn.4 atphy.4 atppc.4 attimer.4 atw.4 \ auacer.4 audio.4 audiocs.4 auich.4 \ auixp.4 autri.4 auvia.4 awi.4 azalia.4 \ battery_pmu.4 bba.4 bce.4 bcsp.4 be.4 bge.4 bnx.4 bha.4 \ Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.368 src/sys/arch/amd64/conf/GENERIC:1.369 --- src/sys/arch/amd64/conf/GENERIC:1.368 Fri Mar 1 21:42:08 2013 +++ src/sys/arch/amd64/conf/GENERIC Fri Mar 29 22:38:58 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.368 2013/03/02 02:42:08 christos Exp $ +# $NetBSD: GENERIC,v 1.369 2013/03/30 02:38:58 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.368 $ +#ident GENERIC-$Revision: 1.369 $ maxusers 64 # estimated number of users @@ -690,6 +690,7 @@ alc* at pci? dev ? function ? # Attansic ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 +athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) - UNTESTED atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) bce* at pci? dev ? function ? # Broadcom 440x 10/100 Ethernet bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet @@ -765,6 +766,7 @@ sm* at mhzc? # CardBus network cards ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 +athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) - UNTESTED atw* at cardbus? function ? # ADMtek ADM8211 (802.11) ex* at cardbus? function ? # 3Com 3C575TX fxp* at cardbus? function ? # Intel i8255x @@ -961,6 +963,7 @@ ucom* at ukyopon? portno ? uscanner* at uhub? port ? # USB 802.11 adapters +athn* at uhub? port ? # Atheros AR9002U atu* at uhub? port ? # Atmel at76c50x 802.11b otus* at uhub? port ? # Atheros AR9001U ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g Index: src/sys/conf/files diff -u src/sys/conf/files:1.1065 src/sys/conf/files:1.1066 --- src/sys/conf/files:1.1065 Fri Mar 1 13:25:55 2013 +++ src/sys/conf/files Fri Mar 29 22:38:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1065 2013/03/01 18:25:55 joerg Exp $ +# $NetBSD: files,v 1.1066 2013/03/30 02:38:59 christos Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Sat Mar 30 02:42:05 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: remove dups To generate a diff of this commit: cvs rdiff -u -r1.642 -r1.643 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.642 src/sys/dev/usb/usbdevs:1.643 --- src/sys/dev/usb/usbdevs:1.642 Fri Mar 29 22:37:18 2013 +++ src/sys/dev/usb/usbdevs Fri Mar 29 22:42:05 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.642 2013/03/30 02:37:18 christos Exp $ +$NetBSD: usbdevs,v 1.643 2013/03/30 02:42:05 christos Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2245,8 +2245,6 @@ product NETGEAR EA101 0x1001 Ethernet a product NETGEAR EA101X 0x1002 Ethernet adapter product NETGEAR FA101 0x1020 10/100 Ethernet product NETGEAR FA120 0x1040 USB 2.0 Fast Ethernet Adapter -product NETGEAR2 MA101 0x4100 MA101 -product NETGEAR2 MA101B 0x4102 MA101 Rev B product NETGEAR MA111NA 0x4110 802.11b Adapter product NETGEAR MA111V2 0x4230 802.11b V2 product NETGEAR WG111V2_2 0x4240 PrismGT USB 2.0 WLAN
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 02:42:20 UTC 2013
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.635 -r1.636 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.636 -r1.637 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.635 src/sys/dev/usb/usbdevs.h:1.636
--- src/sys/dev/usb/usbdevs.h:1.635 Fri Mar 29 22:37:47 2013
+++ src/sys/dev/usb/usbdevs.h Fri Mar 29 22:42:19 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.635 2013/03/30 02:37:47 christos Exp $ */
+/* $NetBSD: usbdevs.h,v 1.636 2013/03/30 02:42:19 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.642 2013/03/30 02:37:18 christos Exp
+ * NetBSD: usbdevs,v 1.643 2013/03/30 02:42:05 christos Exp
*/
/*
@@ -2252,8 +2252,6 @@
#define USB_PRODUCT_NETGEAR_EA101X 0x1002 /* Ethernet adapter */
#define USB_PRODUCT_NETGEAR_FA101 0x1020 /* 10/100 Ethernet */
#define USB_PRODUCT_NETGEAR_FA120 0x1040 /* USB 2.0 Fast Ethernet Adapter */
-#define USB_PRODUCT_NETGEAR2_MA101 0x4100 /* MA101 */
-#define USB_PRODUCT_NETGEAR2_MA101B 0x4102 /* MA101 Rev B */
#define USB_PRODUCT_NETGEAR_MA111NA 0x4110 /* 802.11b Adapter */
#define USB_PRODUCT_NETGEAR_MA111V2 0x4230 /* 802.11b V2 */
#define USB_PRODUCT_NETGEAR_WG111V2_2 0x4240 /* PrismGT USB 2.0 WLAN */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.636 src/sys/dev/usb/usbdevs_data.h:1.637
--- src/sys/dev/usb/usbdevs_data.h:1.636 Fri Mar 29 22:37:47 2013
+++ src/sys/dev/usb/usbdevs_data.h Fri Mar 29 22:42:20 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.636 2013/03/30 02:37:47 christos Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.637 2013/03/30 02:42:20 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.642 2013/03/30 02:37:18 christos Exp
+ * NetBSD: usbdevs,v 1.643 2013/03/30 02:42:05 christos Exp
*/
/*
@@ -6927,14 +6927,6 @@ const struct usb_product usb_products[]
USB 2.0 Fast Ethernet Adapter,
},
{
- USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101,
- MA101,
- },
- {
- USB_VENDOR_NETGEAR2, USB_PRODUCT_NETGEAR2_MA101B,
- MA101 Rev B,
- },
- {
USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111NA,
802.11b Adapter,
},
@@ -9979,4 +9971,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1963;
+const int usb_nproducts = 1961;
CVS commit: src/external/atheros/athn
Module Name:src Committed By: christos Date: Sat Mar 30 02:47:56 UTC 2013 Added Files: src/external/atheros/athn: Makefile Log Message: build glue To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/atheros/athn/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/atheros/athn/Makefile diff -u /dev/null src/external/atheros/athn/Makefile:1.1 --- /dev/null Fri Mar 29 22:47:56 2013 +++ src/external/atheros/athn/Makefile Fri Mar 29 22:47:56 2013 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2013/03/30 02:47:56 christos Exp $ + +NOMAN= # define + +FILES= dist/athn-ar7010 dist/athn-ar7010-11 dist/athn-ar9271 dist/athn-license +FILESDIR= /libdata/firmware/if_athn + +.include bsd.files.mk
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sat Mar 30 02:49:26 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi Log Message: firmware files for if_athn To generate a diff of this commit: cvs rdiff -u -r1.1025 -r1.1026 src/distrib/sets/lists/base/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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1025 src/distrib/sets/lists/base/mi:1.1026 --- src/distrib/sets/lists/base/mi:1.1025 Sun Mar 10 17:48:17 2013 +++ src/distrib/sets/lists/base/mi Fri Mar 29 22:49:26 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1025 2013/03/10 21:48:17 christos Exp $ +# $NetBSD: mi,v 1.1026 2013/03/30 02:49:26 christos Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -130,6 +130,10 @@ ./lib/libssp.so base-obsolete obsolete ./libdata base-sys-root ./libdata/firmwarebase-firmware-root +./libdata/firmware/if_athn/athn-ar7010 base-firmware-root +./libdata/firmware/if_athn/athn-ar7010-11 base-firmware-root +./libdata/firmware/if_athn/athn-ar9271 base-firmware-root +./libdata/firmware/if_athn/athn-license base-firmware-root ./libdata/firmware/if_ipw base-firmware-root ./libdata/firmware/if_ipw/LICENSE base-firmware-root ./libdata/firmware/if_ipw/ipw2100-1.2-i.fw base-firmware-root
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Sat Mar 30 02:59:03 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: remove stray + To generate a diff of this commit: cvs rdiff -u -r1.643 -r1.644 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.643 src/sys/dev/usb/usbdevs:1.644 --- src/sys/dev/usb/usbdevs:1.643 Fri Mar 29 22:42:05 2013 +++ src/sys/dev/usb/usbdevs Fri Mar 29 22:59:03 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.643 2013/03/30 02:42:05 christos Exp $ +$NetBSD: usbdevs,v 1.644 2013/03/30 02:59:03 christos Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -659,7 +659,7 @@ product ACCTON RT2870_4 0xa618 RT2870 product ACCTON RT3070_1 0xa701 RT3070 product ACCTON RT3070_2 0xa702 RT3070 product ACCTON RT3070_6 0xa703 RT3070 -+product ACCTON AR9280 0xa704 AR9280+AR7010 +product ACCTON AR9280 0xa704 AR9280+AR7010 product ACCTON RT2870_1 0xb522 RT2870 product ACCTON RTL8192SU 0xc512 RTL8192SU product ACCTON RT3070_3 0xc522 RT3070
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 02:59:19 UTC 2013
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.636 -r1.637 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.637 -r1.638 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.636 src/sys/dev/usb/usbdevs.h:1.637
--- src/sys/dev/usb/usbdevs.h:1.636 Fri Mar 29 22:42:19 2013
+++ src/sys/dev/usb/usbdevs.h Fri Mar 29 22:59:19 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.636 2013/03/30 02:42:19 christos Exp $ */
+/* $NetBSD: usbdevs.h,v 1.637 2013/03/30 02:59:19 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.643 2013/03/30 02:42:05 christos Exp
+ * NetBSD: usbdevs,v 1.644 2013/03/30 02:59:03 christos Exp
*/
/*
@@ -666,7 +666,7 @@
#define USB_PRODUCT_ACCTON_RT3070_1 0xa701 /* RT3070 */
#define USB_PRODUCT_ACCTON_RT3070_2 0xa702 /* RT3070 */
#define USB_PRODUCT_ACCTON_RT3070_6 0xa703 /* RT3070 */
-+product ACCTON AR9280 0xa704 AR9280+AR7010
+#define USB_PRODUCT_ACCTON_AR9280 0xa704 /* AR9280+AR7010 */
#define USB_PRODUCT_ACCTON_RT2870_1 0xb522 /* RT2870 */
#define USB_PRODUCT_ACCTON_RTL8192SU 0xc512 /* RTL8192SU */
#define USB_PRODUCT_ACCTON_RT3070_3 0xc522 /* RT3070 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.637 src/sys/dev/usb/usbdevs_data.h:1.638
--- src/sys/dev/usb/usbdevs_data.h:1.637 Fri Mar 29 22:42:20 2013
+++ src/sys/dev/usb/usbdevs_data.h Fri Mar 29 22:59:19 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.637 2013/03/30 02:42:20 christos Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.638 2013/03/30 02:59:19 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.643 2013/03/30 02:42:05 christos Exp
+ * NetBSD: usbdevs,v 1.644 2013/03/30 02:59:03 christos Exp
*/
/*
@@ -2387,6 +2387,10 @@ const struct usb_product usb_products[]
RT3070,
},
{
+ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_AR9280,
+ AR9280+AR7010,
+ },
+ {
USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_RT2870_1,
RT2870,
},
@@ -9971,4 +9975,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1961;
+const int usb_nproducts = 1962;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Sat Mar 30 03:03:49 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: missed one To generate a diff of this commit: cvs rdiff -u -r1.644 -r1.645 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.644 src/sys/dev/usb/usbdevs:1.645 --- src/sys/dev/usb/usbdevs:1.644 Fri Mar 29 22:59:03 2013 +++ src/sys/dev/usb/usbdevs Fri Mar 29 23:03:48 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.644 2013/03/30 02:59:03 christos Exp $ +$NetBSD: usbdevs,v 1.645 2013/03/30 03:03:48 christos Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -924,6 +924,7 @@ product ATHEROS2 AR3011 0x3000 AR3011 product ATHEROS2 AR9280 0x7010 AR9280+AR7010 product ATHEROS2 AR9287 0x7015 AR9287+AR7010 product ATHEROS2 AR9170 0x9170 AR9170 +product ATHEROS2 AR9271_2 0x9271 AR9271 product ATHEROS2 AR9271_3 0xb003 AR9271 /* ATI products */
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:04:01 UTC 2013
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.637 -r1.638 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.638 -r1.639 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.637 src/sys/dev/usb/usbdevs.h:1.638
--- src/sys/dev/usb/usbdevs.h:1.637 Fri Mar 29 22:59:19 2013
+++ src/sys/dev/usb/usbdevs.h Fri Mar 29 23:04:01 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.637 2013/03/30 02:59:19 christos Exp $ */
+/* $NetBSD: usbdevs.h,v 1.638 2013/03/30 03:04:01 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.644 2013/03/30 02:59:03 christos Exp
+ * NetBSD: usbdevs,v 1.645 2013/03/30 03:03:48 christos Exp
*/
/*
@@ -931,6 +931,7 @@
#define USB_PRODUCT_ATHEROS2_AR9280 0x7010 /* AR9280+AR7010 */
#define USB_PRODUCT_ATHEROS2_AR9287 0x7015 /* AR9287+AR7010 */
#define USB_PRODUCT_ATHEROS2_AR9170 0x9170 /* AR9170 */
+#define USB_PRODUCT_ATHEROS2_AR9271_2 0x9271 /* AR9271 */
#define USB_PRODUCT_ATHEROS2_AR9271_3 0xb003 /* AR9271 */
/* ATI products */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.638 src/sys/dev/usb/usbdevs_data.h:1.639
--- src/sys/dev/usb/usbdevs_data.h:1.638 Fri Mar 29 22:59:19 2013
+++ src/sys/dev/usb/usbdevs_data.h Fri Mar 29 23:04:01 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.638 2013/03/30 02:59:19 christos Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.639 2013/03/30 03:04:01 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.644 2013/03/30 02:59:03 christos Exp
+ * NetBSD: usbdevs,v 1.645 2013/03/30 03:03:48 christos Exp
*/
/*
@@ -3107,6 +3107,10 @@ const struct usb_product usb_products[]
AR9170,
},
{
+ USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9271_2,
+ AR9271,
+ },
+ {
USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9271_3,
AR9271,
},
@@ -9975,4 +9979,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1962;
+const int usb_nproducts = 1963;
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:09:44 UTC 2013
Modified Files:
src/sys/dev/acpi: thinkpad_acpi.c
src/sys/sys: power.h
Log Message:
Define THINKPAD_EXTENDED_HOTKEYS to enable more hotkeys on ThinkPads.
This has only been tested on a T61.
XXX: Should we put THINKPAD_EXTENDED_HOTKEYS into a opt_*.h include
(defflag) or just always enable it?
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/power.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/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.42 src/sys/dev/acpi/thinkpad_acpi.c:1.43
--- src/sys/dev/acpi/thinkpad_acpi.c:1.42 Sat Nov 24 15:56:39 2012
+++ src/sys/dev/acpi/thinkpad_acpi.c Fri Mar 29 23:09:44 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.42 2012/11/24 20:56:39 riastradh Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.43 2013/03/30 03:09:44 christos Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: thinkpad_acpi.c,v 1.42 2012/11/24 20:56:39 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: thinkpad_acpi.c,v 1.43 2013/03/30 03:09:44 christos Exp $);
#include sys/param.h
#include sys/device.h
@@ -55,15 +55,28 @@ typedef struct thinkpad_softc {
ACPI_HANDLE sc_powhdl;
ACPI_HANDLE sc_cmoshdl;
-#define TP_PSW_SLEEP 0
-#define TP_PSW_HIBERNATE 1
-#define TP_PSW_DISPLAY_CYCLE 2
-#define TP_PSW_LOCK_SCREEN 3
-#define TP_PSW_BATTERY_INFO 4
-#define TP_PSW_EJECT_BUTTON 5
-#define TP_PSW_ZOOM_BUTTON 6
-#define TP_PSW_VENDOR_BUTTON 7
-#define TP_PSW_LAST 8
+#define TP_PSW_SLEEP 0 /* FnF4 */
+#define TP_PSW_HIBERNATE 1 /* FnF12 */
+#define TP_PSW_DISPLAY_CYCLE 2 /* FnF7 */
+#define TP_PSW_LOCK_SCREEN 3 /* FnF2 */
+#define TP_PSW_BATTERY_INFO 4 /* FnF3 */
+#define TP_PSW_EJECT_BUTTON 5 /* FnF9 */
+#define TP_PSW_ZOOM_BUTTON 6 /* FnSPACE */
+#define TP_PSW_VENDOR_BUTTON 7 /* ThinkVantage */
+#define TP_PSW_FNF1_BUTTON 8 /* FnF1 */
+#define TP_PSW_WIRELESS_BUTTON 9 /* FnF5 */
+#define TP_PSW_WWAN_BUTTON 10 /* FnF6 */
+#define TP_PSW_POINTER_BUTTON 11 /* FnF8 */
+#define TP_PSW_FNF10_BUTTON 12 /* FnF10 */
+#define TP_PSW_FNF11_BUTTON 13 /* FnF11 */
+#define TP_PSW_BRIGHTNESS_UP 14
+#define TP_PSW_BRIGHTNESS_DOWN 15
+#define TP_PSW_THINKLIGHT 16
+#define TP_PSW_VOLUME_UP 17
+#define TP_PSW_VOLUME_DOWN 18
+#define TP_PSW_VOLUME_MUTE 19
+#define TP_PSW_LAST 20
+
struct sysmon_pswitch sc_smpsw[TP_PSW_LAST];
bool sc_smpsw_valid;
@@ -83,16 +96,16 @@ typedef struct thinkpad_softc {
#define THINKPAD_NOTIFY_DisplayCycle 0x007
#define THINKPAD_NOTIFY_PointerSwitch 0x008
#define THINKPAD_NOTIFY_EjectButton 0x009
-#define THINKPAD_NOTIFY_FnF10 0x00a
+#define THINKPAD_NOTIFY_FnF10 0x00a /* XXX: Not seen on T61 */
#define THINKPAD_NOTIFY_FnF11 0x00b
#define THINKPAD_NOTIFY_HibernateButton 0x00c
#define THINKPAD_NOTIFY_BrightnessUp 0x010
#define THINKPAD_NOTIFY_BrightnessDown 0x011
#define THINKPAD_NOTIFY_ThinkLight 0x012
#define THINKPAD_NOTIFY_Zoom 0x014
-#define THINKPAD_NOTIFY_VolumeUp 0x015
-#define THINKPAD_NOTIFY_VolumeDown 0x016
-#define THINKPAD_NOTIFY_VolumeMute 0x017
+#define THINKPAD_NOTIFY_VolumeUp 0x015 /* XXX: Not seen on T61 */
+#define THINKPAD_NOTIFY_VolumeDown 0x016 /* XXX: Not seen on T61 */
+#define THINKPAD_NOTIFY_VolumeMute 0x017 /* XXX: Not seen on T61 */
#define THINKPAD_NOTIFY_ThinkVantage 0x018
#define THINKPAD_CMOS_BRIGHTNESS_UP 0x04
@@ -245,6 +258,20 @@ thinkpad_attach(device_t parent, device_
psw[TP_PSW_EJECT_BUTTON].smpsw_name = PSWITCH_HK_EJECT_BUTTON;
psw[TP_PSW_ZOOM_BUTTON].smpsw_name = PSWITCH_HK_ZOOM_BUTTON;
psw[TP_PSW_VENDOR_BUTTON].smpsw_name = PSWITCH_HK_VENDOR_BUTTON;
+#ifdef THINKPAD_EXTENDED_HOTKEYS
+ psw[TP_PSW_FNF1_BUTTON].smpsw_name = PSWITCH_HK_FNF1_BUTTON;
+ psw[TP_PSW_WIRELESS_BUTTON].smpsw_name = PSWITCH_HK_WIRELESS_BUTTON;
+ psw[TP_PSW_WWAN_BUTTON].smpsw_name = PSWITCH_HK_WWAN_BUTTON;
+ psw[TP_PSW_POINTER_BUTTON].smpsw_name = PSWITCH_HK_POINTER_BUTTON;
+ psw[TP_PSW_FNF10_BUTTON].smpsw_name= PSWITCH_HK_FNF10_BUTTON;
+ psw[TP_PSW_FNF11_BUTTON].smpsw_name= PSWITCH_HK_FNF11_BUTTON;
+ psw[TP_PSW_BRIGHTNESS_UP].smpsw_name = PSWITCH_HK_BRIGHTNESS_UP;
+ psw[TP_PSW_BRIGHTNESS_DOWN].smpsw_name = PSWITCH_HK_BRIGHTNESS_DOWN;
+ psw[TP_PSW_THINKLIGHT].smpsw_name = PSWITCH_HK_THINKLIGHT;
+ psw[TP_PSW_VOLUME_UP].smpsw_name = PSWITCH_HK_VOLUME_UP;
+ psw[TP_PSW_VOLUME_DOWN].smpsw_name = PSWITCH_HK_VOLUME_DOWN;
+ psw[TP_PSW_VOLUME_MUTE].smpsw_name = PSWITCH_HK_VOLUME_MUTE;
+#endif /* THINKPAD_EXTENDED_HOTKEYS */
for (i = 0; i TP_PSW_LAST; i++) {
/* not supported yet */
@@ -343,15 +370,39 @@ thinkpad_get_hotkeys(void *opaque)
switch (event) {
case THINKPAD_NOTIFY_BrightnessUp:
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:12:40 UTC 2013
Modified Files:
src/sys/dev/usb: if_athn_usb.c
Log Message:
reflect the new location of the firmware files
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/if_athn_usb.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/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.1 src/sys/dev/usb/if_athn_usb.c:1.2
--- src/sys/dev/usb/if_athn_usb.c:1.1 Fri Mar 29 22:53:02 2013
+++ src/sys/dev/usb/if_athn_usb.c Fri Mar 29 23:12:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.1 2013/03/30 02:53:02 christos Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.2 2013/03/30 03:12:39 christos Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_athn_usb.c,v 1.1 2013/03/30 02:53:02 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_athn_usb.c,v 1.2 2013/03/30 03:12:39 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -813,7 +813,7 @@ athn_usb_load_firmware(struct athn_usb_s
name = athn-ar9271;
/* Read firmware image from the filesystem. */
- if ((error = firmware_open(if_athn_usb, name, fwh)) != 0) {
+ if ((error = firmware_open(if_athn, name, fwh)) != 0) {
aprint_error_dev(sc-sc_dev,
failed to open firmware file %s (%d)\n, name, error);
return error;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:15:53 UTC 2013
Modified Files:
src/sys/dev/usb: if_atu.c if_smsc.c if_upgt.c if_urndis.c
Log Message:
remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_smsc.c src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_urndis.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/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.48 src/sys/dev/usb/if_atu.c:1.49
--- src/sys/dev/usb/if_atu.c:1.48 Tue Jan 22 07:40:42 2013
+++ src/sys/dev/usb/if_atu.c Fri Mar 29 23:15:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.48 2013/01/22 12:40:42 jmcneill Exp $ */
+/* $NetBSD: if_atu.c,v 1.49 2013/03/30 03:15:52 christos Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_atu.c,v 1.48 2013/01/22 12:40:42 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_atu.c,v 1.49 2013/03/30 03:15:52 christos Exp $);
#include sys/param.h
#include sys/sockio.h
@@ -693,8 +693,8 @@ atu_initial_config(struct atu_softc *sc)
cmd.WEP_DefaultKeyID = ic-ic_def_txkey;
for (i = 0; i IEEE80211_WEP_NKID; i++) {
- memcpy(cmd.WEP_DefaultKey[i], ic-ic_nw_keys[i].wk_key,
- ic-ic_nw_keys[i].wk_keylen);
+ memcpy(cmd.WEP_DefaultKey[i], ic-ic_nw_keys[i].wk_key,
+ ic-ic_nw_keys[i].wk_keylen);
}
}
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.8 src/sys/dev/usb/if_smsc.c:1.9
--- src/sys/dev/usb/if_smsc.c:1.8 Mon Mar 11 05:35:38 2013
+++ src/sys/dev/usb/if_smsc.c Fri Mar 29 23:15:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.8 2013/03/11 09:35:38 skrll Exp $ */
+/* $NetBSD: if_smsc.c,v 1.9 2013/03/30 03:15:52 christos Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -574,7 +574,7 @@ smsc_init(struct ifnet *ifp)
/* Load the multicast filter. */
smsc_setmulti(sc);
-
+
/* Open RX and TX pipes. */
err = usbd_open_pipe(sc-sc_iface, sc-sc_ed[SMSC_ENDPT_RX],
USBD_EXCLUSIVE_USE, sc-sc_ep[SMSC_ENDPT_RX]);
@@ -1044,7 +1044,7 @@ smsc_attach(device_t parent, device_t se
ifp-if_stop = smsc_stop;
sc-sc_ec.ec_capabilities = ETHERCAP_VLAN_MTU;
-
+
/* Setup some of the basics */
sc-sc_phyno = 1;
@@ -1308,7 +1308,7 @@ smsc_rxeof(usbd_xfer_handle xfer, usbd_p
m-m_pkthdr.rcvif = ifp;
pktlen -= 2; // JDM
-
+
m-m_pkthdr.len = m-m_len = pktlen;
#define ETHER_ALIGN 2
m_adj(m, ETHER_ALIGN);
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.8 src/sys/dev/usb/if_upgt.c:1.9
--- src/sys/dev/usb/if_upgt.c:1.8 Tue Jan 22 07:40:43 2013
+++ src/sys/dev/usb/if_upgt.c Fri Mar 29 23:15:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.8 2013/01/22 12:40:43 jmcneill Exp $ */
+/* $NetBSD: if_upgt.c,v 1.9 2013/03/30 03:15:53 christos Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_upgt.c,v 1.8 2013/01/22 12:40:43 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_upgt.c,v 1.9 2013/03/30 03:15:53 christos Exp $);
#include sys/param.h
#include sys/callout.h
@@ -727,7 +727,7 @@ upgt_fw_verify(struct upgt_softc *sc)
if (*uc != 0)
break;
}
- if (offset == sc-sc_fw_size) {
+ if (offset == sc-sc_fw_size) {
aprint_error_dev(sc-sc_dev,
firmware Boot Record Area not found\n);
return EIO;
Index: src/sys/dev/usb/if_urndis.c
diff -u src/sys/dev/usb/if_urndis.c:1.4 src/sys/dev/usb/if_urndis.c:1.5
--- src/sys/dev/usb/if_urndis.c:1.4 Thu Mar 1 23:22:57 2012
+++ src/sys/dev/usb/if_urndis.c Fri Mar 29 23:15:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urndis.c,v 1.4 2012/03/02 04:22:57 jakllsch Exp $ */
+/* $NetBSD: if_urndis.c,v 1.5 2013/03/30 03:15:53 christos Exp $ */
/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
/*
@@ -21,7 +21,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.4 2012/03/02 04:22:57 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_urndis.c,v 1.5 2013/03/30 03:15:53 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -330,7 +330,7 @@ urndis_ctrl_handle_query(struct urndis_s
go out of buffer limit %u\n,
DEVNAME(sc),
le32toh(msg-rm_infobuflen),
- le32toh(msg-rm_infobufoffset),
+ le32toh(msg-rm_infobufoffset),
le32toh(msg-rm_infobuflen) +
le32toh(msg-rm_infobufoffset) + (uint32_t)RNDIS_HEADER_OFFSET,
le32toh(msg-rm_len));
@@ -580,7 +580,7 @@ urndis_ctrl_set(struct urndis_softc *sc,
rval = urndis_ctrl_handle(sc, hdr, NULL, NULL);
if (rval != RNDIS_STATUS_SUCCESS)
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:17:34 UTC 2013
Modified Files:
src/sys/dev/usb: if_run.c if_urtwn.c
Log Message:
replace macro with inline function
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/if_urtwn.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/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.8 src/sys/dev/usb/if_run.c:1.9
--- src/sys/dev/usb/if_run.c:1.8 Tue Jan 22 07:40:42 2013
+++ src/sys/dev/usb/if_run.c Fri Mar 29 23:17:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.8 2013/01/22 12:40:42 jmcneill Exp $ */
+/* $NetBSD: if_run.c,v 1.9 2013/03/30 03:17:33 christos Exp $ */
/* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_run.c,v 1.8 2013/01/22 12:40:42 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_run.c,v 1.9 2013/03/30 03:17:33 christos Exp $);
#include sys/param.h
#include sys/sockio.h
@@ -2251,7 +2251,7 @@ run_tx(struct run_softc *sc, struct mbuf
#endif
type = wh-i_fc[0] IEEE80211_FC0_TYPE_MASK;
- if ((hasqos = IEEE80211_QOS_HAS_SEQ(wh))) {
+ if ((hasqos = ieee80211_has_qos(wh))) {
qos = ((struct ieee80211_qosframe *)wh)-i_qos[0];
tid = qos IEEE80211_QOS_TID;
qid = TID_TO_WME_AC(tid);
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.22 src/sys/dev/usb/if_urtwn.c:1.23
--- src/sys/dev/usb/if_urtwn.c:1.22 Tue Mar 12 10:19:34 2013
+++ src/sys/dev/usb/if_urtwn.c Fri Mar 29 23:17:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.22 2013/03/12 14:19:34 christos Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.23 2013/03/30 03:17:33 christos Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_urtwn.c,v 1.22 2013/03/12 14:19:34 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_urtwn.c,v 1.23 2013/03/30 03:17:33 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -2197,7 +2197,7 @@ urtwn_tx(struct urtwn_softc *sc, struct
bpf_mtap2(sc-sc_drvbpf, tap, sc-sc_txtap_len, m);
}
- if ((hasqos = IEEE80211_QOS_HAS_SEQ(wh))) {
+ if ((hasqos = ieee80211_has_qos(wh))) {
/* data frames in 11n mode */
struct ieee80211_qosframe *qwh = (void *)wh;
tid = qwh-i_qos[0] IEEE80211_QOS_TID;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:21:43 UTC 2013
Modified Files:
src/sys/dev/pci: if_iwn.c if_wpi.c
Log Message:
replace function with macro
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/if_iwn.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/if_wpi.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_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.63 src/sys/dev/pci/if_iwn.c:1.64
--- src/sys/dev/pci/if_iwn.c:1.63 Fri Mar 29 23:21:05 2013
+++ src/sys/dev/pci/if_iwn.c Fri Mar 29 23:21:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.63 2013/03/30 03:21:05 christos Exp $ */
+/* $NetBSD: if_iwn.c,v 1.64 2013/03/30 03:21:43 christos Exp $ */
/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwn.c,v 1.63 2013/03/30 03:21:05 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwn.c,v 1.64 2013/03/30 03:21:43 christos Exp $);
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -2726,7 +2726,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf
hdrlen = ieee80211_anyhdrsize(wh);
type = wh-i_fc[0] IEEE80211_FC0_TYPE_MASK;
- hdrlen2 = (IEEE80211_QOS_HAS_SEQ(wh)) ?
+ hdrlen2 = (ieee80211_has_qos(wh)) ?
sizeof (struct ieee80211_qosframe) :
sizeof (struct ieee80211_frame);
@@ -2736,7 +2736,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf
/* XXX OpenBSD sets a different tid when using QOS */
tid = 0;
- if (IEEE80211_QOS_HAS_SEQ(wh)) {
+ if (ieee80211_has_qos(wh)) {
cap = ic-ic_wme.wme_chanParams;
noack = cap-cap_wmeParams[ac].wmep_noackPolicy;
}
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.55 src/sys/dev/pci/if_wpi.c:1.56
--- src/sys/dev/pci/if_wpi.c:1.55 Fri Mar 29 23:21:08 2013
+++ src/sys/dev/pci/if_wpi.c Fri Mar 29 23:21:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.55 2013/03/30 03:21:08 christos Exp $*/
+/* $NetBSD: if_wpi.c,v 1.56 2013/03/30 03:21:43 christos Exp $*/
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.55 2013/03/30 03:21:08 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.56 2013/03/30 03:21:43 christos Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -1833,7 +1833,7 @@ wpi_tx_data(struct wpi_softc *sc, struct
wh = mtod(m0, struct ieee80211_frame *);
- if (IEEE80211_QOS_HAS_SEQ(wh)) {
+ if (ieee80211_has_qos(wh)) {
cap = ic-ic_wme.wme_chanParams;
noack = cap-cap_wmeParams[ac].wmep_noackPolicy;
}
CVS commit: src/sys/dev/pcmcia
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:22:14 UTC 2013
Modified Files:
src/sys/dev/pcmcia: if_wi_pcmcia.c
Log Message:
remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/pcmcia/if_wi_pcmcia.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/pcmcia/if_wi_pcmcia.c
diff -u src/sys/dev/pcmcia/if_wi_pcmcia.c:1.89 src/sys/dev/pcmcia/if_wi_pcmcia.c:1.90
--- src/sys/dev/pcmcia/if_wi_pcmcia.c:1.89 Mon Aug 15 14:04:59 2011
+++ src/sys/dev/pcmcia/if_wi_pcmcia.c Fri Mar 29 23:22:14 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.89 2011/08/15 18:04:59 dyoung Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.90 2013/03/30 03:22:14 christos Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wi_pcmcia.c,v 1.89 2011/08/15 18:04:59 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wi_pcmcia.c,v 1.90 2013/03/30 03:22:14 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -323,7 +323,7 @@ wi_pcmcia_validate_config(struct pcmcia_
static void
wi_pcmcia_attach(device_t parent, device_t self, void *aux)
{
- struct wi_pcmcia_softc *psc = device_private(self);
+ struct wi_pcmcia_softc *psc = device_private(self);
struct wi_softc *sc = psc-sc_wi;
struct pcmcia_attach_args *pa = aux;
struct pcmcia_config_entry *cfe;
CVS commit: src/sys/net80211
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:24:55 UTC 2013
Modified Files:
src/sys/net80211: ieee80211_crypto_ccmp.c ieee80211_input.c
Log Message:
remove trailing space
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/net80211/ieee80211_crypto_ccmp.c
cvs rdiff -u -r1.73 -r1.74 src/sys/net80211/ieee80211_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/net80211/ieee80211_crypto_ccmp.c
diff -u src/sys/net80211/ieee80211_crypto_ccmp.c:1.8 src/sys/net80211/ieee80211_crypto_ccmp.c:1.9
--- src/sys/net80211/ieee80211_crypto_ccmp.c:1.8 Wed Dec 17 15:51:37 2008
+++ src/sys/net80211/ieee80211_crypto_ccmp.c Fri Mar 29 23:24:55 2013
@@ -34,7 +34,7 @@
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_crypto_ccmp.c,v 1.7 2005/07/11 03:06:23 sam Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ieee80211_crypto_ccmp.c,v 1.8 2008/12/17 20:51:37 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_crypto_ccmp.c,v 1.9 2013/03/30 03:24:55 christos Exp $);
#endif
/*
@@ -45,8 +45,8 @@ __KERNEL_RCSID(0, $NetBSD: ieee80211_cr
* it's license is included below.
*/
#include sys/param.h
-#include sys/systm.h
-#include sys/mbuf.h
+#include sys/systm.h
+#include sys/mbuf.h
#include sys/malloc.h
#include sys/kernel.h
Index: src/sys/net80211/ieee80211_input.c
diff -u src/sys/net80211/ieee80211_input.c:1.73 src/sys/net80211/ieee80211_input.c:1.74
--- src/sys/net80211/ieee80211_input.c:1.73 Thu Jan 10 12:40:10 2013
+++ src/sys/net80211/ieee80211_input.c Fri Mar 29 23:24:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_input.c,v 1.73 2013/01/10 17:40:10 christos Exp $ */
+/* $NetBSD: ieee80211_input.c,v 1.74 2013/03/30 03:24:55 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.81 2005/08/10 16:22:29 sam Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ieee80211_input.c,v 1.73 2013/01/10 17:40:10 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_input.c,v 1.74 2013/03/30 03:24:55 christos Exp $);
#endif
#include opt_inet.h
@@ -46,11 +46,11 @@ __KERNEL_RCSID(0, $NetBSD: ieee80211_in
#include sys/param.h
#include sys/systm.h
-#include sys/mbuf.h
+#include sys/mbuf.h
#include sys/malloc.h
#include sys/endian.h
#include sys/kernel.h
-
+
#include sys/socket.h
#include sys/sockio.h
#include sys/endian.h
@@ -70,7 +70,7 @@ __KERNEL_RCSID(0, $NetBSD: ieee80211_in
#include net/bpf.h
#ifdef INET
-#include netinet/in.h
+#include netinet/in.h
#include net/if_ether.h
#endif
@@ -919,7 +919,7 @@ ieee80211_auth_open(struct ieee80211com
ic-ic_stats.is_rx_bad_auth++; /* XXX */
if (ic-ic_opmode == IEEE80211_M_HOSTAP) {
/* XXX hack to workaround calling convention */
- ieee80211_send_error(ic, ni, wh-i_addr2,
+ ieee80211_send_error(ic, ni, wh-i_addr2,
IEEE80211_FC0_SUBTYPE_AUTH,
(seq + 1) | (IEEE80211_STATUS_ALG16));
}
@@ -1340,7 +1340,7 @@ ieee80211_ssid_mismatch(struct ieee80211
} while (0)
#endif /* !IEEE80211_DEBUG */
-/* unalligned little endian access */
+/* unalligned little endian access */
#define LE_READ_2(p) \
((u_int16_t) \
const u_int8_t *)(p))[0] ) | \
@@ -1618,7 +1618,7 @@ ieee80211_parse_rsn(struct ieee80211com
int n;
/*
- * Check the length once for fixed parts:
+ * Check the length once for fixed parts:
* version, mcast cipher, and 2 selector counts.
* Other, variable-length data, must be checked separately.
*/
@@ -1686,7 +1686,7 @@ ieee80211_parse_rsn(struct ieee80211com
n = LE_READ_2(frm);
frm += 2, len -= 2;
if (len n*4) {
- IEEE80211_DISCARD_IE(ic,
+ IEEE80211_DISCARD_IE(ic,
IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
wh, RSN, key mgmt alg data too short; len %u, n %u,
len, n);
@@ -1861,7 +1861,7 @@ ieee80211_recv_mgmt(struct ieee80211com
* updates such as 802.11g slot time), or
*o adhoc mode (to discover neighbors)
* Frames otherwise received are discarded.
- */
+ */
if (!((ic-ic_flags IEEE80211_F_SCAN) ||
(ic-ic_opmode == IEEE80211_M_STA ni-ni_associd) ||
ic-ic_opmode == IEEE80211_M_IBSS)) {
@@ -2249,7 +2249,7 @@ ieee80211_recv_mgmt(struct ieee80211com
}
#endif /* !IEEE80211_NO_HOSTAP */
return;
- }
+ }
break;
}
@@ -2348,7 +2348,7 @@ ieee80211_recv_mgmt(struct ieee80211com
ieee80211_node_leave(ic, ni);
/* XXX distinguish WPA/RSN? */
ic-ic_stats.is_rx_assoc_badwpaie++;
- return;
+ return;
}
if (wpa != NULL) {
/*
@@ -2723,7 +2723,7 @@ ieee80211_node_pwrsave(struct ieee80211_
IEEE80211_NODE_SAVEQ_DEQUEUE(ni, m, qlen);
if (m == NULL)
break;
- /*
+ /*
* If this is the last packet, turn off the TIM bit.
* If there are more
CVS commit: src/sys/net80211
Module Name:src
Committed By: christos
Date: Sat Mar 30 03:25:47 UTC 2013
Modified Files:
src/sys/net80211: ieee80211.h
Log Message:
remove obsolete macro
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/net80211/ieee80211.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/net80211/ieee80211.h
diff -u src/sys/net80211/ieee80211.h:1.24 src/sys/net80211/ieee80211.h:1.25
--- src/sys/net80211/ieee80211.h:1.24 Fri Mar 29 21:06:37 2013
+++ src/sys/net80211/ieee80211.h Fri Mar 29 23:25:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.h,v 1.24 2013/03/30 01:06:37 christos Exp $ */
+/* $NetBSD: ieee80211.h,v 1.25 2013/03/30 03:25:47 christos Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -202,13 +202,6 @@ struct ieee80211_qosframe_addr4 {
#define IEEE80211_QOS_ESOP_S 4
#define IEEE80211_QOS_TID 0x000f
-/* does frame have QoS sequence control data */
-/* XXX: use ieee80211_has_qos() instead */
-#define IEEE80211_QOS_HAS_SEQ(wh) \
- (((wh)-i_fc[0] \
- (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
- (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
-
/*
* EDCA Access Categories.
*/
