CVS commit: src/distrib/sets/lists
Module Name:src Committed By: matt Date: Fri Jul 3 15:11:05 UTC 2015 Modified Files: src/distrib/sets/lists/base: ad.arm src/distrib/sets/lists/comp: ad.arm ad.arm.shl src/distrib/sets/lists/debug: ad.arm Log Message: Remove entries made redundant by compatdir/compatfile To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/ad.arm.shl cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/debug/ad.arm 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.arm diff -u src/distrib/sets/lists/base/ad.arm:1.76 src/distrib/sets/lists/base/ad.arm:1.77 --- src/distrib/sets/lists/base/ad.arm:1.76 Fri Jul 3 01:00:59 2015 +++ src/distrib/sets/lists/base/ad.arm Fri Jul 3 15:11:04 2015 @@ -1,384 +1,15 @@ -# $NetBSD: ad.arm,v 1.76 2015/07/03 01:00:59 christos Exp $ -./lib/oabi base-compat-shlib compat -./lib/oabi/npf base-npf-shlib compat -./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic -./lib/oabi/npf/ext_log.so.0 base-npf-shlib compat,pic -./lib/oabi/npf/ext_log.so.0.0 base-npf-shlib compat,pic -./lib/oabi/npf/ext_normalize.so base-npf-shlib compat,pic -./lib/oabi/npf/ext_normalize.so.0 base-npf-shlib compat,pic -./lib/oabi/npf/ext_normalize.so.0.0 base-npf-shlib compat,pic -./lib/oabi/npf/ext_rndblock.so base-npf-shlib compat,pic -./lib/oabi/npf/ext_rndblock.so.0 base-npf-shlib compat,pic -./lib/oabi/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic +# $NetBSD: ad.arm,v 1.77 2015/07/03 15:11:04 matt Exp $ ./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic ./sbin/ldconfig base-sysutil-root pic,endian=1234 ./usr/bin/fdformatbase-util-bin -./usr/lib/libarm.sobase-sys-shlib pic -./usr/lib/libarm.so.0base-sys-shlib pic -./usr/lib/libarm.so.0.0base-sys-shlib pic -./usr/lib/libpmc.sobase-sys-shlib pic -./usr/lib/libpmc.so.1base-sys-shlib pic -./usr/lib/libpmc.so.1.0base-sys-shlib pic -./usr/lib/oabi base-compat-lib compat,eabi -./usr/lib/oabi/i18nbase-compat-lib compat,eabi -./usr/lib/oabi/i18n/libBIG5.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libBIG5.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libDECHanyu.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libDECHanyu.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libEUC.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libEUC.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libEUCTW.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libEUCTW.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libGBK2K.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libGBK2K.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libHZ.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libHZ.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libISO2022.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libISO2022.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libJOHAB.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libJOHAB.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libMSKanji.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libMSKanji.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUES.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUES.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUTF1632.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUTF1632.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUTF7.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUTF7.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUTF8.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libUTF8.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libVIQR.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libVIQR.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libZW.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libZW.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libiconv_none.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libiconv_none.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libiconv_std.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libiconv_std.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libmapper_646.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libmapper_646.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libmapper_none.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libmapper_none.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libmapper_parallel.so.5 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libmapper_parallel.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/i18n/libmapper_serial.so.5
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Fri Jul 3 13:06:55 UTC 2015 Modified Files: src/lib/libc/time: strptime.c Log Message: PR/50009: David CARLIER: Enhance strptime to fill out more fields when it can. From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/lib/libc/time/strptime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/strptime.c diff -u src/lib/libc/time/strptime.c:1.39 src/lib/libc/time/strptime.c:1.40 --- src/lib/libc/time/strptime.c:1.39 Mon Apr 6 10:38:22 2015 +++ src/lib/libc/time/strptime.c Fri Jul 3 09:06:54 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: strptime.c,v 1.39 2015/04/06 14:38:22 ginsbach Exp $ */ +/* $NetBSD: strptime.c,v 1.40 2015/07/03 13:06:54 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc. @@ -31,11 +31,13 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: strptime.c,v 1.39 2015/04/06 14:38:22 ginsbach Exp $); +__RCSID($NetBSD: strptime.c,v 1.40 2015/07/03 13:06:54 christos Exp $); #endif #include namespace.h #include sys/localedef.h +#include sys/types.h +#include sys/clock.h #include ctype.h #include locale.h #include string.h @@ -60,6 +62,12 @@ __weak_alias(strptime_l, _strptime_l) #define ALT_O 0x02 #define LEGAL_ALT(x) { if (alt_format ~(x)) return NULL; } +#define FLAG_YEAR (1 0) +#define FLAG_MONTH (1 1) +#define FLAG_YDAY (1 2) +#define FLAG_MDAY (1 3) +#define FLAG_WDAY (1 4) + static char gmt[] = { GMT }; static char utc[] = { UTC }; /* RFC-822/RFC-2822 */ @@ -74,6 +82,25 @@ static const u_char *conv_num(const unsi static const u_char *find_string(const u_char *, int *, const char * const *, const char * const *, int); +static const int start_of_month[2][13] = { + { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, + { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } +}; + +/* + * Calculate the week day of the first day of a year. Valid for + * the Gregorian calendar, which began Sept 14, 1752 in the UK + * and its colonies. Ref: + * http://en.wikipedia.org/wiki/Determination_of_the_day_of_the_week + */ + +static int +first_wday_of(int yr) +{ + return ((2 * (3 - (yr / 100) % 4)) + (yr % 100) + ((yr % 100) / 4) + + (is_leap_year(yr) ? 6 : 0) + 1) % 7; +} + char * strptime(const char *buf, const char *fmt, struct tm *tm) { @@ -85,7 +112,8 @@ strptime_l(const char *buf, const char * { unsigned char c; const unsigned char *bp, *ep; - int alt_format, i, split_year = 0, neg = 0, offs; + int alt_format, i, split_year = 0, neg = 0, flags = 0, + day_offset = -1, week_offset = 0, offs; const char *new_fmt; bp = (const u_char *)buf; @@ -133,16 +161,20 @@ literal: */ case 'c': /* Date and time, using the locale's format. */ new_fmt = _TIME_LOCALE(loc)-d_t_fmt; + flags |= FLAG_WDAY | FLAG_MONTH | FLAG_MDAY | + FLAG_YEAR; goto recurse; case 'D': /* The date as %m/%d/%y. */ new_fmt = %m/%d/%y; LEGAL_ALT(0); + flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR; goto recurse; case 'F': /* The date as %Y-%m-%d. */ new_fmt = %Y-%m-%d; LEGAL_ALT(0); + flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR; goto recurse; case 'R': /* The time as %H:%M. */ @@ -166,6 +198,7 @@ literal: case 'x': /* The date, using the locale's format. */ new_fmt = _TIME_LOCALE(loc)-d_fmt; + flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR; recurse: bp = (const u_char *)strptime((const char *)bp, new_fmt, tm); @@ -180,6 +213,7 @@ literal: bp = find_string(bp, tm-tm_wday, _TIME_LOCALE(loc)-day, _TIME_LOCALE(loc)-abday, 7); LEGAL_ALT(0); + flags |= FLAG_WDAY; continue; case 'B': /* The month, using the locale's form. */ @@ -189,6 +223,7 @@ literal: _TIME_LOCALE(loc)-mon, _TIME_LOCALE(loc)-abmon, 12); LEGAL_ALT(0); + flags |= FLAG_MONTH; continue; case 'C': /* The century number. */ @@ -201,12 +236,14 @@ literal: split_year = 1; tm-tm_year = i; LEGAL_ALT(ALT_E); + flags |= FLAG_YEAR; continue; case 'd': /* The day of month. */ case 'e': bp = conv_num(bp, tm-tm_mday, 1, 31); LEGAL_ALT(ALT_O); + flags |= FLAG_MDAY; continue; case 'k': /* The hour (24-hour clock representation). */ @@ -232,6 +269,7 @@ literal: bp = conv_num(bp, i, 1, 366); tm-tm_yday = i - 1; LEGAL_ALT(0); + flags |= FLAG_YDAY; continue; case 'M': /* The minute. */ @@ -244,6 +282,7 @@ literal: bp = conv_num(bp, i, 1, 12); tm-tm_mon = i - 1; LEGAL_ALT(ALT_O); + flags |= FLAG_MONTH; continue; case 'p': /* The locale's equivalent of AM/PM. */ @@ -287,6 +326,9 @@ literal: if (localtime_r(sse, tm) == NULL) bp = NULL; +else + flags |= FLAG_YDAY | FLAG_WDAY | + FLAG_MONTH | FLAG_MDAY |
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Fri Jul 3 13:15:54 UTC 2015 Modified Files: src/sys/dev/usb: usbdevs Log Message: Lumix Camera DMC-FS45 from kern/49809 To generate a diff of this commit: cvs rdiff -u -r1.697 -r1.698 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.697 src/sys/dev/usb/usbdevs:1.698 --- src/sys/dev/usb/usbdevs:1.697 Wed Jun 17 14:20:14 2015 +++ src/sys/dev/usb/usbdevs Fri Jul 3 13:15:54 2015 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.697 2015/06/17 14:20:14 nonaka Exp $ +$NetBSD: usbdevs,v 1.698 2015/07/03 13:15:54 skrll Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2477,6 +2477,7 @@ product PANASONIC KXLRW32AN 0x0d09 CD-R product PANASONIC KXLCB20AN 0x0d0a CD-R Drive KXL-CB20AN product PANASONIC KXLCB35AN 0x0d0e DVD-ROM CD-R/RW product PANASONIC SDCAAE 0x1b00 MultiMediaCard Adapter +product PANASONIC DMCFS45 0x2372 Lumix Camera DMC-FS45 product PANASONIC TYTP50P6S 0x3900 TY-TP50P6-S 50in Touch Panel /* PARA Industrial products */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Fri Jul 3 13:17:21 UTC 2015 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.689 -r1.690 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.690 -r1.691 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.689 src/sys/dev/usb/usbdevs.h:1.690 --- src/sys/dev/usb/usbdevs.h:1.689 Wed Jun 17 14:21:22 2015 +++ src/sys/dev/usb/usbdevs.h Fri Jul 3 13:17:20 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.689 2015/06/17 14:21:22 nonaka Exp $ */ +/* $NetBSD: usbdevs.h,v 1.690 2015/07/03 13:17:20 skrll Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.697 2015/06/17 14:20:14 nonaka Exp + * NetBSD: usbdevs,v 1.698 2015/07/03 13:15:54 skrll Exp */ /* @@ -2484,6 +2484,7 @@ #define USB_PRODUCT_PANASONIC_KXLCB20AN 0x0d0a /* CD-R Drive KXL-CB20AN */ #define USB_PRODUCT_PANASONIC_KXLCB35AN 0x0d0e /* DVD-ROM CD-R/RW */ #define USB_PRODUCT_PANASONIC_SDCAAE 0x1b00 /* MultiMediaCard Adapter */ +#define USB_PRODUCT_PANASONIC_DMCFS45 0x2372 /* Lumix Camera DMC-FS45 */ #define USB_PRODUCT_PANASONIC_TYTP50P6S 0x3900 /* TY-TP50P6-S 50in Touch Panel */ /* PARA Industrial products */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.690 src/sys/dev/usb/usbdevs_data.h:1.691 --- src/sys/dev/usb/usbdevs_data.h:1.690 Wed Jun 17 14:21:22 2015 +++ src/sys/dev/usb/usbdevs_data.h Fri Jul 3 13:17:20 2015 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.690 2015/06/17 14:21:22 nonaka Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.691 2015/07/03 13:17:20 skrll Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.697 2015/06/17 14:20:14 nonaka Exp + * NetBSD: usbdevs,v 1.698 2015/07/03 13:15:54 skrll Exp */ /* @@ -3306,8 +3306,10 @@ static const uint16_t usb_products[] = { 14803, 3001, 13632, 0, USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_SDCAAE, 14811, 4724, 0, + USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_DMCFS45, + 14826, 2882, 14832, 0, USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_TYTP50P6S, - 14826, 14838, 5549, 9004, 0, + 14841, 14853, 5549, 9004, 0, USB_VENDOR_PARA, USB_PRODUCT_PARA_RT3070, 4943, 0, USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT2870, @@ -3321,11 +3323,11 @@ static const uint16_t usb_products[] = { USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3072, 4957, 0, USB_VENDOR_FUTUREBITS, USB_PRODUCT_FUTUREBITS_4PI, - 14843, 14847, 0, + 14858, 14862, 0, USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISKPRO, 4710, 12075, 4808, 0, USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER, - 4710, 14854, 6255, 5421, 5612, 12779, 0, + 4710, 14869, 6255, 5421, 5612, 12779, 0, USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE, 4710, 7198, 6255, 5421, 5612, 12779, 0, USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK, @@ -3337,45 +3339,45 @@ static const uint16_t usb_products[] = { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET, 4740, 4749, 0, USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3, - 3018, 14856, 4740, 4724, 0, + 3018, 14871, 4740, 4724, 0, USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2, 4740, 4749, 0, USB_VENDOR_PHEENET, USB_PRODUCT_PHEENET_GWU513, - 14861, 0, + 14876, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS350, - 14868, 8275, 2209, 6901, 2699, 0, + 14883, 8275, 2209, 6901, 2699, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS, - 14868, 14872, 2209, 6901, 2699, 0, + 14883, 14887, 2209, 6901, 2699, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SA235, - 14876, 0, + 14891, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_HUB, 6719, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA645VC, - 14882, 5609, 2882, 0, + 14897, 5609, 2882, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA646VC, - 14891, 5609, 2882, 0, + 14906, 5609, 2882, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC675K, - 14900, 14909, 5609, 2882, 0, + 14915, 14924, 5609, 2882, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K, - 14915, 14909, 4808, 5609, 2882, 0, + 14930, 14924, 4808, 5609, 2882, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC690K, - 14924, 14909, 4808, 14933, 5609, 2882, 0, + 14939, 14924, 4808, 14948, 5609, 2882, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC730K, - 14938, 14947, 14954, 5609, 2882, 0, + 14953, 14962, 14969, 5609, 2882, 0, USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC740K, - 14958, 14947, 4808, 5609, 2882, 0, + 14973, 14962, 4808, 5609, 2882, 0,
CVS commit: src
Module Name:src Committed By: bouyer Date: Fri Jul 3 14:18:18 UTC 2015 Modified Files: src/share/man/man4: btmagic.4 src/sys/dev/bluetooth: btmagic.c Log Message: Add basic support for tap detection, emulating a left-click. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/btmagic.4 cvs rdiff -u -r1.13 -r1.14 src/sys/dev/bluetooth/btmagic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/btmagic.4 diff -u src/share/man/man4/btmagic.4:1.4 src/share/man/man4/btmagic.4:1.5 --- src/share/man/man4/btmagic.4:1.4 Mon Apr 6 21:10:31 2015 +++ src/share/man/man4/btmagic.4 Fri Jul 3 14:18:18 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: btmagic.4,v 1.4 2015/04/06 21:10:31 wiz Exp $ +.\ $NetBSD: btmagic.4,v 1.5 2015/07/03 14:18:18 bouyer Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 6, 2015 +.Dd July 4, 2015 .Dt BTMAGIC 4 .Os .Sh NAME @@ -76,7 +76,10 @@ The .Nm driver emulates 3 buttons by splitting the area at the bottom of the device in 3 equal zones and detects finger presence in one of these zones -when the button is pressed. +when the button is pressed. In addition, a tap in any area of the trackpad is interpreted as a left click. The timeout for tap detection defaults to 100ms +and is adjustable with +.Xr sysctl 8 . +.Pp Pointer movement is reported for single-touch movements over the device, and scroll is reported for multi-touch movements. .Pp Index: src/sys/dev/bluetooth/btmagic.c diff -u src/sys/dev/bluetooth/btmagic.c:1.13 src/sys/dev/bluetooth/btmagic.c:1.14 --- src/sys/dev/bluetooth/btmagic.c:1.13 Thu Apr 16 19:53:19 2015 +++ src/sys/dev/bluetooth/btmagic.c Fri Jul 3 14:18:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: btmagic.c,v 1.13 2015/04/16 19:53:19 christos Exp $ */ +/* $NetBSD: btmagic.c,v 1.14 2015/07/03 14:18:18 bouyer Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: btmagic.c,v 1.13 2015/04/16 19:53:19 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: btmagic.c,v 1.14 2015/07/03 14:18:18 bouyer Exp $); #include sys/param.h #include sys/conf.h @@ -171,6 +171,11 @@ struct btmagic_softc { /* previous mouse buttons */ int sc_mb_id; /* which ID selects the button */ uint32_t sc_mb; + /* button emulation with tap */ + int sc_tapmb_id; /* which ID selects the button */ + struct timeval sc_taptime; + int sc_taptimeout; + callout_t sc_tapcallout; }; /* sc_flags */ @@ -191,6 +196,8 @@ static int btmagic_listen(struct btmagi static int btmagic_connect(struct btmagic_softc *); static int btmagic_sysctl_resolution(SYSCTLFN_PROTO); static int btmagic_sysctl_scale(SYSCTLFN_PROTO); +static int btmagic_tap(struct btmagic_softc *, int); +static int btmagic_sysctl_taptimeout(SYSCTLFN_PROTO); CFATTACH_DECL_NEW(btmagic, sizeof(struct btmagic_softc), btmagic_match, btmagic_attach, btmagic_detach, NULL); @@ -220,6 +227,7 @@ static void btmagic_input(void *, struc static void btmagic_input_basic(struct btmagic_softc *, uint8_t *, size_t); static void btmagic_input_magicm(struct btmagic_softc *, uint8_t *, size_t); static void btmagic_input_magict(struct btmagic_softc *, uint8_t *, size_t); +static void btmagic_tapcallout(void *); /* report types (data[1]) */ #define BASIC_REPORT_ID 0x10 @@ -291,8 +299,12 @@ btmagic_attach(device_t parent, device_t */ sc-sc_dev = self; sc-sc_state = BTMAGIC_CLOSED; + sc-sc_mb_id = -1; + sc-sc_tapmb_id = -1; callout_init(sc-sc_timeout, 0); callout_setfunc(sc-sc_timeout, btmagic_timeout, sc); + callout_init(sc-sc_tapcallout, 0); + callout_setfunc(sc-sc_tapcallout, btmagic_tapcallout, sc); sockopt_init(sc-sc_mode, BTPROTO_L2CAP, SO_L2CAP_LM, 0); /* @@ -332,6 +344,7 @@ btmagic_attach(device_t parent, device_t sc-sc_firm = 6; sc-sc_dist = 130; sc-sc_scale = 20; + sc-sc_taptimeout = 100; sysctl_createv(sc-sc_log, 0, NULL, node, 0, @@ -378,6 +391,14 @@ btmagic_attach(device_t parent, device_t (void *)sc, 0, CTL_HW, node-sysctl_num, CTL_CREATE, CTL_EOL); + sysctl_createv(sc-sc_log, 0, NULL, NULL, + CTLFLAG_READWRITE, + CTLTYPE_INT, taptimeout, + timeout for tap detection in milliseconds, + btmagic_sysctl_taptimeout, 0, + (void *)sc, 0, + CTL_HW, node-sysctl_num, + CTL_CREATE, CTL_EOL); } /* @@ -437,6 +458,8 @@ btmagic_detach(device_t self, int flags) sc-sc_ctl = NULL; } + callout_halt(sc-sc_tapcallout, bt_lock); + callout_destroy(sc-sc_tapcallout); callout_halt(sc-sc_timeout, bt_lock); callout_destroy(sc-sc_timeout); @@ -617,6 +640,31 @@
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: matt Date: Fri Jul 3 18:28:37 UTC 2015 Modified Files: src/distrib/sets/lists/base: md.sparc64 src/distrib/sets/lists/comp: md.sparc64 src/distrib/sets/lists/debug: md.sparc64 Log Message: Remove entries made redundnat by compatdir/compatfile To generate a diff of this commit: cvs rdiff -u -r1.253 -r1.254 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.191 -r1.192 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/debug/md.sparc64 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/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.253 src/distrib/sets/lists/base/md.sparc64:1.254 --- src/distrib/sets/lists/base/md.sparc64:1.253 Fri Jul 3 01:01:00 2015 +++ src/distrib/sets/lists/base/md.sparc64 Fri Jul 3 18:28:37 2015 @@ -1,374 +1,7 @@ -# $NetBSD: md.sparc64,v 1.253 2015/07/03 01:01:00 christos Exp $ -./lib/sparc base-npf-shlib compat -./lib/sparc/npf base-npf-shlib compat -./lib/sparc/npf/ext_log.so base-npf-shlib compat,pic -./lib/sparc/npf/ext_log.so.0 base-npf-shlib compat,pic -./lib/sparc/npf/ext_log.so.0.0 base-npf-shlib compat,pic -./lib/sparc/npf/ext_normalize.so base-npf-shlib compat,pic -./lib/sparc/npf/ext_normalize.so.0 base-npf-shlib compat,pic -./lib/sparc/npf/ext_normalize.so.0.0 base-npf-shlib compat,pic -./lib/sparc/npf/ext_rndblock.so base-npf-shlib compat,pic -./lib/sparc/npf/ext_rndblock.so.0 base-npf-shlib compat,pic -./lib/sparc/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic +# $NetBSD: md.sparc64,v 1.254 2015/07/03 18:28:37 matt Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root obsolete ./usr/bin/fdformatbase-util-bin -./usr/lib/sparc base-compat-lib compat -./usr/lib/sparc/i18nbase-compat-lib compat -./usr/lib/sparc/i18n/libBIG5.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libBIG5.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libDECHanyu.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libDECHanyu.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libEUC.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libEUC.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libEUCTW.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libEUCTW.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libGBK2K.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libGBK2K.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libHZ.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libHZ.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libISO2022.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libISO2022.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libJOHAB.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libJOHAB.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libMSKanji.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libMSKanji.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUES.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUES.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUTF1632.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUTF1632.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUTF7.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUTF7.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUTF8.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libUTF8.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libVIQR.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libVIQR.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libZW.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libZW.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libiconv_none.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libiconv_none.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libiconv_std.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libiconv_std.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_646.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_646.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_none.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_none.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_parallel.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_parallel.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_serial.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_serial.so.5.0 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_std.so.5 base-i18n-shlib compat,pic -./usr/lib/sparc/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: matt Date: Fri Jul 3 16:43:50 UTC 2015 Modified Files: src/distrib/sets/lists/base: ad.riscv src/distrib/sets/lists/comp: ad.riscv src/distrib/sets/lists/debug: ad.riscv Log Message: Remove entries made redundant by compatdir/compatfile. (Leaves only libexec/ld.elf_so-rv32 as the only compat files). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/comp/ad.riscv cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/debug/ad.riscv 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.riscv diff -u src/distrib/sets/lists/base/ad.riscv:1.20 src/distrib/sets/lists/base/ad.riscv:1.21 --- src/distrib/sets/lists/base/ad.riscv:1.20 Fri Jul 3 01:00:59 2015 +++ src/distrib/sets/lists/base/ad.riscv Fri Jul 3 16:43:50 2015 @@ -1,329 +1,3 @@ -# $NetBSD: ad.riscv,v 1.20 2015/07/03 01:00:59 christos Exp $ -./lib/rv32 base-compat-shlib compat,arch64 -./lib/rv32/npf base-npf-shlib compat,arch64 -./lib/rv32/npf/ext_log.so base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_log.so.0 base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_log.so.0.0 base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_normalize.so base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_normalize.so.0 base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_normalize.so.0.0 base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_rndblock.so base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_rndblock.so.0 base-npf-shlib compat,pic,arch64 -./lib/rv32/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic,arch64 +# $NetBSD: ad.riscv,v 1.21 2015/07/03 16:43:50 matt Exp $ ./libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64 -./usr/lib/rv32 base-compat-lib arch64 -./usr/lib/rv32/i18nbase-compat-lib arch64 -./usr/lib/rv32/i18n/libBIG5.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libBIG5.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libDECHanyu.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libDECHanyu.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libEUC.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libEUC.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libEUCTW.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libEUCTW.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libGBK2K.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libGBK2K.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libHZ.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libHZ.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libISO2022.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libISO2022.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libJOHAB.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libJOHAB.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libMSKanji.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libMSKanji.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUES.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUES.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUTF1632.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUTF1632.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUTF7.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUTF7.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUTF8.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libUTF8.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libVIQR.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libVIQR.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libZW.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libZW.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libiconv_none.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libiconv_none.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libiconv_std.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libiconv_std.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libmapper_646.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libmapper_646.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libmapper_none.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libmapper_none.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libmapper_parallel.so.5 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libmapper_parallel.so.5.0 base-i18n-shlib compat,pic,arch64 -./usr/lib/rv32/i18n/libmapper_serial.so.5
CVS commit: src/etc/rc.d
Module Name:src Committed By: dholland Date: Fri Jul 3 18:36:54 UTC 2015 Modified Files: src/etc/rc.d: cleartmp perusertmp Log Message: /usr/sbin/chown - /sbin/chown (not sure why these need explicit paths at all, but whatevs) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/etc/rc.d/cleartmp cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/perusertmp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/cleartmp diff -u src/etc/rc.d/cleartmp:1.11 src/etc/rc.d/cleartmp:1.12 --- src/etc/rc.d/cleartmp:1.11 Wed Oct 24 21:23:55 2012 +++ src/etc/rc.d/cleartmp Fri Jul 3 18:36:54 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: cleartmp,v 1.11 2012/10/24 21:23:55 apb Exp $ +# $NetBSD: cleartmp,v 1.12 2015/07/03 18:36:54 dholland Exp $ # # PROVIDE: cleartmp @@ -26,7 +26,7 @@ cleartmp_start() if [ $(/usr/bin/readlink /tmp) = ${per_user_tmp_dir}/@ruid ]; then /bin/rm -rf ${tmp_dir} /bin/mkdir ${tmp_dir} - /usr/sbin/chown root:wheel ${tmp_dir} + /sbin/chown root:wheel ${tmp_dir} /bin/chmod 1777 ${tmp_dir} fi fi Index: src/etc/rc.d/perusertmp diff -u src/etc/rc.d/perusertmp:1.7 src/etc/rc.d/perusertmp:1.8 --- src/etc/rc.d/perusertmp:1.7 Tue Dec 4 22:09:01 2007 +++ src/etc/rc.d/perusertmp Fri Jul 3 18:36:54 2015 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: perusertmp,v 1.7 2007/12/04 22:09:01 mjf Exp $ +# $NetBSD: perusertmp,v 1.8 2015/07/03 18:36:54 dholland Exp $ # # PROVIDE: perusertmp @@ -36,7 +36,7 @@ perusertmp_start() if [ ! -d ${per_user_tmp_dir} ]; then /bin/mkdir -p ${per_user_tmp_dir} fi - /usr/sbin/chown root:wheel ${per_user_tmp_dir} + /sbin/chown root:wheel ${per_user_tmp_dir} /bin/chmod 0555 ${per_user_tmp_dir} # Create magic link for /tmp.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Jul 3 22:18:02 UTC 2015 Modified Files: src/share/man/man4: btmagic.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/btmagic.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/btmagic.4 diff -u src/share/man/man4/btmagic.4:1.5 src/share/man/man4/btmagic.4:1.6 --- src/share/man/man4/btmagic.4:1.5 Fri Jul 3 14:18:18 2015 +++ src/share/man/man4/btmagic.4 Fri Jul 3 22:18:02 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: btmagic.4,v 1.5 2015/07/03 14:18:18 bouyer Exp $ +.\ $NetBSD: btmagic.4,v 1.6 2015/07/03 22:18:02 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -76,7 +76,9 @@ The .Nm driver emulates 3 buttons by splitting the area at the bottom of the device in 3 equal zones and detects finger presence in one of these zones -when the button is pressed. In addition, a tap in any area of the trackpad is interpreted as a left click. The timeout for tap detection defaults to 100ms +when the button is pressed. +In addition, a tap in any area of the trackpad is interpreted as a left click. +The timeout for tap detection defaults to 100ms and is adjustable with .Xr sysctl 8 . .Pp
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Fri Jul 3 10:19:29 UTC 2015 Modified Files: src/libexec/ld.elf_so: ld.elf_so.1 Log Message: Add an explicit note about the search path used by dlopen(3). To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/libexec/ld.elf_so/ld.elf_so.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/ld.elf_so.1 diff -u src/libexec/ld.elf_so/ld.elf_so.1:1.15 src/libexec/ld.elf_so/ld.elf_so.1:1.16 --- src/libexec/ld.elf_so/ld.elf_so.1:1.15 Fri Dec 17 08:50:26 2010 +++ src/libexec/ld.elf_so/ld.elf_so.1 Fri Jul 3 10:19:29 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: ld.elf_so.1,v 1.15 2010/12/17 08:50:26 wiz Exp $ +.\ $NetBSD: ld.elf_so.1,v 1.16 2015/07/03 10:19:29 joerg Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -89,6 +89,11 @@ The list of default paths which is set t .Pa /usr/lib . .El .Pp +Dynamic loading via +.Xr dlopen 3 +uses the DT_RPATH entries of the main binary, independently of which object +the call came from. +.Pp .Nm will expand the following variables if present in the paths: .Bl -tag -width $PLATFORM