svn commit: r262016 - head/sys/dev/etherswitch/arswitch

2014-02-16 Thread Adrian Chadd
Author: adrian
Date: Mon Feb 17 05:54:24 2014
New Revision: 262016
URL: http://svnweb.freebsd.org/changeset/base/262016

Log:
  The MDIO control register for the AR8327 has a different address to
  previous chipsets.
  
  Obtained from:AR8327 datasheet

Modified:
  head/sys/dev/etherswitch/arswitch/arswitchreg.h

Modified: head/sys/dev/etherswitch/arswitch/arswitchreg.h
==
--- head/sys/dev/etherswitch/arswitch/arswitchreg.h Mon Feb 17 05:51:37 
2014(r262015)
+++ head/sys/dev/etherswitch/arswitch/arswitchreg.h Mon Feb 17 05:54:24 
2014(r262016)
@@ -395,6 +395,8 @@
 #defineAR8327_REG_MIB_FUNC 0x034
 #defineAR8327_MIB_CPU_KEEP (1 << 20)
 
+#defineAR8327_REG_MDIO_CTRL0x03c
+
 #defineAR8327_REG_SERVICE_TAG  0x048
 #defineAR8327_REG_LED_CTRL00x050
 #defineAR8327_REG_LED_CTRL10x054
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r262015 - head/sys/dev/etherswitch/arswitch

2014-02-16 Thread Adrian Chadd
Author: adrian
Date: Mon Feb 17 05:51:37 2014
New Revision: 262015
URL: http://svnweb.freebsd.org/changeset/base/262015

Log:
  Add mmd declaration.

Modified:
  head/sys/dev/etherswitch/arswitch/arswitch_reg.h

Modified: head/sys/dev/etherswitch/arswitch/arswitch_reg.h
==
--- head/sys/dev/etherswitch/arswitch/arswitch_reg.hMon Feb 17 05:07:43 
2014(r262014)
+++ head/sys/dev/etherswitch/arswitch/arswitch_reg.hMon Feb 17 05:51:37 
2014(r262015)
@@ -30,6 +30,8 @@
 
 extern void arswitch_writedbg(device_t dev, int phy, uint16_t dbg_addr,
uint16_t dbg_data);
+extern void arswitch_writemmd(device_t dev, int phy, uint16_t dbg_addr,
+   uint16_t dbg_data);
 
 extern int arswitch_readreg(device_t dev, int addr);
 extern int arswitch_writereg(device_t dev, int addr, int value);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r262011 - head/usr.bin/calendar

2014-02-16 Thread Eitan Adler
Author: eadler
Date: Mon Feb 17 03:24:00 2014
New Revision: 262011
URL: http://svnweb.freebsd.org/changeset/base/262011

Log:
  calendar(1): don't segfault in invalid input
  
  When the user supplies an invalid number of days provide a useful error 
message
  instead of segfaulting.
  
  PR:   bin/186697
  Reported by:  kaltheat 
  Submitted by: oliver  (older version)

Modified:
  head/usr.bin/calendar/calendar.c

Modified: head/usr.bin/calendar/calendar.c
==
--- head/usr.bin/calendar/calendar.cMon Feb 17 02:24:58 2014
(r262010)
+++ head/usr.bin/calendar/calendar.cMon Feb 17 03:24:00 2014
(r262011)
@@ -96,10 +96,14 @@ main(int argc, char *argv[])
 
case 'A': /* days after current date */
f_dayAfter = atoi(optarg);
+   if (f_dayAfter < 0)
+   errx(1, "number of days must be positive");
break;
 
case 'B': /* days before current date */
f_dayBefore = atoi(optarg);
+   if (f_dayBefore < 0)
+   errx(1, "number of days must be positive");
break;
 
case 'D': /* debug output of sun and moon info */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r262010 - head/sys/dev/etherswitch/arswitch

2014-02-16 Thread Adrian Chadd
Author: adrian
Date: Mon Feb 17 02:24:58 2014
New Revision: 262010
URL: http://svnweb.freebsd.org/changeset/base/262010

Log:
  Implement PHY bus MMD writes for arswitch.
  
  This is used by the AR8327 PHY setup path.
  
  Obtained from:OpenWRT

Modified:
  head/sys/dev/etherswitch/arswitch/arswitch_reg.c
  head/sys/dev/etherswitch/arswitch/arswitchreg.h

Modified: head/sys/dev/etherswitch/arswitch/arswitch_reg.c
==
--- head/sys/dev/etherswitch/arswitch/arswitch_reg.cMon Feb 17 01:40:33 
2014(r262009)
+++ head/sys/dev/etherswitch/arswitch/arswitch_reg.cMon Feb 17 02:24:58 
2014(r262010)
@@ -111,6 +111,16 @@ arswitch_writedbg(device_t dev, int phy,
MII_ATH_DBG_DATA, dbg_data);
 }
 
+void
+arswitch_writemmd(device_t dev, int phy, uint16_t dbg_addr,
+uint16_t dbg_data)
+{
+   (void) MDIO_WRITEREG(device_get_parent(dev), phy,
+   MII_ATH_MMD_ADDR, dbg_addr);
+   (void) MDIO_WRITEREG(device_get_parent(dev), phy,
+   MII_ATH_MMD_DATA, dbg_data);
+}
+
 /*
  * Write half a register
  */

Modified: head/sys/dev/etherswitch/arswitch/arswitchreg.h
==
--- head/sys/dev/etherswitch/arswitch/arswitchreg.h Mon Feb 17 01:40:33 
2014(r262009)
+++ head/sys/dev/etherswitch/arswitch/arswitchreg.h Mon Feb 17 02:24:58 
2014(r262010)
@@ -39,6 +39,8 @@
 #defineMS(_v, _f)  (((_v) & (_f)) >> _f##_S)
 
 /* Atheros specific MII registers */
+#defineMII_ATH_MMD_ADDR0x0d
+#defineMII_ATH_MMD_DATA0x0e
 #defineMII_ATH_DBG_ADDR0x1d
 #defineMII_ATH_DBG_DATA0x1e
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r262006 - head/sys/kern

2014-02-16 Thread Bryan Drewery
Author: bdrewery
Date: Mon Feb 17 00:00:39 2014
New Revision: 262006
URL: http://svnweb.freebsd.org/changeset/base/262006

Log:
  Fix M_FILEDESC leak in fdgrowtable() introduced in r244510.
  
  fdgrowtable() now only reallocates fd_map when necessary.
  
  This fixes fdgrowtable() to use the same logic as fdescfree() for
  when to free the fd_map. The logic in fdescfree() is intended to
  not free the initial static allocation, however the fd_map grows
  at a slower rate than the table does. The table is intended to hold
  20 fd, but its initial map has many more slots than 20.  The slot
  sizing causes NDSLOTS(20) through NDSLOTS(63) to be 1 which matches
  NDSLOTS(20), so fdescfree() was assuming that the fd_map was still
  the initial allocation and not freeing it.
  
  This partially reverts r244510 by reintroducing some of the logic
  it removed in fdgrowtable().
  
  Reviewed by:  mjg
  Approved by:  bapt (mentor)
  MFC after:2 weeks

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cSun Feb 16 23:10:46 2014
(r262005)
+++ head/sys/kern/kern_descrip.cMon Feb 17 00:00:39 2014
(r262006)
@@ -1521,7 +1521,7 @@ fdgrowtable(struct filedesc *fdp, int nf
return;
 
/*
-* Allocate a new table and map.  We need enough space for the
+* Allocate a new table.  We need enough space for the
 * file entries themselves and the struct freetable we will use
 * when we decommission the table and place it on the freelist.
 * We place the struct freetable in the middle so we don't have
@@ -1529,16 +1529,20 @@ fdgrowtable(struct filedesc *fdp, int nf
 */
ntable = malloc(nnfiles * sizeof(ntable[0]) + sizeof(struct freetable),
M_FILEDESC, M_ZERO | M_WAITOK);
-   nmap = malloc(NDSLOTS(nnfiles) * NDSLOTSIZE, M_FILEDESC,
-   M_ZERO | M_WAITOK);
-
/* copy the old data over and point at the new tables */
memcpy(ntable, otable, onfiles * sizeof(*otable));
-   memcpy(nmap, omap, NDSLOTS(onfiles) * sizeof(*omap));
-
-   /* update the pointers and counters */
fdp->fd_ofiles = ntable;
-   fdp->fd_map = nmap;
+
+   /* Allocate a new map only if the old is not large enough.  It will
+* grow at a slower rate than the table as it can map more
+* entries than the table can hold. */
+   if (NDSLOTS(nnfiles) > NDSLOTS(onfiles)) {
+   nmap = malloc(NDSLOTS(nnfiles) * NDSLOTSIZE, M_FILEDESC,
+   M_ZERO | M_WAITOK);
+   /* copy over the old data and update the pointer */
+   memcpy(nmap, omap, NDSLOTS(onfiles) * sizeof(*omap));
+   fdp->fd_map = nmap;
+   }
 
/*
 * In order to have a valid pattern for fget_unlocked()
@@ -1554,8 +1558,6 @@ fdgrowtable(struct filedesc *fdp, int nf
 * reference entries within it.  Instead, place it on a freelist
 * which will be processed when the struct filedesc is released.
 *
-* Do, however, free the old map.
-*
 * Note that if onfiles == NDFILE, we're dealing with the original
 * static allocation contained within (struct filedesc0 *)fdp,
 * which must not be freed.
@@ -1565,8 +1567,12 @@ fdgrowtable(struct filedesc *fdp, int nf
fdp0 = (struct filedesc0 *)fdp;
ft->ft_table = otable;
SLIST_INSERT_HEAD(&fdp0->fd_free, ft, ft_next);
-   free(omap, M_FILEDESC);
}
+   /* The map does not have the same possibility of threads still
+* holding references to it.  So always free it as long as it
+* does not reference the original static allocation. */
+   if (NDSLOTS(onfiles) > NDSLOTS(NDFILE))
+   free(omap, M_FILEDESC);
 }
 
 /*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r262005 - head/sys/kern

2014-02-16 Thread Bryan Drewery
Author: bdrewery
Date: Sun Feb 16 23:10:46 2014
New Revision: 262005
URL: http://svnweb.freebsd.org/changeset/base/262005

Log:
  Remove redundant memcpy of fd_ofiles in fdgrowtable() added in r247602
  
  Discussed with:   mjg
  Approved by:  bapt (mentor)
  MFC after:2 weeks

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==
--- head/sys/kern/kern_descrip.cSun Feb 16 23:08:21 2014
(r262004)
+++ head/sys/kern/kern_descrip.cSun Feb 16 23:10:46 2014
(r262005)
@@ -1537,7 +1537,6 @@ fdgrowtable(struct filedesc *fdp, int nf
memcpy(nmap, omap, NDSLOTS(onfiles) * sizeof(*omap));
 
/* update the pointers and counters */
-   memcpy(ntable, otable, onfiles * sizeof(ntable[0]));
fdp->fd_ofiles = ntable;
fdp->fd_map = nmap;
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r259441 - head/sys/kern

2014-02-16 Thread Jilles Tjoelker
On Mon, Dec 16, 2013 at 12:50:15AM +, Marcel Moolenaar wrote:
> Author: marcel
> Date: Mon Dec 16 00:50:14 2013
> New Revision: 259441
> URL: http://svnweb.freebsd.org/changeset/base/259441

> Log:
>   Properly drain the TTY when both revoke(2) and close(2) end up closing
>   the TTY. In such a case, ttydev_close() is called multiple times and
>   each time, t_revokecnt is incremented and cv_broadcast() is called for
>   both the t_outwait and t_inwait condition variables.
>   Let's say revoke(2) comes in first and gets to call tty_drain() from
>   ttydev_leave(). Let's say that the revoke comes from init(8) as the
>   result of running "shutdown -r now". Since shutdown prints various
>   messages to the console before announing that the machine will reboot
>   immediately, let's also say that the output queue is not empty and
>   that tty_drain() has something to do. Let's assume this all happens
>   on a 9600 baud serial console, so it takes a time to drain.
>   The shutdown command will exit(2) and as such will end up closing
>   stdout. Let's say this close will come in second, bump t_revokecnt
>   and call tty_wakeup(). This has tty_wait() return prematurely and
>   the next thing that will happen is that the thread doing revoke(2)
>   will flush the TTY. Since the drain wasn't complete, the flush will
>   effectively drop whatever is left in t_outq.

>   This change takes into account that tty_drain() will return ERESTART
>   due to the fact that t_revokecnt was bumped and in that case simply
>   call tty_drain() again. The thread in question is already performing
>   the close so it can safely finish draining the TTY before destroying
>   the TTY structure.

>   Now all messages from shutdown will be printed on the serial console.

>   Obtained from:  Juniper Networks, Inc.

> Modified:
>   head/sys/kern/tty.c

> Modified: head/sys/kern/tty.c
> ==
> --- head/sys/kern/tty.c   Sun Dec 15 23:49:42 2013(r259440)
> +++ head/sys/kern/tty.c   Mon Dec 16 00:50:14 2013(r259441)
> @@ -191,8 +191,10 @@ ttydev_leave(struct tty *tp)
>  
>   /* Drain any output. */
>   MPASS((tp->t_flags & TF_STOPPED) == 0);
> - if (!tty_gone(tp))
> - tty_drain(tp);
> + if (!tty_gone(tp)) {
> + while (tty_drain(tp) == ERESTART)
> + ;
> + }
>  
>   ttydisc_close(tp);
>  

Unfortunately, this is only correct if the [ERESTART] is because of the
(tp->t_revokecnt != revokecnt) check. If cv_wait_sig() returned
ERESTART, it will return ERESTART immediately the next time it is
called, until the signal has been handled. Therefore, if a process
performing the last close of a TTY via close(2) receives a signal with
SA_RESTART set, it will spin until the data has drained. Formerly, the
data would be discarded when the signal was received (without reflecting
this in close(2)'s return value, since ttydev_leave() returns nothing
and ttydev_close() always returns 0).

One way to fix this would be to replicate the revokecnt check into
ttydev_leave() so that tty_drain() is only retried if t_revokecnt
changed.

Discarding data because of a signal is not ideal, but I think leaving a
process unkillable because of a drain that will never complete is worse.
A process that cares about data in TTY buffers can use tcdrain(3) and
handle signals and errors normally.

-- 
Jilles Tjoelker
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r262003 - head/sys/i386/xbox

2014-02-16 Thread Dimitry Andric
Author: dim
Date: Sun Feb 16 22:48:36 2014
New Revision: 262003
URL: http://svnweb.freebsd.org/changeset/base/262003

Log:
  After r261980, the local ptr variable in xbox_init() is no longer used,
  breaking the LINT build.
  
  Pointy hat to:brueffer

Modified:
  head/sys/i386/xbox/xbox.c

Modified: head/sys/i386/xbox/xbox.c
==
--- head/sys/i386/xbox/xbox.c   Sun Feb 16 22:12:13 2014(r262002)
+++ head/sys/i386/xbox/xbox.c   Sun Feb 16 22:48:36 2014(r262003)
@@ -51,7 +51,6 @@ xbox_poweroff(void* junk, int howto)
 static void
 xbox_init(void)
 {
-   char* ptr;
 
if (!arch_i386_is_xbox)
return;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r262000 - head/contrib/atf

2014-02-16 Thread Julio Merino
Author: jmmv
Date: Sun Feb 16 21:53:33 2014
New Revision: 262000
URL: http://svnweb.freebsd.org/changeset/base/262000

Log:
  Undefine HAVE_VSNPRINTF_IN_STD.
  
  Should fix the build with g++/libstdc++.
  
  This is what we used to do prior the import of atf 0.20 and the build worked
  just fine with both libstdc++ and libc++.  Still investigating how to properly
  fix this upstream so that we do not hit the same issue on the next import.

Modified:
  head/contrib/atf/bconfig.h

Modified: head/contrib/atf/bconfig.h
==
--- head/contrib/atf/bconfig.h  Sun Feb 16 20:54:26 2014(r261999)
+++ head/contrib/atf/bconfig.h  Sun Feb 16 21:53:33 2014(r262000)
@@ -56,7 +56,7 @@
 #define HAVE_UNSETENV 1
 
 /* Define to 1 if vsnprintf is in std */
-#define HAVE_VSNPRINTF_IN_STD 1
+/* #undef HAVE_VSNPRINTF_IN_STD */
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261988 - head

2014-02-16 Thread Christian Brueffer
Author: brueffer
Date: Sun Feb 16 19:33:34 2014
New Revision: 261988
URL: http://svnweb.freebsd.org/changeset/base/261988

Log:
  Add an UPDATING entry about the nve(4) driver removal.

Modified:
  head/UPDATING

Modified: head/UPDATING
==
--- head/UPDATING   Sun Feb 16 19:21:44 2014(r261987)
+++ head/UPDATING   Sun Feb 16 19:33:34 2014(r261988)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140216:
+   The nve(4) driver has been removed.  Please use the nfe(4) driver
+   for NVIDIA nForce MCP Ethernet adapters instead.
+
 20140212:
An ABI incompatibility crept into the libc++ 3.4 import in r261283.
This could cause certain C++ applications using shared libraries built
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261987 - head/sys/arm/freescale/vybrid

2014-02-16 Thread Ruslan Bukin
Author: br
Date: Sun Feb 16 19:21:44 2014
New Revision: 261987
URL: http://svnweb.freebsd.org/changeset/base/261987

Log:
  - Decrease buffer size.
  - Handle eDMA interrupt on running channel only.

Modified:
  head/sys/arm/freescale/vybrid/vf_sai.c

Modified: head/sys/arm/freescale/vybrid/vf_sai.c
==
--- head/sys/arm/freescale/vybrid/vf_sai.c  Sun Feb 16 19:20:13 2014
(r261986)
+++ head/sys/arm/freescale/vybrid/vf_sai.c  Sun Feb 16 19:21:44 2014
(r261987)
@@ -396,7 +396,8 @@ sai_dma_intr(void *arg, int chn)
if (sc->pos >= sc->dma_size)
sc->pos -= sc->dma_size;
 
-   chn_intr(ch->channel);
+   if (ch->run)
+   chn_intr(ch->channel);
 
return (0);
 }
@@ -492,7 +493,7 @@ setup_dma(struct sc_pcminfo *scp)
tcd->nbytes = 64;
 
tcd->nmajor = 512;
-   tcd->smod = 18; /* dma_size range */
+   tcd->smod = 17; /* dma_size range */
tcd->dmod = 0;
tcd->esg = 0;
tcd->soff = 0x4;
@@ -523,6 +524,7 @@ saichan_trigger(kobj_t obj, void *data, 
 #if 0
device_printf(scp->dev, "trigger start\n");
 #endif
+   ch->run = 1;
break;
 
case PCMTRIG_STOP:
@@ -530,6 +532,7 @@ saichan_trigger(kobj_t obj, void *data, 
 #if 0
device_printf(scp->dev, "trigger stop or abort\n");
 #endif
+   ch->run = 0;
break;
}
 
@@ -720,7 +723,7 @@ sai_attach(device_t dev)
scp->dev = dev;
 
/* DMA */
-   sc->dma_size = 262144;
+   sc->dma_size = 131072;
 
/*
 * Must use dma_size boundary as modulo feature required.
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261984 - head/etc/etc.ia64

2014-02-16 Thread Marcel Moolenaar
Author: marcel
Date: Sun Feb 16 19:08:10 2014
New Revision: 261984
URL: http://svnweb.freebsd.org/changeset/base/261984

Log:
  Start getty(8) on ttyu1 as well. It's not uncommon for HP hardware
  to have that be the iLO console (e.g. pluto).

Modified:
  head/etc/etc.ia64/ttys

Modified: head/etc/etc.ia64/ttys
==
--- head/etc/etc.ia64/ttys  Sun Feb 16 17:22:49 2014(r261983)
+++ head/etc/etc.ia64/ttys  Sun Feb 16 19:08:10 2014(r261984)
@@ -42,7 +42,7 @@ ttyv8 "/usr/local/bin/xdm -nodaemon"  xte
 # Serial terminals. The 'dialup' keyword identifies dialin lines to login,
 # fingerd etc.
 ttyu0  "/usr/libexec/getty std.9600"   vt100   on  secure
-ttyu1  "/usr/libexec/getty std.9600"   dialup  off secure
+ttyu1  "/usr/libexec/getty std.9600"   vt100   on  secure
 ttyu2  "/usr/libexec/getty std.9600"   dialup  off secure
 ttyu3  "/usr/libexec/getty std.9600"   dialup  off secure
 # Dumb console
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r261875 - head/usr.bin/netstat

2014-02-16 Thread Rui Paulo
On 14 Feb 2014, at 01:23, Adrian Chadd  wrote:

> ew, ok. Sorry. We don't have a generic way of doing that. I'll fix it in the 
> am.

Of course we do.  Just move the %s to 'lookup%s'.

--
Rui Paulo



___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261983 - head/sys/dev/sdhci

2014-02-16 Thread Ian Lepore
Author: ian
Date: Sun Feb 16 17:22:49 2014
New Revision: 261983
URL: http://svnweb.freebsd.org/changeset/base/261983

Log:
  After a timeout, reset the controller using SDHCI_RESET_CMD|SDHCI_RESET_DATA
  rather than SDHCI_RESET_ALL; the latter turns off clocks and power, removing
  any possibility of recovering from the error.
  
  Also, double the timeout to 2 seconds.  Despite what the SD spec says about
  all transactions completing in 250ms or less, I have a card which sometimes
  takes more than a second to complete a write.

Modified:
  head/sys/dev/sdhci/sdhci.c

Modified: head/sys/dev/sdhci/sdhci.c
==
--- head/sys/dev/sdhci/sdhci.c  Sun Feb 16 16:49:54 2014(r261982)
+++ head/sys/dev/sdhci/sdhci.c  Sun Feb 16 17:22:49 2014(r261983)
@@ -725,7 +725,7 @@ sdhci_timeout(void *arg)
struct sdhci_slot *slot = arg;
 
if (slot->curcmd != NULL) {
-   sdhci_reset(slot, SDHCI_RESET_ALL);
+   sdhci_reset(slot, SDHCI_RESET_CMD|SDHCI_RESET_DATA);
slot->curcmd->error = MMC_ERR_TIMEOUT;
sdhci_req_done(slot);
}
@@ -850,8 +850,8 @@ sdhci_start_command(struct sdhci_slot *s
sdhci_set_transfer_mode(slot, cmd->data);
/* Start command. */
WR2(slot, SDHCI_COMMAND_FLAGS, (cmd->opcode << 8) | (flags & 0xff));
-   /* Start timeout callout; no command should take more than a second. */
-   callout_reset(&slot->timeout_callout, hz, sdhci_timeout, slot);
+   /* Start timeout callout. */
+   callout_reset(&slot->timeout_callout, 2*hz, sdhci_timeout, slot);
 }
 
 static void
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261982 - in head/sys: arm/freescale/vybrid boot/fdt/dts

2014-02-16 Thread Ruslan Bukin
Author: br
Date: Sun Feb 16 16:49:54 2014
New Revision: 261982
URL: http://svnweb.freebsd.org/changeset/base/261982

Log:
  Add driver for Synchronous Audio Interface (SAI).
  
  SAI supports full-duplex serial interfaces with frame
  synchronization such as I2S, AC97, TDM, and codec/DSP
  interfaces.

Added:
  head/sys/arm/freescale/vybrid/vf_sai.c   (contents, props changed)
Modified:
  head/sys/arm/freescale/vybrid/files.vybrid
  head/sys/boot/fdt/dts/vybrid.dtsi

Modified: head/sys/arm/freescale/vybrid/files.vybrid
==
--- head/sys/arm/freescale/vybrid/files.vybrid  Sun Feb 16 14:37:23 2014
(r261981)
+++ head/sys/arm/freescale/vybrid/files.vybrid  Sun Feb 16 16:49:54 2014
(r261982)
@@ -29,4 +29,5 @@ arm/freescale/vybrid/vf_nfc.c optional
 arm/freescale/vybrid/vf_ehci.c optionalehci
 arm/freescale/vybrid/vf_gpio.c optionalgpio
 arm/freescale/vybrid/vf_uart.c optionaluart
+arm/freescale/vybrid/vf_sai.c  optionalsound
 dev/ffec/if_ffec.c optionalffec

Added: head/sys/arm/freescale/vybrid/vf_sai.c
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/freescale/vybrid/vf_sai.c  Sun Feb 16 16:49:54 2014
(r261982)
@@ -0,0 +1,802 @@
+/*-
+ * Copyright (c) 2014 Ruslan Bukin 
+ * 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 AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Vybrid Family Synchronous Audio Interface (SAI)
+ * Chapter 51, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#include 
+__FBSDID("$FreeBSD$");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#defineI2S_TCSR0x00/* SAI Transmit Control */
+#defineI2S_TCR10x04/* SAI Transmit Configuration 1 */
+#defineI2S_TCR20x08/* SAI Transmit Configuration 2 */
+#defineI2S_TCR30x0C/* SAI Transmit Configuration 3 */
+#defineI2S_TCR40x10/* SAI Transmit Configuration 4 */
+#defineI2S_TCR50x14/* SAI Transmit Configuration 5 */
+#defineI2S_TDR00x20/* SAI Transmit Data */
+#defineI2S_TFR00x40/* SAI Transmit FIFO */
+#defineI2S_TMR 0x60/* SAI Transmit Mask */
+#defineI2S_RCSR0x80/* SAI Receive Control */
+#defineI2S_RCR10x84/* SAI Receive Configuration 1 */
+#defineI2S_RCR20x88/* SAI Receive Configuration 2 */
+#defineI2S_RCR30x8C/* SAI Receive Configuration 3 */
+#defineI2S_RCR40x90/* SAI Receive Configuration 4 */
+#defineI2S_RCR50x94/* SAI Receive Configuration 5 */
+#defineI2S_RDR00xA0/* SAI Receive Data */
+#defineI2S_RFR00xC0/* SAI Receive FIFO */
+#defineI2S_RMR 0xE0/* SAI Receive Mask */
+
+#defineTCR1_TFW_M  0x1f/* Transmit FIFO Watermark Mask 
*/
+#defineTCR1_TFW_S  0   /* Transmit FIFO Watermark 
Shift */
+#defineTCR2_MSEL_M 0x3 /* MCLK Select Mask*/
+#defineTCR2_MSEL_S 26  /* MCLK Select Shift*/
+#defineTCR2_BCP(1 << 25)   /* Bit Clock Polarity */
+#defineTCR2_BCD(

svn commit: r261981 - head/sys/dev/usb/controller

2014-02-16 Thread Hans Petter Selasky
Author: hselasky
Date: Sun Feb 16 14:37:23 2014
New Revision: 261981
URL: http://svnweb.freebsd.org/changeset/base/261981

Log:
  Add new PCI ID for hardware which needs port routing for USB 3.0.
  
  PR:   usb/186811
  MFC after:1 week
  Submitted by: Philipp Maechler 

Modified:
  head/sys/dev/usb/controller/xhci_pci.c

Modified: head/sys/dev/usb/controller/xhci_pci.c
==
--- head/sys/dev/usb/controller/xhci_pci.c  Sun Feb 16 14:35:19 2014
(r261980)
+++ head/sys/dev/usb/controller/xhci_pci.c  Sun Feb 16 14:37:23 2014
(r261981)
@@ -102,6 +102,7 @@ xhci_pci_match(device_t self)
case 0x10421b21:
return ("ASMedia ASM1042 USB 3.0 controller");
 
+   case 0x9c318086:
case 0x1e318086:
return ("Intel Panther Point USB 3.0 controller");
case 0x8c318086:
@@ -237,6 +238,7 @@ xhci_pci_attach(device_t self)
 
/* On Intel chipsets reroute ports from EHCI to XHCI controller. */
switch (pci_get_devid(self)) {
+   case 0x9c318086:/* Panther Point */
case 0x1e318086:/* Panther Point */
case 0x8c318086:/* Lynx Point */
sc->sc_port_route = &xhci_pci_port_route;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261980 - head/sys/i386/xbox

2014-02-16 Thread Christian Brueffer
Author: brueffer
Date: Sun Feb 16 14:35:19 2014
New Revision: 261980
URL: http://svnweb.freebsd.org/changeset/base/261980

Log:
  Remove an nve(4)-specific workaround from the xbox port.  nfe(4) doesn't
  need it.
  
  Reviewed by:  ed

Modified:
  head/sys/i386/xbox/xbox.c

Modified: head/sys/i386/xbox/xbox.c
==
--- head/sys/i386/xbox/xbox.c   Sun Feb 16 13:42:49 2014(r261979)
+++ head/sys/i386/xbox/xbox.c   Sun Feb 16 14:35:19 2014(r261980)
@@ -59,27 +59,6 @@ xbox_init(void)
/* register our poweroff function */
EVENTHANDLER_REGISTER (shutdown_final, xbox_poweroff, NULL,
   SHUTDOWN_PRI_LAST);
-
-   /*
-* Some XBOX loaders, such as Cromwell, have a flaw which cause the
-* nve(4) driver to fail attaching to the NIC.
-*
-* This is because they leave the NIC running; this will cause the
-* Nvidia driver to fail as the NIC does not return any sensible
-* values and thus fails attaching (using an error 0x5, this means
-* it cannot find a valid PHY)
-*
-* We bluntly tell the NIC to stop whatever it's doing; this makes
-* nve(4) attach correctly. As the NIC always resides at
-* 0xfef0-0xfef003ff on an XBOX, we simply hardcode this address.
-*/
-   ptr = pmap_mapdev (0xfef0, 0x400);
-   *(uint32_t*)(ptr + 0x188) = 0; /* clear adapter control field */
-   pmap_unmapdev ((vm_offset_t)ptr, 0x400);
 }
 
-/*
- * This must be called before the drivers, as the if_nve(4) driver will fail
- * if we do not do this in advance.
- */
 SYSINIT(xbox, SI_SUB_DRIVERS, SI_ORDER_FIRST, xbox_init, NULL);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261978 - head/tests

2014-02-16 Thread Julio Merino
Author: jmmv
Date: Sun Feb 16 12:56:05 2014
New Revision: 261978
URL: http://svnweb.freebsd.org/changeset/base/261978

Log:
  Use DESTDIR for the installation of the /usr/tests/local symlink.
  
  MFC after:5 days

Modified:
  head/tests/Makefile

Modified: head/tests/Makefile
==
--- head/tests/Makefile Sun Feb 16 12:41:57 2014(r261977)
+++ head/tests/Makefile Sun Feb 16 12:56:05 2014(r261978)
@@ -9,6 +9,6 @@ KYUAFILE= yes
 
 afterinstall: install-tests-local
 install-tests-local: .PHONY
-   ${INSTALL_SYMLINK} ../local/tests ${TESTSDIR}/local
+   ${INSTALL_SYMLINK} ../local/tests ${DESTDIR}${TESTSDIR}/local
 
 .include 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r261975 - in head: release/doc/en_US.ISO8859-1/hardware release/doc/share/misc share/man/man4 sys/amd64/conf sys/boot/forth sys/conf sys/contrib/dev/nve sys/dev/nve sys/i386/conf sys/m

2014-02-16 Thread Remko Lodder

On 16 Feb 2014, at 13:22, Christian Brueffer  wrote:

> Author: brueffer
> Date: Sun Feb 16 12:22:43 2014
> New Revision: 261975
> URL: http://svnweb.freebsd.org/changeset/base/261975
> 
> Log:
>  Retire the nve(4) driver; nfe(4) has been the default driver for NVIDIA
>  nForce MCP adapters for a long time.
> 
>  Yays:jhb, remko, yongari
>  Nays:none on the current and stable lists

\o/ yay!

> 
> Deleted:
>  head/share/man/man4/nve.4
>  head/sys/contrib/dev/nve/
>  head/sys/dev/nve/
>  head/sys/modules/nve/
> Modified:
>  head/release/doc/en_US.ISO8859-1/hardware/article.xml
>  head/release/doc/share/misc/dev.archlist.txt
>  head/share/man/man4/Makefile
>  head/share/man/man4/altq.4
>  head/share/man/man4/miibus.4
>  head/share/man/man4/vlan.4
>  head/sys/amd64/conf/GENERIC
>  head/sys/amd64/conf/NOTES
>  head/sys/boot/forth/loader.conf
>  head/sys/conf/WITHOUT_SOURCELESS_HOST
>  head/sys/conf/files.amd64
>  head/sys/conf/files.i386
>  head/sys/i386/conf/GENERIC
>  head/sys/i386/conf/NOTES
>  head/sys/i386/conf/PAE
>  head/sys/i386/conf/XEN
>  head/sys/mips/conf/OCTEON1
>  head/sys/modules/Makefile
> 
> Modified: head/release/doc/en_US.ISO8859-1/hardware/article.xml
> ==
> --- head/release/doc/en_US.ISO8859-1/hardware/article.xml Sun Feb 16 
> 11:17:40 2014(r261974)
> +++ head/release/doc/en_US.ISO8859-1/hardware/article.xml Sun Feb 16 
> 12:22:43 2014(r261975)
> @@ -883,8 +883,6 @@
> 
>   &hwlist.nge;
> 
> -  &hwlist.nve;
> -
>   &hwlist.nxge;
> 
>   &hwlist.oce;
> 
> Modified: head/release/doc/share/misc/dev.archlist.txt
> ==
> --- head/release/doc/share/misc/dev.archlist.txt  Sun Feb 16 11:17:40 
> 2014(r261974)
> +++ head/release/doc/share/misc/dev.archlist.txt  Sun Feb 16 12:22:43 
> 2014(r261975)
> @@ -97,7 +97,6 @@ nfe i386,amd64
> ng_bt3c   i386,pc98,amd64
> ng_ubti386,pc98,amd64
> nsp   i386,pc98
> -nve  i386,amd64
> nxge  i386,amd64
> oce   i386,amd64
> ohci  i386,pc98,ia64,amd64,powerpc
> 
> Modified: head/share/man/man4/Makefile
> ==
> --- head/share/man/man4/Makefile  Sun Feb 16 11:17:40 2014
> (r261974)
> +++ head/share/man/man4/Makefile  Sun Feb 16 12:22:43 2014
> (r261975)
> @@ -344,7 +344,6 @@ MAN=  aac.4 \
>   ${_ntb.4} \
>   null.4 \
>   ${_nvd.4} \
> - ${_nve.4} \
>   ${_nvme.4} \
>   ${_nvram.4} \
>   ${_nvram2env.4} \
> @@ -673,7 +672,6 @@ MLINKS+=${_nfe.4} ${_if_nfe.4}
> MLINKS+=nge.4 if_nge.4
> MLINKS+=${_ntb.4} ${_if_ntb.4} \
>   ${_ntb.4} ${_ntb_hw.4}
> -MLINKS+=${_nve.4} ${_if_nve.4}
> MLINKS+=${_nxge.4} ${_if_nxge.4}
> MLINKS+=patm.4 if_patm.4
> MLINKS+=pccbb.4 cbb.4
> @@ -772,7 +770,6 @@ _ichwd.4= ichwd.4
> _if_bxe.4=if_bxe.4
> _if_ndis.4=   if_ndis.4
> _if_nfe.4=if_nfe.4
> -_if_nve.4=   if_nve.4
> _if_nxge.4=   if_nxge.4
> _if_urtw.4=   if_urtw.4
> _if_vmx.4=if_vmx.4
> @@ -787,7 +784,6 @@ _ndis.4=  ndis.4
> _nfe.4=   nfe.4
> _nfsmb.4= nfsmb.4
> _nvd.4=   nvd.4
> -_nve.4=  nve.4
> _nvme.4=  nvme.4
> _nvram.4= nvram.4
> _nxge.4=  nxge.4
> 
> Modified: head/share/man/man4/altq.4
> ==
> --- head/share/man/man4/altq.4Sun Feb 16 11:17:40 2014
> (r261974)
> +++ head/share/man/man4/altq.4Sun Feb 16 12:22:43 2014
> (r261975)
> @@ -151,7 +151,6 @@ They have been applied to the following 
> .Xr nfe 4 ,
> .Xr nge 4 ,
> .Xr npe 4 ,
> -.Xr nve 4 ,
> .Xr qlxgb 4 ,
> .Xr ral 4 ,
> .Xr re 4 ,
> 
> Modified: head/share/man/man4/miibus.4
> ==
> --- head/share/man/man4/miibus.4  Sun Feb 16 11:17:40 2014
> (r261974)
> +++ head/share/man/man4/miibus.4  Sun Feb 16 12:22:43 2014
> (r261975)
> @@ -87,8 +87,6 @@ Marvell/SysKonnect Yukon II Gigabit Ethe
> NVIDIA nForce MCP Networking Adapter
> .It Xr nge 4
> National Semiconductor DP83820/DP83821 Gigabit Ethernet
> -.It Xr nve 4
> -NVIDIA nForce MCP Networking Adapter
> .It Xr pcn 4
> AMD Am79C97x PCI 10/100
> .It Xr re 4
> @@ -159,7 +157,6 @@ but as a result are not well behaved new
> .Xr netintro 4 ,
> .Xr nfe 4 ,
> .Xr nge 4 ,
> -.Xr nve 4 ,
> .Xr pcn 4 ,
> .Xr re 4 ,
> .Xr rgephy 4 ,
> 
> Modified: head/share/man/man4/vlan.4
> ==
> --- head/share/man/man4/vlan.4Sun Feb 16 11:17:40 2014
> (r261974)
> +++ head/share/man/man4/vlan.4Sun Feb 16 12:22:43 2014
> (r261975)
> @@ -176,7 +176,6 @@ These interfaces natively support long f
> .Xr hme 4 ,
> .Xr le 4 ,
> .Xr nfe 4 ,
> -.Xr nve 4 ,
> .Xr rl 4 ,
> .Xr s

svn commit: r261977 - head/sys/dev/usb/controller

2014-02-16 Thread Dimitry Andric
Author: dim
Date: Sun Feb 16 12:41:57 2014
New Revision: 261977
URL: http://svnweb.freebsd.org/changeset/base/261977

Log:
  In sys/dev/usb/controller/musb_otg.c, fix a warning about musbotg_odevd
  being unused, by adding it to the part that handles getting descriptors.
  
  Reviewed by:  hselasky
  MFC after:3 days

Modified:
  head/sys/dev/usb/controller/musb_otg.c

Modified: head/sys/dev/usb/controller/musb_otg.c
==
--- head/sys/dev/usb/controller/musb_otg.c  Sun Feb 16 12:25:22 2014
(r261976)
+++ head/sys/dev/usb/controller/musb_otg.c  Sun Feb 16 12:41:57 2014
(r261977)
@@ -3776,6 +3776,13 @@ tr_handle_get_descriptor:
len = sizeof(musbotg_devd);
ptr = (const void *)&musbotg_devd;
goto tr_valid;
+   case UDESC_DEVICE_QUALIFIER:
+   if (value & 0xff) {
+   goto tr_stalled;
+   }
+   len = sizeof(musbotg_odevd);
+   ptr = (const void *)&musbotg_odevd;
+   goto tr_valid;
case UDESC_CONFIG:
if (value & 0xff) {
goto tr_stalled;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261976 - head/release/doc/en_US.ISO8859-1/relnotes

2014-02-16 Thread Christian Brueffer
Author: brueffer
Date: Sun Feb 16 12:25:22 2014
New Revision: 261976
URL: http://svnweb.freebsd.org/changeset/base/261976

Log:
  Note the removal of nve(4).

Modified:
  head/release/doc/en_US.ISO8859-1/relnotes/article.xml

Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml
==
--- head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Sun Feb 16 
12:22:43 2014(r261975)
+++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml   Sun Feb 16 
12:25:22 2014(r261976)
@@ -176,6 +176,11 @@
Support for Broadcom chipsets
  BCM57764, BCM57767, BCM57782, BCM57786 and BCM57787 has
  been added to &man.bge.4;.
+
+   The deprecated nve(4) driver has been
+ removed.  Users of NVIDIA nForce MCP network adapters are
+ advised to use the &man.nfe.4; driver instead, which has been
+ the default driver for this hardware since &os; 7.0.
   
 
 
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261975 - in head: release/doc/en_US.ISO8859-1/hardware release/doc/share/misc share/man/man4 sys/amd64/conf sys/boot/forth sys/conf sys/contrib/dev/nve sys/dev/nve sys/i386/conf sys/mi...

2014-02-16 Thread Christian Brueffer
Author: brueffer
Date: Sun Feb 16 12:22:43 2014
New Revision: 261975
URL: http://svnweb.freebsd.org/changeset/base/261975

Log:
  Retire the nve(4) driver; nfe(4) has been the default driver for NVIDIA
  nForce MCP adapters for a long time.
  
  Yays: jhb, remko, yongari
  Nays: none on the current and stable lists

Deleted:
  head/share/man/man4/nve.4
  head/sys/contrib/dev/nve/
  head/sys/dev/nve/
  head/sys/modules/nve/
Modified:
  head/release/doc/en_US.ISO8859-1/hardware/article.xml
  head/release/doc/share/misc/dev.archlist.txt
  head/share/man/man4/Makefile
  head/share/man/man4/altq.4
  head/share/man/man4/miibus.4
  head/share/man/man4/vlan.4
  head/sys/amd64/conf/GENERIC
  head/sys/amd64/conf/NOTES
  head/sys/boot/forth/loader.conf
  head/sys/conf/WITHOUT_SOURCELESS_HOST
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/NOTES
  head/sys/i386/conf/PAE
  head/sys/i386/conf/XEN
  head/sys/mips/conf/OCTEON1
  head/sys/modules/Makefile

Modified: head/release/doc/en_US.ISO8859-1/hardware/article.xml
==
--- head/release/doc/en_US.ISO8859-1/hardware/article.xml   Sun Feb 16 
11:17:40 2014(r261974)
+++ head/release/doc/en_US.ISO8859-1/hardware/article.xml   Sun Feb 16 
12:22:43 2014(r261975)
@@ -883,8 +883,6 @@
 
   &hwlist.nge;
 
-  &hwlist.nve;
-
   &hwlist.nxge;
 
   &hwlist.oce;

Modified: head/release/doc/share/misc/dev.archlist.txt
==
--- head/release/doc/share/misc/dev.archlist.txtSun Feb 16 11:17:40 
2014(r261974)
+++ head/release/doc/share/misc/dev.archlist.txtSun Feb 16 12:22:43 
2014(r261975)
@@ -97,7 +97,6 @@ nfe   i386,amd64
 ng_bt3ci386,pc98,amd64
 ng_ubt i386,pc98,amd64
 nspi386,pc98
-nvei386,amd64
 nxge   i386,amd64
 ocei386,amd64
 ohci   i386,pc98,ia64,amd64,powerpc

Modified: head/share/man/man4/Makefile
==
--- head/share/man/man4/MakefileSun Feb 16 11:17:40 2014
(r261974)
+++ head/share/man/man4/MakefileSun Feb 16 12:22:43 2014
(r261975)
@@ -344,7 +344,6 @@ MAN=aac.4 \
${_ntb.4} \
null.4 \
${_nvd.4} \
-   ${_nve.4} \
${_nvme.4} \
${_nvram.4} \
${_nvram2env.4} \
@@ -673,7 +672,6 @@ MLINKS+=${_nfe.4} ${_if_nfe.4}
 MLINKS+=nge.4 if_nge.4
 MLINKS+=${_ntb.4} ${_if_ntb.4} \
${_ntb.4} ${_ntb_hw.4}
-MLINKS+=${_nve.4} ${_if_nve.4}
 MLINKS+=${_nxge.4} ${_if_nxge.4}
 MLINKS+=patm.4 if_patm.4
 MLINKS+=pccbb.4 cbb.4
@@ -772,7 +770,6 @@ _ichwd.4=   ichwd.4
 _if_bxe.4= if_bxe.4
 _if_ndis.4=if_ndis.4
 _if_nfe.4= if_nfe.4
-_if_nve.4= if_nve.4
 _if_nxge.4=if_nxge.4
 _if_urtw.4=if_urtw.4
 _if_vmx.4= if_vmx.4
@@ -787,7 +784,6 @@ _ndis.4=ndis.4
 _nfe.4=nfe.4
 _nfsmb.4=  nfsmb.4
 _nvd.4=nvd.4
-_nve.4=nve.4
 _nvme.4=   nvme.4
 _nvram.4=  nvram.4
 _nxge.4=   nxge.4

Modified: head/share/man/man4/altq.4
==
--- head/share/man/man4/altq.4  Sun Feb 16 11:17:40 2014(r261974)
+++ head/share/man/man4/altq.4  Sun Feb 16 12:22:43 2014(r261975)
@@ -151,7 +151,6 @@ They have been applied to the following 
 .Xr nfe 4 ,
 .Xr nge 4 ,
 .Xr npe 4 ,
-.Xr nve 4 ,
 .Xr qlxgb 4 ,
 .Xr ral 4 ,
 .Xr re 4 ,

Modified: head/share/man/man4/miibus.4
==
--- head/share/man/man4/miibus.4Sun Feb 16 11:17:40 2014
(r261974)
+++ head/share/man/man4/miibus.4Sun Feb 16 12:22:43 2014
(r261975)
@@ -87,8 +87,6 @@ Marvell/SysKonnect Yukon II Gigabit Ethe
 NVIDIA nForce MCP Networking Adapter
 .It Xr nge 4
 National Semiconductor DP83820/DP83821 Gigabit Ethernet
-.It Xr nve 4
-NVIDIA nForce MCP Networking Adapter
 .It Xr pcn 4
 AMD Am79C97x PCI 10/100
 .It Xr re 4
@@ -159,7 +157,6 @@ but as a result are not well behaved new
 .Xr netintro 4 ,
 .Xr nfe 4 ,
 .Xr nge 4 ,
-.Xr nve 4 ,
 .Xr pcn 4 ,
 .Xr re 4 ,
 .Xr rgephy 4 ,

Modified: head/share/man/man4/vlan.4
==
--- head/share/man/man4/vlan.4  Sun Feb 16 11:17:40 2014(r261974)
+++ head/share/man/man4/vlan.4  Sun Feb 16 12:22:43 2014(r261975)
@@ -176,7 +176,6 @@ These interfaces natively support long f
 .Xr hme 4 ,
 .Xr le 4 ,
 .Xr nfe 4 ,
-.Xr nve 4 ,
 .Xr rl 4 ,
 .Xr sf 4 ,
 .Xr sis 4 ,

Modified: head/sys/amd64/conf/GENERIC
==
--- head/sys/amd64/conf/GENERIC Sun Feb 16 11:17:40 2014(r261974)
+++ head/sys/amd64/conf/GENERIC Sun Feb 16 12:22:43 2014(r261975)
@@ -2

Re: svn commit: r261916 - head/sys/dev/xen/console

2014-02-16 Thread David Chisnall
On 16 Feb 2014, at 04:09, Bruce Evans  wrote:

> [a long list of corner cases where the warning may not be correct]

Fortunately, the goal of compiler warnings is not to address every possible 
case, but rather to minimise false positives while still giving useful results. 
 The warning can be turned off if you are using the C preprocessor in a way 
designed to provide cautionary tales to young programmers, but for everyone 
else it makes sense to have it on by default.

Anyone using a single file as both the main file for a compilation unit and as 
an included file in others, deserves to have a new antipattern named after them 
so that their name can live in infamy, but should not in any way be allowed to 
influence the design of compiler warnings.

David

___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r261962 - head/usr.bin/rctl

2014-02-16 Thread Edward Tomasz Napierala
Author: trasz
Date: Sun Feb 16 08:42:52 2014
New Revision: 261962
URL: http://svnweb.freebsd.org/changeset/base/261962

Log:
  Mention that rctl(8) was sponsored by the Foundation.
  
  Sponsored by: The FreeBSD Foundation

Modified:
  head/usr.bin/rctl/rctl.8

Modified: head/usr.bin/rctl/rctl.8
==
--- head/usr.bin/rctl/rctl.8Sun Feb 16 08:35:33 2014(r261961)
+++ head/usr.bin/rctl/rctl.8Sun Feb 16 08:42:52 2014(r261962)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 14, 2014
+.Dd February 16, 2014
 .Dt RCTL 8
 .Os
 .Sh NAME
@@ -267,8 +267,9 @@ command appeared in
 .An -nosplit
 The
 .Nm
-command was written by
-.An Edward Tomasz Napierala Aq tr...@freebsd.org .
+was developed by
+.An Edward Tomasz Napierala Aq tr...@freebsd.org
+under sponsorship from the FreeBSD Foundation.
 .Sh BUGS
 Limiting
 .Sy memoryuse
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"