svn commit: r207699 - in stable/7: sbin/ifconfig share/man/man4
sys/amd64/amd64 sys/dev/aic7xxx sys/dev/ath
sys/dev/ath/ath_hal/ar5210 sys/dev/ct sys/dev/mly sys/i386/i386
Gavin Atkinson
gavin at FreeBSD.org
Thu May 6 12:37:01 UTC 2010
Author: gavin
Date: Thu May 6 12:37:01 2010
New Revision: 207699
URL: http://svn.freebsd.org/changeset/base/207699
Log:
Merge r202161 from head:
Spell "Hz" correctly wherever it is user-visible.
PR: bin/142566
Submitted by: N.J. Mann njm njm.me.uk
Modified:
stable/7/sbin/ifconfig/ifieee80211.c
stable/7/share/man/man4/ath.4
stable/7/share/man/man4/cpufreq.4
stable/7/share/man/man4/vge.4
stable/7/sys/amd64/amd64/local_apic.c
stable/7/sys/dev/aic7xxx/aic79xx_pci.c
stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
stable/7/sys/dev/ath/if_ath.c
stable/7/sys/dev/ct/ct_isa.c
stable/7/sys/dev/mly/mly.c
stable/7/sys/i386/i386/local_apic.c
Directory Properties:
stable/7/sbin/ifconfig/ (props changed)
stable/7/share/man/man4/ (props changed)
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sbin/ifconfig/ifieee80211.c
==============================================================================
--- stable/7/sbin/ifconfig/ifieee80211.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sbin/ifconfig/ifieee80211.c Thu May 6 12:37:01 2010 (r207699)
@@ -2259,7 +2259,7 @@ print_chaninfo(const struct ieee80211_ch
{
char buf[14];
- printf("Channel %3u : %u%c Mhz%-14.14s",
+ printf("Channel %3u : %u%c MHz%-14.14s",
ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
get_chaninfo(c, verb, buf, sizeof(buf)));
@@ -2338,7 +2338,7 @@ list_channels(int s, int allchans)
static void
print_txpow(const struct ieee80211_channel *c)
{
- printf("Channel %3u : %u Mhz %3.1f reg %2d ",
+ printf("Channel %3u : %u MHz %3.1f reg %2d ",
c->ic_ieee, c->ic_freq,
c->ic_maxpower/2., c->ic_maxregpower);
}
@@ -2800,7 +2800,7 @@ ieee80211_status(int s)
c = getcurchan(s);
if (c->ic_freq != IEEE80211_CHAN_ANY) {
char buf[14];
- printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq,
+ printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
get_chaninfo(c, 1, buf, sizeof(buf)));
} else if (verbose)
printf(" channel UNDEF");
Modified: stable/7/share/man/man4/ath.4
==============================================================================
--- stable/7/share/man/man4/ath.4 Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/share/man/man4/ath.4 Thu May 6 12:37:01 2010 (r207699)
@@ -224,7 +224,7 @@ This should not happen.
An invalid transmit rate was specified for an outgoing frame.
The frame is discarded.
This should not happen.
-.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)"
+.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)"
The Atheros Hardware Access Layer was unable to reset the hardware
when switching channels during scanning.
This should not happen.
Modified: stable/7/share/man/man4/cpufreq.4
==============================================================================
--- stable/7/share/man/man4/cpufreq.4 Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/share/man/man4/cpufreq.4 Thu May 6 12:37:01 2010 (r207699)
@@ -234,7 +234,7 @@ The driver should set unknown or irrelev
All the following elements for each setting should be returned:
.Bd -literal
struct cf_setting {
- int freq; /* CPU clock in Mhz or 100ths of a percent. */
+ int freq; /* CPU clock in MHz or 100ths of a percent. */
int volts; /* Voltage in mV. */
int power; /* Power consumed in mW. */
int lat; /* Transition latency in us. */
Modified: stable/7/share/man/man4/vge.4
==============================================================================
--- stable/7/share/man/man4/vge.4 Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/share/man/man4/vge.4 Thu May 6 12:37:01 2010 (r207699)
@@ -58,7 +58,7 @@ driver provides support for various NICs
based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity
Family Gigabit Ethernet controller chips.
.Pp
-The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed
+The VT6120/VT6122 is a 33/66MHz 64-bit PCI device which combines a tri-speed
MAC with an integrated 10/100/1000 copper PHY.
(Some older cards use an external PHY.)
The VT6130/VT6132 is the PCI express version of Velocity family.
Modified: stable/7/sys/amd64/amd64/local_apic.c
==============================================================================
--- stable/7/sys/amd64/amd64/local_apic.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sys/amd64/amd64/local_apic.c Thu May 6 12:37:01 2010 (r207699)
@@ -467,7 +467,7 @@ lapic_setup_clock(void)
panic("lapic: Divisor too big");
value /= 2;
if (bootverbose)
- printf("lapic: Divisor %lu, Frequency %lu hz\n",
+ printf("lapic: Divisor %lu, Frequency %lu Hz\n",
lapic_timer_divisor, value);
/*
Modified: stable/7/sys/dev/aic7xxx/aic79xx_pci.c
==============================================================================
--- stable/7/sys/dev/aic7xxx/aic79xx_pci.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sys/dev/aic7xxx/aic79xx_pci.c Thu May 6 12:37:01 2010 (r207699)
@@ -248,10 +248,10 @@ static const char *pci_bus_modes[] =
"PCI bus mode unknown",
"PCI bus mode unknown",
"PCI bus mode unknown",
- "PCI-X 101-133Mhz",
- "PCI-X 67-100Mhz",
- "PCI-X 50-66Mhz",
- "PCI 33 or 66Mhz"
+ "PCI-X 101-133MHz",
+ "PCI-X 67-100MHz",
+ "PCI-X 50-66MHz",
+ "PCI 33 or 66MHz"
};
#define TESTMODE 0x00000800ul
Modified: stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
==============================================================================
--- stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Thu May 6 12:37:01 2010 (r207699)
@@ -15,6 +15,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* $Id: ar5210_reset.c,v 1.8 2008/11/11 17:25:16 sam Exp $
+ * $FreeBSD$
*/
#include "opt_ah.h"
@@ -86,7 +87,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMO
if ((chan->channelFlags & CHANNEL_5GHZ) == 0) {
/* Only 11a mode */
- HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5Ghz\n", __func__);
+ HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5GHz\n", __func__);
FAIL(HAL_EINVAL);
}
/*
Modified: stable/7/sys/dev/ath/if_ath.c
==============================================================================
--- stable/7/sys/dev/ath/if_ath.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sys/dev/ath/if_ath.c Thu May 6 12:37:01 2010 (r207699)
@@ -4934,7 +4934,7 @@ ath_chan_set(struct ath_softc *sc, struc
ath_stoprecv(sc); /* turn off frame recv */
if (!ath_hal_reset(ah, sc->sc_opmode, &hchan, AH_TRUE, &status)) {
if_printf(ic->ic_ifp, "%s: unable to reset "
- "channel %u (%u Mhz, flags 0x%x hal flags 0x%x), "
+ "channel %u (%u MHz, flags 0x%x hal flags 0x%x), "
"hal status %u\n", __func__,
ieee80211_chan2ieee(ic, chan), chan->ic_freq,
chan->ic_flags, hchan.channelFlags, status);
Modified: stable/7/sys/dev/ct/ct_isa.c
==============================================================================
--- stable/7/sys/dev/ct/ct_isa.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sys/dev/ct/ct_isa.c Thu May 6 12:37:01 2010 (r207699)
@@ -316,7 +316,7 @@ ct_isa_attach(device_t dev)
break;
}
#if 0
- printf("%s: chiprev %s chipclk %d Mhz\n",
+ printf("%s: chiprev %s chipclk %d MHz\n",
slp->sl_dev.dv_xname, s, ct->sc_chipclk);
#endif
Modified: stable/7/sys/dev/mly/mly.c
==============================================================================
--- stable/7/sys/dev/mly/mly.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sys/dev/mly/mly.c Thu May 6 12:37:01 2010 (r207699)
@@ -2528,7 +2528,7 @@ mly_describe_controller(struct mly_softc
mly_describe_code(mly_table_memorytype, mi->memory_type),
mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "",
mi->cache_size);
- mly_printf(sc, "CPU: %s @ %dMHZ\n",
+ mly_printf(sc, "CPU: %s @ %dMHz\n",
mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed);
if (mi->l2cache_size != 0)
mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size);
Modified: stable/7/sys/i386/i386/local_apic.c
==============================================================================
--- stable/7/sys/i386/i386/local_apic.c Thu May 6 09:54:01 2010 (r207698)
+++ stable/7/sys/i386/i386/local_apic.c Thu May 6 12:37:01 2010 (r207699)
@@ -470,7 +470,7 @@ lapic_setup_clock(void)
panic("lapic: Divisor too big");
value /= 2;
if (bootverbose)
- printf("lapic: Divisor %lu, Frequency %lu hz\n",
+ printf("lapic: Divisor %lu, Frequency %lu Hz\n",
lapic_timer_divisor, value);
/*
More information about the svn-src-all
mailing list