Re: svn commit: r238672 - head/sys/dev/sdhci
On Sat, Jul 21, 2012 at 03:30:26PM +, Alexey Dokuchaev wrote: A> On Sat, Jul 21, 2012 at 02:07:43PM +, Gleb Smirnoff wrote: A> > Author: glebius A> > Date: Sat Jul 21 14:07:43 2012 A> > New Revision: 238672 A> > URL: http://svn.freebsd.org/changeset/base/238672 A> > A> > Log: A> > Fix typo in comment, should be MHz here. A> A> That's nice, but... A> A> > @@ -364,7 +364,7 @@ sdhci_lower_frequency(device_t dev) A> > A> >/* A> > * Some SD/MMC cards don't work with the default base A> > - * clock frequency of 200MHz. Lower it to 50Hz. A> > + * clock frequency of 200MHz. Lower it to 50MHz. A> A> ... Why losing 2-space break after a sentence (per what we are generally A> adhering and AFAIR is suggested by Chicago Style Guide)? Never heard about this rule. Sorry. -- Totus tuus, Glebius. ___ 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: r238672 - head/sys/dev/sdhci
On Mon, Jul 23, 2012 at 12:12 AM, Gleb Smirnoff wrote: > On Sat, Jul 21, 2012 at 03:30:26PM +, Alexey Dokuchaev wrote: > A> On Sat, Jul 21, 2012 at 02:07:43PM +, Gleb Smirnoff wrote: > A> > Author: glebius > A> > Date: Sat Jul 21 14:07:43 2012 > A> > New Revision: 238672 > A> > URL: http://svn.freebsd.org/changeset/base/238672 > A> > > A> > Log: > A> > Fix typo in comment, should be MHz here. > A> > A> That's nice, but... > A> > A> > @@ -364,7 +364,7 @@ sdhci_lower_frequency(device_t dev) > A> > > A> >/* > A> > * Some SD/MMC cards don't work with the default base > A> > - * clock frequency of 200MHz. Lower it to 50Hz. > A> > + * clock frequency of 200MHz. Lower it to 50MHz. > A> > A> ... Why losing 2-space break after a sentence (per what we are generally > A> adhering and AFAIR is suggested by Chicago Style Guide)? > > Never heard about this rule. Sorry. Actually, English spacing is discouraged in more recent texts; it was encouraged during the late 19th century up until the late 20th century according to ye great wikipedia [1], but I've read several other articles in the past decade that suggest that the English spacing convention be completely abolished. FWIW, I'd just follow surrounding style like style(9) suggests. No reason for fighting over an extra byte per sentence in a source file (unless you consider how much added bandwidth / disk space those precious bytes can consume :)...). Thanks, -Garrett 1. http://en.wikipedia.org/wiki/History_of_sentence_spacing#French_and_English_spacing ___ 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: r238672 - head/sys/dev/sdhci
On Mon, Jul 23, 2012 at 12:28:13AM -0700, Garrett Cooper wrote: > On Mon, Jul 23, 2012 at 12:12 AM, Gleb Smirnoff wrote: > > On Sat, Jul 21, 2012 at 03:30:26PM +, Alexey Dokuchaev wrote: > > A> On Sat, Jul 21, 2012 at 02:07:43PM +, Gleb Smirnoff wrote: > > A> >/* > > A> > * Some SD/MMC cards don't work with the default base > > A> > - * clock frequency of 200MHz. Lower it to 50Hz. > > A> > + * clock frequency of 200MHz. Lower it to 50MHz. > > A> > > A> ... Why losing 2-space break after a sentence (per what we are > > A> generally adhering and AFAIR is suggested by Chicago Style Guide)? > > > > Never heard about this rule. Sorry. > > Actually, English spacing is discouraged in more recent texts; it > was encouraged during the late 19th century up until the late 20th > century according to ye great wikipedia [1], but I've read several > other articles in the past decade that suggest that the English > spacing convention be completely abolished. I was under impression that 2-space rule still makes sense for monospaced text as it improves readability (which is less of an issue for proportional fonts). ./danfe ___ 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: r235864 - in head: contrib/llvm/lib/CodeGen/SelectionDAG contrib/llvm/tools/clang/include/clang/AST contrib/llvm/tools/clang/include/clang/Basic contrib/llvm/tools/clang/include/clang/
On 23-07-2012 00:52, Garrett Cooper wrote: > On Wed, May 23, 2012 at 2:48 PM, Dimitry Andric wrote: >> Author: dim >> Date: Wed May 23 21:48:49 2012 >> New Revision: 235864 >> URL: http://svn.freebsd.org/changeset/base/235864 >> >> Log: >> Upgrade our copy of llvm/clang to 3.1 release. Release notes can be >> found at: http://llvm.org/releases/3.1/docs/ReleaseNotes.html >> >> MFC after:3 days > > Hi Dimitry, > This commit was missing necessary changes to > OptionalObsoleteFiles.inc to remove the clang 3.1 headers. This patch > should fix it. > If I don't hear back in a few days, I'll file a PR and attach my patch. There's a PR already: http://www.freebsd.org/cgi/query-pr.cgi?pr=misc/169902 signature.asc Description: OpenPGP digital signature
Re: svn commit: r235864 - in head: contrib/llvm/lib/CodeGen/SelectionDAG contrib/llvm/tools/clang/include/clang/AST contrib/llvm/tools/clang/include/clang/Basic contrib/llvm/tools/clang/include/clang/
On Jul 23, 2012, at 1:44 AM, Tijl Coosemans wrote: > On 23-07-2012 00:52, Garrett Cooper wrote: >> On Wed, May 23, 2012 at 2:48 PM, Dimitry Andric wrote: >>> Author: dim >>> Date: Wed May 23 21:48:49 2012 >>> New Revision: 235864 >>> URL: http://svn.freebsd.org/changeset/base/235864 >>> >>> Log: >>> Upgrade our copy of llvm/clang to 3.1 release. Release notes can be >>> found at: http://llvm.org/releases/3.1/docs/ReleaseNotes.html >>> >>> MFC after:3 days >> >> Hi Dimitry, >>This commit was missing necessary changes to >> OptionalObsoleteFiles.inc to remove the clang 3.1 headers. This patch >> should fix it. >>If I don't hear back in a few days, I'll file a PR and attach my patch. > > There's a PR already: http://www.freebsd.org/cgi/query-pr.cgi?pr=misc/169902 Good to know -- hopefully it will be fixed soon. Thanks! -Garrett ___ 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: r238717 - in head/sys/dev/usb: . serial
Author: rea (ports committer) Date: Mon Jul 23 14:22:45 2012 New Revision: 238717 URL: http://svn.freebsd.org/changeset/base/238717 Log: u3g: add support for Huawei E392 LTE modem I am using it rebranded and it carries the label "Megafon" (it is Russian mobile operator); works fine with my 3G network. Approved by: hselasky Modified: head/sys/dev/usb/serial/u3g.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/u3g.c == --- head/sys/dev/usb/serial/u3g.c Mon Jul 23 09:38:10 2012 (r238716) +++ head/sys/dev/usb/serial/u3g.c Mon Jul 23 14:22:45 2012 (r238717) @@ -287,6 +287,7 @@ static const STRUCT_USB_HOST_ID u3g_devs U3G_DEV(HUAWEI, E180V, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI), + U3G_DEV(HUAWEI, E392, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, MOBILE, U3GINIT_HUAWEI), U3G_DEV(HUAWEI, E1752, U3GINIT_HUAWEISCSI), U3G_DEV(HUAWEI, E1820, U3GINIT_HUAWEISCSI), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsMon Jul 23 09:38:10 2012(r238716) +++ head/sys/dev/usb/usbdevsMon Jul 23 14:22:45 2012(r238717) @@ -1895,6 +1895,7 @@ product HUAWEI E1752 0x1446 3G modem product HUAWEI K3765 0x1465 3G modem product HUAWEI E1820 0x14ac E1820 HSPA+ USB Slider product HUAWEI E3131_INIT 0x14fe 3G modem initial +product HUAWEI E3920x1505 LTE modem product HUAWEI E3131 0x1506 3G modem product HUAWEI K3765_INIT 0x1520 K3765 Initial product HUAWEI ETS2055 0x1803 CDMA modem ___ 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: r238718 - head/sys/dev/usb/quirk
Author: emaste Date: Mon Jul 23 15:14:28 2012 New Revision: 238718 URL: http://svn.freebsd.org/changeset/base/238718 Log: Quirk MS keyboard so that function keys work The function keys on a Microsoft Natural Egronomic Keyboard 4000 have been repurposed as "Help", "Undo", "Redo" etc., and a special "F Lock" key is required to return them to their normal purpose. This change enables the UQ_KBD_BOOTPROTO quirk for the MS Natural 4000 keyboard to get the keys working again. More extensive changes to the USB keyboard infrastructure would be needed to fully support the "F Lock" mode and the extended keys on this keyboard. PR: usb/116947 Approved by: hselasky@ Modified: head/sys/dev/usb/quirk/usb_quirk.c Modified: head/sys/dev/usb/quirk/usb_quirk.c == --- head/sys/dev/usb/quirk/usb_quirk.c Mon Jul 23 14:22:45 2012 (r238717) +++ head/sys/dev/usb/quirk/usb_quirk.c Mon Jul 23 15:14:28 2012 (r238718) @@ -123,6 +123,7 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(METAGEEK2, WISPYDBX, 0x, 0x, UQ_KBD_IGNORE, UQ_HID_IGNORE), USB_QUIRK(TENX, UAUDIO0, 0x0101, 0x0101, UQ_AUDIO_SWAP_LR), /* MS keyboards do weird things */ + USB_QUIRK(MICROSOFT, NATURAL4000, 0x, 0x, UQ_KBD_BOOTPROTO), USB_QUIRK(MICROSOFT, WLINTELLIMOUSE, 0x, 0x, UQ_MS_LEADING_BYTE), /* umodem(4) device quirks */ USB_QUIRK(METRICOM, RICOCHET_GS, 0x100, 0x100, UQ_ASSUME_CM_OVER_DATA), ___ 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: r238721 - head/tools/build/mk
Author: dim Date: Mon Jul 23 16:36:13 2012 New Revision: 238721 URL: http://svn.freebsd.org/changeset/base/238721 Log: When WITHOUT_CLANG is being used, also clean out the clang 3.1 headers in OptionalObsoleteFiles.inc. PR: misc/169902 Submitted by: Thomas Eberhardt MFC after:3 days Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 23 15:20:52 2012(r238720) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jul 23 16:36:13 2012(r238721) @@ -659,6 +659,30 @@ OLD_FILES+=usr/include/clang/3.0/wmmintr OLD_FILES+=usr/include/clang/3.0/x86intrin.h OLD_FILES+=usr/include/clang/3.0/xmmintrin.h OLD_DIRS+=usr/include/clang/3.0 +OLD_FILES+=usr/include/clang/3.1/altivec.h +OLD_FILES+=usr/include/clang/3.1/avx2intrin.h +OLD_FILES+=usr/include/clang/3.1/avxintrin.h +OLD_FILES+=usr/include/clang/3.1/bmi2intrin.h +OLD_FILES+=usr/include/clang/3.1/bmiintrin.h +OLD_FILES+=usr/include/clang/3.1/cpuid.h +OLD_FILES+=usr/include/clang/3.1/emmintrin.h +OLD_FILES+=usr/include/clang/3.1/fma4intrin.h +OLD_FILES+=usr/include/clang/3.1/immintrin.h +OLD_FILES+=usr/include/clang/3.1/lzcntintrin.h +OLD_FILES+=usr/include/clang/3.1/mm3dnow.h +OLD_FILES+=usr/include/clang/3.1/mm_malloc.h +OLD_FILES+=usr/include/clang/3.1/mmintrin.h +OLD_FILES+=usr/include/clang/3.1/module.map +OLD_FILES+=usr/include/clang/3.1/nmmintrin.h +OLD_FILES+=usr/include/clang/3.1/pmmintrin.h +OLD_FILES+=usr/include/clang/3.1/popcntintrin.h +OLD_FILES+=usr/include/clang/3.1/smmintrin.h +OLD_FILES+=usr/include/clang/3.1/tmmintrin.h +OLD_FILES+=usr/include/clang/3.1/unwind.h +OLD_FILES+=usr/include/clang/3.1/wmmintrin.h +OLD_FILES+=usr/include/clang/3.1/x86intrin.h +OLD_FILES+=usr/include/clang/3.1/xmmintrin.h +OLD_DIRS+=usr/include/clang/3.1 OLD_DIRS+=usr/include/clang OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT OLD_DIRS+=usr/share/doc/llvm/clang ___ 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: r238722 - in head/lib/msun: . ld128 ld80 man src
Author: kargl
Date: Mon Jul 23 19:13:55 2012
New Revision: 238722
URL: http://svn.freebsd.org/changeset/base/238722
Log:
Compute the exponential of x for Intel 80-bit format and IEEE 128-bit
format. These implementations are based on
PTP Tang, "Table-driven implementation of the exponential function
in IEEE floating-point arithmetic," ACM Trans. Math. Soft., 15,
144-157 (1989).
PR: standards/152415
Submitted by: kargl
Reviewed by: bde, das
Approved by: das (mentor)
Added:
head/lib/msun/ld128/s_expl.c (contents, props changed)
head/lib/msun/ld80/s_expl.c (contents, props changed)
Modified:
head/lib/msun/Symbol.map
head/lib/msun/man/exp.3
head/lib/msun/src/e_exp.c
head/lib/msun/src/math.h
head/lib/msun/src/math_private.h
Modified: head/lib/msun/Symbol.map
==
--- head/lib/msun/Symbol.mapMon Jul 23 16:36:13 2012(r238721)
+++ head/lib/msun/Symbol.mapMon Jul 23 19:13:55 2012(r238722)
@@ -249,4 +249,5 @@ FBSD_1.3 {
ctanf;
ctanh;
ctanhf;
+ expl;
};
Added: head/lib/msun/ld128/s_expl.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/msun/ld128/s_expl.cMon Jul 23 19:13:55 2012
(r238722)
@@ -0,0 +1,260 @@
+/*-
+ * Copyright (c) 2012 Steven G. Kargl
+ * 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 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.
+ *
+ * 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.
+ */
+
+#include
+__FBSDID("$FreeBSD$");
+
+#include
+
+#include "math.h"
+#include "math_private.h"
+#include "fpmath.h"
+
+#defineBIAS(LDBL_MAX_EXP - 1)
+#defineEXPMASK (BIAS + LDBL_MAX_EXP)
+
+static volatile const long double twom1 = 0x1p-1L, tiny = 0x1p-1L;
+
+static const long double
+huge = 0x1p1L,
+o_threshold = 11356.523406294143949491931077970763428L,
+u_threshold = -11433.462743336297878837243843452621503L,
+L1 = 5.41521234812457272982212595914567508e-03L,
+L2 = -1.02536706388947310094527932552595546e-29L,
+INV_L = 1.84664965233787316142070359168242182e+02L;
+
+static const long double
+P2 = 5.000e-1L,
+P3 = 1.972e-1L,
+P4 = 4.16653708268e-2L,
+P5 = 8.15069867254e-3L,
+P6 = 1.3888996596213795377e-3L,
+P7 = 1.98412698412698412718821436278644414e-4L,
+P8 = 2.48015873015869681884882576649543128e-5L,
+P9 = 2.75573192240103867817876199544468806e-6L,
+P10 = 2.75573236172670046201884000197885520e-7L,
+P11 = 2.50517544183909126492878226167697856e-8L;
+
+#defineNUM 128
+
+static const struct {
+ long double hi;
+ long double lo;
+} s[NUM] = {
+ 0x1p0L, 0x0p0L,
+ 0x1.0163da9fb33356d84a66aep0L, 0x3.36dcdfa4003ec04c360be2404078p-92L,
+ 0x1.02c9a3e778060ee6f7cacap0L, 0x4.f7a29bde93d70a2cabc5cb89ba10p-92L,
+ 0x1.04315e86e7f84bd738f9a2p0L, 0xd.a47e6ed040bb4bfc05af6455e9b8p-96L,
+ 0x1.059b0d31585743ae7c548ep0L, 0xb.68ca417fe53e3495f7df4baf84a0p-92L,
+ 0x1.0706b29ddf6ddc6dc403a8p0L, 0x1.d87b27ed07cb8b092ac75e311753p-88L,
+ 0x1.0874518759bc808c35f25cp0L, 0x1.9427fa2b041b2d6829d8993a0d01p-88L,
+ 0x1.09e3ecac6f3834521e060cp0L, 0x5.84d6b74ba2e023da730e7fccb758p-92L,
+ 0x1.0b5586cf9890f6298b92b6p0L, 0x1.1842a98364291408b3ceb0a2a2bbp-88L,
+ 0x1.0cc922b7247f7407b705b8p0L, 0x9.3dc5e8aac564e6fe2ef1d431fd98p-92L,
+ 0x1.0e3ec32d3d1a2020742e4ep0L, 0x1.8af6a552ac4b358b1129e9f966a4p-88L,
+ 0x1.0fb66affed31af232091dcp0L, 0x1.8a1426514e0b627bda694a400a27p-88L,
+ 0x1.11301d0125b50a4ebbf1aep0L, 0xd.9318ceac5cc47ab166ee57427178p-
svn commit: r238723 - head/sys/amd64/include
Author: kib
Date: Mon Jul 23 19:16:31 2012
New Revision: 238723
URL: http://svn.freebsd.org/changeset/base/238723
Log:
Forcibly shut up clang warning about NULL pointer dereference.
MFC after:3 weeks
Modified:
head/sys/amd64/include/pcpu.h
Modified: head/sys/amd64/include/pcpu.h
==
--- head/sys/amd64/include/pcpu.h Mon Jul 23 19:13:55 2012
(r238722)
+++ head/sys/amd64/include/pcpu.h Mon Jul 23 19:16:31 2012
(r238723)
@@ -217,6 +217,10 @@ extern struct pcpu *pcpup;
#definePCPU_SET(member, val) __PCPU_SET(pc_ ## member, val)
#defineOFFSETOF_CURTHREAD 0
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnull-dereference"
+#endif
static __inline __pure2 struct thread *
__curthread(void)
{
@@ -226,6 +230,9 @@ __curthread(void)
: "m" (*(char *)OFFSETOF_CURTHREAD));
return (td);
}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
#definecurthread (__curthread())
#defineOFFSETOF_CURPCB 32
___
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: r238724 - head/lib/msun
Author: kargl Date: Mon Jul 23 19:23:49 2012 New Revision: 238724 URL: http://svn.freebsd.org/changeset/base/238724 Log: Hook ld80/s_expl.c or ld128/s_expl.c into the building of libm. PR: standards/152415 Approved by: das (mentor) Modified: head/lib/msun/Makefile Modified: head/lib/msun/Makefile == --- head/lib/msun/Makefile Mon Jul 23 19:16:31 2012(r238723) +++ head/lib/msun/Makefile Mon Jul 23 19:23:49 2012(r238724) @@ -94,7 +94,7 @@ COMMON_SRCS+= e_acosl.c e_asinl.c e_atan e_hypotl.c e_remainderl.c e_sqrtl.c \ invtrig.c k_cosl.c k_sinl.c k_tanl.c \ s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \ - s_csqrtl.c s_exp2l.c s_floorl.c s_fmal.c \ + s_csqrtl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \ s_frexpl.c s_logbl.c s_nanl.c s_nextafterl.c s_nexttoward.c \ s_remquol.c s_rintl.c s_scalbnl.c \ s_sinl.c s_tanl.c s_truncl.c w_cabsl.c ___ 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: r238729 - head/sys/dev/ath
Author: adrian
Date: Mon Jul 23 23:40:13 2012
New Revision: 238729
URL: http://svn.freebsd.org/changeset/base/238729
Log:
Modify ath_descdma_setup() to take a descriptor size parameter.
The AR9300 and later descriptors are 128 bytes, however I'd like to make
sure that isn't used for earlier chips.
* Populate the TX descriptor length field in the softc with
sizeof(ath_desc)
* Use this field when allocating the TX descriptors
* Pre-AR93xx TX/RX descriptors will use the ath_desc size; newer ones will
query the HAL for these sizes.
Modified:
head/sys/dev/ath/if_ath.c
head/sys/dev/ath/if_ath_misc.h
head/sys/dev/ath/if_ath_rx.c
head/sys/dev/ath/if_ath_tx.c
Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c Mon Jul 23 21:32:37 2012(r238728)
+++ head/sys/dev/ath/if_ath.c Mon Jul 23 23:40:13 2012(r238729)
@@ -2767,7 +2767,7 @@ ath_load_cb(void *arg, bus_dma_segment_t
int
ath_descdma_setup(struct ath_softc *sc,
struct ath_descdma *dd, ath_bufhead *head,
- const char *name, int nbuf, int ndesc)
+ const char *name, int ds_size, int nbuf, int ndesc)
{
#defineDS2PHYS(_dd, _ds) \
((_dd)->dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)->dd_desc))
@@ -2778,7 +2778,7 @@ ath_descdma_setup(struct ath_softc *sc,
struct ath_buf *bf;
int i, bsize, error;
- dd->dd_descsize = sizeof(struct ath_desc);
+ dd->dd_descsize = ds_size;
DPRINTF(sc, ATH_DEBUG_RESET,
"%s: %s DMA: %u buffers %u desc/buf, %d bytes per descriptor\n",
@@ -3010,14 +3010,15 @@ ath_desc_alloc(struct ath_softc *sc)
int error;
error = ath_descdma_setup(sc, &sc->sc_txdma, &sc->sc_txbuf,
- "tx", ath_txbuf, ATH_TXDESC);
+ "tx", sc->sc_tx_desclen, ath_txbuf, ATH_TXDESC);
if (error != 0) {
return error;
}
sc->sc_txbuf_cnt = ath_txbuf;
error = ath_descdma_setup(sc, &sc->sc_txdma_mgmt, &sc->sc_txbuf_mgmt,
- "tx_mgmt", ath_txbuf_mgmt, ATH_TXDESC);
+ "tx_mgmt", sc->sc_tx_desclen, ath_txbuf_mgmt,
+ ATH_TXDESC);
if (error != 0) {
ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf);
return error;
@@ -3029,7 +3030,7 @@ ath_desc_alloc(struct ath_softc *sc)
*/
error = ath_descdma_setup(sc, &sc->sc_bdma, &sc->sc_bbuf,
- "beacon", ATH_BCBUF, 1);
+ "beacon", sc->sc_tx_desclen, ATH_BCBUF, 1);
if (error != 0) {
ath_descdma_cleanup(sc, &sc->sc_txdma, &sc->sc_txbuf);
ath_descdma_cleanup(sc, &sc->sc_txdma_mgmt,
Modified: head/sys/dev/ath/if_ath_misc.h
==
--- head/sys/dev/ath/if_ath_misc.h Mon Jul 23 21:32:37 2012
(r238728)
+++ head/sys/dev/ath/if_ath_misc.h Mon Jul 23 23:40:13 2012
(r238729)
@@ -85,7 +85,8 @@ extern void ath_setdefantenna(struct ath
extern void ath_setslottime(struct ath_softc *sc);
extern int ath_descdma_setup(struct ath_softc *sc, struct ath_descdma *dd,
- ath_bufhead *head, const char *name, int nbuf, int ndesc);
+ ath_bufhead *head, const char *name, int ds_size, int nbuf,
+ int ndesc);
extern int ath_descdma_setup_rx_edma(struct ath_softc *sc,
struct ath_descdma *dd, ath_bufhead *head, const char *name,
int nbuf, int desclen);
Modified: head/sys/dev/ath/if_ath_rx.c
==
--- head/sys/dev/ath/if_ath_rx.cMon Jul 23 21:32:37 2012
(r238728)
+++ head/sys/dev/ath/if_ath_rx.cMon Jul 23 23:40:13 2012
(r238729)
@@ -1075,7 +1075,7 @@ ath_legacy_dma_rxsetup(struct ath_softc
device_printf(sc->sc_dev, "%s: called\n", __func__);
error = ath_descdma_setup(sc, &sc->sc_rxdma, &sc->sc_rxbuf,
- "rx", ath_rxbuf, 1);
+ "rx", sizeof(struct ath_desc), ath_rxbuf, 1);
if (error != 0)
return (error);
@@ -1099,6 +1099,9 @@ ath_recv_setup_legacy(struct ath_softc *
device_printf(sc->sc_dev, "DMA setup: legacy\n");
+ /* Sensible legacy defaults */
+ sc->sc_rx_statuslen = 0;
+
sc->sc_rx.recv_start = ath_legacy_startrecv;
sc->sc_rx.recv_stop = ath_legacy_stoprecv;
sc->sc_rx.recv_flush = ath_legacy_flushrecv;
Modified: head/sys/dev/ath/if_ath_tx.c
==
--- head/sys/dev/ath/if_ath_tx.cMon Jul 23 21:32:37 2012
(r238728)
+++ head/sys/dev/ath/if_ath_tx.cMon Jul 23 23:40:13 2012
(r238729)
@@ -4483,6 +4483,13 @@ ath_legacy_dma_txteardown(struct ath_sof
void
ath_xmit_setup_le
Re: svn commit: r238672 - head/sys/dev/sdhci
On Jul 23, 2012, at 1:28 AM, Garrett Cooper wrote: > On Mon, Jul 23, 2012 at 12:12 AM, Gleb Smirnoff wrote: >> On Sat, Jul 21, 2012 at 03:30:26PM +, Alexey Dokuchaev wrote: >> A> On Sat, Jul 21, 2012 at 02:07:43PM +, Gleb Smirnoff wrote: >> A> > Author: glebius >> A> > Date: Sat Jul 21 14:07:43 2012 >> A> > New Revision: 238672 >> A> > URL: http://svn.freebsd.org/changeset/base/238672 >> A> > >> A> > Log: >> A> > Fix typo in comment, should be MHz here. >> A> >> A> That's nice, but... >> A> >> A> > @@ -364,7 +364,7 @@ sdhci_lower_frequency(device_t dev) >> A> > >> A> >/* >> A> > * Some SD/MMC cards don't work with the default base >> A> > - * clock frequency of 200MHz. Lower it to 50Hz. >> A> > + * clock frequency of 200MHz. Lower it to 50MHz. >> A> >> A> ... Why losing 2-space break after a sentence (per what we are generally >> A> adhering and AFAIR is suggested by Chicago Style Guide)? >> >> Never heard about this rule. Sorry. > >Actually, English spacing is discouraged in more recent texts; it > was encouraged during the late 19th century up until the late 20th > century according to ye great wikipedia [1], but I've read several > other articles in the past decade that suggest that the English > spacing convention be completely abolished. >FWIW, I'd just follow surrounding style like style(9) suggests. No > reason for fighting over an extra byte per sentence in a source file > (unless you consider how much added bandwidth / disk space those > precious bytes can consume :)...). > Thanks, > -Garrett > > 1. > http://en.wikipedia.org/wiki/History_of_sentence_spacing#French_and_English_spacing Double spacing is the one true way I learned how to type in school. Since the 1980's though, things have changed and many advocate single spaces. However, that's for folks with fancy variable pitch font and such. For fixed-witdh fonts, 2 is still preferred in some circles, including ours. Warner___ 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: r238672 - head/sys/dev/sdhci
On Mon, Jul 23, 2012 at 5:07 PM, Warner Losh wrote: > > On Jul 23, 2012, at 1:28 AM, Garrett Cooper wrote: > >> On Mon, Jul 23, 2012 at 12:12 AM, Gleb Smirnoff wrote: >>> On Sat, Jul 21, 2012 at 03:30:26PM +, Alexey Dokuchaev wrote: >>> A> On Sat, Jul 21, 2012 at 02:07:43PM +, Gleb Smirnoff wrote: >>> A> > Author: glebius >>> A> > Date: Sat Jul 21 14:07:43 2012 >>> A> > New Revision: 238672 >>> A> > URL: http://svn.freebsd.org/changeset/base/238672 >>> A> > >>> A> > Log: >>> A> > Fix typo in comment, should be MHz here. >>> A> >>> A> That's nice, but... >>> A> >>> A> > @@ -364,7 +364,7 @@ sdhci_lower_frequency(device_t dev) >>> A> > >>> A> >/* >>> A> > * Some SD/MMC cards don't work with the default base >>> A> > - * clock frequency of 200MHz. Lower it to 50Hz. >>> A> > + * clock frequency of 200MHz. Lower it to 50MHz. >>> A> >>> A> ... Why losing 2-space break after a sentence (per what we are generally >>> A> adhering and AFAIR is suggested by Chicago Style Guide)? >>> >>> Never heard about this rule. Sorry. >> >>Actually, English spacing is discouraged in more recent texts; it >> was encouraged during the late 19th century up until the late 20th >> century according to ye great wikipedia [1], but I've read several >> other articles in the past decade that suggest that the English >> spacing convention be completely abolished. >>FWIW, I'd just follow surrounding style like style(9) suggests. No >> reason for fighting over an extra byte per sentence in a source file >> (unless you consider how much added bandwidth / disk space those >> precious bytes can consume :)...). >> Thanks, >> -Garrett >> >> 1. >> http://en.wikipedia.org/wiki/History_of_sentence_spacing#French_and_English_spacing > > Double spacing is the one true way I learned how to type in school. Since > the 1980's though, things have changed and many advocate single spaces. > However, that's for folks with fancy variable pitch font and such. For > fixed-witdh fonts, 2 is still preferred in some circles, including ours. And now that I look at style(9), there are subtleties that demonstrate this in the roff generated text: = FreeBSD source tree. It is also a guide for the preferred userland code ^^ style. Many of the style rules are implicit in the examples. Be careful ^^ ^^ to check the examples before assuming that style is silent on an issue. = I wish this point was more explicit, but like style(9), there are other unspoken rules that should/must be adhered to. Thanks, -Garrett ___ 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: r238730 - head/contrib/less
Author: delphij Date: Tue Jul 24 01:09:11 2012 New Revision: 238730 URL: http://svn.freebsd.org/changeset/base/238730 Log: MFV: less v451. Modified: head/contrib/less/NEWS head/contrib/less/README head/contrib/less/brac.c head/contrib/less/ch.c head/contrib/less/charset.c head/contrib/less/charset.h head/contrib/less/cmd.h head/contrib/less/cmdbuf.c head/contrib/less/command.c head/contrib/less/cvt.c head/contrib/less/decode.c head/contrib/less/defines.ds head/contrib/less/defines.o2 head/contrib/less/defines.o9 head/contrib/less/defines.wn head/contrib/less/edit.c head/contrib/less/filename.c head/contrib/less/forwback.c head/contrib/less/funcs.h head/contrib/less/help.c head/contrib/less/ifile.c head/contrib/less/input.c head/contrib/less/jump.c head/contrib/less/less.h head/contrib/less/less.hlp head/contrib/less/less.man head/contrib/less/less.nro head/contrib/less/lessecho.c head/contrib/less/lessecho.man head/contrib/less/lessecho.nro head/contrib/less/lesskey.c head/contrib/less/lesskey.h head/contrib/less/lesskey.man head/contrib/less/lesskey.nro head/contrib/less/lglob.h head/contrib/less/line.c head/contrib/less/linenum.c head/contrib/less/lsystem.c head/contrib/less/main.c head/contrib/less/mark.c head/contrib/less/mkhelp.c head/contrib/less/optfunc.c head/contrib/less/option.c head/contrib/less/option.h head/contrib/less/opttbl.c head/contrib/less/os.c head/contrib/less/output.c head/contrib/less/pattern.c head/contrib/less/pattern.h head/contrib/less/pckeys.h head/contrib/less/position.c head/contrib/less/position.h head/contrib/less/prompt.c head/contrib/less/screen.c head/contrib/less/scrsize.c head/contrib/less/search.c head/contrib/less/signal.c head/contrib/less/tags.c head/contrib/less/ttyin.c head/contrib/less/version.c Directory Properties: head/contrib/less/ (props changed) Modified: head/contrib/less/NEWS == --- head/contrib/less/NEWS Mon Jul 23 23:40:13 2012(r238729) +++ head/contrib/less/NEWS Tue Jul 24 01:09:11 2012(r238730) @@ -11,7 +11,7 @@ == - Major changes between "less" versions 444 and 449 + Major changes between "less" versions 444 and 451 * Add ESC-F command to keep reading data until a pattern is found. Modified: head/contrib/less/README == --- head/contrib/less/READMEMon Jul 23 23:40:13 2012(r238729) +++ head/contrib/less/READMETue Jul 24 01:09:11 2012(r238730) @@ -7,9 +7,9 @@ ** ** -Less, version 449 +Less, version 451 -This is the distribution of less, version 449, released 26 Jun 2012. +This is the distribution of less, version 451, released 21 Jul 2012. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or Modified: head/contrib/less/brac.c == --- head/contrib/less/brac.cMon Jul 23 23:40:13 2012(r238729) +++ head/contrib/less/brac.cTue Jul 24 01:09:11 2012(r238730) @@ -1,11 +1,11 @@ -/* - * Copyright (C) 1984-2012 Mark Nudelman - * - * You may distribute under the terms of either the GNU General Public - * License or the Less License, as specified in the README file. - * - * For more information, see the README file. - */ +/* + * Copyright (C) 1984-2012 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ /* Modified: head/contrib/less/ch.c == --- head/contrib/less/ch.c Mon Jul 23 23:40:13 2012(r238729) +++ head/contrib/less/ch.c Tue Jul 24 01:09:11 2012(r238730) @@ -1,11 +1,11 @@ -/* - * Copyright (C) 1984-2012 Mark Nudelman - * - * You may distribute under the terms of either the GNU General Public - * License or the Less License, as specified in the README file. - * - * For more information, see the README file. - */ +/* + * Copyright (C) 1984-2012 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ /* @@ -807,6 +807,17 @@ seekable(f) } /* + * Force EOF to be at the current read position. + * This is used after an ignore_eof re
svn commit: r238731 - in head/sys/dev/ath: . ath_hal
Author: adrian
Date: Tue Jul 24 01:18:19 2012
New Revision: 238731
URL: http://svn.freebsd.org/changeset/base/238731
Log:
Add a new HAL method - the AR93xx and later NICs have a separate
TX descriptor ring for TX status completion. This API call will pass
the allocated buffer details to the HAL.
Modified:
head/sys/dev/ath/ath_hal/ah.h
head/sys/dev/ath/if_athvar.h
Modified: head/sys/dev/ath/ath_hal/ah.h
==
--- head/sys/dev/ath/ath_hal/ah.h Tue Jul 24 01:09:11 2012
(r238730)
+++ head/sys/dev/ath/ath_hal/ah.h Tue Jul 24 01:18:19 2012
(r238731)
@@ -1090,6 +1090,9 @@ struct ath_hal {
uint32_t *link);
void __ahdecl(*ah_getTxDescLinkPtr)(struct ath_hal *ah, void *ds,
uint32_t **linkptr);
+ void __ahdecl(*ah_setupTxStatusRing)(struct ath_hal *,
+ void *ts_start, uint32_t ts_paddr_start,
+ uint16_t size);
/* Receive Functions */
uint32_t __ahdecl(*ah_getRxDP)(struct ath_hal*, HAL_RX_QUEUE);
Modified: head/sys/dev/ath/if_athvar.h
==
--- head/sys/dev/ath/if_athvar.hTue Jul 24 01:09:11 2012
(r238730)
+++ head/sys/dev/ath/if_athvar.hTue Jul 24 01:18:19 2012
(r238731)
@@ -1099,6 +1099,9 @@ void ath_intr(void *);
((*(_ah)->ah_getTxDescLink)((_ah), (_ds), (_link)))
#define ath_hal_gettxdesclinkptr(_ah, _ds, _linkptr) \
((*(_ah)->ah_getTxDescLinkPtr)((_ah), (_ds), (_linkptr)))
+#defineath_hal_setuptxstatusring(_ah, _tsstart, _tspstart, _size) \
+ ((*(_ah)->ah_setupTxStatusRing)((_ah), (_tsstart), (_tspstart), \
+ (_size)))
#defineath_hal_setupfirsttxdesc(_ah, _ds, _aggrlen, _flags, _txpower, \
_txr0, _txtr0, _antm, _rcr, _rcd) \
___
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: r238732 - head/sys/vm
Author: alc Date: Tue Jul 24 02:35:30 2012 New Revision: 238732 URL: http://svn.freebsd.org/changeset/base/238732 Log: Addendum to r238604. If the inactive queue scan isn't restarted, then the variable "addl_page_shortage_init" isn't needed. X-MFC after: r238604 Modified: head/sys/vm/vm_pageout.c Modified: head/sys/vm/vm_pageout.c == --- head/sys/vm/vm_pageout.cTue Jul 24 01:18:19 2012(r238731) +++ head/sys/vm/vm_pageout.cTue Jul 24 02:35:30 2012(r238732) @@ -873,7 +873,7 @@ vm_pageout_scan(int pass) vm_page_t m, next; struct vm_page marker; int page_shortage, maxscan, pcount; - int addl_page_shortage, addl_page_shortage_init; + int addl_page_shortage; vm_object_t object; int actcount; int vnodes_skipped = 0; @@ -889,13 +889,13 @@ vm_pageout_scan(int pass) */ uma_reclaim(); - addl_page_shortage_init = atomic_readandclear_int(&vm_pageout_deficit); + addl_page_shortage = atomic_readandclear_int(&vm_pageout_deficit); /* * Calculate the number of pages we want to either free or move * to the cache. */ - page_shortage = vm_paging_target() + addl_page_shortage_init; + page_shortage = vm_paging_target() + addl_page_shortage; vm_pageout_init_marker(&marker, PQ_INACTIVE); @@ -921,7 +921,6 @@ vm_pageout_scan(int pass) maxlaunder = 1; vm_page_lock_queues(); queues_locked = TRUE; - addl_page_shortage = addl_page_shortage_init; maxscan = cnt.v_inactive_count; for (m = TAILQ_FIRST(&vm_page_queues[PQ_INACTIVE].pl); ___ 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"
