svn commit: r266941 - in head: sbin/ipfw sys/netinet sys/netpfil/ipfw
Author: hiren
Date: Sun Jun 1 07:28:24 2014
New Revision: 266941
URL: http://svnweb.freebsd.org/changeset/base/266941
Log:
ECN marking implenetation for dummynet.
Changes include both DCTCP and RFC 3168 ECN marking methodology.
DCTCP draft: http://tools.ietf.org/html/draft-bensley-tcpm-dctcp-00
Submitted by: Midori Kato (aoimidor...@gmail.com)
Worked with: Lars Eggert (l...@netapp.com)
Reviewed by: luigi, hiren
Modified:
head/sbin/ipfw/dummynet.c
head/sbin/ipfw/ipfw.8
head/sbin/ipfw/ipfw2.h
head/sys/netinet/ip_dummynet.h
head/sys/netpfil/ipfw/ip_dn_glue.c
head/sys/netpfil/ipfw/ip_dn_io.c
head/sys/netpfil/ipfw/ip_dummynet.c
Modified: head/sbin/ipfw/dummynet.c
==
--- head/sbin/ipfw/dummynet.c Sun Jun 1 05:02:48 2014(r266940)
+++ head/sbin/ipfw/dummynet.c Sun Jun 1 07:28:24 2014(r266941)
@@ -56,6 +56,7 @@ static struct _s_x dummynet_params[] = {
{ "sched_mask", TOK_SCHED_MASK },
{ "flow_mask", TOK_FLOW_MASK },
{ "droptail", TOK_DROPTAIL },
+ { "ecn",TOK_ECN },
{ "red",TOK_RED },
{ "gred", TOK_GRED },
{ "bw", TOK_BW },
@@ -239,7 +240,7 @@ print_flowset_parms(struct dn_fs *fs, ch
else
plr[0] = '\0';
- if (fs->flags & DN_IS_RED) /* RED parameters */
+ if (fs->flags & DN_IS_RED) {/* RED parameters */
sprintf(red,
"\n\t %cRED w_q %f min_th %d max_th %d max_p %f",
(fs->flags & DN_IS_GENTLE_RED) ? 'G' : ' ',
@@ -247,7 +248,9 @@ print_flowset_parms(struct dn_fs *fs, ch
fs->min_th,
fs->max_th,
1.0 * fs->max_p / (double)(1 << SCALE_RED));
- else
+ if (fs->flags & DN_IS_ECN)
+ strncat(red, " (ecn)", 6);
+ } else
sprintf(red, "droptail");
if (prefix[0]) {
@@ -1046,13 +1049,17 @@ end_mask:
}
if ((end = strsep(&av[0], "/"))) {
double max_p = strtod(end, NULL);
- if (max_p > 1 || max_p <= 0)
- errx(EX_DATAERR, "0 < max_p <= 1");
+ if (max_p > 1 || max_p < 0)
+ errx(EX_DATAERR, "0 <= max_p <= 1");
fs->max_p = (int)(max_p * (1 << SCALE_RED));
}
ac--; av++;
break;
+ case TOK_ECN:
+ fs->flags |= DN_IS_ECN;
+ break;
+
case TOK_DROPTAIL:
NEED(fs, "droptail is only for flowsets");
fs->flags &= ~(DN_IS_RED|DN_IS_GENTLE_RED);
@@ -1175,13 +1182,20 @@ end_mask:
errx(EX_DATAERR, "2 <= queue size <= %ld", limit);
}
+ if ((fs->flags & DN_IS_ECN) && !(fs->flags & DN_IS_RED))
+ errx(EX_USAGE, "enable red/gred for ECN");
+
if (fs->flags & DN_IS_RED) {
size_t len;
int lookup_depth, avg_pkt_size;
- if (fs->min_th >= fs->max_th)
+ if (!(fs->flags & DN_IS_ECN) && (fs->min_th >= fs->max_th))
errx(EX_DATAERR, "min_th %d must be < than max_th %d",
fs->min_th, fs->max_th);
+ else if ((fs->flags & DN_IS_ECN) && (fs->min_th > fs->max_th))
+ errx(EX_DATAERR, "min_th %d must be =< than max_th %d",
+ fs->min_th, fs->max_th);
+
if (fs->max_th == 0)
errx(EX_DATAERR, "max_th must be > 0");
Modified: head/sbin/ipfw/ipfw.8
==
--- head/sbin/ipfw/ipfw.8 Sun Jun 1 05:02:48 2014(r266940)
+++ head/sbin/ipfw/ipfw.8 Sun Jun 1 07:28:24 2014(r266941)
@@ -1,7 +1,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 25, 2012
+.Dd May 31, 2014
.Dt IPFW 8
.Os
.Sh NAME
@@ -2441,22 +2441,23 @@ and
control the maximum lengths that can be specified.
.Pp
.It Cm red | gred Ar w_q Ns / Ns Ar min_th Ns / Ns Ar max_th Ns / Ns Ar max_p
+[ecn]
Make use of the RED (Random Early Detection) queue management algorithm.
.Ar w_q
and
.Ar max_p
are floating
-point numbers between 0 and 1 (0 not included), while
+point numbers between 0 and 1 (inclusive), while
.Ar min_th
and
.Ar max_th
are integer numbers specifying thresholds for queue management
(thresholds are computed in bytes if the queue has been defined
in bytes, in slots otherwise).
-The
+The two parameters can also be of the same value if needed. The
.Nm dummynet
-also supports the gentle RED variant (gred).
-Three
+also supports the gentle R
svn commit: r266942 - head/sys/arm/samsung/exynos
Author: br
Date: Sun Jun 1 07:34:54 2014
New Revision: 266942
URL: http://svnweb.freebsd.org/changeset/base/266942
Log:
Do only receive chars if there are some data in the buffer.
This fixes operation on newer Exynos boards.
Modified:
head/sys/arm/samsung/exynos/uart.c
Modified: head/sys/arm/samsung/exynos/uart.c
==
--- head/sys/arm/samsung/exynos/uart.c Sun Jun 1 07:28:24 2014
(r266941)
+++ head/sys/arm/samsung/exynos/uart.c Sun Jun 1 07:34:54 2014
(r266942)
@@ -286,8 +286,13 @@ s3c2410_bus_setsig(struct uart_softc *sc
static int
s3c2410_bus_receive(struct uart_softc *sc)
{
+ struct uart_bas *bas;
+
+ bas = &sc->sc_bas;
+ while (bus_space_read_4(bas->bst, bas->bsh,
+ SSCOM_UFSTAT) & UFSTAT_RXCOUNT)
+ uart_rx_put(sc, uart_getreg(&sc->sc_bas, SSCOM_URXH));
- uart_rx_put(sc, uart_getreg(&sc->sc_bas, SSCOM_URXH));
return (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: r266943 - in head/sys: arm/conf arm/samsung/exynos boot/fdt/dts/arm
Author: br Date: Sun Jun 1 08:15:34 2014 New Revision: 266943 URL: http://svnweb.freebsd.org/changeset/base/266943 Log: Add support for Exynos 5420 Octa - 8-core heterogeneous (big.LITTLE) ARM machine (4 x Cortex-A15 @ 1.8Ghz, 4 x Cortex-A7 @ 1Ghz) Add configuration for Arndale Octa development board Added: head/sys/arm/conf/ARNDALE-OCTA (contents, props changed) head/sys/arm/conf/EXYNOS5.common (contents, props changed) head/sys/arm/conf/EXYNOS5250 - copied, changed from r266941, head/sys/arm/conf/EXYNOS5250.common head/sys/arm/conf/EXYNOS5420 (contents, props changed) head/sys/arm/samsung/exynos/std.exynos5250 - copied unchanged from r266941, head/sys/arm/samsung/exynos/std.exynos5 head/sys/arm/samsung/exynos/std.exynos5420 (contents, props changed) head/sys/boot/fdt/dts/arm/exynos5.dtsi (contents, props changed) head/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts (contents, props changed) head/sys/boot/fdt/dts/arm/exynos5420.dtsi (contents, props changed) Deleted: head/sys/arm/conf/EXYNOS5250.common head/sys/arm/samsung/exynos/std.exynos5 Modified: head/sys/arm/conf/ARNDALE head/sys/arm/conf/CHROMEBOOK head/sys/boot/fdt/dts/arm/exynos5250-arndale.dts head/sys/boot/fdt/dts/arm/exynos5250.dtsi Modified: head/sys/arm/conf/ARNDALE == --- head/sys/arm/conf/ARNDALE Sun Jun 1 07:34:54 2014(r266942) +++ head/sys/arm/conf/ARNDALE Sun Jun 1 08:15:34 2014(r266943) @@ -19,7 +19,7 @@ #NO_UNIVERSE -include"EXYNOS5250.common" +include"EXYNOS5250" ident ARNDALE #FDT Added: head/sys/arm/conf/ARNDALE-OCTA == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/ARNDALE-OCTA Sun Jun 1 08:15:34 2014 (r266943) @@ -0,0 +1,28 @@ +# Kernel configuration for Arndale Octa Board (Exynos 5420) +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +#NO_UNIVERSE + +include"EXYNOS5420" +ident ARNDALE-OCTA + +#FDT +optionsFDT +optionsFDT_DTB_STATIC +makeoptionsFDT_DTS_FILE=exynos5420-arndale-octa.dts Modified: head/sys/arm/conf/CHROMEBOOK == --- head/sys/arm/conf/CHROMEBOOKSun Jun 1 07:34:54 2014 (r266942) +++ head/sys/arm/conf/CHROMEBOOKSun Jun 1 08:15:34 2014 (r266943) @@ -17,7 +17,7 @@ # # $FreeBSD$ -include"EXYNOS5250.common" +include"EXYNOS5250" ident CHROMEBOOK hints "CHROMEBOOK.hints" Added: head/sys/arm/conf/EXYNOS5.common == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/EXYNOS5.commonSun Jun 1 08:15:34 2014 (r266943) @@ -0,0 +1,129 @@ +# Kernel configuration for Samsung Exynos 5 SoC. +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +makeoptionsMODULES_OVERRIDE="" +makeoptionsWITHOUT_MODULES="ahc" + +makeoptionsDEBUG=-g# Build kernel with gdb(1) debug symbols +makeoptionsWERROR="-Werror" + +optionsHZ=100 +optionsSCHED_4BSD # 4BSD scheduler +optionsINET# InterNETworking +optionsINET6 # IPv6 communications protocols +optionsGEOM_PART_BSD # BSD partition scheme +optionsGEOM_PART_MBR
svn commit: r266944 - head/sys/arm/samsung/exynos
Author: br
Date: Sun Jun 1 08:34:45 2014
New Revision: 266944
URL: http://svnweb.freebsd.org/changeset/base/266944
Log:
Rename exynos uart driver filenames.
Added:
head/sys/arm/samsung/exynos/exynos_uart.c
- copied, changed from r266942, head/sys/arm/samsung/exynos/uart.c
head/sys/arm/samsung/exynos/exynos_uart.h
- copied unchanged from r266941, head/sys/arm/samsung/exynos/uart.h
Deleted:
head/sys/arm/samsung/exynos/uart.c
head/sys/arm/samsung/exynos/uart.h
Modified:
head/sys/arm/samsung/exynos/files.exynos5
Copied and modified: head/sys/arm/samsung/exynos/exynos_uart.c (from r266942,
head/sys/arm/samsung/exynos/uart.c)
==
--- head/sys/arm/samsung/exynos/uart.c Sun Jun 1 07:34:54 2014
(r266942, copy source)
+++ head/sys/arm/samsung/exynos/exynos_uart.c Sun Jun 1 08:34:45 2014
(r266944)
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
+#include
#include "uart_if.h"
Copied: head/sys/arm/samsung/exynos/exynos_uart.h (from r266941,
head/sys/arm/samsung/exynos/uart.h)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/samsung/exynos/exynos_uart.h Sun Jun 1 08:34:45 2014
(r266944, copy of r266941, head/sys/arm/samsung/exynos/uart.h)
@@ -0,0 +1,126 @@
+/* $NetBSD: s3c2xx0reg.h,v 1.4 2004/02/12 03:47:29 bsh Exp $ */
+
+/*-
+ * Copyright (c) 2002, 2003 Fujitsu Component Limited
+ * Copyright (c) 2002, 2003 Genetec Corporation
+ * 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.
+ * 3. Neither the name of The Fujitsu Component Limited nor the name of
+ *Genetec corporation may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY FUJITSU COMPONENT LIMITED AND GENETEC
+ * CORPORATION ``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 FUJITSU COMPONENT LIMITED OR GENETEC
+ * CORPORATION 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$
+ */
+
+/* s3c2410-specific registers */
+#defineUMCON_AFC (1 << 4)/* auto flow control */
+#defineUMSTAT_DCTS (1 << 2)/* CTS change */
+#defineULCON_IR(1 << 6)
+#defineULCON_PARITY_SHIFT 3
+
+/*
+ * Exynos-specific
+ *
+ * UFSTAT_TXFULL register differs between Exynos and others.
+ * Others have UFSTAT_TXFULL (1 << 9)
+ */
+#defineUFSTAT_TXFULL (1 << 24)
+
+#defineSSCOM_UINTM 0x038
+#defineSSCOM_UINTP 0x030
+
+/* common for s3c2800 and s3c24x0 */
+#defineSSCOM_ULCON 0x00/* UART line control */
+#define ULCON_PARITY_NONE (0 << ULCON_PARITY_SHIFT)
+#define ULCON_PARITY_ODD (4 << ULCON_PARITY_SHIFT)
+#define ULCON_PARITY_EVEN (5 << ULCON_PARITY_SHIFT)
+#define ULCON_PARITY_ONE (6 << ULCON_PARITY_SHIFT)
+#define ULCON_PARITY_ZERO (7 << ULCON_PARITY_SHIFT)
+#define ULCON_STOP (1 << 2)
+#define ULCON_LENGTH_5 0
+#define ULCON_LENGTH_6 1
+#define ULCON_LENGTH_7 2
+#define ULCON_LENGTH_8 3
+#defineSSCOM_UCON 0x04/* UART control */
+#define UCON_TXINT_TYPE(1 << 9)/* Tx interrupt.
0=pulse,1=level */
+#define UCON_TXINT_TYPE_LEVEL UCON_TXINT_TYPE
+#define UCON_TXINT_TYPE_PULSE 0
+#define UCON_RXINT_TYPE(1 << 8)/* Rx interrupt */
+#define UCON_RXINT_TYPE_LEVEL UCON_RXINT_TYPE
+#define UCON_RXINT_TYPE_PULSE 0
+#define UCON_TOINT (1 << 7)/* Rx timeout interru
svn commit: r266945 - head/sys/arm/samsung/exynos
Author: br
Date: Sun Jun 1 08:45:27 2014
New Revision: 266945
URL: http://svnweb.freebsd.org/changeset/base/266945
Log:
Fix i2c communication interface to be compatible with
vendor tools, e.g. embedded controller tool
Submitted by: Maxim Ignatenko
Modified:
head/sys/arm/samsung/exynos/chrome_ec.c
head/sys/arm/samsung/exynos/exynos5_i2c.c
Modified: head/sys/arm/samsung/exynos/chrome_ec.c
==
--- head/sys/arm/samsung/exynos/chrome_ec.c Sun Jun 1 08:34:45 2014
(r266944)
+++ head/sys/arm/samsung/exynos/chrome_ec.c Sun Jun 1 08:45:27 2014
(r266945)
@@ -165,7 +165,7 @@ ec_command(uint8_t cmd, uint8_t *dout, u
int i;
msg_dout = malloc(dout_len + 4, M_DEVBUF, M_NOWAIT);
- msg_dinp = malloc(dinp_len + 4, M_DEVBUF, M_NOWAIT);
+ msg_dinp = malloc(dinp_len + 3, M_DEVBUF, M_NOWAIT);
if (ec_sc == NULL)
return (-1);
@@ -184,7 +184,7 @@ ec_command(uint8_t cmd, uint8_t *dout, u
struct iic_msg msgs[] = {
{ 0x1e, IIC_M_WR, dout_len + 4, msg_dout, },
- { 0x1e, IIC_M_RD, dinp_len + 4, msg_dinp, },
+ { 0x1e, IIC_M_RD, dinp_len + 3, msg_dinp, },
};
ret = iicbus_transfer(sc->dev, msgs, 2);
@@ -196,7 +196,7 @@ ec_command(uint8_t cmd, uint8_t *dout, u
}
for (i = 0; i < dinp_len; i++) {
- dinp[i] = msg_dinp[i + 3];
+ dinp[i] = msg_dinp[i + 2];
};
free(msg_dout, M_DEVBUF);
Modified: head/sys/arm/samsung/exynos/exynos5_i2c.c
==
--- head/sys/arm/samsung/exynos/exynos5_i2c.c Sun Jun 1 08:34:45 2014
(r266944)
+++ head/sys/arm/samsung/exynos/exynos5_i2c.c Sun Jun 1 08:45:27 2014
(r266945)
@@ -372,6 +372,13 @@ i2c_read(device_t dev, char *buf, int le
mtx_lock(&sc->mutex);
/* dummy read */
+ clear_ipend(sc);
+ error = wait_for_iif(sc);
+ if (error) {
+ DPRINTF("cant i2c read: iif error\n");
+ mtx_unlock(&sc->mutex);
+ return (error);
+ }
READ1(sc, I2CDS);
DPRINTF("Read ");
___
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: r266946 - head/sys/dev/usb/controller
Author: hselasky
Date: Sun Jun 1 10:22:18 2014
New Revision: 266946
URL: http://svnweb.freebsd.org/changeset/base/266946
Log:
Add basic support for isochronous transfers in host mode to the
ISP/SAF1761 driver.
Sponsored by: DARPA, AFRL
Modified:
head/sys/dev/usb/controller/saf1761_otg.c
head/sys/dev/usb/controller/saf1761_otg_reg.h
Modified: head/sys/dev/usb/controller/saf1761_otg.c
==
--- head/sys/dev/usb/controller/saf1761_otg.c Sun Jun 1 08:45:27 2014
(r266945)
+++ head/sys/dev/usb/controller/saf1761_otg.c Sun Jun 1 10:22:18 2014
(r266946)
@@ -112,6 +112,7 @@ SYSCTL_INT(_hw_usb_saf1761_otg, OID_AUTO
static const struct usb_bus_methods saf1761_otg_bus_methods;
static const struct usb_pipe_methods saf1761_otg_non_isoc_methods;
static const struct usb_pipe_methods saf1761_otg_device_isoc_methods;
+static const struct usb_pipe_methods saf1761_otg_host_isoc_methods;
static saf1761_otg_cmd_t saf1761_host_setup_tx;
static saf1761_otg_cmd_t saf1761_host_bulk_data_rx;
@@ -758,7 +759,8 @@ saf1761_host_intr_data_rx(struct saf1761
temp = SOTG_PTD_DW3_ACTIVE | (td->toggle << 25) | SOTG_PTD_DW3_CERR_3;
SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW3, temp);
- temp = (SOTG_HC_MEMORY_ADDR(SOTG_DATA_ADDR(td->channel)) << 8) |
(td->interval & 0xF8);
+ temp = (SOTG_HC_MEMORY_ADDR(SOTG_DATA_ADDR(td->channel)) << 8) |
+ (td->interval & 0xF8);
SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW2, temp);
temp = td->dw1_value | (1 << 10) /* IN-PID */ | (td->ep_index >> 1);
@@ -847,7 +849,8 @@ saf1761_host_intr_data_tx(struct saf1761
temp = SOTG_PTD_DW3_ACTIVE | (td->toggle << 25) | SOTG_PTD_DW3_CERR_3;
SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW3, temp);
- temp = (SOTG_HC_MEMORY_ADDR(SOTG_DATA_ADDR(td->channel)) << 8) |
(td->interval & 0xF8);
+ temp = (SOTG_HC_MEMORY_ADDR(SOTG_DATA_ADDR(td->channel)) << 8) |
+ (td->interval & 0xF8);
SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW2, temp);
temp = td->dw1_value | (0 << 10) /* OUT-PID */ | (td->ep_index >> 1);
@@ -874,21 +877,160 @@ complete:
static uint8_t
saf1761_host_isoc_data_rx(struct saf1761_otg_softc *sc, struct saf1761_otg_td
*td)
{
+ uint32_t pdt_addr;
+ uint32_t temp;
+
+ if (td->channel < SOTG_HOST_CHANNEL_MAX) {
+ uint32_t status;
+ uint32_t count;
+
+ pdt_addr = SOTG_PTD(td->channel);
+
+ status = saf1761_peek_host_status_le_4(sc, pdt_addr +
SOTG_PTD_DW3);
+
+ DPRINTFN(5, "STATUS=0x%08x\n", status);
+
+ if (status & SOTG_PTD_DW3_ACTIVE) {
+ goto busy;
+ } else if (status & SOTG_PTD_DW3_HALTED) {
+ goto complete;
+ }
+ count = (status & SOTG_PTD_DW3_XFER_COUNT);
+
+ /* verify the packet byte count */
+ if (count != td->max_packet_size) {
+ if (count < td->max_packet_size) {
+ /* we have a short packet */
+ td->short_pkt = 1;
+ } else {
+ /* invalid USB packet */
+ td->error_any = 1;
+ goto complete;
+ }
+ }
+
+ /* verify the packet byte count */
+ if (count > td->remainder) {
+ /* invalid USB packet */
+ td->error_any = 1;
+ goto complete;
+ }
+
+ saf1761_read_host_memory(sc, td, count);
+ goto complete;
+ }
+
+ if (saf1761_host_channel_alloc(sc, td))
+ goto busy;
+
+ /* receive one more packet */
+
+ pdt_addr = SOTG_PTD(td->channel);
+
+ SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW7, 0);
+ SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW6, 0);
+
+ temp = (0xFC << td->uframe) & 0xFF; /* complete split */
+ SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW5, temp);
+
+ temp = (1U << td->uframe); /* start split */
+ SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW4, temp);
+
+ temp = SOTG_PTD_DW3_ACTIVE | SOTG_PTD_DW3_CERR_3;
+ SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW3, temp);
+
+ temp = (SOTG_HC_MEMORY_ADDR(SOTG_DATA_ADDR(td->channel)) << 8);
+ SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW2, temp);
+
+ temp = td->dw1_value | (1 << 10) /* IN-PID */ | (td->ep_index >> 1);
+ SAF1761_WRITE_LE_4(sc, pdt_addr + SOTG_PTD_DW1, temp);
+
+ temp = (td->ep_index << 31) | (1 << 29) /* pkt-multiplier */ |
+ (td->max_packet_size << 18) /* wMaxPacketSize */ |
+ (td->max_packet_size << 3) /* transfer count */ |
+ SOTG_PTD_DW0
svn commit: r266947 - head/bin/sh
Author: jilles Date: Sun Jun 1 11:25:34 2014 New Revision: 266947 URL: http://svnweb.freebsd.org/changeset/base/266947 Log: sh: Avoid undefined behaviour shifting negative values left in arithmetic. With i386 base clang, arith_yacc.o remains unchanged. Modified: head/bin/sh/arith_yacc.c Modified: head/bin/sh/arith_yacc.c == --- head/bin/sh/arith_yacc.cSun Jun 1 10:22:18 2014(r266946) +++ head/bin/sh/arith_yacc.cSun Jun 1 11:25:34 2014(r266947) @@ -139,7 +139,7 @@ static arith_t do_binop(int op, arith_t case ARITH_SUB: return (uintmax_t)a - (uintmax_t)b; case ARITH_LSHIFT: - return a << b; + return (uintmax_t)a << b; case ARITH_RSHIFT: return a >> b; case ARITH_LT: ___ 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: r266948 - head/usr.bin/printf/tests
Author: jilles Date: Sun Jun 1 13:33:22 2014 New Revision: 266948 URL: http://svnweb.freebsd.org/changeset/base/266948 Log: printf: Install tests/regress.missingpos1.out, fixing tests. Modified: head/usr.bin/printf/tests/Makefile Modified: head/usr.bin/printf/tests/Makefile == --- head/usr.bin/printf/tests/Makefile Sun Jun 1 11:25:34 2014 (r266947) +++ head/usr.bin/printf/tests/Makefile Sun Jun 1 13:33:22 2014 (r266948) @@ -15,6 +15,7 @@ FILES+= regress.m2.out FILES+=regress.m3.out FILES+=regress.m4.out FILES+=regress.m5.out +FILES+=regress.missingpos1.out FILES+=regress.s.out FILES+=regress.sh FILES+=regress.zero.out ___ 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: r266943 - in head/sys: arm/conf arm/samsung/exynos boot/fdt/dts/arm
On Sun, 1 Jun 2014 08:15:34 + (UTC) Ruslan Bukin wrote: > Author: br > Date: Sun Jun 1 08:15:34 2014 > New Revision: 266943 > URL: http://svnweb.freebsd.org/changeset/base/266943 > > Log: > Add support for Exynos 5420 Octa - 8-core > heterogeneous (big.LITTLE) ARM machine > (4 x Cortex-A15 @ 1.8Ghz, 4 x Cortex-A7 @ 1Ghz) > > Add configuration for Arndale Octa development board > > Added: > head/sys/arm/conf/ARNDALE-OCTA (contents, props changed) > head/sys/arm/conf/EXYNOS5.common (contents, props changed) > head/sys/arm/conf/EXYNOS5250 > - copied, changed from r266941, > head/sys/arm/conf/EXYNOS5250.common head/sys/arm/conf/EXYNOS5420 > (contents, props changed) head/sys/arm/samsung/exynos/std.exynos5250 > - copied unchanged from r266941, > head/sys/arm/samsung/exynos/std.exynos5 > head/sys/arm/samsung/exynos/std.exynos5420 (contents, props > changed) head/sys/boot/fdt/dts/arm/exynos5.dtsi (contents, props > changed) head/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts > (contents, props changed) head/sys/boot/fdt/dts/arm/exynos5420.dtsi > (contents, props changed) Deleted: head/sys/arm/conf/EXYNOS5250.common > head/sys/arm/samsung/exynos/std.exynos5 > Modified: > head/sys/arm/conf/ARNDALE > head/sys/arm/conf/CHROMEBOOK > head/sys/boot/fdt/dts/arm/exynos5250-arndale.dts > head/sys/boot/fdt/dts/arm/exynos5250.dtsi The EXYNOS5250 and EXYNOS5420 configs are missing an ident value. This causes universe to break. The following patch fixes it. Andrew Index: EXYNOS5250 === --- EXYNOS5250 (revision 266949) +++ EXYNOS5250 (working copy) @@ -17,6 +17,7 @@ # # $FreeBSD$ +ident EXYNOS5250 include"EXYNOS5.common" include"../samsung/exynos/std.exynos5250" Index: EXYNOS5420 === --- EXYNOS5420 (revision 266949) +++ EXYNOS5420 (working copy) @@ -17,6 +17,7 @@ # # $FreeBSD$ +ident EXYNOS5420 include"EXYNOS5.common" include"../samsung/exynos/std.exynos5420" ___ 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: r266950 - head/sys/arm/conf
Author: br Date: Sun Jun 1 17:09:02 2014 New Revision: 266950 URL: http://svnweb.freebsd.org/changeset/base/266950 Log: Add ident value. This fixes universe build. Pointed out by: andrew Modified: head/sys/arm/conf/EXYNOS5250 head/sys/arm/conf/EXYNOS5420 Modified: head/sys/arm/conf/EXYNOS5250 == --- head/sys/arm/conf/EXYNOS5250Sun Jun 1 16:35:22 2014 (r266949) +++ head/sys/arm/conf/EXYNOS5250Sun Jun 1 17:09:02 2014 (r266950) @@ -17,6 +17,7 @@ # # $FreeBSD$ +ident EXYNOS5250 include"EXYNOS5.common" include"../samsung/exynos/std.exynos5250" Modified: head/sys/arm/conf/EXYNOS5420 == --- head/sys/arm/conf/EXYNOS5420Sun Jun 1 16:35:22 2014 (r266949) +++ head/sys/arm/conf/EXYNOS5420Sun Jun 1 17:09:02 2014 (r266950) @@ -17,6 +17,7 @@ # # $FreeBSD$ +ident EXYNOS5420 include"EXYNOS5.common" include"../samsung/exynos/std.exynos5420" ___ 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: r266943 - in head/sys: arm/conf arm/samsung/exynos boot/fdt/dts/arm
On Sun, Jun 01, 2014 at 05:57:42PM +0100, Andrew Turner wrote: > The EXYNOS5250 and EXYNOS5420 configs are missing an ident value. This > causes universe to break. The following patch fixes it. Thanks. ___ 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: r266951 - in head/sys/dev/virtio: . pci
Author: bryanv
Date: Sun Jun 1 18:16:01 2014
New Revision: 266951
URL: http://svnweb.freebsd.org/changeset/base/266951
Log:
Split the virtio.h header file into multiple files
Reorganize the previous contexts of the file as it is in Linux. The
eventual goal is to install the header files and share them between
the kernel and bhyve.
MFC after:1 week
Added:
head/sys/dev/virtio/virtio_config.h (contents, props changed)
head/sys/dev/virtio/virtio_ids.h (contents, props changed)
Modified:
head/sys/dev/virtio/pci/virtio_pci.c
head/sys/dev/virtio/virtio.c
head/sys/dev/virtio/virtio.h
head/sys/dev/virtio/virtqueue.c
Modified: head/sys/dev/virtio/pci/virtio_pci.c
==
--- head/sys/dev/virtio/pci/virtio_pci.cSun Jun 1 17:09:02 2014
(r266950)
+++ head/sys/dev/virtio/pci/virtio_pci.cSun Jun 1 18:16:01 2014
(r266951)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
Modified: head/sys/dev/virtio/virtio.c
==
--- head/sys/dev/virtio/virtio.cSun Jun 1 17:09:02 2014
(r266950)
+++ head/sys/dev/virtio/virtio.cSun Jun 1 18:16:01 2014
(r266951)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include "virtio_bus_if.h"
Modified: head/sys/dev/virtio/virtio.h
==
--- head/sys/dev/virtio/virtio.hSun Jun 1 17:09:02 2014
(r266950)
+++ head/sys/dev/virtio/virtio.hSun Jun 1 18:16:01 2014
(r266951)
@@ -1,29 +1,27 @@
/*-
- * This header is BSD licensed so anyone can use the definitions to implement
- * compatible drivers/servers.
+ * Copyright (c) 2014, Bryan Venteicher
+ * 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.
+ *notice unmodified, 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.
- * 3. Neither the name of IBM nor the names of its contributors
- *may be used to endorse or promote products derived from this software
- *without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 IBM 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.
+ *
+ * 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$
*/
@@ -31,44 +29,9 @@
#ifndef _VIRTIO_H_
#define _VIRTIO_H_
-struct vq_alloc_info;
-
-/* VirtIO device IDs. */
-#define VIRTIO_ID_NETWORK 0x01
-#define VIRTIO_ID_BLOCK0x02
-#define VIRTIO_ID_CONSOLE 0x03
-#define VIRTIO_ID_ENTROPY 0x04
-#define VIRTIO_ID_BALLOON 0x05
-#define VIRTIO_ID_IOMEMORY 0x06
-#define VIRTIO_ID_SCSI 0x08
-#define VIRTIO_ID_9P 0x09
-
-/* Status byte for guest to report progress. */
-#define VIRTIO_CONFIG_STATUS_RESET 0x00
-#define VIRTIO_CONFIG_STATUS_ACK 0x01
-#define VIRTIO_CONFIG_STATUS_DRIVER0x02
-#define VIRTIO_CONFIG_STATUS_DRIVER_OK 0x04
-#define VIRTIO_CONFIG_STATUS_FAILED0x
svn commit: r266955 - head/sys/netpfil/ipfw
Author: hiren
Date: Sun Jun 1 20:19:17 2014
New Revision: 266955
URL: http://svnweb.freebsd.org/changeset/base/266955
Log:
DNOLD_IS_ECN introduced by r266941 is not required.
DNOLD_* flags are for compat with old binaries.
Suggested by: luigi
Modified:
head/sys/netpfil/ipfw/ip_dn_glue.c
Modified: head/sys/netpfil/ipfw/ip_dn_glue.c
==
--- head/sys/netpfil/ipfw/ip_dn_glue.c Sun Jun 1 20:08:37 2014
(r266954)
+++ head/sys/netpfil/ipfw/ip_dn_glue.c Sun Jun 1 20:19:17 2014
(r266955)
@@ -83,7 +83,6 @@ struct dn_flow_set {
#define DNOLD_QSIZE_IS_BYTES 0x0008 /* queue size is measured in bytes */
#define DNOLD_NOERROR 0x0010 /* do not report ENOBUFS on drops */
#define DNOLD_HAS_PROFILE 0x0020 /* the pipe has a delay profile. */
-#define DNOLD_IS_ECN 0x0040
#define DNOLD_IS_PIPE 0x4000
#define DNOLD_IS_QUEUE 0x8000
@@ -339,8 +338,6 @@ convertflags2new(int src)
dst |= DN_IS_RED;
if (src & DNOLD_IS_GENTLE_RED)
dst |= DN_IS_GENTLE_RED;
- if (src & DNOLD_IS_ECN)
- dst |= DN_IS_ECN;
if (src & DNOLD_HAS_PROFILE)
dst |= DN_HAS_PROFILE;
___
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: r266959 - head
Author: eadler
Date: Mon Jun 2 00:21:42 2014
New Revision: 266959
URL: http://svnweb.freebsd.org/changeset/base/266959
Log:
arc: add linting for python files
Added:
head/.arclint (contents, props changed)
Added: head/.arclint
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/.arclint Mon Jun 2 00:21:42 2014(r266959)
@@ -0,0 +1,9 @@
+{
+ "linters": {
+"python": {
+ "type": "pep8",
+ "exclude": "(contrib)",
+ "include": "(\\.py$)"
+}
+ }
+}
___
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: r266960 - in head: share/man/man4/man4.arm sys/arm/ti
Author: loos
Date: Mon Jun 2 02:00:17 2014
New Revision: 266960
URL: http://svnweb.freebsd.org/changeset/base/266960
Log:
Configure the analog input 7 which, on BBB, is connected to the 3V3B rail
through a voltage divisor (R163 and R164 on page 4 of BBB schematic).
Add a note about this on ti_adc(4) man page. The ti_adc(4) man page will
first appear on 10.1-RELEASE.
MFC after:1 week
Suggested by: Sulev-Madis Silber (ketas)
Manual page reviewed by: brueffer (D127)
Modified:
head/share/man/man4/man4.arm/ti_adc.4
head/sys/arm/ti/ti_adc.c
head/sys/arm/ti/ti_adcreg.h
head/sys/arm/ti/ti_adcvar.h
Modified: head/share/man/man4/man4.arm/ti_adc.4
==
--- head/share/man/man4/man4.arm/ti_adc.4 Mon Jun 2 00:21:42 2014
(r266959)
+++ head/share/man/man4/man4.arm/ti_adc.4 Mon Jun 2 02:00:17 2014
(r266960)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 21, 2014
+.Dd June 1, 2014
.Dt TI_ADC 4
.Os
.Sh NAME
@@ -78,8 +78,17 @@ dev.ti_adc.0.ain.6.enable: 1
dev.ti_adc.0.ain.6.open_delay: 0
dev.ti_adc.0.ain.6.samples_avg: 4
dev.ti_adc.0.ain.6.input: 2308
+dev.ti_adc.0.ain.7.enable: 1
+dev.ti_adc.0.ain.7.open_delay: 0
+dev.ti_adc.0.ain.7.samples_avg: 0
+dev.ti_adc.0.ain.7.input: 3812
.Ed
.Pp
+On Beaglebone-black the analog input 7 is connected to the 3V3B rail through
+a voltage divisor (2:1).
+The 3V3B voltage rail comes from the TL5209 LDO regulator which is limited
+to 500mA maximum.
+.Pp
Global settings:
.Bl -tag -width ".Va dev.ti_adc.0.clockdiv"
.It Va dev.ti_adc.0.clockdiv
@@ -112,8 +121,8 @@ It is made of a 12 bit value (0 ~ 4095).
The
.Nm
driver first appeared in
-.Fx 11.0 .
+.Fx 10.1 .
.Sh AUTHORS
.An -nosplit
The driver and this manual page was written by
-.An Luiz Otavio O Souza Aq l...@freebsd.org
+.An Luiz Otavio O Souza Aq l...@freebsd.org .
Modified: head/sys/arm/ti/ti_adc.c
==
--- head/sys/arm/ti/ti_adc.cMon Jun 2 00:21:42 2014(r266959)
+++ head/sys/arm/ti/ti_adc.cMon Jun 2 02:00:17 2014(r266960)
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-/* Define our 7 steps, one for each input channel. */
+/* Define our 8 steps, one for each input channel. */
static struct ti_adc_input ti_adc_inputs[TI_ADC_NPINS] = {
{ .stepconfig = ADC_STEPCFG1, .stepdelay = ADC_STEPDLY1 },
{ .stepconfig = ADC_STEPCFG2, .stepdelay = ADC_STEPDLY2 },
@@ -59,6 +59,7 @@ static struct ti_adc_input ti_adc_inputs
{ .stepconfig = ADC_STEPCFG5, .stepdelay = ADC_STEPDLY5 },
{ .stepconfig = ADC_STEPCFG6, .stepdelay = ADC_STEPDLY6 },
{ .stepconfig = ADC_STEPCFG7, .stepdelay = ADC_STEPDLY7 },
+ { .stepconfig = ADC_STEPCFG8, .stepdelay = ADC_STEPDLY8 },
};
static int ti_adc_samples[5] = { 0, 2, 4, 8, 16 };
Modified: head/sys/arm/ti/ti_adcreg.h
==
--- head/sys/arm/ti/ti_adcreg.h Mon Jun 2 00:21:42 2014(r266959)
+++ head/sys/arm/ti/ti_adcreg.h Mon Jun 2 02:00:17 2014(r266960)
@@ -81,6 +81,8 @@
#defineADC_STEPDLY60x090
#defineADC_STEPCFG70x094
#defineADC_STEPDLY70x098
+#defineADC_STEPCFG80x09c
+#defineADC_STEPDLY80x0a0
#defineADC_STEP_DIFF_CNTRL (1 << 25)
#defineADC_STEP_RFM_MSK0x0180
#defineADC_STEP_RFM_SHIFT 23
Modified: head/sys/arm/ti/ti_adcvar.h
==
--- head/sys/arm/ti/ti_adcvar.h Mon Jun 2 00:21:42 2014(r266959)
+++ head/sys/arm/ti/ti_adcvar.h Mon Jun 2 02:00:17 2014(r266960)
@@ -29,7 +29,7 @@
#ifndef _TI_ADCVAR_H_
#define _TI_ADCVAR_H_
-#defineTI_ADC_NPINS7
+#defineTI_ADC_NPINS8
#defineADC_READ4(_sc, reg) bus_read_4((_sc)->sc_mem_res, reg)
#defineADC_WRITE4(_sc, reg, 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: r266961 - head/usr.sbin/bsnmpd/modules/snmp_lm75
Author: loos Date: Mon Jun 2 02:20:28 2014 New Revision: 266961 URL: http://svnweb.freebsd.org/changeset/base/266961 Log: Never, ever, abbreviate the month names on manual pages. Pointed out by: brueffer Pointy hat to:loos Modified: head/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3 Modified: head/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3 == --- head/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3 Mon Jun 2 02:00:17 2014(r266960) +++ head/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3 Mon Jun 2 02:20:28 2014(r266961) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Jun 1, 2014 +.Dd June 2, 2014 .Dt SNMP_LM75 3 .Os .Sh NAME ___ 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: r266962 - head/share/man/man9
Author: bjk (doc committer) Date: Mon Jun 2 03:03:57 2014 New Revision: 266962 URL: http://svnweb.freebsd.org/changeset/base/266962 Log: Document some more socket features Add some mention of the functions used by protocol implementations, upcalls, and other general routines. Not all functionality is documented; in particular: o the *at() variants, which are useful only for implementing the corresponding syscalls. o soconnect2(), also only used to implement a syscall (socketpair()). o sockargs(), which is essentually unused and only tangentially socket-related. o selsocket(), which is commented as being present solely for use by netncp and netsmb. o getsockaddr(), which is just a convenience shortcut for copyin(). Reviewed by: jhb (previous version) Approved by: hrs (mentor) Modified: head/share/man/man9/Makefile head/share/man/man9/socket.9 Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileMon Jun 2 02:20:28 2014 (r266961) +++ head/share/man/man9/MakefileMon Jun 2 03:03:57 2014 (r266962) @@ -1260,15 +1260,41 @@ MLINKS+=sleepqueue.9 init_sleepqueues.9 sleepqueue.9 sleepq_timedwait_sig.9 \ sleepqueue.9 sleepq_wait.9 \ sleepqueue.9 sleepq_wait_sig.9 -MLINKS+=socket.9 sobind.9 \ +MLINKS+=socket.9 soabort.9 \ + socket.9 soaccept.9 \ + socket.9 sobind.9 \ + socket.9 socheckuid.9 \ socket.9 soclose.9 \ socket.9 soconnect.9 \ socket.9 socreate.9 \ + socket.9 sodisconnect.9 \ + socket.9 sodupsockaddr.9 \ + socket.9 sofree.9 \ socket.9 sogetopt.9 \ + socket.9 sohasoutofband.9 \ + socket.9 solisten.9 \ + socket.9 solisten_proto.9 \ + socket.9 solisten_proto_check.9 \ + socket.9 sonewconn.9 \ + socket.9 sooptcopyin.9 \ + socket.9 sooptcopyout.9 \ + socket.9 sopoll.9 \ + socket.9 sopoll_generic.9 \ socket.9 soreceive.9 \ + socket.9 soreceive_dgram.9 \ + socket.9 soreceive_generic.9 \ + socket.9 soreceive_stream.9 \ + socket.9 soreserve.9 \ + socket.9 sorflush.9 \ socket.9 sosend.9 \ + socket.9 sosend_dgram.9 \ + socket.9 sosend_generic.9 \ socket.9 sosetopt.9 \ - socket.9 soshutdown.9 + socket.9 soshutdown.9 \ + socket.9 sotoxsocket.9 \ + socket.9 soupcall_clear.9 \ + socket.9 soupcall_set.9 \ + socket.9 sowakeup.9 MLINKS+=spl.9 spl0.9 \ spl.9 splbio.9 \ spl.9 splclock.9 \ Modified: head/share/man/man9/socket.9 == --- head/share/man/man9/socket.9Mon Jun 2 02:20:28 2014 (r266961) +++ head/share/man/man9/socket.9Mon Jun 2 03:03:57 2014 (r266962) @@ -1,5 +1,6 @@ .\"- .\" Copyright (c) 2006 Robert N. M. Watson +.\" Copyright (c) 2014 Benjamin J. Kaduk .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 12, 2013 +.Dd May 26, 2014 .Dt SOCKET 9 .Os .Sh NAME @@ -34,6 +35,12 @@ .Sh SYNOPSIS .In sys/socket.h .In sys/socketvar.h +.Ft void +.Fn soabort "struct socket *so" +.Ft int +.Fn soaccept "struct socket *so" "struct sockaddr **nam" +.Ft int +.Fn socheckuid "struct socket *so" "uid_t uid" .Ft int .Fn sobind "struct socket *so" "struct sockaddr *nam" "struct thread *td" .Ft void @@ -46,21 +53,97 @@ .Fa "struct ucred *cred" "struct thread *td" .Fc .Ft int -.Fn sogetopt "struct socket *so" "struct sockopt *sopt" +.Fn sodisconnect "struct socket *so" +.Ft struct sockaddr * +.Fn sodupsockaddr "const struct sockaddr *sa" "int mflags" +.Ft void +.Fn sofree "struct socket *so" +.Ft void +.Fn sohasoutofband "struct socket *so" +.Ft int +.Fn solisten "struct socket *so" "int backlog" "struct thread *td" +.Ft void +.Fn solisten_proto "struct socket *so" "int backlog" +.Ft int +.Fn solisten_proto_check "struct socket *so" +.Ft struct socket * +.Fn sonewconn "struct socket *head" "int connstatus" +.Ft int +.Fo sopoll +.Fa "struct socket *so" "int events" "struct ucred *active_cred" +.Fa "struct thread *td" +.Fc +.Ft int +.Fo sopoll_generic +.Fa "struct socket *so" "int events" "struct ucred *active_cred" +.Fa "struct thread *td" +.Fc .Ft int .Fo soreceive .Fa "struct socket *so" "struct sockaddr **psa" "struct uio *uio" .Fa "struct mbuf **mp0" "struct mbuf **controlp" "int *flagsp" .Fc .Ft int -.Fn sosetopt "struct socket *so" "struct sockopt *sopt" +.Fo soreceive_stream +.Fa "struct socket *so" "struct sockaddr **paddr" +.Fa "struct uio *uio" "struct mbuf **mp0" "struct mbuf **controlp" +.Fa "int *flagsp" +.Fc +.Ft int +.Fo soreceive_dgram +.Fa "struct socket *so" "struct sockaddr **paddr" +.Fa "struct uio *uio" "struct mbuf **mp0" "struct mbuf **controlp" +.F
svn commit: r266963 - head/share/man/man4
Author: bjk (doc committer) Date: Mon Jun 2 03:07:16 2014 New Revision: 266963 URL: http://svnweb.freebsd.org/changeset/base/266963 Log: Note that recording is not supported for snd_envy24* PR: docs/166755 Approved by: hrs (mentor) Modified: head/share/man/man4/snd_envy24.4 head/share/man/man4/snd_envy24ht.4 Modified: head/share/man/man4/snd_envy24.4 == --- head/share/man/man4/snd_envy24.4Mon Jun 2 03:03:57 2014 (r266962) +++ head/share/man/man4/snd_envy24.4Mon Jun 2 03:07:16 2014 (r266963) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 30, 2006 +.Dd June 1, 2014 .Dt SND_ENVY24 4 .Os .Sh NAME @@ -65,6 +65,8 @@ M-Audio Delta Dio 2496 .It Terratec DMX 6fire .El +Only analog playback is supported. +Recording and other features of these cards are not supported. .Sh SEE ALSO .Xr sound 4 .Sh HISTORY Modified: head/share/man/man4/snd_envy24ht.4 == --- head/share/man/man4/snd_envy24ht.4 Mon Jun 2 03:03:57 2014 (r266962) +++ head/share/man/man4/snd_envy24ht.4 Mon Jun 2 03:07:16 2014 (r266963) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 28, 2007 +.Dd June 1, 2014 .Dt SND_ENVY24HT 4 .Os .Sh NAME @@ -85,6 +85,8 @@ Terratec PHASE 22 .It Terratec PHASE 28 .El +Only analog playback is supported. +Recording and other features of these cards are not supported. .Sh SEE ALSO .Xr sound 4 .Sh HISTORY ___ 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: r266964 - head/sys/modules
Author: jmg
Date: Mon Jun 2 03:27:33 2014
New Revision: 266964
URL: http://svnweb.freebsd.org/changeset/base/266964
Log:
enable sound modules on arm.. This is necessary to get the uaudio
module installed...
Modified:
head/sys/modules/Makefile
Modified: head/sys/modules/Makefile
==
--- head/sys/modules/Makefile Mon Jun 2 03:07:16 2014(r266963)
+++ head/sys/modules/Makefile Mon Jun 2 03:27:33 2014(r266964)
@@ -778,6 +778,7 @@ _zfs= zfs
.if ${MACHINE_CPUARCH} == "arm"
_cfi= cfi
_cpsw= cpsw
+_sound=sound
.endif
.if ${MACHINE_CPUARCH} == "ia64"
___
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"
