CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jun 25 06:30:13 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: xhci.c Log Message: Improve bInterval handling in xhci_configure_endpoint - should help keyboards. >From t-hash To generate a diff of this commit: cvs rdiff -u -r1.28.2.29 -r1.28.2.30 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/xhci.c diff -u src/sys/dev/usb/xhci.c:1.28.2.29 src/sys/dev/usb/xhci.c:1.28.2.30 --- src/sys/dev/usb/xhci.c:1.28.2.29 Tue Jun 23 12:22:35 2015 +++ src/sys/dev/usb/xhci.c Thu Jun 25 06:30:13 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci.c,v 1.28.2.29 2015/06/23 12:22:35 skrll Exp $ */ +/* $NetBSD: xhci.c,v 1.28.2.30 2015/06/25 06:30:13 skrll Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.29 2015/06/23 12:22:35 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.30 2015/06/25 06:30:13 skrll Exp $"); #include "opt_usb.h" @@ -1250,13 +1250,30 @@ xhci_configure_endpoint(struct usbd_pipe switch (xfertype) { case UE_INTERRUPT: - /* 6.2.3.6 */ + if (pipe->up_interval != USBD_DEFAULT_INTERVAL) + ival = pipe->up_interval; + + /* xHCI 6.2.3.6 Table 65, USB 2.0 9.6.6 */ if (speed == USB_SPEED_LOW || speed == USB_SPEED_FULL) { - ival = ival > 10 ? 10 : ival; - ival = ival < 3 ? 3 : ival; + int i; + + /* + * round ival down to "the nearest base 2 multiple of + * bInterval * 8". + * bInterval is at most 255 as its type is uByte. + * 255(ms) = 2040(x 125us) < 2^11, so start with 11. + */ + for (i = 11; i > 0; i--) { +if ((ival * 8) >= (1 << i)) + break; + } + ival = i; } else { - ival = ival > 15 ? 15 : ival; + /* Interval = bInterval-1 for SS/HS */ + ival--; } + DPRINTFN(4, "ival %u", ival, 0, 0, 0); + if (USB_IS_SS(speed)) { if (maxb > 0) mps = 1024; @@ -1279,12 +1296,11 @@ xhci_configure_endpoint(struct usbd_pipe break; #ifdef notyet case UE_ISOCHRONOUS: - if (speed == USB_SPEED_FULL) { - ival = ival > 18 ? 18 : ival; - ival = ival < 3 ? 3 : ival; - } else { - ival = ival > 15 ? 15 : ival; - } + if (speed == USB_SPEED_FULL) + ival += 3; /* 1ms -> 125us */ + ival--; + DPRINTFN(4, "ival %u", ival, 0, 0, 0); + if (USB_IS_SS(speed)) { mps = 1024; } else {
CVS commit: src/games/atc
Module Name:src Committed By: dholland Date: Thu Jun 25 05:33:02 UTC 2015 Modified Files: src/games/atc: extern.h graphics.c main.c update.c Log Message: Move game logic out of the file with the curses code. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/games/atc/extern.h cvs rdiff -u -r1.19 -r1.20 src/games/atc/graphics.c cvs rdiff -u -r1.23 -r1.24 src/games/atc/main.c cvs rdiff -u -r1.26 -r1.27 src/games/atc/update.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/atc/extern.h diff -u src/games/atc/extern.h:1.18 src/games/atc/extern.h:1.19 --- src/games/atc/extern.h:1.18 Fri Jun 19 06:02:31 2015 +++ src/games/atc/extern.h Thu Jun 25 05:33:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.18 2015/06/19 06:02:31 dholland Exp $ */ +/* $NetBSD: extern.h,v 1.19 2015/06/25 05:33:02 dholland Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -64,6 +64,13 @@ extern struct termios tty_start, tty_new extern DISPLACEMENT displacement[MAXDIR]; +/* in graphics.c */ +void shutdown_gr(void); +void ioaskquit(void); +void ionoquit(void); +void losermsg(const PLANE *p, const char *msg); + +/* misc */ void addplane(void); void append(LIST *, PLANE *); void check_adir(int, int, int); @@ -88,7 +95,6 @@ char name(const PLANE *); int number(int); void open_score_file(void); void planewin(void); -void quit(int); void redraw(void); void setup_screen(const C_SCREEN *); void update(int); Index: src/games/atc/graphics.c diff -u src/games/atc/graphics.c:1.19 src/games/atc/graphics.c:1.20 --- src/games/atc/graphics.c:1.19 Fri Jun 19 06:02:31 2015 +++ src/games/atc/graphics.c Thu Jun 25 05:33:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: graphics.c,v 1.19 2015/06/19 06:02:31 dholland Exp $ */ +/* $NetBSD: graphics.c,v 1.20 2015/06/25 05:33:02 dholland Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)graphics.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: graphics.c,v 1.19 2015/06/19 06:02:31 dholland Exp $"); +__RCSID("$NetBSD: graphics.c,v 1.20 2015/06/25 05:33:02 dholland Exp $"); #endif #endif /* not lint */ @@ -136,6 +136,15 @@ init_gr(void) } void +shutdown_gr(void) +{ + (void)clear(); /* move to top of screen */ + (void)refresh(); + (void)fflush(stdout); + (void)endwin(); +} + +void setup_screen(const C_SCREEN *scp) { int i, j; @@ -293,43 +302,25 @@ ioerror(int pos, int len, const char *st (void)fflush(stdout); } -/* ARGSUSED */ +static int ioquit_x, ioquit_y; + void -quit(int dummy __unused) +ioaskquit(void) { - int c, y, x; -#ifdef BSD - struct itimerval itv; -#endif - - getyx(input, y, x); + getyx(input, ioquit_y, ioquit_x); (void)wmove(input, 2, 0); (void)waddstr(input, "Really quit? (y/n) "); (void)wclrtobot(input); (void)wrefresh(input); (void)fflush(stdout); +} - c = getchar(); - if (c == EOF || c == 'y') { - /* disable timer */ -#ifdef BSD - itv.it_value.tv_sec = 0; - itv.it_value.tv_usec = 0; - (void)setitimer(ITIMER_REAL, &itv, NULL); -#endif -#ifdef SYSV - alarm(0); -#endif - (void)fflush(stdout); - (void)clear(); - (void)refresh(); - (void)endwin(); - (void)log_score(0); - exit(0); - } +void +ionoquit(void) +{ (void)wmove(input, 2, 0); (void)wclrtobot(input); - (void)wmove(input, y, x); + (void)wmove(input, ioquit_y, ioquit_x); (void)wrefresh(input); (void)fflush(stdout); } @@ -378,42 +369,20 @@ planewin(void) } void -loser(const PLANE *p, const char *s) +losermsg(const PLANE *p, const char *msg) { - int c; -#ifdef BSD - struct itimerval itv; -#endif - - /* disable timer */ -#ifdef BSD - itv.it_value.tv_sec = 0; - itv.it_value.tv_usec = 0; - (void)setitimer(ITIMER_REAL, &itv, NULL); -#endif -#ifdef SYSV - alarm(0); -#endif - (void)wmove(input, 0, 0); (void)wclrtobot(input); /* p may be NULL if we ran out of memory */ if (p == NULL) (void)wprintw(input, "%s\n\nHit space for top players list...", - s); + msg); else { - (void)wprintw(input, "Plane '%c' %s\n\n", name(p), s); + (void)wprintw(input, "Plane '%c' %s\n\n", name(p), msg); (void)wprintw(input, "Hit space for top players list..."); } (void)wrefresh(input); (void)fflush(stdout); - while ((c = getchar()) != EOF && c != ' ') - ; - (void)clear(); /* move to top of screen */ - (void)refresh(); - (void)endwin(); - (void)log_score(0); - exit(0); } void Index: src/games/atc/main.c diff -u src/games/atc/main.c:1.23 src/games/atc/main.c:1.24 --- src/games/atc/main.c:1.23 Fri Jun 19 06:02:31 2015 +++ src/games/atc/main.c Thu Jun 25 05:33:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.23 2015/06/19 06:02:31 dholland Exp $ */ +/* $NetBSD: main.c,v 1.24 2015/06/25 05:33:02 dholland Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -51,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 19 #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCS
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: matt Date: Thu Jun 25 05:30:48 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: mi shl.mi Log Message: More compat changes. Add compat dirs to each set. To generate a diff of this commit: cvs rdiff -u -r1.1966 -r1.1967 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.165 -r1.166 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xdebug/mi cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xdebug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1966 src/distrib/sets/lists/comp/mi:1.1967 --- src/distrib/sets/lists/comp/mi:1.1966 Mon Jun 22 06:02:02 2015 +++ src/distrib/sets/lists/comp/mi Thu Jun 25 05:30:47 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1966 2015/06/22 06:02:02 matt Exp $ +# $NetBSD: mi,v 1.1967 2015/06/25 05:30:47 matt Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3475,6 +3475,7 @@ ./usr/include/wordexp.hcomp-c-include ./usr/include/zconf.hcomp-c-include ./usr/include/zlib.hcomp-c-include +./usr/lib base-sys-usr compatdir ./usr/lib/crt0.ocomp-c-lib compatfile ./usr/lib/gcrt0.ocomp-c-lib compatfile ./usr/lib/i18n/libBIG5.a comp-i18n-lib compatfile Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.118 src/distrib/sets/lists/debug/mi:1.119 --- src/distrib/sets/lists/debug/mi:1.118 Mon Jun 22 19:10:13 2015 +++ src/distrib/sets/lists/debug/mi Thu Jun 25 05:30:48 2015 @@ -1,6 +1,7 @@ -# $NetBSD: mi,v 1.118 2015/06/22 19:10:13 christos Exp $ +# $NetBSD: mi,v 1.119 2015/06/25 05:30:48 matt Exp $ ./etc/mtree/set.debug comp-sys-root +./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile ./usr/lib/i18n/libDECHanyu_g.a comp-c-debuglib debuglib,compatfile ./usr/lib/i18n/libEUCTW_g.a comp-c-debuglib debuglib,compatfile Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.101 src/distrib/sets/lists/debug/shl.mi:1.102 --- src/distrib/sets/lists/debug/shl.mi:1.101 Wed Jun 24 16:10:54 2015 +++ src/distrib/sets/lists/debug/shl.mi Thu Jun 25 05:30:48 2015 @@ -1,4 +1,5 @@ -# $NetBSD: shl.mi,v 1.101 2015/06/24 16:10:54 matt Exp $ +# $NetBSD: shl.mi,v 1.102 2015/06/25 05:30:48 matt Exp $ +./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libc.so.12.197.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot @@ -26,6 +27,7 @@ ./usr/libdata/debug/lib/npf/ext_normalize.so.0.0.debug comp-sys-debug debug,compatfile,npf ./usr/libdata/debug/lib/npf/ext_rndblock.so.0.0.debug comp-sys-debug debug,compatfile,npf ./usr/libdata/debug/libexec/ld.elf_so.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/usr/lib base-sys-usr debug,compatdir ./usr/libdata/debug/usr/lib/i18n/libBIG5.so.5.0.debug comp-i18n-debug debug,compatfile ./usr/libdata/debug/usr/lib/i18n/libDECHanyu.so.5.0.debug comp-i18n-debug debug,compatfile ./usr/libdata/debug/usr/lib/i18n/libEUC.so.5.0.debug comp-i18n-debug debug,compatfile Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.165 src/distrib/sets/lists/xcomp/mi:1.166 --- src/distrib/sets/lists/xcomp/mi:1.165 Wed Jun 24 22:20:25 2015 +++ src/distrib/sets/lists/xcomp/mi Thu Jun 25 05:30:48 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.165 2015/06/24 22:20:25 matt Exp $ +# $NetBSD: mi,v 1.166 2015/06/25 05:30:48 matt Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -6050,6 +6050,7 @@ ./usr/X11R7/include/xorg/xsha1.h -unknown- xorg ./usr/X11R7/include/xorg/xvdix.h -unknown- xorg ./usr/X11R7/include/xorg/xvmcext.h -unknown- xorg +./usr/X11R7/lib -unknown- xorg,compatdir ./usr/X11R7/lib/X11/config/Amoeba.cf -unknown- xorg ./usr/X11R7/lib/X11/config/DGUX.cf -unknown- xorg ./usr/X11R7/lib/X11/config/FreeBSD.cf -unknown- xorg Index: src/distrib/sets/lists/xdebug/mi diff -u src/distrib/sets/lists/xdebug/mi:1.13 src/distrib/sets/lists/xdebug/mi:1.14 --- src/distrib/sets/lists/xdebug/mi:1.13 Mon Feb 23 13:12:37 2015 +++ src/distrib/sets/lists/xdebug/mi Thu Jun 25 05:30:48 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.13 2015/02/23 13:12:37 martin Exp $ +# $NetBSD: mi,v 1.14 2015/06/25 05:30:48 matt Exp $ ./etc/mtree/set.xdebug comp-sys-root ./usr/X11R6/lib/libFS_g.a-unkn
CVS commit: src/distrib/sets
Module Name:src Committed By: matt Date: Thu Jun 25 05:27:00 UTC 2015 Modified Files: src/distrib/sets: sets.subr Log Message: Don't add duplicate compat paths To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/sets.subr diff -u src/distrib/sets/sets.subr:1.167 src/distrib/sets/sets.subr:1.168 --- src/distrib/sets/sets.subr:1.167 Tue Jun 23 00:58:16 2015 +++ src/distrib/sets/sets.subr Thu Jun 25 05:27:00 2015 @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.167 2015/06/23 00:58:16 matt Exp $ +# $NetBSD: sets.subr,v 1.168 2015/06/25 05:27:00 matt Exp $ # # @@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g # In each file, a record consists of a path and a System Package name, # separated by whitespace. E.g., # -# # $NetBSD: sets.subr,v 1.167 2015/06/23 00:58:16 matt Exp $ +# # $NetBSD: sets.subr,v 1.168 2015/06/25 05:27:00 matt Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root @@ -418,7 +418,11 @@ list_set_files() if (iscompatfile) { emitcompat[$1] = 1; -next; +next + } + for (d in cpaths) { +if (cpaths[d] == $1 "/") + next } cpaths[ncpaths++] = $1 "/" for (d in compatarchdirs) {
CVS commit: src/external/mit/xorg/tools/makekeys
Module Name:src Committed By: matt Date: Thu Jun 25 01:38:09 UTC 2015 Modified Files: src/external/mit/xorg/tools/makekeys: Makefile Log Message: Make this work without a populated X11 include heirarchy. It's ugly but it works. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makekeys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/tools/makekeys/Makefile diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.2 src/external/mit/xorg/tools/makekeys/Makefile:1.3 --- src/external/mit/xorg/tools/makekeys/Makefile:1.2 Wed Jun 24 22:20:25 2015 +++ src/external/mit/xorg/tools/makekeys/Makefile Thu Jun 25 01:38:09 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/06/24 22:20:25 matt Exp $ +# $NetBSD: Makefile,v 1.3 2015/06/25 01:38:09 matt Exp $ NOMAN= 1 @@ -8,7 +8,31 @@ NOMAN= 1 PROG?= makekeys SRCS= makekeys.c +.if !make(obj) && !exists(${DESTDIR}${X11INCDIR}/X.h) +CLEANFILES+= X11 +CPPFLAGS+= -I. +XPINCS= X.h Xarch.h Xos.h Xosdefs.h keysymdef.h +X11INCS= Xlib.h Xresource.h +CLEANFILES+= ${XPINCS} ${X11INCS} Xfuncproto.h +.BEGIN: + @rm -f X11 && ln -s . X11 +.for i in ${XPINCS} + @rm -f $i && ln -s ${X11SRCDIR.xproto}/$i . +.endfor +.for i in ${X11INCS} + @rm -f $i && ln -s ${X11SRCDIR.X11}/include/X11/$i . +.endfor + +Xfuncproto.h: ${X11SRCDIR.xproto}/Xfuncproto.h.in + ${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/' \ + -e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \ + < ${.ALLSRC} > ${.TARGET} + +makekeys.lo makekeys.o makekeys.d: Xfuncproto.h + +.else CPPFLAGS+= -I${DESTDIR}${X11INCDIR} +.endif .include .include
CVS commit: src
Module Name:src Committed By: matt Date: Wed Jun 24 22:20:26 UTC 2015 Modified Files: src: Makefile src/compat: compatsubdir.mk src/compat/amd64/i386: bsd.i386.mk src/compat/arm/eabi: bsd.eabi.mk src/compat/arm/eabihf: bsd.eabihf.mk src/compat/arm/oabi: bsd.oabi.mk src/compat/mips64/o32: bsd.o32.mk src/compat/powerpc64/powerpc: bsd.powerpc.mk src/compat/riscv64/rv32: bsd.rv32.mk src/compat/sparc64/sparc: bsd.sparc.mk src/distrib/sets/lists/xbase: md.amd64 mi shl.mi src/distrib/sets/lists/xcomp: md.amd64 mi shl.mi src/distrib/sets/lists/xdebug: md.amd64 shl.mi src/etc/mtree: Makefile src/external/mit/xorg/lib: Makefile src/external/mit/xorg/lib/libpciaccess: Makefile src/external/mit/xorg/tools: Makefile src/external/mit/xorg/tools/makekeys: Makefile Makefile.makekeys src/external/mit/xorg/tools/makestrs: Makefile Makefile.makestrs src/share/mk: bsd.own.mk bsd.x11.mk src/tools: Makefile Added Files: src/etc/mtree: NetBSD.dist.xcompat.in src/tools/makekeys: Makefile src/tools/makestrs: Makefile Log Message: Support building the xorg X11 libraries under MKCOMPAT. Add XORG_MACHINE_ARCH to compat's bsd.*.mk Turn xorg makekeys and makestrs into real host tools which are installed into ${TOOLSDIR} To generate a diff of this commit: cvs rdiff -u -r1.313 -r1.314 src/Makefile cvs rdiff -u -r1.10 -r1.11 src/compat/compatsubdir.mk cvs rdiff -u -r1.5 -r1.6 src/compat/amd64/i386/bsd.i386.mk cvs rdiff -u -r1.3 -r1.4 src/compat/arm/eabi/bsd.eabi.mk cvs rdiff -u -r1.2 -r1.3 src/compat/arm/eabihf/bsd.eabihf.mk cvs rdiff -u -r1.3 -r1.4 src/compat/arm/oabi/bsd.oabi.mk cvs rdiff -u -r1.12 -r1.13 src/compat/mips64/o32/bsd.o32.mk cvs rdiff -u -r1.3 -r1.4 src/compat/powerpc64/powerpc/bsd.powerpc.mk cvs rdiff -u -r1.1 -r1.2 src/compat/riscv64/rv32/bsd.rv32.mk cvs rdiff -u -r1.5 -r1.6 src/compat/sparc64/sparc/bsd.sparc.mk cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xbase/md.amd64 cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xcomp/md.amd64 \ src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.164 -r1.165 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.25 -r1.26 src/etc/mtree/Makefile cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.xcompat.in cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libpciaccess/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/makekeys/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/tools/makekeys/Makefile.makekeys cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/makestrs/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/tools/makestrs/Makefile.makestrs cvs rdiff -u -r1.857 -r1.858 src/share/mk/bsd.own.mk cvs rdiff -u -r1.115 -r1.116 src/share/mk/bsd.x11.mk cvs rdiff -u -r1.180 -r1.181 src/tools/Makefile cvs rdiff -u -r0 -r1.1 src/tools/makekeys/Makefile cvs rdiff -u -r0 -r1.1 src/tools/makestrs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/Makefile diff -u src/Makefile:1.313 src/Makefile:1.314 --- src/Makefile:1.313 Sun May 3 15:13:13 2015 +++ src/Makefile Wed Jun 24 22:20:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.313 2015/05/03 15:13:13 martin Exp $ +# $NetBSD: Makefile,v 1.314 2015/06/24 22:20:24 matt Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -485,6 +485,9 @@ do-x11: .PHONY .MAKE .if ${X11FLAVOUR} == "Xorg" ${MAKEDIRTARGET} external/mit/xorg/tools all ${MAKEDIRTARGET} external/mit/xorg/lib build_install +.if ${MKCOMPAT} != "no" + ${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../external/mit/xorg/lib" +.endif .else ${MAKEDIRTARGET} x11 build .endif Index: src/compat/compatsubdir.mk diff -u src/compat/compatsubdir.mk:1.10 src/compat/compatsubdir.mk:1.11 --- src/compat/compatsubdir.mk:1.10 Mon Jun 22 00:11:33 2015 +++ src/compat/compatsubdir.mk Wed Jun 24 22:20:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: compatsubdir.mk,v 1.10 2015/06/22 00:11:33 matt Exp $ +# $NetBSD: compatsubdir.mk,v 1.11 2015/06/24 22:20:24 matt Exp $ # Build netbsd libraries. @@ -30,7 +30,10 @@ SUBDIR+= ../../../tests SUBDIR+= ../../../tests/share # because MKSHARE=no above SUBDIR+= ../../../external/bsd/atf/tests .endif -.endif +.if ${MKX11} != no && ${X11FLAVOUR} == "Xorg" && make(obj) +SUBDIR+= ../../../external/mit/xorg/lib +.endif # } MKX11 +.endif # } BOOTSTRAP_SUBDIRS .include Index: src/compat
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Wed Jun 24 19:46:30 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: pci.h Log Message: Fix type of pd_rom_found_size: it's a size, not a handle. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/include/linux/pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/include/linux/pci.h diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.18 src/sys/external/bsd/drm2/include/linux/pci.h:1.19 --- src/sys/external/bsd/drm2/include/linux/pci.h:1.18 Wed Jun 24 18:20:36 2015 +++ src/sys/external/bsd/drm2/include/linux/pci.h Wed Jun 24 19:46:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pci.h,v 1.18 2015/06/24 18:20:36 riastradh Exp $ */ +/* $NetBSD: pci.h,v 1.19 2015/06/24 19:46:30 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -127,7 +127,7 @@ struct pci_dev { bus_space_handle_t pd_rom_bsh; bus_size_t pd_rom_size; bus_space_handle_t pd_rom_found_bsh; - bus_space_handle_t pd_rom_found_size; + bus_size_t pd_rom_found_size; void *pd_rom_vaddr; device_t pd_dev; struct drm_device *pd_drm_dev; /* XXX Nouveau kludge! */
CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon
Module Name:src Committed By: riastradh Date: Wed Jun 24 18:23:23 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c Log Message: Use bus_space_read rather than kmemdup to read ROM. jakllsch@ reports that on some 64-bit systems, kmemdup does 8-byte reads, which yield garbage in the high word. bus_space_read_region_1 does 1-byte reads instead, which seem to work. Derived from a patch from jakllsch@. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.4 --- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.3 Sat Jun 13 18:18:18 2015 +++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Wed Jun 24 18:23:23 2015 @@ -116,6 +116,31 @@ static bool radeon_read_bios(struct rade return false; } +#ifdef __NetBSD__ + /* + * Using kmemdup results in >4-byte memory access on 64-bit + * systems, which yields bogus answers on some devices. So we + * use bus_space(9) to do guaranteed byte access with + * bus_space_read_region_1 which seems to work better. + */ +{ + const bus_space_tag_t bst = rdev->pdev->pd_rom_bst; + const bus_space_handle_t bsh = rdev->pdev->pd_rom_found_bsh; + + if (size == 0 || + bus_space_read_1(bst, bsh, 0) != 0x55 || + bus_space_read_1(bst, bsh, 1) != 0xaa) { + pci_unmap_rom(rdev->pdev, bios); + return false; + } + rdev->bios = kmalloc(size, GFP_KERNEL); + if (rdev->bios == NULL) { + pci_unmap_rom(rdev->pdev, bios); + return false; + } + bus_space_read_region_1(bst, bsh, 0, rdev->bios, size); +} +#else if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) { pci_unmap_rom(rdev->pdev, bios); return false; @@ -125,6 +150,7 @@ static bool radeon_read_bios(struct rade pci_unmap_rom(rdev->pdev, bios); return false; } +#endif pci_unmap_rom(rdev->pdev, bios); return true; }
CVS commit: src/sys/external/bsd/drm2/include/linux
Module Name:src Committed By: riastradh Date: Wed Jun 24 18:20:36 UTC 2015 Modified Files: src/sys/external/bsd/drm2/include/linux: pci.h Log Message: Save the location of the found ROM so caller can bus_space_read it. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/include/linux/pci.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/include/linux/pci.h diff -u src/sys/external/bsd/drm2/include/linux/pci.h:1.17 src/sys/external/bsd/drm2/include/linux/pci.h:1.18 --- src/sys/external/bsd/drm2/include/linux/pci.h:1.17 Mon Apr 6 02:29:18 2015 +++ src/sys/external/bsd/drm2/include/linux/pci.h Wed Jun 24 18:20:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pci.h,v 1.17 2015/04/06 02:29:18 riastradh Exp $ */ +/* $NetBSD: pci.h,v 1.18 2015/06/24 18:20:36 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -126,6 +126,8 @@ struct pci_dev { bus_space_tag_t pd_rom_bst; bus_space_handle_t pd_rom_bsh; bus_size_t pd_rom_size; + bus_space_handle_t pd_rom_found_bsh; + bus_space_handle_t pd_rom_found_size; void *pd_rom_vaddr; device_t pd_dev; struct drm_device *pd_drm_dev; /* XXX Nouveau kludge! */ @@ -504,8 +506,6 @@ pci_map_rom_md(struct pci_dev *pdev) static inline void __pci_rom_iomem * pci_map_rom(struct pci_dev *pdev, size_t *sizep) { - bus_space_handle_t bsh; - bus_size_t size; KASSERT(!ISSET(pdev->pd_kludges, NBPCI_KLUDGE_MAP_ROM)); @@ -519,14 +519,16 @@ pci_map_rom(struct pci_dev *pdev, size_t /* XXX This type is obviously wrong in general... */ if (pci_find_rom(&pdev->pd_pa, pdev->pd_rom_bst, pdev->pd_rom_bsh, - pdev->pd_rom_size, PCI_ROM_CODE_TYPE_X86, &bsh, &size)) { + pdev->pd_rom_size, PCI_ROM_CODE_TYPE_X86, + &pdev->pd_rom_found_bsh, &pdev->pd_rom_found_size)) { pci_unmap_rom(pdev, NULL); return NULL; } - KASSERT(size <= SIZE_T_MAX); - *sizep = size; - pdev->pd_rom_vaddr = bus_space_vaddr(pdev->pd_rom_bst, bsh); + KASSERT(pdev->pd_rom_found_size <= SIZE_T_MAX); + *sizep = pdev->pd_rom_found_size; + pdev->pd_rom_vaddr = bus_space_vaddr(pdev->pd_rom_bst, + pdev->pd_rom_found_bsh); return pdev->pd_rom_vaddr; }
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: matt Date: Wed Jun 24 16:10:54 UTC 2015 Modified Files: src/distrib/sets/lists/debug: shl.mi Log Message: Tag libgcc.so.debug with gcc To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.100 src/distrib/sets/lists/debug/shl.mi:1.101 --- src/distrib/sets/lists/debug/shl.mi:1.100 Mon Jun 22 06:02:02 2015 +++ src/distrib/sets/lists/debug/shl.mi Wed Jun 24 16:10:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.100 2015/06/22 06:02:02 matt Exp $ +# $NetBSD: shl.mi,v 1.101 2015/06/24 16:10:54 matt Exp $ ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libc.so.12.197.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot @@ -7,7 +7,7 @@ ./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libedit.so.3.1.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libevent.so.4.0.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libgcc_s.so.1.0.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libgcc_s.so.1.0.debug comp-sys-debug debug,dynamicroot,gcc ./usr/libdata/debug/lib/libipsec.so.3.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libkvm.so.6.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/liblzf.so.1.0.debug comp-sys-debug debug,dynamicroot
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: mrg Date: Wed Jun 24 14:29:51 UTC 2015 Modified Files: src/external/gpl3/gcc/dist/gcc: ChangeLog Log Message: merge GCC 4.8.5 (round two) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/dist/gcc/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/ChangeLog diff -u src/external/gpl3/gcc/dist/gcc/ChangeLog:1.11 src/external/gpl3/gcc/dist/gcc/ChangeLog:1.12 --- src/external/gpl3/gcc/dist/gcc/ChangeLog:1.11 Thu Jan 15 08:42:14 2015 +++ src/external/gpl3/gcc/dist/gcc/ChangeLog Wed Jun 24 14:29:51 2015 @@ -1,3 +1,1085 @@ +2015-06-23 Release Manager + + * GCC 4.8.5 released. + +2015-06-23 Richard Biener + + * cpp.texi: Update displayed copyright years. + * cppinternals.texi: Likewise. + * gcc.texi: Likewise. + * gccint.texi: Likewise. + * gcov.texi: Likewise. + * install.texi: Likewise. + * invoke.texi: Likewise. + * gcc.c: Likewise. + * gcov-dump.c: Likewise. + * gcov.c: Likewise. + +2015-06-18 Richard Biener + + Backport from mainline + 2014-12-04 Marek Polacek + + PR middle-end/56917 + * fold-const.c (fold_unary_loc): Perform the negation in A's type + when transforming ~ (A - 1) or ~ (A + -1) to -A. + +2015-06-18 Jakub Jelinek + + PR tree-optimization/66233 + * fold-const.c (fold_unary_loc): Don't handle vector types. + Simplify. + * tree-ssa-forwprop.c (combine_conversions): Likewise. + +2015-06-16 Richard Biener + + Revert + 2015-06-01 Richard Biener + + Backport from mainline + 2015-05-26 Michael Matz + + PR middle-end/66251 + * tree-vect-stmts.c (vect_create_vectorized_demotion_stmts): Always set + STMT_VINFO_VEC_STMT, also with SLP. + + 2015-05-22 Richard Biener + + PR tree-optimization/66251 + * tree-vect-stmts.c (vectorizable_conversion): Properly + set STMT_VINFO_VEC_STMT even for the SLP case. + +2015-06-16 Christophe Lyon + + Backported from mainline r217076. + 2014-11-04 Michael Collison + + * config/aarch64/iterators.md (lconst_atomic): New mode attribute + to support constraints for CONST_INT in atomic operations. + * config/aarch64/atomics.md + (atomic_): Use lconst_atomic constraint. + (atomic_nand): Likewise. + (atomic_fetch_): Likewise. + (atomic_fetch_nand): Likewise. + (atomic__fetch): Likewise. + (atomic_nand_fetch): Likewise. + +2015-06-12 Michael Matz + + Backported from mainline + 2014-10-23 Jakub Jelinek + + PR debug/63623 + * var-tracking.c (stack_adjust_offset_pre_post_cb): New function. + (stack_adjust_offset_pre_post): Use it through for_each_inc_dec, + instead of only handling autoinc in dest if it is a MEM. + +2015-06-12 Jakub Jelinek + + Backported from mainline + 2014-12-15 Vladimir Makarov + + PR target/62642 + * ira.c (rtx_moveable_p): Prevent UNSPEC_VOLATILE moves. + +2015-06-12 Jakub Jelinek + + PR middle-end/63608 + Backported from mainline + 2014-05-16 Eric Botcazou + + * fold-const (fold_unary_loc) : New case. + : Pass arg0 instead of op0 to fold_convert_const. + +2015-06-11 John David Anglin + + * config/pa/pa.c (pa_output_global_address): Handle LABEL_REF plus + CONST_INT for goto. + +2015-06-11 Richard Biener + + Backport from mainline, guarded with in_lto_p + 2015-06-02 Richard Biener + + PR debug/65549 + * dwarf2out.c (lookup_context_die): New function. + (resolve_addr): Avoid forcing a full DIE for the + target of a DW_TAG_GNU_call_site during late compilation. + Instead create a stub DIE without a type if we have a + context DIE present. + + Backport from mainline + 2014-04-04 Jan Hubicka + + PR ipa/59626 + * ipa.c (process_references, symtab_remove_unreachable_nodes): + Drop bodies of always inline after early inlining. + (symtab_remove_unreachable_nodes): Remove always_inline attribute. + +2015-06-10 Michael Meissner + + Backport from mainline: + 2015-06-10 Michael Meissner + + PR target/66474 + * doc/md.texi (Machine Constraints): Document that on the PowerPC + if you use a constraint that targets a VSX register, you must use + %x in the template. + +2015-06-10 Richard Biener + + Backport from mainline + 2014-04-04 Cong Hou + + PR tree-optimization/60656 + * tree-vect-stmts.c (supportable_widening_operation): + Fix a bug that elements in a vector with vect_used_by_reduction + property are incorrectly reordered when the operation on it is not + consistant with the one in reduction operation. + + 2014-01-31 Richard Biener + + PR middle-end/59990 + * builtins.c (fold_builtin_memory_op): Make sure to not + use a floating-point mode or a boolean or enumeral type for + the copy operation. + +2015-06-10 Jakub Jelinek + + PR target/66470 + * config/i386/i386.c (ix86_split_long_move): For collisions + involving direct tls segment refs, move the UNSPEC_TP possibly + wrapped in ZERO_EXTEND out of the address for lea, to each of + the memory loads. + +2015-06-08 Uros Bizjak + +
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: matt Date: Wed Jun 24 13:58:29 UTC 2015 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: add gcc keyword to libgcc_s.so files To generate a diff of this commit: cvs rdiff -u -r1.739 -r1.740 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.739 src/distrib/sets/lists/base/shl.mi:1.740 --- src/distrib/sets/lists/base/shl.mi:1.739 Mon Jun 22 06:02:01 2015 +++ src/distrib/sets/lists/base/shl.mi Wed Jun 24 13:58:29 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.739 2015/06/22 06:02:01 matt Exp $ +# $NetBSD: shl.mi,v 1.740 2015/06/24 13:58:29 matt Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -37,9 +37,9 @@ ./lib/libevent.sobase-sys-shlib dynamicroot ./lib/libevent.so.4base-sys-shlib dynamicroot ./lib/libevent.so.4.0base-sys-shlib dynamicroot -./lib/libgcc_s.sobase-sys-shlib dynamicroot -./lib/libgcc_s.so.1base-sys-shlib dynamicroot -./lib/libgcc_s.so.1.0base-sys-shlib dynamicroot +./lib/libgcc_s.sobase-sys-shlib dynamicroot,gcc +./lib/libgcc_s.so.1base-sys-shlib dynamicroot,gcc +./lib/libgcc_s.so.1.0base-sys-shlib dynamicroot,gcc ./lib/libipsec.sobase-net-shlib dynamicroot ./lib/libipsec.so.3base-net-shlib dynamicroot ./lib/libipsec.so.3.0base-net-shlib dynamicroot
CVS commit: src/share/mk
Module Name:src Committed By: matt Date: Wed Jun 24 13:42:53 UTC 2015 Modified Files: src/share/mk: bsd.kmodule.mk Log Message: Don't add anything to CFLAGS/LDFLAGS on mips64 is BSD_MK_COMPAT_FILE is set. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/share/mk/bsd.kmodule.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.kmodule.mk diff -u src/share/mk/bsd.kmodule.mk:1.53 src/share/mk/bsd.kmodule.mk:1.54 --- src/share/mk/bsd.kmodule.mk:1.53 Sat May 2 18:18:13 2015 +++ src/share/mk/bsd.kmodule.mk Wed Jun 24 13:42:53 2015 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.kmodule.mk,v 1.53 2015/05/02 18:18:13 matt Exp $ +# $NetBSD: bsd.kmodule.mk,v 1.54 2015/06/24 13:42:53 matt Exp $ # We are not building this with PIE MKPIE=no @@ -37,10 +37,10 @@ CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mlon CFLAGS+= -fno-pic .elif ${MACHINE_CPU} == "riscv" CFLAGS+= -fPIC -Wa,-fno-pic -.elif ${MACHINE_ARCH} == "mips64eb" +.elif ${MACHINE_ARCH} == "mips64eb" && !defined(BSD_MK_COMPAT_FILE) CFLAGS+= -mabi=64 LDFLAGS+= -Wl,-m,elf64btsmip -.elif ${MACHINE_ARCH} == "mips64el" +.elif ${MACHINE_ARCH} == "mips64el" && !defined(BSD_MK_COMPAT_FILE) CFLAGS+= -mabi=64 LDFLAGS+= -Wl,-m,elf64ltsmip .endif
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Wed Jun 24 11:09:27 UTC 2015 Modified Files: src/sys/arch/x86/x86: mpbios.c Log Message: No functional change: - Fix typo. - KNF a bit. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/x86/x86/mpbios.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/mpbios.c diff -u src/sys/arch/x86/x86/mpbios.c:1.62 src/sys/arch/x86/x86/mpbios.c:1.63 --- src/sys/arch/x86/x86/mpbios.c:1.62 Wed Nov 6 20:19:03 2013 +++ src/sys/arch/x86/x86/mpbios.c Wed Jun 24 11:09:26 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mpbios.c,v 1.62 2013/11/06 20:19:03 mrg Exp $ */ +/* $NetBSD: mpbios.c,v 1.63 2015/06/24 11:09:26 msaitoh Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.62 2013/11/06 20:19:03 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.63 2015/06/24 11:09:26 msaitoh Exp $"); #include "acpica.h" #include "lapic.h" @@ -243,7 +243,7 @@ mp_ioapicprint(void *aux, const char *pn } /* - * Map a chunk of memory read-only and return an appropraitely + * Map a chunk of memory read-only and return an appropriately * const'ed pointer. */ @@ -300,12 +300,12 @@ mpbios_probe(device_t self) /* see if EBDA exists */ - mpbios_page = mpbios_map (0, PAGE_SIZE, &t); + mpbios_page = mpbios_map(0, PAGE_SIZE, &t); - ebda = *(const uint16_t *) (&mpbios_page[0x40e]); + ebda = *(const uint16_t *)(&mpbios_page[0x40e]); ebda <<= 4; - memtop = *(const uint16_t *) (&mpbios_page[0x413]); + memtop = *(const uint16_t *)(&mpbios_page[0x413]); memtop <<= 10; mpbios_page = NULL; @@ -434,10 +434,9 @@ mpbios_search(device_t self, paddr_t sta if ((m->signature == MP_FP_SIG) && ((len = m->length << 4) != 0) && mpbios_cksum(m, (m->length << 4)) == 0) { - mpbios_unmap (&t); - return mpbios_map (start+i, len, map); + return mpbios_map(start + i, len, map); } } mpbios_unmap(&t); @@ -717,7 +716,7 @@ mpbios_scan(device_t self, int *ncpup) mp_nintr = intr_cnt; /* re-walk the table, recording info of interest */ - position = (const uint8_t *) mp_cth + sizeof(*mp_cth); + position = (const uint8_t *)mp_cth + sizeof(*mp_cth); count = mp_cth->entry_count; cur_intr = 0; @@ -1196,8 +1195,7 @@ mpbios_bus(const uint8_t *ent, device_t mp_busses[bus_id].mb_intr_print = mp_print_eisa_intr; mp_busses[bus_id].mb_intr_cfg = mp_cfg_eisa_intr; - mp_busses[bus_id].mb_data = - inb(ELCR0) | (inb(ELCR1) << 8); + mp_busses[bus_id].mb_data = inb(ELCR0) | (inb(ELCR1) << 8); if (mp_eisa_bus != -1) aprint_error("oops: multiple isa busses?\n");
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed Jun 24 10:26:26 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: gcc-4.8.5 out. To generate a diff of this commit: cvs rdiff -u -r1.1229 -r1.1230 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1229 src/doc/3RDPARTY:1.1230 --- src/doc/3RDPARTY:1.1229 Sun Jun 21 15:30:13 2015 +++ src/doc/3RDPARTY Wed Jun 24 10:26:26 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1229 2015/06/21 15:30:13 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.1230 2015/06/24 10:26:26 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -421,7 +421,7 @@ There is a flex2netbsd script to help ne Package: gcc Version: 4.8.4 -Current Vers: 4.8.4/5.1 +Current Vers: 4.8.5/5.1 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gcc/ Home Page: http://www.gnu.org/software/gcc/
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: knakahara Date: Wed Jun 24 10:00:37 UTC 2015 Modified Files: src/sys/dev/marvell: mvpex.c mvpexvar.h Log Message: fix: pexih->ih_evcnt->ev_name pointed stack address wrongly. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/marvell/mvpex.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/marvell/mvpexvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/marvell/mvpex.c diff -u src/sys/dev/marvell/mvpex.c:1.12 src/sys/dev/marvell/mvpex.c:1.13 --- src/sys/dev/marvell/mvpex.c:1.12 Sun Mar 30 23:25:20 2014 +++ src/sys/dev/marvell/mvpex.c Wed Jun 24 10:00:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mvpex.c,v 1.12 2014/03/30 23:25:20 christos Exp $ */ +/* $NetBSD: mvpex.c,v 1.13 2015/06/24 10:00:37 knakahara Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.12 2014/03/30 23:25:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.13 2015/06/24 10:00:37 knakahara Exp $"); #include "opt_pci.h" #include "pci.h" @@ -660,7 +660,6 @@ mvpex_intr_establish(void *v, pci_intr_h struct mvpex_intrhand *pexih; uint32_t mask; int ih = pin - 1, s; - char buf[PCI_INTRSTR_LEN]; intrtab = &sc->sc_intrtab[ih]; @@ -674,8 +673,9 @@ mvpex_intr_establish(void *v, pci_intr_h pexih->ih_arg = intrarg; pexih->ih_type = ipl; pexih->ih_intrtab = intrtab; + mvpex_intr_string(v, pin, pexih->ih_evname, sizeof(pexih->ih_evname)); evcnt_attach_dynamic(&pexih->ih_evcnt, EVCNT_TYPE_INTR, NULL, "mvpex", - mvpex_intr_string(v, pin, buf, sizeof(buf))); + pexih->ih_evname); s = splhigh(); Index: src/sys/dev/marvell/mvpexvar.h diff -u src/sys/dev/marvell/mvpexvar.h:1.5 src/sys/dev/marvell/mvpexvar.h:1.6 --- src/sys/dev/marvell/mvpexvar.h:1.5 Sun Mar 30 01:17:51 2014 +++ src/sys/dev/marvell/mvpexvar.h Wed Jun 24 10:00:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mvpexvar.h,v 1.5 2014/03/30 01:17:51 christos Exp $ */ +/* $NetBSD: mvpexvar.h,v 1.6 2015/06/24 10:00:37 knakahara Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved. @@ -38,6 +38,7 @@ struct mvpex_intrhand { void *ih_intrtab; + char ih_evname[PCI_INTRSTR_LEN]; struct evcnt ih_evcnt; };