Re: svn commit: r249129 - head/sys/powerpc/aim
On 05.04.2013 08:52, Rui Paulo wrote: On 2013/04/04, at 22:13, Justin Hibbits jr...@alumni.cwru.edu wrote: I rebuilt all ports just the other day, don't know what ports revision it corresponds to, but I did a portsnap on Monday. And I don't have ORGANIZATION set in make.conf. How did you commit it? It's impossible for it not to appear on your editor session. Are you sure you didn't miss it? I've seen the same problem when committing from my laptop with SVN built couple of weeks ago from ports. That line was present in editor, but I expected it to be removed since I haven't touched it. But it was not removed. -- Alexander Motin ___ 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: r249131 - head/sys/dev/ath/ath_hal
Author: adrian
Date: Fri Apr 5 07:41:47 2013
New Revision: 249131
URL: http://svnweb.freebsd.org/changeset/base/249131
Log:
HAL additions to enable MCI Bluetooth coexistence in the AR9300 HAL.
* Add the rest of the missing GPIO output mux types;
* Add in a new debug category;
* And a new MCI btcoex configuration option in ath_hal.ah_config
Obtained from:Qualcomm Atheros
Modified:
head/sys/dev/ath/ath_hal/ah.h
head/sys/dev/ath/ath_hal/ah_debug.h
Modified: head/sys/dev/ath/ath_hal/ah.h
==
--- head/sys/dev/ath/ath_hal/ah.h Fri Apr 5 06:55:19 2013
(r249130)
+++ head/sys/dev/ath/ath_hal/ah.h Fri Apr 5 07:41:47 2013
(r249131)
@@ -566,7 +566,22 @@ typedef enum {
HAL_GPIO_OUTPUT_MUX_MAC_NETWORK_LED = 3,
HAL_GPIO_OUTPUT_MUX_MAC_POWER_LED = 4,
HAL_GPIO_OUTPUT_MUX_AS_WLAN_ACTIVE = 5,
- HAL_GPIO_OUTPUT_MUX_AS_TX_FRAME = 6
+ HAL_GPIO_OUTPUT_MUX_AS_TX_FRAME = 6,
+
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA,
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK,
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA,
+ HAL_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK,
+ HAL_GPIO_OUTPUT_MUX_AS_WL_IN_TX,
+ HAL_GPIO_OUTPUT_MUX_AS_WL_IN_RX,
+ HAL_GPIO_OUTPUT_MUX_AS_BT_IN_TX,
+ HAL_GPIO_OUTPUT_MUX_AS_BT_IN_RX,
+ HAL_GPIO_OUTPUT_MUX_AS_RUCKUS_STROBE,
+ HAL_GPIO_OUTPUT_MUX_AS_RUCKUS_DATA,
+ HAL_GPIO_OUTPUT_MUX_AS_SMARTANT_CTRL0,
+ HAL_GPIO_OUTPUT_MUX_AS_SMARTANT_CTRL1,
+ HAL_GPIO_OUTPUT_MUX_AS_SMARTANT_CTRL2,
+ HAL_GPIO_OUTPUT_MUX_NUM_ENTRIES
} HAL_GPIO_MUX_TYPE;
typedef enum {
@@ -1074,6 +1089,8 @@ typedef enum {
HAL_BT_COEX_SET_ACK_PWR = 0,/* Change ACK power setting */
HAL_BT_COEX_LOWER_TX_PWR, /* Change transmit power */
HAL_BT_COEX_ANTENNA_DIVERSITY, /* Enable RX diversity for Kite */
+ HAL_BT_COEX_MCI_MAX_TX_PWR, /* Set max tx power for concurrent tx */
+ HAL_BT_COEX_MCI_FTP_STOMP_RX, /* Use a different weight for stomp low
*/
} HAL_BT_COEX_SET_PARAMETER;
#defineHAL_BT_COEX_FLAG_LOW_ACK_PWR0x0001
@@ -1244,6 +1261,7 @@ typedef struct
int ath_hal_ant_ctrl_comm2g_switch_enable;
int ath_hal_ext_atten_margin_cfg;
int ath_hal_war70c;
+ uint32_t ath_hal_mci_config;
} HAL_OPS_CONFIG;
/*
Modified: head/sys/dev/ath/ath_hal/ah_debug.h
==
--- head/sys/dev/ath/ath_hal/ah_debug.h Fri Apr 5 06:55:19 2013
(r249130)
+++ head/sys/dev/ath/ath_hal/ah_debug.h Fri Apr 5 07:41:47 2013
(r249131)
@@ -53,6 +53,7 @@ enum {
HAL_DEBUG_QUEUE = 0x0400,
HAL_DEBUG_PRINT_REG = 0x0800,
HAL_DEBUG_FCS_RTT = 0x1000,
+ HAL_DEBUG_BT_COEX = 0x2000,
HAL_DEBUG_UNMASKABLE= 0x8000, /* always printed */
HAL_DEBUG_ANY = 0x
___
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: r249115 - in head: sbin/camcontrol sys/sys
On 04/05/13 01:19, Steven Hartland wrote: Author: smh Date: Thu Apr 4 23:19:51 2013 New Revision: 249115 URL: http://svnweb.freebsd.org/changeset/base/249115 Log: Adds security options to camcontrol this includes the ability to secure erase disks such as SSD's Adds the ability to run ATA commands via the SCSI ATA Pass-Through(16) comand Reviewed by:mav Approved by:pjd (mentor) MFC after: 2 weeks Modified: head/sbin/camcontrol/camcontrol.8 You should bump the date in the manual as well, look for .Dd. Regards! -- Niclas ___ 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: r249115 - in head: sbin/camcontrol sys/sys
- Original Message - From: Niclas Zeising zeising+free...@daemonic.se On 04/05/13 01:19, Steven Hartland wrote: Author: smh Date: Thu Apr 4 23:19:51 2013 New Revision: 249115 URL: http://svnweb.freebsd.org/changeset/base/249115 Log: Adds security options to camcontrol this includes the ability to secure erase disks such as SSD's Adds the ability to run ATA commands via the SCSI ATA Pass-Through(16) comand Reviewed by: mav Approved by: pjd (mentor) MFC after: 2 weeks Modified: head/sbin/camcontrol/camcontrol.8 You should bump the date in the manual as well, look for .Dd. Regards! Got another patch which adds HPA support will include in that :) Regards Steve This e.mail is private and confidential between Multiplay (UK) Ltd. and the person or entity to whom it is addressed. In the event of misdirection, the recipient is prohibited from using, copying, printing or otherwise disseminating it or any information contained in it. In the event of misdirection, illegible or incomplete transmission please telephone +44 845 868 1337 or return the E.mail to postmas...@multiplay.co.uk. ___ 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: r249137 - head/sys/dev/ath/ath_hal
Author: adrian
Date: Fri Apr 5 09:06:39 2013
New Revision: 249137
URL: http://svnweb.freebsd.org/changeset/base/249137
Log:
Add a new TX power field - it's inteded to be used where low TX power
is configured for higher rates (lower than max) but higher TX power
is configured for the lower rates, above the configured cap, to improve
long distance behaviour.
Modified:
head/sys/dev/ath/ath_hal/ah_internal.h
Modified: head/sys/dev/ath/ath_hal/ah_internal.h
==
--- head/sys/dev/ath/ath_hal/ah_internal.h Fri Apr 5 09:06:26 2013
(r249136)
+++ head/sys/dev/ath/ath_hal/ah_internal.h Fri Apr 5 09:06:39 2013
(r249137)
@@ -392,6 +392,7 @@ struct ath_hal_private {
int16_t ah_powerLimit; /* tx power cap */
uint16_tah_maxPowerLevel; /* calculated max tx power */
u_int ah_tpScale; /* tx power scale factor */
+ u_int16_t ah_extraTxPow; /* low rates extra-txpower */
uint32_tah_11nCompat; /* 11n compat controls */
/*
___
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: r249095 - in head/etc: defaults periodic/daily
In message 201304041503.r34f3c5l094...@svn.freebsd.org, Alexander Motin (m...@freebsd.org) wrote: Author: mav Date: Thu Apr 4 15:03:12 2013 New Revision: 249095 URL: http://svnweb.freebsd.org/changeset/base/249095 Log: Remove periodic script for ataraid(4) and add instead script for graid(8). Added: head/etc/periodic/daily/401.status-graid (contents, props changed) As graid is in 9.x will you be MFCing this addition? Cheers, Nick. -- ___ 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: r249139 - head/sys/boot/common
Author: avg
Date: Fri Apr 5 09:14:30 2013
New Revision: 249139
URL: http://svnweb.freebsd.org/changeset/base/249139
Log:
strncmp for boot code: fix an off by one error
Before this change strncmp would access and _compare_ n+1 characters
in the case where the first n characters match.
MFC after:5 days
Modified:
head/sys/boot/common/util.c
Modified: head/sys/boot/common/util.c
==
--- head/sys/boot/common/util.c Fri Apr 5 09:06:59 2013(r249138)
+++ head/sys/boot/common/util.c Fri Apr 5 09:14:30 2013(r249139)
@@ -68,9 +68,9 @@ int
strncmp(const char *s1, const char *s2, size_t len)
{
- for (; *s1 == *s2 *s1 != '\0' len 0; len--, s1++, s2++)
+ for (; len 0 *s1 == *s2 *s1 != '\0'; len--, s1++, s2++)
;
- return ((unsigned char)*s1 - (unsigned char)*s2);
+ return (len == 0 ? 0 : (unsigned char)*s1 - (unsigned char)*s2);
}
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
Re: svn commit: r249095 - in head/etc: defaults periodic/daily
On 05.04.2013 12:02, N.J. Mann wrote: In message 201304041503.r34f3c5l094...@svn.freebsd.org, Alexander Motin (m...@freebsd.org) wrote: Author: mav Date: Thu Apr 4 15:03:12 2013 New Revision: 249095 URL: http://svnweb.freebsd.org/changeset/base/249095 Log: Remove periodic script for ataraid(4) and add instead script for graid(8). Added: head/etc/periodic/daily/401.status-graid (contents, props changed) As graid is in 9.x will you be MFCing this addition? Sure. I just didn't know/remember about these scripts till this time. -- Alexander Motin ___ 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: r249141 - in head/contrib/unbound: . daemon doc iterator libunbound services services/cache smallapp util util/data util/storage validator
Author: des Date: Fri Apr 5 09:51:31 2013 New Revision: 249141 URL: http://svnweb.freebsd.org/changeset/base/249141 Log: Upgrade to 1.4.20. Added: head/contrib/unbound/validator/val_secalgo.c - copied unchanged from r249136, vendor/unbound/dist/validator/val_secalgo.c head/contrib/unbound/validator/val_secalgo.h - copied unchanged from r249136, vendor/unbound/dist/validator/val_secalgo.h Modified: head/contrib/unbound/Makefile.in head/contrib/unbound/aclocal.m4 head/contrib/unbound/acx_python.m4 head/contrib/unbound/config.guess head/contrib/unbound/config.h.in head/contrib/unbound/config.sub head/contrib/unbound/configure head/contrib/unbound/configure.ac head/contrib/unbound/daemon/cachedump.c head/contrib/unbound/daemon/daemon.c head/contrib/unbound/daemon/remote.c head/contrib/unbound/daemon/remote.h head/contrib/unbound/daemon/unbound.c head/contrib/unbound/daemon/worker.c head/contrib/unbound/doc/Changelog head/contrib/unbound/doc/FEATURES head/contrib/unbound/doc/README head/contrib/unbound/doc/example.conf.in head/contrib/unbound/doc/libunbound.3.in head/contrib/unbound/doc/unbound-anchor.8.in head/contrib/unbound/doc/unbound-checkconf.8.in head/contrib/unbound/doc/unbound-control.8.in head/contrib/unbound/doc/unbound-host.1 head/contrib/unbound/doc/unbound.8.in head/contrib/unbound/doc/unbound.conf.5.in head/contrib/unbound/doc/unbound.doxygen head/contrib/unbound/install-sh head/contrib/unbound/iterator/iter_fwd.c head/contrib/unbound/iterator/iter_hints.c head/contrib/unbound/iterator/iter_utils.c head/contrib/unbound/iterator/iter_utils.h head/contrib/unbound/iterator/iterator.c head/contrib/unbound/libunbound/libworker.c head/contrib/unbound/libunbound/unbound.h head/contrib/unbound/ltmain.sh head/contrib/unbound/services/cache/infra.c head/contrib/unbound/services/listen_dnsport.c head/contrib/unbound/services/localzone.c head/contrib/unbound/services/mesh.c head/contrib/unbound/services/outside_network.c head/contrib/unbound/services/outside_network.h head/contrib/unbound/smallapp/unbound-anchor.c head/contrib/unbound/smallapp/unbound-control.c head/contrib/unbound/smallapp/unbound-host.c head/contrib/unbound/util/alloc.h head/contrib/unbound/util/config_file.c head/contrib/unbound/util/configlexer.c head/contrib/unbound/util/configlexer.lex head/contrib/unbound/util/configparser.c head/contrib/unbound/util/configparser.h head/contrib/unbound/util/data/msgparse.c head/contrib/unbound/util/iana_ports.inc head/contrib/unbound/util/log.c head/contrib/unbound/util/net_help.c head/contrib/unbound/util/net_help.h head/contrib/unbound/util/netevent.c head/contrib/unbound/util/random.c head/contrib/unbound/util/rtt.c head/contrib/unbound/util/storage/lookup3.c head/contrib/unbound/util/tube.c head/contrib/unbound/validator/autotrust.c head/contrib/unbound/validator/val_anchor.c head/contrib/unbound/validator/val_neg.c head/contrib/unbound/validator/val_nsec3.c head/contrib/unbound/validator/val_sigcrypt.c head/contrib/unbound/validator/val_utils.c head/contrib/unbound/validator/validator.c head/contrib/unbound/validator/validator.h Directory Properties: head/contrib/unbound/ (props changed) Modified: head/contrib/unbound/Makefile.in == --- head/contrib/unbound/Makefile.inFri Apr 5 09:43:20 2013 (r249140) +++ head/contrib/unbound/Makefile.inFri Apr 5 09:51:31 2013 (r249141) @@ -30,6 +30,7 @@ PYTHONMOD_INSTALL=@PYTHONMOD_INSTALL@ PYTHONMOD_UNINSTALL=@PYTHONMOD_UNINSTALL@ PYUNBOUND_INSTALL=@PYUNBOUND_INSTALL@ PYUNBOUND_UNINSTALL=@PYUNBOUND_UNINSTALL@ +ALLTARGET=@ALLTARGET@ # _unbound.la if pyunbound enabled. PYUNBOUND_TARGET=@PYUNBOUND_TARGET@ @@ -99,7 +100,8 @@ util/storage/lruhash.c util/storage/slab util/winsock_event.c validator/autotrust.c validator/val_anchor.c \ validator/validator.c validator/val_kcache.c validator/val_kentry.c \ validator/val_neg.c validator/val_nsec3.c validator/val_nsec.c \ -validator/val_sigcrypt.c validator/val_utils.c $(CHECKLOCK_SRC) +validator/val_secalgo.c validator/val_sigcrypt.c \ +validator/val_utils.c $(CHECKLOCK_SRC) COMMON_OBJ_WITHOUT_NETCALL=dns.lo infra.lo rrset.lo dname.lo msgencode.lo \ msgparse.lo msgreply.lo packed_rrset.lo iterator.lo iter_delegpt.lo \ iter_donotq.lo iter_fwd.lo iter_hints.lo iter_priv.lo iter_resptype.lo \ @@ -109,7 +111,7 @@ fptr_wlist.lo locks.lo log.lo mini_event random.lo rbtree.lo regional.lo rtt.lo dnstree.lo lookup3.lo lruhash.lo \ slabhash.lo timehist.lo tube.lo winsock_event.lo autotrust.lo val_anchor.lo \ validator.lo val_kcache.lo val_kentry.lo val_neg.lo val_nsec3.lo val_nsec.lo \ -val_sigcrypt.lo val_utils.lo $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ) +val_secalgo.lo val_sigcrypt.lo val_utils.lo $(PYTHONMOD_OBJ) $(CHECKLOCK_OBJ)
svn commit: r249153 - head/sbin/camcontrol
Author: joel (doc committer) Date: Fri Apr 5 11:42:28 2013 New Revision: 249153 URL: http://svnweb.freebsd.org/changeset/base/249153 Log: mdoc: remove superfluous paragraph macro. Modified: head/sbin/camcontrol/camcontrol.8 Modified: head/sbin/camcontrol/camcontrol.8 == --- head/sbin/camcontrol/camcontrol.8 Fri Apr 5 11:41:56 2013 (r249152) +++ head/sbin/camcontrol/camcontrol.8 Fri Apr 5 11:42:28 2013 (r249153) @@ -1372,19 +1372,16 @@ camcontrol smpcmd ses0 -v -r 4 40 0 00 Send the SMP REPORT GENERAL command to ses0, and display the number of PHYs it contains. Display SMP errors if the command fails. -.Pp .Bd -literal -offset indent camcontrol security ada0 .Ed .Pp Report security support and settings for ada0 -.Pp .Bd -literal -offset indent camcontrol security ada0 -u user -s MyPass .Ed .Pp Enable security on device ada0 with the password MyPass -.Pp .Bd -literal -offset indent camcontrol security ada0 -u user -e MyPass .Ed ___ 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: r249161 - head/sys/geom
Author: mav
Date: Fri Apr 5 13:11:28 2013
New Revision: 249161
URL: http://svnweb.freebsd.org/changeset/base/249161
Log:
Following r241022, replace iteration over the provider list on media events
by taking first one and asserting that there is no others.
MFC after:1 week
Modified:
head/sys/geom/geom_disk.c
Modified: head/sys/geom/geom_disk.c
==
--- head/sys/geom/geom_disk.c Fri Apr 5 11:57:41 2013(r249160)
+++ head/sys/geom/geom_disk.c Fri Apr 5 13:11:28 2013(r249161)
@@ -658,8 +658,12 @@ disk_media_changed(struct disk *dp, int
gp = dp-d_geom;
if (gp != NULL) {
- LIST_FOREACH(pp, gp-provider, provider)
+ pp = LIST_FIRST(gp-provider);
+ if (pp != NULL) {
+ KASSERT(LIST_NEXT(pp, provider) == NULL,
+ (geom %p has more than one provider, gp));
g_media_changed(pp, flag);
+ }
}
}
@@ -671,8 +675,12 @@ disk_media_gone(struct disk *dp, int fla
gp = dp-d_geom;
if (gp != NULL) {
- LIST_FOREACH(pp, gp-provider, provider)
+ pp = LIST_FIRST(gp-provider);
+ if (pp != NULL) {
+ KASSERT(LIST_NEXT(pp, provider) == NULL,
+ (geom %p has more than one provider, gp));
g_media_gone(pp, flag);
+ }
}
}
___
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: r249163 - head/sys/kern
Author: kib
Date: Fri Apr 5 14:30:51 2013
New Revision: 249163
URL: http://svnweb.freebsd.org/changeset/base/249163
Log:
If filter of the interrupt event is not null, print it, in addition to
the handler address. Add a mark to distinguish between filter and
handler.
Note that the arguments for both filter and handler are same.
Sponsored by: The FreeBSD Foundation
Reviewed by: jhb
MFC after:1 week
Modified:
head/sys/kern/kern_intr.c
Modified: head/sys/kern/kern_intr.c
==
--- head/sys/kern/kern_intr.c Fri Apr 5 13:19:30 2013(r249162)
+++ head/sys/kern/kern_intr.c Fri Apr 5 14:30:51 2013(r249163)
@@ -1739,7 +1739,16 @@ db_dump_intrhand(struct intr_handler *ih
break;
}
db_printf( );
- db_printsym((uintptr_t)ih-ih_handler, DB_STGY_PROC);
+ if (ih-ih_filter != NULL) {
+ db_printf([F]);
+ db_printsym((uintptr_t)ih-ih_filter, DB_STGY_PROC);
+ }
+ if (ih-ih_handler != NULL) {
+ if (ih-ih_filter != NULL)
+ db_printf(,);
+ db_printf([H]);
+ db_printsym((uintptr_t)ih-ih_handler, DB_STGY_PROC);
+ }
db_printf((%p), ih-ih_argument);
if (ih-ih_need ||
(ih-ih_flags (IH_EXCLUSIVE | IH_ENTROPY | IH_DEAD |
___
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: r249129 - head/sys/powerpc/aim
On 2013/04/05, at 0:37, Alexander Motin m...@freebsd.org wrote: On 05.04.2013 08:52, Rui Paulo wrote: On 2013/04/04, at 22:13, Justin Hibbits jr...@alumni.cwru.edu wrote: I rebuilt all ports just the other day, don't know what ports revision it corresponds to, but I did a portsnap on Monday. And I don't have ORGANIZATION set in make.conf. How did you commit it? It's impossible for it not to appear on your editor session. Are you sure you didn't miss it? I've seen the same problem when committing from my laptop with SVN built couple of weeks ago from ports. That line was present in editor, but I expected it to be removed since I haven't touched it. But it was not removed. OK, the server is supposed to remove it. We need to change the scripts running on the server. Regards, -- 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
Re: svn commit: r249105 - in head/sys/cam: ata scsi
On Thu, 4 Apr 2013, Alexander Motin wrote: On 04.04.2013 23:53, Adrian Chadd wrote: Hi, Isn't this a prime candidate to replace with KASSERT()? It could be, but NULL dereference attempt will crash system no less reliably then KASSERT. Much more reliably: - if INAVRIANTS is not configured, then the NULL dereference still crashes properly - if INAVRIANTS is configured, then the NULL dereference gives a nice (restartable) fault, while KASSERT() calls panic() and there is no way to get back to the original context so as to to restart or debug it more easily. KASSERT() could be improved by replacing it by a a null dereference or other restartable fault, at least before calling panic() or taking any other unrestartable actions. The panic() call would still prevent restarting very easily -- you would have to back out to before the KASSERT() and fix up all the asserted conditions (usually more than a single null pointer). This method works well in userland too. Instead of assert() or abort(), use an null dereference, or more portably, a signal, or less portably, an asm with a breakpoint instruction or with the null pointer dereference (so that the compiler can't see that it gives undefined behaviour and optimize it away). I use this more to debug than to restart. Even if optimization or the debugger doesn't lose the local variables when assert() or abort() is called, it is easier to debug if you don't have to go up several frames to see the variables. Bruce ___ 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: r249166 - head/lib/libc/sys
Author: gnn Date: Fri Apr 5 18:09:43 2013 New Revision: 249166 URL: http://svnweb.freebsd.org/changeset/base/249166 Log: Correct the returned message lengths for timeval and bintime control messages (SO_BINTIME, SO_TIMEVAL). Obtained from:phk Modified: head/lib/libc/sys/getsockopt.2 Modified: head/lib/libc/sys/getsockopt.2 == --- head/lib/libc/sys/getsockopt.2 Fri Apr 5 16:04:31 2013 (r249165) +++ head/lib/libc/sys/getsockopt.2 Fri Apr 5 18:09:43 2013 (r249166) @@ -28,7 +28,7 @@ .\ @(#)getsockopt.2 8.4 (Berkeley) 5/2/95 .\ $FreeBSD$ .\ -.Dd February 26, 2012 +.Dd April 5, 2013 .Dt GETSOCKOPT 2 .Os .Sh NAME @@ -437,7 +437,7 @@ The .Vt cmsghdr fields have the following values for TIMESTAMP: .Bd -literal - cmsg_len = sizeof(struct timeval); + cmsg_len = CMSG_LEN(sizeof(struct timeval)); cmsg_level = SOL_SOCKET; cmsg_type = SCM_TIMESTAMP; .Ed @@ -445,7 +445,7 @@ fields have the following values for TIM and for .Dv SO_BINTIME : .Bd -literal - cmsg_len = sizeof(struct bintime); + cmsg_len = CMSG_LEN(sizeof(struct bintime)); cmsg_level = SOL_SOCKET; cmsg_type = SCM_BINTIME; .Ed ___ 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: r249105 - in head/sys/cam: ata scsi
On Fri, Apr 5, 2013 at 8:21 AM, Bruce Evans b...@optusnet.com.au wrote: This method works well in userland too. Instead of assert() or abort(), use an null dereference, or more portably, a signal Digressing quite a bit, doesn't abort() send a signal already, i.e. SIGABRT? And doesn't __assert() call abort()? Cheers, matthew ___ 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: r249168 - head/sys/kern
Author: glebius Date: Fri Apr 5 20:24:51 2013 New Revision: 249168 URL: http://svnweb.freebsd.org/changeset/base/249168 Log: Fix memory leak in coredump(). Reviewed by: kib Modified: head/sys/kern/kern_sig.c Modified: head/sys/kern/kern_sig.c == --- head/sys/kern/kern_sig.cFri Apr 5 19:33:31 2013(r249167) +++ head/sys/kern/kern_sig.cFri Apr 5 20:24:51 2013(r249168) @@ -3273,6 +3273,7 @@ restart: goto out; if ((error = vn_start_write(NULL, mp, V_XSLEEP | PCATCH)) != 0) goto out; + free(name, M_TEMP); goto restart; } ___ 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: r249105 - in head/sys/cam: ata scsi
On Fri, 5 Apr 2013 m...@freebsd.org wrote: On Fri, Apr 5, 2013 at 8:21 AM, Bruce Evans b...@optusnet.com.au wrote: This method works well in userland too. Instead of assert() or abort(), use an null dereference, or more portably, a signal Digressing quite a bit, doesn't abort() send a signal already, i.e. SIGABRT? And doesn't __assert() call abort()? Yes, but with assert() the signal occurs deeply nested in a function that doesn't return. Bruce ___ 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: r249170 - head/sys/dev/ciss
Author: sbruno
Date: Fri Apr 5 21:13:39 2013
New Revision: 249170
URL: http://svnweb.freebsd.org/changeset/base/249170
Log:
Notify CAM on state* change to a logical volume not status. This resolves
the issues reported regarding camcontrol devlist not showing the rebuild
states of volumes unless an explicit camcontrol rescan was executed.
PR: kern/171650
Reviewed by: sco...@freebsd.org
Obtained from:Yahoo! Inc.
MFC after:2 weeks
Modified:
head/sys/dev/ciss/ciss.c
Modified: head/sys/dev/ciss/ciss.c
==
--- head/sys/dev/ciss/ciss.cFri Apr 5 20:41:46 2013(r249169)
+++ head/sys/dev/ciss/ciss.cFri Apr 5 21:13:39 2013(r249170)
@@ -3959,7 +3959,8 @@ static void
ciss_notify_logical(struct ciss_softc *sc, struct ciss_notify *cn)
{
struct ciss_ldrive *ld;
-intostatus, bus, target;
+intbus, target;
+intrescan_ld;
debug_called(2);
@@ -3982,7 +3983,6 @@ ciss_notify_logical(struct ciss_softc *s
/*
* Update our idea of the drive's status.
*/
- ostatus =
ciss_decode_ldrive_status(cn-data.logical_status.previous_state);
ld-cl_status =
ciss_decode_ldrive_status(cn-data.logical_status.new_state);
if (ld-cl_lstatus != NULL)
ld-cl_lstatus-status = cn-data.logical_status.new_state;
@@ -3990,7 +3990,9 @@ ciss_notify_logical(struct ciss_softc *s
/*
* Have CAM rescan the drive if its status has changed.
*/
- if (ostatus != ld-cl_status) {
+rescan_ld = (cn-data.logical_status.previous_state !=
+ cn-data.logical_status.new_state) ? 1 : 0;
+ if (rescan_ld) {
ld-cl_update = 1;
ciss_notify_rescan_logical(sc);
}
___
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: r249171 - head/share/misc
Author: antoine Date: Fri Apr 5 21:17:37 2013 New Revision: 249171 URL: http://svnweb.freebsd.org/changeset/base/249171 Log: Add myself as a ports committer Approved by: eadler (mentor) Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotFri Apr 5 21:13:39 2013 (r249170) +++ head/share/misc/committers-ports.dotFri Apr 5 21:17:37 2013 (r249171) @@ -51,6 +51,7 @@ alepulver [label=Alejandro Pulver\nalep alexbl [label=Alexander Botero-Lowry\nale...@freebsd.org\n2006/09/11] amdmi3 [label=Dmitry Marakasov\namd...@freebsd.org\n2008/06/19] anray [label=Andrey Slusar\nan...@freebsd.org\n2005/12/11] +antoine [label=Antoine Brodin\nanto...@freebsd.org\n2013/04/03] araujo [label=Marcelo Araujo\nara...@freebsd.org\n2007/04/26] arved [label=Tilman Linneweh\nar...@freebsd.org\n2002/10/15] ashish [label=Ashish SHUKLA\nash...@freebsd.org\n2010/06/10] @@ -283,6 +284,7 @@ delphij - rafan demon - mat eadler - ak +eadler - antoine eadler - dbn eadler - bdrewery eadler - gjb @@ -398,6 +400,7 @@ mat - thierry mezz - tmclaugh miwi - amdmi3 +miwi - antoine miwi - avilla miwi - beat miwi - bf ___ 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: r249172 - head
Author: rene (doc,ports committer) Date: Fri Apr 5 21:18:01 2013 New Revision: 249172 URL: http://svnweb.freebsd.org/changeset/base/249172 Log: Fix a typo in the burncd line. Approved by: cognet Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri Apr 5 21:17:37 2013(r249171) +++ head/ObsoleteFiles.inc Fri Apr 5 21:18:01 2013(r249172) @@ -43,7 +43,7 @@ OLD_FILES+=sbin/atacontrol OLD_FILES+=usr/share/man/man8/atacontrol.8.gz OLD_FILES+=usr/share/man/man4/atapicam.4.gz OLD_FILES+=usr/share/man/man4/ataraid.4.gz -OLD_FILES+=usr.sbin/burncd +OLD_FILES+=usr/sbin/burncd OLD_FILES+=usr/share/man/man8/burncd.8.gz # 20130316: vinum.4 removed OLD_FILES+=usr/share/man/man4/vinum.4.gz ___ 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: r249173 - head/usr.sbin/bhyve
Author: grehan Date: Fri Apr 5 22:14:07 2013 New Revision: 249173 URL: http://svnweb.freebsd.org/changeset/base/249173 Log: config checksum is over the entire fixed portion, not just the config header. FreeBSD doesn't check this but other o/s's do. Obtained from:NetApp Modified: head/usr.sbin/bhyve/mptbl.c Modified: head/usr.sbin/bhyve/mptbl.c == --- head/usr.sbin/bhyve/mptbl.c Fri Apr 5 21:18:01 2013(r249172) +++ head/usr.sbin/bhyve/mptbl.c Fri Apr 5 22:14:07 2013(r249173) @@ -395,7 +395,7 @@ mptable_build(struct vmctx *ctx, int ncp } mpch-base_table_length = curraddr - (char *)mpch; - mpch-checksum = mpt_compute_checksum(mpch, sizeof(*mpch)); + mpch-checksum = mpt_compute_checksum(mpch, mpch-base_table_length); 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: r249174 - head/sys/amd64/vmm/io
Author: grehan
Date: Fri Apr 5 22:16:31 2013
New Revision: 249174
URL: http://svnweb.freebsd.org/changeset/base/249174
Log:
Don't panic when a valid divisor of 1 has been requested.
Obtained from:NetApp
Modified:
head/sys/amd64/vmm/io/vlapic.c
Modified: head/sys/amd64/vmm/io/vlapic.c
==
--- head/sys/amd64/vmm/io/vlapic.c Fri Apr 5 22:14:07 2013
(r249173)
+++ head/sys/amd64/vmm/io/vlapic.c Fri Apr 5 22:16:31 2013
(r249174)
@@ -128,6 +128,8 @@ static int
vlapic_timer_divisor(uint32_t dcr)
{
switch (dcr 0xB) {
+ case APIC_TDCR_1:
+ return (1);
case APIC_TDCR_2:
return (2);
case APIC_TDCR_4:
___
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: r249176 - head/sys/arm/arm
Author: andrew
Date: Fri Apr 5 23:35:23 2013
New Revision: 249176
URL: http://svnweb.freebsd.org/changeset/base/249176
Log:
Add the hw.floatingpoint sysctl to ARM to tell us if we have vfp support
in the kernel and the hardware includes a vfp unit.
Modified:
head/sys/arm/arm/machdep.c
head/sys/arm/arm/vfp.c
Modified: head/sys/arm/arm/machdep.c
==
--- head/sys/arm/arm/machdep.c Fri Apr 5 22:19:02 2013(r249175)
+++ head/sys/arm/arm/machdep.c Fri Apr 5 23:35:23 2013(r249176)
@@ -183,6 +183,10 @@ SYSCTL_UINT(_hw_board, OID_AUTO, revisio
SYSCTL_STRING(_hw_board, OID_AUTO, serial, CTLFLAG_RD,
board_serial, 0, Board serial);
+int vfp_exists;
+SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD,
+vfp_exists, 0, Floating point support enabled);
+
void
board_set_serial(uint64_t serial)
{
Modified: head/sys/arm/arm/vfp.c
==
--- head/sys/arm/arm/vfp.c Fri Apr 5 22:19:02 2013(r249175)
+++ head/sys/arm/arm/vfp.c Fri Apr 5 23:35:23 2013(r249176)
@@ -47,7 +47,7 @@ void vfp_restore(struct vfp_state *);
void vfp_store(struct vfp_state *);
void set_coprocessorACR(u_int);
-boolean_t vfp_exists;
+extern int vfp_exists;
static struct undefined_handler vfp10_uh, vfp11_uh;
/* The VFMXR command using coprocessor commands */
___
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: r249177 - head/lib/libpam/modules/pam_unix
Author: jkim
Date: Fri Apr 5 23:41:34 2013
New Revision: 249177
URL: http://svnweb.freebsd.org/changeset/base/249177
Log:
Fix declaration vs. definition inconsistency. No functional change.
Modified:
head/lib/libpam/modules/pam_unix/pam_unix.c
Modified: head/lib/libpam/modules/pam_unix/pam_unix.c
==
--- head/lib/libpam/modules/pam_unix/pam_unix.c Fri Apr 5 23:35:23 2013
(r249176)
+++ head/lib/libpam/modules/pam_unix/pam_unix.c Fri Apr 5 23:41:34 2013
(r249177)
@@ -460,14 +460,14 @@ to64(char *s, long v, int n)
}
/* Salt suitable for traditional DES and MD5 */
-void
-makesalt(char salt[SALTSIZE])
+static void
+makesalt(char salt[SALTSIZE + 1])
{
int i;
/* These are not really random numbers, they are just
* numbers that change to thwart construction of a
-* dictionary. This is exposed to the public.
+* dictionary.
*/
for (i = 0; i SALTSIZE; i += 4)
to64(salt[i], arc4random(), 4);
___
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: r249178 - head/sys/netgraph/bluetooth/drivers/ubt
Author: adrian
Date: Fri Apr 5 23:41:38 2013
New Revision: 249178
URL: http://svnweb.freebsd.org/changeset/base/249178
Log:
Add blacklist entries for Atheros bluetooth device IDs that are known to
need firmware before they will re-attach as correctly functioning bluetooth
devices.
Reviewed by: maksim
Obtained from:Linux ath3k device driver
Modified:
head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
==
--- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.cFri Apr 5 23:41:34
2013(r249177)
+++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.cFri Apr 5 23:41:38
2013(r249178)
@@ -386,6 +386,39 @@ static const STRUCT_USB_HOST_ID ubt_igno
{
/* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */
{ USB_VPI(USB_VENDOR_AVM, 0x2200, 0) },
+
+ /* Atheros 3011 with sflash firmware */
+ { USB_VPI(0x0cf3, 0x3002, 0) },
+ { USB_VPI(0x0cf3, 0xe019, 0) },
+ { USB_VPI(0x13d3, 0x3304, 0) },
+ { USB_VPI(0x0930, 0x0215, 0) },
+ { USB_VPI(0x0489, 0xe03d, 0) },
+ { USB_VPI(0x0489, 0xe027, 0) },
+
+ /* Atheros AR9285 Malbec with sflash firmware */
+ { USB_VPI(0x03f0, 0x311d, 0) },
+
+ /* Atheros 3012 with sflash firmware */
+ { USB_VPI(0x0cf3, 0x3004, 0) },
+ { USB_VPI(0x0cf3, 0x311d, 0) },
+ { USB_VPI(0x13d3, 0x3375, 0) },
+ { USB_VPI(0x04ca, 0x3005, 0) },
+ { USB_VPI(0x04ca, 0x3006, 0) },
+ { USB_VPI(0x04ca, 0x3008, 0) },
+ { USB_VPI(0x13d3, 0x3362, 0) },
+ { USB_VPI(0x0cf3, 0xe004, 0) },
+ { USB_VPI(0x0930, 0x0219, 0) },
+ { USB_VPI(0x0489, 0xe057, 0) },
+ { USB_VPI(0x13d3, 0x3393, 0) },
+ { USB_VPI(0x0489, 0xe04e, 0) },
+ { USB_VPI(0x0489, 0xe056, 0) },
+
+ /* Atheros AR5BBU12 with sflash firmware */
+ { USB_VPI(0x0489, 0xe02c, 0) },
+
+ /* Atheros AR5BBU12 with sflash firmware */
+ { USB_VPI(0x0489, 0xe03c, 0) },
+ { USB_VPI(0x0489, 0xe036, 0) },
};
/* List of supported bluetooth devices */
___
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: r249179 - head/usr.sbin/bluetooth/ath3kfw
Author: adrian
Date: Fri Apr 5 23:42:22 2013
New Revision: 249179
URL: http://svnweb.freebsd.org/changeset/base/249179
Log:
Extend ath3kfw to include overridable device / vendor IDs.
This is required for ar3k series bluetooth devices who need firmware
but have a different vendor ID than normal.
Reviewed by: maksim
Modified:
head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c
Modified: head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c
==
--- head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c Fri Apr 5 23:41:38 2013
(r249178)
+++ head/usr.sbin/bluetooth/ath3kfw/ath3kfw.c Fri Apr 5 23:42:22 2013
(r249179)
@@ -59,6 +59,9 @@ static intdownload_firmware (struct lib
char const *firmware);
static voidusage (void);
+static int vendor_id = ATH3KFW_VENDOR_ID;
+static int product_id = ATH3KFW_PRODUCT_ID;
+
/*
* Firmware downloader for Atheros AR3011 based USB Bluetooth devices
*/
@@ -78,7 +81,7 @@ main(int argc, char **argv)
addr = 0;
firmware = ATH3KFW_FW;
- while ((n = getopt(argc, argv, d:f:h)) != -1) {
+ while ((n = getopt(argc, argv, d:f:hp:v:)) != -1) {
switch (n) {
case 'd': /* ugen device name */
if (parse_ugen_name(optarg, bus, addr) 0)
@@ -88,7 +91,12 @@ main(int argc, char **argv)
case 'f': /* firmware file */
firmware = optarg;
break;
-
+ case 'p': /* product id */
+ product_id = strtol(optarg, NULL, 0);
+ break;
+ case 'v': /* vendor id */
+ vendor_id = strtol(optarg, NULL, 0);
+ break;
case 'h':
default:
usage();
@@ -166,8 +174,8 @@ find_device(struct libusb20_backend *be,
if (desc == NULL)
continue;
- if (desc-idVendor != ATH3KFW_VENDOR_ID ||
- desc-idProduct != ATH3KFW_PRODUCT_ID)
+ if (desc-idVendor != vendor_id ||
+ desc-idProduct != product_id)
continue;
break;
@@ -280,6 +288,8 @@ usage(void)
Where:\n \
\t-d ugenX.Y ugen device name\n \
\t-f firmware imagefirmware image file name for download\n \
+\t-v vendor_id vendor id\n \
+\t-p vendor_id product id\n \
\t-h display this message\n, ATH3KFW, ATH3KFW);
exit(255);
___
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: r249180 - head/sys/arm/include
Author: andrew
Date: Sat Apr 6 00:47:33 2013
New Revision: 249180
URL: http://svnweb.freebsd.org/changeset/base/249180
Log:
Hide non-assembler bits behind #ifndef __ASSEMBLER__
Modified:
head/sys/arm/include/setjmp.h
Modified: head/sys/arm/include/setjmp.h
==
--- head/sys/arm/include/setjmp.h Fri Apr 5 23:42:22 2013
(r249179)
+++ head/sys/arm/include/setjmp.h Sat Apr 6 00:47:33 2013
(r249180)
@@ -87,10 +87,13 @@
/* Only valid with the _JB_MAGIC_SETJMP magic */
#define _JB_SIGMASK25
+
+#ifndef __ASSEMBLER__
#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
typedef struct _sigjmp_buf { int _sjb[_JBLEN + 1]; } sigjmp_buf[1];
#endif
typedef struct _jmp_buf { int _jb[_JBLEN + 1]; } jmp_buf[1];
+#endif
#endif /* !_MACHINE_SETJMP_H_ */
___
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: r249181 - head/sys/arm/ti
Author: gonzo
Date: Sat Apr 6 03:31:28 2013
New Revision: 249181
URL: http://svnweb.freebsd.org/changeset/base/249181
Log:
Properly clean spurious interrupt state
Suggested by: Ian Lepore
Modified:
head/sys/arm/ti/aintc.c
Modified: head/sys/arm/ti/aintc.c
==
--- head/sys/arm/ti/aintc.c Sat Apr 6 00:47:33 2013(r249180)
+++ head/sys/arm/ti/aintc.c Sat Apr 6 03:31:28 2013(r249181)
@@ -157,6 +157,7 @@ arm_get_next_irq(int last_irq)
if ((active_irq 0xff80)) {
device_printf(ti_aintc_sc-sc_dev,
Spurious interrupt detected (0x%08x)\n, active_irq);
+ aintc_write_4(INTC_SIR_IRQ, 0);
return -1;
}
___
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
