svn commit: r307814 - head/sys/powerpc/powerpc
Author: jhibbits Date: Sun Oct 23 01:03:17 2016 New Revision: 307814 URL: https://svnweb.freebsd.org/changeset/base/307814 Log: Revert r307813. I misread the code, and it shouldn't have compiled (fputhread is just a variable name). Modified: head/sys/powerpc/powerpc/trap.c Modified: head/sys/powerpc/powerpc/trap.c == --- head/sys/powerpc/powerpc/trap.c Sun Oct 23 01:01:08 2016 (r307813) +++ head/sys/powerpc/powerpc/trap.c Sun Oct 23 01:03:17 2016 (r307814) @@ -769,9 +769,9 @@ fix_unaligned(struct thread *td, struct * the registers, and that their current state is in * the PCB. */ - if (vecthread != td) { - if (vecthread) - save_vec(vecthread); + if (fputhread != td) { + if (fputhread) + save_vec(fputhread); enable_vec(td); } save_vec(td); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307813 - head/sys/powerpc/powerpc
Author: jhibbits Date: Sun Oct 23 01:01:08 2016 New Revision: 307813 URL: https://svnweb.freebsd.org/changeset/base/307813 Log: Use the right thread pointer for SPE alignment exceptions. Modified: head/sys/powerpc/powerpc/trap.c Modified: head/sys/powerpc/powerpc/trap.c == --- head/sys/powerpc/powerpc/trap.c Sun Oct 23 00:46:53 2016 (r307812) +++ head/sys/powerpc/powerpc/trap.c Sun Oct 23 01:01:08 2016 (r307813) @@ -765,13 +765,13 @@ fix_unaligned(struct thread *td, struct fpr = (double *)td->td_pcb->pcb_vec.vr[reg]; fputhread = PCPU_GET(vecthread); - /* Juggle the FPU to ensure that we've initialized -* the FPRs, and that their current state is in + /* Juggle the SPE to ensure that we've initialized +* the registers, and that their current state is in * the PCB. */ - if (fputhread != td) { - if (fputhread) - save_vec(fputhread); + if (vecthread != td) { + if (vecthread) + save_vec(vecthread); enable_vec(td); } save_vec(td); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307810 - in vendor/heirloom-doctools/20161016: . checknr eqn eqn/checkeq.d eqn/eqnchar.d grap include mpm pic picpack ptx refer tbl troff troff/libhnj troff/nroff.d troff/troff.d troff...
Author: bapt Date: Sun Oct 23 00:25:51 2016 New Revision: 307810 URL: https://svnweb.freebsd.org/changeset/base/307810 Log: tag import of heirloom-doctools 20161016 Added: vendor/heirloom-doctools/20161016/ - copied from r306788, vendor/heirloom-doctools/dist/ vendor/heirloom-doctools/20161016/compat.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/compat.c Replaced: vendor/heirloom-doctools/20161016/checknr/checknr.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/checknr/checknr.c vendor/heirloom-doctools/20161016/eqn/checkeq.d/checkeq.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/checkeq.d/checkeq.c vendor/heirloom-doctools/20161016/eqn/diacrit.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/diacrit.c vendor/heirloom-doctools/20161016/eqn/e.h - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/e.h vendor/heirloom-doctools/20161016/eqn/eqnbox.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/eqnbox.c vendor/heirloom-doctools/20161016/eqn/eqnchar.d/genutf8.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/eqnchar.d/genutf8.c vendor/heirloom-doctools/20161016/eqn/funny.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/funny.c vendor/heirloom-doctools/20161016/eqn/integral.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/integral.c vendor/heirloom-doctools/20161016/eqn/io.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/io.c vendor/heirloom-doctools/20161016/eqn/lex.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/lex.c vendor/heirloom-doctools/20161016/eqn/lookup.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/lookup.c vendor/heirloom-doctools/20161016/eqn/matrix.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/matrix.c vendor/heirloom-doctools/20161016/eqn/paren.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/paren.c vendor/heirloom-doctools/20161016/eqn/shift.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/shift.c vendor/heirloom-doctools/20161016/eqn/text.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/eqn/text.c vendor/heirloom-doctools/20161016/grap/coord.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/grap/coord.c vendor/heirloom-doctools/20161016/grap/grap.h - copied unchanged from r307809, vendor/heirloom-doctools/dist/grap/grap.h vendor/heirloom-doctools/20161016/grap/input.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/grap/input.c vendor/heirloom-doctools/20161016/grap/main.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/grap/main.c vendor/heirloom-doctools/20161016/grap/misc.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/grap/misc.c vendor/heirloom-doctools/20161016/include/global.h - copied unchanged from r307809, vendor/heirloom-doctools/dist/include/global.h vendor/heirloom-doctools/20161016/mpm/Makefile.mk - copied unchanged from r307809, vendor/heirloom-doctools/dist/mpm/Makefile.mk vendor/heirloom-doctools/20161016/mpm/misc.h - copied unchanged from r307809, vendor/heirloom-doctools/dist/mpm/misc.h vendor/heirloom-doctools/20161016/pic/arcgen.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/arcgen.c vendor/heirloom-doctools/20161016/pic/blockgen.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/blockgen.c vendor/heirloom-doctools/20161016/pic/for.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/for.c vendor/heirloom-doctools/20161016/pic/input.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/input.c vendor/heirloom-doctools/20161016/pic/main.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/main.c vendor/heirloom-doctools/20161016/pic/misc.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/misc.c vendor/heirloom-doctools/20161016/pic/pic.h - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/pic.h vendor/heirloom-doctools/20161016/pic/picl.l - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/picl.l vendor/heirloom-doctools/20161016/pic/pltroff.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/pltroff.c vendor/heirloom-doctools/20161016/pic/symtab.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/pic/symtab.c vendor/heirloom-doctools/20161016/picpack/Makefile.mk - copied unchanged from r307809, vendor/heirloom-doctools/dist/picpack/Makefile.mk vendor/heirloom-doctools/20161016/picpack/picpack.c - copied unchanged from r307809, vendor/heirloom-doctools/dist/picpack/picpack.c
svn commit: r307809 - in vendor/heirloom-doctools/dist: . checknr eqn eqn/checkeq.d eqn/eqnchar.d grap include mpm pic picpack ptx refer tbl troff troff/libhnj troff/nroff.d troff/troff.d troff/tro...
Author: bapt Date: Sun Oct 23 00:24:25 2016 New Revision: 307809 URL: https://svnweb.freebsd.org/changeset/base/307809 Log: Import heirloom doctools snapshot 20161016 Added: vendor/heirloom-doctools/dist/compat.c (contents, props changed) Deleted: vendor/heirloom-doctools/dist/picpack/getopt.c vendor/heirloom-doctools/dist/troff/troff.d/devaps/getopt.c vendor/heirloom-doctools/dist/troff/troff.d/dpost.d/getopt.c Modified: vendor/heirloom-doctools/dist/checknr/checknr.c vendor/heirloom-doctools/dist/eqn/checkeq.d/checkeq.c vendor/heirloom-doctools/dist/eqn/diacrit.c vendor/heirloom-doctools/dist/eqn/e.h vendor/heirloom-doctools/dist/eqn/eqnbox.c vendor/heirloom-doctools/dist/eqn/eqnchar.d/genutf8.c vendor/heirloom-doctools/dist/eqn/funny.c vendor/heirloom-doctools/dist/eqn/integral.c vendor/heirloom-doctools/dist/eqn/io.c vendor/heirloom-doctools/dist/eqn/lex.c vendor/heirloom-doctools/dist/eqn/lookup.c vendor/heirloom-doctools/dist/eqn/matrix.c vendor/heirloom-doctools/dist/eqn/paren.c vendor/heirloom-doctools/dist/eqn/shift.c vendor/heirloom-doctools/dist/eqn/text.c vendor/heirloom-doctools/dist/grap/coord.c vendor/heirloom-doctools/dist/grap/grap.h vendor/heirloom-doctools/dist/grap/input.c vendor/heirloom-doctools/dist/grap/main.c vendor/heirloom-doctools/dist/grap/misc.c vendor/heirloom-doctools/dist/include/global.h vendor/heirloom-doctools/dist/mpm/Makefile.mk vendor/heirloom-doctools/dist/mpm/misc.h vendor/heirloom-doctools/dist/pic/arcgen.c vendor/heirloom-doctools/dist/pic/blockgen.c vendor/heirloom-doctools/dist/pic/for.c vendor/heirloom-doctools/dist/pic/input.c vendor/heirloom-doctools/dist/pic/main.c vendor/heirloom-doctools/dist/pic/misc.c vendor/heirloom-doctools/dist/pic/pic.h vendor/heirloom-doctools/dist/pic/picl.l vendor/heirloom-doctools/dist/pic/pltroff.c vendor/heirloom-doctools/dist/pic/symtab.c vendor/heirloom-doctools/dist/picpack/Makefile.mk vendor/heirloom-doctools/dist/picpack/picpack.c vendor/heirloom-doctools/dist/ptx/Makefile.mk vendor/heirloom-doctools/dist/ptx/ptx.c vendor/heirloom-doctools/dist/refer/Makefile.mk vendor/heirloom-doctools/dist/refer/deliv2.c vendor/heirloom-doctools/dist/refer/glue1.c vendor/heirloom-doctools/dist/refer/glue3.c vendor/heirloom-doctools/dist/refer/glue4.c vendor/heirloom-doctools/dist/refer/glue5.c vendor/heirloom-doctools/dist/refer/hunt1.c vendor/heirloom-doctools/dist/refer/hunt2.c vendor/heirloom-doctools/dist/refer/hunt5.c vendor/heirloom-doctools/dist/refer/hunt6.c vendor/heirloom-doctools/dist/refer/hunt7.c vendor/heirloom-doctools/dist/refer/hunt8.c vendor/heirloom-doctools/dist/refer/hunt9.c vendor/heirloom-doctools/dist/refer/inv1.c vendor/heirloom-doctools/dist/refer/inv2.c vendor/heirloom-doctools/dist/refer/inv3.c vendor/heirloom-doctools/dist/refer/inv5.c vendor/heirloom-doctools/dist/refer/inv6.c vendor/heirloom-doctools/dist/refer/mkey1.c vendor/heirloom-doctools/dist/refer/mkey2.c vendor/heirloom-doctools/dist/refer/refer..c vendor/heirloom-doctools/dist/refer/refer0.c vendor/heirloom-doctools/dist/refer/refer1.c vendor/heirloom-doctools/dist/refer/refer2.c vendor/heirloom-doctools/dist/refer/refer3.c vendor/heirloom-doctools/dist/refer/refer5.c vendor/heirloom-doctools/dist/refer/refer6.c vendor/heirloom-doctools/dist/refer/refer7.c vendor/heirloom-doctools/dist/refer/refer8.c vendor/heirloom-doctools/dist/refer/shell.c vendor/heirloom-doctools/dist/refer/sortbib.c vendor/heirloom-doctools/dist/refer/tick.c vendor/heirloom-doctools/dist/tbl/Makefile.mk vendor/heirloom-doctools/dist/tbl/t..c vendor/heirloom-doctools/dist/tbl/t0.c vendor/heirloom-doctools/dist/tbl/t1.c vendor/heirloom-doctools/dist/tbl/t3.c vendor/heirloom-doctools/dist/tbl/t4.c vendor/heirloom-doctools/dist/tbl/t5.c vendor/heirloom-doctools/dist/tbl/t8.c vendor/heirloom-doctools/dist/tbl/tb.c vendor/heirloom-doctools/dist/tbl/tc.c vendor/heirloom-doctools/dist/tbl/te.c vendor/heirloom-doctools/dist/tbl/tg.c vendor/heirloom-doctools/dist/tbl/tm.c vendor/heirloom-doctools/dist/tbl/ts.c vendor/heirloom-doctools/dist/tbl/tt.c vendor/heirloom-doctools/dist/tbl/tu.c vendor/heirloom-doctools/dist/tbl/tv.c vendor/heirloom-doctools/dist/troff/ext.h vendor/heirloom-doctools/dist/troff/libhnj/hnjalloc.c vendor/heirloom-doctools/dist/troff/n1.c vendor/heirloom-doctools/dist/troff/n2.c vendor/heirloom-doctools/dist/troff/n3.c vendor/heirloom-doctools/dist/troff/n4.c vendor/heirloom-doctools/dist/troff/n5.c vendor/heirloom-doctools/dist/troff/n7.c vendor/heirloom-doctools/dist/troff/n8.c vendor/heirloom-doctools/dist/troff/n9.c vendor/heirloom-doctools/dist/troff/nroff.d/draw.c vendor/heirloom-doctools/dist/troff/nroff.d/n10.c vendor/heirloom-doctools/dist/troff/nroff.d/n6.c vendor/heirloom-doctools/dist/troff/nroff.d/pt.h
svn commit: r307808 - head/contrib/elftoolchain/elfcopy
Author: emaste Date: Sat Oct 22 23:49:06 2016 New Revision: 307808 URL: https://svnweb.freebsd.org/changeset/base/307808 Log: elfcopy: select mode by the end of the program name The mode of operation (elfcopy, mcs, or strip) is chosen based on the program name. Broaden this to allow a substring match at the end of the name to allow prefixes - for example, bsdstrip or aarch64-freebsd-strip. This improves use of these tools as drop-in replacements for GNU objcopy and strip, which are often built with a limited set of supported targets and installed with a target prefix for cross tools. Reviewed by: dim Sponsored by: The FreeBSD Foundation Differential Revision:https://reviews.freebsd.org/D1663 Modified: head/contrib/elftoolchain/elfcopy/main.c Modified: head/contrib/elftoolchain/elfcopy/main.c == --- head/contrib/elftoolchain/elfcopy/main.cSat Oct 22 23:09:06 2016 (r307807) +++ head/contrib/elftoolchain/elfcopy/main.cSat Oct 22 23:49:06 2016 (r307808) @@ -1529,6 +1529,22 @@ print_version(void) exit(EXIT_SUCCESS); } +/* + * Compare the ending of s with end. + */ +static int +strrcmp(const char *s, const char *end) +{ + size_t endlen, slen; + + slen = strlen(s); + endlen = strlen(end); + + if (slen >= endlen) + s += slen - endlen; + return (strcmp(s, end)); +} + int main(int argc, char **argv) { @@ -1562,12 +1578,16 @@ main(int argc, char **argv) if ((ecp->progname = ELFTC_GETPROGNAME()) == NULL) ecp->progname = "elfcopy"; - if (strcmp(ecp->progname, "strip") == 0) + if (strrcmp(ecp->progname, "strip") == 0) strip_main(ecp, argc, argv); - else if (strcmp(ecp->progname, "mcs") == 0) + else if (strrcmp(ecp->progname, "mcs") == 0) mcs_main(ecp, argc, argv); - else + else { + if (strrcmp(ecp->progname, "elfcopy") != 0 && + strrcmp(ecp->progname, "objcopy") != 0) + warnx("program mode not known, defaulting to elfcopy"); elfcopy_main(ecp, argc, argv); + } free_sec_add(ecp); free_sec_act(ecp); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307807 - head/share/doc/psd/title
Author: bapt Date: Sat Oct 22 23:09:06 2016 New Revision: 307807 URL: https://svnweb.freebsd.org/changeset/base/307807 Log: Remove reference to RCS from PSD titles Modified: head/share/doc/psd/title/Title Modified: head/share/doc/psd/title/Title == --- head/share/doc/psd/title/Title Sat Oct 22 23:05:44 2016 (r307806) +++ head/share/doc/psd/title/Title Sat Oct 22 23:09:06 2016 (r307807) @@ -117,12 +117,6 @@ Permission is granted to make and distri this document provided the copyright notice and this permission notice are preserved on all copies. .sp 2 -Document PSD:13 is part of the user contributed software and is -copyright 1983 by Walter F. Tichy. -Permission to copy the RCS documentation or any portion thereof as -necessary for licensed use of the software is granted to licensees -of this software, provided this copyright notice is included. -.sp 2 The views and conclusions contained in this manual are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the Regents of the University of California. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307806 - head/share/doc/psd/contents
Author: bapt Date: Sat Oct 22 23:05:44 2016 New Revision: 307806 URL: https://svnweb.freebsd.org/changeset/base/307806 Log: Remove RCS entry from PSD content file, it is gone along with GNU RCS Modified: head/share/doc/psd/contents/contents.ms Modified: head/share/doc/psd/contents/contents.ms == --- head/share/doc/psd/contents/contents.ms Sat Oct 22 22:55:10 2016 (r307805) +++ head/share/doc/psd/contents/contents.ms Sat Oct 22 23:05:44 2016 (r307806) @@ -145,17 +145,6 @@ Indispensable tool for making sure large compiled with minimal effort. .sp .IP -.tl 'An Introduction to the Revision Control System''PSD:13' -.if \n(.U \{\ -.br -.>> 13.rcs/paper.html -.\} -.QP -RCS is a user-contributed tool for working together with other people -without stepping on each other's toes. -An alternative to \fIsccs\fR for controlling software changes. -.sp -.IP .tl 'An Introduction to the Source Code Control System''PSD:14' .QP A useful introductory article for those users with ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307805 - head/sys/dev/usb/input
Author: gonzo Date: Sat Oct 22 22:55:10 2016 New Revision: 307805 URL: https://svnweb.freebsd.org/changeset/base/307805 Log: EVDEV: ums evdev support improvements: locking and event reporting - Use ums lock as evdev lock - Do not cap axes values to sysmouse limits for evdev reports - Do not map T-axis events to buttons for evdev reports - Use shortcuts for event reporting Submitted by: Vladimir KondratievMFC after:1 week Modified: head/sys/dev/usb/input/ums.c Modified: head/sys/dev/usb/input/ums.c == --- head/sys/dev/usb/input/ums.cSat Oct 22 22:52:50 2016 (r307804) +++ head/sys/dev/usb/input/ums.cSat Oct 22 22:55:10 2016 (r307805) @@ -173,6 +173,8 @@ static usb_fifo_ioctl_t ums_fifo_ioctl; #ifdef EVDEV_SUPPORT static evdev_open_t ums_ev_open; static evdev_close_t ums_ev_close; +static void ums_evdev_push(struct ums_softc *, int32_t, int32_t, +int32_t, int32_t, int32_t); #endif static voidums_start_rx(struct ums_softc *); @@ -205,6 +207,9 @@ ums_put_queue_timeout(void *__sc) mtx_assert(>sc_mtx, MA_OWNED); ums_put_queue(sc, 0, 0, 0, 0, 0); +#ifdef EVDEV_SUPPORT + ums_evdev_push(sc, 0, 0, 0, 0, 0); +#endif } static void @@ -216,6 +221,9 @@ ums_intr_callback(struct usb_xfer *xfer, uint8_t *buf = sc->sc_temp; int32_t buttons = 0; int32_t buttons_found = 0; +#ifdef EVDEV_SUPPORT + int32_t buttons_reported = 0; +#endif int32_t dw = 0; int32_t dx = 0; int32_t dy = 0; @@ -306,6 +314,9 @@ ums_intr_callback(struct usb_xfer *xfer, if (++info != >sc_info[UMS_INFO_MAX]) goto repeat; +#ifdef EVDEV_SUPPORT + buttons_reported = buttons; +#endif /* keep old button value(s) for non-detected buttons */ buttons |= sc->sc_status.button & ~buttons_found; @@ -351,6 +362,11 @@ ums_intr_callback(struct usb_xfer *xfer, usb_callout_stop(>sc_callout); ums_put_queue(sc, dx, dy, dz, dt, buttons); +#ifdef EVDEV_SUPPORT + ums_evdev_push(sc, dx, dy, dz, dt, + buttons_reported); +#endif + } } case USB_ST_SETUP: @@ -720,7 +736,7 @@ ums_attach(device_t dev) for (i = 0; i < info->sc_buttons; i++) evdev_support_key(sc->sc_evdev, BTN_MOUSE + i); - err = evdev_register(sc->sc_evdev); + err = evdev_register_mtx(sc->sc_evdev, >sc_mtx); if (err) goto detach; #endif @@ -891,27 +907,32 @@ ums_put_queue(struct ums_softc *sc, int3 } usb_fifo_put_data_linear(sc->sc_fifo.fp[USB_FIFO_RX], buf, sc->sc_mode.packetsize, 1); - -#ifdef EVDEV_SUPPORT - if (evdev_rcpt_mask & EVDEV_RCPT_HW_MOUSE) { - /* Push evdev event */ - evdev_push_event(sc->sc_evdev, EV_REL, REL_X, dx); - evdev_push_event(sc->sc_evdev, EV_REL, REL_Y, -dy); - evdev_push_event(sc->sc_evdev, EV_REL, REL_WHEEL, -dz); - evdev_push_event(sc->sc_evdev, EV_REL, REL_HWHEEL, dt); - evdev_push_mouse_btn(sc->sc_evdev, - (buttons & ~MOUSE_STDBUTTONS) | - (buttons & (1 << 2) ? MOUSE_BUTTON1DOWN : 0) | - (buttons & (1 << 1) ? MOUSE_BUTTON2DOWN : 0) | - (buttons & (1 << 0) ? MOUSE_BUTTON3DOWN : 0)); - evdev_sync(sc->sc_evdev); - } -#endif } else { DPRINTF("Buffer full, discarded packet\n"); } } +#ifdef EVDEV_SUPPORT +static void +ums_evdev_push(struct ums_softc *sc, int32_t dx, int32_t dy, +int32_t dz, int32_t dt, int32_t buttons) +{ + if (evdev_rcpt_mask & EVDEV_RCPT_HW_MOUSE) { + /* Push evdev event */ + evdev_push_rel(sc->sc_evdev, REL_X, dx); + evdev_push_rel(sc->sc_evdev, REL_Y, -dy); + evdev_push_rel(sc->sc_evdev, REL_WHEEL, -dz); + evdev_push_rel(sc->sc_evdev, REL_HWHEEL, dt); + evdev_push_mouse_btn(sc->sc_evdev, + (buttons & ~MOUSE_STDBUTTONS) | + (buttons & (1 << 2) ? MOUSE_BUTTON1DOWN : 0) | + (buttons & (1 << 1) ? MOUSE_BUTTON2DOWN : 0) | + (buttons & (1 << 0) ? MOUSE_BUTTON3DOWN : 0)); + evdev_sync(sc->sc_evdev); + } +} +#endif + static void ums_reset_buf(struct ums_softc *sc) { @@ -925,7 +946,7 @@ ums_ev_open(struct evdev_dev *evdev, voi { struct ums_softc *sc = (struct ums_softc *)ev_softc; - mtx_lock(>sc_mtx); + mtx_assert(>sc_mtx, MA_OWNED);
svn commit: r307804 - head/sys/dev/evdev
Author: gonzo Date: Sat Oct 22 22:52:50 2016 New Revision: 307804 URL: https://svnweb.freebsd.org/changeset/base/307804 Log: EVDEV: Add shortcut functions for event types Add wrappers around generic evdev_push_event for specific event types: EV_KEY/EV_REL/EV_ABS etc... Submitted by: Vladimir KondratievModified: head/sys/dev/evdev/evdev.c head/sys/dev/evdev/evdev.h head/sys/dev/evdev/evdev_utils.c Modified: head/sys/dev/evdev/evdev.c == --- head/sys/dev/evdev/evdev.c Sat Oct 22 22:36:32 2016(r307803) +++ head/sys/dev/evdev/evdev.c Sat Oct 22 22:52:50 2016(r307804) @@ -822,21 +822,6 @@ push: return (ret); } -inline int -evdev_sync(struct evdev_dev *evdev) -{ - - return (evdev_push_event(evdev, EV_SYN, SYN_REPORT, 1)); -} - - -inline int -evdev_mt_sync(struct evdev_dev *evdev) -{ - - return (evdev_push_event(evdev, EV_SYN, SYN_MT_REPORT, 1)); -} - int evdev_register_client(struct evdev_dev *evdev, struct evdev_client *client) { Modified: head/sys/dev/evdev/evdev.h == --- head/sys/dev/evdev/evdev.h Sat Oct 22 22:36:32 2016(r307803) +++ head/sys/dev/evdev/evdev.h Sat Oct 22 22:52:50 2016(r307804) @@ -97,8 +97,6 @@ int evdev_register(struct evdev_dev *); int evdev_register_mtx(struct evdev_dev *, struct mtx *); int evdev_unregister(struct evdev_dev *); int evdev_push_event(struct evdev_dev *, uint16_t, uint16_t, int32_t); -int evdev_sync(struct evdev_dev *); -int evdev_mt_sync(struct evdev_dev *); void evdev_support_prop(struct evdev_dev *, uint16_t); void evdev_support_event(struct evdev_dev *, uint16_t); void evdev_support_key(struct evdev_dev *, uint16_t); @@ -129,4 +127,68 @@ void evdev_push_leds(struct evdev_dev *, void evdev_push_repeats(struct evdev_dev *, keyboard_t *); evdev_event_t evdev_ev_kbd_event; +/* Event reporting shortcuts: */ +static __inline int +evdev_sync(struct evdev_dev *evdev) +{ + + return (evdev_push_event(evdev, EV_SYN, SYN_REPORT, 1)); +} + +static __inline int +evdev_mt_sync(struct evdev_dev *evdev) +{ + + return (evdev_push_event(evdev, EV_SYN, SYN_MT_REPORT, 1)); +} + +static __inline int +evdev_push_key(struct evdev_dev *evdev, uint16_t code, int32_t value) +{ + + return (evdev_push_event(evdev, EV_KEY, code, value != 0)); +} + +static __inline int +evdev_push_rel(struct evdev_dev *evdev, uint16_t code, int32_t value) +{ + + return (evdev_push_event(evdev, EV_REL, code, value)); +} + +static __inline int +evdev_push_abs(struct evdev_dev *evdev, uint16_t code, int32_t value) +{ + + return (evdev_push_event(evdev, EV_ABS, code, value)); +} + +static __inline int +evdev_push_msc(struct evdev_dev *evdev, uint16_t code, int32_t value) +{ + + return (evdev_push_event(evdev, EV_MSC, code, value)); +} + +static __inline int +evdev_push_led(struct evdev_dev *evdev, uint16_t code, int32_t value) +{ + + return (evdev_push_event(evdev, EV_LED, code, value != 0)); +} + +static __inline int +evdev_push_snd(struct evdev_dev *evdev, uint16_t code, int32_t value) +{ + + return (evdev_push_event(evdev, EV_SND, code, value != 0)); +} + +static __inline int +evdev_push_sw(struct evdev_dev *evdev, uint16_t code, int32_t value) +{ + + return (evdev_push_event(evdev, EV_SW, code, value != 0)); +} + #endif /* _DEV_EVDEV_EVDEV_H */ Modified: head/sys/dev/evdev/evdev_utils.c == --- head/sys/dev/evdev/evdev_utils.cSat Oct 22 22:36:32 2016 (r307803) +++ head/sys/dev/evdev/evdev_utils.cSat Oct 22 22:52:50 2016 (r307804) @@ -271,8 +271,8 @@ evdev_push_mouse_btn(struct evdev_dev *e size_t i; for (i = 0; i < nitems(evdev_mouse_button_codes); i++) - evdev_push_event(evdev, EV_KEY, evdev_mouse_button_codes[i], - (buttons & (1 << i)) != 0); + evdev_push_key(evdev, evdev_mouse_button_codes[i], + buttons & (1 << i)); } void @@ -285,8 +285,7 @@ evdev_push_leds(struct evdev_dev *evdev, return; for (i = 0; i < nitems(evdev_led_codes); i++) - evdev_push_event(evdev, EV_LED, evdev_led_codes[i], - (leds & (1 << i)) != 0); + evdev_push_led(evdev, evdev_led_codes[i], leds & (1 << i)); } void ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307803 - stable/10/usr.bin/calendar/calendars
Author: grog Date: Sat Oct 22 22:36:32 2016 New Revision: 307803 URL: https://svnweb.freebsd.org/changeset/base/307803 Log: Spelling, title. Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday Modified: stable/10/usr.bin/calendar/calendars/calendar.holiday == --- stable/10/usr.bin/calendar/calendars/calendar.holiday Sat Oct 22 22:35:39 2016(r307802) +++ stable/10/usr.bin/calendar/calendars/calendar.holiday Sat Oct 22 22:36:32 2016(r307803) @@ -447,7 +447,7 @@ 10/20 Kenyatta Day in Kenya 10/21 Armed Forces Day in Honduras 10/21 Revolution Days (2 days) in Somalia -10/23 Chulalongkron's Day in Thailand +10/23 King Chulalongkorn Day in Thailand 10/24 Independence Day in Zambia 10/24 United Nations Day 10/25 Taiwan Restoration Day in Taiwan ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307802 - in head: tools/build/mk usr.sbin usr.sbin/tzsetup
Author: bapt Date: Sat Oct 22 22:35:39 2016 New Revision: 307802 URL: https://svnweb.freebsd.org/changeset/base/307802 Log: Fix build of tzsetup when WITHOUT_DIALOG is set Hide dialog specific code behind HAVE_DIALOG. It allows to build a stripped down version (missing the dialog UI) but perfectly function tzsetup when world is built WITHOUT_DIALOG Reorganise a bit the code to limit the number of blocks under HAVE_DIALOG Reviewed by: emaste Sponsored by: https://reviews.freebsd.org/D8325 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.sbin/Makefile head/usr.sbin/tzsetup/Makefile head/usr.sbin/tzsetup/tzsetup.c Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 22:29:03 2016(r307801) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 22:35:39 2016(r307802) @@ -1348,12 +1348,10 @@ OLD_FILES+=usr/lib/libdpv.so OLD_FILES+=usr/lib/libdpv.so.1 OLD_FILES+=usr/lib/libdpv_p.a OLD_FILES+=usr/sbin/bsdconfig -OLD_FILES+=usr/sbin/tzsetup OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz -OLD_FILES+=usr/share/man/man8/tzsetup.8.gz OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz .endif Modified: head/usr.sbin/Makefile == --- head/usr.sbin/Makefile Sat Oct 22 22:29:03 2016(r307801) +++ head/usr.sbin/Makefile Sat Oct 22 22:35:39 2016(r307802) @@ -88,6 +88,7 @@ SUBDIR= adduser \ tcpdump \ traceroute \ trpt \ + tzsetup \ uefisign \ ugidfw \ vigr \ @@ -121,7 +122,6 @@ SUBDIR.${MK_BOOTPARAMD}+= bootparamd SUBDIR.${MK_BSDINSTALL}+= bsdinstall SUBDIR.${MK_BSNMP}+= bsnmpd SUBDIR.${MK_CTM}+= ctm -SUBDIR.${MK_DIALOG}+= tzsetup SUBDIR.${MK_DIALOG}+= bsdconfig SUBDIR.${MK_EFI}+= efivar SUBDIR.${MK_FLOPPY}+= fdcontrol Modified: head/usr.sbin/tzsetup/Makefile == --- head/usr.sbin/tzsetup/Makefile Sat Oct 22 22:29:03 2016 (r307801) +++ head/usr.sbin/tzsetup/Makefile Sat Oct 22 22:35:39 2016 (r307802) @@ -1,12 +1,16 @@ # $FreeBSD$ +.include + PROG= tzsetup MAN= tzsetup.8 -CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I. +CFLAGS+= -I. +.if ${MK_DIALOG} != no WARNS?=3 - +CFLAGS+= -I${.CURDIR}/../../contrib/dialog -DHAVE_DIALOG LIBADD=dialog ncursesw +.endif .include Modified: head/usr.sbin/tzsetup/tzsetup.c == --- head/usr.sbin/tzsetup/tzsetup.c Sat Oct 22 22:29:03 2016 (r307801) +++ head/usr.sbin/tzsetup/tzsetup.c Sat Oct 22 22:35:39 2016 (r307802) @@ -49,7 +49,9 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef HAVE_DIALOG #include +#endif #define_PATH_ZONETAB "/usr/share/zoneinfo/zone.tab" #define_PATH_ISO3166 "/usr/share/misc/iso3166" @@ -72,6 +74,19 @@ __FBSDID("$FreeBSD$"); #define DITEM_LEAVE_MENU(1 << 16) #define DITEM_RECREATE (1 << 18) +static charpath_zonetab[MAXPATHLEN], path_iso3166[MAXPATHLEN], + path_zoneinfo[MAXPATHLEN], path_localtime[MAXPATHLEN], + path_db[MAXPATHLEN], path_wall_cmos_clock[MAXPATHLEN]; + +static int reallydoit = 1; +static int reinstall = 0; +static char *chrootenv = NULL; + +static voidusage(void); +static int install_zoneinfo(const char *zoneinfo); +static int install_zoneinfo_file(const char *zoneinfo_file); + +#ifdef HAVE_DIALOG /* for use in describing more exotic behaviors */ typedef struct dialogMenuItem { char *prompt; @@ -187,20 +202,10 @@ again: return result; } -static charpath_zonetab[MAXPATHLEN], path_iso3166[MAXPATHLEN], - path_zoneinfo[MAXPATHLEN], path_localtime[MAXPATHLEN], - path_db[MAXPATHLEN], path_wall_cmos_clock[MAXPATHLEN]; - -static int reallydoit = 1; -static int reinstall = 0; static int usedialog = 1; -static char *chrootenv = NULL; -static voidusage(void); static int confirm_zone(const char *filename); static int continent_country_menu(dialogMenuItem *); -static int install_zoneinfo(const char *zoneinfo); -static int install_zoneinfo_file(const char *zoneinfo_file); static int set_zone_multi(dialogMenuItem *); static int set_zone_whole_country(dialogMenuItem *); static int set_zone_menu(dialogMenuItem *); @@ -644,6 +649,53 @@ set_zone_utc(void) } static int +confirm_zone(const char *filename) +{ + chartitle[64], prompt[64]; + time_t t = time(0); + struct tm
svn commit: r307801 - head/usr.sbin/amd/amd
Author: cy Date: Sat Oct 22 22:29:03 2016 New Revision: 307801 URL: https://svnweb.freebsd.org/changeset/base/307801 Log: Align whitespace. MFC after:2 weeks X-MFC with: r307800 Modified: head/usr.sbin/amd/amd/Makefile Modified: head/usr.sbin/amd/amd/Makefile == --- head/usr.sbin/amd/amd/Makefile Sat Oct 22 22:27:51 2016 (r307800) +++ head/usr.sbin/amd/amd/Makefile Sat Oct 22 22:29:03 2016 (r307801) @@ -31,7 +31,7 @@ LIBADD= amu wrap CLEANFILES+= conf_parse.c conf_parse.h conf_tok.c -conf_tok.o: conf_parse.h +conf_tok.o:conf_parse.h # These are generated at compile time SRCS+= mount_xdr.c ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307800 - in head/usr.sbin/amd: . amd libamu
Author: cy Date: Sat Oct 22 22:27:51 2016 New Revision: 307800 URL: https://svnweb.freebsd.org/changeset/base/307800 Log: Sources from the "current" build tree and generated sources in the object tree should be used instead of sources and headers from the already installed source tree on the build host. This was noticed while addressing issues in the upcoming amd update. MFC after:2 weeks Modified: head/usr.sbin/amd/Makefile.inc head/usr.sbin/amd/amd/Makefile head/usr.sbin/amd/libamu/Makefile Modified: head/usr.sbin/amd/Makefile.inc == --- head/usr.sbin/amd/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) +++ head/usr.sbin/amd/Makefile.inc Sat Oct 22 22:27:51 2016 (r307800) @@ -32,8 +32,8 @@ CFLAGS+= -DYES_HESIOD CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" RPCCOM=RPCGEN_CPP=${CPP:Q} rpcgen -MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x -NFS_PROT_X=${DESTDIR}/usr/include/rpcsvc/nfs_prot.x +MOUNT_X= ${SRCTOP}/include/rpcsvc/mount.x +NFS_PROT_X=${SRCTOP}/include/rpcsvc/nfs_prot.x WARNS?=1 Modified: head/usr.sbin/amd/amd/Makefile == --- head/usr.sbin/amd/amd/Makefile Sat Oct 22 21:51:58 2016 (r307799) +++ head/usr.sbin/amd/amd/Makefile Sat Oct 22 22:27:51 2016 (r307800) @@ -25,7 +25,7 @@ SRCS+=ops_unionfs.c opts.c readdir.c re SRCS+= srvr_amfs_auto.c srvr_nfs.c CFLAGS+= -I${SRCTOP}/contrib/amd/amd \ --I${DESTDIR}/usr/include/rpcsvc +-I${.OBJDIR}/../../../include/rpcsvc LIBADD=amu wrap Modified: head/usr.sbin/amd/libamu/Makefile == --- head/usr.sbin/amd/libamu/Makefile Sat Oct 22 21:51:58 2016 (r307799) +++ head/usr.sbin/amd/libamu/Makefile Sat Oct 22 22:27:51 2016 (r307800) @@ -23,7 +23,7 @@ SRCS+=nfs_prot_x.c xdr_func_%undef.c CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \ --I${DESTDIR}/usr/include/rpcsvc +-I${.OBJDIR}/../../../include/rpcsvc nfs_prot_x.c: ${NFS_PROT_X} ${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307799 - in head/lib/libc: powerpc/gen powerpcspe powerpcspe/gen powerpcspe/sys
Author: jhibbits Date: Sat Oct 22 21:51:58 2016 New Revision: 307799 URL: https://svnweb.freebsd.org/changeset/base/307799 Log: Reduce code duplication between powerpc and powerpcspe They're nearly identical except for a few files. Reported by: kib Added: head/lib/libc/powerpc/gen/Makefile.common (contents, props changed) Deleted: head/lib/libc/powerpcspe/SYS.h head/lib/libc/powerpcspe/_fpmath.h head/lib/libc/powerpcspe/arith.h head/lib/libc/powerpcspe/gd_qnan.h head/lib/libc/powerpcspe/gen/_ctx_start.S head/lib/libc/powerpcspe/gen/_set_tp.c head/lib/libc/powerpcspe/gen/eabi.S head/lib/libc/powerpcspe/gen/infinity.c head/lib/libc/powerpcspe/gen/makecontext.c head/lib/libc/powerpcspe/gen/signalcontext.c head/lib/libc/powerpcspe/gen/syncicache.c head/lib/libc/powerpcspe/sys/brk.S head/lib/libc/powerpcspe/sys/cerror.S head/lib/libc/powerpcspe/sys/exect.S head/lib/libc/powerpcspe/sys/sbrk.S head/lib/libc/powerpcspe/sys/setlogin.S Modified: head/lib/libc/powerpc/gen/Makefile.inc head/lib/libc/powerpcspe/Makefile.inc head/lib/libc/powerpcspe/gen/Makefile.inc head/lib/libc/powerpcspe/sys/Makefile.inc Added: head/lib/libc/powerpc/gen/Makefile.common == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libc/powerpc/gen/Makefile.common Sat Oct 22 21:51:58 2016 (r307799) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +.PATH: ${LIBC_SRCTOP}/powerpc/gen + +SRCS += _ctx_start.S eabi.S infinity.c ldexp.c makecontext.c \ + signalcontext.c syncicache.c _set_tp.c trivial-getcontextx.c Modified: head/lib/libc/powerpc/gen/Makefile.inc == --- head/lib/libc/powerpc/gen/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpc/gen/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,11 +1,7 @@ # $FreeBSD$ -SRCS += _ctx_start.S eabi.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ - fpgetsticky.c fpsetmask.c fpsetround.c \ - infinity.c ldexp.c makecontext.c _setjmp.S \ - setjmp.S sigsetjmp.S signalcontext.c syncicache.c \ - _set_tp.c \ - trivial-getcontextx.c - - +.include "${LIBC_SRC}/powerpc/gen/Makefile.common" +SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ + fpgetsticky.c fpsetmask.c fpsetround.c \ + _setjmp.S setjmp.S sigsetjmp.S Modified: head/lib/libc/powerpcspe/Makefile.inc == --- head/lib/libc/powerpcspe/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpcspe/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,5 +1,6 @@ # $FreeBSD$ +CFLAGS+= -I${LIBC_SRCTOP}/powerpc SRCS+= trivial-vdso_tc.c # Long double is 64-bits Modified: head/lib/libc/powerpcspe/gen/Makefile.inc == --- head/lib/libc/powerpcspe/gen/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpcspe/gen/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,11 +1,7 @@ # $FreeBSD$ -SRCS += _ctx_start.S eabi.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ - fpgetsticky.c fpsetmask.c fpsetround.c \ - infinity.c ldexp.c makecontext.c _setjmp.S \ - setjmp.S sigsetjmp.S signalcontext.c syncicache.c \ - _set_tp.c \ - trivial-getcontextx.c - - +.include "${LIBC_SRCTOP}/powerpc/gen/Makefile.common" +SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ + fpgetsticky.c fpsetmask.c fpsetround.c \ + _setjmp.S setjmp.S sigsetjmp.S Modified: head/lib/libc/powerpcspe/sys/Makefile.inc == --- head/lib/libc/powerpcspe/sys/Makefile.inc Sat Oct 22 21:41:28 2016 (r307798) +++ head/lib/libc/powerpcspe/sys/Makefile.inc Sat Oct 22 21:51:58 2016 (r307799) @@ -1,8 +1,4 @@ # $FreeBSD$ -MDASM+=brk.S cerror.S exect.S sbrk.S setlogin.S - -# Don't generate default code for these syscalls: -NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o - -PSEUDO=_getlogin.o _exit.o +.PATH: ${LIBC_SRCTOP}/powerpc/sys +.sinclude "${LIBC_SRCTOP}/powerpc/sys/Makefile.inc" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307797 - in stable/11/contrib/libarchive: cpio/test libarchive libarchive/test tar/test
Author: mm Date: Sat Oct 22 21:41:00 2016 New Revision: 307797 URL: https://svnweb.freebsd.org/changeset/base/307797 Log: MFC r307215: Sync libarchive with vendor. Style and tests fixes. Important vendor bugfixes (relevant to FreeBSD): #801: FreeBSD Coverity report: resource leak in libarchive/tar/test/main.c Modified: stable/11/contrib/libarchive/cpio/test/main.c stable/11/contrib/libarchive/cpio/test/test.h stable/11/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c stable/11/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c stable/11/contrib/libarchive/libarchive/test/main.c stable/11/contrib/libarchive/libarchive/test/test.h stable/11/contrib/libarchive/libarchive/test/test_read_set_format.c stable/11/contrib/libarchive/tar/test/main.c stable/11/contrib/libarchive/tar/test/test.h stable/11/contrib/libarchive/tar/test/test_missing_file.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/libarchive/cpio/test/main.c == --- stable/11/contrib/libarchive/cpio/test/main.c Sat Oct 22 20:57:51 2016(r307796) +++ stable/11/contrib/libarchive/cpio/test/main.c Sat Oct 22 21:41:00 2016(r307797) @@ -130,6 +130,13 @@ __FBSDID("$FreeBSD$"); # include #endif +mode_t umasked(mode_t expected_mode) +{ + mode_t mode = umask(0); + umask(mode); + return expected_mode & ~mode; +} + /* Path to working directory for current test */ const char *testworkdir; #ifdef PROGRAM @@ -1294,6 +1301,11 @@ assertion_file_time(const char *file, in switch (type) { case 'a': filet_nsec = st.st_atimespec.tv_nsec; break; case 'b': filet = st.st_birthtime; + /* FreeBSD filesystems that don't support birthtime +* (e.g., UFS1) always return -1 here. */ + if (filet == -1) { + return (1); + } filet_nsec = st.st_birthtimespec.tv_nsec; break; case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break; default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type); @@ -1425,7 +1437,7 @@ assertion_file_nlinks(const char *file, assertion_count(file, line); r = lstat(pathname, ); if (r == 0 && (int)st.st_nlink == nlinks) - return (1); + return (1); failure_start(file, line, "File %s has %d links, expected %d", pathname, st.st_nlink, nlinks); failure_finish(NULL); @@ -1661,6 +1673,7 @@ assertion_make_file(const char *file, in if (0 != chmod(path, mode)) { failure_start(file, line, "Could not chmod %s", path); failure_finish(NULL); + close(fd); return (0); } if (contents != NULL) { @@ -1675,6 +1688,7 @@ assertion_make_file(const char *file, in failure_start(file, line, "Could not write to %s", path); failure_finish(NULL); + close(fd); return (0); } } Modified: stable/11/contrib/libarchive/cpio/test/test.h == --- stable/11/contrib/libarchive/cpio/test/test.h Sat Oct 22 20:57:51 2016(r307796) +++ stable/11/contrib/libarchive/cpio/test/test.h Sat Oct 22 21:41:00 2016(r307797) @@ -182,6 +182,8 @@ assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) #define assertFileSize(pathname, size) \ assertion_file_size(__FILE__, __LINE__, pathname, size) +#define assertFileMode(pathname, mode) \ + assertion_file_mode(__FILE__, __LINE__, pathname, mode) #define assertTextFileContents(text, pathname) \ assertion_text_file_contents(__FILE__, __LINE__, text, pathname) #define assertFileContainsLinesAnyOrder(pathname, lines) \ @@ -327,6 +329,9 @@ void copy_reference_file(const char *); */ void extract_reference_files(const char **); +/* Subtract umask from mode */ +mode_t umasked(mode_t expected_mode); + /* Path to working directory for current test */ extern const char *testworkdir; Modified: stable/11/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c == --- stable/11/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Sat Oct 22 20:57:51 2016(r307796) +++ stable/11/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Sat Oct 22 21:41:00 2016(r307797) @@ -627,7 +627,6 @@ translate_acl(struct archive_read_disk * archive_set_error(>archive, ARCHIVE_ERRNO_MISC, "Unknown ACL brand"); return (ARCHIVE_WARN); - break; } #endif Modified:
svn commit: r307798 - in stable/10/contrib/libarchive: cpio/test libarchive libarchive/test tar/test
Author: mm Date: Sat Oct 22 21:41:28 2016 New Revision: 307798 URL: https://svnweb.freebsd.org/changeset/base/307798 Log: MFC r307215: Sync libarchive with vendor. Style and tests fixes. Important vendor bugfixes (relevant to FreeBSD): #801: FreeBSD Coverity report: resource leak in libarchive/tar/test/main.c Modified: stable/10/contrib/libarchive/cpio/test/main.c stable/10/contrib/libarchive/cpio/test/test.h stable/10/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c stable/10/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c stable/10/contrib/libarchive/libarchive/test/main.c stable/10/contrib/libarchive/libarchive/test/test.h stable/10/contrib/libarchive/libarchive/test/test_read_set_format.c stable/10/contrib/libarchive/tar/test/main.c stable/10/contrib/libarchive/tar/test/test.h stable/10/contrib/libarchive/tar/test/test_missing_file.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/libarchive/cpio/test/main.c == --- stable/10/contrib/libarchive/cpio/test/main.c Sat Oct 22 21:41:00 2016(r307797) +++ stable/10/contrib/libarchive/cpio/test/main.c Sat Oct 22 21:41:28 2016(r307798) @@ -130,6 +130,13 @@ __FBSDID("$FreeBSD$"); # include #endif +mode_t umasked(mode_t expected_mode) +{ + mode_t mode = umask(0); + umask(mode); + return expected_mode & ~mode; +} + /* Path to working directory for current test */ const char *testworkdir; #ifdef PROGRAM @@ -1294,6 +1301,11 @@ assertion_file_time(const char *file, in switch (type) { case 'a': filet_nsec = st.st_atimespec.tv_nsec; break; case 'b': filet = st.st_birthtime; + /* FreeBSD filesystems that don't support birthtime +* (e.g., UFS1) always return -1 here. */ + if (filet == -1) { + return (1); + } filet_nsec = st.st_birthtimespec.tv_nsec; break; case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break; default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type); @@ -1425,7 +1437,7 @@ assertion_file_nlinks(const char *file, assertion_count(file, line); r = lstat(pathname, ); if (r == 0 && (int)st.st_nlink == nlinks) - return (1); + return (1); failure_start(file, line, "File %s has %d links, expected %d", pathname, st.st_nlink, nlinks); failure_finish(NULL); @@ -1661,6 +1673,7 @@ assertion_make_file(const char *file, in if (0 != chmod(path, mode)) { failure_start(file, line, "Could not chmod %s", path); failure_finish(NULL); + close(fd); return (0); } if (contents != NULL) { @@ -1675,6 +1688,7 @@ assertion_make_file(const char *file, in failure_start(file, line, "Could not write to %s", path); failure_finish(NULL); + close(fd); return (0); } } Modified: stable/10/contrib/libarchive/cpio/test/test.h == --- stable/10/contrib/libarchive/cpio/test/test.h Sat Oct 22 21:41:00 2016(r307797) +++ stable/10/contrib/libarchive/cpio/test/test.h Sat Oct 22 21:41:28 2016(r307798) @@ -182,6 +182,8 @@ assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks) #define assertFileSize(pathname, size) \ assertion_file_size(__FILE__, __LINE__, pathname, size) +#define assertFileMode(pathname, mode) \ + assertion_file_mode(__FILE__, __LINE__, pathname, mode) #define assertTextFileContents(text, pathname) \ assertion_text_file_contents(__FILE__, __LINE__, text, pathname) #define assertFileContainsLinesAnyOrder(pathname, lines) \ @@ -327,6 +329,9 @@ void copy_reference_file(const char *); */ void extract_reference_files(const char **); +/* Subtract umask from mode */ +mode_t umasked(mode_t expected_mode); + /* Path to working directory for current test */ extern const char *testworkdir; Modified: stable/10/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c == --- stable/10/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Sat Oct 22 21:41:00 2016(r307797) +++ stable/10/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c Sat Oct 22 21:41:28 2016(r307798) @@ -627,7 +627,6 @@ translate_acl(struct archive_read_disk * archive_set_error(>archive, ARCHIVE_ERRNO_MISC, "Unknown ACL brand"); return (ARCHIVE_WARN); - break; } #endif Modified:
Re: svn commit: r307791 - stable/11/usr.sbin/bhyve
On Sat, Oct 22, 2016 at 11:27:43PM +0200, Ed Schouten wrote: > Hi Baptiste, > > 2016-10-22 22:49 GMT+02:00 Baptiste Daroussin: > > Use accept4 with O_NONBLOCK rather than accept + fcntl > > Keep in mind that changes like these do reduce the portability of the > code. accept4(), SOCK_NONBLOCK, etc. are not part of POSIX. > I entirely forgot that! Thanks for the heads up, I'll be carefull Best regards, Bapt signature.asc Description: PGP signature
Re: svn commit: r307791 - stable/11/usr.sbin/bhyve
Hi Baptiste, 2016-10-22 22:49 GMT+02:00 Baptiste Daroussin: > Use accept4 with O_NONBLOCK rather than accept + fcntl Keep in mind that changes like these do reduce the portability of the code. accept4(), SOCK_NONBLOCK, etc. are not part of POSIX. -- Ed Schouten Nuxi, 's-Hertogenbosch, the Netherlands KvK-nr.: 62051717 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307796 - stable/11/usr.sbin/syslogd
Author: bapt Date: Sat Oct 22 20:57:51 2016 New Revision: 307796 URL: https://svnweb.freebsd.org/changeset/base/307796 Log: MFC r305707: Directly set the O_NONBLOCK flags via open(2) Modified: stable/11/usr.sbin/syslogd/syslogd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/syslogd/syslogd.c == --- stable/11/usr.sbin/syslogd/syslogd.cSat Oct 22 20:56:49 2016 (r307795) +++ stable/11/usr.sbin/syslogd/syslogd.cSat Oct 22 20:57:51 2016 (r307796) @@ -621,10 +621,7 @@ main(int argc, char *argv[]) dprintf("sending on inet and/or inet6 socket\n"); } - if ((fklog = open(_PATH_KLOG, O_RDONLY, 0)) >= 0) - if (fcntl(fklog, F_SETFL, O_NONBLOCK) < 0) - fklog = -1; - if (fklog < 0) + if ((fklog = open(_PATH_KLOG, O_RDONLY|O_NONBLOCK, 0)) < 0) dprintf("can't open %s (%d)\n", _PATH_KLOG, errno); /* tuck my process id away */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307795 - stable/11/contrib/mdocml
Author: bapt Date: Sat Oct 22 20:56:49 2016 New Revision: 307795 URL: https://svnweb.freebsd.org/changeset/base/307795 Log: MFC r303223: Update mandoc to 1.13.4 release Added: stable/11/contrib/mdocml/man.cgi.3 - copied unchanged from r303223, head/contrib/mdocml/man.cgi.3 Modified: stable/11/contrib/mdocml/INSTALL stable/11/contrib/mdocml/LICENSE stable/11/contrib/mdocml/Makefile stable/11/contrib/mdocml/NEWS stable/11/contrib/mdocml/TODO stable/11/contrib/mdocml/cgi.c stable/11/contrib/mdocml/cgi.h.example stable/11/contrib/mdocml/configure stable/11/contrib/mdocml/configure.local.example stable/11/contrib/mdocml/demandoc.c stable/11/contrib/mdocml/libmandoc.h stable/11/contrib/mdocml/main.c stable/11/contrib/mdocml/main.h stable/11/contrib/mdocml/man.1 stable/11/contrib/mdocml/man.cgi.8 stable/11/contrib/mdocml/mandoc.3 stable/11/contrib/mdocml/mandoc.css stable/11/contrib/mdocml/mandoc.db.5 stable/11/contrib/mdocml/mandoc_headers.3 stable/11/contrib/mdocml/mandoc_malloc.3 stable/11/contrib/mdocml/mandocdb.c stable/11/contrib/mdocml/manpage.c stable/11/contrib/mdocml/manpath.c stable/11/contrib/mdocml/mansearch.c stable/11/contrib/mdocml/mchars_alloc.3 stable/11/contrib/mdocml/read.c stable/11/contrib/mdocml/tag.c stable/11/contrib/mdocml/term.c stable/11/contrib/mdocml/term_ascii.c stable/11/contrib/mdocml/test-rewb-bsd.c stable/11/contrib/mdocml/test-rewb-sysv.c Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/mdocml/INSTALL == --- stable/11/contrib/mdocml/INSTALLSat Oct 22 20:54:54 2016 (r307794) +++ stable/11/contrib/mdocml/INSTALLSat Oct 22 20:56:49 2016 (r307795) @@ -1,4 +1,4 @@ -$Id: INSTALL,v 1.13 2015/11/07 14:01:16 schwarze Exp $ +$Id: INSTALL,v 1.15 2016/07/14 11:09:06 schwarze Exp $ About mdocml, the portable mandoc distribution -- @@ -16,7 +16,7 @@ tech@ mailing list, too. Enjoy using the mandoc toolset! -Ingo Schwarze, Karlsruhe, March 2015 +Ingo Schwarze, Karlsruhe, July 2016 Installation @@ -52,7 +52,7 @@ and go back to step 2. 4. Run "make -n install" and check whether everything will be installed to the intended places. Otherwise, put some *DIR or *NM* -variables into "configure.local" and go back to step�2. +variables into "configure.local" and go back to step 2. 5. Run "sudo make install". If you intend to build a binary package using some kind of fake root mechanism, you may need a @@ -63,7 +63,7 @@ in the "Makefile" to understand how DEST manpath(1), make sure it is configured correctly, in particular, it returns all directory trees where manual pages are installed. Otherwise, if your system uses man.conf(5), make sure it contains -a "_whatdb" line for each directory tree, and the order of these +a "manpath" line for each directory tree, and the order of these lines meets your wishes. 7. If you compiled with database support, run the command "sudo Modified: stable/11/contrib/mdocml/LICENSE == --- stable/11/contrib/mdocml/LICENSESat Oct 22 20:54:54 2016 (r307794) +++ stable/11/contrib/mdocml/LICENSESat Oct 22 20:56:49 2016 (r307795) @@ -1,11 +1,11 @@ -$Id: LICENSE,v 1.11 2015/11/07 17:58:55 schwarze Exp $ +$Id: LICENSE,v 1.12 2016/07/07 23:46:36 schwarze Exp $ With the exceptions noted below, all code and documentation contained in the mdocml toolkit is protected by the Copyright of the following developers: Copyright (c) 2008-2012, 2014 Kristaps Dzonsons-Copyright (c) 2010-2015 Ingo Schwarze +Copyright (c) 2010-2016 Ingo Schwarze Copyright (c) 2009, 2010, 2011, 2012 Joerg Sonnenberger Copyright (c) 2013 Franco Fichtner Copyright (c) 2014 Baptiste Daroussin Modified: stable/11/contrib/mdocml/Makefile == --- stable/11/contrib/mdocml/Makefile Sat Oct 22 20:54:54 2016 (r307794) +++ stable/11/contrib/mdocml/Makefile Sat Oct 22 20:56:49 2016 (r307795) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.480 2015/11/07 21:53:14 schwarze Exp $ +# $Id: Makefile,v 1.488 2016/07/12 05:18:38 kristaps Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons -# Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze +# Copyright (c) 2011, 2013-2016 Ingo Schwarze # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR
svn commit: r307794 - stable/11/usr.bin/mkcsmapper
Author: bapt Date: Sat Oct 22 20:54:54 2016 New Revision: 307794 URL: https://svnweb.freebsd.org/changeset/base/307794 Log: MFC r302471, r302473: r302471: Add RCS Id. Sort options in SYNOPSIS. Fix macro usage. Fix Dd. Submitted by: w...@netbsd.org Obtained from:NetBSD r302473: Sync usage between program and man page. Increase column width. [1] Simplifay the usage() function Replace errx/strerror with errc Submitted by: w...@netbsd.org [1] Obtained from:NetBSD Modified: stable/11/usr.bin/mkcsmapper/mkcsmapper.1 stable/11/usr.bin/mkcsmapper/yacc.y Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/mkcsmapper/mkcsmapper.1 == --- stable/11/usr.bin/mkcsmapper/mkcsmapper.1 Sat Oct 22 20:52:58 2016 (r307793) +++ stable/11/usr.bin/mkcsmapper/mkcsmapper.1 Sat Oct 22 20:54:54 2016 (r307794) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Sep 6, 2009 +.Dd July 9, 2016 .Dt MKCSMAPPER 1 .Os .Sh NAME @@ -43,10 +43,10 @@ .Xr iconv 3 .Sh SYNOPSIS .Nm -.Op Fl mpd -.Fl o -.Ar outfile -.Ar infile +.Op Fl d +.Op Fl m | Fl p +.Op Fl o Ar outfile +.Op Ar infile .Sh DESCRIPTION The .Nm @@ -60,7 +60,7 @@ A pivot file, which the possible source pairs or the set of mappings to use for a compound encoding. .Pp The following options are available: -.Bl -tag -width 0123 +.Bl -tag -width XoXoutfileXX .It Fl d Turns on debug mode. .It Fl m @@ -82,7 +82,8 @@ Generate pivot data from .Sh HISTORY .Nm first appeared in -.Nx 2.0 , and made its appearance in +.Nx 2.0 , +and made its appearance in .Fx 9.0 . .Sh AUTHORS This manual page was written by Modified: stable/11/usr.bin/mkcsmapper/yacc.y == --- stable/11/usr.bin/mkcsmapper/yacc.y Sat Oct 22 20:52:58 2016 (r307793) +++ stable/11/usr.bin/mkcsmapper/yacc.y Sat Oct 22 20:54:54 2016 (r307794) @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $NetBSD: yacc.y,v 1.7 2006/09/09 14:35:17 tnozaki Exp $ */ +/* $NetBSD: yacc.y,v 1.11 2016/06/28 09:22:16 wiz Exp $*/ %{ /*- @@ -664,18 +664,15 @@ do_mkpv(FILE *in) if (ret && output) unlink(output); /* dump failure */ if (ret) - errx(EXIT_FAILURE, "%s\n", strerror(ret)); + errc(EXIT_FAILURE, ret, ""); } static void usage(void) { - warnx("usage: \n" - "\t%s [-d] [-o outfile] [infile]\n" - "\t%s -m [-d] [-o outfile] [infile]\n" - "\t%s -p [-d] [-o outfile] [infile]\n", - getprogname(), getprogname(), getprogname()); - exit(1); + fprintf(stderr, "Usage: %s [-d] [-m|-p] [-o outfile] [infile]\n", + getprogname()); + exit(EXIT_FAILURE); } int ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307793 - stable/11/usr.bin/calendar
Author: bapt Date: Sat Oct 22 20:52:58 2016 New Revision: 307793 URL: https://svnweb.freebsd.org/changeset/base/307793 Log: MFC r303265: Remove reference cpp(1) which is not used anymore Modified: stable/11/usr.bin/calendar/calendar.1 Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/calendar/calendar.1 == --- stable/11/usr.bin/calendar/calendar.1 Sat Oct 22 20:50:49 2016 (r307792) +++ stable/11/usr.bin/calendar/calendar.1 Sat Oct 22 20:52:58 2016 (r307793) @@ -28,7 +28,7 @@ .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" $FreeBSD$ .\" -.Dd April 6, 2013 +.Dd July 24, 2016 .Dt CALENDAR 1 .Os .Sh NAME @@ -295,7 +295,6 @@ This is no longer true, the date is only at the beginning of a line. .Sh SEE ALSO .Xr at 1 , -.Xr cpp 1 , .Xr mail 1 , .Xr cron 8 .Sh HISTORY ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307792 - stable/11/lib/libdevdctl
Author: bapt Date: Sat Oct 22 20:50:49 2016 New Revision: 307792 URL: https://svnweb.freebsd.org/changeset/base/307792 Log: MFC r307364: directly create the socket with SOCK_NONBLOCK instead of calling fcntl(2) Modified: stable/11/lib/libdevdctl/consumer.cc Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libdevdctl/consumer.cc == --- stable/11/lib/libdevdctl/consumer.ccSat Oct 22 20:49:44 2016 (r307791) +++ stable/11/lib/libdevdctl/consumer.ccSat Oct 22 20:50:49 2016 (r307792) @@ -108,11 +108,9 @@ Consumer::ConnectToDevd() strlcpy(devdAddr.sun_path, s_devdSockPath, sizeof(devdAddr.sun_path)); sLen = SUN_LEN(); - m_devdSockFD = socket(AF_UNIX, SOCK_SEQPACKET, 0); + m_devdSockFD = socket(AF_UNIX, SOCK_SEQPACKET | SOCK_NONBLOCK, 0); if (m_devdSockFD == -1) err(1, "Unable to create socket"); -if (fcntl(m_devdSockFD, F_SETFL, O_NONBLOCK) < 0) -err(1, "fcntl"); result = connect(m_devdSockFD, reinterpret_cast(), sLen); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307791 - stable/11/usr.sbin/bhyve
Author: bapt Date: Sat Oct 22 20:49:44 2016 New Revision: 307791 URL: https://svnweb.freebsd.org/changeset/base/307791 Log: MFC r306554: Use accept4 with O_NONBLOCK rather than accept + fcntl Modified: stable/11/usr.sbin/bhyve/dbgport.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bhyve/dbgport.c == --- stable/11/usr.sbin/bhyve/dbgport.c Sat Oct 22 20:49:07 2016 (r307790) +++ stable/11/usr.sbin/bhyve/dbgport.c Sat Oct 22 20:49:44 2016 (r307791) @@ -73,10 +73,8 @@ again: printf("Waiting for connection from gdb\r\n"); printonce = 1; } - conn_fd = accept(listen_fd, NULL, NULL); - if (conn_fd >= 0) - fcntl(conn_fd, F_SETFL, O_NONBLOCK); - else if (errno != EINTR) + conn_fd = accept4(listen_fd, NULL, NULL, O_NONBLOCK); + if (conn_fd < 0 && errno != EINTR) perror("accept"); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307790 - in stable/11/contrib/libucl: . haskell include m4 python python/src python/tests src tests/schema
Author: bapt Date: Sat Oct 22 20:49:07 2016 New Revision: 307790 URL: https://svnweb.freebsd.org/changeset/base/307790 Log: MFC r306544: Import libucl 20160812 Added: stable/11/contrib/libucl/haskell/ - copied from r306544, head/contrib/libucl/haskell/ stable/11/contrib/libucl/m4/gcov.m4 - copied unchanged from r306544, head/contrib/libucl/m4/gcov.m4 stable/11/contrib/libucl/python/tests/ - copied from r306544, head/contrib/libucl/python/tests/ Deleted: stable/11/contrib/libucl/python/test.sh stable/11/contrib/libucl/python/test_uclmodule.py Modified: stable/11/contrib/libucl/CMakeLists.txt stable/11/contrib/libucl/Makefile.unix stable/11/contrib/libucl/Makefile.w32 stable/11/contrib/libucl/README.md stable/11/contrib/libucl/include/ucl++.h stable/11/contrib/libucl/include/ucl.h stable/11/contrib/libucl/python/setup.py stable/11/contrib/libucl/python/src/uclmodule.c stable/11/contrib/libucl/src/ucl_parser.c stable/11/contrib/libucl/src/ucl_schema.c stable/11/contrib/libucl/src/ucl_util.c stable/11/contrib/libucl/tests/schema/patternProperties.json stable/11/contrib/libucl/tests/schema/refRemote.json Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/libucl/CMakeLists.txt == --- stable/11/contrib/libucl/CMakeLists.txt Sat Oct 22 20:46:57 2016 (r307789) +++ stable/11/contrib/libucl/CMakeLists.txt Sat Oct 22 20:49:07 2016 (r307790) @@ -205,8 +205,7 @@ SET(UCLSRC src/ucl_util.c src/ucl_hash.c src/ucl_schema.c src/ucl_msgpack.c - src/ucl_sexp.c - src/xxhash.c) + src/ucl_sexp.c) SET (LIB_TYPE STATIC) Modified: stable/11/contrib/libucl/Makefile.unix == --- stable/11/contrib/libucl/Makefile.unix Sat Oct 22 20:46:57 2016 (r307789) +++ stable/11/contrib/libucl/Makefile.unix Sat Oct 22 20:49:07 2016 (r307790) @@ -1,7 +1,7 @@ CC ?= gcc DESTDIR ?= /usr/local LD ?= gcc -C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src +C_COMMON_FLAGS ?= -fPIC -Wall -W -Wno-unused-parameter -Wno-pointer-sign -I./include -I./uthash -I./src -I./klib MAJOR_VERSION = 0 MINOR_VERSION = 2 PATCH_VERSION = 9 @@ -25,13 +25,12 @@ HDEPS = $(SRCDIR)/ucl_hash.h \ $(SRCDIR)/ucl_chartable.h \ $(SRCDIR)/ucl_internal.h \ $(INCLUDEDIR)/ucl.h \ - $(SRCDIR)/xxhash.h + $(SRCDIR)/mum.h OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ - $(OBJDIR)/ucl_schema.o \ - $(OBJDIR)/xxhash.o + $(OBJDIR)/ucl_schema.o all: $(OBJDIR) $(OBJDIR)/$(SONAME) @@ -55,8 +54,6 @@ $(OBJDIR)/ucl_hash.o: $(SRCDIR)/ucl_hash $(CC) -o $(OBJDIR)/ucl_hash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_hash.c $(OBJDIR)/ucl_schema.o: $(SRCDIR)/ucl_schema.c $(HDEPS) $(CC) -o $(OBJDIR)/ucl_schema.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/ucl_schema.c -$(OBJDIR)/xxhash.o: $(SRCDIR)/xxhash.c $(HDEPS) - $(CC) -o $(OBJDIR)/xxhash.o $(CPPFLAGS) $(COPT_FLAGS) $(CFLAGS) $(C_COMMON_FLAGS) $(SSL_CFLAGS) $(FETCH_FLAGS) -c $(SRCDIR)/xxhash.c clean: $(RM) $(OBJDIR)/*.o $(OBJDIR)/$(SONAME_FULL) $(OBJDIR)/$(SONAME) $(OBJDIR)/chargen $(OBJDIR)/test_basic $(OBJDIR)/test_speed $(OBJDIR)/objdump $(OBJDIR)/test_generate $(OBJDIR)/test_schema || true Modified: stable/11/contrib/libucl/Makefile.w32 == --- stable/11/contrib/libucl/Makefile.w32 Sat Oct 22 20:46:57 2016 (r307789) +++ stable/11/contrib/libucl/Makefile.w32 Sat Oct 22 20:49:07 2016 (r307790) @@ -28,14 +28,13 @@ HDEPS = $(SRCDIR)/ucl_hash.h \ $(SRCDIR)/ucl_chartable.h \ $(SRCDIR)/ucl_internal.h \ $(INCLUDEDIR)/ucl.h \ - $(SRCDIR)/xxhash.h + $(SRCDIR)/mum.h OBJECTS = $(OBJDIR)/ucl_hash.o \ $(OBJDIR)/ucl_util.o \ $(OBJDIR)/ucl_parser.o \ $(OBJDIR)/ucl_emitter.o \ $(OBJDIR)/ucl_emitter_utils.o \ - $(OBJDIR)/ucl_schema.o \ - $(OBJDIR)/xxhash.o + $(OBJDIR)/ucl_schema.o all: $(OBJDIR) $(OBJDIR)/$(SONAME) Modified: stable/11/contrib/libucl/README.md == --- stable/11/contrib/libucl/README.md Sat Oct 22 20:46:57 2016 (r307789) +++ stable/11/contrib/libucl/README.md Sat Oct
svn commit: r307789 - stable/11/usr.bin/sdiff
Author: bapt Date: Sat Oct 22 20:46:57 2016 New Revision: 307789 URL: https://svnweb.freebsd.org/changeset/base/307789 Log: MFC r303783, r305927: r303783: sdiff: remove non finish/function code 2 extra options not available neither on other BSD nor in GNU sdiff: --diff-pid and --pipe-fd were present in the SoC code, none were usable Just remove it r305927: Remove reference of z(s)diff which was dropped before importing Modified: stable/11/usr.bin/sdiff/sdiff.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/sdiff/sdiff.c == --- stable/11/usr.bin/sdiff/sdiff.c Sat Oct 22 20:39:18 2016 (r307788) +++ stable/11/usr.bin/sdiff/sdiff.c Sat Oct 22 20:46:57 2016 (r307789) @@ -104,9 +104,6 @@ enum { HLINES_OPT, LFILES_OPT, DIFFPROG_OPT, - PIPE_FD, - /* pid from the diff parent (if applicable) */ - DIFF_PID, NOOP_OPT, }; @@ -120,8 +117,6 @@ static struct option longopts[] = { { "output", required_argument, NULL, 'o' }, { "diff-program", required_argument, NULL, DIFFPROG_OPT }, - { "pipe-fd",required_argument, NULL, PIPE_FD }, - { "diff-pid", required_argument, NULL, DIFF_PID }, /* Options processed by diff. */ { "ignore-file-name-case", no_argument,NULL, FCASE_IGNORE_OPT }, { "no-ignore-file-name-case", no_argument,NULL, FCASE_SENSITIVE_OPT }, @@ -237,7 +232,7 @@ main(int argc, char **argv) FILE *diffpipe=NULL, *file1, *file2; size_t diffargc = 0, wflag = WIDTH; int ch, fd[2] = {-1}, status; - pid_t pid=0; pid_t ppid =-1; + pid_t pid=0; const char *outfile = NULL; struct option *popt; char **diffargv, *diffprog = DIFF_PATH, *filename1, *filename2, @@ -320,11 +315,6 @@ main(int argc, char **argv) if (errstr) errx(2, "width is %s: %s", errstr, optarg); break; - case DIFF_PID: - ppid = strtonum(optarg, 0, INT_MAX, ); - if (errstr) - errx(2, "diff pid value is %s: %s", errstr, optarg); - break; case HELP_OPT: for (i = 0; help_msg[i] != NULL; i++) printf("%s\n", help_msg[i]); @@ -393,35 +383,34 @@ main(int argc, char **argv) errx(2, "width is too large: %zu", width); line_width = width * 2 + 3; - if (ppid == -1 ) { - if (pipe(fd)) - err(2, "pipe"); - - switch (pid = fork()) { - case 0: - /* child */ - /* We don't read from the pipe. */ - close(fd[0]); - if (dup2(fd[1], STDOUT_FILENO) == -1) - err(2, "child could not duplicate descriptor"); - /* Free unused descriptor. */ - close(fd[1]); - execvp(diffprog, diffargv); - err(2, "could not execute diff: %s", diffprog); - break; - case -1: - err(2, "could not fork"); - break; - } + if (pipe(fd)) + err(2, "pipe"); - /* parent */ - /* We don't write to the pipe. */ + switch (pid = fork()) { + case 0: + /* child */ + /* We don't read from the pipe. */ + close(fd[0]); + if (dup2(fd[1], STDOUT_FILENO) == -1) + err(2, "child could not duplicate descriptor"); + /* Free unused descriptor. */ close(fd[1]); - - /* Open pipe to diff command. */ - if ((diffpipe = fdopen(fd[0], "r")) == NULL) - err(2, "could not open diff pipe"); + execvp(diffprog, diffargv); + err(2, "could not execute diff: %s", diffprog); + break; + case -1: + err(2, "could not fork"); + break; } + + /* parent */ + /* We don't write to the pipe. */ + close(fd[1]); + + /* Open pipe to diff command. */ + if ((diffpipe = fdopen(fd[0], "r")) == NULL) + err(2, "could not open diff pipe"); + if ((file1 = fopen(filename1, "r")) == NULL) err(2, "could not open %s", filename1); if ((file2 = fopen(filename2, "r")) == NULL) @@ -489,8 +478,8 @@ main(int argc, char **argv) } /* - * When sdiff/zsdiff detects a binary file as input, executes them
svn commit: r307788 - in stable/11: tools/build/mk usr.sbin usr.sbin/etcupdate
Author: bapt Date: Sat Oct 22 20:39:18 2016 New Revision: 307788 URL: https://svnweb.freebsd.org/changeset/base/307788 Log: MFC r303784, r303785, r305620: r303784: etcupdate: directly use diff3(1) instead of merge(1) During the last attempt to rmeove GNU rcs, 2 blockers were spotted: We need an ident(1) and etcupdate(8) uses merge(1). Now nothing should prevent to remove rcs from base Reviewed by: jhb Differential Revision:https://reviews.freebsd.org/D7401 r303785: always install etcupdate Now that etcupdate does not depend on rcs anymore there is no need to conditionnally install it r305620: (by vangyzen ) etcupdate: preserve the metadata of the destination file When using diff3 to perform a three-way merge, etcupdate lost the destination file's metadata. The metadata from the temporary file were used instead. This was unpleasant for rc.d scripts, which require execute permission. Use "cat >" to overwrite the destination file's contents while preserving its metadata. Reviewed by: bapt Sponsored by: Dell Technologies Differential Revision:https://reviews.freebsd.org/D7817 Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc stable/11/usr.sbin/Makefile stable/11/usr.sbin/etcupdate/etcupdate.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/tools/build/mk/OptionalObsoleteFiles.inc == --- stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 20:00:39 2016(r307787) +++ stable/11/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 20:39:18 2016(r307788) @@ -6800,7 +6800,6 @@ OLD_FILES+=usr/bin/rcsdiff OLD_FILES+=usr/bin/rcsfreeze OLD_FILES+=usr/bin/rcsmerge OLD_FILES+=usr/bin/rlog -OLD_FILES+=usr/sbin/etcupdate OLD_FILES+=usr/share/man/man1/ci.1.gz OLD_FILES+=usr/share/man/man1/co.1.gz OLD_FILES+=usr/share/man/man1/merge.1.gz @@ -6812,16 +6811,6 @@ OLD_FILES+=usr/share/man/man1/rcsintro.1 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz OLD_FILES+=usr/share/man/man1/rlog.1.gz OLD_FILES+=usr/share/man/man5/rcsfile.5.gz -OLD_FILES+=usr/share/man/man8/etcupdate.8.gz -OLD_FILES+=usr/tests/usr.sbin/etcupdate/Kyuafile -OLD_FILES+=usr/tests/usr.sbin/etcupdate/always_test -OLD_FILES+=usr/tests/usr.sbin/etcupdate/conflicts_test -OLD_FILES+=usr/tests/usr.sbin/etcupdate/fbsdid_test -OLD_FILES+=usr/tests/usr.sbin/etcupdate/ignore_test -OLD_FILES+=usr/tests/usr.sbin/etcupdate/preworld_test -OLD_FILES+=usr/tests/usr.sbin/etcupdate/tests_test -OLD_FILES+=usr/tests/usr.sbin/etcupdate/tzsetup_test -OLD_DIRS+=usr/tests/usr.sbin/etcupdate .endif #.if ${MK_RESCUE} == no Modified: stable/11/usr.sbin/Makefile == --- stable/11/usr.sbin/Makefile Sat Oct 22 20:00:39 2016(r307787) +++ stable/11/usr.sbin/Makefile Sat Oct 22 20:39:18 2016(r307788) @@ -25,6 +25,7 @@ SUBDIR= adduser \ digictl \ diskinfo \ dumpcis \ + etcupdate \ extattr \ extattrctl \ fifolog \ @@ -188,7 +189,6 @@ SUBDIR.${MK_QUOTAS}+= edquota SUBDIR.${MK_QUOTAS}+= quotaon SUBDIR.${MK_QUOTAS}+= repquota SUBDIR.${MK_RCMDS}+= rwhod -SUBDIR.${MK_RCS}+= etcupdate SUBDIR.${MK_SENDMAIL}+=editmap SUBDIR.${MK_SENDMAIL}+=mailstats SUBDIR.${MK_SENDMAIL}+=makemap Modified: stable/11/usr.sbin/etcupdate/etcupdate.sh == --- stable/11/usr.sbin/etcupdate/etcupdate.sh Sat Oct 22 20:00:39 2016 (r307787) +++ stable/11/usr.sbin/etcupdate/etcupdate.sh Sat Oct 22 20:39:18 2016 (r307788) @@ -814,15 +814,19 @@ merge_file() local res # Try the merge to see if there is a conflict. - merge -q -p ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 >/dev/null 2>&3 + diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > /dev/null 2>&3 res=$? case $res in 0) # No conflicts, so just redo the merge to the # real file. - log "merge ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1" + log "diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1" if [ -z "$dryrun" ]; then - merge ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 + temp=$(mktemp -t etcupdate) + diff3 -E -m ${DESTDIR}$1 ${OLDTREE}$1 ${NEWTREE}$1 > ${temp} + # Use "cat >" to preserve metadata. + cat ${temp} > ${DESTDIR}$1 + rm -f ${temp} fi post_install_file $1 echo " M $1" @@ -832,10 +836,10 @@ merge_file() #
svn commit: r307787 - head/sys/boot/efi
Author: bapt Date: Sat Oct 22 20:00:39 2016 New Revision: 307787 URL: https://svnweb.freebsd.org/changeset/base/307787 Log: Fix typo in the COMPILER_VERSION check PR: 213120 Submitted by: Yuta SatohMFC after:3 days Modified: head/sys/boot/efi/Makefile Modified: head/sys/boot/efi/Makefile == --- head/sys/boot/efi/Makefile Sat Oct 22 19:51:32 2016(r307786) +++ head/sys/boot/efi/Makefile Sat Oct 22 20:00:39 2016(r307787) @@ -4,7 +4,7 @@ # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer # than 4.5 supports it. -.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 +.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" .if ${MK_FDT} != "no" @@ -18,6 +18,6 @@ SUBDIR+= fdt SUBDIR+= libefi loader boot1 .endif -.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500 +.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500 .include ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307786 - in head: etc/rc.d tools/build/mk
Author: bapt Date: Sat Oct 22 19:51:32 2016 New Revision: 307786 URL: https://svnweb.freebsd.org/changeset/base/307786 Log: Do not install NIS program rc script if WITHOUT_NIS is set PR: 213375 Submitted by: ser...@akhmatov.ru MFC after:3 days Modified: head/etc/rc.d/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/etc/rc.d/Makefile == --- head/etc/rc.d/Makefile Sat Oct 22 19:36:12 2016(r307785) +++ head/etc/rc.d/Makefile Sat Oct 22 19:51:32 2016(r307786) @@ -118,14 +118,17 @@ FILES=DAEMON \ ugidfw \ ${_utx} \ var \ - watchdogd \ - ypbind \ + watchdogd + +.if ${MK_NIS} != "no" +FILES+=ypbind \ ypldap \ yppasswdd \ ypserv \ ypset \ ypupdated \ ypxfrd +.endif .if ${MK_ACCT} != "no" FILESGROUPS+= ACCT Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 19:36:12 2016(r307785) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Oct 22 19:51:32 2016(r307786) @@ -6113,6 +6113,13 @@ OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-N .endif .if ${MK_NIS} == no +OLD_FILES+=etc/rc.d/ypbind +OLD_FILES+=etc/rc.d/ypldap +OLD_FILES+=etc/rc.d/yppasswdd +OLD_FILES+=etc/rc.d/ypserv +OLD_FILES+=etc/rc.d/ypset +OLD_FILES+=etc/rc.d/ypupdated +OLD_FILES+=etc/rc.d/ypxfrd OLD_FILES+=usr/bin/ypcat OLD_FILES+=usr/bin/ypchfn OLD_FILES+=usr/bin/ypchpass ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307785 - head/share/misc
Author: bapt Date: Sat Oct 22 19:36:12 2016 New Revision: 307785 URL: https://svnweb.freebsd.org/changeset/base/307785 Log: Import pci_vendors 2016.10.20 Modified: head/share/misc/pci_vendors Modified: head/share/misc/pci_vendors == --- head/share/misc/pci_vendors Sat Oct 22 19:27:49 2016(r307784) +++ head/share/misc/pci_vendors Sat Oct 22 19:36:12 2016(r307785) @@ -3,8 +3,8 @@ # # List of PCI ID's # -# Version: 2016.10.03 -# Date:2016-10-03 03:15:01 +# Version: 2016.10.20 +# Date:2016-10-20 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at http://pci-ids.ucw.cz/. @@ -245,8 +245,13 @@ 0013 53c875a 1000 1000 LSI53C875A PCI to Ultra SCSI Controller 0014 MegaRAID Tri-Mode SAS3516 + 1028 1fd4 PERC H745P MX 1d49 0602 ThinkSystem RAID 930-16i 4GB Flash PCIe 12Gb Adapter 0016 MegaRAID Tri-Mode SAS3508 + 1028 1fc9 PERC H840 Adapter + 1028 1fcb PERC H740P Adapter + 1028 1fcd PERC H740P Mini + 1028 1fcf PERC H740P Mini 1d49 0601 ThinkSystem RAID 930-8i 2GB Flash PCIe 12Gb Adapter 1d49 0603 ThinkSystem RAID 930-24i 4GB Flash PCIe 12Gb Adapter 1d49 0604 ThinkSystem RAID 930-8e 4GB Flash PCIe 12Gb Adapter @@ -376,6 +381,7 @@ 1028 1f4d PERC FD33xS 1028 1f4f PERC H730P Slim 1028 1f54 PERC FD33xD + 1028 1fd1 PERC H730P MX 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter @@ -535,8 +541,11 @@ 0097 SAS3008 PCI-Express Fusion-MPT SAS-3 1000 3090 SAS9311-8i 1000 30e0 SAS9300-8i - 1028 1f45 12GB/s HBA internal + 1028 1f45 HBA330 Adapter 1028 1f46 12Gbps HBA + 1028 1f53 HBA330 Mini + 1028 1fd2 HBA330 MX + 1028 1fd3 HBA330 MMZ 00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC) 00ac SAS3416 Fusion-MPT Tri-Mode I/O Controller Chip (IOC) 1d49 0201 ThinkSystem 9400-16i PCIe 12Gb HBA @@ -1588,7 +1597,7 @@ 1462 2938 Radeon R9 360 OEM 1462 3271 Radeon R9 360 OEM 1682 7360 Radeon R7 360 - 6660 Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330] + 6660 Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430] 1028 05ea Radeon HD 8670M 1028 06bf Radeon R5 M335 103c 1970 Radeon HD 8670M @@ -1596,6 +1605,7 @@ 103c 8136 Radeon R5 M330 17aa 3804 Radeon R5 M330 17aa 3809 Radeon R5 M330 + 17aa 381a Radeon R5 M430 17aa 390c Radeon R5 M330 6663 Sun PRO [Radeon HD 8570A/8570M] 1025 0846 Radeon HD 8570A @@ -2866,11 +2876,12 @@ 174b e180 Radeon HD 7350 17af 3015 Radeon HD 7350 68fe Cedar LE - 6900 Topaz XT [Radeon R7 M260/M265 / M340/M360] + 6900 Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445] 1025 1056 Radeon R7 M360 / R8 M365DX 1028 0640 Radeon R7 M260/M265 1028 0643 Radeon R7 M260/M265 1028 067f Radeon R7 M260 + 1028 0767 Radeon R7 M445 1028 130a Radeon R7 M260 103c 2263 Radeon R7 M260 103c 2269 Radeon R7 M260 @@ -2881,6 +2892,7 @@ 103c 80b5 Radeon R7 M360 103c 80b9 Radeon R7 M360 103c 811c Radeon R7 M340 + 103c 8226 Radeon R7 M440 10cf 1906 Radeon R7 M260 1170 9979 Radeon R7 M360 1179 f903 Radeon R7 M260 @@ -2892,6 +2904,7 @@ 17aa 5021 Radeon R7 M260 6901 Topaz PRO [Radeon R5 M255] 103c 1318 Radeon R6 M255DX + 6907 Meso XT [Radeon R5 M315] 6921 Amethyst XT [Radeon R9 M295X] 6929 Tonga XT GL [FirePro S7150] 692b Tonga PRO GL [FirePro W7100] @@ -3349,7 +3362,7 @@ 99a4 Trinity [Radeon HD 7400G] aa00 R600 HDMI Audio [Radeon HD 2900 GT/PRO/XT] aa01 RV635 HDMI Audio [Radeon HD 3650/3730/3750] - aa08 RV630 HDMI Audio [Radeon HD 2600 Series] + aa08 RV630 HDMI Audio [Radeon HD 2600 PRO/XT / HD 3610] aa10 RV610 HDMI Audio [Radeon HD 2350 PRO / 2400 PRO/XT / HD 3410] 174b aa10 Radeon HD 2400 PRO 18bc aa10 Radeon HD 2400 PRO @@ -3369,10 +3382,10 @@ aa68 Cedar HDMI Audio [Radeon HD 5400/6300/7300 Series] 1028 aa68
svn commit: r307784 - head/gnu/usr.bin/cc
Author: jhibbits Date: Sat Oct 22 19:27:49 2016 New Revision: 307784 URL: https://svnweb.freebsd.org/changeset/base/307784 Log: Fix a typo from a manual merge. Modified: head/gnu/usr.bin/cc/Makefile.tgt Modified: head/gnu/usr.bin/cc/Makefile.tgt == --- head/gnu/usr.bin/cc/Makefile.tgtSat Oct 22 19:24:46 2016 (r307783) +++ head/gnu/usr.bin/cc/Makefile.tgtSat Oct 22 19:27:49 2016 (r307784) @@ -4,7 +4,7 @@ # MACHINE_CPUARCH, but there's no easy way to export make functions... .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc(64spe)/powerpc/} +TARGET_CPUARCH=${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb)?/arm/:C/powerpc(64|spe)/powerpc/} .else TARGET_CPUARCH=${MACHINE_CPUARCH} .endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307783 - head/contrib/tzdata
Author: bapt Date: Sat Oct 22 19:24:46 2016 New Revision: 307783 URL: https://svnweb.freebsd.org/changeset/base/307783 Log: Import tzdata 2016h MFC after:2 days Modified: head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/northamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaSat Oct 22 19:19:31 2016(r307782) +++ head/contrib/tzdata/asiaSat Oct 22 19:24:46 2016(r307783) @@ -2544,11 +2544,6 @@ Zone Asia/Karachi4:28:12 - LMT 1907 # From Paul Eggert (2015-03-03): # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014 # says that the fall 2014 transition was Oct 23 at 24:00. -# For future dates, guess the last Friday in March at 24:00 through -# the first Friday on or after October 21 at 00:00. This is consistent with -# the predictions in today's editions of the following URLs: -# http://www.timeanddate.com/time/change/gaza-strip/gaza -# http://www.timeanddate.com/time/change/west-bank/hebron # From Hannah Kreitem (2016-03-09): # http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728 @@ -2558,7 +2553,21 @@ Zone Asia/Karachi4:28:12 - LMT 1907 # # From Paul Eggert (2016-03-12): # Predict spring transitions on March's last Saturday at 01:00 from now on. -# Leave fall predictions alone for now. + +# From Sharef Mustafa (2016-10-19): +# [T]he Palestinian cabinet decision (Mar 8th 2016) published on +# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf +# states that summer time will end on Oct 29th at 01:00. +# +# From Tim Parenti (2016-10-19): +# Predict fall transitions on October's last Saturday at 01:00 from now on. +# This is consistent with the 2016 transition as well as our spring +# predictions. +# +# From Paul Eggert (2016-10-19): +# It's also consistent with predictions in the following URLs today: +# http://www.timeanddate.com/time/change/gaza-strip/gaza +# http://www.timeanddate.com/time/change/west-bank/hebron # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule EgyptAsia 1957only- May 10 0:001:00S @@ -2587,9 +2596,10 @@ Rule Palestine 2011only- Sep 30 0:000 Rule Palestine 20122014- Mar lastThu 24:00 1:00S Rule Palestine 2012only- Sep 21 1:000 - Rule Palestine 2013only- Sep Fri>=21 0:000 - -Rule Palestine 2014max - Oct Fri>=21 0:000 - +Rule Palestine 20142015- Oct Fri>=21 0:000 - Rule Palestine 2015only- Mar lastFri 24:00 1:00S Rule Palestine 2016max - Mar lastSat 1:001:00S +Rule Palestine 2016max - Oct lastSat 1:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2739,45 +2749,31 @@ ZoneAsia/Singapore 6:55:25 - LMT 1901 J # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'], # as that zone has agreed with the Tamil areas since our cutoff date of 1970. -# From K Sethu (2006-04-25): -# I think the abbreviation LKT originated from the world of computers at -# the time of or subsequent to the time zone changes by SL Government -# twice in 1996 and probably SL Government or its standardization -# agencies never declared an abbreviation as a national standard. -# -# I recollect before the recent change the government announcements -# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka -# Time and no mention was made about the abbreviation. -# -# If we look at Sri Lanka Department of Government's "Official News -# Website of Sri Lanka" ... http://www.news.lk/ we can see that they -# use SLT as abbreviation in time stamp at the beginning of each news -# item -# -# Within Sri Lanka I think LKT is well known among computer users and -# administrators. In my opinion SLT may not be a good choice because the -# nation's largest telcom / internet operator Sri Lanka Telcom is well -# known by that abbreviation - simply as SLT (there IP domains are -# slt.lk and sltnet.lk). -# -# But if indeed our government has adopted SLT as standard abbreviation -# (that we have not known so far) then it is better that it be used for -# all computers. - -# From Paul Eggert (2006-04-25): -# One possibility is that we wait for a bit for the dust to settle down -# and then see what people actually say in practice. +# From Sadika Sumanapala (2016-10-19): +# According to http://www.sltime.org (maintained by Measurement Units, +# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka +# standard time is
svn commit: r307782 - vendor/tzdata/tzdata2016h
Author: bapt Date: Sat Oct 22 19:19:31 2016 New Revision: 307782 URL: https://svnweb.freebsd.org/changeset/base/307782 Log: tag import of tzdata 2016h Added: vendor/tzdata/tzdata2016h/ - copied from r306848, vendor/tzdata/dist/ Replaced: vendor/tzdata/tzdata2016h/asia - copied unchanged from r307781, vendor/tzdata/dist/asia vendor/tzdata/tzdata2016h/australasia - copied unchanged from r307781, vendor/tzdata/dist/australasia vendor/tzdata/tzdata2016h/europe - copied unchanged from r307781, vendor/tzdata/dist/europe vendor/tzdata/tzdata2016h/northamerica - copied unchanged from r307781, vendor/tzdata/dist/northamerica Copied: vendor/tzdata/tzdata2016h/asia (from r307781, vendor/tzdata/dist/asia) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/tzdata/tzdata2016h/asia Sat Oct 22 19:19:31 2016 (r307782, copy of r307781, vendor/tzdata/dist/asia) @@ -0,0 +1,3054 @@ +# This file is in the public domain, so clarified as of +# 2009-05-17 by Arthur David Olson. + +# This file is by no means authoritative; if you think you know better, +# go ahead and edit the file (and please send any changes to +# t...@iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. + +# From Paul Eggert (2015-08-08): +# +# Unless otherwise specified, the source for data through 1990 is: +# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), +# San Diego: ACS Publications, Inc. (2003). +# Unfortunately this book contains many errors and cites no sources. +# +# Gwillim Law writes that a good source +# for recent time zone data is the International Air Transport +# Association's Standard Schedules Information Manual (IATA SSIM), +# published semiannually. Law sent in several helpful summaries +# of the IATA's data after 1990. Except where otherwise noted, +# IATA SSIM is the source for entries after 1990. +# +# Another source occasionally used is Edward W. Whitman, World Time Differences, +# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which +# I found in the UCLA library. +# +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. +# http://www.jstor.org/stable/1774359 +# +# For Russian data circa 1919, a source is: +# Byalokoz EL. New Counting of Time in Russia since July 1, 1919. +# (See the 'europe' file for a fuller citation.) +# +# A reliable and entertaining source about time zones is +# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). +# +# I invented the abbreviations marked '*' in the following table; +# the rest are from earlier versions of this file, or from other sources. +# Corrections are welcome! +# std dst +# LMTLocal Mean Time +# 2:00 EET EEST Eastern European Time +# 2:00 IST IDT Israel +# 3:00 AST ADT Arabia* +# 3:30 IRST IRDT Iran* +# 4:00 GSTGulf* +# 5:30 ISTIndia +# 7:00 ICTIndochina, most times and locations* +# 7:00 WIBwest Indonesia (Waktu Indonesia Barat) +# 8:00 WITA central Indonesia (Waktu Indonesia Tengah) +# 8:00 CSTChina +# 8:00 IDTIndochina, 1943-45, 1947-55, 1960-75 (some locations)* +# 8:00 JWST Western Standard Time (Japan, 1896/1937)* +# 8:30 KST KDT Korea when at +0830* +# 9:00 JCST Central Standard Time (Japan, 1896/1937) +# 9:00 WITeast Indonesia (Waktu Indonesia Timur) +# 9:00 JST JDT Japan +# 9:00 KST KDT Korea when at +09 +# 9:30 ACST Australian Central Standard Time +# +# See the 'europe' file for Russia and Turkey in Asia. + +# From Guy Harris: +# Incorporates data for Singapore from Robert Elz' asia 1.1, as well as +# additional information from Tom Yap, Sun Microsystems Intercontinental +# Technical Support (including a page from the Official Airline Guide - +# Worldwide Edition). The names for time zones are guesses. + +### + +# These rules are stolen from the 'europe' file. +# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S +Rule EUAsia 1981max - Mar lastSun 1:00u 1:00S +Rule EUAsia 19791995- Sep lastSun 1:00u 0 - +Rule EUAsia 1996max - Oct lastSun 1:00u 0 - +Rule E-EurAsia 1981max - Mar lastSun 0:00 1:00S +Rule E-EurAsia 19791995- Sep lastSun 0:00 0 - +Rule E-EurAsia 1996max - Oct lastSun 0:00 0 - +Rule RussiaAsia19811984- Apr 10:00 1:00 S +Rule RussiaAsia19811983- Oct 10:00 0 - +Rule RussiaAsia
svn commit: r307781 - vendor/tzdata/dist
Author: bapt Date: Sat Oct 22 19:18:59 2016 New Revision: 307781 URL: https://svnweb.freebsd.org/changeset/base/307781 Log: Import tzdata 2016h Modified: vendor/tzdata/dist/asia vendor/tzdata/dist/australasia vendor/tzdata/dist/europe vendor/tzdata/dist/northamerica Modified: vendor/tzdata/dist/asia == --- vendor/tzdata/dist/asia Sat Oct 22 18:02:20 2016(r307780) +++ vendor/tzdata/dist/asia Sat Oct 22 19:18:59 2016(r307781) @@ -2544,11 +2544,6 @@ Zone Asia/Karachi4:28:12 - LMT 1907 # From Paul Eggert (2015-03-03): # http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014 # says that the fall 2014 transition was Oct 23 at 24:00. -# For future dates, guess the last Friday in March at 24:00 through -# the first Friday on or after October 21 at 00:00. This is consistent with -# the predictions in today's editions of the following URLs: -# http://www.timeanddate.com/time/change/gaza-strip/gaza -# http://www.timeanddate.com/time/change/west-bank/hebron # From Hannah Kreitem (2016-03-09): # http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728 @@ -2558,7 +2553,21 @@ Zone Asia/Karachi4:28:12 - LMT 1907 # # From Paul Eggert (2016-03-12): # Predict spring transitions on March's last Saturday at 01:00 from now on. -# Leave fall predictions alone for now. + +# From Sharef Mustafa (2016-10-19): +# [T]he Palestinian cabinet decision (Mar 8th 2016) published on +# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf +# states that summer time will end on Oct 29th at 01:00. +# +# From Tim Parenti (2016-10-19): +# Predict fall transitions on October's last Saturday at 01:00 from now on. +# This is consistent with the 2016 transition as well as our spring +# predictions. +# +# From Paul Eggert (2016-10-19): +# It's also consistent with predictions in the following URLs today: +# http://www.timeanddate.com/time/change/gaza-strip/gaza +# http://www.timeanddate.com/time/change/west-bank/hebron # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule EgyptAsia 1957only- May 10 0:001:00S @@ -2587,9 +2596,10 @@ Rule Palestine 2011only- Sep 30 0:000 Rule Palestine 20122014- Mar lastThu 24:00 1:00S Rule Palestine 2012only- Sep 21 1:000 - Rule Palestine 2013only- Sep Fri>=21 0:000 - -Rule Palestine 2014max - Oct Fri>=21 0:000 - +Rule Palestine 20142015- Oct Fri>=21 0:000 - Rule Palestine 2015only- Mar lastFri 24:00 1:00S Rule Palestine 2016max - Mar lastSat 1:001:00S +Rule Palestine 2016max - Oct lastSat 1:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2739,45 +2749,31 @@ ZoneAsia/Singapore 6:55:25 - LMT 1901 J # People who live in regions under Tamil control can use [TZ='Asia/Kolkata'], # as that zone has agreed with the Tamil areas since our cutoff date of 1970. -# From K Sethu (2006-04-25): -# I think the abbreviation LKT originated from the world of computers at -# the time of or subsequent to the time zone changes by SL Government -# twice in 1996 and probably SL Government or its standardization -# agencies never declared an abbreviation as a national standard. -# -# I recollect before the recent change the government announcements -# mentioning it as simply changing Sri Lanka Standard Time or Sri Lanka -# Time and no mention was made about the abbreviation. -# -# If we look at Sri Lanka Department of Government's "Official News -# Website of Sri Lanka" ... http://www.news.lk/ we can see that they -# use SLT as abbreviation in time stamp at the beginning of each news -# item -# -# Within Sri Lanka I think LKT is well known among computer users and -# administrators. In my opinion SLT may not be a good choice because the -# nation's largest telcom / internet operator Sri Lanka Telcom is well -# known by that abbreviation - simply as SLT (there IP domains are -# slt.lk and sltnet.lk). -# -# But if indeed our government has adopted SLT as standard abbreviation -# (that we have not known so far) then it is better that it be used for -# all computers. - -# From Paul Eggert (2006-04-25): -# One possibility is that we wait for a bit for the dust to settle down -# and then see what people actually say in practice. +# From Sadika Sumanapala (2016-10-19): +# According to http://www.sltime.org (maintained by Measurement Units, +# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka +# standard time is SLST. +# +# From Paul Eggert (2016-10-18): +# "SLST" seems to be reasonably recent and
svn commit: r307780 - head/sys/kern
Author: cem Date: Sat Oct 22 18:02:20 2016 New Revision: 307780 URL: https://svnweb.freebsd.org/changeset/base/307780 Log: ddb(4): Add sleepchains to "show allchains" Reported by: markj Reviewed by: markj Sponsored by: Dell EMC Isilon Differential Revision:https://reviews.freebsd.org/D8320 Modified: head/sys/kern/subr_turnstile.c Modified: head/sys/kern/subr_turnstile.c == --- head/sys/kern/subr_turnstile.c Sat Oct 22 17:21:21 2016 (r307779) +++ head/sys/kern/subr_turnstile.c Sat Oct 22 18:02:20 2016 (r307780) @@ -157,6 +157,9 @@ static void init_turnstile0(void *dummy) #ifdef TURNSTILE_PROFILING static voidinit_turnstile_profiling(void *arg); #endif +#ifdef DDB +static voidprint_sleepchain(struct thread *td, const char *prefix); +#endif static voidpropagate_priority(struct thread *td); static int turnstile_adjust_thread(struct turnstile *ts, struct thread *td); @@ -1169,6 +1172,10 @@ DB_SHOW_ALL_COMMAND(chains, db_show_allc db_printf("chain %d:\n", i++); print_lockchain(td, " "); } + if (TD_IS_INHIBITED(td) && TD_ON_SLEEPQ(td)) { + db_printf("chain %d:\n", i++); + print_sleepchain(td, " "); + } if (db_pager_quit) return; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307779 - head/sys/netinet
Author: tuexen Date: Sat Oct 22 17:21:21 2016 New Revision: 307779 URL: https://svnweb.freebsd.org/changeset/base/307779 Log: No functional changes, mostly getting the whitespace changes resulting from an updated formatting tool chain. MFC after: 1 month Modified: head/sys/netinet/sctp_bsd_addr.c head/sys/netinet/sctp_output.c Modified: head/sys/netinet/sctp_bsd_addr.c == --- head/sys/netinet/sctp_bsd_addr.cSat Oct 22 16:42:49 2016 (r307778) +++ head/sys/netinet/sctp_bsd_addr.cSat Oct 22 17:21:21 2016 (r307779) @@ -140,7 +140,6 @@ sctp_gather_internal_ifa_flags(struct sc ifa->localifa_flags &= ~SCTP_ADDR_IFA_UNUSEABLE; } } - #endif /* INET6 */ @@ -201,10 +200,8 @@ sctp_init_ifns_for_vrf(int vrfid) struct ifaddr *ifa; struct sctp_ifa *sctp_ifa; uint32_t ifa_flags; - #ifdef INET6 struct in6_ifaddr *ifa6; - #endif IFNET_RLOCK(); Modified: head/sys/netinet/sctp_output.c == --- head/sys/netinet/sctp_output.c Sat Oct 22 16:42:49 2016 (r307778) +++ head/sys/netinet/sctp_output.c Sat Oct 22 17:21:21 2016 (r307779) @@ -1943,7 +1943,6 @@ sctp_add_addr_to_mbuf(struct mbuf *m, st struct sctp_paramhdr *parmh; struct mbuf *mret; uint16_t plen; - #endif switch (ifa->address.sa.sa_family) { @@ -2139,10 +2138,8 @@ skip_count: cnt++; total_count++; if (cnt >= 2) { - /* -* two from each -* address -*/ + /* two from each +* address */ break; } if (total_count > SCTP_ADDRESS_LIMIT) { @@ -2784,7 +2781,6 @@ sctp_select_nth_preferred_addr_from_ifn_ { struct sctp_ifa *ifa, *sifa; int num_eligible_addr = 0; - #ifdef INET6 struct sockaddr_in6 sin6, lsa6; @@ -2829,10 +2825,8 @@ sctp_select_nth_preferred_addr_from_ifn_ if (fam == AF_INET6 && IN6_IS_ADDR_LINKLOCAL(>address.sin6.sin6_addr) && IN6_IS_ADDR_LINKLOCAL(_addr)) { - /* -* link-local <-> link-local must belong to the same -* scope. -*/ + /* link-local <-> link-local must belong to the same +* scope. */ memcpy(, >address.sin6, sizeof(struct sockaddr_in6)); (void)sa6_recoverscope(); if (sin6.sin6_scope_id != lsa6.sin6_scope_id) { @@ -2966,10 +2960,8 @@ sctp_choose_boundall(struct sctp_inpcb * struct sctp_ifa *sctp_ifa, *sifa; uint32_t ifn_index; struct sctp_vrf *vrf; - #ifdef INET int retried = 0; - #endif /*- @@ -3315,14 +3307,11 @@ sctp_source_address_selection(struct sct struct sctp_ifa *answer; uint8_t dest_is_priv, dest_is_loop; sa_family_t fam; - #ifdef INET struct sockaddr_in *to = (struct sockaddr_in *)>ro_dst; - #endif #ifdef INET6 struct sockaddr_in6 *to6 = (struct sockaddr_in6 *)>ro_dst; - #endif /** @@ -3570,14 +3559,11 @@ sctp_process_cmsgs_for_init(struct sctp_ struct cmsghdr cmh; int tlen, at; struct sctp_initmsg initmsg; - #ifdef INET struct sockaddr_in sin; - #endif #ifdef INET6 struct sockaddr_in6 sin6; - #endif tlen = SCTP_BUF_LEN(control); @@ -3618,10 +3604,8 @@ sctp_process_cmsgs_for_init(struct sctp_ if (stcb->asoc.streamoutcnt < stcb->asoc.pre_open_streams) { struct sctp_stream_out *tmp_str; unsigned int i; - #if defined(SCTP_DETAILED_STR_STATS) int j; - #endif /* Default is NOT correct */ @@ -3744,14 +3728,11 @@ sctp_findassociation_cmsgs(struct sctp_i int tlen, at; struct sctp_tcb *stcb; struct sockaddr *addr; - #ifdef INET struct sockaddr_in sin; - #endif #ifdef INET6 struct sockaddr_in6 sin6; - #endif tlen = SCTP_BUF_LEN(control); @@ -3970,7 +3951,6 @@ sctp_handle_no_route(struct sctp_tcb *st
svn commit: r307778 - stable/11/sys/arm/broadcom/bcm2835
Author: gonzo Date: Sat Oct 22 16:42:49 2016 New Revision: 307778 URL: https://svnweb.freebsd.org/changeset/base/307778 Log: MFC r306860: Add multitouch support for RPi's FT5406 - Add multitouch support (protocol B) - Report physical size of the screen - Switch from using busy loop to callbacks - Enable callbacks only when there is active listener on /dev/input/eventX Submitted by: Vladimir KondratievModified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c == --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Sat Oct 22 16:38:39 2016(r30) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Sat Oct 22 16:42:49 2016(r307778) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include @@ -102,14 +101,20 @@ __FBSDID("$FreeBSD$"); (buf[FT5406_POINT_YL(n)])) #defineGET_TOUCH_ID(buf, n)((buf[FT5406_POINT_YH(n)] >> 4) & 0xf) -#defineNO_POINTS 99 -#defineSCREEN_WIDTH800 -#defineSCREEN_HEIGHT 480 +#defineNO_POINTS 99 +#defineSCREEN_WIDTH800 +#defineSCREEN_HEIGHT 480 +#defineSCREEN_WIDTH_MM 155 +#defineSCREEN_HEIGHT_MM86 +#defineSCREEN_RES_X(SCREEN_WIDTH / SCREEN_WIDTH_MM) +#defineSCREEN_RES_Y(SCREEN_HEIGHT / SCREEN_HEIGHT_MM) +#defineMAX_TOUCH_ID(10 - 1) struct ft5406ts_softc { device_tsc_dev; struct mtx sc_mtx; - struct proc *sc_worker; + int sc_tick; + struct callout sc_callout; /* mbox buffer (mapped to KVA) */ uint8_t *touch_buf; @@ -118,86 +123,76 @@ struct ft5406ts_softc { struct intr_config_hook sc_init_hook; struct evdev_dev*sc_evdev; - int sc_detaching; + + uint8_t sc_window[FT5406_WINDOW_SIZE]; +}; + +static evdev_open_t ft5406ts_ev_open; +static evdev_close_t ft5406ts_ev_close; + +static const struct evdev_methods ft5406ts_evdev_methods = { + .ev_open = _ev_open, + .ev_close = _ev_close, }; static void -ft5406ts_worker(void *data) +ft5406ts_callout(void *data) { struct ft5406ts_softc *sc = (struct ft5406ts_softc *)data; int points; - int id, new_x, new_y, i, new_pen_down, updated; - int x, y, pen_down; - uint8_t window[FT5406_WINDOW_SIZE]; - int tick; + int id, i, x, y; - /* 60Hz */ - tick = hz*17/1000; - if (tick == 0) - tick = 1; - - x = y = -1; - pen_down = 0; - - FT5406_LOCK(sc); - while(1) { - msleep(sc, >sc_mtx, PCATCH | PZERO, "ft5406ts", tick); - - if (sc->sc_detaching) - break; - - memcpy(window, sc->touch_buf, sizeof(window)); - sc->touch_buf[FT5406_NUM_POINTS] = NO_POINTS; - - points = GET_NUM_POINTS(window); - /* -* No update from VC - do nothing -*/ - if (points == NO_POINTS) - continue; + FT5406_LOCK_ASSERT(sc); - /* No points and pen is already up */ - if ((points == 0) && !pen_down) - continue; + memcpy(sc->sc_window, sc->touch_buf, FT5406_WINDOW_SIZE); + sc->touch_buf[FT5406_NUM_POINTS] = NO_POINTS; - new_pen_down = 0; - for (i = 0; i < points; i++) { - id = GET_TOUCH_ID(window, 0); - /* For now consider only touch 0 */ - if (id != 0) - continue; - new_pen_down = 1; - new_x = GET_X(window, 0); - new_y = GET_Y(window, 0); + points = GET_NUM_POINTS(sc->sc_window); + /* +* No update from VC - do nothing. +*/ + if (points == NO_POINTS) + goto out; + + for (i = 0; i < points; i++) { + id = GET_TOUCH_ID(sc->sc_window, i); + x = GET_X(sc->sc_window, i); + y = GET_Y(sc->sc_window, i); + + if (id > MAX_TOUCH_ID) { + device_printf(sc->sc_dev, "bad touch id: %d", id); + continue; } + evdev_push_event(sc->sc_evdev, EV_ABS, ABS_MT_SLOT, id); + evdev_push_event(sc->sc_evdev, EV_ABS, ABS_MT_TRACKING_ID, id); + evdev_push_event(sc->sc_evdev, EV_ABS, ABS_MT_POSITION_X, x); +
svn commit: r307777 - in stable/11/sys/dev: evdev usb/input
Author: gonzo Date: Sat Oct 22 16:38:39 2016 New Revision: 30 URL: https://svnweb.freebsd.org/changeset/base/30 Log: MFC r306647, r306855, r306857 r306647: const-ify struct evdev_methods Submitted by: Vladimir KondratievSuggested by: hselasky r306855: Allow using of driver's mutex instead internal one for evdev locking. Add new API call: evdev_register_mtx which takes lock argument that should be used instead of internal one for evdev locking. Useful for cases if evdev_push_event() is always called with driver's lock taken and reduces amount of lock aquisitions. This allows to avoid LOR between ev_open/ev_close invocations and evdev_push_event() Such LOR can happen when ev_open/ev_close methods acquire driver lock and evdev_push_event() is called with this lock taken. Submitted by: Vladimir Kondratiev r306857: Implement EVDEV_FLAG_MT_AUTOREL flag (autorelease touchpoints) Automaticaly release (send ABS_MT_TRACKING_ID = -1) MT-slots that has not been listed in current MT protocol type B report. Slot is counted as listed if corresponding ABS_MT_SLOT event has been sent regardless of other MT events. Events are sent on SYN_REPORT event. Submitted by: Vladimir Kondratiev Modified: stable/11/sys/dev/evdev/evdev.c stable/11/sys/dev/evdev/evdev.h stable/11/sys/dev/evdev/evdev_mt.c stable/11/sys/dev/evdev/evdev_private.h stable/11/sys/dev/usb/input/ukbd.c stable/11/sys/dev/usb/input/ums.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/evdev/evdev.c == --- stable/11/sys/dev/evdev/evdev.c Sat Oct 22 16:24:12 2016 (r307776) +++ stable/11/sys/dev/evdev/evdev.c Sat Oct 22 16:38:39 2016 (r30) @@ -187,8 +187,8 @@ evdev_estimate_report_size(struct evdev_ return (size); } -int -evdev_register(struct evdev_dev *evdev) +static int +evdev_register_common(struct evdev_dev *evdev) { int ret; @@ -196,7 +196,6 @@ evdev_register(struct evdev_dev *evdev) evdev->ev_shortname, evdev->ev_name, evdev->ev_serial); /* Initialize internal structures */ - mtx_init(>ev_mtx, "evmtx", NULL, MTX_DEF); LIST_INIT(>ev_clients); if (evdev_event_supported(evdev, EV_REP) && @@ -228,6 +227,19 @@ evdev_register(struct evdev_dev *evdev) /* Create char device node */ ret = evdev_cdev_create(evdev); bail_out: + return (ret); +} + +int +evdev_register(struct evdev_dev *evdev) +{ + int ret; + + evdev->ev_lock_type = EV_LOCK_INTERNAL; + evdev->ev_lock = >ev_mtx; + mtx_init(>ev_mtx, "evmtx", NULL, MTX_DEF); + + ret = evdev_register_common(evdev); if (ret != 0) mtx_destroy(>ev_mtx); @@ -235,6 +247,15 @@ bail_out: } int +evdev_register_mtx(struct evdev_dev *evdev, struct mtx *mtx) +{ + + evdev->ev_lock_type = EV_LOCK_MTX; + evdev->ev_lock = mtx; + return (evdev_register_common(evdev)); +} + +int evdev_unregister(struct evdev_dev *evdev) { struct evdev_client *client; @@ -257,7 +278,7 @@ evdev_unregister(struct evdev_dev *evdev /* destroy_dev can sleep so release lock */ ret = evdev_cdev_destroy(evdev); evdev->ev_cdev = NULL; - if (ret == 0) + if (ret == 0 && evdev->ev_lock_type == EV_LOCK_INTERNAL) mtx_destroy(>ev_mtx); evdev_free_absinfo(evdev->ev_absinfo); @@ -302,7 +323,7 @@ evdev_set_serial(struct evdev_dev *evdev inline void evdev_set_methods(struct evdev_dev *evdev, void *softc, -struct evdev_methods *methods) +const struct evdev_methods *methods) { evdev->ev_methods = methods; @@ -665,6 +686,8 @@ evdev_sparse_event(struct evdev_dev *evd case EV_SYN: if (code == SYN_REPORT) { + /* Count empty reports as well as non empty */ + evdev->ev_report_count++; /* Skip empty reports */ if (!evdev->ev_report_opened) return (EV_SKIP_EVENT); @@ -701,10 +724,7 @@ evdev_propagate_event(struct evdev_dev * EVDEV_CLIENT_UNLOCKQ(client); } - /* Update counters */ evdev->ev_event_count++; - if (type == EV_SYN && code == SYN_REPORT) - evdev->ev_report_count++; } void @@ -735,16 +755,24 @@ evdev_push_event(struct evdev_dev *evdev int32_t value) { + if (evdev->ev_lock_type != EV_LOCK_INTERNAL) + EVDEV_LOCK_ASSERT(evdev); + if (evdev_check_event(evdev, type, code, value) != 0) return (EINVAL); - EVDEV_LOCK(evdev); + if (evdev->ev_lock_type == EV_LOCK_INTERNAL) + EVDEV_LOCK(evdev); evdev_modify_event(evdev, type, code, ); + if
svn commit: r307776 - in stable/11/sys: arm/broadcom/bcm2835 arm/conf modules/rpi_ft5406
Author: gonzo Date: Sat Oct 22 16:24:12 2016 New Revision: 307776 URL: https://svnweb.freebsd.org/changeset/base/307776 Log: MFC r306618, r306619 r306618: Fix attach/detach methods - Initialize lock before starting worker process - Do not hold lock when destroying evdev. By that time ther should be no other active code pathes that can access softc r306619: Add rpi_ft5406 module and add it to extra modules in Raspberry Pi configs Added: stable/11/sys/modules/rpi_ft5406/ - copied from r306619, head/sys/modules/rpi_ft5406/ Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c stable/11/sys/arm/conf/RPI-B stable/11/sys/arm/conf/RPI2 Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c == --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Sat Oct 22 15:26:32 2016(r307775) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Sat Oct 22 16:24:12 2016(r307776) @@ -288,13 +288,13 @@ ft5406ts_attach(device_t dev) sc->sc_init_hook.ich_func = ft5406ts_init; sc->sc_init_hook.ich_arg = sc; + FT5406_LOCK_INIT(sc); + if (config_intrhook_establish(>sc_init_hook) != 0) { device_printf(dev, "config_intrhook_establish failed\n"); return (ENOMEM); } - FT5406_LOCK_INIT(sc); - return (0); } @@ -308,10 +308,11 @@ ft5406ts_detach(device_t dev) FT5406_LOCK(sc); if (sc->sc_worker) sc->sc_detaching = 1; + wakeup(sc); + FT5406_UNLOCK(sc); if (sc->sc_evdev) evdev_free(sc->sc_evdev); - FT5406_UNLOCK(sc); FT5406_LOCK_DESTROY(sc); Modified: stable/11/sys/arm/conf/RPI-B == --- stable/11/sys/arm/conf/RPI-BSat Oct 22 15:26:32 2016 (r307775) +++ stable/11/sys/arm/conf/RPI-BSat Oct 22 16:24:12 2016 (r307776) @@ -94,4 +94,4 @@ options FDT # Configure using FDT/DTB # handed to kernel via U-Boot and ubldr. #options FDT_DTB_STATIC #makeoptions FDT_DTS_FILE=rpi.dts -makeoptionsMODULES_EXTRA=dtb/rpi +makeoptionsMODULES_EXTRA="dtb/rpi rpi_ft5406" Modified: stable/11/sys/arm/conf/RPI2 == --- stable/11/sys/arm/conf/RPI2 Sat Oct 22 15:26:32 2016(r307775) +++ stable/11/sys/arm/conf/RPI2 Sat Oct 22 16:24:12 2016(r307776) @@ -98,4 +98,4 @@ options FDT # Configure using FDT/DTB # handed to kernel via U-Boot and ubldr. #options FDT_DTB_STATIC #makeoptions FDT_DTS_FILE=rpi2.dts -makeoptionsMODULES_EXTRA=dtb/rpi +makeoptionsMODULES_EXTRA="dtb/rpi rpi_ft5406" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307775 - in stable/11/sys: arm/broadcom/bcm2835 arm/conf arm/ti conf dev/evdev dev/usb/input modules modules/evdev modules/uinput
Author: gonzo Date: Sat Oct 22 15:26:32 2016 New Revision: 307775 URL: https://svnweb.freebsd.org/changeset/base/307775 Log: MFC r306530, r306531, r306532, r306579: r306530: Declare a module for evdev and add dependency to ukbd(4) and ums(4) Prepare for making evdev a module. "Pure" evdev device drivers (like touchscreen) and evdev itself can be built as a modules regardless of "options EVDEV" in kernel config. So if people does not require evdev functionality in hybrid drivers like ums and ukbd they can, for instance, kldload evdev and utouchscreen to run FreeBSD in kiosk mode. r306531: Add dependency to evdev module (if required) r306532: Add dependency to evdev module r306579: Modularize evdev - Convert "options EVDEV" to "device evdev" and "device uinput", add modules for both new devices. They are isolated subsystems and do not require any compile-time changes to general kernel subsytems - For hybrid drivers that have evdev as an optional way to deliver input events add option EVDEV_SUPPORT. Update all existing hybrid drivers to use it instead of EVDEV - Remove no-op DECLARE_MODULE in evdev, it's not required, MODULE_VERSION is enough - Add evdev module dependency to uinput Submitted by: Vladimir KondratievAdded: stable/11/sys/modules/evdev/ - copied from r306579, head/sys/modules/evdev/ stable/11/sys/modules/uinput/ - copied from r306579, head/sys/modules/uinput/ Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c stable/11/sys/arm/conf/BEAGLEBONE stable/11/sys/arm/ti/ti_adc.c stable/11/sys/arm/ti/ti_adcvar.h stable/11/sys/conf/NOTES stable/11/sys/conf/options stable/11/sys/dev/evdev/evdev.c stable/11/sys/dev/evdev/uinput.c stable/11/sys/dev/usb/input/ukbd.c stable/11/sys/dev/usb/input/ums.c stable/11/sys/modules/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c == --- stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Sat Oct 22 14:37:13 2016(r307774) +++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Sat Oct 22 15:26:32 2016(r307775) @@ -335,3 +335,4 @@ static driver_t ft5406ts_driver = { }; DRIVER_MODULE(ft5406ts, ofwbus, ft5406ts_driver, ft5406ts_devclass, 0, 0); +MODULE_DEPEND(ft5406ts, evdev, 1, 1, 1); Modified: stable/11/sys/arm/conf/BEAGLEBONE == --- stable/11/sys/arm/conf/BEAGLEBONE Sat Oct 22 14:37:13 2016 (r307774) +++ stable/11/sys/arm/conf/BEAGLEBONE Sat Oct 22 15:26:32 2016 (r307775) @@ -135,4 +135,4 @@ device ukbd device kbdmux # Uncomment to enable evdev support for ti_adc -# options EVDEV +# options EVDEV_SUPPORT Modified: stable/11/sys/arm/ti/ti_adc.c == --- stable/11/sys/arm/ti/ti_adc.c Sat Oct 22 14:37:13 2016 (r307774) +++ stable/11/sys/arm/ti/ti_adc.c Sat Oct 22 15:26:32 2016 (r307775) @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include -#ifdef EVDEV +#ifdef EVDEV_SUPPORT #include #include #endif @@ -89,7 +89,7 @@ static int ti_adc_samples[5] = { 0, 2, 4 static int ti_adc_detach(device_t dev); -#ifdef EVDEV +#ifdef EVDEV_SUPPORT static void ti_adc_ev_report(struct ti_adc_softc *sc) { @@ -472,7 +472,7 @@ ti_adc_tsc_read_data(struct ti_adc_softc device_printf(sc->sc_dev, "touchscreen x: %d, y: %d\n", x, y); #endif -#ifdef EVDEV +#ifdef EVDEV_SUPPORT if ((sc->sc_x != x) || (sc->sc_y != y)) { sc->sc_x = x; sc->sc_y = y; @@ -516,7 +516,7 @@ ti_adc_intr(void *arg) status |= ADC_IRQ_HW_PEN_ASYNC; ADC_WRITE4(sc, ADC_IRQENABLE_CLR, ADC_IRQ_HW_PEN_ASYNC); -#ifdef EVDEV +#ifdef EVDEV_SUPPORT ti_adc_ev_report(sc); #endif } @@ -524,7 +524,7 @@ ti_adc_intr(void *arg) if (rawstatus & ADC_IRQ_PEN_UP) { sc->sc_pen_down = 0; status |= ADC_IRQ_PEN_UP; -#ifdef EVDEV +#ifdef EVDEV_SUPPORT ti_adc_ev_report(sc); #endif } @@ -874,7 +874,7 @@ ti_adc_attach(device_t dev) ti_adc_setup(sc); TI_ADC_UNLOCK(sc); -#ifdef EVDEV +#ifdef EVDEV_SUPPORT if (sc->sc_tsc_wires > 0) { sc->sc_evdev = evdev_alloc(); evdev_set_name(sc->sc_evdev, device_get_desc(dev)); @@ -921,7 +921,7 @@ ti_adc_detach(device_t dev) ti_adc_reset(sc); ti_adc_setup(sc); -#ifdef EVDEV +#ifdef EVDEV_SUPPORT evdev_free(sc->sc_evdev); #endif @@ -958,3 +958,6 @@ static devclass_t ti_adc_devclass; DRIVER_MODULE(ti_adc, simplebus, ti_adc_driver, ti_adc_devclass, 0,
svn commit: r307774 - head/lib/libusb
Author: trasz Date: Sat Oct 22 14:37:13 2016 New Revision: 307774 URL: https://svnweb.freebsd.org/changeset/base/307774 Log: Fix libusb20_dev_get_desc(3) to use the "vendor product" order, not "product vendor". This is consistent with how it's generally done. The ordering is visible eg in usbconfig(8) output. Note to self: MFC this to 9 and 8. Reviewed by: hselasky@ MFC after:1 month Differential Revision:https://reviews.freebsd.org/D8258 Modified: head/lib/libusb/libusb20_ugen20.c Modified: head/lib/libusb/libusb20_ugen20.c == --- head/lib/libusb/libusb20_ugen20.c Sat Oct 22 13:20:02 2016 (r307773) +++ head/lib/libusb/libusb20_ugen20.c Sat Oct 22 14:37:13 2016 (r307774) @@ -214,8 +214,8 @@ ugen20_enumerate(struct libusb20_device snprintf(pdev->usb_desc, sizeof(pdev->usb_desc), USB_GENERIC_NAME "%u.%u: <%s %s> at usbus%u", pdev->bus_number, - pdev->device_address, devinfo.udi_product, - devinfo.udi_vendor, pdev->bus_number); + pdev->device_address, devinfo.udi_vendor, + devinfo.udi_product, pdev->bus_number); error = 0; done: ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r307756 - in head: include sys/sys
On 22 Oct 2016, at 16:00, Dimitry Andricwrote: > > On 22 Oct 2016, at 02:00, Brooks Davis wrote: ... >> Ideally I'd add a void * as well since that will support systems like >> CHERI where pointers are the largest type. > > Is void * larger than a struct with long long and long double? I'd > think this would be at least 128 bits on almost all architectures? > > In any case, if you want to change this definition, it is probably best > to first check it with upstream gcc, otherwise you'll end up with an > incompatibility. For some more historic context, see this LLVM commit: http://llvm.org/viewvc/llvm-project?view=revision=201729 r201729 | chandlerc | 2014-02-19 23:35:01 +0100 (Wed, 19 Feb 2014) | 20 lines Teach Clang to provide ::max_align_t in C11 and C++11 modes. This definition is not chosen idly. There is an unfortunate reality with max_align_t -- the specific nature of its definition leaks into the ABI almost immediately. Because it is part of C11 and C++11 it becomes essential for it to match with other systems on that ABI. There is an effort to discourage any further use of this construct as a consequence -- using max_align_t introduces an immediate ABI problem. We can never update it to have larger alignment even as the microarchitecture changes to necessitate higher alignment. =/ The particular definition here exactly matches the ABI of GCC's chosen ::max_align_t definition, for better or worse. This was written with the help of Richard Smith who was decoding the exact ABI implications of the selected definition in GCC. Notably, in-register arguments are impacted by the particular definition chosen. =/ No one is under the illusion that this is a "good" or "useful" definition of max_align_t, and we are working with the standards committee to specify a more useful interface to address this need. E.g., it is likely better to avoid using max_align_t altogether. -Dimitry signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r307756 - in head: include sys/sys
On 22 Oct 2016, at 02:00, Brooks Daviswrote: > > On Fri, Oct 21, 2016 at 11:50:02PM +, John Baldwin wrote: >> Author: jhb >> Date: Fri Oct 21 23:50:02 2016 >> New Revision: 307756 >> URL: https://svnweb.freebsd.org/changeset/base/307756 >> >> Log: >> Define max_align_t for C11. >> >> libc++'s stddef.h includes an existing definition of max_align_t for >> C++11, but it is only defined for C++, not for C. In addition, GCC and >> clang both define an alternate version of max_align_t that uses a >> union of multiple types rather than a plain long double as in libc++. >> This adds a __max_align_t to that matches the GCC and >> clang definition that is mapped to max_align_t in . ... Modified: head/sys/sys/_types.h >> == >> --- head/sys/sys/_types.hFri Oct 21 21:55:50 2016(r307755) >> +++ head/sys/sys/_types.hFri Oct 21 23:50:02 2016(r307756) >> @@ -100,6 +100,11 @@ typedef __uint_least32_t __char32_t; >> #define _CHAR32_T_DECLARED >> #endif >> >> +typedef struct { > > Should this be union per the commit message? You would be inclined to think so, but the strange way this is defined is only to be compatible with gcc's definition, which was introduced here in 2011: https://gcc.gnu.org/viewcvs/gcc/trunk/gcc/ginclude/stddef.h?r1=181048=181047=181048 > Ideally I'd add a void * as well since that will support systems like > CHERI where pointers are the largest type. Is void * larger than a struct with long long and long double? I'd think this would be at least 128 bits on almost all architectures? In any case, if you want to change this definition, it is probably best to first check it with upstream gcc, otherwise you'll end up with an incompatibility. -Dimitry signature.asc Description: Message signed with OpenPGP using GPGMail
svn commit: r307773 - stable/11/usr.bin/tee
Author: bapt Date: Sat Oct 22 13:20:02 2016 New Revision: 307773 URL: https://svnweb.freebsd.org/changeset/base/307773 Log: MFC: 305937 Capsicum-ize tee(1) Reviewed by: allanjude Differential Revision:https://reviews.freebsd.org/D7940 Modified: stable/11/usr.bin/tee/tee.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/tee/tee.c == --- stable/11/usr.bin/tee/tee.c Sat Oct 22 13:15:19 2016(r307772) +++ stable/11/usr.bin/tee/tee.c Sat Oct 22 13:20:02 2016(r307773) @@ -41,14 +41,18 @@ static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ -#include +#include #include +#include + #include +#include #include #include #include #include #include +#include #include typedef struct _list { @@ -69,6 +73,8 @@ main(int argc, char *argv[]) char *bp; int append, ch, exitval; char *buf; + cap_rights_t rights; + unsigned long cmd; #defineBSIZE (8 * 1024) append = 0; @@ -90,6 +96,16 @@ main(int argc, char *argv[]) if ((buf = malloc(BSIZE)) == NULL) err(1, "malloc"); + cap_rights_init(, CAP_READ, CAP_FSTAT); + if (cap_rights_limit(STDIN_FILENO, ) < 0 && errno != ENOSYS) + err(EXIT_FAILURE, "unable to limit rights for stdin"); + cap_rights_init(, CAP_WRITE, CAP_FSTAT, CAP_IOCTL); + if (cap_rights_limit(STDERR_FILENO, ) < 0 && errno != ENOSYS) + err(EXIT_FAILURE, "unable to limit rights for stderr"); + cmd = TIOCGETA; + if (cap_ioctls_limit(STDERR_FILENO, , 1) < 0 && errno != ENOSYS) + err(EXIT_FAILURE, "unable to limit ioctls for stderr"); + add(STDOUT_FILENO, "stdout"); for (exitval = 0; *argv; ++argv) @@ -100,6 +116,8 @@ main(int argc, char *argv[]) } else add(fd, *argv); + if (cap_enter() < 0 && errno != ENOSYS) + err(EXIT_FAILURE, "unable to enter capability mode"); while ((rval = read(STDIN_FILENO, buf, BSIZE)) > 0) for (p = head; p; p = p->next) { n = rval; @@ -129,6 +147,21 @@ static void add(int fd, const char *name) { LIST *p; + cap_rights_t rights; + unsigned long cmd; + + if (fd == STDOUT_FILENO) + cap_rights_init(, CAP_WRITE, CAP_FSTAT, CAP_IOCTL); + else + cap_rights_init(, CAP_WRITE, CAP_FSTAT); + if (cap_rights_limit(fd, ) < 0 && errno != ENOSYS) + err(EXIT_FAILURE, "unable to limit rights"); + + if (fd == STDOUT_FILENO) { + cmd = TIOCGETA; + if (cap_ioctls_limit(fd, , 1) < 0 && errno != ENOSYS) + err(EXIT_FAILURE, "unable to limit ioctls for stdout"); + } if ((p = malloc(sizeof(LIST))) == NULL) err(1, "malloc"); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307772 - stable/11/usr.bin/sdiff
Author: bapt Date: Sat Oct 22 13:15:19 2016 New Revision: 307772 URL: https://svnweb.freebsd.org/changeset/base/307772 Log: MFC: 307368,307369,307372,307381 Remove the common.h include which is actually not used in sdiff.c Turn editit into a static function Move cleanup() into the edit.c file which is the only users of that function Remove common.{c,h} Fix typos in sdiff(1) message and improve display Deleted: stable/11/usr.bin/sdiff/common.c stable/11/usr.bin/sdiff/common.h Modified: stable/11/usr.bin/sdiff/Makefile stable/11/usr.bin/sdiff/edit.c stable/11/usr.bin/sdiff/sdiff.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/sdiff/Makefile == --- stable/11/usr.bin/sdiff/MakefileSat Oct 22 13:11:09 2016 (r307771) +++ stable/11/usr.bin/sdiff/MakefileSat Oct 22 13:15:19 2016 (r307772) @@ -3,7 +3,7 @@ .include PROG= sdiff -SRCS= common.c edit.c sdiff.c +SRCS= edit.c sdiff.c WARNS= 3 MAN1= sdiff.1 Modified: stable/11/usr.bin/sdiff/edit.c == --- stable/11/usr.bin/sdiff/edit.c Sat Oct 22 13:11:09 2016 (r307771) +++ stable/11/usr.bin/sdiff/edit.c Sat Oct 22 13:15:19 2016 (r307772) @@ -21,10 +21,16 @@ __FBSDID("$FreeBSD$"); #include #include -#include "common.h" #include "extern.h" -int editit(const char *); +static void +cleanup(const char *filename) +{ + + if (unlink(filename)) + err(2, "could not delete: %s", filename); + exit(2); +} /* * Execute an editor on the specified pathname, which is interpreted @@ -32,7 +38,7 @@ int editit(const char *); * * Returns -1 on error, or the exit value on success. */ -int +static int editit(const char *pathname) { sig_t sighup, sigint, sigquit, sigchld; Modified: stable/11/usr.bin/sdiff/sdiff.c == --- stable/11/usr.bin/sdiff/sdiff.c Sat Oct 22 13:11:09 2016 (r307771) +++ stable/11/usr.bin/sdiff/sdiff.c Sat Oct 22 13:15:19 2016 (r307772) @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "common.h" #include "extern.h" #define DIFF_PATH "/usr/bin/diff" @@ -144,24 +143,25 @@ static struct option longopts[] = { }; static const char *help_msg[] = { - "\nusage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2\n", - "\t-l, --left-column, Only print the left column for identical lines.", - "\t-o OUTFILE, --output=OUTFILE, nteractively merge file1 and file2 into outfile.", - "\t-s, --suppress-common-lines, Skip identical lines.", - "\t-w WIDTH, --width=WIDTH, Print a maximum of WIDTH characters on each line.", - "\tOptions passed to diff(1) are:", - "\t\t-a, --text, Treat file1 and file2 as text files.", - "\t\t-b, --ignore-trailing-cr, Ignore trailing blank spaces.", - "\t\t-d, --minimal, Minimize diff size.", - "\t\t-I RE, --ignore-matching-lines=RE, Ignore changes whose line matches RE.", - "\t\t-i, --ignore-case, Do a case-insensitive comparison.", - "\t\t-t, --expand-tabs Expand tabs to spaces.", - "\t\t-W, --ignore-all-spaces, Ignore all spaces.", - "\t\t--speed-large-files, Assume large file with scattered changes.", - "\t\t--strip-trailing-cr, Strip trailing carriage return.", - "\t\t--ignore-file-name-case, Ignore case of file names.", - "\t\t--no-ignore-file-name-case, Do not ignore file name case", - "\t\t--tabsize NUM, Change size of tabs (default 8.)", + "usage: sdiff [-abdilstW] [-I regexp] [-o outfile] [-w width] file1 file2\n", + "-l, --left-column: only print the left column for identical lines.", + "-o OUTFILE, --output=OUTFILE: interactively merge file1 and file2 into outfile.", + "-s, --suppress-common-lines: skip identical lines.", + "-w WIDTH, --width=WIDTH: print a maximum of WIDTH characters on each line.", + "", + "Options passed to diff(1) are:", + "\t-a, --text: treat file1 and file2 as text files.", + "\t-b, --ignore-trailing-cr: ignore trailing blank spaces.", + "\t-d, --minimal: minimize diff size.", + "\t-I RE, --ignore-matching-lines=RE: ignore changes whose line matches RE.", + "\t-i, --ignore-case: do a case-insensitive comparison.", + "\t-t, --expand-tabs: sxpand tabs to spaces.", + "\t-W, --ignore-all-spaces: ignore all spaces.", + "\t--speed-large-files: assume large file with scattered changes.", + "\t--strip-trailing-cr: strip trailing carriage return.", + "\t--ignore-file-name-case: ignore case of file names.", + "\t--no-ignore-file-name-case: do not ignore file name case", + "\t--tabsize NUM: change size of tabs (default 8.)",
Re: svn commit: r307761 - in head: . contrib/binutils/bfd contrib/gcc/config/rs6000 gnu/lib/libgcc gnu/lib/libgomp gnu/usr.bin/binutils gnu/usr.bin/cc gnu/usr.bin/cc/cc_tools gnu/usr.bin/cc/include gn
On Oct 22, 2016, at 7:43 AM, Konstantin Belousov wrote: On Sat, Oct 22, 2016 at 03:20:17PM +0300, Konstantin Belousov wrote: On Sat, Oct 22, 2016 at 01:57:15AM +, Justin Hibbits wrote: Author: jhibbits Date: Sat Oct 22 01:57:15 2016 New Revision: 307761 URL: https://svnweb.freebsd.org/changeset/base/307761 Log: Create a new MACHINE_ARCH for Freescale PowerPC e500v2 Added: head/lib/libc/powerpcspe/sys/ptrace.S (contents, props changed) This is not needed, libc provides MI implementation in libc/sys/ ptrace.c. Why the decision to copy whole lib/libc/powerpc to lib/libc/powerpcspe was used to create the architecture ? I did a primitive-science overview, and got total ~2300 lines in lib/libc/powerpcspe, while $ diff -Nrua lib/libc/powerpc lib/libc/powerpcspe | diffstat -p0 | tail -1 16 files changed, 240 insertions(+), 174 deletions(-) It seems to be possible to only create several new files, like *setjmp.S and fp*.c, and reuse existing stock files from libc/powerpc for anything else. I am the one who does most of the sweeping changes over libc, and I am somewhat saddened by addition of almost identical copy of the existing architecture files which need to be maintained together with the original. To be honest, I didn't think it was the right way either, but wasn't completely certain (and admittedly didn't try) that I could have two files with the same names, one in powerpc one in powerpcspe, and have it ignore the powerpc one if it exists in powerpcspe. libc's Makefile includes ${MACHINE_ARCH}/Makefile.inc, unless it doesn't exist in which case it includes ${MACHINE_CPUARCH}/ Makefile.inc, I'll see if I can consolidate them, but do you have a recommendation of the best way to do it? I also didn't really like the code duplication, but couldn't think of an easy/good way to do so. Now that we've chatted on IRC a bit about this, I'll take your suggestion and create some Makefile.common files to share between powerpc and powerpcspe. It may take a couple days depending on my available time. - Justin ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307771 - head/lib/libc/powerpcspe/sys
Author: jhibbits Date: Sat Oct 22 13:11:09 2016 New Revision: 307771 URL: https://svnweb.freebsd.org/changeset/base/307771 Log: ptrace.S is not needed, libc/sys/ptrace.c exists already. This was leftovers from the initial branch work. Reported by: kib Deleted: head/lib/libc/powerpcspe/sys/ptrace.S Modified: head/lib/libc/powerpcspe/sys/Makefile.inc Modified: head/lib/libc/powerpcspe/sys/Makefile.inc == --- head/lib/libc/powerpcspe/sys/Makefile.inc Sat Oct 22 13:09:30 2016 (r307770) +++ head/lib/libc/powerpcspe/sys/Makefile.inc Sat Oct 22 13:11:09 2016 (r307771) @@ -1,6 +1,6 @@ # $FreeBSD$ -MDASM+=brk.S cerror.S exect.S ptrace.S sbrk.S setlogin.S +MDASM+=brk.S cerror.S exect.S sbrk.S setlogin.S # Don't generate default code for these syscalls: NOASM= break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307770 - stable/11
Author: bapt Date: Sat Oct 22 13:09:30 2016 New Revision: 307770 URL: https://svnweb.freebsd.org/changeset/base/307770 Log: MFC: 306864,307648 Groff is needed only if MK_GROFF and MK_SHAREDOCS are both true. Modified: stable/11/Makefile.inc1 Modified: stable/11/Makefile.inc1 == --- stable/11/Makefile.inc1 Sat Oct 22 11:26:22 2016(r307769) +++ stable/11/Makefile.inc1 Sat Oct 22 13:09:30 2016(r307770) @@ -1570,7 +1570,7 @@ _strfile= usr.bin/fortune/strfile _gperf=gnu/usr.bin/gperf .endif -.if ${MK_GROFF} != "no" +.if ${MK_SHAREDOCS} != "no" && ${MK_GROFF} != "no" _groff=gnu/usr.bin/groff \ usr.bin/soelim .endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r307761 - in head: . contrib/binutils/bfd contrib/gcc/config/rs6000 gnu/lib/libgcc gnu/lib/libgomp gnu/usr.bin/binutils gnu/usr.bin/cc gnu/usr.bin/cc/cc_tools gnu/usr.bin/cc/include gn
On Sat, Oct 22, 2016 at 03:20:17PM +0300, Konstantin Belousov wrote: > On Sat, Oct 22, 2016 at 01:57:15AM +, Justin Hibbits wrote: > > Author: jhibbits > > Date: Sat Oct 22 01:57:15 2016 > > New Revision: 307761 > > URL: https://svnweb.freebsd.org/changeset/base/307761 > > > > Log: > > Create a new MACHINE_ARCH for Freescale PowerPC e500v2 > > > Added: > > head/lib/libc/powerpcspe/sys/ptrace.S (contents, props changed) > > This is not needed, libc provides MI implementation in libc/sys/ptrace.c. Why the decision to copy whole lib/libc/powerpc to lib/libc/powerpcspe was used to create the architecture ? I did a primitive-science overview, and got total ~2300 lines in lib/libc/powerpcspe, while $ diff -Nrua lib/libc/powerpc lib/libc/powerpcspe | diffstat -p0 | tail -1 16 files changed, 240 insertions(+), 174 deletions(-) It seems to be possible to only create several new files, like *setjmp.S and fp*.c, and reuse existing stock files from libc/powerpc for anything else. I am the one who does most of the sweeping changes over libc, and I am somewhat saddened by addition of almost identical copy of the existing architecture files which need to be maintained together with the original. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r307761 - in head: . contrib/binutils/bfd contrib/gcc/config/rs6000 gnu/lib/libgcc gnu/lib/libgomp gnu/usr.bin/binutils gnu/usr.bin/cc gnu/usr.bin/cc/cc_tools gnu/usr.bin/cc/include gn
On Sat, Oct 22, 2016 at 01:57:15AM +, Justin Hibbits wrote: > Author: jhibbits > Date: Sat Oct 22 01:57:15 2016 > New Revision: 307761 > URL: https://svnweb.freebsd.org/changeset/base/307761 > > Log: > Create a new MACHINE_ARCH for Freescale PowerPC e500v2 > Added: > head/lib/libc/powerpcspe/sys/ptrace.S (contents, props changed) This is not needed, libc provides MI implementation in libc/sys/ptrace.c. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r307003 - head/contrib/mdocml
On 10 October 2016 at 19:09, Ed Mastewrote: > Author: emaste > Date: Mon Oct 10 19:09:35 2016 > New Revision: 307003 > URL: https://svnweb.freebsd.org/changeset/base/307003 > > Log: > makewhatis: make output reproducible Several of us discussed this issue at the FreeBSD Developer Summit prior to FOSDEM 2016, and des@ later added to the wiki a description of the approach taken by this commit; I'm sorry that wasn't mentioned in the commit message. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r307769 - head/usr.sbin/daemon
Author: jilles Date: Sat Oct 22 11:26:22 2016 New Revision: 307769 URL: https://svnweb.freebsd.org/changeset/base/307769 Log: daemon: Allow logging daemon stdout/stderr to file or syslog. There are various new options, documented in the man page, to send the daemon's standard output and/or standard error to a file or to syslog. Submitted by: ank at iki.fi Reviewed by: wblock (man page only) Relnotes: yes Differential Revision:https://reviews.freebsd.org/D7993 Modified: head/usr.sbin/daemon/daemon.8 head/usr.sbin/daemon/daemon.c Modified: head/usr.sbin/daemon/daemon.8 == --- head/usr.sbin/daemon/daemon.8 Sat Oct 22 08:00:46 2016 (r307768) +++ head/usr.sbin/daemon/daemon.8 Sat Oct 22 11:26:22 2016 (r307769) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 2, 2016 +.Dd October 22, 2016 .Dt DAEMON 8 .Os .Sh NAME @@ -34,11 +34,16 @@ .Nd run detached from the controlling terminal .Sh SYNOPSIS .Nm -.Op Fl cfr +.Op Fl cfrS .Op Fl p Ar child_pidfile .Op Fl P Ar supervisor_pidfile .Op Fl t Ar title .Op Fl u Ar user +.Op Fl m Ar output_mask +.Op Fl o Ar output_file +.Op Fl s Ar syslog_priority +.Op Fl T Ar syslog_tag +.Op Fl s Ar syslog_facility .Ar command arguments ... .Sh DESCRIPTION The @@ -46,6 +51,8 @@ The utility detaches itself from the controlling terminal and executes the program specified by its arguments. Privileges may be lowered to the specified user. +The output of the daemonized process may be redirected to syslog and to a +log file. .Pp The options are as follows: .Bl -tag -width indent @@ -55,6 +62,19 @@ Change the current working directory to .It Fl f Redirect standard input, standard output and standard error to .Pa /dev/null . +.It Fl S +Enable syslog output. +This is implicitly applied if other syslog parameters are provided. +The default values are daemon, notice, and daemon for facility, priority, and +tag, respectively. +.It Fl o Ar output_file +Append output from the daemonized process to +.Pa output_file . +If the file does not exist, it is created with permissions 0600. +.It Fl m Ar output_mask +Redirect output from the child process stdout (1), stderr (2), or both (3). +This value specifies what is sent to syslog and the log file. +The default is 3. .It Fl p Ar child_pidfile Write the ID of the created process into the .Ar child_pidfile @@ -96,18 +116,37 @@ option is used or not. .It Fl r Supervise and restart the program if it has been terminated. .It Fl t Ar title -Process title for the daemon to make it easily identifiable. +Set the title for the daemon process. +The default is the daemonized invocation. .It Fl u Ar user Login name of the user to execute the program under. Requires adequate superuser privileges. +.It Fl s Ar syslog_priority +These priorities are accepted: emerg, alert, crit, err, warning, +notice, info, and debug. +The default is info. +.It Fl l Ar syslog_facility +These facilities are accepted: auth, authpriv, console, cron, daemon, +ftp, kern, lpr, mail, news, ntp, security, syslog, user, uucp, and +local0, ..., local7. +The default is daemon. +.It Fl T Ar syslog_tag +Set the tag which is appended to all syslog messages. +The default is daemon. .El .Pp -If the +If any of the options .Fl p , -.Fl P +.Fl P , +.Fl r , +.Fl o , +.Fl s , +.Fl T , +.Fl m , +.Fl S , or -.Fl r -option is specified the program is executed in a spawned child process. +.Fl l +are specified, the program is executed in a spawned child process. The .Nm waits until it terminates to keep the pid file(s) locked and removes them @@ -119,6 +158,13 @@ spawned process. Normally it will cause the child to exit, remove the pidfile(s) and then terminate. .Pp +If neither file or syslog output are selected, all output is redirected to the +.Nm +process and written to stdout. +The +.Fl f +option may be used to suppress the stdout output completely. +.Pp The .Fl P option is useful combined with the @@ -145,13 +191,21 @@ library routine, 2 if or .Ar supervisor_pidfile is requested, but cannot be opened, 3 if process is already running (pidfile -exists and is locked), -otherwise 0. +exists and is locked), 4 if +.Ar syslog_priority +is not accepted, 5 if +.Ar syslog_facility +is not accepted, 6 if +.Ar output_mask +is not within the accepted range, 7 if +.Ar output_file +cannot be opened for appending, and otherwise 0. .Sh DIAGNOSTICS -If the command cannot be executed, an error message is displayed on -standard error unless the +If the command cannot be executed, an error message is printed to +standard error. +The exact behavior depends on the logging parameters and the .Fl f -flag is specified. +flag. .Sh SEE ALSO .Xr setregid 2 , .Xr setreuid 2 , Modified: head/usr.sbin/daemon/daemon.c == --- head/usr.sbin/daemon/daemon.c Sat
svn commit: r307768 - in head: share/man/man4 sys/conf sys/dev/jedec_ts sys/modules/i2c sys/modules/i2c/jedec_ts
Author: avg Date: Sat Oct 22 08:00:46 2016 New Revision: 307768 URL: https://svnweb.freebsd.org/changeset/base/307768 Log: jedec_ts: a driver for thermal sensors on memory modules The driver currently supports chips that are fully compliant with the JEDEC SPD / EEPROM / TS standard (JEDEC Standard 21-C, TSE2002 Specification, frequenlty referred to as JEDEC JC 42.4). Additionally some chips from STMicroelectronics are supported as well. They are compliant except for their Device ID pattern. Given the continued lack of any common sensor infrastructure, the driver uses an ad-hoc sysctl to report the temperature. Reviewed by: wblock (documentation) MFC after:2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D8174 Added: head/share/man/man4/jedec_ts.4 (contents, props changed) head/sys/dev/jedec_ts/ head/sys/dev/jedec_ts/jedec_ts.c (contents, props changed) head/sys/modules/i2c/jedec_ts/ head/sys/modules/i2c/jedec_ts/Makefile (contents, props changed) Modified: head/sys/conf/NOTES head/sys/conf/files head/sys/modules/i2c/Makefile Added: head/share/man/man4/jedec_ts.4 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man4/jedec_ts.4 Sat Oct 22 08:00:46 2016 (r307768) @@ -0,0 +1,130 @@ +.\" +.\" Copyright (c) 2016 Andriy Gapon+.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd October 13, 2016 +.Dt JEDEC_TS 4 +.Os +.Sh NAME +.Nm jedec_ts +.Nd driver for temperature sensors on memory modules +.Sh SYNOPSIS +.Bd -ragged -offset indent +.Cd "device jedec_ts" +.Cd "device smbus" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +jedec_ts_load="YES" +.Ed +.Pp +In +.Pa /boot/device.hints : +.Bd -literal -offset indent +.Cd hint.jedec_ts.0.at="smbus0" +.Cd hint.jedec_ts.0.addr="0x30" +.Cd hint.jedec_ts.1.at="smbus0" +.Cd hint.jedec_ts.1.addr="0x32" +.Cd hint.jedec_ts.2.at="smbus0" +.Cd hint.jedec_ts.2.addr="0x34" +.Cd hint.jedec_ts.3.at="smbus0" +.Cd hint.jedec_ts.3.addr="0x36" +.Cd hint.jedec_ts.4.at="smbus0" +.Cd hint.jedec_ts.4.addr="0x38" +.Cd hint.jedec_ts.5.at="smbus0" +.Cd hint.jedec_ts.5.addr="0x3A" +.Cd hint.jedec_ts.6.at="smbus0" +.Cd hint.jedec_ts.6.addr="0x3C" +.Cd hint.jedec_ts.7.at="smbus0" +.Cd hint.jedec_ts.7.addr="0x3E" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides access to sensor data over the +.Xr smbus 4 . +The driver supports temperature sensors on memory modules that conform +to JEDEC Standard 21-C, TSE2002 Specification. +.Pp +The access to +.Nm +data is made via the +.Xr sysctl 8 +interface: +.Bl -tag -width "dev.jedec_ts.%d.temp" +.It Va dev.jedec_ts.%d.temp +read-only value of the current temperature read by the sensor. +.El +.Pp +On a system using +.Xr device.hints 5 , +these values are configurable for +.Nm : +.Bl -tag -width "hint.jedec_ts.%d.addr" +.It Va hint.jedec_ts.%d.at +target +.Xr smbus 4 . +.It Va hint.jedec_ts.%d.addr +.Nm +SMBus address on the +.Xr smbus 4 . +.El +.Pp +.Nm +temperature sensors can be wired to eight different addresses, +allowing up to eight sensors on the same +.Xr smbus 4 . +.Pp +If the sensors are on an I2C bus behind an +.Xr iicbus 4 +controller, then the +.Xr iicsmb 4 +bridge driver can be used to attach the +.Xr smbus 4 . +.Sh EXAMPLES +.Ss Sensor read out for two memory modules: +.Bd -literal +dev.jedec_ts.0.temp: 40.2500C +dev.jedec_ts.1.temp: 40.7500C +.Ed +.Sh SEE ALSO +.Xr iicbus 4 , +.Xr iicsmb 4 , +.Xr smbus 4 , +.Xr sysctl 8 +.Sh HISTORY