Date: Sun, 10 Jan 2010 09:38:02 GMT From: "N.J. Mann" <njm@njm.me.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: kern/142566: [PATCH] correct capitalisation of the symbol Hz in user output Message-ID: <201001100938.o0A9c29Y066172@titania.njm.me.uk> Resent-Message-ID: <201001101010.o0AAA25J058996@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142566
>Category: kern
>Synopsis: [PATCH] correct capitalisation of the symbol Hz in user output
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 10 10:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: N.J. Mann
>Release: FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD titania.njm.me.uk 7.2-STABLE FreeBSD 7.2-STABLE #23 r201635M: Wed Jan 6 10:00:37 GMT 2010 njm@titania.njm.me.uk:/usr/obj/usr/src/sys/titania i386
>Description:
The SI unit of frequency measurement is Hertz. Symbol is Hz, not hz
or HZ. The attached patches correct HZ and hz to Hz in user facing output
and manual pages.
>How-To-Repeat:
>Fix:
The first patch is against HEAD and with minimal changes may be MFCed
to both 8-STABLE and 7-STABLE. The second patch is an addiotnal patch for
7-STABLE since arlcontrol seems to have been removed from HEAD (and 8-STABLE).
--- Hz_patch_1.diff begins here ---
Index: sbin/ifconfig/ifieee80211.c
===================================================================
--- sbin/ifconfig/ifieee80211.c (revision 201718)
+++ sbin/ifconfig/ifieee80211.c (working copy)
@@ -3429,9 +3429,9 @@
else if (IEEE80211_IS_CHAN_B(c))
strlcat(buf, " 11b", bsize);
if (IEEE80211_IS_CHAN_HALF(c))
- strlcat(buf, "/10Mhz", bsize);
+ strlcat(buf, "/10MHz", bsize);
if (IEEE80211_IS_CHAN_QUARTER(c))
- strlcat(buf, "/5Mhz", bsize);
+ strlcat(buf, "/5MHz", bsize);
if (IEEE80211_IS_CHAN_TURBO(c))
strlcat(buf, " Turbo", bsize);
if (precise) {
@@ -3453,7 +3453,7 @@
{
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)));
@@ -3562,7 +3562,7 @@
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);
}
@@ -4244,7 +4244,7 @@
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");
Index: tools/tools/ath/athdecode/main.c
===================================================================
--- tools/tools/ath/athdecode/main.c (revision 201718)
+++ tools/tools/ath/athdecode/main.c (working copy)
@@ -125,13 +125,13 @@
fprintf(fd, "ar%uReset (done), OK", state.chipnum);
break;
case AH_MARK_CHIPRESET:
- fprintf(fd, "ar%uChipReset, channel %u Mhz", state.chipnum, r->val);
+ fprintf(fd, "ar%uChipReset, channel %u MHz", state.chipnum, r->val);
break;
case AH_MARK_PERCAL:
- fprintf(fd, "ar%uPerCalibration, channel %u Mhz", state.chipnum, r->val);
+ fprintf(fd, "ar%uPerCalibration, channel %u MHz", state.chipnum, r->val);
break;
case AH_MARK_SETCHANNEL:
- fprintf(fd, "ar%uSetChannel, channel %u Mhz", state.chipnum, r->val);
+ fprintf(fd, "ar%uSetChannel, channel %u MHz", state.chipnum, r->val);
break;
case AH_MARK_ANI_RESET:
switch (r->val) {
Index: share/man/man4/vge.4
===================================================================
--- share/man/man4/vge.4 (revision 201718)
+++ share/man/man4/vge.4 (working copy)
@@ -58,7 +58,7 @@
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.
Index: share/man/man4/cpufreq.4
===================================================================
--- share/man/man4/cpufreq.4 (revision 201718)
+++ share/man/man4/cpufreq.4 (working copy)
@@ -234,7 +234,7 @@
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. */
Index: share/man/man4/ath.4
===================================================================
--- share/man/man4/ath.4 (revision 201718)
+++ share/man/man4/ath.4 (working copy)
@@ -249,7 +249,7 @@
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.
Index: sys/dev/mly/mly.c
===================================================================
--- sys/dev/mly/mly.c (revision 201718)
+++ sys/dev/mly/mly.c (working copy)
@@ -2528,7 +2528,7 @@
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);
Index: sys/dev/ct/ct_isa.c
===================================================================
--- sys/dev/ct/ct_isa.c (revision 201718)
+++ sys/dev/ct/ct_isa.c (working copy)
@@ -316,7 +316,7 @@
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
Index: sys/dev/aic7xxx/aic79xx_pci.c
===================================================================
--- sys/dev/aic7xxx/aic79xx_pci.c (revision 201718)
+++ sys/dev/aic7xxx/aic79xx_pci.c (working copy)
@@ -248,10 +248,10 @@
"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
Index: sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
===================================================================
--- sys/dev/ath/ath_hal/ar5210/ar5210_reset.c (revision 201718)
+++ sys/dev/ath/ath_hal/ar5210/ar5210_reset.c (working copy)
@@ -87,7 +87,7 @@
if (!IEEE80211_IS_CHAN_5GHZ(chan)) {
/* 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);
}
/*
Index: sys/dev/ath/if_ath.c
===================================================================
--- sys/dev/ath/if_ath.c (revision 201718)
+++ sys/dev/ath/if_ath.c (working copy)
@@ -5351,7 +5351,7 @@
ath_stoprecv(sc); /* turn off frame recv */
if (!ath_hal_reset(ah, sc->sc_opmode, chan, AH_TRUE, &status)) {
if_printf(ifp, "%s: unable to reset "
- "channel %u (%u Mhz, flags 0x%x), hal status %u\n",
+ "channel %u (%u MHz, flags 0x%x), hal status %u\n",
__func__, ieee80211_chan2ieee(ic, chan),
chan->ic_freq, chan->ic_flags, status);
return EIO;
Index: sys/i386/i386/local_apic.c
===================================================================
--- sys/i386/i386/local_apic.c (revision 201718)
+++ sys/i386/i386/local_apic.c (working copy)
@@ -450,7 +450,7 @@
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);
/*
Index: sys/amd64/amd64/local_apic.c
===================================================================
--- sys/amd64/amd64/local_apic.c (revision 201718)
+++ sys/amd64/amd64/local_apic.c (working copy)
@@ -448,7 +448,7 @@
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);
/*
--- Hz_patch_1.diff ends here ---
--- Hz_patch_2.diff begins here ---
Index: usr.sbin/arlcontrol/arlcontrol.c
===================================================================
--- usr.sbin/arlcontrol/arlcontrol.c (revision 201718)
+++ usr.sbin/arlcontrol/arlcontrol.c (working copy)
@@ -148,21 +148,21 @@
int max_freq;
} CHSET[] = {
{ 0, 0, 0, 0, 0, 0 },
- { 1, "900 Mhz", "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) },
+ { 1, "900 MHz", "Canada, U.S.A., Mexico", 0, freq_list_1, MAXFREQ(freq_list_1) },
{ 2, 0, 0, 0, 0, 0 },
{ 3, 0, 0, 0, 0, 0 },
{ 4, 0, 0, 0, 0, 0 },
{ 5, 0, 0, 0, 0, 0 },
- { 6, "900 Mhz", "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) },
+ { 6, "900 MHz", "Australia", 0, freq_list_6, MAXFREQ(freq_list_6) },
{ 7, 0, 0, 0, 0, 0 },
{ 8, 0, 0, 0, 0, 0 },
- { 9, "2400 Mhz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) },
- { 10, "2400 Mhz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) },
- { 11, "2400 Mhz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) },
- { 12, "2400 Mhz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) },
- { 13, "2400 Mhz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) },
- { 14, "2400 Mhz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) },
- { 15, "2400 Mhz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) }
+ { 9, "2400 MHz", "North America", rate_list_2400, freq_list_9, MAXFREQ(freq_list_9) },
+ { 10, "2400 MHz", "E.T.S.I", rate_list_2400, freq_list_10, MAXFREQ(freq_list_10) },
+ { 11, "2400 MHz", "Japan", rate_list_2400, freq_list_11, MAXFREQ(freq_list_11) },
+ { 12, "2400 MHz", "France", rate_list_2400, freq_list_12, MAXFREQ(freq_list_12) },
+ { 13, "2400 MHz", "Australia", rate_list_2400, freq_list_13, MAXFREQ(freq_list_13) },
+ { 14, "2400 MHz", "Germany", rate_list_2400, freq_list_14, MAXFREQ(freq_list_14) },
+ { 15, "2400 MHz", "U.K.(MPT1349),Spain", rate_list_2400, freq_list_15, MAXFREQ(freq_list_15) }
};
char* registrationMode[] = {
@@ -221,7 +221,7 @@
arl_io->channelSet,
CHSET[arl_io->channelSet].fr,
CHSET[arl_io->channelSet].country);
- printf("\tfrequency %s Mhz, bitrate %s kb/s, priority %s, receive mode %d\n",
+ printf("\tfrequency %s MHz, bitrate %s kb/s, priority %s, receive mode %d\n",
(CHSET[arl_io->channelSet].freq &&
CHSET[arl_io->channelSet].max_freq > arl_io->channelNumber) ?
CHSET[arl_io->channelSet].freq[arl_io->channelNumber].name :
--- Hz_patch_2.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001100938.o0A9c29Y066172>