svn commit: r221964 - in projects/largeSMP: contrib/top
games/fortune/datfiles games/morse lib/libprocstat
sbin/geom/class/part sbin/ifconfig share/man/man4
share/man/man4/man4.i386 share/mk sys/co...
Attilio Rao
attilio at FreeBSD.org
Sun May 15 15:47:18 UTC 2011
Author: attilio
Date: Sun May 15 15:47:16 2011
New Revision: 221964
URL: http://svn.freebsd.org/changeset/base/221964
Log:
MFC
Added:
projects/largeSMP/lib/libprocstat/Symbol.map
- copied unchanged from r221963, head/lib/libprocstat/Symbol.map
projects/largeSMP/lib/libprocstat/Versions.def
- copied unchanged from r221963, head/lib/libprocstat/Versions.def
projects/largeSMP/share/man/man4/man4.i386/glxiic.4
- copied unchanged from r221963, head/share/man/man4/man4.i386/glxiic.4
projects/largeSMP/sys/dev/glxiic/
- copied from r221963, head/sys/dev/glxiic/
projects/largeSMP/sys/modules/glxiic/
- copied from r221963, head/sys/modules/glxiic/
Modified:
projects/largeSMP/games/fortune/datfiles/fortunes
projects/largeSMP/games/fortune/datfiles/fortunes-o.real
projects/largeSMP/games/fortune/datfiles/fortunes-o.sp.ok
projects/largeSMP/games/fortune/datfiles/fortunes.sp.ok
projects/largeSMP/games/fortune/datfiles/freebsd-tips.sp.ok
projects/largeSMP/games/fortune/datfiles/gerrold.limerick
projects/largeSMP/games/fortune/datfiles/limerick
projects/largeSMP/games/fortune/datfiles/limerick.sp.ok
projects/largeSMP/games/fortune/datfiles/startrek.sp.ok
projects/largeSMP/games/fortune/datfiles/zippy.sp.ok
projects/largeSMP/games/morse/morse.c
projects/largeSMP/lib/libprocstat/Makefile
projects/largeSMP/lib/libprocstat/libprocstat.c
projects/largeSMP/sbin/geom/class/part/geom_part.c
projects/largeSMP/sbin/ifconfig/ifmedia.c
projects/largeSMP/share/man/man4/hpet.4
projects/largeSMP/share/man/man4/man4.i386/Makefile
projects/largeSMP/sys/conf/files.i386
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
projects/largeSMP/sys/dev/cxgbe/t4_sge.c
projects/largeSMP/sys/dev/iwn/if_iwn.c
projects/largeSMP/sys/dev/mii/mii.c
projects/largeSMP/sys/dev/mk48txx/mk48txx.c
projects/largeSMP/sys/dev/mk48txx/mk48txxreg.h
projects/largeSMP/sys/dev/scc/scc_bfe_ebus.c
projects/largeSMP/sys/dev/uart/uart_cpu_sparc64.c
projects/largeSMP/sys/geom/eli/g_eli_key_cache.c
projects/largeSMP/sys/i386/conf/NOTES
projects/largeSMP/sys/modules/Makefile
projects/largeSMP/sys/net/if_media.h
projects/largeSMP/sys/sparc64/sparc64/eeprom.c
Directory Properties:
projects/largeSMP/ (props changed)
projects/largeSMP/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/contrib/bind9/ (props changed)
projects/largeSMP/contrib/binutils/ (props changed)
projects/largeSMP/contrib/bzip2/ (props changed)
projects/largeSMP/contrib/dialog/ (props changed)
projects/largeSMP/contrib/ee/ (props changed)
projects/largeSMP/contrib/expat/ (props changed)
projects/largeSMP/contrib/file/ (props changed)
projects/largeSMP/contrib/gcc/ (props changed)
projects/largeSMP/contrib/gdb/ (props changed)
projects/largeSMP/contrib/gdtoa/ (props changed)
projects/largeSMP/contrib/gnu-sort/ (props changed)
projects/largeSMP/contrib/groff/ (props changed)
projects/largeSMP/contrib/less/ (props changed)
projects/largeSMP/contrib/libpcap/ (props changed)
projects/largeSMP/contrib/libstdc++/ (props changed)
projects/largeSMP/contrib/llvm/ (props changed)
projects/largeSMP/contrib/llvm/tools/clang/ (props changed)
projects/largeSMP/contrib/ncurses/ (props changed)
projects/largeSMP/contrib/netcat/ (props changed)
projects/largeSMP/contrib/ntp/ (props changed)
projects/largeSMP/contrib/one-true-awk/ (props changed)
projects/largeSMP/contrib/openbsm/ (props changed)
projects/largeSMP/contrib/openpam/ (props changed)
projects/largeSMP/contrib/pf/ (props changed)
projects/largeSMP/contrib/sendmail/ (props changed)
projects/largeSMP/contrib/tcpdump/ (props changed)
projects/largeSMP/contrib/tcsh/ (props changed)
projects/largeSMP/contrib/top/ (props changed)
projects/largeSMP/contrib/top/install-sh (props changed)
projects/largeSMP/contrib/tzcode/stdtime/ (props changed)
projects/largeSMP/contrib/tzcode/zic/ (props changed)
projects/largeSMP/contrib/tzdata/ (props changed)
projects/largeSMP/contrib/wpa/ (props changed)
projects/largeSMP/contrib/xz/ (props changed)
projects/largeSMP/crypto/openssh/ (props changed)
projects/largeSMP/crypto/openssl/ (props changed)
projects/largeSMP/gnu/lib/ (props changed)
projects/largeSMP/gnu/usr.bin/binutils/ (props changed)
projects/largeSMP/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/largeSMP/gnu/usr.bin/gdb/ (props changed)
projects/largeSMP/lib/libc/ (props changed)
projects/largeSMP/lib/libc/stdtime/ (props changed)
projects/largeSMP/lib/libutil/ (props changed)
projects/largeSMP/lib/libz/ (props changed)
projects/largeSMP/sbin/ (props changed)
projects/largeSMP/sbin/ipfw/ (props changed)
projects/largeSMP/share/mk/bsd.arch.inc.mk (props changed)
projects/largeSMP/share/zoneinfo/ (props changed)
projects/largeSMP/sys/ (props changed)
projects/largeSMP/sys/amd64/include/xen/ (props changed)
projects/largeSMP/sys/boot/ (props changed)
projects/largeSMP/sys/boot/i386/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/ski/ (props changed)
projects/largeSMP/sys/boot/powerpc/boot1.chrp/ (props changed)
projects/largeSMP/sys/boot/powerpc/ofw/ (props changed)
projects/largeSMP/sys/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/sys/conf/ (props changed)
projects/largeSMP/sys/contrib/dev/acpica/ (props changed)
projects/largeSMP/sys/contrib/octeon-sdk/ (props changed)
projects/largeSMP/sys/contrib/pf/ (props changed)
projects/largeSMP/sys/contrib/x86emu/ (props changed)
projects/largeSMP/usr.bin/calendar/ (props changed)
projects/largeSMP/usr.bin/csup/ (props changed)
projects/largeSMP/usr.bin/procstat/ (props changed)
projects/largeSMP/usr.sbin/ndiscvt/ (props changed)
projects/largeSMP/usr.sbin/zic/ (props changed)
Modified: projects/largeSMP/games/fortune/datfiles/fortunes
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/fortunes Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/fortunes Sun May 15 15:47:16 2011 (r221964)
@@ -10494,13 +10494,13 @@ Anti-trust laws should be approached wit
Antonio Antonio
Was tired of living alonio
He thought he would woo Antonio Antonio
-Miss Lucamy Lu, Rode of on his polo ponio
+Miss Lucamy Lu, Rode off on his polo ponio
Miss Lucamy Lucy Molonio. And found the maid
In a bowery shade,
Sitting and knitting alonio.
Antonio Antonio
Said if you will be my ownio
-I'll love tou true Oh nonio Antonio
+I'll love you true Oh nonio Antonio
And buy for you You're far too bleak and bonio
An icery creamry conio. And all that I wish
You singular fish
@@ -10509,7 +10509,7 @@ Antonio Antonio
Uttered a dismal moanio
And went off and hid
Or I'm told that he did
-In the Antartical Zonio.
+In the Antarctical Zonio.
%
Antonym, n.:
The opposite of the word you're trying to think of.
@@ -20232,7 +20232,7 @@ Good-bye. I am leaving because I am bor
Goodbye, cool world.
%
Goose pimples rose all over me, my hair stood on end, my eyes filled with
-tears of love and gratitude for this greatest of all conquerers of human
+tears of love and gratitude for this greatest of all conquerors of human
misery and shame, and my breath came in little gasps. If I had not known
that the Leader would have scorned such adulation, I might have fallen to
my knees in unashamed worship, but instead I drew myself to attention, raised
@@ -25099,7 +25099,7 @@ intellectual
enlightenment
%
IBM:
- [Internation Business Machines Corp.] Also known as Itty Bitty
+ [International Business Machines Corp.] Also known as Itty Bitty
Machines or The Lawyer's Friend. The dominant force in computer
marketing, having supplied worldwide some 75% of all known hardware
and 10% of all software. To protect itself from the litigious envy
Modified: projects/largeSMP/games/fortune/datfiles/fortunes-o.real
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/fortunes-o.real Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/fortunes-o.real Sun May 15 15:47:16 2011 (r221964)
@@ -7722,7 +7722,7 @@ I wooed a stewed nude in Bermuda,
I was lewd, but my God! she was lewder.
She said it was crude
To be wooed in the nude--
-I persued her, subdued her, and screwed her!
+I pursued her, subdued her, and screwed her!
%
I would like to say, Mister Bunce,
I'm a great connoisseur of hot cunts.
@@ -9044,7 +9044,7 @@ raped, his house burned, and all his cat
distant neighbors about the tragedy, a few of them reported that the only
stranger they had seen in the area for weeks was a tall desperado wearing a
black hat and a red neckerchief.
- The cowboy saddled his fastest horse and set out to find the villian.
+ The cowboy saddled his fastest horse and set out to find the villain.
He searched for months but couldn't catch up with the culprit; in town after
dusty town he was told that a man fitting the description had been there but
had just departed; usually after some heinous crime.
Modified: projects/largeSMP/games/fortune/datfiles/fortunes-o.sp.ok
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/fortunes-o.sp.ok Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/fortunes-o.sp.ok Sun May 15 15:47:16 2011 (r221964)
@@ -1121,7 +1121,6 @@ pees
penis
pere
Perelman
-persued
pestes
Peteer
Pettigrew
@@ -1600,7 +1599,6 @@ vibrators
vici
Vida
vidi
-villian
virginem
Visme
viziti
Modified: projects/largeSMP/games/fortune/datfiles/fortunes.sp.ok
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/fortunes.sp.ok Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/fortunes.sp.ok Sun May 15 15:47:16 2011 (r221964)
@@ -139,7 +139,6 @@ Anouilh
ANRS
Ansley
answerback
-Antartic
Anthony's
Antonym
Antrim
@@ -375,7 +374,6 @@ Bertolt
Besicovitch
Beslove
Betazoid
-bethumped
Bette
Bevan
BEW
@@ -468,7 +466,6 @@ booing
bookaholic
Booker's
boola
-Boorchi
Boorstin
bootable
Boothe
@@ -576,7 +573,6 @@ Bulwer
bumperless
Bumstead
Bungei
-BURBULATION
Buren
Burggoven
burgled
@@ -623,7 +619,6 @@ Callahan
Callahan's
Callimachus
Camden
-Camelia
Cameron
Camillo
Campbell
@@ -771,7 +766,6 @@ Churchill's
Churchy
Chuzzlewit
CI
-Cianci
Ciardi
cinched
cinema's
@@ -806,7 +800,6 @@ Cochran
cockamamie
Cocteau
Cody
-Cody's
Coevolution
cogito
Cohen's
@@ -826,7 +819,6 @@ Comebacks
Commedia
Commie
CommUNIXque
-compuberty
computatis
Computerdom
computerites
@@ -1077,8 +1069,6 @@ DJ
DMPK
Dobb's
Dobbs
-doberman
-doberperson
Dobie
Doc
Docquier
@@ -1203,7 +1193,6 @@ EINS
Einstein's
Eisley
Elbert
-ELBONICS
Eldridge
electrocommunications
Electrocution
@@ -1264,7 +1253,6 @@ Eschenbach
Escher
esperantisto
Esplandian
-Esser
est
estas
Estes
@@ -1293,7 +1281,6 @@ exhalation
exhibitionists
EXP
expatriated
-extemporanea
extracurricular
Exupery
Exxon's
@@ -1301,7 +1288,6 @@ eyestalks
Eyquem
Ezrin
FAA
-FACISM
Factorials
Fadiman
Fafhrd
@@ -1340,7 +1326,6 @@ Fellgett's
Felton
feminism's
Femme
-FENDERBERG
Fenelon
Fenster
Ferber
@@ -1369,7 +1354,6 @@ fikcio
fiks
filees
filename
-Filgoer's
filigrees
Filkharmonics
Fillmore
@@ -1398,7 +1382,6 @@ flamewars
Flandry
Flannagan's
Flannery
-FLANNISTER
Flappity
flatfoot
flatteries
@@ -1410,7 +1393,6 @@ Flon's
floppity
Florio
floss
-flouride
Flugg's
Flummery
flutterby
@@ -1557,7 +1539,6 @@ Geminis
Genderplex
Genesereth
Genghis
-genlock
genocide
Genter
Geritol
@@ -1605,7 +1586,6 @@ Giuseppe
Glanvill
Glaser
gleekzorp
-GLEEMITES
Glegg
gleknow
Glib's
@@ -2013,7 +1993,6 @@ if's
ifthen
Igmmlptk
Ignatowski
-ignisecond
ihuxw
IIc
III's
@@ -2498,7 +2477,6 @@ Lovin
Lowells
Lowery's
Lowes
-Lownes
LP
LPA
LSD
@@ -2534,7 +2512,6 @@ Ma's
Mabbitt
Mabley
Macaroons
-MacBeth
Maccius
MacDowell
MacDuff
@@ -2621,7 +2598,6 @@ Matz's
Maud
Maud'Dib
Maugham
-Maughm
Maupin
Maureens
Maurois
@@ -2630,7 +2606,6 @@ Maxey
Maxson
May's
Mayorga
-Mårten
MBAs
MBH
MC
@@ -2687,7 +2662,6 @@ Mendelson
mendicants
Mengot
Menninger
-Mensa
Menschen
Meow
meowing
@@ -2715,7 +2689,6 @@ Mickos
microchips
Microcomputing
micrometric
-Microsystem's
Microsystems
MicroVAXes
midgets
@@ -2730,7 +2703,6 @@ milk's
Milkbone
Millay
Milligan
-millihelen
Millikan
Millikan's
millions
@@ -2763,7 +2735,6 @@ Mitford
Mitgong
mittengrabben
mitts
-mittsquinter
MITZIE
Mix's
Miyamoto
@@ -2779,7 +2750,6 @@ modifaiing
Modula
Moebius
Mohandas
-Mohandis
mohmen
Moishe
Molander
@@ -2803,7 +2773,6 @@ Moolah
moonshiner's
Moore's
mopeds
-mophobia
Moping
moralists
Mordecai
@@ -2832,7 +2801,6 @@ Mt
MTA
Muad'dib
muckest
-mucklucks
Mudgeeraba
Mudhead
mudslide
@@ -2888,7 +2856,6 @@ nanohenry
nanometers
Nansen
Napoleon's
-narcolepulacyi
Narnia
Nasium's
Naso
@@ -2909,7 +2876,6 @@ Neantical
Nebuchadnezzar
Nebuchadnezzar's
necesas
-necessitious
NecroSoft
Nehru
Neil's
@@ -2940,7 +2906,6 @@ NF
NFL
Ngdanga
Niagra
-Niccoli
Nicklaus
Nicol
Nicolaides
@@ -3165,7 +3130,6 @@ Pearsall
PECCATOPHOBIA
Pecor's
Pedaeration
-pediddel
Peers's
Pegler
pelted
@@ -3192,7 +3156,6 @@ Personifiers
Petaluma
Petersons
Petr
-petribar
Petronius
Pfeiffer
Pfffttt
@@ -3204,7 +3167,6 @@ Philips
philogyny
phoney
Phooey
-phosflink
Picadilly
Pickard
Pickle's
@@ -3246,7 +3208,6 @@ Pocataligo
Pocatello
Podunk
Pohl's
-Poincair
Poincare's
pointy
Polanski
@@ -3347,7 +3308,6 @@ Pumpernickel
punchline
punning
PUPs
-PURPITATION
Purshottam
PUSHes
pushy
@@ -3551,7 +3511,6 @@ Saberhagen
Sacher's
Sadat
Saddam
-sadoequinecrophilia
Saens
Safford
Safire's
@@ -3605,7 +3564,6 @@ Schickele
Schieffer
schisms
schizophrenics
-schlattwhapper
schlichte
schluerfen
Schmendrick
@@ -3631,7 +3589,6 @@ Scintillae
Scott's
Scoville
SCRBL
-SCRIBLINE
Scrubb
scullery
scurries
@@ -3784,7 +3741,6 @@ somebody'd
something's
Sondheim
Sooooo
-Soren
Sorhed
sort've
sorta
@@ -3799,7 +3755,6 @@ SP
Spacemen
Spaceport
spacewar
-SPAGMUMPS
spake
Spam
spank
@@ -3824,7 +3779,6 @@ springenwerk
Springsteen
sprites
SPSW
-SQUATCHO
squaws
squealers
squrooneg
@@ -3980,7 +3934,6 @@ teepers
telematic
telepath
teleportation
-TELEPRESSION
telepsychology
tempfile
tendrils
@@ -4028,7 +3981,6 @@ tinpot
Tirith
tis
Tiselius
-Titas
tites
TLC
TM
@@ -4060,7 +4012,6 @@ toun
Tourbillon
Toven
trans
-transcendant
transmogrifiers
trapezes
Traub
@@ -4121,7 +4072,6 @@ TYDFS
tyg
typefaces
Tyroon
-tzu
Ubi
UDA
Udall's
@@ -4152,7 +4102,6 @@ Unseld
untechnician
unvoist
Updike
-upharsen
uponst
Urey
Urho
Modified: projects/largeSMP/games/fortune/datfiles/freebsd-tips.sp.ok
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/freebsd-tips.sp.ok Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/freebsd-tips.sp.ok Sun May 15 15:47:16 2011 (r221964)
@@ -45,7 +45,6 @@ misc
natserv
ncal
netcat
-netscape
netstat
newfile
NICs
Modified: projects/largeSMP/games/fortune/datfiles/gerrold.limerick
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/gerrold.limerick Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/gerrold.limerick Sun May 15 15:47:16 2011 (r221964)
@@ -3,7 +3,7 @@
%% Copyright David Gerrold, 1984-2000, all rights reserved,
%% used with permission of the author.
%%
-%%© This is the copyright line.
+%%© This is the copyright line.
%%Eighty-nine is the year we assign.
%% These verses are caroled
%% by one David Gerrold.
Modified: projects/largeSMP/games/fortune/datfiles/limerick
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/limerick Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/limerick Sun May 15 15:47:16 2011 (r221964)
@@ -260,7 +260,7 @@ And white footgear intended for tennis.
%
A dulcet-voiced callgirl named Shedd,
Who's cultured, well-spoken, well-bred,
- Had achieved some reknown
+ Had achieved some renown
For her tone going down--
There's a nice civil tongue in her head.
%
@@ -307,7 +307,7 @@ Had sex with a virgin named Grace.
By bleeding all over his face.
%
A gay young prince from Morocco
-Made love in a manner rococco.
+Made love in a manner rococo.
He painted his penis
To resemble a Venus
And flavored his semen with cocoa.
Modified: projects/largeSMP/games/fortune/datfiles/limerick.sp.ok
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/limerick.sp.ok Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/limerick.sp.ok Sun May 15 15:47:16 2011 (r221964)
@@ -283,6 +283,7 @@ McTavish
meanie
meanies
meany
+Mensa
mentis
midgets
minimis
@@ -353,11 +354,9 @@ quimmy
quints
ravished
Reims
-reknown
Resounded
retriebrve
Rhyll
-rococco
rogered
Salinas
Sandem
Modified: projects/largeSMP/games/fortune/datfiles/startrek.sp.ok
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/startrek.sp.ok Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/startrek.sp.ok Sun May 15 15:47:16 2011 (r221964)
@@ -14,7 +14,6 @@ Corbomite
Corby
Daystrom
Deela
-Dehaver
Elaan
Eleen
Eneg
Modified: projects/largeSMP/games/fortune/datfiles/zippy.sp.ok
==============================================================================
--- projects/largeSMP/games/fortune/datfiles/zippy.sp.ok Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/fortune/datfiles/zippy.sp.ok Sun May 15 15:47:16 2011 (r221964)
@@ -180,7 +180,7 @@ manicurist
matic
meatball
meltdown
-naugahide
+naugahyde
obstetrician
poindexter
pre
Modified: projects/largeSMP/games/morse/morse.c
==============================================================================
--- projects/largeSMP/games/morse/morse.c Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/games/morse/morse.c Sun May 15 15:47:16 2011 (r221964)
@@ -161,20 +161,20 @@ static const struct morsetab iso8859_1ta
static const struct morsetab iso8859_7tab[] = {
/*
- * The greek alphabet; you'll need an 8859-7 font in order
+ * The Greek alphabet; you'll need an ISO8859-7 font in order
* to see the actual characters.
* This table does not implement:
* - the special sequences for the seven diphthongs,
* - the punctuation differences.
* Implementing these features would introduce too many
* special-cases in the program's main loop.
- * The diphtong sequences are:
+ * The diphthong sequences are:
* alpha iota .-.-
* alpha upsilon ..--
* epsilon upsilon ---.
* eta upsilon ...-
- * omikron iota ---..
- * omikron upsilon ..-
+ * omicron iota ---..
+ * omicron upsilon ..-
* upsilon iota .---
* The different punctuation symbols are:
* ; ..-.-
@@ -193,10 +193,10 @@ static const struct morsetab iso8859_7ta
{'è', "-.-."}, /* theta */
{'é', ".."}, /* iota */
{'ß', ".."}, /* iota with acute */
- {'ú', ".."}, /* iota with diairesis */
- {'À', ".."}, /* iota with acute and diairesis */
+ {'ú', ".."}, /* iota with diaeresis */
+ {'À', ".."}, /* iota with acute and diaeresis */
{'ê', "-.-"}, /* kappa */
- {'ë', ".-.."}, /* lamda */
+ {'ë', ".-.."}, /* lambda */
{'ì', "--"}, /* mu */
{'í', "-."}, /* nu */
{'î', "-..-"}, /* xi */
@@ -209,8 +209,8 @@ static const struct morsetab iso8859_7ta
{'ô', "-"}, /* tau */
{'õ', "-.--"}, /* upsilon */
{'ý', "-.--"}, /* upsilon with acute */
- {'û', "-.--"}, /* upsilon and diairesis */
- {'à', "-.--"}, /* upsilon with acute and diairesis */
+ {'û', "-.--"}, /* upsilon and diaeresis */
+ {'à', "-.--"}, /* upsilon with acute and diaeresis */
{'ö', "..-."}, /* phi */
{'÷', "----"}, /* chi */
{'ø', "--.-"}, /* psi */
@@ -222,29 +222,29 @@ static const struct morsetab iso8859_7ta
static const struct morsetab koi8rtab[] = {
/*
- * the cyrillic alphabet; you'll need a KOI8R font in order
+ * The Cyrillic alphabet; you'll need a KOI8-R font in order
* to see the actual characters
*/
- {'Á', ".-"}, /* a */
+ {'Á', ".-"}, /* a */
{'Â', "-..."}, /* be */
{'×', ".--"}, /* ve */
{'Ç', "--."}, /* ge */
{'Ä', "-.."}, /* de */
- {'Å', "."}, /* ye */
- {'£', "."}, /* yo, the same as ye */
+ {'Å', "."}, /* ye */
+ {'£', "."}, /* yo, the same as ye */
{'Ö', "...-"}, /* she */
{'Ú', "--.."}, /* ze */
- {'É', ".."}, /* i */
+ {'É', ".."}, /* i */
{'Ê', ".---"}, /* i kratkoye */
{'Ë', "-.-"}, /* ka */
{'Ì', ".-.."}, /* el */
- {'Í', "--"}, /* em */
- {'Î', "-."}, /* en */
+ {'Í', "--"}, /* em */
+ {'Î', "-."}, /* en */
{'Ï', "---"}, /* o */
{'Ð', ".--."}, /* pe */
{'Ò', ".-."}, /* er */
{'Ó', "..."}, /* es */
- {'Ô', "-"}, /* te */
+ {'Ô', "-"}, /* te */
{'Õ', "..-"}, /* u */
{'Æ', "..-."}, /* ef */
{'È', "...."}, /* kha */
@@ -305,9 +305,9 @@ main(int argc, char **argv)
while ((ch = getopt(argc, argv, GETOPTOPTS)) != -1)
switch ((char) ch) {
- case 'c':
- cpm = atoi(optarg);
- break;
+ case 'c':
+ cpm = atoi(optarg);
+ break;
case 'd':
device = optarg;
break;
Modified: projects/largeSMP/lib/libprocstat/Makefile
==============================================================================
--- projects/largeSMP/lib/libprocstat/Makefile Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/lib/libprocstat/Makefile Sun May 15 15:47:16 2011 (r221964)
@@ -12,6 +12,9 @@ SRCS= cd9660.c \
smbfs.c \
udf.c
+VERSION_DEF= ${.CURDIR}/Versions.def
+SYMBOL_MAPS= ${.CURDIR}/Symbol.map
+
INCS= libprocstat.h
CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE
SHLIB_MAJOR= 1
Copied: projects/largeSMP/lib/libprocstat/Symbol.map (from r221963, head/lib/libprocstat/Symbol.map)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/largeSMP/lib/libprocstat/Symbol.map Sun May 15 15:47:16 2011 (r221964, copy of r221963, head/lib/libprocstat/Symbol.map)
@@ -0,0 +1,16 @@
+/*
+ * $FreeBSD$
+ */
+FBSD_1.2 {
+ procstat_close;
+ procstat_freefiles;
+ procstat_freeprocs;
+ procstat_get_pipe_info;
+ procstat_get_pts_info;
+ procstat_get_socket_info;
+ procstat_get_vnode_info;
+ procstat_getfiles;
+ procstat_getprocs;
+ procstat_open_kvm;
+ procstat_open_sysctl;
+};
Copied: projects/largeSMP/lib/libprocstat/Versions.def (from r221963, head/lib/libprocstat/Versions.def)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/largeSMP/lib/libprocstat/Versions.def Sun May 15 15:47:16 2011 (r221964, copy of r221963, head/lib/libprocstat/Versions.def)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+# This version was first added to 9.0-current.
+FBSD_1.2 {
+};
Modified: projects/largeSMP/lib/libprocstat/libprocstat.c
==============================================================================
--- projects/largeSMP/lib/libprocstat/libprocstat.c Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/lib/libprocstat/libprocstat.c Sun May 15 15:47:16 2011 (r221964)
@@ -253,7 +253,7 @@ procstat_getfiles(struct procstat *procs
if (procstat->type == PROCSTAT_SYSCTL)
return (procstat_getfiles_sysctl(procstat, kp, mmapped));
else if (procstat->type == PROCSTAT_KVM)
- return (procstat_getfiles_kvm(procstat, kp, mmapped));
+ return (procstat_getfiles_kvm(procstat, kp, mmapped));
else
return (NULL);
}
Modified: projects/largeSMP/sbin/geom/class/part/geom_part.c
==============================================================================
--- projects/largeSMP/sbin/geom/class/part/geom_part.c Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/sbin/geom/class/part/geom_part.c Sun May 15 15:47:16 2011 (r221964)
@@ -253,13 +253,7 @@ find_provider(struct ggeom *gp, off_t mi
bestsector = 0;
LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
s = find_provcfg(pp, "start");
- if (s == NULL) {
- s = find_provcfg(pp, "offset");
- sector =
- (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize;
- } else
- sector = (off_t)strtoimax(s, NULL, 0);
-
+ sector = (off_t)strtoimax(s, NULL, 0);
if (sector < minsector)
continue;
if (bestpp != NULL && sector >= bestsector)
@@ -379,18 +373,9 @@ gpart_autofill_resize(struct gctl_req *r
errx(EXIT_FAILURE, "invalid partition index");
s = find_provcfg(pp, "start");
- if (s == NULL) {
- s = find_provcfg(pp, "offset");
- start = (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize;
- } else
- start = (off_t)strtoimax(s, NULL, 0);
+ start = (off_t)strtoimax(s, NULL, 0);
s = find_provcfg(pp, "end");
- if (s == NULL) {
- s = find_provcfg(pp, "length");
- lba = start +
- (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize;
- } else
- lba = (off_t)strtoimax(s, NULL, 0) + 1;
+ lba = (off_t)strtoimax(s, NULL, 0) + 1;
if (lba > last) {
geom_deletetree(&mesh);
@@ -402,12 +387,7 @@ gpart_autofill_resize(struct gctl_req *r
new_size = ALIGNDOWN(last - start + 1, alignment);
else {
s = find_provcfg(pp, "start");
- if (s == NULL) {
- s = find_provcfg(pp, "offset");
- new_lba =
- (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize;
- } else
- new_lba = (off_t)strtoimax(s, NULL, 0);
+ new_lba = (off_t)strtoimax(s, NULL, 0);
/*
* Is there any free space between current and
* next providers?
@@ -512,12 +492,7 @@ gpart_autofill(struct gctl_req *req)
last = ALIGNDOWN(last, alignment);
while ((pp = find_provider(gp, first)) != NULL) {
s = find_provcfg(pp, "start");
- if (s == NULL) {
- s = find_provcfg(pp, "offset");
- lba = (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize;
- } else
- lba = (off_t)strtoimax(s, NULL, 0);
-
+ lba = (off_t)strtoimax(s, NULL, 0);
a_lba = ALIGNDOWN(lba, alignment);
if (first < a_lba && a_first < a_lba) {
/* Free space [first, lba> */
@@ -543,12 +518,7 @@ gpart_autofill(struct gctl_req *req)
}
s = find_provcfg(pp, "end");
- if (s == NULL) {
- s = find_provcfg(pp, "length");
- first = lba +
- (off_t)strtoimax(s, NULL, 0) / pp->lg_sectorsize;
- } else
- first = (off_t)strtoimax(s, NULL, 0) + 1;
+ first = (off_t)strtoimax(s, NULL, 0) + 1;
a_first = ALIGNUP(first, alignment);
}
if (a_first <= last) {
@@ -625,21 +595,12 @@ gpart_show_geom(struct ggeom *gp, const
while ((pp = find_provider(gp, first)) != NULL) {
s = find_provcfg(pp, "start");
- if (s == NULL) {
- s = find_provcfg(pp, "offset");
- sector = (off_t)strtoimax(s, NULL, 0) / secsz;
- } else
- sector = (off_t)strtoimax(s, NULL, 0);
+ sector = (off_t)strtoimax(s, NULL, 0);
s = find_provcfg(pp, "end");
- if (s == NULL) {
- s = find_provcfg(pp, "length");
- length = (off_t)strtoimax(s, NULL, 0) / secsz;
- end = sector + length - 1;
- } else {
- end = (off_t)strtoimax(s, NULL, 0);
- length = end - sector + 1;
- }
+ end = (off_t)strtoimax(s, NULL, 0);
+ length = end - sector + 1;
+
s = find_provcfg(pp, "index");
idx = atoi(s);
if (first < sector) {
@@ -782,20 +743,12 @@ gpart_backup(struct gctl_req *req, unsig
printf("%s %s\n", scheme, s);
LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
s = find_provcfg(pp, "start");
- if (s == NULL) {
- s = find_provcfg(pp, "offset");
- sector = (off_t)strtoimax(s, NULL, 0) / secsz;
- } else
- sector = (off_t)strtoimax(s, NULL, 0);
+ sector = (off_t)strtoimax(s, NULL, 0);
s = find_provcfg(pp, "end");
- if (s == NULL) {
- s = find_provcfg(pp, "length");
- length = (off_t)strtoimax(s, NULL, 0) / secsz;
- } else {
- end = (off_t)strtoimax(s, NULL, 0);
- length = end - sector + 1;
- }
+ end = (off_t)strtoimax(s, NULL, 0);
+ length = end - sector + 1;
+
s = find_provcfg(pp, "label");
printf("%-*s %*s %*jd %*jd %s %s\n",
windex, find_provcfg(pp, "index"),
Modified: projects/largeSMP/sbin/ifconfig/ifmedia.c
==============================================================================
--- projects/largeSMP/sbin/ifconfig/ifmedia.c Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/sbin/ifconfig/ifmedia.c Sun May 15 15:47:16 2011 (r221964)
@@ -268,13 +268,9 @@ setmedia(const char *val, int d, int s,
subtype = get_media_subtype(IFM_TYPE(ifmr->ifm_ulist[0]), val);
strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
- ifr.ifr_media = (ifmr->ifm_current & ~(IFM_NMASK|IFM_TMASK)) |
+ ifr.ifr_media = (ifmr->ifm_current & IFM_IMASK) |
IFM_TYPE(ifmr->ifm_ulist[0]) | subtype;
- if ((ifr.ifr_media & IFM_TMASK) == 0) {
- ifr.ifr_media &= ~(IFM_GMASK | IFM_OMASK);
- }
-
ifmr->ifm_current = ifr.ifr_media;
callback_register(setifmediacallback, (void *)ifmr);
}
Modified: projects/largeSMP/share/man/man4/hpet.4
==============================================================================
--- projects/largeSMP/share/man/man4/hpet.4 Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/share/man/man4/hpet.4 Sun May 15 15:47:16 2011 (r221964)
@@ -69,14 +69,14 @@ This driver uses High Precision Event Ti
usually enumerated via ACPI) to supply kernel with one time counter and
several (usually from 3 to 8) event timers.
This hardware includes single main counter with known increment frequency
-(10MHz or more), and several programable comparators (optionally with
+(10MHz or more), and several programmable comparators (optionally with
automatic reload feature).
When value of the main counter matches current value of any comparator,
interrupt can be generated.
Depending on hardware capabilities and configuration, interrupt can be
delivered as regular I/O APIC interrupt (ISA or PCI) in range from 0 to 31,
or as Front Side Bus interrupt, alike to PCI MSI interrupts, or in so called
-"LegacyReplacement Route" HPET can speal IRQ0 of i8254 and IRQ8 of the RTC.
+"LegacyReplacement Route" HPET can steal IRQ0 of i8254 and IRQ8 of the RTC.
Interrupt can be either edge- or level-triggered. In last case they could be
safely shared with PCI IRQs.
Driver prefers to use FSB interrupts, if supported, to avoid sharing.
Modified: projects/largeSMP/share/man/man4/man4.i386/Makefile
==============================================================================
--- projects/largeSMP/share/man/man4/man4.i386/Makefile Sun May 15 14:58:29 2011 (r221963)
+++ projects/largeSMP/share/man/man4/man4.i386/Makefile Sun May 15 15:47:16 2011 (r221964)
@@ -12,6 +12,7 @@ MAN= aic.4 \
ep.4 \
ex.4 \
fe.4 \
+ glxiic.4 \
glxsb.4 \
ie.4 \
longrun.4 \
Copied: projects/largeSMP/share/man/man4/man4.i386/glxiic.4 (from r221963, head/share/man/man4/man4.i386/glxiic.4)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/largeSMP/share/man/man4/man4.i386/glxiic.4 Sun May 15 15:47:16 2011 (r221964, copy of r221963, head/share/man/man4/man4.i386/glxiic.4)
@@ -0,0 +1,106 @@
+.\" Copyright (c) 2011 Henrik Brix Andersen <brix at FreeBSD.org>
+.\" 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, 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd May 15, 2011
+.Dt GLXIIC 4 i386
+.Os
+.Sh NAME
+.Nm glxiic
+.Nd Geode LX CS5536 I2C controller driver
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device pci"
+.Cd "device isa"
+.Cd "device glxiic"
+.Cd "device iicbus"
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+glxiic_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the System Management Bus controller of the Geode LX
+series CS5536 Companion Device. The Geode LX is a member of the AMD
+Geode family of integrated x86 system chips.
+.Pp
+Although AMD refers to this device as a System Management Bus (SMBus)
+controller, it is really an I2C controller (it lacks SMBus ALERT# and
+Alert Response support).
+.Pp
+The
+.Nm
+driver supports both I2C master and slave mode.
+.Sh SYSCTL VARIABLE
+The
+.Nm
+driver supports the following variable as both
+.Xr sysctl 8
+and
+.Xr loader 8
+tunable:
+.Bl -tag -width indent
+.It Va dev.glxiic.0.timeout
+This variable controls the I2C bus timeout in milliseconds. The
+default timeout is 35 milliseconds. A value of zero disables the
+timeout.
+.El
+.Sh CAVEAT
+The
+.Nm
+driver uses the interrupt line number configured by the board firmware
+by default. If no interrupt line number has been configured by the
+board firmware (or to override the interrupt line number configured by
+board firmware), place the following line in
+.Xr device.hints 5 :
+.Bd -ragged -offset indent
+hint.glxiic.0.irq="10"
+.Ed
+.Pp
+The interrupt line number must be between 1 and 15.
+.Sh SEE ALSO
+.Xr iicbus 4 ,
+.Xr device.hints 5 ,
+.Xr loader.conf 5 ,
+.Xr loader 8 ,
+.Xr sysctl 8
+.Sh HISTORY
+The
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list