Permalink
Browse files

Remove some more %D remains here and there.

  • Loading branch information...
1 parent aff9f48 commit e707c6f376381d3f2b345db6e00717f18a8b40d3 Sascha Wildner committed Jan 23, 2013
@@ -24,7 +24,6 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/man4.i386/ex.4,v 1.9.2.6 2001/08/17 13:08:45 ru Exp $
-.\" $DragonFly: src/share/man/man4/man4.i386/ex.4,v 1.4 2007/02/25 12:03:07 swildner Exp $
.\"
.Dd January 19, 1997
.Dt EX 4 i386
@@ -46,7 +45,7 @@ read from the EEPROM on the card. For correct operation on newer
cards the Plug-N-Play support should be disabled.
.Sh DIAGNOSTICS
.Bl -diag
-.It "ex%d: Intel EtherExpress Pro/10, address %6D, connector %s"
+.It "ex%d: Intel EtherExpress Pro/10, address XX:XX:XX:XX:XX:XX, connector %s"
The device probe found an installed card, and was able to correctly install
the device driver.
.It "ex%d: WARNING: board's EEPROM is configured for IRQ %d, using %d"
View
@@ -23,7 +23,6 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $FreeBSD: src/share/man/man4/mlx.4,v 1.3.2.5 2001/10/01 13:07:23 dd Exp $
-.\" $DragonFly: src/share/man/man4/mlx.4,v 1.4 2007/05/13 18:33:56 swildner Exp $
.\"
.Dd April 10, 2000
.Dt MLX 4
@@ -169,7 +168,7 @@ The system disk indicated has changed state.
.It mlx%d: physical drive %d:%d reset
.It mlx%d: physical drive %d:%d killed %s
.It "mlx%d: physical drive %d:%d error log: sense = %d asc = %x asq = %x"
-.It "mlx%d: info %4D csi %4D"
+.It "mlx%d: info XX:XX:XX:XX csi XX:XX:XX:XX"
.Pp
The drive at channel:target has been reset, killed for the given reason,
or experienced a SCSI error.
View
@@ -185,10 +185,10 @@ The controller cache is being flushed prior to detach or shutdown.
.It "mly%d: physical device %d:%d start rebuild failed due to physical drive too small"
.It "mly%d: physical device %d:%d sense data received"
.It "mly%d: sense key %d asc %02x ascq %02x"
-.It "mly%d: info %4D csi %4D"
+.It "mly%d: info XX:XX:XX:XX csi XX:XX:XX:XX"
.It "mly%d: physical device %d:%d offline"
.It "mly%d: sense key %d asc %02x ascq %02x"
-.It "mly%d: info %4D csi %4D"
+.It "mly%d: info XX:XX:XX:XX csi XX:XX:XX:XX"
.Pp
The reported event refers to the physical device at the given channel:target
address.
View
@@ -20,9 +20,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
/*-
* Ralink Technology RT2500USB chipset driver
* http://www.ralinktech.com/
@@ -1847,6 +1844,9 @@ static void
ural_set_bssid(struct ural_softc *sc, const uint8_t *bssid)
{
uint16_t tmp;
+#ifdef USB_DEBUG
+ char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
tmp = bssid[0] | bssid[1] << 8;
ural_write(sc, RAL_MAC_CSR5, tmp);
@@ -1857,13 +1857,16 @@ ural_set_bssid(struct ural_softc *sc, const uint8_t *bssid)
tmp = bssid[4] | bssid[5] << 8;
ural_write(sc, RAL_MAC_CSR7, tmp);
- DPRINTF("setting BSSID to %6D\n", bssid, ":");
+ DPRINTF("setting BSSID to %s\n", kether_ntoa(bssid, ethstr));
}
static void
ural_set_macaddr(struct ural_softc *sc, uint8_t *addr)
{
uint16_t tmp;
+#ifdef USB_DEBUG
+ char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
tmp = addr[0] | addr[1] << 8;
ural_write(sc, RAL_MAC_CSR2, tmp);
@@ -1874,7 +1877,7 @@ ural_set_macaddr(struct ural_softc *sc, uint8_t *addr)
tmp = addr[4] | addr[5] << 8;
ural_write(sc, RAL_MAC_CSR4, tmp);
- DPRINTF("setting MAC address to %6D\n", addr, ":");
+ DPRINTF("setting MAC address to %s\n", kether_ntoa(addr, ethstr));
}
static void
@@ -2680,6 +2680,9 @@ zyd_init_locked(struct zyd_softc *sc)
struct usb_config_descriptor *cd;
int error;
uint32_t val;
+#ifdef USB_DEBUG
+ char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
ZYD_LOCK_ASSERT(sc, MA_OWNED);
@@ -2731,8 +2734,8 @@ zyd_init_locked(struct zyd_softc *sc)
if (ifp->if_drv_flags & IFF_DRV_RUNNING)
zyd_stop(sc);
- DPRINTF(sc, ZYD_DEBUG_INIT, "setting MAC address to %6D\n",
- IF_LLADDR(ifp), ":");
+ DPRINTF(sc, ZYD_DEBUG_INIT, "setting MAC address to %s\n",
+ kether_ntoa(IF_LLADDR(ifp), ethstr));
error = zyd_set_macaddr(sc, IF_LLADDR(ifp));
if (error != 0)
return;
@@ -321,7 +321,6 @@ format_class(int8_t class)
}
}
-/* Simulates %D from kernel printf(9). */
static void
simple_hex(void *ptr, size_t length, const char *separator)
{

0 comments on commit e707c6f

Please sign in to comment.