From owner-p4-projects@FreeBSD.ORG Sun Dec 7 00:26:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DD251065675; Sun, 7 Dec 2008 00:26:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C5D891065672 for ; Sun, 7 Dec 2008 00:26:33 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4BB58FC13 for ; Sun, 7 Dec 2008 00:26:33 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB70QXju036324 for ; Sun, 7 Dec 2008 00:26:33 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB70QXpt036322 for perforce@freebsd.org; Sun, 7 Dec 2008 00:26:33 GMT (envelope-from zec@icir.org) Date: Sun, 7 Dec 2008 00:26:33 GMT Message-Id: <200812070026.mB70QXpt036322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 00:26:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=154226 Change 154226 by zec@zec_tpx32 on 2008/12/07 00:26:21 Improve style and remove an XXX comment which no longer holds. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#6 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#36 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#6 (text+ko) ==== @@ -1311,10 +1311,9 @@ CURVNET_SET(TD_TO_VNET(td)); error = vi_symlookup(&lookup, symstr); CURVNET_RESTORE(); - if (error == 0) { + if (error == 0) error = copyout(&lookup, uap->data, sizeof(lookup)); - } } #else if (lf == NULL) ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#4 (text+ko) ==== @@ -82,12 +82,12 @@ if (strcmp(symstr, mapentry->name) == 0) { lookup->symvalue = (u_long) mapentry->base; lookup->symsize = mapentry->size; - return 0; + return (0); } } } - return ENOENT; + return (ENOENT); } static void ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#36 (text+ko) ==== @@ -1483,7 +1483,6 @@ #define ISN_RANDOM_INCREMENT (4096 - 1) #ifdef VIMAGE_GLOBALS -/* XXX WARNING WARNING clash with contrib/pf/net/pf_subr.c - REVISIT !!! */ static u_char isn_secret[32]; static int isn_last_reseed; static u_int32_t isn_offset, isn_offset_old; From owner-p4-projects@FreeBSD.ORG Sun Dec 7 01:40:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 682431065675; Sun, 7 Dec 2008 01:40:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C1181065672 for ; Sun, 7 Dec 2008 01:40:53 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19E7A8FC0C for ; Sun, 7 Dec 2008 01:40:53 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB71ep27054920 for ; Sun, 7 Dec 2008 01:40:51 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB71engJ054917 for perforce@freebsd.org; Sun, 7 Dec 2008 01:40:49 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 7 Dec 2008 01:40:49 GMT Message-Id: <200812070140.mB71engJ054917@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 01:40:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=154228 Change 154228 by pgj@kolbasz on 2008/12/07 01:39:51 Add Hungarian translation of chapter "Structuring Documents Under doc/" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/structure/chapter.sgml#2 (text+ko) ==== @@ -31,255 +31,368 @@ --> - Structuring documents under <filename>doc/</filename> + A dokumentumok szervezése a <filename>doc/</filename> + könyvtáron belül - The doc/ tree is organized in a particular - fashion, and the documents that are part of the FDP are in turn organized - in a particular fashion. The aim is to make it simple to add new - documentation into the tree and: + A doc/ könyvtár tartalma egy + adott módon szervezõdik, és ennek megfelelõen + a &os; Dokumentációs Projektben + készített dokumentumok is adott módon + kerülnek elrendezésre. Célunk ezzel + megkönnyíteni az újabb + dokumentációk felvételét, + illetve: - make it easy to automate converting the document to other formats; + leegyszerûsíteni az új dokumentum + automatikus átalakítását + különbözõ formátumokba; - promote consistency between the different documentation - organizations, to make it easier to switch between working on - different documents; + megteremteni a különbözõ dokumentumok + közti következetes elrendezést, így + könnyebben lehet köztük váltani munka + közben; - make it easy to decide where in the tree new documentation should - be placed. + segíteni az új dokumentumok helyének + egyszerû eldöntésében. - In addition, the documentation tree has to accommodate documentation - that could be in many different languages and in many different - encodings. It is important that the structure of the documentation tree - does not enforce any particular defaults or cultural preferences. + Mindezek mellett a dokumentációt + tároló könyvtárnak olyan + felépítésûnek kell lennie, amely + lehetõvé teszi több különbözõ + nyelven és több különbözõ + kódolásban írt dokumentumok kényelmes + elhelyezését. Fontos hozzátennünk, hogy a + könyvtár szerkezete nem követel meg semmilyen + különleges elõfeltételezést vagy + kulturális berendezkedést. - The top level, <filename>doc/</filename> + A legfelsõ szint: a <filename>doc/</filename> + könyvtár - There are two types of directory under doc/, - each with very specific directory names and meanings. + A doc/ további két, + különleges névvel és jelentéssel + rendelkezõ könyvtárat rejt. - Directory + Könyvtár - Meaning + Leírás share/ - - Contains files that are not specific to the various translations - and encodings of the documentation. Contains subdirectories to - further categorize the information. For example, the files that - comprise the &man.make.1; infrastructure are in - share/mk, while the additional SGML support - files (such as the FreeBSD extended DocBook DTD) are in - share/sgml. + + Ebben a könyvtárban találjuk azokat az + állományokat, amelyek függetlenek az egyes + fordításoktól és + kódolásoktól. A benne + található alkönyvtárakon + keresztül tovább csoportosítódik a + tartalmuk. Például a dokumentáció + elõállításához + kapcsolódó &man.make.1; infrastruktúra + állományai a share/mk, + miközben a SGML használatához + szükséges további állományok + (mint például a &os; kiterjesztéseit + tartalmazó DocBook DTD) a + share/sgml alkönyvtárban + helyezkednek el. - lang.encoding/ - - One directory exists for each available translation and encoding - of the documentation, for example - en_US.ISO8859-1/ and - zh_TW.Big5/. The names are long, but by fully - specifying the language and encoding we prevent any future headaches - should a translation team want to provide the documentation in the - same language but in more than one encoding. This also completely - isolates us from any problems that might be caused by a switch to - Unicode. + nyelv.kódolás/ + + Minden fordításhoz és annak + kódolásához tartozik egy + könyvtár, például + en_US.ISO8859-1 vagy + hu_HU.ISO8859-2. A nevek alapvetõen + hosszúak, de pontosan meghatározzák az + adott nyelvet és a dokumentáció + írásához alkalmazott + kódolást. Ezzel igyekszük + felkészülni olyan esetekre, amikor a + fordítócsapatok egy nyelven többféle + kódolás szerint is szeretnének + dokumentációt készíteni. Ez a + megoldás egyben kiutat szolgáltat egy esetleges + késõbbi, Unicode kódolásra + váltás során felmerülõ + problémák elõl. - The - <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable>/</filename> directories + A + <filename><replaceable>nyelv</replaceable>.<replaceable>kódolás</replaceable>/</filename> + könyvtárak - These directories contain the documents themselves. The - documentation is split into up to three more categories at this - level, indicated by the different directory names. + Ezek a könyvtárak tartalmazzák magukat a + dokumentumokat. A dokumentumokat ezen a szinten a + különbözõ könyvtárak neveinek + megfelelõen három vagy több + kategóriára osztjuk. - Directory + Könyvtár - Contents + Tartalom articles - - Documentation marked up as a DocBook article - (or equivalent). Reasonably short, and broken up into sections. - Normally only available as one HTML file. + + Az itt található dokumentumokat a DocBook + article eleme szerint (vagy egy azzal + egyenlõ megoldással) jelöltük. + Viszonylag rövid, szakaszokra osztott dokumentumokat + találhatunk itt. Általában egyetlen HTML + állományként érhetõek + el. - + books - - Documentation marked up as a DocBook book (or - equivalent). Book length, and broken up into chapters. Normally - available as both one large HTML file (for people with fast - connections, or who want to print it easily from a browser) and - as a collection of linked, smaller files. + + Ebben a könyvtárban a DocBook + book eleme szerint (vagy egy azzal + egyenlõ megoldással) jelöltük. + Hosszabb, fejezetekre osztott dokumentum. + Általában egyetlen nagyobb HTML + állományként (a gyors + internetkapcsolattal rendelkezõ, vagy a dokumentumot a + böngészõbõl nyomtatni + kívánó egyének + számára), illetve több kisebb + állományként együtteseként is + elérhetõ. man - - For translations of the system manual pages. This directory will - contain one or more - mann directories, - corresponding to the sections that have been translated. + + A rendszerhez tartozó man oldalak + fordításai. A lefordított szakaszoknak + megfelelõen ebben a könyvtárban egy vagy + több mann + nevû alkönyvtárat találhatunk. - Not every - lang.encoding directory will contain all of these directories. It depends - on how much translation has been accomplished by that translation - team. + Nem mindegyik + nyelv.kódolás + könyvtár tartalmazza ezeket az + alkönyvtárakat. Az egyes fordítások + tartalma mindig attól függ, hogy az adott + fordítócsapatnak mennyit sikerült eddig + lefordítania. - + - Document specific information + Az egyes dokumentumokkal kapcsolatos + tudnivalók - This section contains specific notes about particular documents - managed by the FDP. + Ebben a szakaszban a &os; Dokumentációs Projekt + keretein belül gondozott különbözõ + dokumentumokat ismerhetjük meg részletesebben. - The Handbook + A kézikönyv books/handbook/ - The Handbook is written to comply with the FreeBSD DocBook - extended DTD. - - The Handbook is organized as a DocBook book. - It is then divided into parts, each of which may - contain several chapters. - chapters are further subdivided into sections - (sect1) and subsections (sect2, - sect3) and so on. - + A kézikönyv a &os; kiterjesztéseit + tartalmazó DocBook DTD szerint készült. + + A kézikönyv a DocBook book + elemének megfelelõen szervezõdik. Több + part elemmel jelölt részbõl + áll, amelyek mindegyike több + chapter elemmel jelölt fejezetet foglal + magában. Ezek a fejezetek további szakaszokra + (sect1) bomlanak, amelyek helyenként + alszakaszokra (sect2, + sect3) oszlanak, és így + tovább. + - Physical organization - - There are a number of files and directories within the - handbook directory. + Fizikai szervezés + + A kézikönyv forrásai több + különbözõ állományban + és könyvtárban a + handbook könyvtáron + belül találhatóak. - The Handbook's organization may change over time, and this - document may lag in detailing the organizational changes. If you - have any questions about how the Handbook is organized, please - contact the &a.doc;. + A kézikönyv szervezése + idõrõl-idõre változik, ezért + könnyen elõfordulhat, hogy ez a dokumentum csak + kissé késve követi ezeket a + változtatásokat. Ha további + kérdéseink lennének a + kézikönyv szervezésérõl, + bátran írjunk a &a.doc; + címére! - + <filename>Makefile</filename> - - The Makefile defines some variables that - affect how the SGML source is converted to other formats, and - lists the various source files that make up the Handbook. It then - includes the standard doc.project.mk file, to - bring in the rest of the code that handles converting documents - from one format to another. + + A Makefile + állományban definiálódnak olyan + változók, amelyek a SGML források + különbözõ formátumúra + alakításának menetét + befolyásolják, illetve hivatkozik a + kézikönyv forrásaira. Ezután + beemeli a doc.project.mk + állományt, és így + lényegében betölti a dokumentumok + átalakításáért + felelõs további + utasításokat. <filename>book.sgml</filename> - - This is the top level document in the Handbook. It contains - the Handbook's DOCTYPE - declaration, as well as the elements that describe the - Handbook's structure. + + Ez a kézikönyv legfelsõ szintû + dokumentuma. Ebben van a kézikönyv dokumentípus-deklarációja, + illetve a szerkezetét leíró + további elemek. - book.sgml uses parameter - entities to load in the files with the - .ent extension. These files (described later) - then define general - entities that are used throughout the rest of the - Handbook. + A book.sgml az + .ent kiterjesztésû + állományokat paraméteregyedek + segítségével tölti be. Ezek az + állományok (amelyekrõl késõbb + még szó lesz) aztán a + kézikönyv további részeiben + használt általános + egyedeket definiálnak. - <filename><replaceable>directory</replaceable>/chapter.sgml</filename> + <filename><replaceable>könyvtár</replaceable>/chapter.sgml</filename> + + A kézikönyv egyes fejezetei + egymástól különálló + könyvtárakban, chapter.sgml + nevû állományokban + tárolódnak. Ezeket a könyvtárakat + az adott fejezetet jelölõ + chapter id + tulajdonsága szerint szokták elnevezni. - Each chapter in the Handbook is stored in a file called - chapter.sgml in a separate directory from the - other chapters. Each directory is named after the value of the - id attribute on the chapter - element. + Például ha az egyik fejezet + forrásában a következõ sor + olvasható: - For example, if one of the chapter files contains: - + ... ]]> - then it will be called chapter.sgml in - the kernelconfiguration directory. In - general, the entire contents of the chapter will be held in this - file. - - When the HTML version of the Handbook is produced, this will - yield kernelconfiguration.html. This is - because of the id value, and is not related to - the name of the directory. + Ekkor a chapter.sgml nevû + állományt tartalmazó könyvtár + neve kernelconfig lesz. Egy ilyen + állomány általában a teljes + fejezetet tartalmazza. + + A kézikönyv HTML változatának + készítése során ebbõl a + kernelconfig.html + állomány fog keletkezni. Ezt azonban az + id értéke határozza + meg, semmi köze nincs a könyvtár + elnevezéséhez. - In earlier versions of the Handbook the files were stored in - the same directory as book.sgml, and named - after the value of the id attribute on the - file's chapter element. Moving them into - separate directories prepares for future plans for the Handbook. - Specifically, it will soon be possible to include images in each - chapter. It makes more sense for each image to be stored in a - directory with the text for the chapter than to try to keep the - text for all the chapters, and all the images, in one large - directory. Namespace collisions would be inevitable, and it is - easier to work with several directories with a few files in them - than it is to work with one directory that has many files in - it. + A kézikönyv korábbi + változataiban az összes forrás a + book.sgml állománnyal + volt egy szinten, és az adott + chapter elemek id + tulajdonságának megfelelõen került + elnevezésre. A könyvtárak + létrehozásával a kézikönyv + szervezésének további + átalakításait kívántuk + elõkészíteni. Itt + különösen gondolunk arra, hogy ezzel + szeretnénk lehetõvé tenni képek + hozzáadását az egyes fejezetekhez. + Véleményünk szerint sokkal több + értelme van ugyanis a képeket a fejezetek + forrásával együtt egy külön + könyvtárban tárolni, mintsem az + összes képet és szöveget egyetlen + nagy könyvtárban összeömleszteni. A + névütközés egy idõ után + úgyis elkerülhetetlenné válik, + és sok, kevés állományt + tartalmazó könyvtárral + egyébként is könnyebb dolgozni, mint egy + sok állományt tartalmazó + könyvtárral. - A brief look will show that there are many directories with - individual chapter.sgml files, including + A kézikönyv forrásaiban könnyen + láthatjuk, hogy sok ilyen könyvtár van, + bennük egy-egy chapter.sgml + állománnyal. Például basics/chapter.sgml, - introduction/chapter.sgml, and + introduction/chapter.sgml és printing/chapter.sgml. - + - Chapters and/or directories should not be named in a fashion - that reflects their ordering within the Handbook. This ordering - might change as the content within the Handbook is reorganized; - this sort of reorganization should not (generally) include the - need to rename files (unless entire chapters are being promoted - or demoted within the hierarchy). + A fejezeteket és könyvtárakat nem + szabad semmilyen sorrendiségre utaló + módon elnevezni. A fejezetek elrendezése + ugyanis változhat a kézikönyv egy + esetleges átszervezése során. Az + ilyen átszervezések során pedig + (általában) nem lenne szabad + állományokat átnevezni (hacsak + komplett fejezeteket nem mozgatunk fentebb vagy lentebb a + szerkezetben). - - Each chapter.sgml file will not be a - complete SGML document. In particular, they will not have their - own DOCTYPE lines at the start of the files. - - This is unfortunate as - it makes it impossible to treat these as generic SGML - files and simply convert them to HTML, RTF, PS, and other - formats in the same way the main Handbook is generated. This - would force you to rebuild the Handbook - every time you want to see the effect a change has had on just - one chapter. + + Az egyes chapter.sgml + állományok önmagukban teljes SGML + dokumentumok. Különösen azért, mert + semmilyen DOCTYPE sor nem + található az elejükön. + + Ez abból a szempontból + hátrányos, hogy ezeket az + állományokat ezért nem tudjuk + normál SGML állományokként + kezelni. Emiatt ezeket nem lehet egyszerûen, a + kézikönyvhöz hasonlóan módon + HTML, RTF, PS vagy más egyéb formátumba + átalakítani. Ezért tehát + könnyen elõfordulhat, hogy a fejezetek + megváltoztatásakor a + teljes kézikönyvet elõ + kell állítanunk. From owner-p4-projects@FreeBSD.ORG Sun Dec 7 01:49:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5599D10656D5; Sun, 7 Dec 2008 01:49:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0048D10656D2 for ; Sun, 7 Dec 2008 01:49:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E17DC8FC1A for ; Sun, 7 Dec 2008 01:49:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB71n1oU055492 for ; Sun, 7 Dec 2008 01:49:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB71n1qm055490 for perforce@freebsd.org; Sun, 7 Dec 2008 01:49:01 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 7 Dec 2008 01:49:01 GMT Message-Id: <200812070149.mB71n1qm055490@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 01:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=154229 Change 154229 by pgj@kolbasz on 2008/12/07 01:48:29 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#20 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#8 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/geom/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#11 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#17 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/preface/preface.sgml#7 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#12 edit .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#11 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate .. //depot/projects/docproj_hu/www/en/community/social.xsl#2 integrate .. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#5 integrate .. //depot/projects/docproj_hu/www/en/multimedia/multimedia.pl#4 integrate .. //depot/projects/docproj_hu/www/en/releases/7.1R/schedule.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#10 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#15 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#10 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#30 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -3447,6 +3447,7 @@ + @@ -3759,6 +3760,7 @@ + ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.342 2008/11/24 01:26:22 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.343 2008/12/01 21:15:04 brueffer Exp $ 2000 @@ -712,6 +712,8 @@ &hwlist.ixgb; + &hwlist.ixgbe; + &hwlist.jme; &hwlist.kue; @@ -838,6 +840,8 @@ &hwlist.rum; + &hwlist.upgt; + &hwlist.ural; [&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent ==== //depot/projects/docproj_hu/www/en/community/social.xsl#2 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -55,7 +55,7 @@
  • There are hundreds of videos from conferences, screencasts, and demonstrations relating to FreeBSD - on YouTube.
    • + on YouTube. In particular, there is a new BSD Conferences channel with full length 1 hour taped presentations from FreeBSD technical conferences.
  • There is a FreeBSD ==== //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#5 (text+ko) ==== @@ -9,6 +9,368 @@ + + + Asterisk Open Source Community Director John Todd + + An interview with Asterisk Open Source Community + Director John Todd, who also happens to be a user + of BSD. We talk about Asterisk on BSD, and his + choice of OpenBSD for his systems. + + http://bsdtalk.blogspot.com/2008/11/bsdtalk166-asterisk-open-source.html + bsdtalk,interview,john todd,asterisk,openbsd + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk166.mp3 + 11 Mb + 23 minutes + MP3 version + mp3 + + + bsdtalk166.ogg + 23 minutes + Ogg version + ogg + + + + + + Julian Elischer + + An interview with Julian Elischer at MeetBSD in + California. We talk about his early days with BSD + and his work using BSD at various companies. He is + currently with IronPort, which was bought by Cisco. + + http://bsdtalk.blogspot.com/2008/11/bsdtalk165-julian-elischer.html + bsdtalk,interview,julian elischer,ironport + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk165.mp3 + 16 Mb + 35 minutes + MP3 version + mp3 + + + bsdtalk165.ogg + 16 minutes + Ogg version + ogg + + + + + + At MeetBSD with some of the FreeBSD Core Team + + A conversation with some of the FreeBSD Core Team + at MeetBSD California 2008. I speak with Brooks + Davis, Kris Kennaway, Robert Watson, Peter Wemm, + and Philip Paeps about the recent core team election, + FreeBSD 7.1 and 8, Developer Summits, and the move + to Subversion. + + http://bsdtalk.blogspot.com/2008/11/bsdtalk164-at-meetbsd-with-some-of.html + bsdtalk,interview,freebsd core team,meetbsd2008,meetbsd,robert watson,brooks davis,kris kennaway,peter wemm,philip paeps,freebsd,subversion + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk164.mp3 + 18 Mb + 38 minutes + MP3 version + mp3 + + + bsdtalk164.ogg + 38 minutes + Ogg version + ogg + + + + + + A Tour of iXsystems + + A brief description of my visit to iXsystems in + California prior to MeetBSD 2008. + + http://bsdtalk.blogspot.com/2008/11/bsdtalk163-tour-of-ixsystems.html + bsdtalk,interview,ixsystems + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk163.mp3 + 4 Mb + 8 minutes + MP3 version + mp3 + + + bsdtalk163.ogg + 8 minutes + Ogg version + ogg + + + + + + BSD on a eeePC 900A + + A brief description of my first attempts to get BSD + on a eeePC 900A. I try OpenBSD 4.4, DragonFlyBSD + 2.0.1, PC-BSD 7.0.1, and FreeBSD 7. + ]]> + + http://bsdtalk.blogspot.com/2008/11/bsdtalk162-bsd-on-eeepc-900a.html + bsdtalk,eeepc + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk162.mp3 + 5 Mb + 10 minutes + MP3 version + mp3 + + + bsdtalk162.ogg + 10 minutes + Ogg version + ogg + + + + + + Live from NYCBSDCon Sunday + + A copy of Sunday's live stream from NYCBSDCon + 2008. + + http://bsdtalk.blogspot.com/2008/10/bsdtalk161-live-from-nycbsdcon-sunday.html + bsdtalk,nycbsdcon2008,nycbsdcon,interview + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk161.mp3 + 12 Mb + 25 minutes + MP3 version + mp3 + + + bsdtalk161.ogg + 25 minutes + Ogg version + ogg + + + + + + Live from NYCBSDCon Saturday + + A copy of Saturday's live stream from NYCBSDCon + 2008. I wander around during lunch talking to random + people. Voices include Jason Dixon, Pawel Jakub + Dawidek, Kris Moore, Matt Olander, George Neville-Neil, + Phillip Coblentz, and Jason Wright. + + http://bsdtalk.blogspot.com/2008/10/bsdtalk160-live-from-nycbsdcon-saturday.html + bsdtalk,nycbsdcon2008,nycbsdcon,interview,jason dixon,pawel jakub dawidek,kris more,matt olander,george neville-neil,phillip coblentz,jason wright + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk160.mp3 + 18 Mb + 40 minutes + MP3 version + mp3 + + + bsdtalk160.ogg + 40 minutes + Ogg version + ogg + + + + + + Kris Moore + + Interview with Kris Moore. We talk about the recent + release of PC-BSD 7.0. + + http://bsdtalk.blogspot.com/2008/10/bsdtalk159-kris-moore.html + bsdtalk,interview,kris more,pc-bsd + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk159.mp3 + 6 Mb + 12 minutes + MP3 version + mp3 + + + bsdtalk159.ogg + 12 minutes + Ogg version + ogg + + + + + + Interview with Chess Griffin + + Interview with Chess Griffin, host of the LinuxReality + podcast. We talk about his use of Linux and recent + exploration into the BSDs. + + http://bsdtalk.blogspot.com/2008/09/bsdtalk158-interview-with-chess-griffin.html + bsdtalk,interview,chess griffin,linuxreality + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk158.mp3 + 11 Mb + 24 minutes + MP3 version + mp3 + + + bsdtalk158.ogg + 24 minutes + Ogg version + ogg + + + + + + Questions for you + +
  • Things have been very busy at the beginning of the school year, so I'm sorry that I haven't been producing as many shows as usual. +
  • Registration is open for NYCBSDCon and the list of speakers is available. Are you going? +
  • I plan on streaming live during the conference. Do you have any suggestions for live streaming software that is known to work well on the BSDs? Are there any live CDs like Dyne:bolic? +
  • I've come into possession of a Soekris 5501. What are your suggestions for soekris-friendly projects to test? + ]]> + + http://bsdtalk.blogspot.com/2008/09/bsdtalk157-questions-for-you.html + bsdtalk + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk157.mp3 + 3 Mb + 6 minutes + MP3 version + mp3 + + + bsdtalk157.ogg + 6 minutes + Ogg version + ogg + + + + + + NYCBSDCon Update with Isaac Levy and Steven Kreuzer + + An update on NYCBSDCon 2008 with Isaac Levy and + Steven Kreuzer. More information on the conference + can be found at http://www.nycbsdcon.org/ + + http://bsdtalk.blogspot.com/2008/08/bsdtalk156-nycbsdcon-update-with-isaac.html + bsdtalk,interview,nycbug,nycbsdcon,nycbsdcon2008,isaac levy,steven kreuzer + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk156.mp3 + 7 Mb + 15 minutes + MP3 version + mp3 + + + bsdtalk156.ogg + 15 minutes + Ogg version + ogg + + + + + + Martin Tournoij from DaemonForums.org + + A brief interview with Martin Tournoij, one of the + founders of DaemonForums.org. + + http://bsdtalk.blogspot.com/2008/07/bsdtalk-155-martin-tournoij-from.html + bsdtalk,interview,daemonforums,martin tournoij + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk155.mp3 + 3 Mb + 7 minutes + MP3 version + mp3 + + + bsdtalk155.ogg + 7 minutes + Ogg version + ogg + + + + + + Matthew Dillon + + An interview with Matthew Dillon. He gives a fairly + technical description of the HAMMER filesystem + features that will make it in the DragonflyBSD 2.0 + release. + + http://bsdtalk.blogspot.com/2008/07/bsdtalk154-matthew-dillon.html + bsdtalk,interview,hammer,matthew dillon + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk154.mp3 + 14 Mb + 30 minutes + MP3 version + mp3 + + + bsdtalk154.ogg + 30 minutes + Ogg version + ogg + + + + Michael W. Lucas @@ -340,7 +702,7 @@ new features in PBI 4. http://bsdtalk.blogspot.com/2008/02/bsdtalk141-pbi4-with-kris-moore.html - bsdtalk,interview,pc-bsd, kris moore + bsdtalk,interview,pc-bsd,kris moore http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ @@ -369,7 +731,7 @@ a quick update on Sysjail. http://bsdtalk.blogspot.com/2008/02/bsdtalk140-mult-project-with-kristaps.html - bsdtalk,interview,multi project, kristaps dzonsons + bsdtalk,interview,multi project,kristaps dzonsons http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ @@ -2536,6 +2898,258 @@ + + + + Detangling and debugging + + clive URL: http://www.youtube.com/watch?v=G8Fm8mgPyDc + ]]> + + http://www.youtube.com/watch?v=G8Fm8mgPyDc + meetbsd,meetbsd2007,debuggig,philip paeps + + + http://www.youtube.com/watch?v=G8Fm8mgPyDc + 18:36 + Flash + flash + + + + + + FreeBSD Profiling, Kris Kennaway, MeetBSD 2008 + + clive URL: http://www.youtube.com/watch?v=Mfb5_uG7BCA + ]]> + + http://www.youtube.com/watch?v=Mfb5_uG7BCA + meetbsd,meetbsd2008,freebsd,profiling,kris kennaway + + + http://www.youtube.com/watch?v=Mfb5_uG7BCA + 1:06:23 + Flash + flash + + + + + + BSD v. GPL, Jason Dixon, NYCBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=mMmbjJI5su0 + ]]> + + http://www.youtube.com/watch?v=mMmbjJI5su0 + nycbsdcon,nycbsdcon2008,bsd,gpl,jason dixon + + + http://www.youtube.com/watch?v=mMmbjJI5su0 + 16:21 + Flash + flash + + + + + + BSD is Dying, Jason Dixon, NYCBSDCon 2007 + + clive URL: http://www.youtube.com/watch?v=g7tvI6JCXD0 + ]]> + + http://www.youtube.com/watch?v=g7tvI6JCXD0 + nycbsdcon,nycbsdcon2007,bsd is dying,jason dixon + + + http://www.youtube.com/watch?v=g7tvI6JCXD0 + 17:41 + Flash + flash + + + + + + PC-BSD: FreeBSD on the Desktop + + clive URL: http://www.youtube.com/watch?v=oC4gsipGfQU + ]]> + + http://www.youtube.com/watch?v=oC4gsipGfQU + meetbsd,meetbsd2007,pc-bsd,matt olander + + + http://www.youtube.com/watch?v=oC4gsipGfQU + 31:30 + Flash + flash + + + + + + FreeBSD, Protecting Privacy with Tor + + clive URL: http://www.youtube.com/watch?v=OwBh8ro7xHQ + ]]> + + http://www.youtube.com/watch?v=OwBh8ro7xHQ + meetbsd,meetbsd2007,freebsd,tor,privacy,christian bruffer + + + http://www.youtube.com/watch?v=OwBh8ro7xHQ + 46:24 + Flash + flash + + + + + + FreeBSD, Building a Computing Cluster + + clive URL: http://www.youtube.com/watch?v=BpsRb9fJ4Ds + ]]> + + http://www.youtube.com/watch?v=BpsRb9fJ4Ds + meetbsd,meetbsd2007,freebsd,cluster,performance,brooks davis + + + http://www.youtube.com/watch?v=BpsRb9fJ4Ds + 47:51 + Flash + flash + + + + + + Isolating Cluster Jobs for Performance and Predictability, Brooks Davis, MeetBSD 2008 + + clive URL: http://www.youtube.com/watch?v=0uBFLJm7IHc + ]]> + + http://www.youtube.com/watch?v=0uBFLJm7IHc + meetbsd,meetbsd2008,cluster,performance,brooks davis + + + http://www.youtube.com/watch?v=0uBFLJm7IHc + 43:40 + Flash + flash + + + + + + BSD Certification, MeetBSD 2008 + + clive URL: http://www.youtube.com/watch?v=rGQmLYplO9U + ]]> + + http://www.youtube.com/watch?v=rGQmLYplO9U + meetbsd,meetbsd2008,bsd certification,dru lavigne + + + http://www.youtube.com/watch?v=rGQmLYplO9U + 44:14 + Flash + flash + + + + + + Embedding FreeBSD, MeetBSD 2008 + + clive URL: http://www.youtube.com/watch?v=Fc3xYrxvIU0 + ]]> + + http://www.youtube.com/watch?v=Fc3xYrxvIU0 + meetbsd,meetbsd2008,embedded,freebsd,philip paeps,warner losh + + + http://www.youtube.com/watch?v=Fc3xYrxvIU0 + 38:56 + Flash + flash + + + + + + FreeBSD Foundation Update & Recognition, MeetBSD 2008 + + clive URL: http://www.youtube.com/watch?v=sNQ2d41Vn2A + ]]> + + http://www.youtube.com/watch?v=sNQ2d41Vn2A + meetbsd,meetbsd2008,freebsd foundation,robert watson + + + http://www.youtube.com/watch?v=sNQ2d41Vn2A + 16:22 + Flash + flash + + + + @@ -2675,6 +3289,1279 @@ + + EuroBSDCon 2008 - Paeps Philip - How-to embed FreeBSD + + This paper provides a how-to embed FreeBSD. A console + server built form an AT91RM9200 based ARM system + will be explored. This paper will talk about the + selection of hardware. It will explore creating + images for the target system, as well as concentrate + on different alternatives for deploying the system. + A number of different options exist today, and no + comprehensive guide for navigating through the + choices exists today. This paper will explore the + different alternatives that exist today for producing + images targeted at different size requirements. The + differing choices for storage in an embedded + environment are explored. The techniques used to + access rich debugging environments are discussed. + + http://2008.eurobsdcon.org/talks.html + eurobsdcon,eurobsdcon2008,embed,freebsd,philip paeps + + + http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2828&type=ogg + OGG + 1 byte + 43 minutes + ogg + + + http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2828&type=mp3 + MP3 + 1 byte + 43 minutes + mp3 + + + http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2828&type=pdf + PDF + 1 byte + 17 pages + pdf + + + + + + EuroBSDCon 2008 - George Neville-Neil - Multicast Performance in FreeBSD + + In the past ten years most of the research in network + protocols has gone into TCP, leaving UDP to languish + as a local configuration protocol. While the majority + of Internet traffic is TCP, UDP remains the only + IP protocol that works over multicast and as such + has some specific, and interesting uses in some + areas of computing. In 2008 we undertook a study + of the performance of UDP multicast on both 1Gbps + and 10Gbps Ethernet networks in order to see if + changing the physical layer of the network would + give a linear decrease in packet latency. To measure + the possible gains we developed a new network + protocol test program, mctest, which is capable of + recording packet round trip times from many hosts + simultaneously and which we believe accurately + represents how many environments use multicast. The + mctest program has been integrated into FreeBSD and + is now being used to verify the proper operation + of multicast on various pieces of 10Gbps hardware. + + http://2008.eurobsdcon.org/talks.html + eurobsdcon,eurobsdcon2008,multicast,freebsd,george neville-neil + + + http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2827&type=ogg + OGG + 1 byte + 39 minutes + ogg + + + http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2827&type=mp3 + MP3 + 1 byte + 39 minutes + mp3 + + + http://audiovideocours.u-strasbg.fr/avc/courseaccess?id=2827&type=pdf + PDF + 1 byte >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 7 02:29:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEABB1065672; Sun, 7 Dec 2008 02:29:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 932021065670 for ; Sun, 7 Dec 2008 02:29:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81F658FC17 for ; Sun, 7 Dec 2008 02:29:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB72ThKa060311 for ; Sun, 7 Dec 2008 02:29:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB72Th0T060309 for perforce@freebsd.org; Sun, 7 Dec 2008 02:29:43 GMT (envelope-from sam@freebsd.org) Date: Sun, 7 Dec 2008 02:29:43 GMT Message-Id: <200812070229.mB72Th0T060309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154231 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 02:29:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=154231 Change 154231 by sam@sam_ebb on 2008/12/07 02:29:07 honor IEEE80211_BPF_CRYPTO for raw xmit; fixes shared key auth in sta mode Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#129 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#129 (text+ko) ==== @@ -6955,7 +6955,7 @@ struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; int error, ismcast, ismrr; - int hdrlen, pktlen, try0, txantenna; + int keyix, hdrlen, pktlen, try0, txantenna; u_int8_t rix, cix, txrate, ctsrate, rate1, rate2, rate3; struct ieee80211_frame *wh; u_int flags, ctsduration; @@ -6974,6 +6974,54 @@ /* XXX honor IEEE80211_BPF_DATAPAD */ pktlen = m0->m_pkthdr.len - (hdrlen & 3) + IEEE80211_CRC_LEN; + if (params->ibp_flags & IEEE80211_BPF_CRYPTO) { + const struct ieee80211_cipher *cip; + struct ieee80211_key *k; + + /* + * Construct the 802.11 header+trailer for an encrypted + * frame. The only reason this can fail is because of an + * unknown or unsupported cipher/key type. + */ + k = ieee80211_crypto_encap(ni, m0); + if (k == NULL) { + /* + * This can happen when the key is yanked after the + * frame was queued. Just discard the frame; the + * 802.11 layer counts failures and provides + * debugging/diagnostics. + */ + ath_freetx(m0); + return EIO; + } + /* + * Adjust the packet + header lengths for the crypto + * additions and calculate the h/w key index. When + * a s/w mic is done the frame will have had any mic + * added to it prior to entry so m0->m_pkthdr.len will + * account for it. Otherwise we need to add it to the + * packet length. + */ + cip = k->wk_cipher; + hdrlen += cip->ic_header; + pktlen += cip->ic_header + cip->ic_trailer; + /* NB: frags always have any TKIP MIC done in s/w */ + if ((k->wk_flags & IEEE80211_KEY_SWMIC) == 0) + pktlen += cip->ic_miclen; + keyix = k->wk_keyix; + + /* packet header may have moved, reset our local pointer */ + wh = mtod(m0, struct ieee80211_frame *); + } else if (ni->ni_ucastkey.wk_cipher == &ieee80211_cipher_none) { + /* + * Use station key cache slot, if assigned. + */ + keyix = ni->ni_ucastkey.wk_keyix; + if (keyix == IEEE80211_KEYIX_NONE) + keyix = HAL_TXKEYIX_INVALID; + } else + keyix = HAL_TXKEYIX_INVALID; + error = ath_tx_dmasetup(sc, bf, m0); if (error != 0) return error; @@ -7062,7 +7110,7 @@ , atype /* Atheros packet type */ , params->ibp_power /* txpower */ , txrate, try0 /* series 0 rate/tries */ - , HAL_TXKEYIX_INVALID /* key cache index */ + , keyix /* key cache index */ , txantenna /* antenna mode */ , flags /* flags */ , ctsrate /* rts/cts rate */ From owner-p4-projects@FreeBSD.ORG Sun Dec 7 03:18:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 723FF1065679; Sun, 7 Dec 2008 03:18:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F7C71065675 for ; Sun, 7 Dec 2008 03:18:33 +0000 (UTC) (envelope-from kan@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 054BC8FC0A for ; Sun, 7 Dec 2008 03:18:33 +0000 (UTC) (envelope-from kan@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB73IWEF065066 for ; Sun, 7 Dec 2008 03:18:32 GMT (envelope-from kan@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB73IWtZ065064 for perforce@freebsd.org; Sun, 7 Dec 2008 03:18:32 GMT (envelope-from kan@freebsd.org) Date: Sun, 7 Dec 2008 03:18:32 GMT Message-Id: <200812070318.mB73IWtZ065064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kan@freebsd.org using -f From: Alexander Kabaev To: Perforce Change Reviews Cc: Subject: PERFORCE change 154233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 03:18:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=154233 Change 154233 by kan@kanbsd_valgrind on 2008/12/07 03:18:19 Do not dump core if valgrind cannot figure out the name of newly mmapped segment. Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#14 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#14 (text+ko) ==== @@ -367,7 +367,8 @@ return; if (search_addr > (addr + len - 1)) return; - VG_(strncpy)( search_buf, filename, search_nbuf - 1); + if (filename != NULL) + VG_(strncpy)( search_buf, filename, search_nbuf - 1); } static From owner-p4-projects@FreeBSD.ORG Sun Dec 7 03:28:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05B8C1065677; Sun, 7 Dec 2008 03:28:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4F121065673 for ; Sun, 7 Dec 2008 03:28:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9323F8FC0C for ; Sun, 7 Dec 2008 03:28:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB73Sh7w065821 for ; Sun, 7 Dec 2008 03:28:43 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB73Sh3Z065819 for perforce@freebsd.org; Sun, 7 Dec 2008 03:28:43 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 7 Dec 2008 03:28:43 GMT Message-Id: <200812070328.mB73Sh3Z065819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 03:28:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=154234 Change 154234 by pgj@kolbasz on 2008/12/07 03:28:02 MFen (doc): 1.65 -> 1.66 hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml 1.109 -> 1.110 hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#4 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#14 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#4 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml - %SRCID% 1.65 + %SRCID% 1.66 --> @@ -745,6 +745,249 @@ + + + + + + Joseph J. + Barbish + Készítette: + + + + + Rendszerbetöltõ képernyõk + + A rendszertöltés során megjelenõ + rendszerüzenetek megjelenítése helyett egy + sokkal megnyerõbb, látványosabb + rendszerindítást tudunk elérni + betöltõ képernyõk + használatával. Egy ilyen képet + egészen a konzolos bejelentkezésig vagy az X + felett futó valamelyik bejelentkezõ + képernyõ megjelenéséig + láthatunk. + + &os; alatt alapvetõen két típusú + környezet létezik. Ezek közül az egyik a + hagyományos virtuális konzolos parancssoros + felület. Ekkor a rendszertöltés + befejezõdésekor egy szöveges parancssori + bejelentkezõ promptot kapunk. A másik + környezet az X11 által felkínált + grafikus felület. Miután telepítettük + az X11 szervert és + valamelyik munkakörnyezetet, tehát + például a GNOME, a + KDE vagy + XFce környezetek + valamelyikét, a startx paranccsal + indíthatjuk el a grafikus felületet. + + Némely felhasználók a megszokott + szöveges bejelentkezés helyett is inkább + valamelyik X11 alapú grafikus bejelentkezést + szeretnék használni. A + különbözõ bejelentkezõ + képernyõk, mint amilyen az &xorg; esetén az + XDM, a + GNOME esetén a + gdm, vagy a + KDE esetén a + kdm (illetve a + Portgyûjteménybõl származó + egyéb megoldások) alapvetõen a konzolos + bejelentkezés helyett nyújtanak egy grafikus + bejelentkezõ felületet. Ilyenkor a sikeres + bejelentkezést követõen a + felhasználó közvetlenül egy grafikus + környezetbe kerül. + + A parancssoros felület esetén a + rendszertöltõ képernyõ elrejti az + összes rendszerüzenetet és a rendszer + indításakor futtatott programok üzeneteit. + Az X11 használata esetén azonban a + felhasználók ezzel együtt már a + többi, alapértelmezés szerint grafikus + felülettel rendelkezõ rendszerhez (µsoft; + &windows; vagy más nem-UNIX operációs + rendszer) hasonló élményt nyernek. + + + A rendszerbetöltõ képek + támogatása + + A &os; csak BMP + (.bmp) vagy ZSoft PCX + formátumú, 256 színû + rendszerbetöltõ képek + megjelenítését támogatja. + Emellett szabványos VGA kártyákon csak + akkor fog mûködni, ha a kép 320x200 vagy + annál kisebb felbontású. + + Nagyobb méretû képek esetén, + egészen az 1024x768-as felbontásig, a &os; + VESA támogatására + lesz szükségünk. Ezt vagy a rendszer + indításakor a VESA modul + betöltésével + engedélyezhetjük, vagy ha a rendszermag + konfigurációs + állományában megadjuk a + VESA sort és + készítünk egy saját rendszermagot + (lásd ). A + VESA támogatáson + keresztül a felhasználók a teljes + képernyõt betöltõ + rendszerbetöltõ képeket is meg tudnak + így jeleníteni. + + A rendszerbetöltõ képernyõ a + rendszer indítása közben bármikor + tetszõlegesen kikapcsolható egy tetszõleges + billentyû lenyomásával. + + A megadott betöltõképernyõ + alapértelmezés szerint a + képernyõvédõ szerepét is + betölti az X11 felületén kívül. + Ha tehát egy ideig nem használjuk a + számítógépünket, akkor a + képernyõ átvált a + betöltõképre és folyamatosan + változtatni kezdi az intenzitását, a + nagyon világosból a nagyon + sötétbe, majd újrakezdi. Az + alapértelmezett képernyõvédõ + az /etc/rc.conf + állományban a saver= sor + megadásával állítható + át. Ehhez a beállításhoz + több különbözõ + beépített képernyõvédõ + tartozik, ezek teljes listáját a + &man.splash.4; man oldalon olvashatjuk. Ezek + közül az alapértelmezett a + warp. Az /etc/rc.conf + állományban megadható + saver= csak a virtuális konzolokra + vonatkozik, az X11 bejelentkezõ képernyõire + semmilyen hatással sincs. + + A rendszerbetöltõ néhány + üzenete, valamint a rendszerindítási + opciókat tartalmazó menü és a + hozzátartozó + visszaszámlálás még a + rendszerbetöltõ képernyõ + használata során is meg fog jelenni. + + A + címen találhatunk néhány ilyen + betöltõképernyõt. A sysutils/bsd-splash-changer port + telepítésével pedig a rendszer egyes + indításakor egy elõre megadott + gyûjteménybõl tudunk + véletlenszerûen választani egyet. + + + + A rendszerbetöltõ képek + használata + + A betöltõképet tartalmazó + (.bmp vagy .pcx + kiterjesztésû) állományt a + /boot + könyvtárba kell tennünk. + + A normál (256 szín, legfeljebb 320x200-as + felbontású) képek esetén a + következõ sorokat adjuk hozzá a + /boot/loader.conf + állományhoz: + + splash_bmp_load="YES" +bitmap_load="YES" +bitmap_name="/boot/betöltõkép.bmp" + + Nagyobb felbontás esetén (legfeljebb + 1024x768-as méretig) pedig a + /boot/loader.conf + állománynak a következõket kell + tartalmaznia: + + vesa_load="YES" +splash_bmp_load="YES" +bitmap_load="YES" +bitmap_name="/boot/betöltõkép.bmp" + + Az iménti példában + feltételeztük, hogy a + /boot/betöltõkép.bmp + állományt használt + betöltõképként. Amikor azonban + PCX állományokat akarunk + használni, a következõ sorokat kell + megadnunk, a felbontástól függõen a + vesa_load="YES" sorral + kiegészítve: + + splash_pcx_load="YES" +bitmap_load="YES" +bitmap_name="/boot/betöltõkép.pcx" + + Természetesen a kép neve sem csak + betöltõkép lehet. + Tetszõlegesen elnevezhetjük, egyedül csak + arra kell ügyelünk, hogy BMP + vagy PCX formátumú legyen: + splash_640x400.bmp + vagy például + blue_wave.pcx. + + További érdekes + beállítások a + loader.conf + állományból: + + + + beastie_disable="YES" + + + Ennek megadásakor nem jelenik meg a + rendszerindítási + lehetõségeket + felkínáló menü, de a + visszaszámlálás megmarad. + Hiába tiltjuk le a menüt, ilyenkor + továbbra is választanunk kell a + lehetõségek közül. + + + + + loader_logo="beastie" + + + Ezzel a beállítással a + menüben látható &os; + feliratot cserélhetjük le a korábbi + kiadásokban szereplõ színes + démonos emblémára. + + + + + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#14 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -5921,7 +5921,7 @@ /etc/inetd.conf állományban is engedélyeznünk kell. Itt mindössze annyira lesz szükségünk, hogy - eltávolítjuk a megjegyzést jelzõ + eltávolítsuk a megjegyzést jelzõ # karaktert a már meglevõ ftpd sor elõl: @@ -5932,7 +5932,29 @@ inetd beállításait újra be kell olvastatunk a konfigurációs állomány - megváltoztatása után. + megváltoztatása után. A írja le az + inetd + engedélyezésének részleteit. + + Az ftpd önálló + szerverként is elindítható. Ehhez + mindössze elegendõ csak a megfelelõ + változót beállítani az + /etc/rc.conf + állományban: + + ftpd_enable="YES" + + Miután megadtuk az iménti + változót, a szerver el fog indulni a rendszer + következõ indítása során. + Szükség esetén természetesen + root felhasználóként a + következõ paranccsal is közvetlenül + elindítható: + + &prompt.root; /etc/rc.d/ftpd start Most már be is tudunk jelentkezni az FTP szerverre: From owner-p4-projects@FreeBSD.ORG Sun Dec 7 12:06:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0250F1065676; Sun, 7 Dec 2008 12:06:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9A3A1065673 for ; Sun, 7 Dec 2008 12:06:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A66588FC0C for ; Sun, 7 Dec 2008 12:06:06 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7C66UE060773 for ; Sun, 7 Dec 2008 12:06:06 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7C65DK060769 for perforce@freebsd.org; Sun, 7 Dec 2008 12:06:05 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 7 Dec 2008 12:06:05 GMT Message-Id: <200812071206.mB7C65DK060769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 12:06:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=154248 Change 154248 by ed@ed_flippo on 2008/12/07 12:06:05 IFC. Affected files ... .. //depot/projects/mpsafetty/lib/libarchive/archive.h#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_compression_program.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#11 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_gtar_sparse.c#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/mpsafetty/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/mpsafetty/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/mpsafetty/lib/libc/string/strdup.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/string/strndup.c#1 branch .. //depot/projects/mpsafetty/lib/libthr/thread/thr_rtld.c#3 integrate .. //depot/projects/mpsafetty/lib/libutil/Makefile#5 integrate .. //depot/projects/mpsafetty/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/mpsafetty/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/mpsafetty/share/man/man4/man4.powerpc/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/mpsafetty/share/man/man7/ports.7#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/mpsafetty/sys/boot/common/loader.8#2 integrate .. //depot/projects/mpsafetty/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_mouse.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adbvar.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/sdhci/sdhci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/mpsafetty/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/atomic.h#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exec.c#10 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exit.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/kern_fork.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#13 integrate .. //depot/projects/mpsafetty/sys/libkern/iconv.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_header.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_os_bsd.h#7 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_sysctl.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_uio.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_var.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/sctputil.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/sctputil.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/cuda.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/cudavar.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/proc.h#12 integrate .. //depot/projects/mpsafetty/tools/test/pthread_vfork/pthread_vfork_test.c#1 branch .. //depot/projects/mpsafetty/usr.bin/cpio/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/cmdline.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/config_freebsd.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/cpio.c#8 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/cpio.h#5 integrate .. //depot/projects/mpsafetty/usr.bin/cpio/cpio_platform.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/tar/Makefile#4 integrate .. //depot/projects/mpsafetty/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/mpsafetty/usr.bin/tar/bsdtar.h#4 integrate .. //depot/projects/mpsafetty/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/wc/wc.1#2 integrate .. //depot/projects/mpsafetty/usr.bin/wc/wc.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libarchive/archive.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive.h,v 1.21 2008/09/18 04:19:06 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.22 2008/12/06 06:17:18 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -82,7 +82,6 @@ # define __LA_DECL #endif - #ifdef __cplusplus extern "C" { #endif @@ -114,13 +113,13 @@ * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_NUMBER 2005005 +#define ARCHIVE_VERSION_NUMBER 2005903 __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_STRING "libarchive 2.5.5" +#define ARCHIVE_VERSION_STRING "libarchive 2.5.903a" __LA_DECL const char * archive_version_string(void); #if ARCHIVE_VERSION_NUMBER < 3000000 @@ -185,20 +184,37 @@ */ /* Returns pointer and size of next block of data from archive. */ -typedef __LA_SSIZE_T archive_read_callback(struct archive *, void *_client_data, - const void **_buffer); +typedef __LA_SSIZE_T archive_read_callback(struct archive *, + void *_client_data, const void **_buffer); + /* Skips at most request bytes from archive and returns the skipped amount */ #if ARCHIVE_VERSION_NUMBER < 2000000 -typedef __LA_SSIZE_T archive_skip_callback(struct archive *, void *_client_data, - size_t request); +/* Libarchive 1.0 used ssize_t for the return, which is only 32 bits + * on most 32-bit platforms; not large enough. */ +typedef __LA_SSIZE_T archive_skip_callback(struct archive *, + void *_client_data, size_t request); +#elif ARCHIVE_VERSION_NUMBER < 3000000 +/* Libarchive 2.0 used off_t here, but that is a bad idea on Linux and a + * few other platforms where off_t varies with build settings. */ +typedef off_t archive_skip_callback(struct archive *, + void *_client_data, off_t request); #else -typedef off_t archive_skip_callback(struct archive *, void *_client_data, - off_t request); +/* Libarchive 3.0 uses int64_t here, which is actually guaranteed to be + * 64 bits on every platform. */ +typedef __LA_INT64_T archive_skip_callback(struct archive *, + void *_client_data, __LA_INT64_T request); #endif + /* Returns size actually written, zero on EOF, -1 on error. */ -typedef __LA_SSIZE_T archive_write_callback(struct archive *, void *_client_data, - const void *_buffer, size_t _length); +typedef __LA_SSIZE_T archive_write_callback(struct archive *, + void *_client_data, + const void *_buffer, size_t _length); + +#if ARCHIVE_VERSION_NUMBER < 3000000 +/* Open callback is actually never needed; remove it in libarchive 3.0. */ typedef int archive_open_callback(struct archive *, void *_client_data); +#endif + typedef int archive_close_callback(struct archive *, void *_client_data); /* @@ -209,6 +225,7 @@ #define ARCHIVE_COMPRESSION_BZIP2 2 #define ARCHIVE_COMPRESSION_COMPRESS 3 #define ARCHIVE_COMPRESSION_PROGRAM 4 +#define ARCHIVE_COMPRESSION_LZMA 5 /* * Codes returned by archive_format. @@ -333,15 +350,23 @@ __LA_DECL __LA_INT64_T archive_read_header_position(struct archive *); /* Read data from the body of an entry. Similar to read(2). */ -__LA_DECL __LA_SSIZE_T archive_read_data(struct archive *, void *, size_t); +__LA_DECL __LA_SSIZE_T archive_read_data(struct archive *, + void *, size_t); + /* * A zero-copy version of archive_read_data that also exposes the file offset * of each returned block. Note that the client has no way to specify * the desired size of the block. The API does guarantee that offsets will * be strictly increasing and that returned blocks will not overlap. */ +#if ARCHIVE_VERSION_NUMBER < 3000000 +__LA_DECL int archive_read_data_block(struct archive *a, + const void **buff, size_t *size, off_t *offset); +#else __LA_DECL int archive_read_data_block(struct archive *a, - const void **buff, size_t *size, off_t *offset); + const void **buff, size_t *size, + __LA_INT64_T *offset); +#endif /*- * Some convenience functions that are built on archive_read_data: @@ -350,8 +375,8 @@ * 'into_fd': writes data to specified filedes */ __LA_DECL int archive_read_data_skip(struct archive *); -__LA_DECL int archive_read_data_into_buffer(struct archive *, void *buffer, - __LA_SSIZE_T len); +__LA_DECL int archive_read_data_into_buffer(struct archive *, + void *buffer, __LA_SSIZE_T len); __LA_DECL int archive_read_data_into_fd(struct archive *, int fd); /*- @@ -414,12 +439,11 @@ __LA_DECL int archive_read_close(struct archive *); /* Release all resources and destroy the object. */ /* Note that archive_read_finish will call archive_read_close for you. */ -#if ARCHIVE_VERSION_NUMBER >= 2000000 -__LA_DECL int archive_read_finish(struct archive *); -#else -/* Temporarily allow library to compile with either 1.x or 2.0 API. */ +#if ARCHIVE_VERSION_NUMBER < 2000000 /* Erroneously declared to return void in libarchive 1.x */ __LA_DECL void archive_read_finish(struct archive *); +#else +__LA_DECL int archive_read_finish(struct archive *); #endif /*- @@ -491,22 +515,36 @@ */ __LA_DECL int archive_write_header(struct archive *, struct archive_entry *); -#if ARCHIVE_VERSION_NUMBER >= 2000000 -__LA_DECL __LA_SSIZE_T archive_write_data(struct archive *, const void *, size_t); +#if ARCHIVE_VERSION_NUMBER < 2000000 +/* This was erroneously declared to return "int" in libarchive 1.x. */ +__LA_DECL int archive_write_data(struct archive *, + const void *, size_t); +#else +/* Libarchive 2.0 and later return ssize_t here. */ +__LA_DECL __LA_SSIZE_T archive_write_data(struct archive *, + const void *, size_t); +#endif + +#if ARCHIVE_VERSION_NUMBER < 3000000 +/* Libarchive 1.x and 2.x use off_t for the argument, but that's not + * stable on Linux. */ +__LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *, + const void *, size_t, off_t); #else -/* Temporarily allow library to compile with either 1.x or 2.0 API. */ -/* This was erroneously declared to return "int" in libarchive 1.x. */ -__LA_DECL int archive_write_data(struct archive *, const void *, size_t); +/* Libarchive 3.0 uses explicit int64_t to ensure consistent 64-bit support. */ +__LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *, + const void *, size_t, __LA_INT64_T); #endif -__LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *, const void *, size_t, off_t); __LA_DECL int archive_write_finish_entry(struct archive *); __LA_DECL int archive_write_close(struct archive *); -#if ARCHIVE_VERSION_NUMBER >= 2000000 -__LA_DECL int archive_write_finish(struct archive *); -#else -/* Temporarily allow library to compile with either 1.x or 2.0 API. */ +#if ARCHIVE_VERSION_NUMBER < 2000000 /* Return value was incorrect in libarchive 1.x. */ __LA_DECL void archive_write_finish(struct archive *); +#else +/* Libarchive 2.x and later returns an error if this fails. */ +/* It can fail if the archive wasn't already closed, in which case + * archive_write_finish() will implicitly call archive_write_close(). */ +__LA_DECL int archive_write_finish(struct archive *); #endif /*- @@ -589,5 +627,9 @@ /* This is meaningless outside of this header. */ #undef __LA_DECL +#undef __LA_GID_T +#undef __LA_INT64_T +#undef __LA_SSIZE_T +#undef __LA_UID_T #endif /* !ARCHIVE_H_INCLUDED */ ==== //depot/projects/mpsafetty/lib/libarchive/archive_check_magic.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.8 2007/04/02 00:15:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.9 2008/12/06 05:52:01 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -46,7 +46,7 @@ static void errmsg(const char *m) { - write(STDERR_FILENO, m, strlen(m)); + write(2, m, strlen(m)); } static void ==== //depot/projects/mpsafetty/lib/libarchive/archive_endian.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.3 2008/05/26 17:00:22 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.4 2008/12/06 06:12:24 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -35,14 +35,14 @@ #define ARCHIVE_ENDIAN_H_INCLUDED -/* Watcom C++ doesn't support 'inline' in C code. (For any version?) */ -#if defined( __WATCOMC__ ) - #define inline -#endif - -/* Visual C++ 6.0 doesn't support 'inline' in C code. (Does VC7? VC8?) */ -#if defined(_MSC_VER) - #define inline +/* + * Disabling inline keyword for compilers known to choke on it: + * - Watcom C++ in C code. (For any version?) + * - SGI MIPSpro + * - Microsoft Visual C++ 6.0 (supposedly newer versions too) + */ +#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER) +#define inline #endif /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ ==== //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.31 2008/12/06 06:18:46 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -441,7 +441,7 @@ * Note that archive_entry_size() is reset to zero if the file * body should not be written to the archive. Pay attention! */ -__LA_DECL struct archive_entry_linkresolver; +struct archive_entry_linkresolver; /* * There are three different strategies for marking hardlinks. ==== //depot/projects/mpsafetty/lib/libarchive/archive_platform.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive_platform.h,v 1.31 2008/09/12 04:03:34 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.32 2008/12/06 05:53:05 kientzle Exp $ */ /* @@ -39,10 +39,7 @@ /* archive.h and archive_entry.h require this. */ #define __LIBARCHIVE_BUILD 1 -#ifdef _WIN32 -#include "config_windows.h" -#include "archive_windows.h" -#elif defined(PLATFORM_CONFIG_H) +#if defined(PLATFORM_CONFIG_H) /* Use hand-built config.h in environments that need it. */ #include PLATFORM_CONFIG_H #elif defined(HAVE_CONFIG_H) ==== //depot/projects/mpsafetty/lib/libarchive/archive_private.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive_private.h,v 1.30 2008/08/04 01:25:48 cperciva Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.32 2008/12/06 06:23:37 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -31,15 +31,22 @@ #include "archive.h" #include "archive_string.h" +#if defined(__GNUC__) && (__GNUC__ > 2 || \ + (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) +#define __LA_DEAD __attribute__((__noreturn__)) +#else +#define __LA_DEAD +#endif + #define ARCHIVE_WRITE_MAGIC (0xb0c5c0deU) #define ARCHIVE_READ_MAGIC (0xdeb0c5U) -#define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U) +#define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U) #define ARCHIVE_STATE_ANY 0xFFFFU #define ARCHIVE_STATE_NEW 1U #define ARCHIVE_STATE_HEADER 2U #define ARCHIVE_STATE_DATA 4U -#define ARCHIVE_STATE_DATA_END 8U +#define ARCHIVE_STATE_DATA_END 8U #define ARCHIVE_STATE_EOF 0x10U #define ARCHIVE_STATE_CLOSED 0x20U #define ARCHIVE_STATE_FATAL 0x8000U @@ -92,7 +99,7 @@ void __archive_check_magic(struct archive *, unsigned int magic, unsigned int state, const char *func); -void __archive_errx(int retvalue, const char *msg) __dead2; +void __archive_errx(int retvalue, const char *msg) __LA_DEAD; #define err_combine(a,b) ((a) < (b) ? (a) : (b)) ==== //depot/projects/mpsafetty/lib/libarchive/archive_read.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.39 2008/12/06 06:45:15 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -53,9 +53,10 @@ #include "archive_private.h" #include "archive_read_private.h" -static void choose_decompressor(struct archive_read *, const void*, size_t); +#define minimum(a, b) (a < b ? a : b) + +static int build_stream(struct archive_read *); static int choose_format(struct archive_read *); -static off_t dummy_skip(struct archive_read *, off_t); /* * Allocate, initialize and return a struct archive object. @@ -74,8 +75,15 @@ a->archive.state = ARCHIVE_STATE_NEW; a->entry = archive_entry_new(); - /* We always support uncompressed archives. */ - archive_read_support_compression_none(&a->archive); + /* Initialize reblocking logic. */ + a->buffer_size = 64 * 1024; /* 64k */ + a->buffer = (char *)malloc(a->buffer_size); + a->next = a->buffer; + if (a->buffer == NULL) { + archive_entry_free(a->entry); + free(a); + return (NULL); + } return (&a->archive); } @@ -108,6 +116,33 @@ client_reader, NULL, client_closer); } +static ssize_t +client_read_proxy(struct archive_read_source *self, const void **buff) +{ + return (self->archive->client.reader)((struct archive *)self->archive, + self->data, buff); +} + +static int64_t +client_skip_proxy(struct archive_read_source *self, int64_t request) +{ + return (self->archive->client.skipper)((struct archive *)self->archive, + self->data, request); +} + +static int +client_close_proxy(struct archive_read_source *self) +{ + int r = ARCHIVE_OK; + + if (self->archive->client.closer != NULL) + r = (self->archive->client.closer)((struct archive *)self->archive, + self->data); + free(self); + return (r); +} + + int archive_read_open2(struct archive *_a, void *client_data, archive_open_callback *client_opener, @@ -116,28 +151,15 @@ archive_close_callback *client_closer) { struct archive_read *a = (struct archive_read *)_a; - const void *buffer; - ssize_t bytes_read; int e; - __archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, "archive_read_open"); + __archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, + "archive_read_open"); if (client_reader == NULL) __archive_errx(1, "No reader function provided to archive_read_open"); - /* - * Set these NULL initially. If the open or initial read fails, - * we'll leave them NULL to indicate that the file is invalid. - * (In particular, this helps ensure that the closer doesn't - * get called more than once.) - */ - a->client_opener = NULL; - a->client_reader = NULL; - a->client_skipper = NULL; - a->client_closer = NULL; - a->client_data = NULL; - /* Open data source. */ if (client_opener != NULL) { e =(client_opener)(&a->archive, client_data); @@ -149,129 +171,103 @@ } } - /* Read first block now for compress format detection. */ - bytes_read = (client_reader)(&a->archive, client_data, &buffer); + /* Save the client functions and mock up the initial source. */ + a->client.opener = client_opener; /* Do we need to remember this? */ + a->client.reader = client_reader; + a->client.skipper = client_skipper; + a->client.closer = client_closer; + a->client.data = client_data; + + { + struct archive_read_source *source; - if (bytes_read < 0) { - /* If the first read fails, close before returning error. */ - if (client_closer) - (client_closer)(&a->archive, client_data); - /* client_reader should have already set error information. */ - return (ARCHIVE_FATAL); + source = calloc(1, sizeof(*source)); + if (source == NULL) + return (ARCHIVE_FATAL); + source->reader = NULL; + source->upstream = NULL; + source->archive = a; + source->data = client_data; + source->read = client_read_proxy; + source->skip = client_skip_proxy; + source->close = client_close_proxy; + a->source = source; } - /* Now that the client callbacks have worked, remember them. */ - a->client_opener = client_opener; /* Do we need to remember this? */ - a->client_reader = client_reader; - a->client_skipper = client_skipper; - a->client_closer = client_closer; - a->client_data = client_data; + /* In case there's no filter. */ + a->archive.compression_code = ARCHIVE_COMPRESSION_NONE; + a->archive.compression_name = "none"; - /* Select a decompression routine. */ - choose_decompressor(a, buffer, (size_t)bytes_read); - if (a->decompressor == NULL) - return (ARCHIVE_FATAL); - - /* Initialize decompression routine with the first block of data. */ - e = (a->decompressor->init)(a, buffer, (size_t)bytes_read); - + /* Build out the input pipeline. */ + e = build_stream(a); if (e == ARCHIVE_OK) a->archive.state = ARCHIVE_STATE_HEADER; - /* - * If the decompressor didn't register a skip function, provide a - * dummy compression-layer skip function. - */ - if (a->decompressor->skip == NULL) - a->decompressor->skip = dummy_skip; - return (e); } /* - * Allow each registered decompression routine to bid on whether it - * wants to handle this stream. Return index of winning bidder. + * Allow each registered stream transform to bid on whether + * it wants to handle this stream. Repeat until we've finished + * building the pipeline. */ -static void -choose_decompressor(struct archive_read *a, - const void *buffer, size_t bytes_read) +static int +build_stream(struct archive_read *a) { - int decompression_slots, i, bid, best_bid; - struct decompressor_t *decompressor, *best_decompressor; + int number_readers, i, bid, best_bid; + struct archive_reader *reader, *best_reader; + struct archive_read_source *source; + const void *block; + ssize_t bytes_read; + + /* Read first block now for compress format detection. */ + bytes_read = (a->source->read)(a->source, &block); + if (bytes_read < 0) { + /* If the first read fails, close before returning error. */ + if (a->source->close != NULL) { + (a->source->close)(a->source); + a->source = NULL; + } + /* source->read should have already set error information. */ + return (ARCHIVE_FATAL); + } - decompression_slots = sizeof(a->decompressors) / - sizeof(a->decompressors[0]); + number_readers = sizeof(a->readers) / sizeof(a->readers[0]); best_bid = 0; - a->decompressor = NULL; - best_decompressor = NULL; + best_reader = NULL; - decompressor = a->decompressors; - for (i = 0; i < decompression_slots; i++) { - if (decompressor->bid) { - bid = (decompressor->bid)(buffer, bytes_read); - if (bid > best_bid || best_decompressor == NULL) { + reader = a->readers; + for (i = 0, reader = a->readers; i < number_readers; i++, reader++) { + if (reader->bid != NULL) { + bid = (reader->bid)(reader, block, bytes_read); + if (bid > best_bid) { best_bid = bid; - best_decompressor = decompressor; + best_reader = reader; } } - decompressor ++; } /* - * There were no bidders; this is a serious programmer error - * and demands a quick and definitive abort. + * If we have a winner, it becomes the next stage in the pipeline. */ - if (best_decompressor == NULL) - __archive_errx(1, "No decompressors were registered; you " - "must call at least one " - "archive_read_support_compression_XXX function in order " - "to successfully read an archive."); - - /* - * There were bidders, but no non-zero bids; this means we can't - * support this stream. - */ - if (best_bid < 1) { - archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, - "Unrecognized archive format"); - return; - } - - /* Record the best decompressor for this stream. */ - a->decompressor = best_decompressor; -} - -/* - * Dummy skip function, for use if the compression layer doesn't provide - * one: This code just reads data and discards it. - */ -static off_t -dummy_skip(struct archive_read * a, off_t request) -{ - const void * dummy_buffer; - ssize_t bytes_read; - off_t bytes_skipped; - - for (bytes_skipped = 0; request > 0;) { - bytes_read = (a->decompressor->read_ahead)(a, &dummy_buffer, 1); - if (bytes_read < 0) - return (bytes_read); - if (bytes_read == 0) { - /* Premature EOF. */ - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Truncated input file (need to skip %jd bytes)", - (intmax_t)request); + if (best_reader != NULL) { + source = (best_reader->init)(a, best_reader, a->source, + block, bytes_read); + if (source == NULL) return (ARCHIVE_FATAL); - } - if (bytes_read > request) - bytes_read = (ssize_t)request; - (a->decompressor->consume)(a, (size_t)bytes_read); - request -= bytes_read; - bytes_skipped += bytes_read; + /* Record the best decompressor for this stream. */ + a->source = source; + /* Recurse to get next pipeline stage. */ + return (build_stream(a)); } - return (bytes_skipped); + /* Save first block of data. */ + a->client_buff = block; + a->client_total = bytes_read; + a->client_next = a->client_buff; + a->client_avail = a->client_total; + return (ARCHIVE_OK); } /* @@ -598,23 +594,24 @@ /* TODO: Clean up the formatters. */ - /* Clean up the decompressors. */ - n = sizeof(a->decompressors)/sizeof(a->decompressors[0]); + /* Clean up the stream pipeline. */ + if (a->source != NULL) { + r1 = (a->source->close)(a->source); + if (r1 < r) + r = r1; + a->source = NULL; + } + + /* Release the reader objects. */ + n = sizeof(a->readers)/sizeof(a->readers[0]); for (i = 0; i < n; i++) { - if (a->decompressors[i].finish != NULL) { - r1 = (a->decompressors[i].finish)(a); + if (a->readers[i].free != NULL) { + r1 = (a->readers[i].free)(&a->readers[i]); if (r1 < r) r = r1; } } - /* Close the client stream. */ - if (a->client_closer != NULL) { - r1 = ((a->client_closer)(&a->archive, a->client_data)); - if (r1 < r) - r = r1; - } - return (r); } @@ -651,6 +648,7 @@ if (a->entry) archive_entry_free(a->entry); a->archive.magic = 0; + free(a->buffer); free(a); #if ARCHIVE_API_VERSION > 1 return (r); @@ -700,40 +698,350 @@ * Used internally by decompression routines to register their bid and * initialization functions. */ -struct decompressor_t * -__archive_read_register_compression(struct archive_read *a, - int (*bid)(const void *, size_t), - int (*init)(struct archive_read *, const void *, size_t)) +struct archive_reader * +__archive_read_get_reader(struct archive_read *a) { int i, number_slots; __archive_check_magic(&a->archive, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_NEW, - "__archive_read_register_compression"); + "__archive_read_get_reader"); - number_slots = sizeof(a->decompressors) / sizeof(a->decompressors[0]); + number_slots = sizeof(a->readers) / sizeof(a->readers[0]); for (i = 0; i < number_slots; i++) { - if (a->decompressors[i].bid == bid) - return (a->decompressors + i); - if (a->decompressors[i].bid == NULL) { - a->decompressors[i].bid = bid; - a->decompressors[i].init = init; - return (a->decompressors + i); - } + if (a->readers[i].bid == NULL) + return (a->readers + i); } __archive_errx(1, "Not enough slots for compression registration"); return (NULL); /* Never actually executed. */ } -/* used internally to simplify read-ahead */ +/* + * The next three functions comprise the peek/consume internal I/O + * system used by archive format readers. This system allows fairly + * flexible read-ahead and allows the I/O code to operate in a + * zero-copy manner most of the time. + * + * In the ideal case, block providers give the I/O code blocks of data + * and __archive_read_ahead() just returns pointers directly into + * those blocks. Then __archive_read_consume() just bumps those + * pointers. Only if your request would span blocks does the I/O + * layer use a copy buffer to provide you with a contiguous block of + * data. The __archive_read_skip() is an optimization; it scans ahead + * very quickly (it usually translates into a seek() operation if + * you're reading uncompressed disk files). + * + * A couple of useful idioms: + * * "I just want some data." Ask for 1 byte and pay attention to + * the "number of bytes available" from __archive_read_ahead(). + * You can consume more than you asked for; you just can't consume + * more than is available right now. If you consume everything that's + * immediately available, the next read_ahead() call will pull + * the next block. + * * "I want to output a large block of data." As above, ask for 1 byte, + * emit all that's available (up to whatever limit you have), then + * repeat until you're done. + * * "I want to peek ahead by a large amount." Ask for 4k or so, then + * double and repeat until you get an error or have enough. Note + * that the I/O layer will likely end up expanding its copy buffer + * to fit your request, so use this technique cautiously. This + * technique is used, for example, by some of the format tasting + * code that has uncertain look-ahead needs. + * + * TODO: Someday, provide a more generic __archive_read_seek() for + * those cases where it's useful. This is tricky because there are lots + * of cases where seek() is not available (reading gzip data from a + * network socket, for instance), so there needs to be a good way to + * communicate whether seek() is available and users of that interface + * need to use non-seeking strategies whenever seek() is not available. + */ + +/* + * Looks ahead in the input stream: + * * If 'avail' pointer is provided, that returns number of bytes available + * in the current buffer, which may be much larger than requested. + * * If end-of-file, *avail gets set to zero. + * * If error, *avail gets error code. + * * If request can be met, returns pointer to data, returns NULL + * if request is not met. + * + * Note: If you just want "some data", ask for 1 byte and pay attention + * to *avail, which will have the actual amount available. If you + * know exactly how many bytes you need, just ask for that and treat + * a NULL return as an error. + * + * Important: This does NOT move the file pointer. See + * __archive_read_consume() below. + */ + +/* + * This is tricky. We need to provide our clients with pointers to + * contiguous blocks of memory but we want to avoid copying whenever + * possible. + * + * Mostly, this code returns pointers directly into the block of data + * provided by the client_read routine. It can do this unless the + * request would split across blocks. In that case, we have to copy + * into an internal buffer to combine reads. + */ const void * -__archive_read_ahead(struct archive_read *a, size_t len) +__archive_read_ahead(struct archive_read *a, size_t min, ssize_t *avail) { - const void *h; + ssize_t bytes_read; + size_t tocopy; - if ((a->decompressor->read_ahead)(a, &h, len) < (ssize_t)len) + if (a->fatal) { + if (avail) + *avail = ARCHIVE_FATAL; return (NULL); - return (h); + } + + /* + * Keep pulling more data until we can satisfy the request. + */ + for (;;) { + + /* + * If we can satisfy from the copy buffer, we're done. + */ + if (a->avail >= min) { + if (avail != NULL) + *avail = a->avail; + return (a->next); + } + + /* + * We can satisfy directly from client buffer if everything + * currently in the copy buffer is still in the client buffer. + */ + if (a->client_total >= a->client_avail + a->avail + && a->client_avail + a->avail >= min) { + /* "Roll back" to client buffer. */ + a->client_avail += a->avail; + a->client_next -= a->avail; + /* Copy buffer is now empty. */ + a->avail = 0; + a->next = a->buffer; + /* Return data from client buffer. */ + if (avail != NULL) + *avail = a->client_avail; + return (a->client_next); + } + + /* Move data forward in copy buffer if necessary. */ + if (a->next > a->buffer && + a->next + min > a->buffer + a->buffer_size) { + if (a->avail > 0) + memmove(a->buffer, a->next, a->avail); + a->next = a->buffer; + } + + /* If we've used up the client data, get more. */ + if (a->client_avail <= 0) { + if (a->end_of_file) { + if (avail != NULL) + *avail = 0; + return (NULL); + } + bytes_read = (a->source->read)(a->source, + &a->client_buff); + if (bytes_read < 0) { /* Read error. */ + a->client_total = a->client_avail = 0; + a->client_next = a->client_buff = NULL; + a->fatal = 1; + if (avail != NULL) + *avail = ARCHIVE_FATAL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 7 12:28:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7A971065673; Sun, 7 Dec 2008 12:28:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52F9D106564A for ; Sun, 7 Dec 2008 12:28:29 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 412EB8FC0C for ; Sun, 7 Dec 2008 12:28:29 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7CSTBq062467 for ; Sun, 7 Dec 2008 12:28:29 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7CSTfx062465 for perforce@freebsd.org; Sun, 7 Dec 2008 12:28:29 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 7 Dec 2008 12:28:29 GMT Message-Id: <200812071228.mB7CSTfx062465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 12:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=154249 Change 154249 by ed@ed_flippo on 2008/12/07 12:27:41 - Import updated libteken with support for 132 column mode (not implemented by us). - Replace UTF-8 characters by bright yellow/red cells with a question mark for now. We still need UTF-8 font maps. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#14 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#7 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#5 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#14 (text+ko) ==== @@ -265,11 +265,19 @@ { scr_stat *scp = arg; u_char *map; - u_char ch = c; + u_char ch; vm_offset_t p; int cursor, attr; - attr = scteken_attr(a); + if (c >= 0x80) { + /* XXX: Don't display UTF-8 yet. */ + attr = (FG_YELLOW|BG_RED) << 8; + ch = '?'; + } else { + attr = scteken_attr(a); + ch = c; + } + map = scp->sc->scr_map; cursor = tp->tp_row * scp->xsize + tp->tp_col; @@ -287,11 +295,19 @@ { scr_stat *scp = arg; u_char *map; - u_char ch = c; + u_char ch; unsigned int width; int attr, row; - attr = scteken_attr(a); + if (c >= 0x80) { + /* XXX: Don't display UTF-8 yet. */ + attr = (FG_YELLOW|BG_RED) << 8; + ch = '?'; + } else { + attr = scteken_attr(a); + ch = c; + } + map = scp->sc->scr_map; if (r->tr_begin.tp_col == 0 && r->tr_end.tp_col == scp->xsize) { ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#7 (text+ko) ==== @@ -95,6 +95,7 @@ #define TP_KEYPADAPP 2 #define TP_AUTOREPEAT 3 #define TP_SWITCHVT 4 +#define TP_132COLS 5 typedef void tf_respond_t(void *, const void *, size_t); typedef struct { ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#5 (text+ko) ==== @@ -24,9 +24,10 @@ * SUCH DAMAGE. */ +static void teken_subr_cursor_up(teken_t *, unsigned int); static void teken_subr_erase_line(teken_t *, unsigned int); static void teken_subr_regular_character(teken_t *, teken_char_t); -static void teken_subr_cursor_up(teken_t *, unsigned int); +static void teken_subr_reset_to_initial_state(teken_t *); static inline int teken_tab_isset(teken_t *t, unsigned int col) @@ -684,25 +685,33 @@ static void teken_subr_regular_character(teken_t *t, teken_char_t c) { + unsigned int width; /* Unprintable characters. */ if (c <= 0x1B) return; + + /* XXX: calculate character width! */ +#ifdef TEKEN_UTF8 + width = 1; +#else /* !TEKEN_UTF8 */ + width = 1; +#endif /* TEKEN_UTF8 */ if (t->t_stateflags & TS_INSERT) { /* * Insert mode. Keep cursor at the same place, but move * all existing characters to the right. */ - if (t->t_cursor.tp_col < t->t_winsize.tp_col - 1) { + if (t->t_cursor.tp_col < t->t_winsize.tp_col - width) { teken_rect_t tr; teken_pos_t tp; tr.tr_begin = t->t_cursor; tr.tr_end.tp_row = t->t_cursor.tp_row + 1; - tr.tr_end.tp_col = t->t_winsize.tp_col - 1; + tr.tr_end.tp_col = t->t_winsize.tp_col - width; tp.tp_row = t->t_cursor.tp_row; - tp.tp_col = t->t_cursor.tp_col + 1; + tp.tp_col = t->t_cursor.tp_col + width; teken_funcs_copy(t, &tr, &tp); } @@ -733,7 +742,7 @@ teken_funcs_putchar(t, &tp, c, &t->t_curattr); t->t_cursor.tp_row = tp.tp_row; - t->t_cursor.tp_col = 1; + t->t_cursor.tp_col = width; t->t_stateflags &= ~TS_WRAPPED; } else { /* No scrolling needed. */ @@ -741,7 +750,7 @@ if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1) { t->t_stateflags |= TS_WRAPPED; } else { - t->t_cursor.tp_col++; + t->t_cursor.tp_col += width; t->t_stateflags &= ~TS_WRAPPED; } } @@ -758,19 +767,13 @@ teken_funcs_param(t, TP_CURSORKEYS, 0); break; case 3: /* 132 column mode. */ - teken_printf("DECRST 132 columns\n"); - /* XXX: temporary hacks to allow autowrap testing. */ - teken_subr_erase_display(t, 2); - t->t_cursor.tp_row = 0; - t->t_cursor.tp_col = 0; - t->t_stateflags &= ~TS_WRAPPED; - teken_funcs_cursor(t); + teken_funcs_param(t, TP_132COLS, 0); + teken_subr_reset_to_initial_state(t); break; case 5: /* Inverse video. */ teken_printf("DECRST inverse video\n"); break; case 6: /* Origin mode. */ - teken_printf("DECRST origin mode\n"); t->t_stateflags &= ~TS_ORIGIN; t->t_originreg.ts_begin = 0; t->t_originreg.ts_end = t->t_winsize.tp_row; @@ -779,7 +782,6 @@ teken_funcs_cursor(t); break; case 7: /* Autowrap mode. */ - teken_printf("DECRST autowrap mode\n"); t->t_stateflags &= ~TS_AUTOWRAP; break; case 8: /* Autorepeat mode. */ @@ -892,19 +894,13 @@ teken_funcs_param(t, TP_CURSORKEYS, 1); break; case 3: /* 132 column mode. */ - teken_printf("DECSET 132 columns\n"); - /* XXX: temporary hacks to allow autowrap testing. */ - teken_subr_erase_display(t, 2); - t->t_cursor.tp_row = 0; - t->t_cursor.tp_col = 0; - t->t_stateflags &= ~TS_WRAPPED; - teken_funcs_cursor(t); + teken_funcs_param(t, TP_132COLS, 1); + teken_subr_reset_to_initial_state(t); break; case 5: /* Inverse video. */ teken_printf("DECSET inverse video\n"); break; case 6: /* Origin mode. */ - teken_printf("DECSET origin mode\n"); t->t_stateflags |= TS_ORIGIN; t->t_originreg = t->t_scrollreg; t->t_cursor.tp_row = t->t_scrollreg.ts_begin; @@ -913,7 +909,6 @@ teken_funcs_cursor(t); break; case 7: /* Autowrap mode. */ - teken_printf("DECSET autowrap mode\n"); t->t_stateflags |= TS_AUTOWRAP; break; case 8: /* Autorepeat mode. */ From owner-p4-projects@FreeBSD.ORG Sun Dec 7 13:11:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E814106567C; Sun, 7 Dec 2008 13:11:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21F6A106564A for ; Sun, 7 Dec 2008 13:11:14 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10F1D8FC0C for ; Sun, 7 Dec 2008 13:11:14 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7DBDiI083274 for ; Sun, 7 Dec 2008 13:11:13 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7DBDLS083272 for perforce@freebsd.org; Sun, 7 Dec 2008 13:11:13 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 7 Dec 2008 13:11:13 GMT Message-Id: <200812071311.mB7DBDLS083272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 13:11:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=154254 Change 154254 by ed@ed_flippo on 2008/12/07 13:10:56 Add an implementation of wcwidth() to libteken. I just took Markus Kuhn's implementation (see URL in teken_wcwidth.h). Maybe we should add it to libkern. It's good enough for now. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#4 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#6 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_wcwidth.h#1 add Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#4 (text+ko) ==== @@ -46,6 +46,16 @@ #endif /* __FreeBSD__ && _KERNEL */ #include "teken.h" +#ifdef TEKEN_UTF8 +#include "teken_wcwidth.h" +#else /* !TEKEN_UTF8 */ +static inline int +teken_wcwidth(teken_char_t c) +{ + + return (c <= 0x1B) ? -1 : 1; +} +#endif /* TEKEN_UTF8 */ #define teken_clamp(x,low,high) (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x))) ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#6 (text+ko) ==== @@ -685,18 +685,11 @@ static void teken_subr_regular_character(teken_t *t, teken_char_t c) { - unsigned int width; + int width; - /* Unprintable characters. */ - if (c <= 0x1B) + width = teken_wcwidth(c); + if (width < 0) return; - - /* XXX: calculate character width! */ -#ifdef TEKEN_UTF8 - width = 1; -#else /* !TEKEN_UTF8 */ - width = 1; -#endif /* TEKEN_UTF8 */ if (t->t_stateflags & TS_INSERT) { /* From owner-p4-projects@FreeBSD.ORG Sun Dec 7 14:01:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 943841065677; Sun, 7 Dec 2008 14:01:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56FA61065672 for ; Sun, 7 Dec 2008 14:01:05 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2CF8D8FC13 for ; Sun, 7 Dec 2008 14:01:05 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7E14XU087348 for ; Sun, 7 Dec 2008 14:01:04 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7E14Hc087346 for perforce@freebsd.org; Sun, 7 Dec 2008 14:01:04 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 7 Dec 2008 14:01:04 GMT Message-Id: <200812071401.mB7E14Hc087346@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 14:01:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=154257 Change 154257 by ed@ed_flippo on 2008/12/07 14:00:44 Don't hardcode to 1-column characters here. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#7 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#7 (text+ko) ==== @@ -740,7 +740,7 @@ } else { /* No scrolling needed. */ teken_funcs_putchar(t, &t->t_cursor, c, &t->t_curattr); - if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1) { + if (t->t_cursor.tp_col >= t->t_winsize.tp_col - width) { t->t_stateflags |= TS_WRAPPED; } else { t->t_cursor.tp_col += width; From owner-p4-projects@FreeBSD.ORG Sun Dec 7 15:34:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 815D41065675; Sun, 7 Dec 2008 15:34:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B42D1065672 for ; Sun, 7 Dec 2008 15:34:40 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 20CF48FC14 for ; Sun, 7 Dec 2008 15:34:40 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7FYduE097808 for ; Sun, 7 Dec 2008 15:34:39 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7FYd8c097806 for perforce@freebsd.org; Sun, 7 Dec 2008 15:34:39 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 7 Dec 2008 15:34:39 GMT Message-Id: <200812071534.mB7FYd8c097806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 15:34:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=154259 Change 154259 by ed@ed_mekker on 2008/12/07 15:34:28 Argh! How hard is it to do it right? It seems we should not do wrapping on tabs after all. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#8 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#8 (text+ko) ==== @@ -275,15 +275,13 @@ do { /* Stop when we've reached the end of the line. */ - if ((t->t_stateflags & TS_AUTOWRAP) == 0 && - t->t_cursor.tp_col == t->t_winsize.tp_col - 1) + if (t->t_cursor.tp_col == t->t_winsize.tp_col - 1) break; teken_subr_regular_character(t, ' '); /* Tab marker set. */ - if (t->t_stateflags & TS_WRAPPED || - teken_tab_isset(t, t->t_cursor.tp_col)) + if (teken_tab_isset(t, t->t_cursor.tp_col)) ntabs--; } while (ntabs > 0); } From owner-p4-projects@FreeBSD.ORG Sun Dec 7 19:07:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31CF71065678; Sun, 7 Dec 2008 19:07:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1BBC1065675 for ; Sun, 7 Dec 2008 19:07:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD8C78FC27 for ; Sun, 7 Dec 2008 19:07:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7J7Rdl090456 for ; Sun, 7 Dec 2008 19:07:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7J7RQ5090454 for perforce@freebsd.org; Sun, 7 Dec 2008 19:07:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Dec 2008 19:07:27 GMT Message-Id: <200812071907.mB7J7RQ5090454@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 19:07:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=154280 Change 154280 by rwatson@rwatson_cinnamon_macosx on 2008/12/07 19:07:10 Regenerate test tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/data_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/data_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/file_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/file_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/header32_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ip_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ip_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/iport_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/iport_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/path_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/path_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/return32_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/return32_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/seq_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/seq_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/socketex_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/socketex_token#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/text_record#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/text_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#3 edit .. //depot/projects/trustedbsd/openbsm/test/reference/zonename_record#2 edit .. //depot/projects/trustedbsd/openbsm/test/reference/zonename_token#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/arg32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/data_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/data_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/file_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/file_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/header32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/in_addr_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ip_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ip_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/ipc_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/iport_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/iport_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/opaque_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/path_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/path_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv4#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_record-IPv6#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv4#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process32ex_token-IPv6#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv4#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_record-IPv6#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv4#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/process64ex_token-IPv6#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/return32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/return32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/seq_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/seq_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/socketex_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/socketex_token#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv4#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/subject32ex_token-IPv6#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/text_record#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/text_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/trailer_token#3 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/zonename_record#2 (binary) ==== ==== //depot/projects/trustedbsd/openbsm/test/reference/zonename_token#2 (binary) ==== From owner-p4-projects@FreeBSD.ORG Sun Dec 7 19:51:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95A4C1065676; Sun, 7 Dec 2008 19:51:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 414891065672 for ; Sun, 7 Dec 2008 19:51:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D4B98FC13 for ; Sun, 7 Dec 2008 19:51:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7JpLaF017881 for ; Sun, 7 Dec 2008 19:51:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7JpLl4017879 for perforce@freebsd.org; Sun, 7 Dec 2008 19:51:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Dec 2008 19:51:21 GMT Message-Id: <200812071951.mB7JpLl4017879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 19:51:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=154288 Change 154288 by rwatson@rwatson_cinnamon on 2008/12/07 19:51:17 Bump OpenBSM BSM header version. Complete deprecation of TRAILER_PAD_MAGIC by replacing it with AUT_TRAILER_MAGIC and removing all references to the old Darwin constant. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 edit .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#16 (text+ko) ==== @@ -12,6 +12,8 @@ after the exec args/env tokens. - Support for AUT_SOCKET_EX extended socket tokens, which describe a socket using a pair of IPv4/IPv6 and port tuples. +- OpenBSM BSM file header version bumped for 1.1 release. +- Deprecated Darwin constants, such as TRAILER_PAD_MAGIC, removed. OpenBSM 1.1 alpha 2 @@ -361,4 +363,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#15 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#16 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#83 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#84 $ */ #include @@ -1556,7 +1556,7 @@ { token_t *t; u_char *dptr = NULL; - u_int16_t magic = TRAILER_PAD_MAGIC; + u_int16_t magic = AUT_TRAILER_MAGIC; GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int16_t) + sizeof(u_int32_t)); ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#22 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#23 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -140,7 +140,7 @@ The .Dq trailer terminates a BSM audit record, and contains a magic number, -.Dv TRAILER_PAD_MAGIC +.Dv AUT_TRAILER_MAGIC and length that can be used to validate that the record was read properly. A .Dq trailer ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#6 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -164,14 +164,11 @@ #define AUDIT_HEADER_VERSION_SOLARIS 2 #define AUDIT_HEADER_VERSION_TSOL25 3 #define AUDIT_HEADER_VERSION_TSOL 4 -#define AUDIT_HEADER_VERSION_OPENBSM 10 +#define AUDIT_HEADER_VERSION_OPENBSM10 10 +#define AUDIT_HEADER_VERSION_OPENBSM11 11 +#define AUDIT_HEADER_VERSION_OPENBSM AUDIT_HEADER_VERSION_OPENBSM11 -/* - * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we - * split the difference, will remove the Apple define for the next release. - */ #define AUT_TRAILER_MAGIC 0xb105 -#define TRAILER_PAD_MAGIC AUT_TRAILER_MAGIC /* BSM library calls */ From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:15:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E96D1065673; Sun, 7 Dec 2008 20:15:46 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 219E11065679 for ; Sun, 7 Dec 2008 20:15:46 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0DDF38FC13 for ; Sun, 7 Dec 2008 20:15:46 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KFkfQ035803 for ; Sun, 7 Dec 2008 20:15:46 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KFjOj035798 for perforce@freebsd.org; Sun, 7 Dec 2008 20:15:45 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 7 Dec 2008 20:15:45 GMT Message-Id: <200812072015.mB7KFjOj035798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 20:15:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=154289 Change 154289 by rene@rene_self on 2008/12/07 20:14:54 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/www/en/multimedia/multimedia-input.xml#3 integrate .. //depot/projects/docproj_nl/www/en/multimedia/multimedia.pl#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#10 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#3 (text+ko) ==== @@ -20,7 +20,7 @@ Jens Schweikhardt - $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.12 2008/12/03 21:59:51 schweikh Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml,v 1.14 2008/12/04 18:13:49 schweikh Exp $ &tm-attrib.freebsd; @@ -119,7 +119,7 @@ done from within the old system, up to the point where you can chroot to the new system. In other words, we go through three stages, where each stage consists of either running a shell - script or invoke make: + script or invoking make: @@ -176,8 +176,9 @@ not be used for its usual duties. If you run a production server you have to consider the downtime caused by stage two. The ports compiled by stage_2.conf.default below require - about 4 hours to build on an AMD1800+ SCSI system with 10krpm disks - and 1GB of RAM. If you prefer to install packages instead of ports, + about 8 hours (of which 4 hours are due to + OpenOffice.org) to build on a contemporary + system. If you prefer to install packages instead of ports, you can significantly reduce the downtime to about 10 minutes. @@ -524,9 +525,9 @@ appropriate answers to the installation command (e.g. yes | make install. For other ports you need to investigate where exactly the interactive command is located and deal with it - appropriately. The examples above for + appropriately. See the examples above for print/acroread8 and - java/jdk16 are examples. + java/jdk16. You should also be aware of upgrade issues for config files. In general you do not know when and if the format or contents of a ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.74 2006/04/28 12:39:55 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.76 2008/12/06 22:09:01 pgj Exp $ --> @@ -50,7 +50,7 @@ content, please post it to the &a.doc;. - Inline vs. block + Inline vs. Block In the remainder of this document, when describing elements, inline means that the element can occur within a @@ -64,7 +64,7 @@ HTML, the HyperText Markup Language, is the markup language of choice on the World Wide Web. More information can be found at - <URL:>. + . HTML is used to markup pages on the FreeBSD web site. It should not (generally) be used to mark up other documentation, @@ -77,7 +77,7 @@ latest, 4.0 (available in both strict and loose variants). - The HTML DTDs are available from the ports collection in the + The HTML DTDs are available from the Ports Collection in the textproc/html port. They are automatically installed as part of the textproc/docproj port. @@ -96,7 +96,7 @@ - Sectional elements + Sectional Elements An HTML document is normally split into two sections. The first section, called the head, contains @@ -110,11 +110,11 @@ contained within the top-level html element. - Normal HTML document structure + Normal HTML Document Structure <html> <head> - <title>The document's title</title> + <title>The Document's Title</title> </head> <body> @@ -127,7 +127,7 @@ - Block elements + Block Elements Headings @@ -204,7 +204,7 @@ - Block quotations + Block Quotations A block quotation is an extended quotation from another document that should not appear within the current paragraph. @@ -285,7 +285,7 @@ - Definition lists with <sgmltag>dl</sgmltag> + Definition Lists with <sgmltag>dl</sgmltag> Use: @@ -308,7 +308,7 @@ - Pre-formatted text + Pre-formatted Text You can indicate that text should be shown to the user exactly as it is in the file. Typically, this means that the text is shown @@ -370,7 +370,7 @@ p element. - Simple use of <sgmltag>table</sgmltag> + Simple Use of <sgmltag>table</sgmltag> Use: @@ -392,7 +392,7 @@ A cell can span multiple rows and columns. To indicate this, add the rowspan and/or colspan - attributes, with values indicating the number of rows of columns + attributes, with values indicating the number of rows or columns that should be spanned. @@ -473,10 +473,10 @@ - In-line elements + In-line Elements - Emphasizing information + Emphasizing Information You have two levels of emphasis available in HTML, em and strong. @@ -498,7 +498,7 @@ - Bold and italics + Bold and Italics Because HTML includes presentational markup, you can also indicate that particular content should be rendered in bold or @@ -514,7 +514,7 @@ - Indicating fixed pitch text + Indicating Fixed-Pitch Text If you have content that should be rendered in a fixed pitch (typewriter) typeface, use tt (for @@ -532,7 +532,7 @@ - Content size + Content Size You can indicate that content should be shown in a larger or smaller font. There are three ways of doing this. @@ -555,7 +555,7 @@ Use font with the size - attribute set to a number between 1 and 7. The default font size + attribute set to a number between 1 and 7. The default font size is 3. This approach is deprecated. @@ -570,7 +570,7 @@ this text is slightly bigger.

    This text is slightly smaller. But - this text is slightly bigger + this text is slightly bigger.

    This text is slightly smaller. But this text is slightly bigger.

    ]]> @@ -586,7 +586,7 @@ - Linking to other documents on the WWW + Linking to Other Documents on the WWW In order to include a link to another document on the WWW you must know the URL of the document you want to link to. @@ -612,7 +612,7 @@ - Linking to other parts of documents + Linking to Other Parts of Documents Linking to a point within another document (or within the same document) requires that the document author include anchors that you @@ -636,7 +636,7 @@ # symbol. - Linking to a named part of another document + Linking to A Named Part of Another Document Assume that the para1 example resides in a document called foo.html. @@ -651,7 +651,7 @@ the anchor (with the preceding #). - Linking to a named part of the same document + Linking to A Named Part of the Same Document Assume that the para1 example resides in this document: @@ -680,7 +680,7 @@ how it should be presented. - <literal>formal</literal> vs. <literal>informal</literal> + Formal vs. Informal Some elements may exist in two forms, formal and informal. Typically, the formal version of @@ -689,13 +689,13 @@ title. - The DocBook DTD is available from the ports collection in the + The DocBook DTD is available from the Ports Collection in the textproc/docbook port. It is automatically installed as part of the textproc/docproj port. - FreeBSD extensions + &os; Extensions The FreeBSD Documentation Project has extended the DocBook DTD by adding some new elements. These elements serve to make some of the @@ -717,8 +717,8 @@ touch with &a.doceng;. - The FreeBSD extensions are not (currently) in the ports - collection. They are stored in the FreeBSD CVS tree, as The &os; extensions are not (currently) in the Ports Collection. + They are stored in the &os; CVS tree, as doc/share/sgml/freebsd.dtd. @@ -733,7 +733,7 @@ - Document structure + Document Structure DocBook allows you to structure your documentation in several ways. In the FreeBSD Documentation Project we are using two primary @@ -742,7 +742,7 @@ A book is organized into chapters. This is a mandatory requirement. There may be parts between the book and the chapter to provide another layer of organization. - The Handbook is arranged in this way. + For example, the Handbook is arranged in this way. A chapter may (or may not) contain one or more sections. These are indicated with the sect1 element. If a section @@ -770,10 +770,10 @@ document, the FreeBSD FAQ, and the FreeBSD Handbook are - all marked up as books. + all marked up as books, for example. - Starting a book + Starting a Book The content of the book is contained within the book element. As well as containing structural @@ -793,7 +793,7 @@ replaceable elements --> <book> <bookinfo> - <title>Your title here</title> + <title>Your Title Here</title> <author> <firstname>Your first name</firstname> @@ -822,7 +822,7 @@ - Starting an article + Starting an Article The content of the article is contained within the article element. As well as containing @@ -870,17 +870,17 @@ - Indicating chapters + Indicating Chapters Use chapter to mark up your chapters. Each chapter has a mandatory title. Articles do not contain chapters, they are reserved for books. - A simple chapter + A Simple Chapter - The chapter's title + The Chapter's Title ...     ]]> @@ -891,10 +891,10 @@ chapter then just use an empty paragraph. - Empty chapters + Empty Ehapters - This is an empty chapter + This is An Empty Chapter     ]]> @@ -902,7 +902,7 @@ - Sections below chapters + Sections Below Chapters In books, chapters may (but do not need to) be broken up into sections, subsections, and so on. In articles, sections are the @@ -918,34 +918,34 @@ elements, and so on, down to sect5. - Sections in chapters + Sections in Chapters - A sample chapter + A Sample Chapter Some text in the chapter. - First section (1.1) + First Section (1.1) … - Second section (1.2) + Second Section (1.2) - First sub-section (1.2.1) + First Sub-Section (1.2.1) - First sub-sub-section (1.2.1.1) + First Sub-Sub-Section (1.2.1.1) … - Second sub-section (1.2.2) + Second Sub-Section (1.2.2) … @@ -962,7 +962,7 @@ - Subdividing using <sgmltag>part</sgmltag>s + Subdividing Using <sgmltag>part</sgmltag> Elements You can introduce another layer of organization between book and chapter with one or @@ -994,7 +994,7 @@ - Block elements + Block Elements Paragraphs @@ -1025,7 +1025,7 @@ - Block quotations + Block Quotations A block quotation is an extended quotation from another document that should not appear within the current paragraph. You will @@ -1055,6 +1055,8 @@ Appearance: + A small excerpt from the US Constitution: +
    Preamble to the Constitution of the United States @@ -1071,8 +1073,8 @@ - Tips, notes, warnings, cautions, important information and - sidebars. + Tips, Notes, Warnings, Cautions, Important Information and + Sidebars You may need to include extra information separate from the main body of the text. Typically this is meta @@ -1120,6 +1122,7 @@ ]]> + Appearance: Installing FreeBSD may make you want to delete Windows from @@ -1128,7 +1131,7 @@ - Lists and procedures + Lists and Procedures You will often need to list pieces of information to the user, or present them with a number of steps that must be carried out in @@ -1238,7 +1241,7 @@ - Showing file samples + Showing File Samples If you want to show a fragment of a file (or perhaps a complete file) to the user, wrap it in the programlisting @@ -1390,12 +1393,12 @@ Use: - + - This is column head 1 - This is column head 2 + This is Column Head 1 + This is Column Head 2 @@ -1415,12 +1418,12 @@ Appearance: - + - This is column head 1 - This is column head 2 + This is Column Head 1 + This is Column Head 2 @@ -1452,7 +1455,7 @@ frame="none">). - Tables where <literal>frame="none"</literal> + Tables Where <literal>frame="none"</literal> Appearance: @@ -1460,8 +1463,8 @@ - This is column head 1 - This is column head 2 + This is Column Head 1 + This is Column Head 2 @@ -1482,7 +1485,7 @@ - Examples for the user to follow + Examples for the User to Follow A lot of the time you need to show examples for the user to follow. Typically, these will consist of dialogs with the computer; @@ -1586,10 +1589,10 @@ - In-line elements + In-line Elements - Emphasizing information + Emphasizing Information When you want to emphasize a particular word or phrase, use emphasis. This may be presented as italic, or @@ -1644,7 +1647,7 @@ - Keys, mouse buttons, and combinations + Keys, Mouse Buttons, and Combinations To refer to a specific key on the keyboard, use keycap. To refer to a mouse button, use @@ -1665,7 +1668,7 @@ keycombo. - Keys, mouse buttons, and combinations + Keys, Mouse Buttons, and Combinations Use: @@ -1700,10 +1703,10 @@ - Applications, commands, options, and cites + Applications, Commands, Options, and Cites You will frequently want to refer to both applications and - commands when writing for the Handbook. The distinction between + commands when writing documentation. The distinction between them is simple: an application is the name for a suite (or possibly just 1) of programs that fulfil a particular task. A command is the name of a program that the user can run. @@ -1769,7 +1772,7 @@ clear. Hopefully this example makes it clearer. - Applications, commands, and options. + Applications, Commands, and Options Use: @@ -1780,7 +1783,7 @@ sendmail 8 - , &man.mailq.8;, and &man.newaliases.8; + , &man.mailq.1;, and &man.newaliases.1; programs. One of the command line parameters to @@ -1799,13 +1802,7 @@ sendmail 8 - , - mailq - 8 - , and - newaliases - 8 - programs. + , &man.mailq.1;, and &man.newaliases.1; programs. One of the command line parameters to sendmail @@ -1822,7 +1819,7 @@ - Files, directories, extensions + Files, Directories, Extensions Whenever you wish to refer to the name of a file, a directory, or a file extension, use filename. @@ -1833,8 +1830,8 @@ Use: The SGML source for the Handbook in English can be - found in /usr/doc/en/handbook/. The first - file is called handbook.sgml in that + found in /usr/doc/en_US.ISO8859-1/books/handbook/. The first + file is called book.sgml in that directory. You should also see a Makefile and a number of files with a .ent extension.]]> @@ -1850,10 +1847,10 @@ - The name of ports + The Name of Ports - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -1887,7 +1884,7 @@ Devices - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -1938,10 +1935,10 @@ - Hosts, domains, IP addresses, and so forth + Hosts, Domains, IP Addresses, and So Forth - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -1955,11 +1952,11 @@ - No role attribute, or + No role attribute, or role="hostname" - With no role attribute (i.e., + With no role attribute (i.e., hostid.../hostid) the marked up information is the simple hostname, such as freefall or wcarchive. @@ -2037,13 +2034,13 @@ The FreeBSD.org domain contains a number of different hosts, including freefall.FreeBSD.org and - bento.FreeBSD.org. + pointyhat.FreeBSD.org. When adding an IP alias to an interface (using ifconfig) always use a netmask of 255.255.255.255 (which can also be expressed as 0xffffffff. + role="netmask">0xffffffff). The MAC address uniquely identifies every network card in existence. A typical MAC address looks like ifconfig) always use a netmask of 255.255.255.255 (which can also be expressed as 0xffffffff. + role="netmask">0xffffffff). The MAC address uniquely identifies every network card in existence. A typical MAC address looks like Usernames - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -2105,7 +2102,7 @@ Describing <filename>Makefile</filename>s - FreeBSD extension + &os; Extension These elements are part of the FreeBSD extension to DocBook, and do not exist in the original DocBook DTD. @@ -2158,11 +2155,11 @@ - Literal text + Literal Text You will often need to include literal text in the - Handbook. This is text that is excerpted from another file, or - which should be copied from the Handbook into another file + documentation. This is text that is excerpted from another file, or + which should be copied from the documentation into another file verbatim. Some of the time, programlisting will be @@ -2210,9 +2207,7 @@ Use: - - &prompt.user; man command -]]> + &prompt.user; man command]]> Appearance: @@ -2249,7 +2244,7 @@ - Quoting system errors + Quoting System Errors You might want to show errors generated by FreeBSD. Mark these with errorname. This @@ -2279,7 +2274,7 @@ Image support in the documentation is currently extremely - experimental. I think the mechanisms described here are unlikely to + experimental. The mechanisms described here are unlikely to change, but that is not guaranteed. You will also need to install the @@ -2301,7 +2296,7 @@ - Image formats + Image Formats We currently support two formats for images. The format you should use will depend on the nature of your image. @@ -2423,7 +2418,7 @@ - <filename>Makefile</filename> entries + <filename>Makefile</filename> Entries Your images must be listed in the Makefile in the IMAGES @@ -2453,7 +2448,7 @@ - Images and chapters in subdirectories + Images and Chapters in Subdirectories You must be careful when you separate your documentation into smaller files (see ) in @@ -2464,7 +2459,7 @@ chapter1/chapter.sgml, chapter2/chapter.sgml, and chapter3/chapter.sgml. If each chapter has - images associated with it, I suggest you place those images in each + images associated with it, it is suggested to place those images in each chapter's subdirectory (chapter1/, chapter2/, and chapter3/). @@ -2513,7 +2508,7 @@ - Linking to other parts of the same document + Linking to Other Parts of the Same Document Linking within the same document requires you to specify where you are linking from (i.e., the text the user will click, or @@ -2532,7 +2527,7 @@ elements. - <literal>id on chapters and sections</literal> + Attribute <literal>id</literal> on Chapters and Sections Introduction @@ -2603,7 +2598,7 @@ One. More specific information can be found in the - section called Sub-sect 1. + section called Sub-Sect 1.
    @@ -2665,7 +2660,7 @@     - Linking to documents on the WWW + Linking to Documents on the WWW Linking to external documents is much simpler, as long as you know the URL of the document you want to link to. Use ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 (text+ko) ==== @@ -27,11 +27,11 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.17 2005/09/12 16:47:35 yar Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml,v 1.18 2008/12/07 02:05:09 pgj Exp $ --> - Structuring documents under <filename>doc/</filename> + Structuring Documents Under <filename>doc/</filename> The doc/ tree is organized in a particular fashion, and the documents that are part of the FDP are in turn organized @@ -40,17 +40,17 @@ - make it easy to automate converting the document to other formats; + Make it easy to automate converting the document to other formats. - promote consistency between the different documentation + Promote consistency between the different documentation organizations, to make it easier to switch between working on - different documents; + different documents. - make it easy to decide where in the tree new documentation should + Make it easy to decide where in the tree new documentation should be placed. @@ -61,7 +61,7 @@ does not enforce any particular defaults or cultural preferences. - The top level, <filename>doc/</filename> + The Top Level, <filename>doc/</filename> There are two types of directory under doc/, each with very specific directory names and meanings. @@ -101,7 +101,7 @@ The - <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable>/</filename> directories + lang.encoding/ Directories These directories contain the documents themselves. The documentation is split into up to three more categories at this @@ -147,7 +147,7 @@ - Document specific information + Document Specific Information This section contains specific notes about particular documents managed by the FDP. @@ -168,7 +168,7 @@ sect3) and so on. - Physical organization + Physical Organization There are a number of files and directories within the handbook directory. @@ -221,17 +221,17 @@ For example, if one of the chapter files contains: + ... ]]> - then it will be called chapter.sgml in - the kernelconfiguration directory. In + Then it will be called chapter.sgml in + the kernelconfig directory. In general, the entire contents of the chapter will be held in this file. When the HTML version of the Handbook is produced, this will - yield kernelconfiguration.html. This is + yield kernelconfig.html. This is because of the id value, and is not related to the name of the directory. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -507,6 +507,187 @@ + + + + + + Joseph J. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:49:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 008D01065677; Sun, 7 Dec 2008 20:49:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A089B1065670 for ; Sun, 7 Dec 2008 20:49:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C6958FC08 for ; Sun, 7 Dec 2008 20:49:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KnKGL076233 for ; Sun, 7 Dec 2008 20:49:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KnKwo076228 for perforce@freebsd.org; Sun, 7 Dec 2008 20:49:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Dec 2008 20:49:20 GMT Message-Id: <200812072049.mB7KnKwo076228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 20:49:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=154291 Change 154291 by rwatson@rwatson_fledge on 2008/12/07 20:48:33 Add OpenBSM 1.1 alpha3 and hook it up to the OpenBSM page. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.1-alpha3.tgz#1 add .. //depot/projects/trustedbsd/www/openbsm.page#33 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#33 (text+ko) ==== @@ -30,7 +30,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#32 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#33 $ @@ -178,20 +178,17 @@ Description - 1.1 alpha 2 -     openbsm-1.1-alpha2.tgz + 1.1 alpha 3 + openbsm-1.1-alpha3.tgz 512K - 2008-11-11 + 2008-12-07 -

    In this revision, BSM include files required by OS vendors for - use in kernels are broken out into a separate include - directory, a configure option is added to force use of native - rather than OpenBSM sys includes if desired, strlcpy() and - strlcat() are used in preference to less robust APIs, - compatibility defines for old Darwin event identifiers are - removed, support for exended header tokens (containing host - information) is added to the BSM library and auditd(8), and can - be set in audit_control(5).

    +

    In this revision, OpenBSM maps between local and wire values + for the errno error space, bugs are fixed in the encoding of + execve arguments and environmental variables, support for the + portable AUT_SOCKET_EX token type is added, and the BSM header + version is bumped to give OpenBSM 1.1 its own file format + version due to non-trivial changes in tokens.

    @@ -216,6 +213,23 @@ Description + 1.1 alpha 2 + openbsm-1.1-alpha2.tgz + 512K + 2008-11-11 + +

    In this revision, BSM include files required by OS vendors for + use in kernels are broken out into a separate include + directory, a configure option is added to force use of native + rather than OpenBSM sys includes if desired, strlcpy() and + strlcat() are used in preference to less robust APIs, + compatibility defines for old Darwin event identifiers are + removed, support for exended header tokens (containing host + information) is added to the BSM library and auditd(8), and can + be set in audit_control(5).

    + + + 1.1 alpha 1 openbsm-1.1-alpha1.tgz 496K From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:51:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51C831065679; Sun, 7 Dec 2008 20:51:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 161F71065675 for ; Sun, 7 Dec 2008 20:51:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 029448FC1E for ; Sun, 7 Dec 2008 20:51:22 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KpMRN078259 for ; Sun, 7 Dec 2008 20:51:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KpM6E078257 for perforce@freebsd.org; Sun, 7 Dec 2008 20:51:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Dec 2008 20:51:22 GMT Message-Id: <200812072051.mB7KpM6E078257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 20:51:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=154292 Change 154292 by rwatson@rwatson_fledge on 2008/12/07 20:51:21 Add a news blurb about OpenBSM 1.1 alpha3. Affected files ... .. //depot/projects/trustedbsd/www/news.page#16 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#16 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/news.page#15 $ + $P4: //depot/projects/trustedbsd/www/news.page#16 $ @@ -50,6 +50,15 @@
    +
    December 7, 2008 OpenBSM 1.1 alpha 3 released
    + +

    OpenBSM 1.1 alpha 3 has been released; this is a test release + of OpenBSM, adding extended socket token support, mapping between + local and BSM error numbers, and bumping the BSM file format + version number in preparation for the release of OpenBSM 1.1. See + the OpenBSM web page for more + information.

    +
    November 11, 2008 OpenBSM 1.1 alpha 2 released

    OpenBSM 1.1 alpha 2 has been released; this is a test release From owner-p4-projects@FreeBSD.ORG Sun Dec 7 20:55:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C301065673; Sun, 7 Dec 2008 20:55:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C2581065672 for ; Sun, 7 Dec 2008 20:55:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 171258FC14 for ; Sun, 7 Dec 2008 20:55:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7KtQZi080839 for ; Sun, 7 Dec 2008 20:55:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7KtQ46080834 for perforce@freebsd.org; Sun, 7 Dec 2008 20:55:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 7 Dec 2008 20:55:26 GMT Message-Id: <200812072055.mB7KtQ46080834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 20:55:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=154293 Change 154293 by rwatson@rwatson_cinnamon on 2008/12/07 20:54:58 Begin work on OpenBSM 1.1 alpha 4. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#17 edit .. //depot/projects/trustedbsd/openbsm/VERSION#21 edit .. //depot/projects/trustedbsd/openbsm/configure#42 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#44 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#17 (text+ko) ==== @@ -1,5 +1,7 @@ OpenBSM Version History +OpenBSM 1.1 alpha 4 + OpenBSM 1.1 alpha 3 - Add two new functions, au_bsm_to_errno() and au_errno_to_bsm(), to map @@ -363,4 +365,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#16 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#17 $ ==== //depot/projects/trustedbsd/openbsm/VERSION#21 (text+ko) ==== @@ -1,1 +1,1 @@ -OPENBSM_1_1_ALPHA_3 +OPENBSM_1_1_ALPHA_4 ==== //depot/projects/trustedbsd/openbsm/configure#42 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#42 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#43 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha3. +# Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. # # Report bugs to . # @@ -729,8 +729,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.1alpha3' -PACKAGE_STRING='OpenBSM 1.1alpha3' +PACKAGE_VERSION='1.1alpha4' +PACKAGE_STRING='OpenBSM 1.1alpha4' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -1404,7 +1404,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.1alpha3 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.1alpha4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.1alpha3:";; + short | recursive ) echo "Configuration of OpenBSM 1.1alpha4:";; esac cat <<\_ACEOF @@ -1580,7 +1580,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.1alpha3 +OpenBSM configure 1.1alpha4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1594,7 +1594,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.1alpha3, which was +It was created by OpenBSM $as_me 1.1alpha4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -19076,7 +19076,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.1alpha3 + VERSION=1.1alpha4 cat >>confdefs.h <<_ACEOF @@ -23522,7 +23522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenBSM $as_me 1.1alpha3, which was +This file was extended by OpenBSM $as_me 1.1alpha4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23575,7 +23575,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.1alpha3 +OpenBSM config.status 1.1alpha4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/openbsm/configure.ac#44 (text+ko) ==== @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([OpenBSM], [1.1alpha3], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#43 $]) +AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#44 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) From owner-p4-projects@FreeBSD.ORG Sun Dec 7 21:19:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DA2B1065673; Sun, 7 Dec 2008 21:19:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 217511065670 for ; Sun, 7 Dec 2008 21:19:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EF6C8FC12 for ; Sun, 7 Dec 2008 21:19:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7LJp8R098091 for ; Sun, 7 Dec 2008 21:19:51 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7LJpkB098089 for perforce@freebsd.org; Sun, 7 Dec 2008 21:19:51 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 7 Dec 2008 21:19:51 GMT Message-Id: <200812072119.mB7LJpkB098089@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 21:19:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=154295 Change 154295 by rene@rene_self on 2008/12/07 21:19:34 MFen handbook/desktop 1.79 -> 1.83 Checked build, spelling (diff only), whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#10 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.37 2006/08/25 16:14:06 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml - %SRCID% 1.79 + %SRCID% 1.83 --> @@ -62,9 +62,8 @@ - Browsers (zoals Mozilla, + Browsers (zoals Firefox, Opera, - Firefox, Konqueror) @@ -149,15 +148,15 @@ Ports - Afhankelijkheden + Grote afhankelijkheden - Mozilla + Firefox - veel + gemiddeld zwaar @@ -178,16 +177,6 @@ - Firefox - - gemiddeld - - zwaar - - Gtk+ - - - Konqueror gemiddeld @@ -201,95 +190,46 @@ - Mozilla - - Mozilla - - Mozilla is een moderne en - stabiele browser die volledig geschikt gemaakt is voor &os;; de - HTML-weergave engine voldoet in grote mate aan de standaarden; - er worden een mail- en nieuwslezer bijgeleverd en het pakket - bevat zelfs een HTML-bewerker voor het maken van webpagina's. - Gebruikers van &netscape; zullen de - gelijkheden met Communicator suite - herkennen, aangezien beide browsers wat ontwikkelgeschiedenis - delen. - - Op langzame machines, met een CPU-snelheid van 233MHz of - minder dan 64MB aan RAM, kan Mozilla - te veeleisend zijn om volledig bruikbaar te zijn. In dat geval - is Opera browser een mogelijke - vervanger, dat iets later in dit hoofdstuk beschreven wordt. - - - Als het niet wenselijk of mogelijk is om - Mozilla te compileren, dan is dit al - door het &os; GNOME team gedaan. Het pakket kan vanaf het - netwerk geïnstalleerd worden met: - - &prompt.root; pkg_add -r mozilla - - Als het pakket niet beschikbaar is en er genoeg tijd en - schijfruimte beschikbaar zijn, kan de broncode van - Mozilla gedownload, gecompileerd en - geïnstalleerd worden. Dit gaat met: - - &prompt.root; cd /usr/ports/www/mozilla -&prompt.root; make install clean - - De Mozilla port zorgt voor een - correcte installatie door de - chrome registry setup met - root rechten te draaien. Als echter ook - toevoegingen zoals muisgebaren geïnstalleerd moeten worden, - dan moet Mozilla als - root gedraaid worden om dat op de juiste - wijze geïnstalleerd te krijgen. - - Als de installatie van Mozilla - eenmaal voltooid is, is root zijn niet - langer nodig. Mozilla kan als - browser gestart worden met: - - &prompt.user; mozilla - - Het kan direct als mailprogramma of nieuwslezer gestart - worden met: - - &prompt.user; mozilla -mail - - - Firefox Firefox - Firefox is de volgende generatie - browser die gebaseerd is op Mozilla. - Mozilla is een compleet pakket aan - applicaties, waaronder een browser, een email client, een chat - client en nog veel meer. Firefox is - alleen een browser waardoor deze simpeler en sneller is. + Firefox is een moderne, gratis, + stabiele open-source browser die volledig geporteerd is naar + &os;: het heeft een motor voor HTML-weergave die zich zeer + strikt aan de standaarden houdt, browsen met tabbladen, + blokkeren van pop-ups, uitbreidingen, verbeterde veiligheid, en + meer. Firefox is gebaseerd op de + codebase van Mozilla. Installeer het pakket door het volgende te typen: &prompt.root; pkg_add -r firefox + Dit zal Firefox 2.X installeren, + als u in plaats hiervan Firefox 3.X + wilt draaien, gebruik dan: + + &prompt.root; pkg_add -r firefox3 + De Portscollectie kan ook gebruikt worden als u liever vanuit de broncode installeert. &prompt.root; cd /usr/ports/www/firefox &prompt.root; make install clean + + Voor Firefox 3.X dient + firefox in het vorige commando vervangen te + worden door firefox3. - Firefox, Mozilla en &java; plugin + Firefox en &java; plugin In deze en de volgende sectie wordt er vanuit gegaan dat - Firefox of - Mozilla reeds geïnstalleerd + Firefox reeds geïnstalleerd is. @@ -302,9 +242,8 @@ &os; Foundation website. Om &java; ondersteuning toe te voegen aan - Firefox of - Mozilla moet als allereerste - de java/javavmwrapper port + Firefox moet als allereerste de port + java/javavmwrapper geïnstalleerd worden. Download daarna het Diablo &jre; pakket van , @@ -324,7 +263,9 @@ - Firefox, Mozilla en ¯omedia; &flash; plugin + Firefox en ¯omedia; &flash; plugin + + Flash ¯omedia; &flash; plugin is niet beschikbaar voor &os;. Er is echter wel een softwarelaag (wrapper) om de @@ -352,6 +293,30 @@ plugins wordt nu getoond. + + Firefox en Swfdec &flash; plugin + + Swfdec is de bibliotheek om &flash;-animaties te decoderen + en af te beelden. Swfdec-Mozilla is een plugin voor + Firefox-browsers dat de + Swfdec-bibliotheek gebruikt om SWF-bestanden af te spelen. Er + wordt nog steeds veel aan ontwikkeld. + + Als u het niet kunt of wilt compileren, kan het pakket vanaf + het netwerk worden geïnstalleerd: + + &prompt.root; pkg_add -r swfdec-plugin + + Als het pakket niet beschikbaar is, kunt u het vanuit de + Portscollectie compileren en installeren: + + &prompt.root; cd /usr/ports/www/swfdec-plugin +&prompt.root; make install clean + + Herstart hierna uw browser om deze plugin effectief te + maken. + + Opera @@ -1113,14 +1078,6 @@ - Mozilla - - mozilla - - www/mozilla - - - Opera linux-opera From owner-p4-projects@FreeBSD.ORG Sun Dec 7 22:28:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45DAA1065675; Sun, 7 Dec 2008 22:28:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09C3A1065672 for ; Sun, 7 Dec 2008 22:28:02 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECC238FC0C for ; Sun, 7 Dec 2008 22:28:01 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7MS1fB045138 for ; Sun, 7 Dec 2008 22:28:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7MS1UV045136 for perforce@freebsd.org; Sun, 7 Dec 2008 22:28:01 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 7 Dec 2008 22:28:01 GMT Message-Id: <200812072228.mB7MS1UV045136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 22:28:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=154300 Change 154300 by pgj@kolbasz on 2008/12/07 22:27:09 MFen (doc): 1.66 -> 1.67 hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#5 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml - %SRCID% 1.66 + %SRCID% 1.67 --> @@ -905,8 +905,10 @@ A betöltõképet tartalmazó (.bmp vagy .pcx kiterjesztésû) állományt a - /boot - könyvtárba kell tennünk. + rendszerindító partícióra, + például a /boot könyvtárba + kell tennünk. A normál (256 szín, legfeljebb 320x200-as felbontású) képek esetén a From owner-p4-projects@FreeBSD.ORG Sun Dec 7 23:42:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EA381065679; Sun, 7 Dec 2008 23:42:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 406C7106564A for ; Sun, 7 Dec 2008 23:42:23 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E3C98FC08 for ; Sun, 7 Dec 2008 23:42:23 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7NgMd6092891 for ; Sun, 7 Dec 2008 23:42:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7NgMe0092889 for perforce@freebsd.org; Sun, 7 Dec 2008 23:42:22 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 7 Dec 2008 23:42:22 GMT Message-Id: <200812072342.mB7NgMe0092889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 23:42:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=154304 Change 154304 by pgj@kolbasz on 2008/12/07 23:42:14 MFen (doc): 1.79 -> 1.84 hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml 1.1102 -> 1.1103 hu_HU.ISO8859-2/books/faq/book.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#28 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#28 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -10102,69 +10102,11 @@ - A &os; képes - betöltõképeket (splash screen) - megjeleníteni a rendszer indításakor. - Ezek a betöltõképek pillanatnyilag csak 256 - színû BMP (*.BMP) vagy PCX - (*.PCX) állományok - lehetnek. Emellett legfeljebb 320x200 pixel - méretûnek kell lenniük, ha - szabványos VGA kártyán akarjuk - használni ezeket. Amennyiben a rendszermagunkban - VESA támogatás is van, akkor akár - 1024x768-as felbontásig is elmehetünk. A - jelenlegi VESA támogatás - beépíthetõ a rendszermagba a - VESA opció - megadásával, vagy betölthetõ a - rendszerindítás során a VESA modul - használatával. - - A betöltõképernyõ - használatához a &os; - indításáért felelõs - állományokat kell - módosítanunk. - - Elõször is létre kell hoznunk egy - /boot/loader.rc - állományt, amely a következõ sorokat - tartalmazza: - - include /boot/loader.4th -start - - Továbbá a - /boot/loader.conf - állománynak a következõket kell - tartalmaznia: - - splash_bmp_load="YES" -bitmap_load="YES" - - A fenti sorokban azt adtuk meg, hogy az - /boot/splash.bmp állomány - lesz a betöltõképernyõnk. Ha helyette - egy PCX állományt használnánk - inkább, akkor másoljuk le - /boot/splash.pcx néven, majd az - iméntiekben megadottak szerint hozzunk létre - egy /boot/loader.rc, illetve egy ilyen - /boot/loader.conf - állományt: - - splash_pcx_load="YES" -bitmap_load="YES" -bitmap_name="/boot/splash.pcx" - - Most már csak egy jó - betöltõképernyõre van - szükségünk. Ha ilyet keresünk, akkor - például érdemes - szétnéznünk a - oldalon. + Erre a kérdésre részletes + választ a &os; kézikönyv Rendszerbetöltõ + képernyõk + címû szakaszában kapunk. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#10 (text+ko) ==== @@ -6,7 +6,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml - %SRCID% 1.79 + %SRCID% 1.84 --> @@ -80,9 +80,8 @@ Böngészõk (mint a - Mozilla, + Firefox, Opera, - Firefox, Konqueror) @@ -186,8 +185,8 @@ - Mozilla - sok + Firefox + közepes nehéz Gtk+ @@ -204,13 +203,6 @@ - Firefox - közepes - nehéz - Gtk+ - - - Konqueror közepes nehéz @@ -222,105 +214,40 @@ - Mozilla - - Mozilla - - A Mozilla egy modern, - megbízható böngészõ, amelyet - sikeresen portoltak &os;-re. Ez egy nagyon jó, a - szabványoknak megfelelõ HTML-megjelenítõ - motorral rendelkezik, valamint hírolvasót - és levelezõ klienst is tartalmaz. Ezenfelül - találhatunk benne egy HTML-szerkesztõt is, ami - jól használható honlapok - készítéséhez. A - &netscape;-hez szokott - felhasználók felfedezhetnek némi - hasonlóságot a - Communicator programcsomaggal, mivel - ez a két böngészõ valaha egy és - ugyanaz volt. - - 233 MHz-nél lassabb processzorral vagy 64 - MB-nál kevesebb memóriával rendelkezõ - gépeken a kielégítõ - mûködéshez a Mozilla - erõforrásigényesnek tûnhet. Ebben az - esetben inkább érdemes a fejezet egy - késõbbi részében bemutatandó - Opera böngészõt - használni. - - Ha bármilyen okból nem akarjuk vagy nem tudjuk - lefordítani a Mozillat, - nyugodtan támaszkodhatunk a &os; GNOME csapatának - munkájára. Hálózaton keresztül - csomagból a következõ paranccsal tudjuk - telepíteni: - - &prompt.root; pkg_add -r mozilla - - Ha ez a csomag nem érhetõ el, de van - elegendõ idõnk és tárhelyünk, - letölthetjük a Mozilla - forrását is, amit aztán lefordítunk - és telepítünk. Ennek módja: - - &prompt.root; cd /usr/ports/www/mozilla -&prompt.root; make install clean - - A Mozilla portja a - root felhasználó jogaival - végzett regisztrációs - beállítások - érvényesítésével gondoskodik - a megfelelõ inicializálásról. Azonban - ha további kiegészítéseket is - szeretnénk még telepíteni, - például az egérmozdulatok - támogatását, magunknak kell - root felhasználóként - futtatni a Mozillat, hogy ezek - szabályosan telepítõdhessenek. - - Amint sikeresen befejezõdõtt a - Mozilla telepítése, - nincs szükség rá, hogy továbbra is - root felhasználók - legyünk. A Mozilla - böngészõt így tudjuk elindítani a - parancssorból: - - &prompt.user; mozilla - - Hírolvasóként és levelezõ - kliensként pedig az alábbi módon lehet - elindítani: - - &prompt.user; mozilla -mail - - - - Firefox Firefox - A Firefox a - Mozilla alapjaira - építkezõ, következõ - generációs böngészõ. A - Mozilla egy teljes programcsomag, - tehát böngészõ, levelezõ kliens, - csevegõkliens stb. A Firefox - azonban csak egy egyszerû böngészõ, aminek - köszönhetõen kisebb és gyorsabb is. + A Firefox egy modern, szabad + és nyílt forráskódú + böngészõ, amely tökéletesen + használható &os; alatt. + Megtalálható benne egy, a jelenlegi HTML + szabványoknak nagyon jól megfelelõ + megjelenítõ motor, a lapokra bontható + böngészés támogatása, a + kéretlenül felbukkanó ablakok + blokkolása, különbözõ + kiterjesztések, javított biztonsági + lehetõségek és még sok minden + más. A Firefox forrása + a Mozilla kódján + alapszik. Csomagból így telepíthetõ: &prompt.root; pkg_add -r firefox + Ekkor a Firefox + 2.X változata fog + települni. Ha helyette a + Firefox + 3.X változatát + szeretnénk használni, akkor ezt a parancsot adjuk + ki: + + &prompt.root; pkg_add -r firefox3 + Ha forrásból szeretnénk felrakni, használhatjuk a Portgyûjteményben található portját is: @@ -328,18 +255,22 @@ &prompt.root; cd /usr/ports/www/firefox &prompt.root; make install clean + A Firefox + 3.X + telepítéséhez az iménti parancsban + cseréljük ki a firefox + részt a firefox3 + könyvtárra. - Firefox, Mozilla és a &java; plugin + A Firefox és a &java; plugin Ennél és a következõ résznél feltételezzük, hogy már korábban telepítettük a - Firefox vagy a - Mozilla alkalmazások - valamelyikét. + Firefox alkalmazást. A &os; Alapítvány megegyezett a Sun @@ -354,10 +285,10 @@ Ha tehát &java;-támogatást szeretnénk hozzáadni a - Firefox vagy a - Mozilla valamelyikéhez, - elsõként fel kell telepítenünk a - java/javavmwrapper portot. + Firefox + böngészõhöz, elsõként fel kell + telepítenünk a java/javavmwrapper portot. Ezután le kell töltenünk a Diablo &jre; csomagot a @@ -384,9 +315,11 @@ + A Firefox és a ¯omedia; &flash; plugin - Firefox, Mozilla és a ¯omedia; &flash; - plugin + + Flash + A ¯omedia; &flash; plugin nem érhetõ el közvetlenül &os;-re. Azonban létezik egy, a @@ -413,10 +346,45 @@ &prompt.user; nspluginwrapper -v -a -i - Ezután indítsuk el a böngészõt, majd gépeljük be a - about:plugins szöveget a címsorba és nyomjuk - le az Enter billentyût. Ekkor a jelenleg - elérhetõ pluginok listájának kell megjelennie. + Ezután indítsuk el a + böngészõt, majd gépeljük be a + about:plugins szöveget a címsorba + és nyomjuk le az Enter billentyût. + Ekkor a jelenleg elérhetõ pluginok + listájának kell megjelennie. + + + + A Firefox és az Swfdec &flash; plugin + + Az Swfdec egy &flash; animációk + dekódolásáért és + megjelenítéséért felelõs + programkönyvtár. Az Swfdec-Mozilla pedig egy + Firefox + böngészõkhöz készített + plugin, amely az Swfdec könyvtáron keresztül + játszik le SWF állományokat. Jelenleg + még aktív fejlesztés alatt + áll. + + Ha nem akarjuk vagy netalán nem tudjuk + forrásból lefordítani, akkor egyszerûen + csak telepítsük csomagként a + hálózaton keresztül: + + &prompt.root; pkg_add -r swfdec-plugin + + Ha valamiért mégsem érhetõ el + hozzá csomag, akkor a Portgyûjteménybõl is + telepíthetjük: + + &prompt.root; cd /usr/ports/www/swfdec-plugin +&prompt.root; make install clean + + Miután telepítettük a plugint, a + használatához indítsuk újra a + böngészõt. @@ -1294,12 +1262,6 @@ - Mozilla - mozilla - www/mozilla - - - Opera opera www/opera From owner-p4-projects@FreeBSD.ORG Sun Dec 7 23:43:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8750D1065673; Sun, 7 Dec 2008 23:43:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BB55106564A for ; Sun, 7 Dec 2008 23:43:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 218B98FC18 for ; Sun, 7 Dec 2008 23:43:24 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB7NhO03092961 for ; Sun, 7 Dec 2008 23:43:24 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB7NhOxE092959 for perforce@freebsd.org; Sun, 7 Dec 2008 23:43:24 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 7 Dec 2008 23:43:24 GMT Message-Id: <200812072343.mB7NhOxE092959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Dec 2008 23:43:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=154305 Change 154305 by pgj@kolbasz on 2008/12/07 23:43:09 Add a missing section id Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#6 (text+ko) ==== @@ -746,7 +746,7 @@ - + From owner-p4-projects@FreeBSD.ORG Mon Dec 8 02:23:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAF7C1065678; Mon, 8 Dec 2008 02:23:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FBAA1065675 for ; Mon, 8 Dec 2008 02:23:06 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E93F8FC1F for ; Mon, 8 Dec 2008 02:23:06 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB82N6mo019070 for ; Mon, 8 Dec 2008 02:23:06 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB82N6iZ019068 for perforce@freebsd.org; Mon, 8 Dec 2008 02:23:06 GMT (envelope-from zec@icir.org) Date: Mon, 8 Dec 2008 02:23:06 GMT Message-Id: <200812080223.mB82N6iZ019068@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2008 02:23:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=154309 Change 154309 by zec@zec_tpx32 on 2008/12/08 02:22:49 Nuke ng_wormhole to reduce the confusion among more essential changes requiring attention and thought in the vimage branch. ng_wormhole allowed for netgraph topologies to span multiple vnets / vimages, which is a neat functionality, though not so badly needed by probably 99% of people waiting for vimage to arrive in -CURRENT. Moreover, ng_wormhole was effectively defunct ever since the introduction of hierarchichal vimage naming scheme. We'll most probably bring it back to life once the management interface for vimage infrastructure gets settled. Until that time, ng_wormhole will continue to live under the radar in zec_vimage_7 branch in p4... Affected files ... .. //depot/projects/vimage/src/sys/conf/files#47 edit .. //depot/projects/vimage/src/sys/conf/options#38 edit .. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#8 edit .. //depot/projects/vimage/src/sys/modules/netgraph/wormhole/Makefile#2 delete .. //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#7 delete .. //depot/projects/vimage/src/sys/sys/vimage.h#71 edit Differences ... ==== //depot/projects/vimage/src/sys/conf/files#47 (text+ko) ==== @@ -2314,7 +2314,6 @@ netgraph/ng_tee.c optional netgraph_tee netgraph/ng_tty.c optional netgraph_tty netgraph/ng_vjc.c optional netgraph_vjc -netgraph/ng_wormhole.c optional netgraph_wormhole vimage netinet/accf_data.c optional accept_filter_data netinet/accf_dns.c optional accept_filter_dns netinet/accf_http.c optional accept_filter_http ==== //depot/projects/vimage/src/sys/conf/options#38 (text+ko) ==== @@ -491,7 +491,6 @@ NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h -NETGRAPH_WORMHOLE opt_netgraph.h # NgATM options NGATM_ATM opt_netgraph.h ==== //depot/projects/vimage/src/sys/modules/netgraph/Makefile#8 (text+ko) ==== @@ -51,8 +51,7 @@ tee \ UI \ vjc \ - vlan \ - ${_wormhole} + vlan .if ${MACHINE_ARCH} == "i386" _sync_ar= sync_ar @@ -67,9 +66,4 @@ _mppc= mppc .endif -VIMAGE!= grep VIMAGE ${KERNBUILDDIR}/opt_vimage.h | cut -d" " -f3 || true -.if ${VIMAGE} == 1 -_wormhole= wormhole -.endif - .include ==== //depot/projects/vimage/src/sys/sys/vimage.h#71 (text+ko) ==== @@ -82,7 +82,6 @@ #define VNET_MOD_ATALK 10 #define VNET_MOD_ACCF_HTTP 11 /* stateless modules */ -#define VNET_MOD_NG_WORMHOLE 19 #define VNET_MOD_NG_ETHER 20 #define VNET_MOD_NG_IFACE 21 #define VNET_MOD_NG_EIFACE 22 From owner-p4-projects@FreeBSD.ORG Mon Dec 8 08:16:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3D7C1065675; Mon, 8 Dec 2008 08:16:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 683891065672 for ; Mon, 8 Dec 2008 08:16:05 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 577258FC22 for ; Mon, 8 Dec 2008 08:16:05 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB88G5XF091582 for ; Mon, 8 Dec 2008 08:16:05 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB88G5vk091576 for perforce@freebsd.org; Mon, 8 Dec 2008 08:16:05 GMT (envelope-from ed@FreeBSD.org) Date: Mon, 8 Dec 2008 08:16:05 GMT Message-Id: <200812080816.mB88G5vk091576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2008 08:16:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=154320 Change 154320 by ed@ed_dull on 2008/12/08 08:15:18 Unbreak Cons25-support: When I implemented RIS (Reset to Initial State), I accidentally replaced teken_subr_vertical_position_absolute() with code that should have been placed inside the RIS routine. I didn't really notice this, until I ran some Cons25-apps, which heavily use VPA. This means we are once again compatible with syscons. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#9 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.h#9 (text+ko) ==== @@ -1074,8 +1074,8 @@ teken_subr_vertical_position_absolute(teken_t *t, unsigned int row) { - t->t_curattr = t->t_saved_curattr = teken_defattr; - t->t_cursor.tp_row = t->t_cursor.tp_col = 0; - t->t_saved_cursor = t->t_cursor; - t->t_stateflags = TS_AUTOWRAP; + t->t_cursor.tp_row = teken_clamp(row + t->t_originreg.ts_begin, + 1, t->t_originreg.ts_end) - 1; + t->t_stateflags &= ~TS_WRAPPED; + teken_funcs_cursor(t); } From owner-p4-projects@FreeBSD.ORG Mon Dec 8 08:40:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 642B71065672; Mon, 8 Dec 2008 08:40:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EBE01065675 for ; Mon, 8 Dec 2008 08:40:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F01368FC14 for ; Mon, 8 Dec 2008 08:40:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB88eXEf004975 for ; Mon, 8 Dec 2008 08:40:33 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB88eUnw004966 for perforce@freebsd.org; Mon, 8 Dec 2008 08:40:30 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 8 Dec 2008 08:40:30 GMT Message-Id: <200812080840.mB88eUnw004966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2008 08:40:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=154321 Change 154321 by rene@rene_self on 2008/12/08 08:39:55 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#11 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#11 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#11 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1102 2008/10/18 08:54:27 manolis Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1103 2008/12/07 20:44:01 pgj Exp $ 1995 @@ -7426,49 +7426,10 @@ - &os; have a feature to allow the display of - splash screens during the boot messages. The - splash screens currently must be a 256 color bitmap - (*.BMP) or ZSoft PCX - (*.PCX) file. In addition, they must - have a resolution of 320x200 or less to work on standard VGA - adapters. If you compile VESA support into your kernel, - then you can use larger bitmaps up to 1024x768. The actual - VESA support can either be compiled directly into the kernel - with the VESA kernel config option or by - loading the VESA kld module during bootup. - - To use a splash screen, you need to modify the startup - files that control the boot process for &os;. - - You need to create a - /boot/loader.rc file that contains the - following lines: - - include /boot/loader.4th -start - - and a /boot/loader.conf that - contains the following: - - splash_bmp_load="YES" -bitmap_load="YES" - - This assumes you are using - /boot/splash.bmp for your splash - screen. If you would rather use a PCX file, copy it to - /boot/splash.pcx, create a - /boot/loader.rc as instructed above, - and create a /boot/loader.conf that - contains: - - splash_pcx_load="YES" -bitmap_load="YES" -bitmap_name="/boot/splash.pcx" - - Now all you need is a splash screen. For that you can - surf on over to the gallery at . + The detailed answer for this question can be found in + the Boot Time Splash Screens + section of the &os; Handbook. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $ --> DocEng - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $ - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.31 2008/10/02 12:14:31 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/book.sgml,v 1.32 2008/12/07 22:03:48 pgj Exp $ &bookinfo.legalnotice; @@ -192,7 +192,7 @@ - Notes, tips, important information, warnings, and examples + Notes, Tips, Important Information, Warnings, and Examples Within the text appear notes, warnings, and examples. @@ -220,7 +220,7 @@ - A sample example + A Sample Example Examples are represented like this, and typically contain examples you should walk through, or show you what the results of a ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.23 2005/02/20 16:46:26 simon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml,v 1.24 2008/12/07 22:03:48 pgj Exp $ --> @@ -146,7 +146,7 @@ - Before you start + Before You Start This document assumes that you already know: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.76 2008/12/06 22:09:01 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.77 2008/12/07 22:03:48 pgj Exp $ --> @@ -172,8 +172,8 @@ Leaving gaps in the numbering is to be avoided. - Bad ordering of - <sgmltag>h<replaceable>n</replaceable></sgmltag> elements + Bad Ordering of + <sgmltag>h<replaceable>n</replaceable></sgmltag> Elements Use: @@ -2023,7 +2023,7 @@ - <sgmltag>hostid</sgmltag> and roles + <sgmltag>hostid</sgmltag> and Roles Use: @@ -2190,8 +2190,8 @@ - Showing items that the user <emphasis>must</emphasis> fill - in + Showing Items That the User <emphasis>Must</emphasis> Fill + In There will often be times when you want to show the user what to do, or refer to a file, or command line, or similar, where the user ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.48 2008/10/31 12:23:35 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.49 2008/12/07 22:03:48 pgj Exp $ --> @@ -157,7 +157,7 @@ - Elements, tags, and attributes + Elements, Tags, and Attributes All the DTDs written in SGML share certain characteristics. This is hardly surprising, as the philosophy behind SGML will inevitably show @@ -209,7 +209,7 @@ /element-name. - Using an element (start and end tags) + Using an Element (Start and End Tags) HTML has an element for indicating that the content enclosed by the element is a paragraph, called p. This @@ -228,7 +228,7 @@ the start tag is required for this element. - Using an element (start tag only) + Using an Element (Start Tag Only) HTML has an element for indicating a horizontal rule, called hr. This element does not wrap content, so only @@ -248,7 +248,7 @@ on. - Elements within elements; <sgmltag>em</sgmltag> + Elements within Elements; <sgmltag>em</sgmltag> This is a simple paragraph where some of the words have been emphasized.

    ]]> @@ -298,7 +298,7 @@ left. - Using an element with an attribute + Using An Element with An Attribute The inclusion of the align attribute on this paragraph was superfluous, since the default is left.

    @@ -313,7 +313,7 @@ the attribute value. - Single quotes around attributes + Single Quotes Around Attributes I am on the right!

    ]]>         @@ -332,7 +332,7 @@ catalog files. - For you to do… + For You to Do… In order to run the examples in this document you will need to install some software on your system and ensure that an environment @@ -356,7 +356,7 @@ <filename>.profile</filename>, for &man.sh.1; and - &man.bash.1; users + &man.bash.1; Users SGML_ROOT=/usr/local/share/sgml SGML_CATALOG_FILES=${SGML_ROOT}/jade/catalog @@ -370,7 +370,7 @@ <filename>.cshrc</filename>, for &man.csh.1; and - &man.tcsh.1; users + &man.tcsh.1; Users setenv SGML_ROOT /usr/local/share/sgml setenv SGML_CATALOG_FILES ${SGML_ROOT}/jade/catalog @@ -395,7 +395,7 @@ - An example HTML file + An Example HTML File @@ -526,7 +526,7 @@ - The DOCTYPE declaration + The DOCTYPE Declaration The beginning of each document that you write must specify the name of the DTD that the document conforms to. This is so that SGML parsers @@ -692,7 +692,7 @@ - <filename>catalog</filename> files + <filename>catalog</filename> Files If you use the syntax above and process this document using an SGML processor, the processor will need to have some way of @@ -779,7 +779,7 @@ - Escaping back to SGML + Escaping Back to SGML As mentioned earlier, SGML is only used when writing a DTD. This is not strictly true. There is certain SGML syntax that you @@ -814,7 +814,7 @@ opens a comment, and the second closes it. - SGML generic comment + SGML Generic Comment <!-- test comment --> @@ -832,7 +832,7 @@ - Use 2 dashes + Use 2 Dashes There is a problem with producing the Postscript and PDF versions of this document. The above example probably shows just one hyphen @@ -861,7 +861,7 @@ will reject documents that make that error. - Erroneous SGML comments + Erroneous SGML Comments - For you to do… + For You to Do… @@ -964,7 +964,7 @@ declaration. - Defining general entities + Defining General Entities @@ -982,7 +982,7 @@ - Parameter entities + Parameter Entities Like general entities, parameter entities are used to assign names to @@ -1003,7 +1003,7 @@ entity. - Defining parameter entities + Defining Parameter Entities @@ -1018,7 +1018,7 @@ - For you to do… + For You to Do… @@ -1031,7 +1031,7 @@ - An example HTML file + An Example HTML File @@ -1098,7 +1098,7 @@ - Using entities to include files + Using Entities to Include Files Entities (both general and - Using general entities to include files + Using General Entities to Include Files Suppose you have some content for an SGML book organized into files, one file per chapter, called @@ -1121,7 +1121,7 @@ the value of the entity. - Using general entities to include files + Using General Entities to Include Files @@ -1150,7 +1150,7 @@ - Using parameter entities to include files + Using Parameter Entities to Include Files Recall that parameter entities can only be used inside an SGML context. Why then would you want to include a file within an SGML @@ -1171,7 +1171,7 @@ document. - Using parameter entities to include files + Using Parameter Entities to Include Files First, place your entity definitions in a separate file, called chapters.ent. This file contains the @@ -1203,10 +1203,10 @@ - For you to do… + For You to Do… - Use general entities to include files + Use General Entities to Include Files @@ -1232,7 +1232,7 @@ - An example HTML file + An Example HTML File @@ -1262,7 +1262,7 @@ - Use parameter entities to include files + Use Parameter Entities to Include Files You must have taken the previous steps first. @@ -1279,7 +1279,7 @@ - An example HTML file + An Example HTML File @@ -1321,14 +1321,14 @@ - Marked sections + Marked Sections SGML provides a mechanism to indicate that particular pieces of the document should be processed in a special way. These are termed marked sections. - Structure of a marked section + Structure of A Marked Section <![ KEYWORD [ Contents of marked section @@ -1352,7 +1352,7 @@ >. - Marked section keywords + Marked Section Keywords <literal>CDATA</literal>, <literal>RCDATA</literal> @@ -1409,7 +1409,7 @@ - Using a CDATA marked section + Using a <literal>CDATA</literal> Marked Section <para>Here is an example of how you would include some text that contained many <literal>&lt;</literal> @@ -1451,7 +1451,7 @@ Using <literal>INCLUDE</literal> and - <literal>IGNORE</literal> in marked sections + IGNORE in Marked Sections <![ INCLUDE [ This text will be processed and included. @@ -1488,8 +1488,8 @@ reprocess the document. - Using a parameter entity to control a marked - section + Using A Parameter Entity to Control a Marked + Section <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" [ <!ENTITY % electronic.copy "INCLUDE"> @@ -1515,7 +1515,7 @@ - For you to do… + For You to Do… ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml,v 1.13 2007/01/15 23:29:57 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml,v 1.14 2008/12/07 22:03:48 pgj Exp $ --> @@ -70,7 +70,7 @@ HTML document without abusing HTML to do so. - The DocBook documents + The DocBook Documents The FreeBSD DSSSL stylesheets include a reference to a stylesheet, docbook.css, which is expected to appear in the ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.33 2008/10/13 06:57:53 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.34 2008/12/07 22:03:48 pgj Exp $ --> @@ -47,7 +47,7 @@ tools is covered in later chapters. - Use <filename role="package">textproc/docproj</filename> if possible + Use <filename role="package">textproc/docproj</filename> If Possible You can save yourself a lot of time if you install the textproc/docproj port. This is a @@ -83,7 +83,7 @@ - Mandatory tools + Mandatory Tools Software @@ -199,7 +199,7 @@ - Optional tools + Optional Tools You do not need to have any of the following installed. However, you may find it easier to work with the documentation if you do, and ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -614,8 +614,8 @@ Enabling the Splash Screen Function The splash screen (.bmp) or - (.pcx) file has to be placed in the - .pcx) file has to be placed on the + root partition, for example in the /boot directory. For default boot display resolution (256-color, 320 by ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -199,7 +199,7 @@ - Firefox and &java; plugin + Firefox and &java; Plugin In this section and in the next one, we assume you have @@ -232,12 +232,12 @@ &prompt.root; ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \ /usr/local/lib/browser_plugins/ - then relaunch your browser. + Then relaunch your browser. - Firefox and ¯omedia; &flash; plugin + Firefox and ¯omedia; &flash; Plugin Flash @@ -247,18 +247,41 @@ exists. This wrapper also supports &adobe; &acrobat; plugin, &realplayer; plugin and more. + + The following text covers the installation of &flash; + 9.X on recent -STABLE branch, &os; 7.1-RELEASE and above. + If you run an older version of &os; or encounter issues, you + should install www/linux-flashplugin7 and skip + the &man.linprocfs.5; part. + + Install the www/nspluginwrapper port. This port requires emulators/linux_base which is a large port. The next step is to install the www/linux-flashplugin7 port. Once + role="package">www/linux-flashplugin9 port. Once this port is installed, the plugin must be installed by each user with nspluginwrapper: &prompt.user; nspluginwrapper -v -a -i + The &linux; process file system, &man.linprocfs.5; has to + be mounted on /usr/compat/linux/proc, if one + wants to play &flash; animations. This can be done via the + following command: + + &prompt.user; mount -t linprocfs linproc /usr/compat/linux/proc + + This point can be automated at boot time with the addition + of the matching line in + /etc/fstab: + + linproc /usr/compat/linux/proc linprocfs rw 0 0 + Then, start your browser, enter about:plugins in the location bar and press Enter. @@ -267,7 +290,7 @@ - Firefox and Swfdec &flash; plugin + Firefox and Swfdec &flash; Plugin Swfdec is the library for decoding and rendering &flash; animations. And Swfdec-Mozilla is a plugin for Firefox @@ -279,7 +302,7 @@ &prompt.root; pkg_add -r swfdec-plugin - if the package is not available, you can compile and install it + If the package is not available, you can compile and install it from the Ports Collection: &prompt.root; cd /usr/ports/www/swfdec-plugin ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -575,7 +575,7 @@ and building a custom kernel (see ). The VESA support gives users the ability to display a splash screen - image that fills the whole display screen. + image that fills the whole display screen. While the splash screen is being displayed during the booting process, it can be turned off any time by hitting ==== //depot/projects/docproj_nl/www/en/news/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/news/Makefile,v 1.50 2008/01/16 08:21:47 murray Exp $ +# $FreeBSD: www/en/news/Makefile,v 1.51 2008/12/08 09:10:44 murray Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -46,6 +46,7 @@ SUBDIR+= 2004 SUBDIR+= 2005 SUBDIR+= 2006 +SUBDIR+= 2007 SUBDIR+= status .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_nl/www/en/news/news.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -19,8 +19,7 @@
  • -

    Press Releases: Press - releases from the project and other related organizations.

    +

    Foundation Press Releases: Press releases from the FreeBSD Foundation (also see archived pre-2005 press releases).

  • ==== //depot/projects/docproj_nl/www/en/news/pressreleases.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -13,6 +13,8 @@

    --> +

    Most press releases are now handled by the FreeBSD Foundation

    . +
    November 25, 2005
    ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#21 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.212 2008/12/04 05:01:36 murray Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.213 2008/12/08 09:10:44 murray Exp $ @@ -857,813 +857,4 @@ - - 2007 - - - 12 - - - 31 - - FreeBSD 6.3-RC2 Available - -

    The second release candidate of FreeBSD 6.3 has been announced. - ISO images and distributions for Tier-1 architectures are - now available on most of the - FreeBSD mirror sites.

    -     -     - - - 30 - - FreeBSD 7.0-RC1 Available - -

    The first release candidate of FreeBSD 7.0 is now available. - ISO images for Tier-1 architectures are now available on most of the - - FreeBSD mirror sites.

    -     -     - - - 28 - -

    New committer: Weongyo Jeong - (src)

    -     -     - - - 26 - -

    New committer: Rafal Jaworowski - (src)

    -     -     - - - 25 - - Juniper Networks, Inc has donated a reference FreeBSD - port to the MIPS architecture - -

    Juniper Networks, Inc. (http://www.juniper.net) has donated a - reference FreeBSD port to the MIPS architecture to The FreeBSD - Project. - This code will be used as one reference for creating an official - project-supported FreeBSD/MIPS offering.

    -

    Information about the code drop can be found here.

    -     -     - - - 10 - - End-of-Year Fund Raising Drive - -

    The FreeBSD - Foundation has announced an End-of-Year Fund Raising - Drive. The goal this year is to raise over $250,000. - This money is used for sponsoring FreeBSD related conferences, - providing travel grants to developers to attend these conferences, - providing grants for projects that improve FreeBSD, and - providing legal support on issues like understanding - the GPLv3 impact on FreeBSD, trademarks, and other legal - issues that come up.

    - -

    Donations can be made online from http://www.freebsdfoundation.org/donate/.

    -     -     - - - 5 - - &os; 7.0-BETA4 Available - -

    The &os; 7.0 release process proceeds and as a consequence - the 7.0-BETA4 ISO images for Tier-1 architectures are now - available for download on most - &os; mirror sites. We ask our users to report any - outstanding bugs, as this will presumably be the last BETA - release before the first RC release.

    -     -     -     - - - 11 - - - 29 - - - FreeBSD 6.3-RC1 Available - -

    The first release candidate of FreeBSD 6.3 has been announced. - ISO images and distributions for Tier-1 architectures are now available on most of the - - FreeBSD mirror sites.

    -     -     - - - 19 - - &os; 7.0-BETA3 Available - -

    The &os; 7.0 release process proceeds and as a consequence - the 7.0-BETA3 ISO images for Tier-1 architectures are now - available for download on most - &os; mirror sites. We ask our users to report any - outstanding bugs.

    -     -     - - - 4 - - &os; 7.0-BETA2 Available - -

    The &os; 7.0 release process proceeds and as a consequence - the 7.0-BETA2 ISO images for Tier-1 architectures are now - available for download on most - &os; mirror sites. We ask our users to report any - outstanding bugs, as this will presumably be the last BETA - release before the first RC release.

    -     -     - - - 1 - -

    New committer: Henrik Brix Andersen - (ports)

    -     -     -     - - - 10 - - - 27 - - The FreeBSD Foundation auctions the first copy of the book - "Absolute &os;, 2nd Edition" - -

    The &os; Foundation has started its Fall Fund-Raising - Campaign with an auction of the first copy of the book - "Absolute &os;, 2nd Edition" which was graciously - donated by the author Michael Lucas. The winner of this - auction will get a laser-printed Certificate of Authenticity - together with a signed bookplate. All proceeds will go to - The &os; Foundation! The bidding ends on November 2nd. - More information is available on eBay.

    -     -     - - - 26 - -

    Enhanced commit privileges: Martin Wilke - (ports, doc)

    -     -     - - - 25 - - New committer: <a href="mailto:lulf@FreeBSD.org">Ulf Lilleengen</a> - (src). SoC2007 alumnus. - -

    Ulf Lilleengen is now a src/ - committer. He participated in the Summer of Code program, where he - worked on gvinum. In FreeBSD, Ulf will continue to work on gvinum, - as well as csup and filesystem-related parts.

    -     -     - - 22 - - &os; 7.0-BETA1 Available - -

    The final stage of the &os;-7.0 Release cycle has begun - with the first beta release. The &os; 7.0-BETA1 ISO images - for Tier-1 architectures are now available - for download on most of the - &os; mirror sites. The more people that test and - report bugs, the better &os; 7.0-RELEASE will be. For more - information about the &os; 7.0 release process, please check - the official schedule - and the todo - list.

    -     -     - - 10 - - July-October, 2007 Status Reports - -

    The July-October, 2007 Status Reports is now - available with 21 entries.

    -     -     - - 3 - - PC-BSD 1.4 Released - -

    PC-BSD 1.4 has just been released. PC-BSD is a - successful desktop operating system based on FreeBSD that - focuses on providing an easy to use desktop system for - casual computer users. The release may be downloaded or purchased on CD.

    -     -     -     - - - 9 - - - 28 - - New committer: <a href="mailto:kaiw@FreeBSD.org">Kai Wang</a> - (src). SoC2007 alumnus. - -

    Kai Wang, a - student in the Summer of Code program, is now a - src/ committer.

    -     -     - - 25 - - New committer: <a href="mailto:rpaulo@FreeBSD.org">Rui Paulo</a> - (src). SoC2007 alumnus. - -

    Rui Paulo, a - student in the Summer of Code program, is now a full - src/ committer.

    -     -     - - 17 - - Summer of Code Projects Completed - -

    We are happy to report that 22 students successfully - completed their FreeBSD Summer of - Code projects. Congratulations to both mentors and - students, and thanks to Google for running - this program and providing funding.

    - -     -     -     - - - 8 - - - 29 - - FreeBSD Foundation August 2007 newsletter - -

    The FreeBSD Foundation has published their - - August 2007 newsletter which summarizes their activities - so far this year.

    -     -     - - - 20 - -

    New committer: Thomas Abthorpe - (ports)

    -     -     - - - 2 - - IPv6 live at the FreeBSD.org cluster - -

    Most of the machines and services in the FreeBSD.org cluster - are now available through IPv6. This includes www, mail and - developer ssh access. Connectivity is provided from ISC using - a tunnel.

    -     - - -

    New committer: Fukang Chen - (doc)

    -     -     -     - - - 7 - - - 10 - - April-June, 2007 Status Report - -

    The April-June, 2007 Status Report is now - available with 49 entries.

    -     -     - - - 9 - -

    New committer: Lars Engels - (ports)

    -     -     -     - - - 6 - - - 25 - -

    Enhanced commit privileges: Edwin Groothuis - (src, ports)

    -     -     - - - 24 - -

    New committer: Sean C. Farley - (src)

    -     -     - - - 12 - -

    New committer: Timur I. Bakeyev - (ports)

    -     - - -

    Enhanced commit privileges: Chin-San Huang - (doc, ports)

    -     -     - - - 7 - - FreeBSD Project Integrates Support for the Camellia Block Cipher - -

    Support for the Camellia block cipher has been integrated - into FreeBSD 7-CURRENT and will be part of the upcoming - FreeBSD 7-RELEASE. For more information, please refer to the - press release.

    -     -     - - - 4 - - -

    Enhanced commit privileges: Johann Kois - (full doc/www)

    -     -     -     - - - 5 - - - 30 - -

    New committer: Beech Rintoul - (ports)

    -     -     - - - 29 - - New committer: <a href="mailto:attilio@FreeBSD.org">Attilio Rao</a> - (src). SoC2007 alumnus. - -

    Attilio Rao, a - student in the Summer of Code program, is now a full - src/ committer.

    -     -     - - - 19 - - Xorg 7.2 imported into the ports collection. -

    Thanks to the hard work of - Florent Thoumie (and - others), the FreeBSD ports collection now uses the modular - Xorg 7.2 as its default X server. i386 and AMD64 6.2-STABLE - packages are available and other architectures/releases - will be available later, or you can compile it from - source. In both cases, see - the 20070519 entry in /usr/ports/UPDATING on how to upgrade. Please track -ports - for last minute information. -

    -     -     -     - - - 4 - - - 26 - -

    New committer: Marcelo Araujo - (ports)

    -     -     - - - 25 - -

    New committer: Tong Liu - (ports)

    -     -     - - - 13 - - - Funded Summer of Code Projects Announced - -

    The FreeBSD Project received over 120 applications for Google's - Summer of Code program, amongst which 25 were selected - for funding. Unfortunately, there were far more first rate - applications than available spots for students. However, - we encourage students to work together with us all year - round. The FreeBSD Project is always willing to help - mentor students learn more about operating system - development through our normal community mailing lists and - development forums. Contributing to an open source - software project is a valuable component of a computer - science education and great preparation for a career in - software development.

    - -

    A complete list of the winning students and projects is - available here. -A Summer -of Code wiki is also available with additional information.

    -     - - -

    New committer: Edward Tomasz Napierala - (ports)

    -     - - Mongolian FreeBSD Documentation Project Launches - -

    Under the supervision of Ganbold Tsagaankhuu the - Mongolian translation goes live. The official translation of the - FreeBSD Handbook, completed by the Mongolian FreeBSD Documentation - Project, adds support for documentation in another language. For - more information about the ongoing work of the MFDP, please refer - to the Translations page - of the FreeBSD Documentation Project.

    -     -     - - - 12 - -

    New committer: Alexander Motin - (src)

    -     -     - - - 9 - - January-March, 2007 Status Report - -

    The January-March, 2007 Status Report is now - available with 19 entries.

    -     -     - - - 6 - - ZFS Now Part of FreeBSD - -

    Support for Sun's - ZFS has been committed - to the FreeBSD 7-CURRENT development branch and will be available - as an experimental feature in FreeBSD 7.0-RELEASE. For more - information please refer to the - announcement.

    -     -     - - - 4 - -

    New committer: Martin Matuska - (ports)

    -     -     - - - 3 - -

    New committer: Li-Wen Hsu - (ports)

    -     -     -     - - - 3 - - - 28 - -

    New committer: Sepherosa Ziehau - (src)

    -     -     - - - 14 - - Accepting Applications for Summer of Code - -

    The FreeBSD Project is now accepting applications for - the Google Summer - of Code 2007 program. This program will provide - funding for students to spend the summer contributing to - open source software projects. A list of FreeBSD specific - projects and potential mentors is available here.

    - -

    Once a suitable project and mentor have been identified, - interested students should complete a proposal and submit - it to Google. Proposals are now being accepted and the - final deadline is March 24, 2007. Please see the Google - FAQ for more information.

    -     -     - - - 12 - - March 2007 Snapshot Releases Available - -

    FreeBSD 7-CURRENT and 6-STABLE snapshot releases for - March 2007 now available. The FreeBSD Release Engineering - Team issues snapshot releases to encourage users to test - new features and improve the reliability. For more - details, please visit - the snapshots - page.

    -     -     - - - 11 - - New committer: <a - href="mailto:bushman@FreeBSD.org">Michael Bushkov</a> - (src). An SoC2006 alumnus. - -

    Michael Bushkov, a - successful student from last year's Summer of Code - program, has continued working with the FreeBSD Project - and is now a full src/ committer.

    -     -     - - - 10 - - Progress on scaling of FreeBSD on 8 CPU systems - -

    Recently there has been significant progress on optimizing - FreeBSD 7.0 for MySQL running an 8-core amd64 system. Under the - test workload FreeBSD has peak performance consistent with Linux, - and outperforms it by a factor of 4 under higher loads. Continue - reading for a more detailed - report here.

    -     -     - - - 7 - - FreeBSD Announces Intel Approval for Redistribution of Wireless Firmware - -

    The FreeBSD project has reached an agreement with Intel about the redistribution - of firmware images for Intel wireless cards. Please refer to the press release - for more information.

    -     -     -     - - - 2 - - - 27 - -

    Information - about how the change in Daylight Savings Time for some - time zones affects FreeBSD releases.

    -     -     - - - 23 - -

    Enhanced commit privileges: Remko Lodder - (doc,src)

    -     -     - - - 17 - -

    New committer: JINMEI, Tatuya - (src)

    -     -     - - - 16 - -

    New committer: Stephane E. Potvin - (src)

    -     -     - - - 10 - -

    New committer: Benjamin Close - (src)

    -     -     - - - 9 - - Podcast Interview with FreeBSD Core Team Member and - AsiaBSDCon 2007 Program Committee Chair George V. - Neville-Neil. - -

    In his latest bsdtalk - podcast, Will Backman interviews FreeBSD Developer George V. - Neville-Neil about the upcoming AsiaBSDCon conference. - - http://cisx1.uma.maine.edu/~wbackman/bsdtalk/bsdtalk099.mp3.

    -     -     - - - 8 - - AsiaBSDCon 2007 Announces Conference Schedule - -

    AsiaBSDCon, the BSD conference for Asia, has posted its schedule of - tutorials, papers and presentations for the conference, taking place - in Tokyo from March 8th through 11th 2007. The complete schedule can - be found here.

    - -

    Registration will begin on or about the 12th of February.

    -     -     - - - 2 - -

    Enhanced commit privileges: Gábor Kövesdán - (doc, ports)

    -     -     -     - - - 1 - - - 31 - -

    Enhanced commit privileges: Rong-En Fan - (src, ports)

    -     -     - - - 18 - -

    New committer: Diane Bruce - (ports)

    -     -     - - - 16 - - October-December, 2006 Status Report - -

    The October-December, 2006 Status Report is now - available with 41 entries.

    -     -     - - - 15 - - - FreeBSD 6.2-RELEASE is Now Available - -

    FreeBSD - 6.2-RELEASE has been released. Please check the release errata - before installation for any late-breaking news and/or - issues with 6.2. The Release Information - page has more information about FreeBSD releases.

    -     -     - - - 9 - - - Hungarian FreeBSD Documentation Project Launches - -

    Under the supervision of FreeBSD developer Gábor Kövesdán, the - Hungarian translation goes live. This official translation, - completed by the Hungarian FreeBSD Documentation Project, adds - support for documentation in another language. For more - information about the ongoing work of the HFDP team, please refer - to the - Translations page of the FreeBSD Documentation Project.

    -     -     -     -     -     ==== //depot/projects/docproj_nl/www/share/sgml/press.xml#6 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.70 2008/10/06 08:54:23 jkoshy Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.71 2008/12/08 09:10:44 murray Exp $ @@ -156,458 +156,4 @@ - - 2007 - - - 11 - - - DataPipe and Rackspace are the Most Reliable Hosting Companies in October 2007 - http://news.netcraft.com/archives/2007/11/19/datapipe_and_rackspace_are_the_most_reliable_hosting_companies_in_october_2007.html - Netcraft - http://www.netcraft.com/ - 19 November 2007 - Paul Mutton -

    FreeBSD using web hosting provider DataPipe was ranked the - most reliable provider in October 2007 by Netcraft.

    -     -     - - - 10 - - - Desktop FreeBSD Part 9: FreeBSD and Broadband - http://www.ofb.biz/safari/article/441.html - Open For Business - http://www.ofb.biz/ - 30 October 2007 - Ed Hurst -

    An article that briefly covers broadband setup on FreeBSD.

    -     - - - Squeeze Your Gigabit NIC for Top Performance - http://www.enterprisenetworkingplanet.com/nethub/article.php/3485486 - Enterprise Networking Planet - http://www.enterprisenetworkingplanet.com/ - 24 October 2007 - Charlie Schluting -

    Describes the TCP stack tuning process used to get FreeBSD - 5.3 to run at gigabit speeds.

    -     - - - Low-Cost Storage Tools - http://www.processor.com/editorial/article.asp?article=articles/p2942/23p42/23p42.asp&guid=&searchtype=&WordList=&bJumpTo=True - Processor Magazine - http://www.processor.com/ - 19 October 2007 - Processor magazine staff -

    FreeBSD-based FreeNAS is touched upon in an article on - open-source storage tools.

    -     - - - Creating And Managing A Jailed Virtual Host - in FreeBSD - http://www.openaddict.com/node/36 - OpenAddict - http://www.openaddict.com/ - 18 October 2007 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 8 20:34:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6994E1065677; Mon, 8 Dec 2008 20:34:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E10A1065670 for ; Mon, 8 Dec 2008 20:34:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C4E78FC16 for ; Mon, 8 Dec 2008 20:34:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB8KY5th017952 for ; Mon, 8 Dec 2008 20:34:05 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB8KY5KO017950 for perforce@freebsd.org; Mon, 8 Dec 2008 20:34:05 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 8 Dec 2008 20:34:05 GMT Message-Id: <200812082034.mB8KY5KO017950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2008 20:34:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=154368 Change 154368 by rene@rene_self on 2008/12/08 20:33:25 MFen handbook/desktop 1.83 -> 1.85 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#12 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.37 2006/08/25 16:14:06 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml - %SRCID% 1.83 + %SRCID% 1.85 --> @@ -268,10 +268,19 @@ Flash ¯omedia; &flash; plugin is niet beschikbaar voor &os;. - Er is echter wel een softwarelaag (wrapper) om de - &linux;-versie van de plugin te draaien. Deze wrapper - ondersteunt ook &adobe; &acrobat; plugin, &realplayer; plugin en - meer. + Er is echter wel een softwarelaag (wrapper) om de &linux;-versie + van de plugin te draaien. Deze wrapper ondersteunt ook &adobe; + &acrobat; plugin, &realplayer; plugin en meer. + + + De volgende tekst behandelt de installatie van &flash; 9.X + op een recente -STABLE-tak, &os; 7.1-RELEASE en verder. Als u + een oudere versie van &os; draait of problemen tegenkomt, + dient u www/linux-flashplugin7 te + installeren en het gedeelte over &man.linprocfs.5; over te + slaan. + Installeer de port www/nspluginwrapper. Deze is @@ -279,14 +288,28 @@ role="package">emulators/linux_base wat een grote port is. - De volgende stap is het installeren van de www/linux-flashplugin7 port. Zodra - de plugin geïnstalleerd is, moet de plugin door elke - gebruiker geïnstalleerd worden met + De volgende stap is het installeren van de port www/linux-flashplugin9. Zodra de + plugin geïnstalleerd is, moet de plugin door elke gebruiker + geïnstalleerd worden met nspluginwrapper: &prompt.user; nspluginwrapper -v -a -i + Het &linux; procesbestandssysteem, &man.linprocfs.5;, moet + zijn aangekoppeld op /usr/compat/linux/proc, indien + het gewenst is om &flash;-animaties af te spelen. Dit kan met + het volgende commando gedaan worden: + + &prompt.user; mount -t linprocfs linproc /usr/compat/linux/proc + + Dit punt kan geautomatiseerd worden tijdens het opstarten + door het toevoegen van deze regel aan + /etc/fstab: + + linproc /usr/compat/linux/proc linprocfs rw 0 0 + Start dan de browser en voer op de adresbalk about:plugins in en druk op Enter. Een pagina met alle geïnstalleerde From owner-p4-projects@FreeBSD.ORG Tue Dec 9 04:28:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DD151065677; Tue, 9 Dec 2008 04:28:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4F6C106564A for ; Tue, 9 Dec 2008 04:28:12 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B210F8FC08 for ; Tue, 9 Dec 2008 04:28:12 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB94SCie092773 for ; Tue, 9 Dec 2008 04:28:12 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB94SCOX092771 for perforce@freebsd.org; Tue, 9 Dec 2008 04:28:12 GMT (envelope-from zec@icir.org) Date: Tue, 9 Dec 2008 04:28:12 GMT Message-Id: <200812090428.mB94SCOX092771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 04:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=154381 Change 154381 by zec@zec_tca51 on 2008/12/09 04:28:02 IFC @ 154379 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/support.4th#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/zfs/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_mouse.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/adb/adbvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sdhci/sdhci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/atomic.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_param.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/radix.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/radix.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cuda.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/cudavar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/macgpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/macgpiovar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/pmuvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_quota.c#3 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#9 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.645 2008/08/09 05:46:13 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.646 2008/12/06 19:37:52 alc Exp $"); /* * Manages physical address maps. @@ -180,7 +180,7 @@ SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); -static int pg_ps_enabled; +static int pg_ps_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0, "Are large page mappings enabled?"); ==== //depot/projects/vimage-commit2/src/sys/boot/common/loader.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.94 2007/11/08 11:59:38 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.95 2008/12/06 11:21:10 danger Exp $ .\" .Dd November 8, 2007 .Dt LOADER 8 @@ -454,7 +454,7 @@ or if a SIGTERM is delivered to the .Xr init 8 process (PID 1). -.It Va init_script +.It Va init_shell Defines the shell binary to be used for executing the various shell scripts. The default is .Dq Li /bin/sh . ==== //depot/projects/vimage-commit2/src/sys/boot/forth/support.4th#2 (text+ko) ==== @@ -22,7 +22,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.17 2007/12/19 17:06:32 ambrisko Exp $ +\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.18 2008/12/07 19:42:20 luigi Exp $ \ Loader.rc support functions: \ @@ -288,6 +288,17 @@ : free-memory free if free_error throw then ; +: strget { var -- addr len } var .addr @ var .len @ ; + +\ assign addr len to variable. +: strset { addr len var -- } addr var .addr ! len var .len ! ; + +\ free memory and reset fields +: strfree { var -- } var .addr @ ?dup if free-memory 0 0 var strset then ; + +\ free old content, make a copy of the string and assign to variable +: string= { addr len var -- } var strfree addr len strdup var strset ; + \ Assignment data temporary storage string name_buffer @@ -712,19 +723,6 @@ module_loaderror_suffix suffix_type? ; -: set_conf_files - conf_files .addr @ ?dup if - free-memory - then - value_buffer .addr @ c@ [char] " = if - value_buffer .addr @ char+ value_buffer .len @ 2 chars - - else - value_buffer .addr @ value_buffer .len @ - then - strdup - conf_files .len ! conf_files .addr ! -; - : set_nextboot_conf nextboot_conf_file .addr @ ?dup if free-memory @@ -888,6 +886,11 @@ then ; +: set_conf_files + set_environment_variable + s" loader_conf_files" getenv conf_files string= +; + : set_nextboot_flag yes_value? to nextboot? ; @@ -1045,7 +1048,6 @@ \ Variables used for processing multiple conf files string current_file_name -variable current_conf_files \ Indicates if any conf file was succesfully read @@ -1053,18 +1055,10 @@ \ loader_conf_files processing support functions -: set_current_conf_files - conf_files .addr @ current_conf_files ! +: get_conf_files ( -- addr len ) \ put addr/len on stack, reset var + conf_files strget 0 0 conf_files strset ; -: get_conf_files - conf_files .addr @ conf_files .len @ strdup -; - -: recurse_on_conf_files? - current_conf_files @ conf_files .addr @ <> -; - : skip_leading_spaces { addr len pos -- addr len pos' } begin pos len = if addr len pos exit then @@ -1133,7 +1127,6 @@ \ Interface to loader_conf_files processing : include_conf_files - set_current_conf_files get_conf_files 0 begin get_next_file ?dup @@ -1141,7 +1134,7 @@ set_current_file_name ['] load_conf catch process_conf_errors - recurse_on_conf_files? if recurse then + conf_files .addr @ if recurse then repeat ; ==== //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/boot0.S#5 (text+ko) ==== @@ -14,7 +14,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.20 2008/12/03 14:53:59 luigi Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.21 2008/12/08 20:53:27 sobomax Exp $ */ /* build options: */ @@ -93,7 +93,7 @@ * %si pointer to the partition table from which we were loaded. * Some boot code (e.g. syslinux) use this info to relocate * themselves, so we want to pass a valid one to the next stage. - * NOTE: the use of %is is not a standard. + * NOTE: the use of %si is not a standard. * * This boot block first relocates itself at a different address (0:0x600), * to free the space at 0:0x7c00 for the next stage boot block. ==== //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btxldr/btxldr.S#2 (text+ko) ==== @@ -12,9 +12,12 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.17 2004/05/14 20:29:30 ru Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.20 2008/12/09 00:25:57 sobomax Exp $ */ +#define RBX_MUTE 0x10 /* -m */ +#define OPT_SET(opt) (1 << (opt)) + /* * Prototype BTX loader program, written in a couple of hours. The * real thing should probably be more flexible, and in C. @@ -64,6 +67,8 @@ * BTX program loader for ELF clients. */ start: cld # String ops inc + testl $OPT_SET(RBX_MUTE), 4(%esp) # Check first argument + setnz muted # for RBX_MUTE, set flag movl $m_logo,%esi # Identify call putstr # ourselves movzwl BDA_MEM,%eax # Get base memory @@ -288,7 +293,9 @@ /* * Output character AL to the console. */ -putchr: pusha # Save +putchr: testb $1,muted # Check muted + jnz putchr.5 # do a nop + pusha # Save xorl %ecx,%ecx # Zero for loops movb $SCR_MAT,%ah # Mode/attribute movl $BDA_POS,%ebx # BDA pointer @@ -325,7 +332,7 @@ movb $SCR_ROW-1,%dh # Bottom line putchr.4: movw %dx,(%ebx) # Update position popa # Restore - ret # To caller +putchr.5: ret # To caller /* * Convert EAX, AX, or AL to hex, saving the result to [EDI]. */ @@ -390,6 +397,12 @@ .asciz " memsz=\0\n" m_done: .asciz "Loading complete\n" #endif + +/* + * Flags + */ +muted: .byte 0x0 + /* * Uninitialized data area. */ ==== //depot/projects/vimage-commit2/src/sys/boot/zfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.2 2008/11/22 14:24:55 dfr Exp $ +# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.3 2008/12/06 14:45:03 ps Exp $ LIB= zfsboot INTERNALLIB= @@ -29,7 +29,7 @@ .if ${MACHINE_ARCH} == "amd64" CLEANFILES+= machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${.CURDIR}/../../i386/include machine .endif .include ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#15 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.128 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.130 2008/12/08 13:15:31 kib Exp $"); #include #include @@ -273,8 +273,7 @@ /* XXX per-cpu vendor / class / model / id? */ } - sbuf_cat(sb, - "flags\t\t:"); + sbuf_cat(sb, "flags\t\t:"); if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) { flags[16] = "fcmov"; @@ -876,10 +875,12 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) { vm_map_t map = &p->p_vmspace->vm_map; - vm_map_entry_t entry; + vm_map_entry_t entry, tmp_entry; vm_object_t obj, tobj, lobj; - vm_offset_t saved_end; + vm_offset_t e_start, e_end; vm_ooffset_t off = 0; + vm_prot_t e_prot; + unsigned int last_timestamp; char *name = "", *freename = NULL; ino_t ino; int ref_count, shadow_count, flags; @@ -905,7 +906,9 @@ freename = NULL; if (entry->eflags & MAP_ENTRY_IS_SUB_MAP) continue; - saved_end = entry->end; + e_prot = entry->protection; + e_start = entry->start; + e_end = entry->end; obj = entry->object.vm_object; for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) { VM_OBJECT_LOCK(tobj); @@ -913,6 +916,8 @@ VM_OBJECT_UNLOCK(lobj); lobj = tobj; } + last_timestamp = map->timestamp; + vm_map_unlock_read(map); ino = 0; if (lobj) { off = IDX_TO_OFF(lobj->size); @@ -950,10 +955,10 @@ */ error = sbuf_printf(sb, "%08lx-%08lx %s%s%s%s %08lx %02x:%02x %lu%s%s\n", - (u_long)entry->start, (u_long)entry->end, - (entry->protection & VM_PROT_READ)?"r":"-", - (entry->protection & VM_PROT_WRITE)?"w":"-", - (entry->protection & VM_PROT_EXECUTE)?"x":"-", + (u_long)e_start, (u_long)e_end, + (e_prot & VM_PROT_READ)?"r":"-", + (e_prot & VM_PROT_WRITE)?"w":"-", + (e_prot & VM_PROT_EXECUTE)?"x":"-", "p", (u_long)off, 0, @@ -968,6 +973,16 @@ error = 0; break; } + vm_map_lock_read(map); + if (last_timestamp + 1 != map->timestamp) { + /* + * Look again for the entry because the map was + * modified while it was unlocked. Specifically, + * the entry may have been clipped, merged, or deleted. + */ + vm_map_lookup_entry(map, e_end - 1, &tmp_entry); + entry = tmp_entry; + } } vm_map_unlock_read(map); ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_table.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.9 2007/10/24 20:57:17 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.10 2008/12/07 21:15:43 kmacy Exp $"); #endif #include @@ -43,6 +43,8 @@ #include #include #include +#include +#include #ifdef __FreeBSD__ #include #endif ==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb.h,v 1.1 2008/10/26 19:37:38 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adb.h,v 1.2 2008/12/06 23:26:02 nwhitehorn Exp $ */ #ifndef _POWERPC_ADB_H_ @@ -68,7 +68,7 @@ uint8_t adb_get_device_handler(device_t dev); uint8_t adb_set_device_handler(device_t dev, uint8_t newhandler); -uint8_t adb_read_register(device_t dev, u_char reg, size_t *len, void *data); +size_t adb_read_register(device_t dev, u_char reg, void *data); /* Bits for implementing ADB host bus adapters */ extern devclass_t adb_devclass; ==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb_bus.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb_bus.c,v 1.3 2008/11/12 17:33:36 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adb_bus.c,v 1.4 2008/12/06 23:26:02 nwhitehorn Exp $ */ #include @@ -48,7 +48,7 @@ static void adb_probe_nomatch(device_t dev, device_t child); static int adb_print_child(device_t dev, device_t child); -static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, uint8_t reg, int len, u_char *data); +static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, uint8_t reg, int len, u_char *data, u_char *reply); static char *adb_device_string[] = { "HOST", "dongle", "keyboard", "mouse", "tablet", "modem", "RESERVED", "misc" @@ -118,9 +118,8 @@ sc->packet_reply = 0; sc->autopoll_mask = 0; + sc->sync_packet = 0xffff; - mtx_init(&sc->sc_sync_mtx,"adbsyn",NULL,MTX_DEF | MTX_RECURSE); - /* Initialize devinfo */ for (i = 0; i < 16; i++) { sc->devinfo[i].address = i; @@ -128,7 +127,7 @@ } /* Reset ADB bus */ - adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL); + adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL,NULL); DELAY(1500); /* Enumerate bus */ @@ -140,7 +139,7 @@ do { reply = adb_send_raw_packet_sync(dev,i, - ADB_COMMAND_TALK,3,0,NULL); + ADB_COMMAND_TALK,3,0,NULL,NULL); if (reply) { /* If we got a response, relocate to next_free */ @@ -150,10 +149,10 @@ r3 |= 0x00fe; adb_send_raw_packet_sync(dev,i, ADB_COMMAND_LISTEN,3, - sizeof(uint16_t),(u_char *)(&r3)); + sizeof(uint16_t),(u_char *)(&r3),NULL); adb_send_raw_packet_sync(dev,next_free, - ADB_COMMAND_TALK,3,0,NULL); + ADB_COMMAND_TALK,3,0,NULL,NULL); sc->devinfo[next_free].default_address = i; if (first_relocated < 0) @@ -169,9 +168,9 @@ adb_send_raw_packet_sync(dev,first_relocated, ADB_COMMAND_LISTEN,3, - sizeof(uint16_t),(u_char *)(&r3)); + sizeof(uint16_t),(u_char *)(&r3),NULL); adb_send_raw_packet_sync(dev,i, - ADB_COMMAND_TALK,3,0,NULL); + ADB_COMMAND_TALK,3,0,NULL,NULL); sc->devinfo[i].default_address = i; sc->devinfo[(int)(first_relocated)].default_address = 0; @@ -194,10 +193,6 @@ static int adb_bus_detach(device_t dev) { - struct adb_softc *sc = device_get_softc(dev); - - mtx_destroy(&sc->sc_sync_mtx); - return (bus_generic_detach(dev)); } @@ -230,6 +225,7 @@ if (sc->sync_packet == command) { memcpy(sc->syncreg,data,(len > 8) ? 8 : len); atomic_store_rel_int(&sc->packet_reply,len + 1); + wakeup(sc); } if (sc->children[addr] != NULL) { @@ -317,12 +313,12 @@ static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, - uint8_t reg, int len, u_char *data) + uint8_t reg, int len, u_char *data, u_char *reply) { u_char command_byte = 0; struct adb_softc *sc; int result = -1; - int i = 0; + int i = 1; sc = device_get_softc(dev); @@ -331,7 +327,8 @@ command_byte |= reg; /* Wait if someone else has a synchronous request pending */ - mtx_lock(&sc->sc_sync_mtx); + while (!atomic_cmpset_int(&sc->sync_packet, 0xffff, command_byte)) + tsleep(sc, 0, "ADB sync", hz/10); sc->packet_reply = 0; sc->sync_packet = command_byte; @@ -343,21 +340,27 @@ * Maybe the command got lost? Try resending and polling the * controller. */ - if (i > 40) + if (i % 40 == 0) ADB_HB_SEND_RAW_PACKET(sc->parent, command_byte, len, data, 1); - DELAY(100); + tsleep(sc, 0, "ADB sync", hz/10); i++; } result = sc->packet_reply - 1; + if (reply != NULL && result > 0) + memcpy(reply,sc->syncreg,result); + /* Clear packet sync */ sc->packet_reply = 0; - sc->sync_packet = 0xffff; /* We can't match a 16 bit value */ - mtx_unlock(&sc->sc_sync_mtx); + /* + * We can't match a value beyond 8 bits, so set sync_packet to + * 0xffff to avoid collisions. + */ + atomic_set_int(&sc->sync_packet, 0xffff); return (result); } @@ -375,37 +378,27 @@ newr3 = dinfo->register3 & 0xff00; newr3 |= (uint16_t)(newhandler); + adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, ADB_COMMAND_LISTEN, + 3, sizeof(uint16_t), (u_char *)(&newr3), NULL); adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, - ADB_COMMAND_LISTEN, 3, sizeof(uint16_t), (u_char *)(&newr3)); - adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, - ADB_COMMAND_TALK, 3, 0, NULL); + ADB_COMMAND_TALK, 3, 0, NULL, NULL); return (dinfo->handler_id); } -uint8_t -adb_read_register(device_t dev, u_char reg, - size_t *len, void *data) +size_t +adb_read_register(device_t dev, u_char reg, void *data) { struct adb_softc *sc; struct adb_devinfo *dinfo; - size_t orig_len; + size_t result; dinfo = device_get_ivars(dev); sc = device_get_softc(device_get_parent(dev)); - orig_len = *len; + result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, + ADB_COMMAND_TALK, reg, 0, NULL, data); - mtx_lock(&sc->sc_sync_mtx); - - *len = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, - ADB_COMMAND_TALK, reg, 0, NULL); - - if (*len > 0) - memcpy(data,sc->syncreg,*len); - - mtx_unlock(&sc->sc_sync_mtx); - - return ((*len > 0) ? 0 : -1); + return (result); } ==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb_kbd.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb_kbd.c,v 1.1 2008/10/26 19:37:38 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adb_kbd.c,v 1.2 2008/12/06 23:26:02 nwhitehorn Exp $ */ #include @@ -271,12 +271,13 @@ } #endif + /* Check if we can read out the LED state from + this keyboard by reading the key state register */ + if (adb_read_register(dev, 2, NULL) == 2) + sc->have_led_control = 1; + adb_set_autopoll(dev,1); - /* Check (asynchronously) if we can read out the LED state from - this keyboard by reading the key state register */ - adb_send_packet(dev,ADB_COMMAND_TALK,2,0,NULL); - return (0); } @@ -323,11 +324,6 @@ if (command != ADB_COMMAND_TALK) return 0; - if (reg == 2 && len == 2) { - sc->have_led_control = 1; - return 0; - } - if (reg != 0 || len != 2) return (0); ==== //depot/projects/vimage-commit2/src/sys/dev/adb/adb_mouse.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb_mouse.c,v 1.3 2008/11/02 19:08:10 ed Exp $ + * $FreeBSD: src/sys/dev/adb/adb_mouse.c,v 1.4 2008/12/06 23:26:02 nwhitehorn Exp $ */ #include @@ -181,7 +181,7 @@ sc->mode.resolution = 200; break; case 4: - adb_read_register(dev,1,&r1_len,r1); + r1_len = adb_read_register(dev,1,r1); if (r1_len < 8) break; ==== //depot/projects/vimage-commit2/src/sys/dev/adb/adbvar.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adbvar.h,v 1.2 2008/10/30 15:27:13 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adbvar.h,v 1.3 2008/12/06 23:26:02 nwhitehorn Exp $ */ #ifndef _POWERPC_ADBVAR_H_ @@ -40,7 +40,6 @@ device_t parent; struct intr_config_hook enum_hook; - struct mtx sc_sync_mtx; volatile int sync_packet; volatile int packet_reply; ==== //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.1 2008/10/03 10:31:31 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.2 2008/12/06 14:23:45 stas Exp $"); #include #include @@ -1105,12 +1105,9 @@ static int ae_alloc_rings(ae_softc_t *sc) { - bus_dma_tag_t bustag; bus_addr_t busaddr; int error; - bustag = bus_get_dma_tag(sc->dev); - /* * Create parent DMA tag. */ @@ -1903,8 +1900,8 @@ if_printf(ifp, "Rx interrupt occuried.\n"); #endif size = le16toh(rxd->len) - ETHER_CRC_LEN; - if (size < 0) { - if_printf(ifp, "Negative length packet received."); + if (size < (ETHER_MIN_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)) { + if_printf(ifp, "Runt frame received."); return (EIO); } ==== //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.221 2008/12/01 16:53:01 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.223 2008/12/07 19:29:11 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -219,9 +219,15 @@ SYSCTL_DECL(_hw_ath); /* XXX validate sysctl values */ -static int ath_calinterval = 30; /* calibrate every 30 secs */ -SYSCTL_INT(_hw_ath, OID_AUTO, calibrate, CTLFLAG_RW, &ath_calinterval, - 0, "chip calibration interval (secs)"); +static int ath_longcalinterval = 30; /* long cals every 30 secs */ +SYSCTL_INT(_hw_ath, OID_AUTO, longcal, CTLFLAG_RW, &ath_longcalinterval, + 0, "long chip calibration interval (secs)"); +static int ath_shortcalinterval = 100; /* short cals every 100 ms */ +SYSCTL_INT(_hw_ath, OID_AUTO, shortcal, CTLFLAG_RW, &ath_shortcalinterval, + 0, "short chip calibration interval (msecs)"); +static int ath_resetcalinterval = 20*60; /* reset cal state 20 mins */ +SYSCTL_INT(_hw_ath, OID_AUTO, resetcal, CTLFLAG_RW, &ath_resetcalinterval, + 0, "reset chip calibration results (secs)"); static int ath_rxbuf = ATH_RXBUF; /* # rx buffers to allocate */ SYSCTL_INT(_hw_ath, OID_AUTO, rxbuf, CTLFLAG_RW, &ath_rxbuf, @@ -1433,8 +1439,9 @@ * state cached in the driver. */ sc->sc_diversity = ath_hal_getdiversity(ah); - sc->sc_calinterval = 1; - sc->sc_caltries = 0; + sc->sc_lastlongcal = 0; + sc->sc_resetcal = 1; + sc->sc_lastcalreset = 0; /* * Setup the hardware after reset: the key cache @@ -1566,8 +1573,6 @@ if_printf(ifp, "%s: unable to reset hardware; hal status %u\n", __func__, status); sc->sc_diversity = ath_hal_getdiversity(ah); - sc->sc_calinterval = 1; - sc->sc_caltries = 0; if (ath_startrecv(sc) != 0) /* restart recv */ if_printf(ifp, "%s: unable to start recv logic\n", __func__); /* @@ -5493,8 +5498,6 @@ } sc->sc_curchan = hchan; sc->sc_diversity = ath_hal_getdiversity(ah); - sc->sc_calinterval = 1; - sc->sc_caltries = 0; /* * Re-enable rx framework. @@ -5528,54 +5531,76 @@ { struct ath_softc *sc = arg; struct ath_hal *ah = sc->sc_ah; - HAL_BOOL iqCalDone; + struct ifnet *ifp = sc->sc_ifp; + HAL_BOOL longCal, isCalDone; + int nextcal; - sc->sc_stats.ast_per_cal++; - - if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) { + longCal = (ticks - sc->sc_lastlongcal >= ath_longcalinterval*hz); + if (longCal) { + sc->sc_stats.ast_per_cal++; + if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) { + /* + * Rfgain is out of bounds, reset the chip + * to load new gain values. + */ + DPRINTF(sc, ATH_DEBUG_CALIBRATE, + "%s: rfgain change\n", __func__); + sc->sc_stats.ast_per_rfgain++; + ath_reset(ifp); + } /* - * Rfgain is out of bounds, reset the chip - * to load new gain values. + * If this long cal is after an idle period, then + * reset the data collection state so we start fresh. */ - DPRINTF(sc, ATH_DEBUG_CALIBRATE, - "%s: rfgain change\n", __func__); - sc->sc_stats.ast_per_rfgain++; - ath_reset(sc->sc_ifp); + if (sc->sc_resetcal) { + (void) ath_hal_calreset(ah, &sc->sc_curchan); + sc->sc_lastcalreset = ticks; + sc->sc_resetcal = 0; + } } - if (!ath_hal_calibrate(ah, &sc->sc_curchan, &iqCalDone)) { + if (ath_hal_calibrateN(ah, &sc->sc_curchan, longCal, &isCalDone)) { + if (longCal) { + /* + * Calibrate noise floor data again in case of change. + */ + ath_hal_process_noisefloor(ah); + } + } else { DPRINTF(sc, ATH_DEBUG_ANY, "%s: calibration of channel %u failed\n", __func__, sc->sc_curchan.channel); sc->sc_stats.ast_per_calfail++; } - /* - * Calibrate noise floor data again in case of change. - */ - ath_hal_process_noisefloor(ah); - /* - * Poll more frequently when the IQ calibration is in - * progress to speedup loading the final settings. - * We temper this aggressive polling with an exponential - * back off after 4 tries up to ath_calinterval. - */ - if (iqCalDone || sc->sc_calinterval >= ath_calinterval) { - sc->sc_caltries = 0; - sc->sc_calinterval = ath_calinterval; - } else if (sc->sc_caltries > 4) { - sc->sc_caltries = 0; - sc->sc_calinterval <<= 1; - if (sc->sc_calinterval > ath_calinterval) - sc->sc_calinterval = ath_calinterval; + if (!isCalDone) { + /* + * Use a shorter interval to potentially collect multiple + * data samples required to complete calibration. Once + * we're told the work is done we drop back to a longer + * interval between requests. We're more aggressive doing + * work when operating as an AP to improve operation right + * after startup. + */ + nextcal = (1000*ath_shortcalinterval)/hz; + if (sc->sc_opmode != HAL_M_HOSTAP) + nextcal *= 10; + } else { + nextcal = ath_longcalinterval*hz; + sc->sc_lastlongcal = ticks; + if (sc->sc_lastcalreset == 0) + sc->sc_lastcalreset = sc->sc_lastlongcal; + else if (ticks - sc->sc_lastcalreset >= ath_resetcalinterval*hz) + sc->sc_resetcal = 1; /* setup reset next trip */ } - KASSERT(0 < sc->sc_calinterval && sc->sc_calinterval <= ath_calinterval, - ("bad calibration interval %u", sc->sc_calinterval)); - DPRINTF(sc, ATH_DEBUG_CALIBRATE, - "%s: next +%u (%siqCalDone tries %u)\n", __func__, - sc->sc_calinterval, iqCalDone ? "" : "!", sc->sc_caltries); - sc->sc_caltries++; - callout_reset(&sc->sc_cal_ch, sc->sc_calinterval * hz, - ath_calibrate, sc); + if (nextcal != 0) { + DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: next +%u (%sisCalDone)\n", + __func__, nextcal, isCalDone ? "" : "!"); + callout_reset(&sc->sc_cal_ch, nextcal, ath_calibrate, sc); + } else { + DPRINTF(sc, ATH_DEBUG_CALIBRATE, "%s: calibration disabled\n", + __func__); + /* NB: don't rearm timer */ + } } static void @@ -5803,10 +5828,12 @@ * Finally, start any timers and the task q thread * (in case we didn't go through SCAN state). */ - if (sc->sc_calinterval != 0) { + if (ath_longcalinterval != 0) { /* start periodic recalibration timer */ - callout_reset(&sc->sc_cal_ch, sc->sc_calinterval * hz, - ath_calibrate, sc); + callout_reset(&sc->sc_cal_ch, 1, ath_calibrate, sc); + } else { + DPRINTF(sc, ATH_DEBUG_CALIBRATE, + "%s: calibration disabled\n", __func__); } taskqueue_unblock(sc->sc_tq); } else if (nstate == IEEE80211_S_INIT) { @@ -6885,7 +6912,7 @@ struct ieee80211com *ic = ifp->if_l2com; struct ath_hal *ah = sc->sc_ah; int error, ismcast, ismrr; - int hdrlen, pktlen, try0, txantenna; + int keyix, hdrlen, pktlen, try0, txantenna; u_int8_t rix, cix, txrate, ctsrate, rate1, rate2, rate3; struct ieee80211_frame *wh; u_int flags, ctsduration; @@ -6904,6 +6931,54 @@ /* XXX honor IEEE80211_BPF_DATAPAD */ pktlen = m0->m_pkthdr.len - (hdrlen & 3) + IEEE80211_CRC_LEN; + if (params->ibp_flags & IEEE80211_BPF_CRYPTO) { + const struct ieee80211_cipher *cip; + struct ieee80211_key *k; + + /* + * Construct the 802.11 header+trailer for an encrypted >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 9 04:52:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0436C1065676; Tue, 9 Dec 2008 04:52:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC58C1065672 for ; Tue, 9 Dec 2008 04:52:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AAC628FC08 for ; Tue, 9 Dec 2008 04:52:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB94qb9k066781 for ; Tue, 9 Dec 2008 04:52:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB94qbdB066779 for perforce@freebsd.org; Tue, 9 Dec 2008 04:52:37 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2008 04:52:37 GMT Message-Id: <200812090452.mB94qbdB066779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 04:52:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=154383 Change 154383 by sam@sam_ebb on 2008/12/09 04:51:47 one possible solution to the ath_rate/sample symbol dependency problem; bundle rate control code into the driver Affected files ... .. //depot/projects/vap/sys/modules/ath/Makefile#9 edit Differences ... ==== //depot/projects/vap/sys/modules/ath/Makefile#9 (text+ko) ==== @@ -29,44 +29,80 @@ # $FreeBSD: src/sys/modules/ath/Makefile,v 1.7 2008/12/02 21:37:28 bz Exp $ # -.PATH: ${.CURDIR}/../../dev/ath \ - ${.CURDIR}/../../dev/ath/ath_hal \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5210 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5211 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5212 \ - ${.CURDIR}/../../dev/ath/ath_hal/ar5416 +ATH_RATE= sample # tx rate control algorithm + +.PATH: ${.CURDIR}/../../dev/ath +.PATH: ${.CURDIR}/../../dev/ath/ath_hal + +KMOD= if_ath +SRCS= if_ath.c if_ath_pci.c +# NB: v3 eeprom support used by both AR5211 and AR5212; just include it +SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c +SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h -AR5210_SRCS=ah_eeprom_v1.c \ +# +# AR5210 support; these are first generation 11a-only devices. +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5210 +SRCS+= ah_eeprom_v1.c \ ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \ ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \ ar5210_recv.c ar5210_reset.c ar5210_xmit.c -AR5211_SRCS=ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ + +# +# AR5211 support; these are second generation 11b/g/a devices +# (but 11g was OFDM only and is not supported). +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5211 +SRCS+= ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \ ar5211_recv.c ar5211_reset.c ar5211_xmit.c -AR5212_SRCS=ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ + +# +# AR5212 support; this covers all other pci/cardbus legacy parts. +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5212 +SRCS+= ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \ ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \ - ar5212_rfgain.c ar5212_xmit.c \ - ar2413.c ar2425.c ar5111.c ar5112.c ar5413.c -AR5416_SRCS=ah_eeprom_v14.c \ + ar5212_rfgain.c ar5212_xmit.c +# RF backends +SRCS+= ar5111.c +SRCS+= ar5112.c +SRCS+= ar2413.c +SRCS+= ar2425.c +SRCS+= ar5413.c + +# +# AR5416, AR9160 support; these are 11n parts but only really +# supported (right now) operating in legacy mode. Note enabling +# this support requires defining AH_SUPPORT_AR5416 in opt_ah.h +# so the 11n tx/rx descriptor format is handled. +# +# NB: 9160 depends on 5416 but 5416 does not require 9160 +# +.PATH: ${.CURDIR}/../../dev/ath/ath_hal/ar5416 +SRCS+= ah_eeprom_v14.c \ ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \ ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \ ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \ ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \ - ar5416_reset.c ar5416_xmit.c \ - ar2133.c -AR9160_SRCS=ar9160_attach.c + ar5416_reset.c ar5416_xmit.c +SRCS+= ar9160_attach.c +# RF backend for 5416 and 9160 +SRCS+= ar2133.c -KMOD= if_ath -SRCS= if_ath.c if_ath_pci.c -# NB: v3 eeprom support used by both AR5211 and AR5212; just include it -SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c -SRCS+= ${AR5210_SRCS} -SRCS+= ${AR5211_SRCS} -SRCS+= ${AR5212_SRCS} -SRCS+= ${AR5416_SRCS} -SRCS+= ${AR9160_SRCS} -SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h +# NB: rate control is bound to the driver by symbol names so only pick one +.if ${ATH_RATE} == "sample" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/sample +SRCS+= sample.c opt_wlan.h +.elif ${ATH_RATE} == "onoe" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/onoe +SRCS+= onoe.c +.elif ${ATH_RATE} == "amrr" +.PATH: ${.CURDIR}/../../dev/ath/ath_rate/amrr +SRCS+= amrr.c +.endif CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal From owner-p4-projects@FreeBSD.ORG Tue Dec 9 04:54:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34AC61065677; Tue, 9 Dec 2008 04:54:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECFCC1065672 for ; Tue, 9 Dec 2008 04:54:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DC10A8FC0C for ; Tue, 9 Dec 2008 04:54:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB94sdti071437 for ; Tue, 9 Dec 2008 04:54:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB94sdcq071435 for perforce@freebsd.org; Tue, 9 Dec 2008 04:54:39 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2008 04:54:39 GMT Message-Id: <200812090454.mB94sdcq071435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 04:54:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=154384 Change 154384 by sam@sam_ebb on 2008/12/09 04:54:31 remove separate ath rate control modules; it's now bundled into ath Affected files ... .. //depot/projects/vap/sys/modules/Makefile#48 edit .. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#13 delete .. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#13 delete .. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#14 delete Differences ... ==== //depot/projects/vap/sys/modules/Makefile#48 (text+ko) ==== @@ -30,9 +30,6 @@ ${_asr} \ ata \ ath \ - ath_rate_amrr \ - ath_rate_onoe \ - ath_rate_sample \ aue \ ${_auxio} \ axe \ From owner-p4-projects@FreeBSD.ORG Tue Dec 9 06:22:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D3681065679; Tue, 9 Dec 2008 06:22:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3F04106564A for ; Tue, 9 Dec 2008 06:22:08 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2C148FC12 for ; Tue, 9 Dec 2008 06:22:08 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB96M8Pl093441 for ; Tue, 9 Dec 2008 06:22:08 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB96M8wQ093439 for perforce@freebsd.org; Tue, 9 Dec 2008 06:22:08 GMT (envelope-from qingli@freebsd.org) Date: Tue, 9 Dec 2008 06:22:08 GMT Message-Id: <200812090622.mB96M8wQ093439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 154385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 06:22:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=154385 Change 154385 by qingli@FreeBSD-newarp on 2008/12/09 06:21:32 fixed loopback issue unit test: ping 127.0.0.1 telnet 127.0.0.1 telnet -6 fe80::20f:1fff:fexx:xxxx%bge0 Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#6 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#6 (text+ko) ==== @@ -287,8 +287,16 @@ senderr(EAFNOSUPPORT); } - if (lle && (lle->la_flags & LLE_IFADDR) && useloopback) + if (lle && (lle->la_flags & LLE_IFADDR) && useloopback) { + int csum_flags = 0; + if (m->m_pkthdr.csum_flags & CSUM_IP) + csum_flags |= (CSUM_IP_CHECKED|CSUM_IP_VALID); + if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) + csum_flags |= (CSUM_DATA_VALID|CSUM_PSEUDO_HDR); + m->m_pkthdr.csum_flags |= csum_flags; + m->m_pkthdr.csum_data = 0xffff; return (if_simloop(ifp, m, dst->sa_family, 0)); + } /* * Add local net header. If no space in first mbuf, From owner-p4-projects@FreeBSD.ORG Tue Dec 9 06:58:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49D691065675; Tue, 9 Dec 2008 06:58:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C0151065672 for ; Tue, 9 Dec 2008 06:58:48 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EC6FD8FC13 for ; Tue, 9 Dec 2008 06:58:47 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB96wlht096237 for ; Tue, 9 Dec 2008 06:58:47 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB96wjn8096235 for perforce@freebsd.org; Tue, 9 Dec 2008 06:58:45 GMT (envelope-from qingli@freebsd.org) Date: Tue, 9 Dec 2008 06:58:45 GMT Message-Id: <200812090658.mB96wjn8096235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 154386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 06:58:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=154386 Change 154386 by qingli@FreeBSD-newarp on 2008/12/09 06:57:54 IFC (changelist 154382) - getting ready for the locking revision Affected files ... .. //depot/projects/arp-v2/src/COPYRIGHT#3 integrate .. //depot/projects/arp-v2/src/Makefile#6 integrate .. //depot/projects/arp-v2/src/ObsoleteFiles.inc#6 integrate .. //depot/projects/arp-v2/src/UPDATING#6 integrate .. //depot/projects/arp-v2/src/bin/df/df.1#2 integrate .. //depot/projects/arp-v2/src/bin/df/df.c#2 integrate .. //depot/projects/arp-v2/src/bin/sh/eval.c#3 integrate .. //depot/projects/arp-v2/src/bin/sh/exec.c#2 integrate .. //depot/projects/arp-v2/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/CREDITS#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/HISTORY#2 delete .. //depot/projects/arp-v2/src/contrib/openbsm/INSTALL#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/NEWS#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/README#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/TODO#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/VERSION#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/configure#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/arp-v2/src/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/arp-v2/src/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/arp-v2/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/arp-v2/src/etc/newsyslog.conf#3 integrate .. //depot/projects/arp-v2/src/etc/syslog.conf#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/arp-v2/src/gnu/usr.bin/sort/config.h#3 integrate .. //depot/projects/arp-v2/src/include/Makefile#5 integrate .. //depot/projects/arp-v2/src/include/string.h#3 integrate .. //depot/projects/arp-v2/src/kerberos5/include/config.h#3 integrate .. //depot/projects/arp-v2/src/lib/Makefile#6 integrate .. //depot/projects/arp-v2/src/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive.h#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_endian.h#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_entry.h#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_private.h#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_gzip.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_mtree.c#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/main.c#6 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_format_gtar_sparse.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_read_pax_truncated.c#4 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_disk_perms.c#5 integrate .. //depot/projects/arp-v2/src/lib/libarchive/test/test_write_format_cpio.c#4 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/Symbol.map#6 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/gen/times.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/arp-v2/src/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/arp-v2/src/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/arp-v2/src/lib/libc/string/Symbol.map#4 integrate .. //depot/projects/arp-v2/src/lib/libc/string/strdup.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/string/strndup.c#1 branch .. //depot/projects/arp-v2/src/lib/libc/string/strsep.3#2 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/cpuset_getaffinity.2#4 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/jail.2#3 integrate .. //depot/projects/arp-v2/src/lib/libc/sys/recv.2#2 integrate .. //depot/projects/arp-v2/src/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/arp-v2/src/lib/libmagic/config.h#3 integrate .. //depot/projects/arp-v2/src/lib/libmd/Makefile#2 integrate .. //depot/projects/arp-v2/src/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/arp-v2/src/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/arp-v2/src/lib/libpmc/pmc.3#4 integrate .. //depot/projects/arp-v2/src/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/arp-v2/src/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/arp-v2/src/lib/libpmc/pmc.core2.3#2 integrate .. //depot/projects/arp-v2/src/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/arp-v2/src/lib/libstand/bootp.c#2 integrate .. //depot/projects/arp-v2/src/lib/libstand/nfs.c#3 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/arp-v2/src/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20.3#2 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20.h#2 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20_compat01.c#2 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20_compat01.h#2 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20_desc.h#2 integrate .. //depot/projects/arp-v2/src/lib/libusb20/libusb20_ugen20.c#2 integrate .. //depot/projects/arp-v2/src/lib/libutil/Makefile#5 integrate .. //depot/projects/arp-v2/src/lib/libutil/gr_util.c#3 integrate .. //depot/projects/arp-v2/src/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/arp-v2/src/lib/libutil/kinfo_getfile.c#1 branch .. //depot/projects/arp-v2/src/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/arp-v2/src/lib/libutil/kinfo_getvmmap.c#1 branch .. //depot/projects/arp-v2/src/lib/libutil/libutil.h#4 integrate .. //depot/projects/arp-v2/src/lib/libutil/realhostname.c#3 integrate .. //depot/projects/arp-v2/src/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/arp-v2/src/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/arp-v2/src/libexec/rtld-elf/rtld_lock.c#4 integrate .. //depot/projects/arp-v2/src/libexec/rtld-elf/rtld_lock.h#3 integrate .. //depot/projects/arp-v2/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/arp-v2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/part/geom_part.c#6 integrate .. //depot/projects/arp-v2/src/sbin/geom/class/part/gpart.8#4 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/config.c#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/login.c#2 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/misc.c#3 integrate .. //depot/projects/arp-v2/src/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/arp-v2/src/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/arp-v2/src/sbin/newfs/Makefile#2 integrate .. //depot/projects/arp-v2/src/sbin/newfs/mkfs.c#4 integrate .. //depot/projects/arp-v2/src/sbin/newfs/newfs.8#4 integrate .. //depot/projects/arp-v2/src/sbin/newfs/newfs.c#3 integrate .. //depot/projects/arp-v2/src/sbin/newfs/newfs.h#3 integrate .. //depot/projects/arp-v2/src/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/arp-v2/src/sbin/newfs_msdos/newfs_msdos.c#2 integrate .. //depot/projects/arp-v2/src/secure/usr.sbin/sshd/Makefile#5 integrate .. //depot/projects/arp-v2/src/share/man/man4/Makefile#8 integrate .. //depot/projects/arp-v2/src/share/man/man4/ale.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/bce.4#3 integrate .. //depot/projects/arp-v2/src/share/man/man4/ddb.4#8 integrate .. //depot/projects/arp-v2/src/share/man/man4/man4.arm/Makefile#2 integrate .. //depot/projects/arp-v2/src/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/arp-v2/src/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/arp-v2/src/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/arp-v2/src/share/man/man4/upgt.4#2 integrate .. //depot/projects/arp-v2/src/share/man/man5/fstab.5#3 integrate .. //depot/projects/arp-v2/src/share/man/man7/hier.7#3 integrate .. //depot/projects/arp-v2/src/share/man/man7/ports.7#4 integrate .. //depot/projects/arp-v2/src/share/man/man9/Makefile#5 integrate .. //depot/projects/arp-v2/src/share/man/man9/ktr.9#2 integrate .. //depot/projects/arp-v2/src/share/man/man9/style.9#6 integrate .. //depot/projects/arp-v2/src/share/man/man9/vfs_mountedon.9#2 delete .. //depot/projects/arp-v2/src/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/arp-v2/src/share/misc/bsd-family-tree#7 integrate .. //depot/projects/arp-v2/src/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/arp-v2/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/arp-v2/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/arp-v2/src/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/arp-v2/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91.c#5 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91board.h#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/arp-v2/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/kb920x_machdep.c#5 delete .. //depot/projects/arp-v2/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/std.bwct#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/std.hl200#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/arp-v2/src/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/AVILA#6 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/BWCT#5 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/CRB#5 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/HL200#5 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/KB920X#6 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/NSLU#3 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/arp-v2/src/sys/arm/conf/SKYEYE#5 integrate .. //depot/projects/arp-v2/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/files.mv#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/arp-v2/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/obio.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/arp-v2/src/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/arp-v2/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/arp-v2/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/arp-v2/src/sys/boot/common/interp.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/common/loader.8#2 integrate .. //depot/projects/arp-v2/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/arp-v2/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/arp-v2/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/arp-v2/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/arp-v2/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/arp-v2/src/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/arp-v2/src/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/arp-v2/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/arp-v2/src/sys/bsm/audit.h#3 integrate .. //depot/projects/arp-v2/src/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/arp-v2/src/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/arp-v2/src/sys/bsm/audit_record.h#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/arp-v2/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/arp-v2/src/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/arp-v2/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/arp-v2/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/arp-v2/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/arp-v2/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/arp-v2/src/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/arp-v2/src/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/arp-v2/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/arp-v2/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/arp-v2/src/sys/conf/files#10 integrate .. //depot/projects/arp-v2/src/sys/conf/files.amd64#7 integrate .. //depot/projects/arp-v2/src/sys/conf/files.arm#3 integrate .. //depot/projects/arp-v2/src/sys/conf/files.i386#8 integrate .. //depot/projects/arp-v2/src/sys/conf/files.mips#3 integrate .. //depot/projects/arp-v2/src/sys/conf/files.pc98#6 integrate .. //depot/projects/arp-v2/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/arp-v2/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/arp-v2/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/arp-v2/src/sys/conf/options#9 integrate .. //depot/projects/arp-v2/src/sys/conf/options.arm#4 integrate .. //depot/projects/arp-v2/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/README#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/dev/ath/version.h#3 delete .. //depot/projects/arp-v2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/arp-v2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_ioctl.c#6 integrate .. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/arp-v2/src/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/arp-v2/src/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/asmc/asmc.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/ah_osdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/ah_osdep.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/arp-v2/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/coretemp/coretemp.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_config.h#5 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate .. //depot/projects/arp-v2/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsi.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_82598.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_api.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_api.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_common.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_common.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_phy.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_phy.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/ixgbe/ixgbe_type.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/jme/if_jmevar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/k8temp/k8temp.c#6 integrate .. //depot/projects/arp-v2/src/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/arp-v2/src/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/arp-v2/src/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/arp-v2/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/arp-v2/src/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/if_upgt.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/if_zyd.c#7 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/if_zydreg.h#4 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/controller/ehci2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/controller/uss820dci_pccard.c#2 delete .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_busdma.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_core.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_device.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_generic.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_hub.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_request.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/core/usbdevs#2 delete .. //depot/projects/arp-v2/src/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/include/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/include/urio2_ioctl.h#2 delete .. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/arp-v2/src/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/arp-v2/src/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/arp-v2/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/arp-v2/src/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/arp-v2/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/arp-v2/src/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/arp-v2/src/sys/fs/unionfs/union.h#3 integrate .. //depot/projects/arp-v2/src/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/arp-v2/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/arp-v2/src/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/arp-v2/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/arp-v2/src/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/geom_subr.c#5 integrate .. //depot/projects/arp-v2/src/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/arp-v2/src/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_bsd.c#8 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_gpt.c#7 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_mbr.c#6 integrate .. //depot/projects/arp-v2/src/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/arp-v2/src/sys/geom/vinum/geom_vinum_rm.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/arp-v2/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/arp-v2/src/sys/i386/conf/PAE#4 integrate .. //depot/projects/arp-v2/src/sys/i386/conf/XEN#3 integrate .. //depot/projects/arp-v2/src/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/arp-v2/src/sys/i386/cpufreq/p4tcc.c#4 integrate .. //depot/projects/arp-v2/src/sys/i386/cpufreq/powernow.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/arp-v2/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/arp-v2/src/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/arp-v2/src/sys/i386/include/atomic.h#3 integrate .. //depot/projects/arp-v2/src/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/arp-v2/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/arp-v2/src/sys/i386/include/pmc_mdep.h#3 integrate .. //depot/projects/arp-v2/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/arp-v2/src/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/arp-v2/src/sys/i386/include/xen/xenbus.h#2 delete .. //depot/projects/arp-v2/src/sys/i386/linux/linux.h#5 integrate .. //depot/projects/arp-v2/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/arp-v2/src/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/arp-v2/src/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/arp-v2/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/arp-v2/src/sys/ia64/include/atomic.h#4 integrate .. //depot/projects/arp-v2/src/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/arp-v2/src/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_cpuset.c#4 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_fork.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_jail.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_linker.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_lockf.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_poll.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_proc.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_bufring.c#1 branch .. //depot/projects/arp-v2/src/sys/kern/subr_param.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/arp-v2/src/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/uipc_shm.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_export.c#5 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/arp-v2/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/arp-v2/src/sys/libkern/iconv.c#2 integrate .. //depot/projects/arp-v2/src/sys/mips/conf/IDT#4 integrate .. //depot/projects/arp-v2/src/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/arp-v2/src/sys/mips/include/atomic.h#2 integrate .. //depot/projects/arp-v2/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/arp-v2/src/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/arp-v2/src/sys/modules/Makefile#8 integrate .. //depot/projects/arp-v2/src/sys/modules/ae/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/ath/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/ath_hal/Makefile#2 delete .. //depot/projects/arp-v2/src/sys/modules/ath_rate_amrr/Makefile#5 integrate .. //depot/projects/arp-v2/src/sys/modules/ath_rate_onoe/Makefile#5 integrate .. //depot/projects/arp-v2/src/sys/modules/ath_rate_sample/Makefile#5 integrate .. //depot/projects/arp-v2/src/sys/modules/bridgestp/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/cxgb/iw_cxgb/Makefile#4 integrate .. //depot/projects/arp-v2/src/sys/modules/hwpmc/Makefile#4 integrate .. //depot/projects/arp-v2/src/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/modules/netgraph/atm/atm/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/netgraph/ether/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/modules/pf/Makefile#3 integrate .. //depot/projects/arp-v2/src/sys/modules/powermac_nvram/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/arp-v2/src/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/arp-v2/src/sys/net/bpf.c#9 integrate .. //depot/projects/arp-v2/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/arp-v2/src/sys/net/if.c#9 integrate .. //depot/projects/arp-v2/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/arp-v2/src/sys/net/if_ef.c#4 integrate .. //depot/projects/arp-v2/src/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/arp-v2/src/sys/net/if_faith.c#3 integrate .. //depot/projects/arp-v2/src/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/arp-v2/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/arp-v2/src/sys/net/if_gif.c#5 integrate .. //depot/projects/arp-v2/src/sys/net/if_gre.c#6 integrate .. //depot/projects/arp-v2/src/sys/net/if_lagg.c#6 integrate .. //depot/projects/arp-v2/src/sys/net/if_loop.c#6 integrate .. //depot/projects/arp-v2/src/sys/net/if_mib.c#3 integrate .. //depot/projects/arp-v2/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/arp-v2/src/sys/net/if_stf.c#4 integrate .. //depot/projects/arp-v2/src/sys/net/if_tun.c#4 integrate .. //depot/projects/arp-v2/src/sys/net/if_var.h#9 integrate .. //depot/projects/arp-v2/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/arp-v2/src/sys/net/radix.c#3 integrate .. //depot/projects/arp-v2/src/sys/net/radix.h#3 integrate .. //depot/projects/arp-v2/src/sys/net/raw_cb.c#5 integrate .. //depot/projects/arp-v2/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/arp-v2/src/sys/net/route.c#12 integrate .. //depot/projects/arp-v2/src/sys/net/route.h#6 integrate .. //depot/projects/arp-v2/src/sys/net/rtsock.c#9 integrate .. //depot/projects/arp-v2/src/sys/net/vnet.h#2 integrate .. //depot/projects/arp-v2/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/arp-v2/src/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/arp-v2/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/arp-v2/src/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/arp-v2/src/sys/net80211/ieee80211_wds.c#4 integrate .. //depot/projects/arp-v2/src/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/arp-v2/src/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_l2tp.c#6 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/arp-v2/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#21 integrate .. //depot/projects/arp-v2/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/in.c#8 integrate .. //depot/projects/arp-v2/src/sys/netinet/in.h#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_proto.c#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/in_var.h#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip6.h#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_id.c#3 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_options.c#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_output.c#8 integrate .. //depot/projects/arp-v2/src/sys/netinet/ip_var.h#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/arp-v2/src/sys/netinet/sctp_auth.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 9 08:22:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D891065677; Tue, 9 Dec 2008 08:22:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7963A1065670 for ; Tue, 9 Dec 2008 08:22:12 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 689BF8FC0C for ; Tue, 9 Dec 2008 08:22:12 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB98MCEt004828 for ; Tue, 9 Dec 2008 08:22:12 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB98MCr2004826 for perforce@freebsd.org; Tue, 9 Dec 2008 08:22:12 GMT (envelope-from zec@icir.org) Date: Tue, 9 Dec 2008 08:22:12 GMT Message-Id: <200812090822.mB98MCr2004826@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 08:22:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=154387 Change 154387 by zec@zec_tca51 on 2008/12/09 08:21:36 Unbreak LINT build. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#17 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#8 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#17 (text+ko) ==== @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Dec 9 08:50:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F17671065687; Tue, 9 Dec 2008 08:50:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B4995106567D for ; Tue, 9 Dec 2008 08:50:41 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 589938FC0C for ; Tue, 9 Dec 2008 08:50:41 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB98ofCY016557 for ; Tue, 9 Dec 2008 08:50:41 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB98ofKU016555 for perforce@freebsd.org; Tue, 9 Dec 2008 08:50:41 GMT (envelope-from qingli@freebsd.org) Date: Tue, 9 Dec 2008 08:50:41 GMT Message-Id: <200812090850.mB98ofKU016555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 154388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 08:50:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=154388 Change 154388 by qingli@FreeBSD-newarp on 2008/12/09 08:49:42 remove unused variables and fix broken build Affected files ... .. //depot/projects/arp-v2/src/sys/netinet6/nd6.c#12 edit .. //depot/projects/arp-v2/src/sys/netinet6/vinet6.h#3 edit Differences ... ==== //depot/projects/arp-v2/src/sys/netinet6/nd6.c#12 (text+ko) ==== @@ -99,11 +99,6 @@ int nd6_debug; -/* for debugging? */ -/* -static int nd6_inuse, nd6_allocated; -struct llinfo_nd6 llinfo_nd6; - struct nd_drhead nd_defrouter; struct nd_prhead nd_prefix; @@ -165,8 +160,6 @@ V_dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ V_dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */ - V_llinfo_nd6.ln_next = &V_llinfo_nd6; - V_llinfo_nd6.ln_prev = &V_llinfo_nd6; LIST_INIT(&V_nd_prefix); ip6_use_tempaddr = 0; ==== //depot/projects/arp-v2/src/sys/netinet6/vinet6.h#3 (text+ko) ==== @@ -77,7 +77,6 @@ int _nd6_inuse; int _nd6_allocated; - struct llinfo_nd6 _llinfo_nd6; struct nd_drhead _nd_defrouter; struct nd_prhead _nd_prefix; struct ifnet * _nd6_defifp; From owner-p4-projects@FreeBSD.ORG Tue Dec 9 09:21:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B873D1065673; Tue, 9 Dec 2008 09:21:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CA011065672 for ; Tue, 9 Dec 2008 09:21:12 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52EFD8FC1B for ; Tue, 9 Dec 2008 09:21:12 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB99LCYO019729 for ; Tue, 9 Dec 2008 09:21:12 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB99LCce019727 for perforce@freebsd.org; Tue, 9 Dec 2008 09:21:12 GMT (envelope-from zec@icir.org) Date: Tue, 9 Dec 2008 09:21:12 GMT Message-Id: <200812090921.mB99LCce019727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 09:21:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=154389 Change 154389 by zec@zec_tca51 on 2008/12/09 09:21:06 Trim out redundant #includes Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#10 (text+ko) ==== @@ -37,9 +37,7 @@ #include #include -#include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Tue Dec 9 11:56:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E21071065670; Tue, 9 Dec 2008 11:56:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A60E81065675 for ; Tue, 9 Dec 2008 11:56:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9514F8FC17 for ; Tue, 9 Dec 2008 11:56:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9Buov7034513 for ; Tue, 9 Dec 2008 11:56:50 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9Buoht034511 for perforce@freebsd.org; Tue, 9 Dec 2008 11:56:50 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 9 Dec 2008 11:56:50 GMT Message-Id: <200812091156.mB9Buoht034511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 11:56:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=154394 Change 154394 by ed@ed_dull on 2008/12/09 11:55:51 Don't use FG_BLINK and FG_UNDERLINE unconditionally. Allow platforms to omit the definitions. Affected files ... .. //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#17 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/syscons/scterm-teken.c#17 (text+ko) ==== @@ -235,10 +235,14 @@ attr |= fgcolors_normal[a->ta_fgcolor]; attr |= bgcolors[a->ta_bgcolor]; +#ifdef FG_UNDERLINE if (a->ta_format & TF_UNDERLINE) attr |= FG_UNDERLINE; +#endif /* FG_UNDERLINE */ +#ifdef FG_BLINK if (a->ta_format & TF_BLINK) attr |= FG_BLINK; +#endif /* FG_BLINK */ return (attr << 8); } From owner-p4-projects@FreeBSD.ORG Tue Dec 9 16:00:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C7411065689; Tue, 9 Dec 2008 16:00:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 009791065688 for ; Tue, 9 Dec 2008 16:00:59 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3DE78FC16 for ; Tue, 9 Dec 2008 16:00:58 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9G0wNO029888 for ; Tue, 9 Dec 2008 16:00:58 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9G0wwI029886 for perforce@freebsd.org; Tue, 9 Dec 2008 16:00:58 GMT (envelope-from strauss@FreeBSD.org) Date: Tue, 9 Dec 2008 16:00:58 GMT Message-Id: <200812091600.mB9G0wwI029886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 154398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 16:00:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=154398 Change 154398 by strauss@strauss_silversurfer on 2008/12/09 16:00:15 Added deflate compression, still compile problems (linking) Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#42 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#42 (text+ko) ==== @@ -76,6 +76,11 @@ #define ZIP_VERSION_BY 0x0314 /* Made by UNIX, using ZIP version 2.0. */ #define ZIP_FLAGS 0x08 /* Flagging bit 3 (count from 0) for using data descriptor. */ +enum compression { + COMPRESSION_STORE = 0, + COMPRESSION_DEFLATE = 6 +}; + static ssize_t archive_write_zip_data(struct archive_write *, const void *buff, size_t s); static int archive_write_zip_finish(struct archive_write *); static int archive_write_zip_destroy(struct archive_write *); @@ -177,11 +182,6 @@ char comment_length[2]; }; -static enum compression { - COMPRESSION_STORE = 0, - COMPRESSION_DEFLATE = 6 -}; - int archive_write_set_format_zip(struct archive *_a) { @@ -294,7 +294,7 @@ zip_encode(path_length(entry), &h.filename_length, sizeof(h.filename_length)); zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); - if (zip->compression = COMPRESSION_STORE) { + if (zip->compression == COMPRESSION_STORE) { /* Setting compressed and uncompressed sizes even when specification says * to set to zero when using data descriptors. Otherwise the end of the * data for an entry is rather difficult to find. */ @@ -342,35 +342,62 @@ struct zip *zip = a->format_data; struct zip_file_header_link *l = zip->central_directory_end; z_stream stream; + size_t chunk = sizeof(*buff); + unsigned char buff_out[chunk]; if (s > zip->remaining_data_bytes) s = zip->remaining_data_bytes; + + if (s == 0) return 0; switch (zip->compression) { case COMPRESSION_STORE: ret = (a->compressor.write)(a, buff, s); + if (ret < 0) return (ret); + zip->written_bytes += s; + zip->remaining_data_bytes -= s; + l->crc32 = crc32(l->crc32, buff, s); + return (ret); case COMPRESSION_DEFLATE: - deflateInit2( - stream, - - ); + stream.zalloc = Z_NULL; + stream.zfree = Z_NULL; + stream.opaque = Z_NULL; + ret = deflateInit(&stream, Z_DEFAULT_COMPRESSION); + if (ret != Z_OK) return (ARCHIVE_FATAL); + stream.next_in = (unsigned char*) buff; + stream.avail_in = s; + do { + stream.next_out = buff_out; + stream.avail_out = chunk; + ret = deflate(&stream, Z_FINISH); + if (ret == Z_STREAM_ERROR) { + deflateEnd(&stream); + return (ARCHIVE_FATAL); + } + ret = (a->compressor.write)(a, buff_out, stream.avail_out); + if (ret < 0) { + deflateEnd(&stream); + return (ret); + } + zip->written_bytes += ret; + } while (stream.avail_out == 0); + zip->remaining_data_bytes -= s; + l->crc32 = crc32(l->crc32, buff, s); + deflateEnd(&stream); + return (s); + default: + + archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Invalid ZIP compression type"); + return ARCHIVE_FATAL; } /* TODO: set compressed size in data descriptor and local file header link */ - if (ret >= 0) { - zip->written_bytes += s; - zip->remaining_data_bytes -= s; - l->crc32 = crc32(l->crc32, buff, s); - return (s); - } else { - return (ret); - } } static int @@ -434,7 +461,7 @@ zip_encode(dos_time(archive_entry_mtime(l->entry)), &h.timedate, sizeof(h.timedate)); zip_encode(l->crc32, &h.crc32, sizeof(h.crc32)); /* TODO: write compressed size */ - zip_encode(archive_entry_size(entry), &h.uncompressed_size, sizeof(h.uncompressed_size)); + zip_encode(archive_entry_size(l->entry), &h.uncompressed_size, sizeof(h.uncompressed_size)); zip_encode(path_length(l->entry), &h.filename_length, sizeof(h.filename_length)); zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); mode = archive_entry_mode(l->entry); @@ -588,7 +615,7 @@ set_compression(struct archive_write *a, enum compression compression) { /* TODO: check archive state, should not switch between header and data */ - /* TODO: check if valid compression? */ - a->format_data->compression = compression; + struct zip *zip = a->format_data; + zip->compression = compression; } From owner-p4-projects@FreeBSD.ORG Tue Dec 9 16:12:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 282CC106567B; Tue, 9 Dec 2008 16:12:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFF801065675 for ; Tue, 9 Dec 2008 16:12:10 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF45F8FC17 for ; Tue, 9 Dec 2008 16:12:10 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9GCAlJ076899 for ; Tue, 9 Dec 2008 16:12:10 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9GCAPs076893 for perforce@freebsd.org; Tue, 9 Dec 2008 16:12:10 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 9 Dec 2008 16:12:10 GMT Message-Id: <200812091612.mB9GCAPs076893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 154400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 16:12:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=154400 Change 154400 by nwhitehorn@nwhitehorn_trantor on 2008/12/09 16:11:49 We don't do anything useful with HID0 on G5 systems, so ignore it. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#4 (text+ko) ==== @@ -93,6 +93,8 @@ { "IBM PowerPC 750FX", IBM750FX, REVFMT_MAJMIN }, { "IBM PowerPC 970", IBM970, REVFMT_MAJMIN }, { "IBM PowerPC 970FX", IBM970FX, REVFMT_MAJMIN }, + { "IBM PowerPC 970GX", IBM970GX, REVFMT_MAJMIN }, + { "IBM PowerPC 970MP", IBM970MP, REVFMT_MAJMIN }, { "Motorola PowerPC 7400", MPC7400, REVFMT_MAJMIN }, { "Motorola PowerPC 7410", MPC7410, REVFMT_MAJMIN }, { "Motorola PowerPC 7450", MPC7450, REVFMT_MAJMIN }, @@ -118,7 +120,7 @@ void cpu_setup(u_int cpuid) { - u_int pvr, maj, min, msr, hid0, hid0lower; + u_int pvr, maj, min, msr, hid0; uint16_t vers, rev, revfmt; const struct cputab *cp; const char *name; @@ -170,26 +172,6 @@ } /* - * Read HID0. On 64-bit machines, the bits we care about - * are (irritatingly) in the upper word of the register. - */ - - if (ppc64) { - hid0 = mfspr64upper(SPR_HID0,msr); - hid0lower = mfspr(SPR_HID0); - } else { - hid0 = mfspr(SPR_HID0); - hid0lower = 0; - } - - /* - * Set PMC granularity for 64 bit systems (architectural). - */ - - if (ppc64) - hid0 &= ~HID0_TG; - - /* * Configure power-saving mode. */ switch (vers) { @@ -251,11 +233,6 @@ break; } - if (ppc64) - mtspr64(SPR_HID0, hid0, hid0lower, msr); - else - mtspr(SPR_HID0, hid0); - switch (vers) { case MPC7447A: case MPC7448: From owner-p4-projects@FreeBSD.ORG Tue Dec 9 16:21:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B357A10656D3; Tue, 9 Dec 2008 16:21:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75DC3106567E for ; Tue, 9 Dec 2008 16:21:20 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4EFF78FC30 for ; Tue, 9 Dec 2008 16:21:20 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9GLKAS010433 for ; Tue, 9 Dec 2008 16:21:20 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9GLKp1010431 for perforce@freebsd.org; Tue, 9 Dec 2008 16:21:20 GMT (envelope-from strauss@FreeBSD.org) Date: Tue, 9 Dec 2008 16:21:20 GMT Message-Id: <200812091621.mB9GLKp1010431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 154401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 16:21:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=154401 Change 154401 by strauss@strauss_silversurfer on 2008/12/09 16:20:34 integrated latest changes from libarchive-portable Affected files ... .. //depot/projects/soc2008/strauss_libarchive/Makefile.am#13 integrate .. //depot/projects/soc2008/strauss_libarchive/NEWS#8 integrate .. //depot/projects/soc2008/strauss_libarchive/configure.ac#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/Makefile#8 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/cmdline.c#9 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/config_freebsd.h#7 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/cpio.c#10 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/cpio.h#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/cpio_platform.h#7 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_t.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_tv.stdout.uu#3 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/Makefile#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#9 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_check_magic.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_endian.h#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry.h#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_platform.h#10 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_private.h#5 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_private.h#4 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_all.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_bzip2.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_lzma.c#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_none.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_program.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_ar.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_empty.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_mtree.c#9 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_tar.c#9 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_format_zip.c#10 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_string.c#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_string.h#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_disk.c#10 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/Makefile#8 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_format_gtar_sparse.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_read_pax_truncated.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_disk_perms.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/libarchive/test/test_write_format_cpio.c#6 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/Makefile#8 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/cmdline.c#2 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/config_freebsd.h#7 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/Makefile#7 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/test/test_strip_components.c#1 branch .. //depot/projects/soc2008/strauss_libarchive/tar/tree.c#5 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/tree.h#3 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/util.c#7 integrate .. //depot/projects/soc2008/strauss_libarchive/tar/write.c#10 integrate .. //depot/projects/soc2008/strauss_libarchive/version#5 integrate .. //depot/projects/soc2008/strauss_libarchive/windows/vc90/libarchive.vcproj#2 integrate Differences ... ==== //depot/projects/soc2008/strauss_libarchive/Makefile.am#13 (text+ko) ==== @@ -182,11 +182,14 @@ libarchive/test/test_acl_pax.c \ libarchive/test/test_archive_api_feature.c \ libarchive/test/test_bad_fd.c \ + libarchive/test/test_compat_bzip2.c \ libarchive/test/test_compat_gtar.c \ + libarchive/test/test_compat_gzip.c \ libarchive/test/test_compat_tar_hardlink.c \ libarchive/test/test_compat_zip.c \ libarchive/test/test_empty_write.c \ libarchive/test/test_entry.c \ + libarchive/test/test_fuzz.c \ libarchive/test/test_entry_strmode.c \ libarchive/test/test_link_resolver.c \ libarchive/test/test_pax_filename_encoding.c \ @@ -255,9 +258,14 @@ libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test libarchive_test_EXTRA_DIST=\ + libarchive/test/test_compat_bzip2_1.tbz.uu \ + libarchive/test/test_compat_bzip2_2.tbz.uu \ libarchive/test/test_compat_gtar_1.tgz.uu \ + libarchive/test/test_compat_gzip_1.tgz.uu \ + libarchive/test/test_compat_gzip_2.tgz.uu \ libarchive/test/test_compat_tar_hardlink_1.tar.uu \ libarchive/test/test_compat_zip_1.zip.uu \ + libarchive/test/test_fuzz_1.iso.uu \ libarchive/test/test_pax_filename_encoding.tar.gz.uu \ libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu \ libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu \ @@ -329,6 +337,7 @@ tar/test/test_option_T.c \ tar/test/test_patterns.c \ tar/test/test_stdio.c \ + tar/test/test_strip_components.c \ tar/test/test_symlink_dir.c \ tar/test/test_version.c ==== //depot/projects/soc2008/strauss_libarchive/NEWS#8 (text+ko) ==== @@ -1,3 +1,5 @@ + +Dec 04, 2008: libarchive 2.5.903a released Nov 09, 2008: libarchive 2.5.902a released Nov 08, 2008: libarchive 2.5.901a released Nov 08, 2008: Start of pre-release testing for libarchive 2.6 ==== //depot/projects/soc2008/strauss_libarchive/configure.ac#6 (text+ko) ==== @@ -4,8 +4,8 @@ dnl In particular, this allows the version macro to be used in AC_INIT dnl These first two version numbers are updated automatically on each release. -m4_define([LIBARCHIVE_VERSION_S],[2.5.902a]) -m4_define([LIBARCHIVE_VERSION_N],[2005902]) +m4_define([LIBARCHIVE_VERSION_S],[2.5.903a]) +m4_define([LIBARCHIVE_VERSION_N],[2005903]) dnl bsdtar versioning tracks libarchive m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S()) @@ -162,17 +162,37 @@ AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([bzlib.h errno.h ext2fs/ext2_fs.h fcntl.h grp.h]) +AC_CHECK_HEADERS([errno.h ext2fs/ext2_fs.h fcntl.h grp.h]) AC_CHECK_HEADERS([inttypes.h langinfo.h limits.h linux/fs.h]) -AC_CHECK_HEADERS([locale.h lzmadec.h paths.h poll.h pwd.h regex.h stdarg.h]) +AC_CHECK_HEADERS([locale.h paths.h poll.h pwd.h regex.h stdarg.h]) AC_CHECK_HEADERS([stdint.h stdlib.h string.h sys/acl.h sys/ioctl.h]) AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/select.h sys/time.h sys/utime.h]) -AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h zlib.h]) +AC_CHECK_HEADERS([time.h unistd.h utime.h wchar.h]) # Checks for libraries. -AC_CHECK_LIB(bz2,BZ2_bzDecompressInit) -AC_CHECK_LIB(z,inflate) -AC_CHECK_LIB(lzmadec,lzmadec_decode) +AC_ARG_WITH([zlib], + AS_HELP_STRING([--without-zlib], [Don't build support for gzip through zlib])) + +if test "x$with_zlib" != "xno"; then + AC_CHECK_HEADERS([zlib.h]) + AC_CHECK_LIB(z,inflate) +fi + +AC_ARG_WITH([bz2lib], + AS_HELP_STRING([--without-bz2lib], [Don't build support for bzip2 through bz2lib])) + +if test "x$with_bz2lib" != "xno"; then + AC_CHECK_HEADERS([bzlib.h]) + AC_CHECK_LIB(bz2,BZ2_bzDecompressInit) +fi + +AC_ARG_WITH([lzmadec], + AS_HELP_STRING([--without-lzmadec], [Don't build support for lzma through lzmadec])) + +if test "x$with_lzmadec" != "xno"; then + AC_CHECK_HEADERS([lzmadec.h]) + AC_CHECK_LIB(lzmadec,lzmadec_decode) +fi # TODO: Give the user the option of using a pre-existing system # libarchive. This will define HAVE_LIBARCHIVE which will cause ==== //depot/projects/soc2008/strauss_libarchive/cpio/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.bin/cpio/Makefile,v 1.5 2008/07/05 05:17:33 kientzle Exp $ +# $FreeBSD: src/usr.bin/cpio/Makefile,v 1.6 2008/12/06 07:30:40 kientzle Exp $ .include ==== //depot/projects/soc2008/strauss_libarchive/cpio/cmdline.c#9 (ktext) ==== @@ -26,7 +26,7 @@ #include "cpio_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.4 2008/07/29 15:23:31 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/cmdline.c,v 1.5 2008/12/06 07:30:40 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include ==== //depot/projects/soc2008/strauss_libarchive/cpio/config_freebsd.h#7 (ktext) ==== @@ -22,7 +22,7 @@ * (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: src/usr.bin/cpio/config_freebsd.h,v 1.2 2008/07/05 05:15:07 kientzle Exp $ + * $FreeBSD: src/usr.bin/cpio/config_freebsd.h,v 1.3 2008/12/06 07:30:40 kientzle Exp $ */ /* A default configuration for FreeBSD, used if there is no config.h. */ ==== //depot/projects/soc2008/strauss_libarchive/cpio/cpio.c#10 (ktext) ==== @@ -26,7 +26,7 @@ #include "cpio_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.13 2008/09/04 05:20:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.15 2008/12/06 07:30:40 kientzle Exp $"); #include #include @@ -41,6 +41,12 @@ #ifdef HAVE_FCNTL_H #include #endif +#ifdef HAVE_GRP_H +#include +#endif +#ifdef HAVE_PWD_H +#include +#endif #ifdef HAVE_STDARG_H #include #endif @@ -58,11 +64,32 @@ #include "cpio.h" #include "matching.h" +/* Fixed size of uname/gname caches. */ +#define name_cache_size 101 + +struct name_cache { + int probes; + int hits; + size_t size; + struct { + id_t id; + char *name; + } cache[name_cache_size]; +}; + static int copy_data(struct archive *, struct archive *); static const char *cpio_rename(const char *name); static int entry_to_archive(struct cpio *, struct archive_entry *); static int file_to_archive(struct cpio *, const char *); +static void free_cache(struct name_cache *cache); +static void list_item_verbose(struct cpio *, struct archive_entry *); static void long_help(void); +static const char *lookup_gname(struct cpio *, gid_t gid); +static int lookup_gname_helper(struct cpio *, + const char **name, id_t gid); +static const char *lookup_uname(struct cpio *, uid_t uid); +static int lookup_uname_helper(struct cpio *, + const char **name, id_t uid); static void mode_in(struct cpio *); static void mode_list(struct cpio *); static void mode_out(struct cpio *); @@ -268,6 +295,8 @@ "Must specify at least one of -i, -o, or -p"); } + free_cache(cpio->gname_cache); + free_cache(cpio->uname_cache); return (0); } @@ -798,18 +827,9 @@ } if (excluded(cpio, archive_entry_pathname(entry))) continue; - if (cpio->verbose) { - /* TODO: uname/gname lookups */ - /* TODO: Clean this up. */ - fprintf(stdout, - "%s%3d %8s%8s " CPIO_FILESIZE_PRINTF " %s\n", - archive_entry_strmode(entry), - archive_entry_nlink(entry), - archive_entry_uname(entry), - archive_entry_gname(entry), - (CPIO_FILESIZE_TYPE)archive_entry_size(entry), - archive_entry_pathname(entry)); - } else + if (cpio->verbose) + list_item_verbose(cpio, entry); + else fprintf(stdout, "%s\n", archive_entry_pathname(entry)); } r = archive_read_close(a); @@ -825,7 +845,74 @@ exit(0); } +/* + * Display information about the current file. + * + * The format here roughly duplicates the output of 'ls -l'. + * This is based on SUSv2, where 'tar tv' is documented as + * listing additional information in an "unspecified format," + * and 'pax -l' is documented as using the same format as 'ls -l'. + */ static void +list_item_verbose(struct cpio *cpio, struct archive_entry *entry) +{ + char size[32]; + char date[32]; + const char *uname, *gname; + FILE *out = stdout; + const struct stat *st; + const char *fmt; + time_t tim; + static time_t now; + + st = archive_entry_stat(entry); + + if (!now) + time(&now); + + /* Use uname if it's present, else uid. */ + uname = archive_entry_uname(entry); + if (uname == NULL) + uname = lookup_uname(cpio, archive_entry_uid(entry)); + + /* Use gname if it's present, else gid. */ + gname = archive_entry_gname(entry); + if (gname == NULL) + gname = lookup_gname(cpio, archive_entry_gid(entry)); + + /* Print device number or file size. */ + if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) { + snprintf(size, sizeof(size), "%lu,%lu", + (unsigned long)major(st->st_rdev), + (unsigned long)minor(st->st_rdev)); /* ls(1) also casts here. */ + } else { + snprintf(size, sizeof(size), CPIO_FILESIZE_PRINTF, + (CPIO_FILESIZE_TYPE)st->st_size); + } + + /* Format the time using 'ls -l' conventions. */ + tim = (time_t)st->st_mtime; + if (abs(tim - now) > (365/2)*86400) + fmt = cpio->day_first ? "%e %b %Y" : "%b %e %Y"; + else + fmt = cpio->day_first ? "%e %b %H:%M" : "%b %e %H:%M"; + strftime(date, sizeof(date), fmt, localtime(&tim)); + + fprintf(out, "%s%3d %-8s %-8s %8s %12s %s", + archive_entry_strmode(entry), + archive_entry_nlink(entry), + uname, gname, size, date, + archive_entry_pathname(entry)); + + /* Extra information for links. */ + if (archive_entry_hardlink(entry)) /* Hard link */ + fprintf(out, " link to %s", archive_entry_hardlink(entry)); + else if (archive_entry_symlink(entry)) /* Symbolic link */ + fprintf(out, " -> %s", archive_entry_symlink(entry)); + fprintf(out, "\n"); +} + +static void mode_pass(struct cpio *cpio, const char *destdir) { unsigned long blocks; @@ -1033,3 +1120,123 @@ free(lr->pathname); free(lr); } + +static void +free_cache(struct name_cache *cache) +{ + size_t i; + + if (cache != NULL) { + for (i = 0; i < cache->size; i++) + free(cache->cache[i].name); + free(cache); + } +} + +/* + * Lookup uname/gname from uid/gid, return NULL if no match. + */ +static const char * +lookup_name(struct cpio *cpio, struct name_cache **name_cache_variable, + int (*lookup_fn)(struct cpio *, const char **, id_t), id_t id) +{ + char asnum[16]; + struct name_cache *cache; + const char *name; + int slot; + + + if (*name_cache_variable == NULL) { + *name_cache_variable = malloc(sizeof(struct name_cache)); + if (*name_cache_variable == NULL) + cpio_errc(1, ENOMEM, "No more memory"); + memset(*name_cache_variable, 0, sizeof(struct name_cache)); + (*name_cache_variable)->size = name_cache_size; + } + + cache = *name_cache_variable; + cache->probes++; + + slot = id % cache->size; + if (cache->cache[slot].name != NULL) { + if (cache->cache[slot].id == id) { + cache->hits++; + return (cache->cache[slot].name); + } + free(cache->cache[slot].name); + cache->cache[slot].name = NULL; + } + + if (lookup_fn(cpio, &name, id) == 0) { + if (name == NULL || name[0] == '\0') { + /* If lookup failed, format it as a number. */ + snprintf(asnum, sizeof(asnum), "%u", (unsigned)id); + name = asnum; + } + cache->cache[slot].name = strdup(name); + if (cache->cache[slot].name != NULL) { + cache->cache[slot].id = id; + return (cache->cache[slot].name); + } + /* + * Conveniently, NULL marks an empty slot, so + * if the strdup() fails, we've just failed to + * cache it. No recovery necessary. + */ + } + return (NULL); +} + +static const char * +lookup_uname(struct cpio *cpio, uid_t uid) +{ + return (lookup_name(cpio, &cpio->uname_cache, + &lookup_uname_helper, (id_t)uid)); +} + +static int +lookup_uname_helper(struct cpio *cpio, const char **name, id_t id) +{ + struct passwd *pwent; + + (void)cpio; /* UNUSED */ + + errno = 0; + pwent = getpwuid((uid_t)id); + if (pwent == NULL) { + *name = NULL; + if (errno != 0) + cpio_warnc(errno, "getpwuid(%d) failed", id); + return (errno); + } + + *name = pwent->pw_name; + return (0); +} + +static const char * +lookup_gname(struct cpio *cpio, gid_t gid) +{ + return (lookup_name(cpio, &cpio->gname_cache, + &lookup_gname_helper, (id_t)gid)); +} + +static int +lookup_gname_helper(struct cpio *cpio, const char **name, id_t id) +{ + struct group *grent; + + (void)cpio; /* UNUSED */ + + errno = 0; + grent = getgrgid((gid_t)id); + if (grent == NULL) { + *name = NULL; + if (errno != 0) + cpio_warnc(errno, "getgrgid(%d) failed", id); + return (errno); + } + + *name = grent->gr_name; + return (0); +} ==== //depot/projects/soc2008/strauss_libarchive/cpio/cpio.h#6 (text+ko) ==== @@ -22,7 +22,7 @@ * (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: src/usr.bin/cpio/cpio.h,v 1.4 2008/08/04 01:25:48 cperciva Exp $ + * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.7 2008/12/06 07:30:40 kientzle Exp $ */ #ifndef CPIO_H_INCLUDED @@ -68,6 +68,7 @@ char *pass_destpath; int uid_override; int gid_override; + int day_first; /* true if locale prefers day/mon */ /* If >= 0, then close this when done. */ int fd; @@ -79,6 +80,9 @@ int return_value; /* Value returned by main() */ struct archive_entry_linkresolver *linkresolver; + struct name_cache *uname_cache; + struct name_cache *gname_cache; + /* Work data. */ struct matching *matching; char *buff; ==== //depot/projects/soc2008/strauss_libarchive/cpio/cpio_platform.h#7 (ktext) ==== @@ -22,7 +22,7 @@ * (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$ + * $FreeBSD: src/usr.bin/cpio/cpio_platform.h,v 1.2 2008/12/06 07:15:42 kientzle Exp $ */ /* ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_t.c#6 (ktext) ==== @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$Id$ $Change: 142961 $ $DateTime$ $Author$"); +__FBSDID("$FreeBSD$"); DEFINE_TEST(test_option_t) @@ -43,5 +43,9 @@ assertEqualInt(r, 0); assertFileContents("1 block\n", 8, "tv.err"); extract_reference_file("test_option_tv.stdout"); - assertEqualFile("tv.out", "test_option_tv.stdout"); + + /* This doesn't work because the usernames on different systems + * are different and cpio now looks up numeric UIDs on + * the local system. */ + /* assertEqualFile("tv.out", "test_option_tv.stdout"); */ } ==== //depot/projects/soc2008/strauss_libarchive/cpio/test/test_option_tv.stdout.uu#3 (text+ko) ==== @@ -1,5 +1,6 @@ -$FreeBSD$ +$FreeBSD: src/usr.bin/cpio/test/test_option_tv.stdout.uu,v 1.2 2008/11/29 20:22:02 kientzle Exp $ begin 644 test_option_tv.stdout -G+7)W+7(M+7(M+2`@(#$@("`H;G5L;"D@("AN=6QL*2`P(&9I;&4* +M+7)W+7(M+7(M+2`@(#$@=&EM("`@("`@=&EM("`@("`@("`@("`@(#`@1&5C +/(#,Q("`Q.38Y(&9I;&4* ` end ==== //depot/projects/soc2008/strauss_libarchive/libarchive/Makefile#8 (text+ko) ==== @@ -16,9 +16,6 @@ # Headers to be installed in /usr/include INCS= archive.h archive_entry.h -# TODO: LZMA reader needs to be converted to the new filter architecture... -# archive_read_support_compression_lzma.c \ - # Sources to be compiled. SRCS= archive_check_magic.c \ archive_entry.c \ ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive.h#9 (ktext) ==== @@ -113,13 +113,13 @@ * (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000) * #endif */ -#define ARCHIVE_VERSION_NUMBER 2005902 +#define ARCHIVE_VERSION_NUMBER 2005903 __LA_DECL int archive_version_number(void); /* * Textual name/version of the library, useful for version displays. */ -#define ARCHIVE_VERSION_STRING "libarchive 2.5.902a" +#define ARCHIVE_VERSION_STRING "libarchive 2.5.903a" __LA_DECL const char * archive_version_string(void); #if ARCHIVE_VERSION_NUMBER < 3000000 ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_check_magic.c#6 (ktext) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.8 2007/04/02 00:15:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.9 2008/12/06 05:52:01 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_endian.h#5 (ktext) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.3 2008/05/26 17:00:22 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_endian.h,v 1.4 2008/12/06 06:12:24 kientzle Exp $ * * Borrowed from FreeBSD's */ @@ -41,8 +41,10 @@ * - SGI MIPSpro * - Microsoft Visual C++ 6.0 (supposedly newer versions too) */ -#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER) +#if defined(__WATCOMC__) || defined(__sgi) #define inline +#elif defined(_MSC_VER) +#define inline __inline #endif /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */ ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_entry.h#7 (ktext) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive_entry.h,v 1.30 2008/09/30 03:53:03 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.31 2008/12/06 06:18:46 kientzle Exp $ */ #ifndef ARCHIVE_ENTRY_H_INCLUDED @@ -441,7 +441,7 @@ * Note that archive_entry_size() is reset to zero if the file * body should not be written to the archive. Pay attention! */ -__LA_DECL struct archive_entry_linkresolver; +struct archive_entry_linkresolver; /* * There are three different strategies for marking hardlinks. ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_platform.h#10 (ktext) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive_platform.h,v 1.31 2008/09/12 04:03:34 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_platform.h,v 1.32 2008/12/06 05:53:05 kientzle Exp $ */ /* ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_private.h#5 (ktext) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive_private.h,v 1.30 2008/08/04 01:25:48 cperciva Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.32 2008/12/06 06:23:37 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -40,13 +40,13 @@ #define ARCHIVE_WRITE_MAGIC (0xb0c5c0deU) #define ARCHIVE_READ_MAGIC (0xdeb0c5U) -#define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U) +#define ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U) #define ARCHIVE_STATE_ANY 0xFFFFU #define ARCHIVE_STATE_NEW 1U #define ARCHIVE_STATE_HEADER 2U #define ARCHIVE_STATE_DATA 4U -#define ARCHIVE_STATE_DATA_END 8U +#define ARCHIVE_STATE_DATA_END 8U #define ARCHIVE_STATE_EOF 0x10U #define ARCHIVE_STATE_CLOSED 0x20U #define ARCHIVE_STATE_FATAL 0x8000U ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read.c#6 (ktext) ==== @@ -32,7 +32,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.38 2008/03/12 04:58:32 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read.c,v 1.39 2008/12/06 06:45:15 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -793,7 +793,8 @@ size_t tocopy; if (a->fatal) { - *avail = ARCHIVE_FATAL; + if (avail) + *avail = ARCHIVE_FATAL; return (NULL); } @@ -861,10 +862,7 @@ /* Return whatever we do have. */ if (avail != NULL) *avail = a->avail; - return (a->next); - /* TODO: I want to change this to - * return(0) as an eof marker, but a little - * more work is needed first. */ + return (NULL); } a->archive.raw_position += bytes_read; a->client_total = bytes_read; ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_private.h#4 (ktext) ==== @@ -22,7 +22,7 @@ * (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: src/lib/libarchive/archive_read_private.h,v 1.6 2008/03/15 11:09:16 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_read_private.h,v 1.7 2008/12/06 06:45:15 kientzle Exp $ */ #ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_all.c#6 (ktext) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_all.c,v 1.6 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_all.c,v 1.7 2008/12/06 06:45:15 kientzle Exp $"); #include "archive.h" ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_bzip2.c#7 (ktext) ==== @@ -25,7 +25,7 @@ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.18 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_bzip2.c,v 1.19 2008/12/06 06:45:15 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -53,7 +53,7 @@ bz_stream stream; char *out_block; size_t out_block_size; - int64_t total_out; + char valid; /* True = decompressor is initialized */ char eof; /* True = found end of compressed data. */ }; @@ -200,7 +200,6 @@ void *out_block; struct archive_read_source *self; struct private_data *state; - int ret; (void)reader; /* UNUSED */ @@ -242,49 +241,7 @@ state->stream.next_out = state->out_block; state->stream.avail_out = state->out_block_size; - /* Initialize compression library. */ - ret = BZ2_bzDecompressInit(&(state->stream), - 0 /* library verbosity */, - 0 /* don't use slow low-mem algorithm */); - - /* If init fails, try using low-memory algorithm instead. */ - if (ret == BZ_MEM_ERROR) { - ret = BZ2_bzDecompressInit(&(state->stream), - 0 /* library verbosity */, - 1 /* do use slow low-mem algorithm */); - } - - if (ret == BZ_OK) - return (self); - - /* Library setup failed: Clean up. */ - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Internal error initializing %s library", - a->archive.compression_name); - - /* Override the error message if we know what really went wrong. */ - switch (ret) { - case BZ_PARAM_ERROR: - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Internal error initializing compression library: " - "invalid setup parameter"); - break; - case BZ_MEM_ERROR: - archive_set_error(&a->archive, ENOMEM, - "Internal error initializing compression library: " - "out of memory"); - break; - case BZ_CONFIG_ERROR: - archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Internal error initializing compression library: " - "mis-compiled library"); - break; - } - - free(state->out_block); - free(state); - free(self); - return (NULL); + return (self); } /* @@ -301,6 +258,11 @@ state = (struct private_data *)self->data; read_avail = 0; + if (state->eof) { + *p = NULL; + return (0); + } + /* Empty our output buffer. */ state->stream.next_out = state->out_block; state->stream.avail_out = state->out_block_size; @@ -319,39 +281,85 @@ return (ARCHIVE_FATAL); /* There is no more data, return whatever we have. */ if (ret == 0) { + state->eof = 1; *p = state->out_block; decompressed = state->stream.next_out - state->out_block; - state->total_out += decompressed; return (decompressed); } state->stream.avail_in = ret; } + if (!state->valid) { + if (state->stream.next_in[0] != 'B') { + state->eof = 1; + *p = state->out_block; + decompressed = state->stream.next_out + - state->out_block; + return (decompressed); + } + /* Initialize compression library. */ + ret = BZ2_bzDecompressInit(&(state->stream), + 0 /* library verbosity */, + 0 /* don't use low-mem algorithm */); + + /* If init fails, try low-memory algorithm instead. */ + if (ret == BZ_MEM_ERROR) + ret = BZ2_bzDecompressInit(&(state->stream), + 0 /* library verbosity */, + 1 /* do use low-mem algo */); + + if (ret != BZ_OK) { + const char *detail = NULL; + int err = ARCHIVE_ERRNO_MISC; + switch (ret) { + case BZ_PARAM_ERROR: + detail = "invalid setup parameter"; + break; + case BZ_MEM_ERROR: + err = ENOMEM; + detail = "out of memory"; + break; + case BZ_CONFIG_ERROR: + detail = "mis-compiled library"; + break; + } + archive_set_error(&self->archive->archive, err, + "Internal error initializing decompressor%s%s", + detail == NULL ? "" : ": ", + detail); + return (ARCHIVE_FATAL); + } + state->valid = 1; + } + /* Decompress as much as we can in one pass. */ ret = BZ2_bzDecompress(&(state->stream)); switch (ret) { case BZ_STREAM_END: /* Found end of stream. */ - /* TODO: Peek ahead to see if there's another - * stream so we can mimic the behavior of gunzip - * on concatenated streams. */ - state->eof = 1; + switch (BZ2_bzDecompressEnd(&(state->stream))) { + case BZ_OK: + break; + default: + archive_set_error(&(self->archive->archive), + ARCHIVE_ERRNO_MISC, + "Failed to clean up decompressor"); + return (ARCHIVE_FATAL); + } + state->valid = 0; + /* FALLTHROUGH */ case BZ_OK: /* Decompressor made some progress. */ /* If we filled our buffer, update stats and return. */ - if (state->eof || state->stream.avail_out == 0) { + if (state->stream.avail_out == 0) { *p = state->out_block; decompressed = state->stream.next_out - state->out_block; - state->total_out += decompressed; return (decompressed); } break; - default: - /* Return an error. */ + default: /* Return an error. */ archive_set_error(&self->archive->archive, - ARCHIVE_ERRNO_MISC, - "%s decompression failed", - self->archive->archive.compression_name); + ARCHIVE_ERRNO_MISC, "bzip decompression failed"); return (ARCHIVE_FATAL); } } @@ -364,25 +372,26 @@ bzip2_source_close(struct archive_read_source *self) { struct private_data *state; - int ret; + int ret = ARCHIVE_OK; state = (struct private_data *)self->data; - ret = ARCHIVE_OK; - switch (BZ2_bzDecompressEnd(&(state->stream))) { - case BZ_OK: - break; - default: - archive_set_error(&(self->archive->archive), - ARCHIVE_ERRNO_MISC, - "Failed to clean up %s compressor", - self->archive->archive.compression_name); - ret = ARCHIVE_FATAL; + + if (state->valid) { + switch (BZ2_bzDecompressEnd(&state->stream)) { + case BZ_OK: + break; + default: + archive_set_error(&self->archive->archive, + ARCHIVE_ERRNO_MISC, + "Failed to clean up decompressor"); + ret = ARCHIVE_FATAL; + } } free(state->out_block); free(state); free(self); - return (ret); + return (ARCHIVE_OK); } #endif /* HAVE_BZLIB_H */ ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_read_support_compression_compress.c#6 (ktext) ==== @@ -64,7 +64,7 @@ #include "archive_platform.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 9 16:59:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8A2A1065676; Tue, 9 Dec 2008 16:59:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B420106564A for ; Tue, 9 Dec 2008 16:59:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 696FF8FC13 for ; Tue, 9 Dec 2008 16:59:00 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9Gx03v097060 for ; Tue, 9 Dec 2008 16:59:00 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9Gx0mu097053 for perforce@freebsd.org; Tue, 9 Dec 2008 16:59:00 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 9 Dec 2008 16:59:00 GMT Message-Id: <200812091659.mB9Gx0mu097053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 154403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 16:59:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=154403 Change 154403 by nwhitehorn@nwhitehorn_trantor on 2008/12/09 16:58:04 Adapt ofw_syscons to use bus_space_map() so that it gets remapped when the MMU turns on with bs_remap_earlyboot(). This removes the assumption that the framebuffer is BAT-mapped. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#11 edit .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#5 edit .. //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#11 (text+ko) ==== @@ -369,8 +369,6 @@ static void moea64_bridge_cpu_bootstrap(mmu_t, int ap); static void moea64_enter_locked(pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t); -static void moea64_bootstrap_find_framebuffer(vm_offset_t *va, - vm_size_t *size); static boolean_t moea64_query_bit(vm_page_t, u_int64_t); static u_int moea64_clear_bit(vm_page_t, u_int64_t, u_int64_t *); static void moea64_kremove(mmu_t, vm_offset_t); @@ -729,8 +727,8 @@ int sz; int i, j; int ofw_mappings; - vm_size_t size, physsz, hwphyssz, fbsize; - vm_offset_t pa, va, off, fbva; + vm_size_t size, physsz, hwphyssz; + vm_offset_t pa, va, off; uint32_t msr; /* We don't have a direct map since there is no BAT */ @@ -873,11 +871,6 @@ moea64_kenter(mmup, pa, pa); ENABLE_TRANS(msr); - /* Find the framebuffer, so we can extract its mapping from OF */ - - fbva = 0; fbsize = 0; - moea64_bootstrap_find_framebuffer(&fbva,&fbsize); - /* * Map certain important things, like ourselves and the exception * vectors @@ -932,32 +925,20 @@ DISABLE_TRANS(msr); for (off = 0; off < translations[i].om_len; off += PAGE_SIZE) { - struct vm_page m; - pmap_t pmap = &ofw_pmap; - vm_prot_t prot = VM_PROT_ALL; + struct vm_page m; - m.phys_addr = translations[i].om_pa_lo + off; - /* Map low memory mappings into the kernel pmap, too. * These are typically mappings made by the loader, * so we need them if we want to keep executing. */ - if (translations[i].om_va + off < SEGMENT_LENGTH) { - moea64_enter_locked(kernel_pmap, - translations[i].om_va + off, &m, - prot, 1); - } + if (translations[i].om_va + off < SEGMENT_LENGTH) + moea64_kenter(mmup, translations[i].om_va + off, + translations[i].om_va + off); - /* Map the frame buffer into the kernel pmap instead */ + m.phys_addr = translations[i].om_pa_lo + off; + moea64_enter_locked(&ofw_pmap, + translations[i].om_va + off, &m, VM_PROT_ALL, 1); - if ((translations[i].om_va + off >= fbva) && - (translations[i].om_va + off < fbva + fbsize)) { - pmap = kernel_pmap; - prot = VM_PROT_READ | VM_PROT_WRITE; - } - - moea64_enter_locked(pmap, translations[i].om_va + off, - &m, prot, 1); ofw_mappings++; } ENABLE_TRANS(msr); @@ -1049,32 +1030,6 @@ } } -static void -moea64_bootstrap_find_framebuffer(vm_offset_t *va, vm_size_t *size) -{ - phandle_t chosen, node; - ihandle_t stdout; - - uint32_t depth, height, linebytes; - char type[16]; - - chosen = OF_finddevice("/chosen"); - OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)); - node = OF_instance_to_package(stdout); - OF_getprop(node, "device_type", type, sizeof(type)); - - if (strcmp(type, "display") != 0) - return; - - OF_getprop(node, "depth", &depth, sizeof(depth)); - OF_getprop(node, "height", &height, sizeof(height)); - OF_getprop(node, "linebytes", &linebytes, sizeof(linebytes)); - OF_getprop(node, "address", va, sizeof(*va)); - - *size = height * depth/8 * linebytes; -} - - /* * Activate a user pmap. The pmap must be activated before it's address * space can be accessed in any way. @@ -1215,8 +1170,8 @@ * will be wired down. */ void -moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, - boolean_t wired) +moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, + vm_prot_t prot, boolean_t wired) { vm_page_lock_queues(); @@ -1364,7 +1319,6 @@ moea64_enter_quick(mmu_t mmu, pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot) { - PMAP_LOCK(pm); moea64_enter_locked(pm, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE); @@ -1600,11 +1554,6 @@ uint64_t pte_lo; int error; -#if 0 - if (va < VM_MIN_KERNEL_ADDRESS) - panic("moea64_kenter: attempt to enter non-kernel address %#x", - va); -#endif if (!pmap_bootstrapped) { if (va >= VM_MIN_KERNEL_ADDRESS && va < VM_MAX_KERNEL_ADDRESS) panic("Trying to enter an address in KVA -- %#x!\n",pa); ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#5 (text+ko) ==== @@ -214,6 +214,7 @@ phandle_t chosen; ihandle_t stdout; phandle_t node; + bus_addr_t fb_phys; int depth; int disable; int len; @@ -266,10 +267,16 @@ OF_getprop(node, "linebytes", &sc->sc_stride, sizeof(sc->sc_stride)); /* - * XXX the physical address of the frame buffer is assumed to be - * BAT-mapped so it can be accessed directly + * Grab the physical address of the framebuffer, and then map it + * into our memory space. If the MMU is not yet up, it will be + * remapped for us when relocation turns on. + * + * XXX We assume #address-cells is 1 at this point. */ - OF_getprop(node, "address", &sc->sc_addr, sizeof(sc->sc_addr)); + OF_getprop(node, "address", &fb_phys, sizeof(fb_phys)); + + bus_space_map(&bs_be_tag, fb_phys, sc->sc_height * sc->sc_stride, + 0, &sc->sc_addr); /* * Get the PCI addresses of the adapter. The node may be the @@ -279,8 +286,8 @@ len = OF_getprop(node, "assigned-addresses", sc->sc_pciaddrs, sizeof(sc->sc_pciaddrs)); if (len == -1) { - len = OF_getprop(OF_parent(node), "assigned-addresses", sc->sc_pciaddrs, - sizeof(sc->sc_pciaddrs)); + len = OF_getprop(OF_parent(node), "assigned-addresses", + sc->sc_pciaddrs, sizeof(sc->sc_pciaddrs)); } if (len != -1) { @@ -846,13 +853,17 @@ static int ofwfb_scprobe(device_t dev) { - /* This is a fake device, so make sure there is no OF node for it */ - if (ofw_bus_get_node(dev) != -1) - return ENXIO; - + int error; + device_set_desc(dev, "System console"); - return (sc_probe_unit(device_get_unit(dev), - device_get_flags(dev) | SC_AUTODETECT_KBD)); + + error = sc_probe_unit(device_get_unit(dev), + device_get_flags(dev) | SC_AUTODETECT_KBD); + if (error != 0) + return (error); + + /* This is a fake device, so make sure we added it ourselves */ + return (BUS_PROBE_NOWILDCARD); } static int ==== //depot/projects/ppc-g5/sys/powerpc/powerpc/cpu.c#5 (text+ko) ==== @@ -120,7 +120,7 @@ void cpu_setup(u_int cpuid) { - u_int pvr, maj, min, msr, hid0; + u_int pvr, maj, min, hid0; uint16_t vers, rev, revfmt; const struct cputab *cp; const char *name; @@ -171,6 +171,8 @@ break; } + hid0 = mfspr(SPR_HID0); + /* * Configure power-saving mode. */ @@ -233,6 +235,8 @@ break; } + mtspr(SPR_HID0, hid0); + switch (vers) { case MPC7447A: case MPC7448: From owner-p4-projects@FreeBSD.ORG Tue Dec 9 17:15:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70EBA1065677; Tue, 9 Dec 2008 17:15:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36A2F106564A for ; Tue, 9 Dec 2008 17:15:35 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 265538FC17 for ; Tue, 9 Dec 2008 17:15:35 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9HFZRW077822 for ; Tue, 9 Dec 2008 17:15:35 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9HFZuM077820 for perforce@freebsd.org; Tue, 9 Dec 2008 17:15:35 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 9 Dec 2008 17:15:35 GMT Message-Id: <200812091715.mB9HFZuM077820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 154405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 17:15:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=154405 Change 154405 by nwhitehorn@nwhitehorn_trantor on 2008/12/09 17:14:34 Have the OFW memory routines check address-cells instead of relying on the value of ppc64 to figure out the number of cells in a physical memory address. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#8 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#8 (text+ko) ==== @@ -147,12 +147,22 @@ mem_regions(struct mem_region **memp, int *memsz, struct mem_region **availp, int *availsz) { - int phandle; + phandle_t phandle; int asz, msz, fsz; int i, j; int still_merging; + cell_t address_cells; asz = msz = 0; + + /* + * Get #address-cells from root node, defaulting to 1 if it cannot + * be found. + */ + phandle = OF_finddevice("/"); + if (OF_getprop(phandle, "#address-cells", &address_cells, + sizeof(address_cells)) < sizeof(address_cells)) + address_cells = 1; /* * Get memory. @@ -174,7 +184,7 @@ } } - if (ppc64) { + if (address_cells == 2) { struct mem_region64 OFmem64[OFMEM_REGIONS + 1]; if ((phandle == -1) || (msz = OF_getprop(phandle, "reg", OFmem64, sizeof OFmem64[0] * OFMEM_REGIONS)) <= 0) { From owner-p4-projects@FreeBSD.ORG Tue Dec 9 17:37:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EC531065686; Tue, 9 Dec 2008 17:37:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 004CA1065675 for ; Tue, 9 Dec 2008 17:37:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E499D8FC20 for ; Tue, 9 Dec 2008 17:37:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9HbvgM079759 for ; Tue, 9 Dec 2008 17:37:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9HbvfN079757 for perforce@freebsd.org; Tue, 9 Dec 2008 17:37:57 GMT (envelope-from sam@freebsd.org) Date: Tue, 9 Dec 2008 17:37:57 GMT Message-Id: <200812091737.mB9HbvfN079757@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 17:37:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=154406 Change 154406 by sam@sam_ebb on 2008/12/09 17:37:19 I2C driver for Cambria's front panel LED Affected files ... .. //depot/projects/vap/sys/arm/conf/CAMBRIA#4 edit .. //depot/projects/vap/sys/arm/conf/CAMBRIA.hints#2 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/cambria_fled.c#1 add .. //depot/projects/vap/sys/arm/xscale/ixp425/files.avila#6 edit Differences ... ==== //depot/projects/vap/sys/arm/conf/CAMBRIA#4 (text+ko) ==== @@ -78,6 +78,7 @@ device ds1672 # DS1672 on I2C bus device ad7418 # AD7418 on I2C bus +device cambria_fled # Font Panel LED on I2C bus device cambria_led # 8-LED latch device ata ==== //depot/projects/vap/sys/arm/conf/CAMBRIA.hints#2 (text+ko) ==== @@ -31,9 +31,10 @@ hint.ata_avila.0.at="ixp0" # Front Panel LED -#hint.led_avila.0.at="ixp0" -#hint.led_avila.0.pin=5 +hint.fled.0.at="iicbus0" +hint.fled.0.addr=0x5a +# Octal LED Latch hint.led_cambria.0.at="ixp0" # Analog Devices AD7418 temperature sensor ==== //depot/projects/vap/sys/arm/xscale/ixp425/files.avila#6 (text+ko) ==== @@ -3,4 +3,5 @@ arm/xscale/ixp425/avila_ata.c optional avila_ata arm/xscale/ixp425/avila_led.c optional avila_led arm/xscale/ixp425/cambria_led.c optional cambria_led +arm/xscale/ixp425/cambria_fled.c optional cambria_fled arm/xscale/ixp425/ixdp425_pci.c optional pci From owner-p4-projects@FreeBSD.ORG Tue Dec 9 20:24:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2FAB1065673; Tue, 9 Dec 2008 20:24:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4FB4106564A for ; Tue, 9 Dec 2008 20:24:51 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 923898FC14 for ; Tue, 9 Dec 2008 20:24:51 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9KOpPw023626 for ; Tue, 9 Dec 2008 20:24:51 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9KOmo9023320 for perforce@freebsd.org; Tue, 9 Dec 2008 20:24:48 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 9 Dec 2008 20:24:48 GMT Message-Id: <200812092024.mB9KOmo9023320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 154412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 20:24:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=154412 Change 154412 by nwhitehorn@nwhitehorn_trantor on 2008/12/09 20:23:57 IFC to grab recent PMU changes Affected files ... .. //depot/projects/ppc-g5/COPYRIGHT#2 integrate .. //depot/projects/ppc-g5/Makefile#2 integrate .. //depot/projects/ppc-g5/ObsoleteFiles.inc#5 integrate .. //depot/projects/ppc-g5/UPDATING#6 integrate .. //depot/projects/ppc-g5/bin/df/df.1#2 integrate .. //depot/projects/ppc-g5/bin/df/df.c#2 integrate .. //depot/projects/ppc-g5/bin/sh/eval.c#2 integrate .. //depot/projects/ppc-g5/bin/sh/exec.c#2 integrate .. //depot/projects/ppc-g5/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/CREDITS#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/HISTORY#2 delete .. //depot/projects/ppc-g5/contrib/openbsm/INSTALL#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/LICENSE#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/NEWS#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/README#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/TODO#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/VERSION#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/audit.8#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/audit_triggers.defs#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd_control.defs#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditfilterd/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditfilterd/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditreduce/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditreduce/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/praudit/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/praudit/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/praudit/praudit.1#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/praudit/praudit.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/audit_uevents.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/compat/clock_gettime.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/compat/strlcat.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/compat/strlcpy.h#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_class.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_free_token.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/audit_submit.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_class.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_flags.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_mask.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_notify.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_user.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_wrappers.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit.2#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_class.5#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_event.5#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_user.5#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_warn.5#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/auditctl.2#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/getaudit.2#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/getauid.2#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/setaudit.2#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/setauid.2#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/modules/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/modules/auditfilter_noop/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/modules/auditfilter_noop/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/Makefile.am#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/Makefile.in#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/Makefile.am#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/Makefile.in#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit.h#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_internal.h#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_record.h#1 branch .. //depot/projects/ppc-g5/contrib/openbsm/test/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/bsm/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/test/bsm/Makefile.in#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/ppc-g5/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/ppc-g5/etc/newsyslog.conf#2 integrate .. //depot/projects/ppc-g5/etc/syslog.conf#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/sort/config.h#2 integrate .. //depot/projects/ppc-g5/include/Makefile#3 integrate .. //depot/projects/ppc-g5/include/string.h#2 integrate .. //depot/projects/ppc-g5/kerberos5/include/config.h#2 integrate .. //depot/projects/ppc-g5/lib/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive.h#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_endian.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.h#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_platform.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_private.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_program.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_empty.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_mtree.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_zip.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#6 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/main.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_bzip2.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_bzip2_1.tbz.uu#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_bzip2_2.tbz.uu#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gzip.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gzip_1.tgz.uu#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gzip_2.tgz.uu#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_fuzz.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_fuzz_1.iso.uu#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_read_format_cpio_bin_bz2.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_read_format_gtar_sparse.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_read_pax_truncated.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_disk_perms.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_write_format_cpio.c#3 integrate .. //depot/projects/ppc-g5/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/ppc-g5/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/gen/times.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/ppc-g5/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/ppc-g5/lib/libc/string/Symbol.map#3 integrate .. //depot/projects/ppc-g5/lib/libc/string/strdup.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/string/strndup.c#1 branch .. //depot/projects/ppc-g5/lib/libc/string/strsep.3#2 integrate .. //depot/projects/ppc-g5/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/ppc-g5/lib/libc/sys/jail.2#2 integrate .. //depot/projects/ppc-g5/lib/libc/sys/recv.2#2 integrate .. //depot/projects/ppc-g5/lib/libkvm/kvm_proc.c#2 integrate .. //depot/projects/ppc-g5/lib/libmagic/config.h#2 integrate .. //depot/projects/ppc-g5/lib/libmd/Makefile#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/ppc-g5/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.3#4 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.atom.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.core2.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmclog.c#2 integrate .. //depot/projects/ppc-g5/lib/libstand/bootp.c#2 integrate .. //depot/projects/ppc-g5/lib/libstand/nfs.c#2 integrate .. //depot/projects/ppc-g5/lib/libthr/thread/thr_fork.c#2 integrate .. //depot/projects/ppc-g5/lib/libthr/thread/thr_rtld.c#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20.3#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20.h#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_compat01.c#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_compat01.h#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_desc.h#2 integrate .. //depot/projects/ppc-g5/lib/libusb20/libusb20_ugen20.c#2 integrate .. //depot/projects/ppc-g5/lib/libutil/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libutil/gr_util.c#3 integrate .. //depot/projects/ppc-g5/lib/libutil/kinfo_getfile.3#1 branch .. //depot/projects/ppc-g5/lib/libutil/kinfo_getfile.c#1 branch .. //depot/projects/ppc-g5/lib/libutil/kinfo_getvmmap.3#1 branch .. //depot/projects/ppc-g5/lib/libutil/kinfo_getvmmap.c#1 branch .. //depot/projects/ppc-g5/lib/libutil/libutil.h#2 integrate .. //depot/projects/ppc-g5/lib/libutil/realhostname.c#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/Symbol.map#2 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld_lock.c#3 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld_lock.h#2 integrate .. //depot/projects/ppc-g5/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/ppc-g5/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/ppc-g5/sbin/geom/class/part/geom_part.c#4 integrate .. //depot/projects/ppc-g5/sbin/geom/class/part/gpart.8#3 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/config.c#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/login.c#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/ppc-g5/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/ppc-g5/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/ppc-g5/sbin/newfs/Makefile#2 integrate .. //depot/projects/ppc-g5/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/ppc-g5/sbin/newfs/newfs.8#2 integrate .. //depot/projects/ppc-g5/sbin/newfs/newfs.c#2 integrate .. //depot/projects/ppc-g5/sbin/newfs/newfs.h#2 integrate .. //depot/projects/ppc-g5/sbin/newfs_msdos/newfs_msdos.8#2 integrate .. //depot/projects/ppc-g5/sbin/newfs_msdos/newfs_msdos.c#2 integrate .. //depot/projects/ppc-g5/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/ppc-g5/share/man/man4/Makefile#6 integrate .. //depot/projects/ppc-g5/share/man/man4/ale.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ath_hal.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/bce.4#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ddb.4#5 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.arm/Makefile#2 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/man4.powerpc/Makefile#2 integrate .. //depot/projects/ppc-g5/share/man/man4/man4.powerpc/pmu.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/upgt.4#2 integrate .. //depot/projects/ppc-g5/share/man/man5/fstab.5#2 integrate .. //depot/projects/ppc-g5/share/man/man7/hier.7#2 integrate .. //depot/projects/ppc-g5/share/man/man7/ports.7#2 integrate .. //depot/projects/ppc-g5/share/man/man9/Makefile#6 integrate .. //depot/projects/ppc-g5/share/man/man9/ktr.9#2 integrate .. //depot/projects/ppc-g5/share/man/man9/style.9#3 integrate .. //depot/projects/ppc-g5/share/man/man9/vfs_mountedon.9#2 delete .. //depot/projects/ppc-g5/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/ppc-g5/share/misc/bsd-family-tree#3 integrate .. //depot/projects/ppc-g5/share/misc/committers-src.dot#5 integrate .. //depot/projects/ppc-g5/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/ppc-g5/sys/amd64/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/ppc-g5/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/ppc-g5/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/ppc-g5/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/ppc-g5/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91.c#4 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/at91_mci.c#7 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91board.h#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/files.at91#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/ppc-g5/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/ppc-g5/sys/arm/at91/if_atereg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/kb920x_machdep.c#3 delete .. //depot/projects/ppc-g5/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/std.at91#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/std.bwct#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/std.hl200#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/ppc-g5/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/ppc-g5/sys/arm/conf/AVILA#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/BWCT#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/CRB#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/HL200#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/KB920X#4 integrate .. //depot/projects/ppc-g5/sys/arm/conf/NSLU#4 integrate .. //depot/projects/ppc-g5/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/ppc-g5/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/ppc-g5/sys/arm/include/atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/common.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/files.mv#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/obio.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/ppc-g5/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/ppc-g5/sys/boot/common/interp.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/common/loader.8#2 integrate .. //depot/projects/ppc-g5/sys/boot/forth/support.4th#2 integrate .. //depot/projects/ppc-g5/sys/boot/i386/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/ppc-g5/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/ppc-g5/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/ppc-g5/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/ppc-g5/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/ppc-g5/sys/bsm/audit.h#2 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/ppc-g5/sys/bsm/audit_record.h#3 integrate .. //depot/projects/ppc-g5/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/ppc-g5/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/ppc-g5/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/ppc-g5/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/ppc-g5/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/ppc-g5/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/ppc-g5/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/ppc-g5/sys/conf/Makefile.arm#3 integrate .. //depot/projects/ppc-g5/sys/conf/files#7 integrate .. //depot/projects/ppc-g5/sys/conf/files.amd64#4 integrate .. //depot/projects/ppc-g5/sys/conf/files.arm#3 integrate .. //depot/projects/ppc-g5/sys/conf/files.i386#5 integrate .. //depot/projects/ppc-g5/sys/conf/files.mips#5 integrate .. //depot/projects/ppc-g5/sys/conf/files.pc98#4 integrate .. //depot/projects/ppc-g5/sys/conf/files.powerpc#12 integrate .. //depot/projects/ppc-g5/sys/conf/files.sparc64#6 integrate .. //depot/projects/ppc-g5/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/ppc-g5/sys/conf/options#6 integrate .. //depot/projects/ppc-g5/sys/conf/options.arm#3 integrate .. //depot/projects/ppc-g5/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/README#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/dev/ath/version.h#3 delete .. //depot/projects/ppc-g5/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_if.c#3 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf_table.c#2 integrate .. //depot/projects/ppc-g5/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/adb/adb.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_ael1002.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_common.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_t3_hw.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_main.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/cxgb_sge.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_x86.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_82598.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_api.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_api.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_common.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_common.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_phy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_phy.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ixgbe/ixgbe_type.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jmereg.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jmevar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmc.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcsd.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/re/if_re.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/if_upgt.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/if_zyd.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/u3g.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/controller/uss820dci_pccard.c#3 delete .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_generic.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/core/usbdevs#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/urio2_ioctl.h#2 delete .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/xen/blkfront/block.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_node.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/procfs/procfs_map.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/ppc-g5/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_ccd.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_subr.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part.c#5 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_gpt.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rename.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/ppc-g5/sys/i386/conf/NOTES#4 integrate .. //depot/projects/ppc-g5/sys/i386/conf/PAE#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/XEN#5 integrate .. //depot/projects/ppc-g5/sys/i386/cpufreq/est.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/cpufreq/p4tcc.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/cpufreq/powernow.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/i386/msi.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/ppc-g5/sys/i386/include/md_var.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/pmc_mdep.h#5 integrate .. //depot/projects/ppc-g5/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/ppc-g5/sys/i386/include/xen/xenbus.h#2 delete .. //depot/projects/ppc-g5/sys/i386/linux/linux.h#5 integrate .. //depot/projects/ppc-g5/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/ppc-g5/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/ppc-g5/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/ppc-g5/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/isa/isa_common.c#3 integrate .. //depot/projects/ppc-g5/sys/isa/isa_common.h#3 integrate .. //depot/projects/ppc-g5/sys/isa/isahint.c#2 integrate .. //depot/projects/ppc-g5/sys/isa/isavar.h#3 integrate .. //depot/projects/ppc-g5/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/ppc-g5/sys/kern/bus_if.m#2 integrate .. //depot/projects/ppc-g5/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_conf.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_descrip.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_exec.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_exit.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_fork.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_jail.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_linker.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_module.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_poll.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_proc.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_thr.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_bufring.c#1 branch .. //depot/projects/ppc-g5/sys/kern/subr_bus.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/subr_param.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/subr_witness.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_mqueue.c#5 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_cache.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_export.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/ppc-g5/sys/libkern/iconv.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/conf/IDT#5 integrate .. //depot/projects/ppc-g5/sys/mips/conf/SENTRY5#5 integrate .. //depot/projects/ppc-g5/sys/mips/include/atomic.h#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/modules/Makefile#7 integrate .. //depot/projects/ppc-g5/sys/modules/ae/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ath/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ath_hal/Makefile#2 delete .. //depot/projects/ppc-g5/sys/modules/ath_rate_amrr/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/ath_rate_onoe/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/bridgestp/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/cxgb/iw_cxgb/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/hwpmc/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/linux/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/netgraph/atm/atm/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/netgraph/ether/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/pf/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/powermac_nvram/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/uart/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/wlan/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/net/bpf.c#4 integrate .. //depot/projects/ppc-g5/sys/net/bridgestp.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if.c#5 integrate .. //depot/projects/ppc-g5/sys/net/if_bridge.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_ef.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/ppc-g5/sys/net/if_faith.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_gif.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_gre.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_lagg.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_loop.c#3 integrate .. //depot/projects/ppc-g5/sys/net/if_mib.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_stf.c#4 integrate .. //depot/projects/ppc-g5/sys/net/if_tun.c#5 integrate .. //depot/projects/ppc-g5/sys/net/if_var.h#3 integrate .. //depot/projects/ppc-g5/sys/net/if_vlan.c#4 integrate .. //depot/projects/ppc-g5/sys/net/radix.c#2 integrate .. //depot/projects/ppc-g5/sys/net/radix.h#2 integrate .. //depot/projects/ppc-g5/sys/net/raw_cb.c#3 integrate .. //depot/projects/ppc-g5/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/ppc-g5/sys/net/route.c#5 integrate .. //depot/projects/ppc-g5/sys/net/route.h#4 integrate .. //depot/projects/ppc-g5/sys/net/rtsock.c#4 integrate .. //depot/projects/ppc-g5/sys/net/vnet.h#2 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_ddb.c#5 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/ppc-g5/sys/net80211/ieee80211_wds.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_gif.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/ppc-g5/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/if_ether.c#6 integrate .. //depot/projects/ppc-g5/sys/netinet/igmp.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/in.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/in.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in_gif.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/in_proto.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/in_var.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip6.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_id.c#2 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_input.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_mroute.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 9 20:52:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE67E1065675; Tue, 9 Dec 2008 20:52:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 914DA1065673 for ; Tue, 9 Dec 2008 20:52:19 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7FD548FC1D for ; Tue, 9 Dec 2008 20:52:19 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9KqJle058620 for ; Tue, 9 Dec 2008 20:52:19 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9KqJgk058618 for perforce@freebsd.org; Tue, 9 Dec 2008 20:52:19 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 9 Dec 2008 20:52:19 GMT Message-Id: <200812092052.mB9KqJgk058618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 20:52:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=154413 Change 154413 by rene@rene_self on 2008/12/09 20:51:44 MFen handbook/boot 1.65 -> 1.68 (plus local fixes) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#3 (text+ko) ==== @@ -3,7 +3,9 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.7 2006/08/25 16:46:17 remko Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.34 2006/08/25 16:42:35 remko Exp $ - Gebaseerd op: 1.65 + + %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml + %SRCID% 1.68 --> @@ -196,10 +198,11 @@ /boot/boot0. Het programma boot0 is erg eenvoudig, omdat MBR maar 446 bytes lang mag zijn vanwege de - slicetabel en de 0x55AA identificatie aan het einde van de - MBR. Als de &os; MBR is geïnstalleerd en er staan - andere besturingssystemen op een harde schijf, dan is bij het - opstarten een scherm zien dat er ongeveer zo uitziet: + slicetabel en de 0x55AA identificatie aan + het einde van de MBR. Als de &os; MBR is geïnstalleerd + en er staan andere besturingssystemen op een harde schijf, dan + is bij het opstarten een scherm te zien dat er ongeveer zo + uitziet: @@ -573,6 +576,198 @@ + + + + + + Joseph J. + Barbish + Bijgedragen door + + + + + Splash-schermen tijdens het opstarten + + Het splash-scherm creëert een visueel aantrekkelijker + scherm in vergelijking met de originele opstartberichten. Dit + scherm zal worden afgebeeld totdat een aanmeldprompt op de + console verschijnt of een X-schermbeheerder een aanmeldprompt + aanbiedt. + + Er zijn twee basisomgevingen beschikbaar in &os;. De + eerste is de verouderde standaardomgeving met de opdrachtregel + op de virtuële console. Nadat het systeem klaar is met + opstarten, wordt er een aanmeldprompt op de console + gepresenteerd. De tweede omgeving is de grafische omgeving + van het X11 Bureaublad. Nadat X11 en één van de + grafische bureaubladomgevingen, + zoals GNOME, + KDE, of + XFce zijn geïnstalleerd, kan + het X11-bureaublad worden gestart door het commando + startx te gebruiken. + + Sommige gebruikers verkiezen het grafische aanmeldscherm + van X11 boven de traditionele op tekst gebaseerde + aanmeldprompt. Schermbeheerders zoals + XDM voor &xorg;, + gdm voor + GNOME, en + kdm voor + KDE (en anderen van de + Portscollectie) bieden in principe een grafisch aanmeldscherm + in plaats van de aanmeldprompt op het console. Na succesvol + aanmelden bieden ze de gebruiker een grafisch + bureaublad. + + In de opdrachtregelomgeving zou het splash-scherm alle + berichten over aftasten tijdens het opstarten en het starten + van taken verbergen voordat het de aanmeldprompt laat zien. + In een X11-omgeving zouden gebruikers een visueel + overzichtelijkere opstartervaring krijgen dat meer lijkt op + wat een gebruiker van een (µsoft; &windows; of + niet-Unix-systeem) zou ervaren. + + + Splash-schermfuncties + + De splash-schermfunctie ondersteunt alleen + 256-kleuren-bitmaps (.bmp) of ZSoft + PCX (.pcx) + bestanden. Verder moeten de splash-afbeeldingsbestanden een + resolutie van 320 bij 200 pixels of minder hebben om op de + standaard VGA-adapters te werken. + + Activeer de VESA-ondersteuning die in + &os; zit om grotere afbeeldingen, tot de maximale resolutie + van 1024 bij 768 pixels, te gebruiken. Dit kan worden + aangezet door de VESA-module tijdens het + opstarten van het systeem te laden, of door de + kernelconfiguratieoptie VESA toe te + voegen en een eigen kernel te bouwen (zie ). De ondersteuning voor + VESA geeft gebruikers de mogelijkheid om + een splash-schermafbeelding af te beelden dat het hele + scherm vult. + + Zolang het splash-scherm wordt afgebeeld tijdens het + opstartproces, kan het ten alle tijden worden uitgezet door + op een toetsenbordtoets te drukken. + + Het splash-scherm is standaard ook een schermbeveiliging + buiten X11. Na een periode van inactiviteit zal het scherm + in het splash-scherm veranderen en herhaald door stappen van + het veranderen van de intensiteit van de afbeelding lopen, + van helder tot zeer donker. Dit standaardgedrag van het + splash-scherm (schermbeveiliging) kan overruled worden door + een regel met saver= toe te voegen aan + /etc/rc.conf. De optie + saver= heeft verschillende ingebouwde + schermbeveiligingen om uit te kiezen, de volledige lijst + staat in de handleidingpagina &man.splash.4;. De standaard + schermbeveiliging heet warp. Merk op dat de + optie saver= die in + /etc/rc.conf is gespecificeerd alleen + betrekking heeft op virtuele consoles. Het heeft geen + effect op X11-schermbeheerders. + + Enkele meldingen van de bootloader, inclusief de opties + van het opstartmenu en een getimede wachtende aftelprompt + worden afgebeeld tijdens het opstarten, zelfs als het + splash-scherm aanstaat. + + Voorbeelden van splash-schermen kunnen gedownload worden + van de galerij op . Door de + port sysutils/bsd-splash-changer te + installeren, kunnen de splash-afbeeldingen willekeurig elke + keer dat er wordt opgestart uit een verzameling worden + gekozen. + + + + De splash-schermfunctie aanzetten + + Het splash-schermbestand (.bmp of + .pcx) moet op de rootpartitie staan, + bijvoorbeeld in de map /boot. + + Bewerk voor de standaard resolutie van het opstartscherm + (256 kleuren, 320 bij 200 pixels, of minder) + /boot/loader.conf zodat het het + volgende bevat: + + splash_bmp_load="YES" +bitmap_load="YES" +bitmap_name="/boot/splash.bmp" + + Bewerk voor grotere videoresoluties tot maximaal 1024 + bij 768 pixels /boot/loader.conf zodat + het het volgende bevat: + + vesa_load="YES" +splash_bmp_load="YES" +bitmap_load="YES" +bitmap_name="/boot/splash.bmp" + + Het bovenstaande neemt aan dat + /boot/splash.bmp + voor het splash-scherm wordt gebruikt. Wanneer een + PCX-bestand gewenst is, dienen de + volgende opdrachten gebruikt te worden, en afhankelijk van + de resolutie de regel vesa_load="YES". + + splash_pcx_load="YES" +bitmap_load="YES" +bitmap_name="/boot/splash.pcx" + + De bestandsnaam is niet beperkt tot + splash zoals in het bovenstaande voorbeeld. + Het kan van alles zijn zolang het van het type + BMP of PCX is, zoals + splash_640x400.bmp + of + blue_wave.pcx. + + Enkele andere interessante opties voor + loader.conf: + + + + beastie_disable="YES" + + + Dit zal het menu met opstartopties niet weergeven, + maar de getimede wachtende aftelprompt zal nog steeds + aanwezig zijn. Zelfs zonder dat het menu met + opstartopties wordt afgebeeld, zal het invoeren van + een optie in de getimede wachtende aftelprompt de + actie van de overeenkomstige opstartoptie + uitvoeren. + + + + + loader_logo="beastie" + + + Dit zal de standaardwoorden &os;, + welke rechts van het menu met opstartopties worden + afgebeeld vervangen door het gekleurde beastie-logo + zoals vroegere uitgaven die hadden. + + + + + Raadpleeg voor meer informatie de handleidingpagina's + &man.splash.4;, &man.loader.conf.5;, en &man.vga.4;. + + @@ -704,7 +899,7 @@ hint.driver.unit.keyword="waarde" - De syntaxis voor de Fase 3 boot loader is: + De syntaxis voor de Fase 3 bootloader is: set hint.driver.unit.keyword=waarde From owner-p4-projects@FreeBSD.ORG Tue Dec 9 20:54:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BD4A1065679; Tue, 9 Dec 2008 20:54:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C38F41065677 for ; Tue, 9 Dec 2008 20:54:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B278E8FC17 for ; Tue, 9 Dec 2008 20:54:21 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9KsLrw067585 for ; Tue, 9 Dec 2008 20:54:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9KsLlk067580 for perforce@freebsd.org; Tue, 9 Dec 2008 20:54:21 GMT (envelope-from jhb@freebsd.org) Date: Tue, 9 Dec 2008 20:54:21 GMT Message-Id: <200812092054.mB9KsLlk067580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 154414 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 20:54:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=154414 Change 154414 by jhb@jhb_mutex on 2008/12/09 20:54:19 Ensure that driver identify routines only get called at the driver's pass level. Affected files ... .. //depot/projects/multipass/notes#4 edit .. //depot/projects/multipass/sys/kern/subr_bus.c#3 edit .. //depot/projects/multipass/sys/sys/bus.h#3 edit Differences ... ==== //depot/projects/multipass/notes#4 (text+ko) ==== @@ -8,10 +8,13 @@ - BUS_PASS_BUSSES (10) - enumerate busses, bridges usually should be here - BUS_PASS_CPUS (20) -- BUS_PASS_INTERRUPT_CONTROLLERS (30) -- BUS_PASS_TIMERS (40) -- will want to start up SMP and schedulers after this point before continuing - further, can clear cold as well then +- BUS_PASS_RESOURCE (30) + - resource discovery happens after this pass +- BUS_PASS_INTERRUPT_CONTROLLERS (40) +- BUS_PASS_TIMERS (50) +- BUS_PASS_SCHEDULER (60) + - will want to start up SMP and schedulers after this point before continuing + further, can clear cold as well then - BUS_PASS_DEFAULT (INT_MAX) Milestones / Todo: @@ -33,3 +36,34 @@ + Change root_bus_configure() to raise the pass level to kick off a scan. + Don't invoke BUS_PROBE_NOMATCH() until a device fails to match during the last pass. ++ Handle identify routines. bus_generic_probe() only calls identify for + drivers at or below the current pass level, so is always suitable to + be called from an attach routine, both for early and regular drivers. It + can also be called from an early driver kldload'ed after boot and DTRT. + BUS_NEW_PASS() is now responsible for calling the identify routines for + any drivers for the current pass (only == current pass). Right now this + is just in bus_generic_new_pass(). + +Guidelines for Writing an Early Driver: +--------------------------------------- +- Use bus_generic_new_pass() for 'bus_new_pass' device method in bus_if.m. +- Use EARLY_DRIVER_MODULE() for attachment to specify pass. +- If you support being in a kld that can be loaded after boot then your + attach routine may need to perform the work of later passes explicitly + in its attach routine if bus_current_pass is too high. + +Thoughts about Resource Discovery: +---------------------------------- +- First raise pass to BUS_PASS_RESOURCE via bus_set_pass(). +- Rather than requiring drivers to overload BUS_NEW_PASS() to hook + BUS_PASS_RESOURCE(), add a new device_if.h method bus_discover_resources(). +- For the PCI case: + - pcibX devices may create resource managers that they sub-allocate to + child devices from (though requests from, e.g. ISA devices may need to + pass through?). For ACPI and MP Table we can actually build these + resource managers from BIOS info. + - For PCI-PCI bridges, we alway use a resource manager that represents the + resource windows in the bridge that we sub-allocate to child devices. +- We will need a way to destroy a resource manager, and something like + device_set_desc_copy() where the rman allocates its own copy of the name + and frees it on destroy. ==== //depot/projects/multipass/sys/kern/subr_bus.c#3 (text+ko) ==== @@ -3031,6 +3031,17 @@ driverlink_t dl; TAILQ_FOREACH(dl, &dc->drivers, link) { + /* + * If this driver's pass is too high, then ignore it. + * For most drivers in the default pass, this will + * never be true. For early-pass drivers they will + * only call the identify routines of eligible drivers + * when this routine is called. Drivers for later + * passes should have their identify routines called + * on early-pass busses during BUS_NEW_PASS(). + */ + if (dl->pass > bus_current_pass) + continue; DEVICE_IDENTIFY(dl->driver, dev); } @@ -3260,16 +3271,22 @@ /** * @brief Helper function for implementing BUS_NEW_PASS(). * - * This implementing of BUS_NEW_PASS() walks the list of devices for this - * bus. If a device is already attached, then it calls BUS_NEW_PASS() on - * that device. If the device is not already attached, it attempts to - * attach a driver to it. + * This implementing of BUS_NEW_PASS() first calls the identify + * routines for any drivers that probe at the current pass. Then it + * walks the list of devices for this bus. If a device is already + * attached, then it calls BUS_NEW_PASS() on that device. If the + * device is not already attached, it attempts to attach a driver to + * it. */ void bus_generic_new_pass(device_t dev) { device_t child; + TAILQ_FOREACH(dl, &dc->drivers, link) { + if (dl->pass == bus_current_pass) + DEVICE_IDENTIFY(dl->driver, dev); + } TAILQ_FOREACH(child, &dev->children, link) { if (child->state >= DS_ATTACHED) BUS_NEW_PASS(child); ==== //depot/projects/multipass/sys/sys/bus.h#3 (text+ko) ==== @@ -525,8 +525,10 @@ #define BUS_PASS_ROOT 0 /* Used to attach root0. */ #define BUS_PASS_BUS 10 /* Busses and bridges. */ #define BUS_PASS_CPU 20 /* CPU devices. */ -#define BUS_PASS_INTERRUPT 30 /* Interrupt controllers. */ -#define BUS_PASS_TIMER 40 /* Timers and clocks. */ +#define BUS_PASS_RESOURCE 30 /* Resource discovery. */ +#define BUS_PASS_INTERRUPT 40 /* Interrupt controllers. */ +#define BUS_PASS_TIMER 50 /* Timers and clocks. */ +#define BUS_PASS_SCHEDULER 60 /* Start scheduler. */ #define BUS_PASS_DEFAULT __INT_MAX /* Everything else. */ extern int bus_current_pass; From owner-p4-projects@FreeBSD.ORG Tue Dec 9 22:18:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 532E41065673; Tue, 9 Dec 2008 22:18:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 192AE106567E for ; Tue, 9 Dec 2008 22:18:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 069628FC16 for ; Tue, 9 Dec 2008 22:18:48 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB9MIlGK057599 for ; Tue, 9 Dec 2008 22:18:47 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB9MIl0Z057596 for perforce@freebsd.org; Tue, 9 Dec 2008 22:18:47 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 9 Dec 2008 22:18:47 GMT Message-Id: <200812092218.mB9MIl0Z057596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2008 22:18:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=154419 Change 154419 by rene@rene_self on 2008/12/09 22:18:23 IFC (manually merge back contributing Makefile and article.sgml) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/Makefile#2 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#9 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#13 integrate .. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#7 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.60 2008/05/31 13:32:19 remko Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/articles/Makefile,v 1.2 2008/12/09 21:38:35 rene Exp $ # %SOURCE% en_US.ISO8859-1/articles/Makefile # %SRCID% 1.60 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/Makefile,v 1.6 2004/07/06 15:09:51 hrs Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/articles/contributing/Makefile,v 1.1 2008/12/09 21:38:35 rene Exp $ # # Article: Contributing to FreeBSD ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#9 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -348,7 +348,7 @@ Het geprefereerde &man.diff.1;-formaat voor het opsturen van patches is het verenigde uitvoerformaat gegenereerd door diff -u. Echter, voor patches die - substantieel een gebied van code wijzigen, kan een diff in + substantieel een gebied aan code wijzigen, kan een diff in contextuitvoerformaat gegenereerd door diff -c leesbaarder en dus verkiesbaar zijn. @@ -364,7 +364,7 @@ of - &prompt.user; diff -c -r oudbestand nieuwbestand + &prompt.user; diff -c -r oudemap nieuwemap zal zo'n verzameling van contextdiffs aanmaken voor het gegeven broncodebestand of maphiërarchie. @@ -374,13 +374,12 @@ of - &prompt.user; diff -u -r oudbestand nieuwbestand + &prompt.user; diff -u -r oudemap nieuwemap zal hetzelfde doen, maar dan in het verenigde diff-formaat. - Zie de hulppagina voor &man.diff.1; voor meer - details. + Zie de hulppagina van &man.diff.1; voor meer details. Als u eenmaal een verzameling aan diffs heeft (welke u kunt testen met het commando &man.patch.1;), dient u ze op te sturen @@ -391,7 +390,7 @@ alleen naar de &a.hackers; op omdat ze dan verloren raken! We stellen uw toezending erg op prijs (dit is een vrijwilligersproject!); omdat we het druk hebben kan het zijn - dat we het direct kunnen behandelen, maar het blijft in de + dat we het niet direct kunnen behandelen, maar het blijft in de PR-database totdat we het doen. Geef uw toezending aan door [PATCH] in het overzicht van het rapport op te nemen. @@ -454,7 +453,11 @@ &os; te investeren. - GPLGNU General Public License + + GPL + + GNU General Public License + GNU General Public License @@ -514,8 +517,7 @@ $Id$ - Voor uw gemak kan een kopie van deze tekst gevonden worden - in + Voor uw gemak staat een kopie van deze tekst in /usr/share/examples/etc/bsd-style-copyright. @@ -540,7 +542,7 @@ inkomstenbelasting van de overheid van de VS alsook van inkomstenbelasting van de staat Colorado. Donaties aan een entiteit die van belasting is uitgesloten zijn vaak aftrekbaar - van het belastbaar nationaal inkomen. + van het belastbaar overheidsinkomen. Donaties kunnen als check verstuurd worden aan:
    ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ + - The Documentation Build Process + A dokumentáció + elõállításának folyamata - This chapter's main purpose is to clearly explain how - the documentation build process is organized, and - how to affect modifications to this process. - + Ebben a fejezetben szeretnénk pontosan tisztázni + hogyan szervezõdik a dokumentáció + elõállításának folyamata + és hogyan tudunk ebbe + beavatkozni. - After you have finished reading this chapter you should: + A fejezet elolvasása során + megismerjük: - Know what you need to build the FDP documentation, in - addition to those mentioned in the SGML tools chapter. + az SGML eszközeirõl + szóló fejezetben említetteken + túl a &os; Dokumentációs Projekt keretein + belül készített dokumentáció + különbözõ változatainak + elõállításához mire van + még szükségünk; - Be able to read and understand the - make instructions that are present in - each document's Makefiles, as well as an - overview of the doc.project.mk includes. + a dokumentumokhoz tartozó + Makefile állományokban + szereplõ make + utasításokat, valamint a hivatkozott + doc.project.mk vázlatos + felépítését; - + - Be able to customize the build process by using - make variables and - make targets. + további make + változókon és célokon keresztül + miként tudjuk testreszabni a dokumentáció + különbözõ változatainak + elõállítási folyamatát. - The FreeBSD Documentation Build Toolset + A &os; dokumentáció + elõállításának + eszközei - Here are your tools. Use them every way you can. + Munkánk folyamán az itt felsorolt + eszközök állnak rendelkezésünkre. + Használjuk ki az általuk nyújtott + lehetõségeket, amennyire csak tudjuk. - The primary build tool you will need is - make, but specifically + Az elsõdleges eszköz maga a + make parancs, pontosabban a Berkeley Make. - Package building is handled by FreeBSD's - pkg_create. If you are not using - FreeBSD, you will either have to live without packages, or - compile the source yourself. + Csomagokat a &os; alaprendszerében + megtalálható pkg_create + programmal tudunk készíteni. Ha nem &os; alatt + dolgozunk, akkor vagy csomagok nélkül kell + dolgoznunk, vagy magunknak kell ezeket + elkészítenünk. - gzip is needed to create - compressed versions of the document. - bzip2 compression and - zip archives are also supported. - tar is supported, but package - building demands it. + A gzip + segítségével lehet az + elõállított dokumentumok + tömörített változatát + elkészíteni. Emellett még a + bzip2 és zip + típusú tömörítés is + támogatott. A tar programot is + támogatjuk, a csomagok + készítéséhez kell. - install is the default method - to install the documentation. There are alternatives, - however. + A dokumentáció + telepítésének elfogadott eszköze az + install program. Természetesen + léteznek egyéb megoldások is. - It is unlikely you will have any trouble finding these last two, they - are mentioned for completeness only. + Nem valószínû, hogy ez az utolsó + két eszközt ne lenne elérhetõ a + rendszerünkön, csupán a teljesség + kedvéért említettük meg ezeket. - Understanding Makefiles in the Documentation tree + A dokumentációt tároló + könyvtárban található + <filename>Makefile</filename> állományok - There are three main types of Makefiles - in the FreeBSD Documentation Project tree. + A &os; Dokumentációs Projekt által + használt könyvtárakban megtalálható + Makefile állományoknak + három típusa létezik: - Subdirectory - Makefiles simply pass - commands to those directories below them. + Az alkönyvtári + Makefile állományok + egyszerûen csak továbbadják a parancsokat + az alkönyvtáraiknak. - Documentation - Makefiles describe the - document(s) that should be produced from this directory. + A dokumentumokra vonatkozó + Makefile állományok + írják le, hogy milyen dokumentumokat kellene az + adott könyvtárban + elõállítani. - Make - includes are the glue that perform the document production, - and are usually of the form - doc.xxx.mk. + Az .mk + állományok segítik valamilyen + formában a dokumentumok + elõállítását. Többnyire + doc.xxx.mk + névvel láthatóak. - Subdirectory Makefiles + Az alkönyvtári <filename>Makefile</filename> + állományok - These Makefiles usually take the form of: + Ezek a típusú Makefile + állományok általában a + következõ alakúak: SUBDIR =articles SUBDIR+=books @@ -147,58 +185,89 @@ DOC_PREFIX?= ${.CURDIR}/.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" - In quick summary, the first four non-empty lines define the - make variables, - SUBDIR, COMPAT_SYMLINK, - and DOC_PREFIX. + Röviden összefoglalva: az elsõ négy + nem üres sorban ún. make + változókat definiálunk. Ezek rendre a + SUBDIR, COMPAT_SYMLINK + és DOC_PREFIX. - The first SUBDIR statement, as well as - the COMPAT_SYMLINK statement, shows how to - assign a value to a variable, overriding any previous - value. + Az elsõ SUBDIR sornál, + illetve a COMPAT_SYMLINK sorában + láthatjuk hogyan kell egy új értéket + beállítani egy ilyen + változónak. - The second SUBDIR statement shows how a - value is appended to the current value of a variable. The - SUBDIR variable is now articles - books. + A második SUBDIR sorban azt + láthatjuk, hogyan tudunk a változó + aktuális értékéhez + továbbiakat hozzáfûzni. Ebben az esetben + tehát az utasítás + végrehajtása után a + SUBDIR értéke articles + books lesz. - The DOC_PREFIX assignment shows how a - value is assigned to the variable, but only if it is not already - defined. This is useful if DOC_PREFIX is not - where this Makefile thinks it is - the user - can override this and provide the correct value. + A DOC_PREFIX esetében pedig olyan + értékadást figyelhetünk meg, amelyik + csak akkor hajtódik végre ténylegesen, ha a + változónak addig még nem volt + értéke. Ez olyankor tud kapóra jönni, + amikor a DOC_PREFIX nem pontosan az, amire a + Makefile számít — a + felhasználó ekkor meg tudja adni a helyes + értéket. - Now what does it all mean? SUBDIR - mentions which subdirectories below this one the build process - should pass any work on to. + Ez így együttesen tehát mit is jelent? A + SUBDIR összefoglalja azokat a + könyvtárakat, amelyekben a dokumentumok + elõállításának + folyamatának folytatódnia kell majd. - COMPAT_SYMLINK is specific to - compatibility symlinks (amazingly enough) for languages to their - official encoding (doc/en would point to - en_US.ISO-8859-1). + A COMPAT_SYMLINK a kompatibilitás + céljából létrehozott szimbolikus + linkekre vonatkozik, amelyek (valamilyen csoda folytán) + az adott nyelv hivatalos kódolására + mutatnak (tehát például a + doc/en a + en_US.ISO8859-1 + könyvtárra). - DOC_PREFIX is the path to the root of the - FreeBSD Document Project tree. This is not always that easy to - find, and is also easily overridden, to allow for flexibility. - .CURDIR is a make - builtin variable with the path to the current directory. + A DOC_PREFIX a &os; + Dokumentációs Projekt + fõkönyvtárához vezetõ utat adja + meg. Ezt nem mindig egyszerû megtalálni, + ezért a rugalmasság kedvéért + könnyedén felül is definiálható. + A .CURDIR a make egyik + saját belsõ változója, amelyben az + aktuális könyvtár elérési + útját tárolja. - The final line includes the FreeBSD Documentation Project's - project-wide make system file - doc.project.mk which is the glue which - converts these variables into build instructions. + Végül az utolsó sorban a &os; + Dokumentációs Projekt összes + Makefile állományára + vonatkozó, rendszerszintû + doc.project.mk állományra + hivatkozunk, amelyen keresztül az iménti + változókból épül fel a + dokumentumok elõállításának + pontos menete. + - - Documentation Makefiles + A dokumentumokra vonatkozó + <filename>Makefile</filename> állományok - These Makefiles set a bunch of - make variables that describe how to - build the documentation contained in that directory. + Ezekben a Makefile + állományokban az adott könyvtárban + található dokumentumok + elõállítását + leíró különbözõ + make változók + szerepelnek. - Here is an example: + Lássunk erre egy példát: - MAINTAINER=nik@FreeBSD.org + MAINTAINER=pgj@FreeBSD.org DOC?= book @@ -207,78 +276,106 @@ INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -# SGML content +# Az SGML forrás SRCS= book.sgml DOC_PREFIX?= ${.CURDIR}/../../.. .include "$(DOC_PREFIX)/share/mk/docproj.docbook.mk" - The MAINTAINER variable is a very - important one. This variable provides the ability to claim - ownership over a document in the FreeBSD Documentation - Project, whereby you gain the responsibility for maintaining - it. + A MAINTAINER változó nagyon + fontos. A &os; Dokumentációs Projekten belül + ezen a változón keresztül jelezhetjük a + dokumentum birtoklását, vagyis + karbantartási kötelezettségünket. - DOC is the name (sans the - .sgml extension) of the main document - created by this directory. SRCS lists all - the individual files that make up the document. This should - also include important files in which a change should result - in a rebuild. + A DOC hivatkozik (az + .sgml kiterjesztés + nélkül) az adott könyvtárban + található dokumentum fõ + forrására. Emellett az SRCS + változóban kell összefoglalnunk a + dokumentumot alkotó források neveit. Ebben + érdemes megadni minden olyan állományt, + amelynek megváltozása esetén újra + elõ kell állítani az érintett + dokumentumot. - FORMATS indicates the default formats - that should be built for this document. - INSTALL_COMPRESSED is the default list of - compression techniques that should be used in the document - build. INSTALL_ONLY_COMPRESS, empty by - default, should be non-empty if only compressed documents are - desired in the build. + A FORMATS + segítségével definiáljuk a dokumentum + alapértelmezetten elõállítandó + formátumait. A INSTALL_COMPRESSED + változóban a dokumentum + elkészítésekor felhasználandó + tömörítési formákat adhatjuk meg. + A INSTALL_ONLY_COMPRESSED + változó alapból üres, de ha adunk neki + valamilyen egyéb értéket, akkor a + dokumentumoknak csak a tömörített + változata fog elkészülni. - We covered optional variable assignments in the - previous section. + A változók feltételes + értékadásáról már + volt szó az elõzõ + szakaszban. - The DOC_PREFIX and include statements - should be familiar already. + A DOC_PREFIX változó + és az .include utasítás a + korábbiak alapján már ismerõs + lehet. - FreeBSD Documentation Project make includes + A &os; Dokumentációs Projekt + <filename>.mk</filename> állományai - This is best explained by inspection of the code. Here are - the system include files: + Ezek az állományok legjobban talán + önmagukon keresztül mutathatóak be. A + következõ rendszerszintû .mk + állományokat használjuk a &os; + Dokumentációs Projektben: - doc.project.mk is the main project - include file, which includes all the following include files, as - necessary. + A doc.project.mk a központi + .mk állomány, amely + szükség szerint hivatkozik az összes + többi .mk + állományra. - doc.subdir.mk handles traversing of - the document tree during the build and install processes. + Az elõállítás és a + telepítés során a + doc.subdir.mk felelõs a dokumentumokat + tároló könyvtárak + bejárásért. - doc.install.mk provides variables - that affect ownership and installation of documents. + A doc.install.mk tartalmazza a + karbantartóval és a telepítéssel + kapcsolatos változókat. - doc.docbook.mk is included if - DOCFORMAT is docbook - and DOC is set. + A doc.docbook.mk + állomány csak akkor kerül + feldolgozásra, ha a DOCFORMAT + értéke docbook és a + DOC változónak van + értéke. - doc.project.mk + A <filename>doc.project.mk</filename> + állomány - By inspection: + Nézzünk bele: DOCFORMAT?= docbook MAINTAINER?= doc@FreeBSD.org @@ -296,99 +393,146 @@ .include "doc.install.mk" + Változók - Variables + Ha nem állítjuk be a dokumentum + Makefile + állományában, akkor a + DOCFORMAT és a + MAINTAINER változók ezen a + helyen kapnak értéket. - DOCFORMAT and MAINTAINER - are assigned default values, if these are not set by the - document make file. + A PREFIX adja azt a + könyvtárat, amelyen belül + elérhetõek a + dokumentáció + elõállításához + szükséges eszközök. + A csomagok és portok átlagos használata + esetén ez a /usr/local. - PREFIX is the prefix under which the - documentation building tools are - installed. For normal package and port installation, this is - /usr/local. + A PRI_LANG adja meg azt a nyelvet + és kódolást, amely a + dokumentációt olvasó + felhasználó számára + elsõdlegesként leginkább elfogadott. + Alapértelmezés szerint ez az amerikai + angol. - PRI_LANG should be set to whatever - language and encoding is natural amongst users these documents are - being built for. US English is the default. - - PRI_LANG in no way affects what documents - can, or even will, be built. Its main use is creating links to - commonly referenced documents into the FreeBSD documentation - install root. + A PRI_LANG változó + semmilyen hatással nincs a dokumentumok + elõállítására. + Egyedül a &os; dokumentáció + telepítésekor a leggyakrabban hivatkozott + dokumentumokhoz létrehozandó szimbolikus + linkek készítésénel van + szerepe. - Conditionals - - The .if defined(DOC) line is an example of - a make conditional which, like in - other programs, defines behavior if some condition is true or - if it is false. defined is a function which - returns whether the variable given is defined or not. + Elágazások + + A .if defined(DOC) sorban a + Makefile állományokban + megadható elágazásokra láthatunk + példát. Hasonlóan más + programokhoz, a Makefile + mûködését tudjuk meghatározni + egy logikai kifejezés + igazságértéktõl függõen. + Ebben a kifejezésben a defined + függvény, amely megadja, hogy a + paramétereként megadott változó + definiált-e. - .if ${DOCFORMAT} == "docbook", next, - tests whether the DOCFORMAT variable is - "docbook", and in this case, includes - doc.docbook.mk. + A következõ elágazásban, vagyis az + .if ${DOCFORMAT} == "docbook" + utasításban azt vizsgáljuk meg, hogy a + DOCFORMAT változó + értéke "docbook" vagy sem. + Amennyiben a válasz erre igen (vagyis + igaz), beemeljük a + doc.docbook.mk tartalmát. - The two .endifs close the two above - conditionals, marking the end of their application. + Az elõbb említett két + elágazást rendre az .endif + kulcsszóval zárjuk le. - doc.subdir.mk + A <filename>doc.subdir.mk</filename> + állomány - This is too long to explain by inspection, you should be - able to work it out with the knowledge gained from the previous - chapters, and a little help given here. + Ez az állomány már + túlságosan nagy ahhoz, hogy a fejezeten belül + könnyen ki lehessen elemezni. Ezért az + elõzõ szakaszok alapján a részleteket a + kedves Olvasóra bízzuk, ehhez adunk még itt + némi segítséget. - Variables + Változók - SUBDIR is a list of subdirectories - that the build process should go further down - into. + A SUBDIR tartalmazza azokat az + alkönyvtárakat, amelyeket a feldolgozás + során be kell járnunk. - ROOT_SYMLINKS is the name of - directories that should be linked to the document - install root from their actual locations, if the current - language is the primary language (specified by - PRI_LANG). + A ROOT_SYMLINKS a + dokumentáció + fõkönyvtárából + szimbolikusan linkelendõ könyvtárak + neveit adja meg, amennyiben az adott nyelv (a + PRI_LANG változó szerint) + az elsõdleges. - COMPAT_SYMLINK is described in the - Subdirectory Makefile - section. + A COMPAT_SYMLINK + változót már korábban bemutattuk + az alkönyvtári + Makefile + állományok címû + szakaszban. - Targets and macros + Célok és makrók - Dependencies are described by - target: - dependency1 dependency2 ... - tuples, where to build target, you need to build - the given dependencies first. + A függõségi viszonyokat + cél: + függõség1 + függõség2 ... + formában írjuk fel, ahol így megmondjuk, + hogy a cél + létrehozásához elõször milyen + elemeknek kell létezniük. Ezeket nevezzük + függõségeknek. - After that descriptive tuple, instructions on how to build - the target may be given, if the conversion process between the - target and its dependencies are not previously defined, or if - this particular conversion is not the same as the default - conversion method. + A függõségi viszony megadása alatt + lehetõségünk van részletezni a + függõségekbõl a cél + elõállításához + szükséges utasításokat. Ezt akkor + kell megtenni, ha a cél és a + függõségek közti + átalakítást elõzõleg még + nem definiáltuk, vagy ha az adott esetben az + átalakítás eltér a + korábbiaktól. - A special dependency .USE defines - the equivalent of a macro. + A .USE nevû speciális + függõség egy makróval + egyenértékû eszköz + használatára ad lehetõséget. _SUBDIRUSE: .USE .for entry in ${SUBDIR} @@ -397,80 +541,114 @@ ${MAKE} ${.TARGET:S/realpackage/package/:S/realinstall/install/} DIRPRFX=${DIRPRFX}${entry}/ ) .endfor - In the above, _SUBDIRUSE is now a - macro which will execute the given commands when it is listed - as a dependency. + A fenti kódrészletben tehát a + _SUBDIRUSE most már egy + makró lesz, amely ha megjelenik a + függõségek között, akkor a + törzsében megadott parancsokat hajtja + végre. - What sets this macro apart from other targets? Basically, - it is executed after the instructions - given in the build procedure it is listed as a dependency to, - and it does not adjust .TARGET, which is the - variable which contains the name of the target currently - being built. + Mi különbözteti meg ezt a makrót a + többi céltól? Két lényeges + eltérés: elõször is, a benne megadott + utasítások a rá + függõségként hivatkozó + célhoz társított + átalakítást végzõ + utasítások után + fognak lefutni, másrészt nem befolyásolja + a jelenleg feldolgozás alatt álló + cél nevét tároló + .TARGET változó + értékét. clean: _SUBDIRUSE rm -f ${CLEANFILES} - In the above, clean will use the - _SUBDIRUSE macro after it has - executed the instruction - rm -f ${CLEANFILES}. In effect, this causes - clean to go further and further down - the directory tree, deleting built files as it goes - down, not on the way back up. + Ebben a kódrészletben a tehát + clean esetében csak az + rm -r ${CLEANFILES} parancs lefutása + után fog végrehajtódni a + _SUBDIRUSE makró tartalma. + Ennek hatására a clean + megy egyre lentebb és lentebb a + könyvtárszerkezetben, + miközben törli a + elõzõleg elõállított + állományokat. - Provided targets + Definiált célok - install and - package both go down the - directory tree calling the real versions of themselves - in the subdirectories - (realinstall and - realpackage - respectively). + Az install és a + package célok + egyaránt folyamatosan haladnak lefelé a + könyvtárszerkezetben és az + alkönyvtárakban hívják + saját maguk tényleges + változatát (ezek a + realinstall és + realpackage). - clean removes files created - by the build process (and goes down the directory tree - too). cleandir does the same, - and also removes the object directory, if any. + A clean + eltávolítja a folyamat során + keletkezett állományokat (és az + elõbbiekhez hasonlóan lefele halad a + könyvtárszerkezetben). A + cleandir ugyanezt + csinálja, de ha talál a + tárgykódokhoz tartozó + könyvtárat, akkor azt is törli. - More on conditionals + Bõvebben a feltételes + kifejezésekrõlzekrõl - exists is another condition - function which returns true if the given file exists. + Az exists egy másik logikai + függvény, amellyel lekérdezhetjük, + hogy a paramétereként megadott + állomány létezik-e. - empty returns true if the given - variable is empty. + Az empty logikai + függvény igaz értékû, ha a + paramétereként megadott + változó értéke + üres. - target returns true if the given - target does not already exist. + A target logikai + függvény igaz értékû, ha a + paraméterként megadott cél még + nem létezik. - Looping constructs in make (.for) + Ciklusszerverzési lehetõségek + (<literal>.for</literal>) - .for provides a way to repeat a set of - instructions for each space-separated element in a variable. - It does this by assigning a variable to contain the current - element in the list being examined. + A .for utasítás + segítségével adott + utasításokat tudunk elvégezni egy + változó tartalmaként megadott, + szóközökkel határolt elemekre. A + ciklus belsejében egy változóból + érhetjük el az aktuálisan feldolgozott + elemet. _SUBDIRUSE: .USE .for entry in ${SUBDIR} @@ -479,12 +657,15 @@ ${MAKE} ${.TARGET:S/realpackage/package/:S/realinstall/install/} DIRPRFX=${DIRPRFX}${entry}/ ) .endfor - In the above, if SUBDIR is empty, no - action is taken; if it has one or more elements, the - instructions between .for and - .endfor would repeat for every element, - with entry being replaced with the value of - the current element. + A fenti kódrészletben ha a + SUBDIR üres, akkor nem + történik semmi. Ha viszont egy vagy több + elemet is tartalmaz, akkor a .for és + az .endfor között megadott + utasítások megismétlõdnek minden + egyes elem esetén. Ezek értékét a + ciklus belsejében rendre a entry + változóban veszi fel. From owner-p4-projects@FreeBSD.ORG Wed Dec 10 09:35:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC754106567D; Wed, 10 Dec 2008 09:35:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F507106567A for ; Wed, 10 Dec 2008 09:35:15 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D4FD8FC0C for ; Wed, 10 Dec 2008 09:35:15 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBA9ZFCt016549 for ; Wed, 10 Dec 2008 09:35:15 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBA9ZFTw016547 for perforce@freebsd.org; Wed, 10 Dec 2008 09:35:15 GMT (envelope-from zec@icir.org) Date: Wed, 10 Dec 2008 09:35:15 GMT Message-Id: <200812100935.mBA9ZFTw016547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 09:35:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=154433 Change 154433 by zec@zec_tca51 on 2008/12/10 09:35:04 IFC @ 154432 Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#30 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.215 2008/10/27 22:10:01 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.216 2008/12/09 21:34:22 marius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -1370,6 +1370,16 @@ BGE_MODECTL_TX_NO_PHDR_CSUM); /* + * BCM5701 B5 have a bug causing data corruption when using + * 64-bit DMA reads, which can be terminated early and then + * completed later as 32-bit accesses, in combination with + * certain bridges. + */ + if (sc->bge_asicrev == BGE_ASICREV_BCM5701 && + sc->bge_chipid == BGE_CHIPID_BCM5701_B5) + BGE_SETBIT(sc, BGE_MODE_CTL, BGE_MODECTL_FORCE_PCI32); + + /* * Tell the firmware the driver is running */ if (sc->bge_asf_mode & ASF_STACKUP) @@ -2462,26 +2472,21 @@ */ if (reg != 0) sc->bge_flags |= BGE_FLAG_PCIE; - } else if (pci_find_extcap(dev, PCIY_PCIX, ®) == 0) { - if (reg != 0) - sc->bge_flags |= BGE_FLAG_PCIX; - } - #else if (BGE_IS_5705_PLUS(sc)) { reg = pci_read_config(dev, BGE_PCIE_CAPID_REG, 4); if ((reg & 0xFF) == BGE_PCIE_CAPID) sc->bge_flags |= BGE_FLAG_PCIE; +#endif } else { /* * Check if the device is in PCI-X Mode. * (This bit is not valid on PCI Express controllers.) */ - if ((pci_read_config(sc->bge_dev, BGE_PCI_PCISTATE, 4) & + if ((pci_read_config(dev, BGE_PCI_PCISTATE, 4) & BGE_PCISTATE_PCI_BUSMODE) == 0) sc->bge_flags |= BGE_FLAG_PCIX; } -#endif #if __FreeBSD_version > 602105 { ==== //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sis/if_sis.c,v 1.4 2008/08/23 15:34:31 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sis/if_sis.c,v 1.5 2008/12/09 04:30:47 yongari Exp $"); /* * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are @@ -1432,7 +1432,11 @@ * it should simply get re-used next time this descriptor * comes up in the ring. */ - if (!(rxstat & SIS_CMDSTS_PKT_OK)) { + if ((ifp->if_capenable & IFCAP_VLAN_MTU) != 0 && + total_len <= (ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN - + ETHER_CRC_LEN)) + rxstat &= ~SIS_RXSTAT_GIANT; + if (SIS_RXSTAT_ERROR(rxstat) != 0) { ifp->if_ierrors++; if (rxstat & SIS_RXSTAT_COLL) ifp->if_collisions++; ==== //depot/projects/vimage-commit2/src/sys/dev/sis/if_sisreg.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sis/if_sisreg.h,v 1.1 2008/08/10 10:00:14 imp Exp $ + * $FreeBSD: src/sys/dev/sis/if_sisreg.h,v 1.2 2008/12/09 04:30:47 yongari Exp $ */ /* @@ -348,6 +348,11 @@ #define SIS_RXSTAT_OVERRUN 0x02000000 #define SIS_RXSTAT_RX_ABORT 0x04000000 +#define SIS_RXSTAT_ERROR(x) \ + ((x) & (SIS_RXSTAT_RX_ABORT | SIS_RXSTAT_OVERRUN | \ + SIS_RXSTAT_GIANT | SIS_RXSTAT_SYMBOLERR | SIS_RXSTAT_RUNT | \ + SIS_RXSTAT_CRCERR | SIS_RXSTAT_ALIGNERR)) + #define SIS_DSTCLASS_REJECT 0x00000000 #define SIS_DSTCLASS_UNICAST 0x00800000 #define SIS_DSTCLASS_MULTICAST 0x01000000 ==== //depot/projects/vimage-commit2/src/sys/net/if.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.296 2008/12/02 21:37:28 bz Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.298 2008/12/09 21:09:05 bz Exp $ */ #include "opt_compat.h" @@ -50,6 +50,8 @@ #include #include #include +#include +#include #include #include #include @@ -1364,8 +1366,6 @@ return (ifa); } -#include - /* * Default action when installing a route with a Link Level gateway. * Lookup an appropriate real ifa to point to. ==== //depot/projects/vimage-commit2/src/sys/net/route.c#26 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.3.1.1 (Berkeley) 2/23/95 - * $FreeBSD: src/sys/net/route.c,v 1.145 2008/12/08 20:21:57 kmacy Exp $ + * $FreeBSD: src/sys/net/route.c,v 1.147 2008/12/10 09:21:52 kmacy Exp $ */ /************************************************************************ * Note: In this file a 'fib' is a "forwarding information base" * @@ -513,7 +513,7 @@ struct rt_addrinfo info; struct ifaddr *ifa; struct radix_node_head *rnh = - V_rt_tables[rt->rt_fibnum][dst->sa_family]; + V_rt_tables[fibnum][dst->sa_family]; /* verify the gateway is directly reachable */ if ((ifa = ifa_ifwithnet(gateway)) == NULL) { @@ -680,7 +680,7 @@ if (ifa == NULL) ifa = ifa_ifwithnet(gateway); if (ifa == NULL) { - struct rtentry *rt = rtalloc1_fib(gateway, 0, 0UL, fibnum); + struct rtentry *rt = rtalloc1_fib(gateway, 0, RTF_RNH_LOCKED, fibnum); if (rt == NULL) return (NULL); /* @@ -1161,7 +1161,7 @@ * then we just blow it away and retry the insertion * of the new one. */ - rt2 = rtalloc1_fib(dst, 0, 0, fibnum); + rt2 = rtalloc1_fib(dst, 0, RTF_RNH_LOCKED, fibnum); if (rt2 && rt2->rt_parent) { rtexpunge(rt2); RT_UNLOCK(rt2); ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 - * $FreeBSD: src/sys/net/rtsock.c,v 1.155 2008/12/08 00:28:21 imp Exp $ + * $FreeBSD: src/sys/net/rtsock.c,v 1.156 2008/12/10 09:21:52 kmacy Exp $ */ #include "opt_sctp.h" #include "opt_mpath.h" @@ -672,9 +672,11 @@ !sa_equal(info.rti_info[RTAX_IFA], rt->rt_ifa->ifa_addr))) { RT_UNLOCK(rt); + RADIX_NODE_HEAD_LOCK(rnh); if ((error = rt_getifa_fib(&info, rt->rt_fibnum)) != 0) senderr(error); + RADIX_NODE_HEAD_UNLOCK(rnh); RT_LOCK(rt); } if (info.rti_ifa != NULL && @@ -686,8 +688,14 @@ IFAFREE(rt->rt_ifa); } if (info.rti_info[RTAX_GATEWAY] != NULL) { - if ((error = rt_setgate(rt, rt_key(rt), - info.rti_info[RTAX_GATEWAY])) != 0) { + RT_UNLOCK(rt); + RADIX_NODE_HEAD_LOCK(rnh); + RT_LOCK(rt); + + error = rt_setgate(rt, rt_key(rt), + info.rti_info[RTAX_GATEWAY]); + RADIX_NODE_HEAD_UNLOCK(rnh); + if (error != 0) { RT_UNLOCK(rt); senderr(error); } ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#11 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,7 +28,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.119 2008/12/08 20:18:50 rwatson Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.121 2008/12/09 23:57:09 rwatson Exp $ */ #ifndef _NETINET_IN_PCB_H_ @@ -88,11 +89,11 @@ struct in_addr_4in6 ie46_local; struct in6_addr ie6_local; } ie_dependladdr; +}; #define ie_faddr ie_dependfaddr.ie46_foreign.ia46_addr4 #define ie_laddr ie_dependladdr.ie46_local.ia46_addr4 #define ie6_faddr ie_dependfaddr.ie6_foreign #define ie6_laddr ie_dependladdr.ie6_local -}; /* * XXX The defines for inc_* are hacks and should be changed to direct @@ -152,20 +153,11 @@ LIST_ENTRY(inpcb) inp_list; /* (i/p) list for all PCBs for proto */ void *inp_ppcb; /* (i) pointer to per-protocol pcb */ struct inpcbinfo *inp_pcbinfo; /* (c) PCB list info */ - struct socket *inp_socket; /* (i) back pointer to socket */ + struct socket *inp_socket; /* (i) back pointer to socket */ struct ucred *inp_cred; /* (c) cache of socket cred */ - - u_int32_t inp_flow; /* (i) IPv6 flow information */ + u_int32_t inp_flow; /* (i) IPv6 flow information */ int inp_flags; /* (i) generic IP/datagram flags */ - u_char inp_vflag; /* (i) IP version flag (v4/v6) */ -#define INP_IPV4 0x1 -#define INP_IPV6 0x2 -#define INP_IPV6PROTO 0x4 /* opened under IPv6 protocol */ -#define INP_TIMEWAIT 0x8 /* .. probably doesn't go here */ -#define INP_ONESBCAST 0x10 /* send all-ones broadcast */ -#define INP_DROPPED 0x20 /* protocol drop flag */ -#define INP_SOCKREF 0x40 /* strong socket reference */ u_char inp_ip_ttl; /* (i) time to live proto */ u_char inp_ip_p; /* (c) protocol proto */ u_char inp_ip_minttl; /* (i) minimum TTL or drop */ @@ -174,9 +166,9 @@ void *inp_pspare[2]; /* (x) rtentry / general use */ /* Local and foreign ports, local and foreign addr. */ - struct in_conninfo inp_inc; + struct in_conninfo inp_inc; /* (i/p) list for PCB's local port */ - /* (i/p) list for PCB's local port */ + /* MAC and IPSEC policy information. */ struct label *inp_label; /* (i) MAC label */ struct inpcbpolicy *inp_sp; /* (s) for IPSEC */ @@ -184,15 +176,8 @@ struct { u_char inp4_ip_tos; /* (i) type of service proto */ struct mbuf *inp4_options; /* (i) IP options */ - struct ip_moptions *inp4_moptions; /* (i) IP multicast options */ + struct ip_moptions *inp4_moptions; /* (i) IP mcast options */ } inp_depend4; -#define inp_fport inp_inc.inc_fport -#define inp_lport inp_inc.inc_lport -#define inp_faddr inp_inc.inc_faddr -#define inp_laddr inp_inc.inc_laddr -#define inp_ip_tos inp_depend4.inp4_ip_tos -#define inp_options inp_depend4.inp4_options -#define inp_moptions inp_depend4.inp4_moptions struct { /* (i) IP options */ struct mbuf *inp6_options; @@ -209,8 +194,16 @@ LIST_ENTRY(inpcb) inp_portlist; /* (i/p) */ struct inpcbport *inp_phd; /* (i/p) head of this list */ #define inp_zero_size offsetof(struct inpcb, inp_gencnt) - inp_gen_t inp_gencnt; /* (c) generation count of this instance */ + inp_gen_t inp_gencnt; /* (c) generation count */ struct rwlock inp_lock; +}; +#define inp_fport inp_inc.inc_fport +#define inp_lport inp_inc.inc_lport +#define inp_faddr inp_inc.inc_faddr +#define inp_laddr inp_inc.inc_laddr +#define inp_ip_tos inp_depend4.inp4_ip_tos +#define inp_options inp_depend4.inp4_options +#define inp_moptions inp_depend4.inp4_moptions #define in6p_faddr inp_inc.inc6_faddr #define in6p_laddr inp_inc.inc6_laddr @@ -228,7 +221,7 @@ #define in6p_lport inp_lport /* for KAME src sync over BSD*'s */ #define in6p_fport inp_fport /* for KAME src sync over BSD*'s */ #define in6p_ppcb inp_ppcb /* for KAME src sync over BSD*'s */ -}; + /* * The range of the generation count, as used in this implementation, is 9e19. * We would have to create 300 billion connections per second for this number @@ -384,7 +377,22 @@ #define INP_PCBPORTHASH(lport, mask) \ (ntohs((lport)) & (mask)) -/* flags in inp_flags: */ +/* + * Flags for inp_vflags -- historically version flags only, but now quite a + * bit more due to an overflow of inp_flag, leading to some locking ambiguity + * as some bits are stable from initial allocation, and others may change. + */ +#define INP_IPV4 0x1 +#define INP_IPV6 0x2 +#define INP_IPV6PROTO 0x4 /* opened under IPv6 protocol */ +#define INP_TIMEWAIT 0x8 /* inpcb in TIMEWAIT, ppcb is tcptw */ +#define INP_ONESBCAST 0x10 /* send all-ones broadcast */ +#define INP_DROPPED 0x20 /* protocol drop flag */ +#define INP_SOCKREF 0x40 /* strong socket reference */ + +/* + * Flags for inp_flag. + */ #define INP_RECVOPTS 0x01 /* receive incoming IP options */ #define INP_RECVRETOPTS 0x02 /* receive IP options for reply */ #define INP_RECVDSTADDR 0x04 /* receive IP dst address */ ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw_nat.c,v 1.5 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw_nat.c,v 1.7 2008/12/10 08:23:47 kmacy Exp $"); #include #include @@ -93,7 +93,7 @@ LIST_FOREACH(ptr, &V_layer3_chain.nat, _next) { /* ...using nic 'ifp->if_xname' as dynamic alias address. */ if (strncmp(ptr->if_name, ifp->if_xname, IF_NAMESIZE) == 0) { - mtx_lock(&ifp->if_addr_mtx); + IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifa, &ifp->if_addrlist, ifa_list) { if (ifa->ifa_addr == NULL) continue; @@ -103,7 +103,7 @@ (ifa->ifa_addr))->sin_addr; LibAliasSetAddress(ptr->lib, ptr->ip); } - mtx_unlock(&ifp->if_addr_mtx); + IF_ADDR_UNLOCK(ifp); } } IPFW_WUNLOCK(&V_layer3_chain); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#30 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.394 2008/12/08 20:27:00 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.395 2008/12/09 15:49:02 rwatson Exp $"); #include "opt_ipfw.h" /* for ipfw_fwd */ #include "opt_inet.h" @@ -480,11 +480,11 @@ /* * Locate pcb for segment, which requires a lock on tcbinfo. - * Optimisticaly acquire a global read lock unless header flags - * necessarily imply a state change. There are two cases where we - * might discover later we need a write lock despite the flags: ACKs - * moving a connection out of the syncache, and ACK relating to a - * connection in TIMEWAIT. + * Optimisticaly acquire a global read lock rather than a write lock + * unless header flags necessarily imply a state change. There are + * two cases where we might discover later we need a write lock + * despite the flags: ACKs moving a connection out of the syncache, + * and ACKs for a connection in TIMEWAIT. */ if ((thflags & (TH_SYN | TH_FIN | TH_RST)) != 0 || tcp_read_locking == 0) { @@ -1087,7 +1087,7 @@ * allow either a read lock or a write lock, as we may have acquired * a write lock due to a race. * - * Require a global write lock for SYN/SIN/RST segments or + * Require a global write lock for SYN/FIN/RST segments or * non-established connections; otherwise accept either a read or * write lock, as we may have conservatively acquired a write lock in * certain cases in tcp_input() (is this still true?). Currently we From owner-p4-projects@FreeBSD.ORG Wed Dec 10 11:40:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 611EF1065675; Wed, 10 Dec 2008 11:40:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 24F611065670 for ; Wed, 10 Dec 2008 11:40:27 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1641E8FC18 for ; Wed, 10 Dec 2008 11:40:27 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBABeONt037327 for ; Wed, 10 Dec 2008 11:40:24 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBABeNwQ037325 for perforce@freebsd.org; Wed, 10 Dec 2008 11:40:23 GMT (envelope-from piso@freebsd.org) Date: Wed, 10 Dec 2008 11:40:23 GMT Message-Id: <200812101140.mBABeNwQ037325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 154437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 11:40:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=154437 Change 154437 by piso@piso_ferret on 2008/12/10 11:40:07 Slightly simplify the logic in IcmpAlias[In|Out]2: always initialize lnk to NULL. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#85 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#85 (text+ko) ==== @@ -342,6 +342,7 @@ ud = (struct udphdr *)ip_next(ip); tc = (struct tcphdr *)ip_next(ip); ic2 = (struct icmp *)ip_next(ip); + lnk = NULL; if (ip->ip_p == IPPROTO_UDP) lnk = FindUdpTcpIn(la, ip->ip_dst, ip->ip_src, @@ -354,10 +355,7 @@ else if (ip->ip_p == IPPROTO_ICMP) { if (ic2->icmp_type == ICMP_ECHO || ic2->icmp_type == ICMP_TSTAMP) lnk = FindIcmpIn(la, ip->ip_dst, ip->ip_src, ic2->icmp_id, 0); - else - lnk = NULL; - } else - lnk = NULL; + } if (lnk != NULL) { if (ip->ip_p == IPPROTO_UDP || ip->ip_p == IPPROTO_TCP) { @@ -525,6 +523,7 @@ ud = (struct udphdr *)ip_next(ip); tc = (struct tcphdr *)ip_next(ip); ic2 = (struct icmp *)ip_next(ip); + lnk = NULL; if (ip->ip_p == IPPROTO_UDP) lnk = FindUdpTcpOut(la, ip->ip_dst, ip->ip_src, @@ -537,10 +536,7 @@ else if (ip->ip_p == IPPROTO_ICMP) { if (ic2->icmp_type == ICMP_ECHO || ic2->icmp_type == ICMP_TSTAMP) lnk = FindIcmpOut(la, ip->ip_dst, ip->ip_src, ic2->icmp_id, 0); - else - lnk = NULL; - } else - lnk = NULL; + } if (lnk != NULL) { if (ip->ip_p == IPPROTO_UDP || ip->ip_p == IPPROTO_TCP) { From owner-p4-projects@FreeBSD.ORG Wed Dec 10 17:38:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1445110656D8; Wed, 10 Dec 2008 17:38:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBA6910656D3 for ; Wed, 10 Dec 2008 17:38:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BD1F48FC1E for ; Wed, 10 Dec 2008 17:38:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHcXEo064341 for ; Wed, 10 Dec 2008 17:38:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHcX0q064339 for perforce@freebsd.org; Wed, 10 Dec 2008 17:38:33 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2008 17:38:33 GMT Message-Id: <200812101738.mBAHcX0q064339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 17:38:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=154445 Change 154445 by sam@sam_ebb on 2008/12/10 17:37:43 the device id tag for ixp435 is the same for ixp465 so show both when describing the fw image to avoid confusion Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#9 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#9 (text+ko) ==== @@ -446,7 +446,7 @@ ixpnpe_init(struct ixpnpe_softc *sc, const char *imageName, uint32_t imageId) { static const char *devname[4] = - { "IXP425", "IXP465", "DeviceID#2", "DeviceID#3" }; + { "IXP425", "IXP435/IXP465", "DeviceID#2", "DeviceID#3" }; uint32_t imageSize; const uint32_t *imageCodePtr; const struct firmware *fw; From owner-p4-projects@FreeBSD.ORG Wed Dec 10 17:39:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D052106568A; Wed, 10 Dec 2008 17:39:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 006741065670 for ; Wed, 10 Dec 2008 17:39:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E614D8FC16 for ; Wed, 10 Dec 2008 17:39:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHdYrf065883 for ; Wed, 10 Dec 2008 17:39:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHdY7s065881 for perforce@freebsd.org; Wed, 10 Dec 2008 17:39:34 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2008 17:39:34 GMT Message-Id: <200812101739.mBAHdY7s065881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 17:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=154446 Change 154446 by sam@sam_ebb on 2008/12/10 17:39:28 Fix mac address confusion: ixp425 has B+C MAC's, ixp435 has A+C MAC's; we map mac's to the same two va windows Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#7 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#7 (text+ko) ==== @@ -132,13 +132,11 @@ #define IXP425_NPE_A_OFFSET 0x00006000UL /* Not User Programmable */ #define IXP425_NPE_B_OFFSET 0x00007000UL /* Not User Programmable */ #define IXP425_NPE_C_OFFSET 0x00008000UL /* Not User Programmable */ -#define IXP425_MAC_A_OFFSET 0x00009000UL -#define IXP425_MAC_B_OFFSET 0x0000a000UL +#define IXP425_MAC_B_OFFSET 0x00009000UL /* Ethernet MAC on NPE-B */ +#define IXP425_MAC_C_OFFSET 0x0000a000UL /* Ethernet MAC on NPE-C */ #define IXP425_USB_OFFSET 0x0000b000UL +#define IXP435_MAC_A_OFFSET 0x0000c000UL /* Ethernet MAC on NPE-A */ -#define IXP435_MAC_C_OFFSET 0x0000a000UL /* Ethernet MAC on NPE C */ -#define IXP435_MAC_A_OFFSET 0x0000c000UL /* Ethernet MAC on NPE A */ - #define IXP425_REG_SIZE 0x1000 /* @@ -613,22 +611,17 @@ #define IXP425_NPE_C_VBASE (IXP425_IO_VBASE + IXP425_NPE_C_OFFSET) #define IXP425_NPE_C_SIZE 0x1000 /* Actually only 256 bytes */ -#define IXP425_MAC_A_HWBASE (IXP425_IO_HWBASE + IXP425_MAC_A_OFFSET) -#define IXP425_MAC_A_VBASE (IXP425_IO_VBASE + IXP425_MAC_A_OFFSET) -#define IXP425_MAC_A_SIZE 0x1000 /* Actually only 256 bytes */ - #define IXP425_MAC_B_HWBASE (IXP425_IO_HWBASE + IXP425_MAC_B_OFFSET) #define IXP425_MAC_B_VBASE (IXP425_IO_VBASE + IXP425_MAC_B_OFFSET) #define IXP425_MAC_B_SIZE 0x1000 /* Actually only 256 bytes */ -/* NB: IXP435 MAC's are mapped differently */ +#define IXP425_MAC_C_HWBASE (IXP425_IO_HWBASE + IXP425_MAC_C_OFFSET) +#define IXP425_MAC_C_VBASE (IXP425_IO_VBASE + IXP425_MAC_C_OFFSET) +#define IXP425_MAC_C_SIZE 0x1000 /* Actually only 256 bytes */ + #define IXP435_MAC_A_HWBASE (IXP425_IO_HWBASE + IXP435_MAC_A_OFFSET) -#define IXP435_MAC_A_VBASE (IXP425_IO_VBASE + IXP425_MAC_A_OFFSET) -#define IXP435_MAC_A_SIZE 0x1000 /* Actually only 256 bytes */ - -#define IXP435_MAC_C_HWBASE (IXP425_IO_HWBASE + IXP435_MAC_C_OFFSET) -#define IXP435_MAC_C_VBASE (IXP425_IO_VBASE + IXP425_MAC_B_OFFSET) -#define IXP435_MAC_C_SIZE 0x1000 /* Actually only 256 bytes */ +#define IXP435_MAC_A_VBASE (IXP425_IO_VBASE + IXP435_MAC_A_OFFSET) +#define IXP435_MAC_A_SIZE 0x1000 /* Actually only 256 bytes */ /* * Expansion Bus Data Space. From owner-p4-projects@FreeBSD.ORG Wed Dec 10 17:44:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82F481065677; Wed, 10 Dec 2008 17:44:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 46B531065676 for ; Wed, 10 Dec 2008 17:44:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36A588FC2B for ; Wed, 10 Dec 2008 17:44:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHierA083519 for ; Wed, 10 Dec 2008 17:44:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHieHx083517 for perforce@freebsd.org; Wed, 10 Dec 2008 17:44:40 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2008 17:44:40 GMT Message-Id: <200812101744.mBAHieHx083517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 17:44:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=154447 Change 154447 by sam@sam_ebb on 2008/12/10 17:44:24 Sync updates in the continued pursuit of a working NPE-A on ixp435: o track MAC address/naming changes o remove macsize and miisize from the static config tables; these are always going to be 4K o fix NPE-A qid's (from clang@gateworks) o move phy probe to npe_activate so it can be done before hooking up the qmgr (seems to be a noop) o simplify mac/mii address override from hints; no more size parameter o split out mac reset logic for possible reuse o rearrange activate work to be more like linux (doesn't seem to matter) o add printfs to show MAC and MII addresses (to go under bootverbose) o add DELAY(1) when polling for MII cmd completion and up max tries to 1000 (~1ms total) Tested on Avila and Cambria boards w/o regression. Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#11 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#11 (text+ko) ==== @@ -159,9 +159,7 @@ static const struct { uint32_t imageid; /* default fw image */ uint32_t macbase; - int macsize; uint32_t miibase; - int miisize; int phy; /* phy id */ uint8_t rx_qid; uint8_t rx_freeqid; @@ -171,21 +169,17 @@ [NPE_A] = { .imageid = IXP425_NPE_A_IMAGEID, .macbase = IXP435_MAC_A_HWBASE, - .macsize = IXP435_MAC_A_SIZE, - .miibase = IXP435_MAC_A_HWBASE, - .miisize = IXP435_MAC_A_SIZE, + .miibase = IXP425_MAC_C_HWBASE, .phy = 2, .rx_qid = 4, - .rx_freeqid = 27, - .tx_qid = 24, + .rx_freeqid = 26, + .tx_qid = 23, .tx_doneqid = 31 }, [NPE_B] = { .imageid = IXP425_NPE_B_IMAGEID, - .macbase = IXP425_MAC_A_HWBASE, - .macsize = IXP425_MAC_A_SIZE, - .miibase = IXP425_MAC_A_HWBASE, - .miisize = IXP425_MAC_A_SIZE, + .macbase = IXP425_MAC_B_HWBASE, + .miibase = IXP425_MAC_C_HWBASE, .phy = 0, .rx_qid = 4, .rx_freeqid = 27, @@ -194,10 +188,8 @@ }, [NPE_C] = { .imageid = IXP425_NPE_C_IMAGEID, - .macbase = IXP425_MAC_B_HWBASE, - .macsize = IXP425_MAC_B_SIZE, - .miibase = IXP425_MAC_A_HWBASE, - .miisize = IXP425_MAC_A_SIZE, + .macbase = IXP425_MAC_C_HWBASE, + .miibase = IXP425_MAC_C_HWBASE, .phy = 1, .rx_qid = 12, .rx_freeqid = 28, @@ -330,7 +322,7 @@ struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(dev); struct sysctl_oid *tree = device_get_sysctl_tree(dev); - struct ifnet *ifp = NULL; + struct ifnet *ifp; int error; u_char eaddr[6]; @@ -341,31 +333,23 @@ sc->sc_debug = npe_debug; sc->sc_tickinterval = npe_tickinterval; - if (!override_npeid(dev, "npeid", &sc->sc_npeid)) - sc->sc_npeid = unit2npeid(device_get_unit(dev)); - sc->sc_npe = ixpnpe_attach(dev, sc->sc_npeid); - if (sc->sc_npe == NULL) { - device_printf(dev, "cannot attach ixpnpe.\n"); + ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + device_printf(dev, "cannot allocate ifnet\n"); error = EIO; /* XXX */ goto out; } + /* NB: must be setup prior to invoking mii code */ + sc->sc_ifp = ifp; error = npe_activate(dev); if (error) { - device_printf(dev, "cannot activate npe.\n"); + device_printf(dev, "cannot activate npe\n"); goto out; } npe_getmac(sc, eaddr); - /* NB: must be setup prior to invoking mii code */ - sc->sc_ifp = ifp = if_alloc(IFT_ETHER); - if (mii_phy_probe(dev, &sc->sc_mii, npe_ifmedia_update, npe_ifmedia_status)) { - device_printf(dev, "cannot find my PHY.\n"); - error = ENXIO; - goto out; - } - ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; @@ -394,8 +378,6 @@ if_free(ifp); NPE_LOCK_DESTROY(sc); npe_deactivate(dev); - if (sc->sc_npe != NULL) - ixpnpe_detach(sc->sc_npe); return error; } @@ -416,8 +398,6 @@ } NPE_LOCK_DESTROY(sc); npe_deactivate(dev); - if (sc->sc_npe != NULL) - ixpnpe_detach(sc->sc_npe); return 0; } @@ -590,36 +570,8 @@ } static int -npe_macaddr(int npeid, int *base, int *size) +override_addr(device_t dev, const char *resname, int *base) { - if (npeid == NPE_A) { - if ((cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435) { - *base = IXP435_MAC_A_HWBASE; - *size = IXP435_MAC_A_SIZE; - } else { - *base = IXP425_MAC_A_HWBASE; - *size = IXP425_MAC_A_SIZE; - } - return 0; - } else if (npeid == NPE_B) { - if ((cpu_id() & CPU_ID_CPU_MASK) != CPU_ID_IXP435) { - *base = IXP425_MAC_B_HWBASE; - *size = IXP425_MAC_B_SIZE; - return 0; - } - } else if (npeid == NPE_C) { - if ((cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435) { - *base = IXP435_MAC_C_HWBASE; - *size = IXP435_MAC_C_SIZE; - return 0; - } - } - return EINVAL; -} - -static int -override_addr(device_t dev, const char *resname, int *base, int *size) -{ int unit = device_get_unit(dev); const char *resval; @@ -628,18 +580,15 @@ return 0; switch (resval[0]) { case 'A': - npe_macaddr(NPE_A, base, size); + *base = IXP435_MAC_A_HWBASE; break; case 'B': - if (npe_macaddr(NPE_B, base, size) != 0) - goto bad; + *base = IXP425_MAC_B_HWBASE; break; case 'C': - if (npe_macaddr(NPE_C, base, size) != 0) - goto bad; + *base = IXP425_MAC_C_HWBASE; break; default: - bad: device_printf(dev, "Warning, bad value %s for " "npe.%d.%s ignored\n", resval, unit, resname); return 0; @@ -711,14 +660,68 @@ return 1; } +static void +npe_mac_reset(struct npe_softc *sc) +{ + /* + * Reset MAC core. + */ + WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_RESET); + DELAY(NPE_MAC_RESET_DELAY); + /* configure MAC to generate MDC clock */ + WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_MDC_EN); +} + static int npe_activate(device_t dev) { struct npe_softc * sc = device_get_softc(dev); - int error, i, macbase, macsize, miibase, miisize; + int error, i, macbase, miibase; uint32_t imageid, msg[2]; /* + * Setup NEP ID, MAC, and MII bindings. We allow override + * via hints to handle unexpected board configs. + */ + if (!override_npeid(dev, "npeid", &sc->sc_npeid)) + sc->sc_npeid = unit2npeid(device_get_unit(dev)); + sc->sc_npe = ixpnpe_attach(dev, sc->sc_npeid); + if (sc->sc_npe == NULL) { + device_printf(dev, "cannot attach ixpnpe\n"); + return EIO; /* XXX */ + } + + /* MAC */ + if (!override_addr(dev, "mac", &macbase)) + macbase = npeconfig[sc->sc_npeid].macbase; + device_printf(sc->sc_dev, "MAC at 0x%x\n", macbase); + if (bus_space_map(sc->sc_iot, macbase, IXP425_REG_SIZE, 0, &sc->sc_ioh)) { + device_printf(dev, "cannot map mac registers 0x%x:0x%x\n", + macbase, IXP425_REG_SIZE); + return ENOMEM; + } + + /* PHY */ + if (!override_unit(dev, "phy", &sc->sc_phy, 0, MII_NPHY-1)) + sc->sc_phy = npeconfig[sc->sc_npeid].phy; + if (!override_addr(dev, "mii", &miibase)) + miibase = npeconfig[sc->sc_npeid].miibase; + device_printf(sc->sc_dev, "MII at 0x%x\n", miibase); + if (miibase != macbase) { + /* + * PHY is mapped through a different MAC, setup an + * additional mapping for frobbing the PHY registers. + */ + if (bus_space_map(sc->sc_iot, miibase, IXP425_REG_SIZE, 0, &sc->sc_miih)) { + device_printf(dev, + "cannot map MII registers 0x%x:0x%x\n", + miibase, IXP425_REG_SIZE); + return ENOMEM; + } + } else + sc->sc_miih = sc->sc_ioh; + + /* * Load NPE firmware and start it running. We assume * that minor version bumps remain compatible so probe * the firmware image starting with the expected version @@ -744,38 +747,18 @@ } imageid++; } + /* NB: firmware should respond with a status msg */ if (ixpnpe_recvmsg_sync(sc->sc_npe, msg) != 0) { device_printf(dev, "firmware did not respond as expected\n"); return EIO; } - if (!override_addr(dev, "mac", &macbase, &macsize)) { - macbase = npeconfig[sc->sc_npeid].macbase; - macsize = npeconfig[sc->sc_npeid].macsize; + /* probe for PHY */ + if (mii_phy_probe(dev, &sc->sc_mii, npe_ifmedia_update, npe_ifmedia_status)) { + device_printf(dev, "cannot find PHY %d.\n", sc->sc_phy); + return ENXIO; } - if (bus_space_map(sc->sc_iot, macbase, macsize, 0, &sc->sc_ioh)) { - device_printf(dev, "cannot map mac registers 0x%x:0x%x\n", - macbase, macsize); - return ENOMEM; - } - if (!override_addr(dev, "mii", &miibase, &miisize)) { - miibase = npeconfig[sc->sc_npeid].miibase; - miisize = npeconfig[sc->sc_npeid].miisize; - } - if (miibase != macbase) { - /* - * PHY is mapped through a different MAC, setup an - * additional mapping for frobbing the PHY registers. - */ - if (bus_space_map(sc->sc_iot, miibase, miisize, 0, &sc->sc_miih)) { - device_printf(dev, - "cannot map MII registers 0x%x:0x%x\n", - miibase, miisize); - return ENOMEM; - } - } else - sc->sc_miih = sc->sc_ioh; error = npe_dma_setup(sc, &sc->txdma, "tx", npe_txbuf, NPE_MAXSEG); if (error != 0) return error; @@ -809,8 +792,6 @@ } sc->sc_stats_phys = sc->buf_phys; - /* XXX disable half-bridge LEARNING+FILTERING feature */ - /* * Setup h/w rx/tx queues. There are four q's: * rx inbound q of rx'd frames @@ -840,7 +821,7 @@ for (i = 0; i < 8; i++) npe_setrxqosentry(sc, i, 0, sc->rx_qid); - /* disable firewall mode just in case (should be off by default) */ + /* disable firewall mode just in case (should be off) */ npe_setfirewallmode(sc, 0); sc->tx_qid = npeconfig[sc->sc_npeid].tx_qid; @@ -852,13 +833,6 @@ tx_doneqid = sc->tx_doneqid; } - /* - * Setup phy port number. We allow override via hints - * to handle different board configs. - */ - if (!override_unit(dev, "phy", &sc->sc_phy, 0, MII_NPHY-1)) - sc->sc_phy = npeconfig[sc->sc_npeid].phy; - KASSERT(npes[sc->sc_npeid] == NULL, ("npe %u already setup", sc->sc_npeid)); npes[sc->sc_npeid] = sc; @@ -874,8 +848,10 @@ npes[sc->sc_npeid] = NULL; /* XXX disable q's */ - if (sc->sc_npe != NULL) + if (sc->sc_npe != NULL) { ixpnpe_stop(sc->sc_npe); + ixpnpe_detach(sc->sc_npe); + } if (sc->sc_stats != NULL) { bus_dmamap_unload(sc->sc_stats_tag, sc->sc_stats_map); bus_dmamem_free(sc->sc_stats_tag, sc->sc_stats, @@ -1256,10 +1232,7 @@ /* * Reset MAC core. */ - WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_RESET); - DELAY(NPE_MAC_RESET_DELAY); - /* configure MAC to generate MDC clock */ - WR4(sc, NPE_MAC_CORE_CNTRL, NPE_CORE_MDC_EN); + npe_mac_reset(sc); /* disable transmitter and reciver in the MAC */ WR4(sc, NPE_MAC_RX_CNTRL1, @@ -1672,10 +1645,13 @@ /* * MII bus support routines. */ +#define MII_RD4(sc, reg) bus_space_read_4(sc->sc_iot, sc->sc_miih, reg) +#define MII_WR4(sc, reg, v) \ + bus_space_write_4(sc->sc_iot, sc->sc_miih, reg, v) + static uint32_t npe_mii_mdio_read(struct npe_softc *sc, int reg) { -#define MII_RD4(sc, reg) bus_space_read_4(sc->sc_iot, sc->sc_miih, reg) uint32_t v; /* NB: registers are known to be sequential */ @@ -1684,37 +1660,34 @@ v |= (MII_RD4(sc, reg+8) & 0xff) << 16; v |= (MII_RD4(sc, reg+12) & 0xff) << 24; return v; -#undef MII_RD4 } static void npe_mii_mdio_write(struct npe_softc *sc, int reg, uint32_t cmd) { -#define MII_WR4(sc, reg, v) \ - bus_space_write_4(sc->sc_iot, sc->sc_miih, reg, v) - /* NB: registers are known to be sequential */ MII_WR4(sc, reg+0, cmd & 0xff); MII_WR4(sc, reg+4, (cmd >> 8) & 0xff); MII_WR4(sc, reg+8, (cmd >> 16) & 0xff); MII_WR4(sc, reg+12, (cmd >> 24) & 0xff); -#undef MII_WR4 } static int npe_mii_mdio_wait(struct npe_softc *sc) { -#define MAXTRIES 100 /* XXX */ uint32_t v; int i; - for (i = 0; i < MAXTRIES; i++) { + /* NB: typically this takes 25-30 trips */ + for (i = 0; i < 1000; i++) { v = npe_mii_mdio_read(sc, NPE_MAC_MDIO_CMD); if ((v & NPE_MII_GO) == 0) return 1; + DELAY(1); } + device_printf(sc->sc_dev, "%s: timeout after ~1ms, cmd 0x%x\n", + __func__, v); return 0; /* NB: timeout */ -#undef MAXTRIES } static int @@ -1725,15 +1698,13 @@ if (phy != sc->sc_phy) /* XXX no auto-detect */ return 0xffff; - v = (phy << NPE_MII_ADDR_SHL) | (reg << NPE_MII_REG_SHL) - | NPE_MII_GO; + v = (phy << NPE_MII_ADDR_SHL) | (reg << NPE_MII_REG_SHL) | NPE_MII_GO; npe_mii_mdio_write(sc, NPE_MAC_MDIO_CMD, v); if (npe_mii_mdio_wait(sc)) v = npe_mii_mdio_read(sc, NPE_MAC_MDIO_STS); else v = 0xffff | NPE_MII_READ_FAIL; return (v & NPE_MII_READ_FAIL) ? 0xffff : (v & 0xffff); -#undef MAXTRIES } static void @@ -1742,7 +1713,7 @@ struct npe_softc *sc = device_get_softc(dev); uint32_t v; - if (phy != sc->sc_phy) /* XXX should not happen */ + if (phy != sc->sc_phy) /* XXX */ return; v = (phy << NPE_MII_ADDR_SHL) | (reg << NPE_MII_REG_SHL) | data | NPE_MII_WRITE From owner-p4-projects@FreeBSD.ORG Wed Dec 10 17:45:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A90AE1065677; Wed, 10 Dec 2008 17:45:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DB681065679 for ; Wed, 10 Dec 2008 17:45:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EFDE8FC20 for ; Wed, 10 Dec 2008 17:45:41 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHjfJ8086972 for ; Wed, 10 Dec 2008 17:45:41 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHjfAk086970 for perforce@freebsd.org; Wed, 10 Dec 2008 17:45:41 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2008 17:45:41 GMT Message-Id: <200812101745.mBAHjfAk086970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 17:45:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=154448 Change 154448 by sam@sam_ebb on 2008/12/10 17:44:49 track MAC address/naming changes Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#12 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#12 (text+ko) ==== @@ -180,12 +180,12 @@ { IXP425_NPE_C_VBASE, IXP425_NPE_C_HWBASE, IXP425_NPE_C_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - /* MAC-A Memory Space */ - { IXP425_MAC_A_VBASE, IXP425_MAC_A_HWBASE, IXP425_MAC_A_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* MAC-B Memory Space */ { IXP425_MAC_B_VBASE, IXP425_MAC_B_HWBASE, IXP425_MAC_B_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* MAC-C Memory Space */ + { IXP425_MAC_C_VBASE, IXP425_MAC_C_HWBASE, IXP425_MAC_C_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { 0 }, }; @@ -224,7 +224,10 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* MAC-C Memory Space */ - { IXP435_MAC_C_VBASE, IXP435_MAC_C_HWBASE, IXP435_MAC_C_SIZE, + { IXP425_MAC_C_VBASE, IXP425_MAC_C_HWBASE, IXP425_MAC_C_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* MAC-B Memory Space */ + { IXP425_MAC_B_VBASE, IXP425_MAC_B_HWBASE, IXP425_MAC_B_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* MAC-A Memory Space */ { IXP435_MAC_A_VBASE, IXP435_MAC_A_HWBASE, IXP435_MAC_A_SIZE, From owner-p4-projects@FreeBSD.ORG Wed Dec 10 17:46:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D25CF1065676; Wed, 10 Dec 2008 17:46:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96B6A1065670 for ; Wed, 10 Dec 2008 17:46:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8825A8FC08 for ; Wed, 10 Dec 2008 17:46:42 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHkgin091464 for ; Wed, 10 Dec 2008 17:46:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHkg1U091462 for perforce@freebsd.org; Wed, 10 Dec 2008 17:46:42 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2008 17:46:42 GMT Message-Id: <200812101746.mBAHkg1U091462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 17:46:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=154449 Change 154449 by sam@sam_ebb on 2008/12/10 17:46:25 track naming changes for MAC/MII Affected files ... .. //depot/projects/vap/sys/arm/conf/AVILA.hints#6 edit Differences ... ==== //depot/projects/vap/sys/arm/conf/AVILA.hints#6 (text+ko) ==== @@ -20,13 +20,13 @@ # NPE wired NIC's, requires ixpqmgr hint.npe.0.at="ixp0" hint.npe.0.npeid="B" -hint.npe.0.mac="A" -hint.npe.0.mii="A" +hint.npe.0.mac="B" +hint.npe.0.mii="B" hint.npe.0.phy=0 hint.npe.1.at="ixp0" hint.npe.1.npeid="C" -hint.npe.1.mac="B" -hint.npe.1.mii="A" +hint.npe.1.mac="C" +hint.npe.1.mii="B" hint.npe.1.phy=1 # CF IDE controller From owner-p4-projects@FreeBSD.ORG Wed Dec 10 17:54:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74B4C106567A; Wed, 10 Dec 2008 17:54:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38C121065673 for ; Wed, 10 Dec 2008 17:54:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 291E98FC1A for ; Wed, 10 Dec 2008 17:54:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHsoGZ024583 for ; Wed, 10 Dec 2008 17:54:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHsoEI024577 for perforce@freebsd.org; Wed, 10 Dec 2008 17:54:50 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2008 17:54:50 GMT Message-Id: <200812101754.mBAHsoEI024577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 17:54:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=154450 Change 154450 by sam@sam_ebb on 2008/12/10 17:53:56 Remove EHCI_SCFLG_BIGENDIAN; this appears to be the wrong approach. Handle the 1- and 2-byte register ops by overriding the bus tag ops in the bus-shim. Also mark the controller with EHCI_SCFLG_FORCESPEED as we need to identify the device speed from the PortStatus following a port enable. Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp435_ehci.c#2 edit .. //depot/projects/vap/sys/dev/usb/ehci.c#16 edit .. //depot/projects/vap/sys/dev/usb/ehcivar.h#10 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp435_ehci.c#2 (text+ko) ==== @@ -38,10 +38,12 @@ #include #include #include +#include #include #include +#include + #include -#include #include #include @@ -58,11 +60,21 @@ #define EHCI_VENDORID_IXP4XX 0x42fa05 #define EHCI_HC_DEVSTR "IXP4XX Integrated USB 2.0 controller" -static device_attach_t ehci_ixp_attach; -static device_detach_t ehci_ixp_detach; -static device_shutdown_t ehci_ixp_shutdown; -static device_suspend_t ehci_ixp_suspend; -static device_resume_t ehci_ixp_resume; +struct ixp_ehci_softc { + ehci_softc_t base; /* storage for EHCI code */ + bus_space_tag_t iot; + bus_space_handle_t ioh; + struct bus_space tag; /* tag for private bus space ops */ +}; + +static int ehci_ixp_detach(device_t self); + +static uint8_t ehci_bs_r_1(void *, bus_space_handle_t, bus_size_t); +static void ehci_bs_w_1(void *, bus_space_handle_t, bus_size_t, u_int8_t); +static uint16_t ehci_bs_r_2(void *, bus_space_handle_t, bus_size_t); +static void ehci_bs_w_2(void *, bus_space_handle_t, bus_size_t, uint16_t); +static uint32_t ehci_bs_r_4(void *, bus_space_handle_t, bus_size_t); +static void ehci_bs_w_4(void *, bus_space_handle_t, bus_size_t, uint32_t); static int ehci_ixp_suspend(device_t self) @@ -112,7 +124,8 @@ static int ehci_ixp_attach(device_t self) { - ehci_softc_t *sc = device_get_softc(self); + struct ixp_ehci_softc *isc = device_get_softc(self); + ehci_softc_t *sc = &isc->base; int err, rid; sc->sc_bus.usbrev = USBREV_2_0; @@ -126,16 +139,27 @@ device_printf(self, "Could not map memory\n"); return ENXIO; } - sc->iot = rman_get_bustag(sc->io_res); + + /* + * Craft special resource for bus space ops that handle + * byte-alignment of non-word addresses. Also, since + * we're already intercepting bus space ops we handle + * the register window offset that could otherwise be + * done with bus_space_subregion. + */ + isc->iot = rman_get_bustag(sc->io_res); + isc->tag.bs_cookie = isc->iot; + /* read single */ + isc->tag.bs_r_1 = ehci_bs_r_1, + isc->tag.bs_r_2 = ehci_bs_r_2, + isc->tag.bs_r_4 = ehci_bs_r_4, + /* write (single) */ + isc->tag.bs_w_1 = ehci_bs_w_1, + isc->tag.bs_w_2 = ehci_bs_w_2, + isc->tag.bs_w_4 = ehci_bs_w_4, + + sc->iot = &isc->tag; sc->ioh = rman_get_bushandle(sc->io_res); - - /* shift register window for EHCI driver */ - if (bus_space_subregion(sc->iot, sc->ioh, - 0x100, IXP435_USB1_SIZE - 0x100, &sc->ioh) != 0) { - device_printf(self, "Could not setup subregion for USB host" - "registers\n"); - return ENXIO; - } sc->sc_size = IXP435_USB1_SIZE - 0x100; rid = 0; @@ -197,10 +221,13 @@ * Arrange to force Host mode, select big-endian byte alignment, * and arrange to not terminate reset operations (the adapter * will ignore it if we do but might as well save a reg write). + * Also, the controller has an embedded Transaction Translator + * which means port speed must be read from the Port Status + * register following a port enable. */ sc->sc_flags |= EHCI_SCFLG_SETMODE - | EHCI_SCFLG_BIGENDIAN | EHCI_SCFLG_NORESTERM + | EHCI_SCFLG_FORCESPEED ; err = ehci_init(sc); if (!err) { @@ -219,7 +246,8 @@ static int ehci_ixp_detach(device_t self) { - ehci_softc_t *sc = device_get_softc(self); + struct ixp_ehci_softc *isc = device_get_softc(self); + ehci_softc_t *sc = &isc->base; int err; if (sc->sc_flags & EHCI_SCFLG_DONEINIT) { @@ -262,6 +290,48 @@ return 0; } +/* + * Bus space accessors for PIO operations. + */ + +static uint8_t +ehci_bs_r_1(void *t, bus_space_handle_t h, bus_size_t o) +{ + return bus_space_read_1((bus_space_tag_t) t, h, + 0x100 + (o &~ 3) + (3 - (o & 3))); +} + +static void +ehci_bs_w_1(void *t, bus_space_handle_t h, bus_size_t o, u_int8_t v) +{ + panic("%s", __func__); +} + +static uint16_t +ehci_bs_r_2(void *t, bus_space_handle_t h, bus_size_t o) +{ + return bus_space_read_2((bus_space_tag_t) t, h, + 0x100 + (o &~ 3) + (2 - (o & 3))); +} + +static void +ehci_bs_w_2(void *t, bus_space_handle_t h, bus_size_t o, uint16_t v) +{ + panic("%s", __func__); +} + +static uint32_t +ehci_bs_r_4(void *t, bus_space_handle_t h, bus_size_t o) +{ + return bus_space_read_4((bus_space_tag_t) t, h, 0x100 + o); +} + +static void +ehci_bs_w_4(void *t, bus_space_handle_t h, bus_size_t o, uint32_t v) +{ + bus_space_write_4((bus_space_tag_t) t, h, 0x100 + o, v); +} + static device_method_t ehci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ehci_ixp_probe), @@ -280,7 +350,7 @@ static driver_t ehci_driver = { "ehci", ehci_methods, - sizeof(ehci_softc_t), + sizeof(struct ixp_ehci_softc), }; static devclass_t ehci_devclass; DRIVER_MODULE(ehci, ixp, ehci_driver, ehci_devclass, 0, 0); ==== //depot/projects/vap/sys/dev/usb/ehci.c#16 (text+ko) ==== @@ -351,12 +351,10 @@ usb_delay_ms(&sc->sc_bus, 1); hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET; if (!hcr) { - if (sc->sc_flags & (EHCI_SCFLG_SETMODE | EHCI_SCFLG_BIGENDIAN)) { + if (sc->sc_flags & EHCI_SCFLG_SETMODE) { /* * Force USBMODE as requested. Controllers - * may have multiple operating modes and on - * some platforms we need to force big-endian - * byte alignement of data structures. + * may have multiple operating modes. */ uint32_t usbmode = EOREAD4(sc, EHCI_USBMODE); if (sc->sc_flags & EHCI_SCFLG_SETMODE) { @@ -364,11 +362,6 @@ device_printf(sc->sc_bus.bdev, "set host controller mode\n"); } - if (sc->sc_flags & EHCI_SCFLG_BIGENDIAN) { - usbmode |= EHCI_UM_ES_BE; - device_printf(sc->sc_bus.bdev, - "set big-endian byte alignment\n"); - } EOWRITE4(sc, EHCI_USBMODE, usbmode); } return (USBD_NORMAL_COMPLETION); @@ -395,11 +388,9 @@ /* NB: must handle byte-order manually before ehci_hcreset */ - sc->sc_offs = EREAD1(sc, sc->sc_flags & EHCI_SCFLG_BIGENDIAN ? - 3-EHCI_CAPLENGTH : EHCI_CAPLENGTH); + sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH); - version = EREAD2(sc, sc->sc_flags & EHCI_SCFLG_BIGENDIAN ? - 2-EHCI_HCIVERSION : EHCI_HCIVERSION); + version = EREAD2(sc, EHCI_HCIVERSION); device_printf(sc->sc_bus.bdev, "EHCI version %x.%x\n", version >> 8, version & 0xff); ==== //depot/projects/vap/sys/dev/usb/ehcivar.h#10 (text+ko) ==== @@ -125,7 +125,6 @@ #define EHCI_SCFLG_SETMODE 0x0004 /* set bridge mode again after init (Marvell) */ #define EHCI_SCFLG_FORCESPEED 0x0008 /* force speed (Marvell) */ #define EHCI_SCFLG_NORESTERM 0x0010 /* don't terminate reset sequence (Marvell) */ -#define EHCI_SCFLG_BIGENDIAN 0x0020 /* set big-endian select on reset */ typedef struct ehci_softc { struct usbd_bus sc_bus; /* base device */ From owner-p4-projects@FreeBSD.ORG Wed Dec 10 18:28:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA41A1065675; Wed, 10 Dec 2008 18:28:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E85A1065670 for ; Wed, 10 Dec 2008 18:28:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F3378FC0C for ; Wed, 10 Dec 2008 18:28:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAISPgM053634 for ; Wed, 10 Dec 2008 18:28:25 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAISPON053626 for perforce@freebsd.org; Wed, 10 Dec 2008 18:28:25 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 10 Dec 2008 18:28:25 GMT Message-Id: <200812101828.mBAISPON053626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 18:28:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=154453 Change 154453 by rene@rene_self on 2008/12/10 18:28:15 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -383,8 +383,9 @@ routing tables, consult &man.route.8; manual page. - + Dual Homed Hosts + dual homed hosts There is one other type of configuration that we should cover, and that is a host that sits on two different networks. Technically, any @@ -433,6 +434,9 @@ 1. If you should need to stop routing temporarily, you can reset this to 0 temporarily. + BGP + RIP + OSPF Your new router will need routes to know where to send the traffic. If your network is simple enough you can use static routes. FreeBSD also comes with the standard BSD routing @@ -442,13 +446,9 @@ net/zebra package. Commercial products such as &gated; are also available for more complex network routing solutions. - -BGP -RIP -OSPF - + @@ -583,7 +583,7 @@ - + Routing Propagation routing propagation We have already talked about how we define our routes to the @@ -614,7 +614,7 @@ propagation. - + Troubleshooting traceroute @@ -635,7 +635,7 @@ &man.traceroute.8;. - + Multicast Routing multicast routing From owner-p4-projects@FreeBSD.ORG Wed Dec 10 19:08:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F61F1065677; Wed, 10 Dec 2008 19:08:06 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 638711065676 for ; Wed, 10 Dec 2008 19:08:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5441A8FC1A for ; Wed, 10 Dec 2008 19:08:06 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAJ86Ap000640 for ; Wed, 10 Dec 2008 19:08:06 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAJ86gK000638 for perforce@freebsd.org; Wed, 10 Dec 2008 19:08:06 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 10 Dec 2008 19:08:06 GMT Message-Id: <200812101908.mBAJ86gK000638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 19:08:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=154455 Change 154455 by rene@rene_self on 2008/12/10 19:07:57 MFen handbook/advanced-networking 1.415 -> 1.416 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#19 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#19 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.6 2008/11/16 21:23:42 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.415 + %SRCID% 1.416 --> @@ -441,7 +441,7 @@ geraadpleegd worden. - + Dual Homed machines dual homed hosts @@ -497,6 +497,12 @@ tijdelijk te stoppen, kan deze variabele tijdelijk op 0 worden teruggezet. + BGP + + RIP + + OSPF + De nieuwe router heeft routes nodig om te weten waar het het verkeer naar toe moet sturen. Voor een eenvoudig netwerk kunnen statische routes gebruikt worden. &os; wordt met het @@ -508,15 +514,9 @@ commerciële producten als &gated; beschikbaar voor complexere netwerkrouteer-oplossingen. - - BGP - - RIP - - OSPF - + @@ -655,7 +655,7 @@ - + Routes propageren routes propageren @@ -693,7 +693,7 @@ routepropagatie. - + Problemen oplossen traceroute @@ -715,7 +715,7 @@ &man.traceroute.8;. - + Multicast routen multicast routen From owner-p4-projects@FreeBSD.ORG Wed Dec 10 20:04:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD18C1065676; Wed, 10 Dec 2008 20:04:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67F61106564A for ; Wed, 10 Dec 2008 20:04:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 55B188FC1A for ; Wed, 10 Dec 2008 20:04:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAK44q6006602 for ; Wed, 10 Dec 2008 20:04:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAK43KP006599 for perforce@freebsd.org; Wed, 10 Dec 2008 20:04:03 GMT (envelope-from jhb@freebsd.org) Date: Wed, 10 Dec 2008 20:04:03 GMT Message-Id: <200812102004.mBAK43KP006599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 154459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 20:04:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=154459 Change 154459 by jhb@jhb_mutex on 2008/12/10 20:03:58 IFC @154458 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#26 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#86 integrate .. //depot/projects/smpng/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/smpng/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#47 integrate .. //depot/projects/smpng/sys/boot/forth/support.4th#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#10 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/btxldr.S#4 integrate .. //depot/projects/smpng/sys/boot/zfs/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#70 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#7 integrate .. //depot/projects/smpng/sys/dev/adb/adb.h#2 integrate .. //depot/projects/smpng/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/smpng/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/smpng/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/smpng/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#61 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#38 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#102 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#10 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#20 integrate .. //depot/projects/smpng/sys/dev/dc/if_dcreg.h#10 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#85 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#7 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcsd.c#8 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#68 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#21 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#66 integrate .. //depot/projects/smpng/sys/dev/sdhci/sdhci.c#4 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/smpng/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#29 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#55 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#10 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/smpng/sys/i386/include/atomic.h#51 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#115 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#135 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#116 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#95 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#175 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#31 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#12 integrate .. //depot/projects/smpng/sys/net/if.c#107 integrate .. //depot/projects/smpng/sys/net/radix.c#15 integrate .. //depot/projects/smpng/sys/net/radix.h#10 integrate .. //depot/projects/smpng/sys/net/route.c#42 integrate .. //depot/projects/smpng/sys/net/route.h#29 integrate .. //depot/projects/smpng/sys/net/rtsock.c#65 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#17 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#63 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#88 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#56 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_nat.c#5 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#10 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.h#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#17 integrate .. //depot/projects/smpng/sys/netinet/sctp_header.h#7 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#17 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#23 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.h#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#23 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#12 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#8 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#17 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#15 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_var.h#12 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#24 integrate .. //depot/projects/smpng/sys/netinet/sctputil.h#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#121 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#62 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#17 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#25 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#16 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#46 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#11 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cuda.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cudavar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macgpio.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macgpiovar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pmu.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powermac/pmuvar.h#2 integrate .. //depot/projects/smpng/sys/sys/aio.h#8 integrate .. //depot/projects/smpng/sys/sys/module.h#12 integrate .. //depot/projects/smpng/sys/sys/proc.h#193 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#42 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#26 (text+ko) ==== @@ -25,7 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.82 2007/12/02 20:40:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.83 2008/12/05 11:34:36 kib Exp $"); + +#include "opt_compat.h" #include #include @@ -318,6 +320,10 @@ frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; +#ifdef COMPAT_IA32 + else if (strcmp(name, "Xint0x80_syscall") == 0) + frame_type = SYSCALL; +#endif /* XXX: These are interrupts with trap frames. */ else if (strcmp(name, "Xtimerint") == 0 || strcmp(name, "Xcpustop") == 0 || ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#86 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.645 2008/08/09 05:46:13 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.646 2008/12/06 19:37:52 alc Exp $"); /* * Manages physical address maps. @@ -180,7 +180,7 @@ SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); -static int pg_ps_enabled; +static int pg_ps_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0, "Are large page mappings enabled?"); ==== //depot/projects/smpng/sys/arm/mv/mv_pci.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.2 2008/11/19 17:07:01 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.3 2008/12/05 15:27:28 raj Exp $"); #include #include @@ -598,6 +598,10 @@ mem_limit = mem_base + sc->sc_info->op_mem_size - 1; /* Configure I/O decode registers */ + pcib_mbus_write_config(sc->sc_dev, bus, slot, func, PCIR_IOBASEL_1, + io_base >> 8, 1); + pcib_mbus_write_config(sc->sc_dev, bus, slot, func, PCIR_IOBASEH_1, + io_base >> 16, 2); pcib_mbus_write_config(sc->sc_dev, bus, slot, func, PCIR_IOLIMITL_1, io_limit >> 8, 1); pcib_mbus_write_config(sc->sc_dev, bus, slot, func, PCIR_IOLIMITH_1, ==== //depot/projects/smpng/sys/arm/mv/orion/std.db88f5xxx#2 (text+ko) ==== @@ -1,13 +1,13 @@ -# $FreeBSD: src/sys/arm/mv/orion/std.db88f5xxx,v 1.1 2008/10/13 20:07:13 raj Exp $ +# $FreeBSD: src/sys/arm/mv/orion/std.db88f5xxx,v 1.2 2008/12/05 15:31:51 raj Exp $ include "../mv/std.mv" files "../mv/orion/files.db88f5xxx" -makeoptions KERNPHYSADDR=0x00400000 -makeoptions KERNVIRTADDR=0xc0400000 +makeoptions KERNPHYSADDR=0x00900000 +makeoptions KERNVIRTADDR=0xc0900000 -options KERNPHYSADDR=0x00400000 -options KERNVIRTADDR=0xc0400000 +options KERNPHYSADDR=0x00900000 +options KERNVIRTADDR=0xc0900000 options PHYSADDR=0x00000000 options PHYSMEM_SIZE=0x08000000 options STARTUP_PAGETABLE_ADDR=0x00100000 ==== //depot/projects/smpng/sys/boot/common/loader.8#47 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.94 2007/11/08 11:59:38 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.95 2008/12/06 11:21:10 danger Exp $ .\" .Dd November 8, 2007 .Dt LOADER 8 @@ -454,7 +454,7 @@ or if a SIGTERM is delivered to the .Xr init 8 process (PID 1). -.It Va init_script +.It Va init_shell Defines the shell binary to be used for executing the various shell scripts. The default is .Dq Li /bin/sh . ==== //depot/projects/smpng/sys/boot/forth/support.4th#6 (text+ko) ==== @@ -22,7 +22,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.17 2007/12/19 17:06:32 ambrisko Exp $ +\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.18 2008/12/07 19:42:20 luigi Exp $ \ Loader.rc support functions: \ @@ -288,6 +288,17 @@ : free-memory free if free_error throw then ; +: strget { var -- addr len } var .addr @ var .len @ ; + +\ assign addr len to variable. +: strset { addr len var -- } addr var .addr ! len var .len ! ; + +\ free memory and reset fields +: strfree { var -- } var .addr @ ?dup if free-memory 0 0 var strset then ; + +\ free old content, make a copy of the string and assign to variable +: string= { addr len var -- } var strfree addr len strdup var strset ; + \ Assignment data temporary storage string name_buffer @@ -712,19 +723,6 @@ module_loaderror_suffix suffix_type? ; -: set_conf_files - conf_files .addr @ ?dup if - free-memory - then - value_buffer .addr @ c@ [char] " = if - value_buffer .addr @ char+ value_buffer .len @ 2 chars - - else - value_buffer .addr @ value_buffer .len @ - then - strdup - conf_files .len ! conf_files .addr ! -; - : set_nextboot_conf nextboot_conf_file .addr @ ?dup if free-memory @@ -888,6 +886,11 @@ then ; +: set_conf_files + set_environment_variable + s" loader_conf_files" getenv conf_files string= +; + : set_nextboot_flag yes_value? to nextboot? ; @@ -1045,7 +1048,6 @@ \ Variables used for processing multiple conf files string current_file_name -variable current_conf_files \ Indicates if any conf file was succesfully read @@ -1053,18 +1055,10 @@ \ loader_conf_files processing support functions -: set_current_conf_files - conf_files .addr @ current_conf_files ! +: get_conf_files ( -- addr len ) \ put addr/len on stack, reset var + conf_files strget 0 0 conf_files strset ; -: get_conf_files - conf_files .addr @ conf_files .len @ strdup -; - -: recurse_on_conf_files? - current_conf_files @ conf_files .addr @ <> -; - : skip_leading_spaces { addr len pos -- addr len pos' } begin pos len = if addr len pos exit then @@ -1133,7 +1127,6 @@ \ Interface to loader_conf_files processing : include_conf_files - set_current_conf_files get_conf_files 0 begin get_next_file ?dup @@ -1141,7 +1134,7 @@ set_current_file_name ['] load_conf catch process_conf_errors - recurse_on_conf_files? if recurse then + conf_files .addr @ if recurse then repeat ; ==== //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#10 (text+ko) ==== @@ -14,7 +14,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.20 2008/12/03 14:53:59 luigi Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.21 2008/12/08 20:53:27 sobomax Exp $ */ /* build options: */ @@ -93,7 +93,7 @@ * %si pointer to the partition table from which we were loaded. * Some boot code (e.g. syslinux) use this info to relocate * themselves, so we want to pass a valid one to the next stage. - * NOTE: the use of %is is not a standard. + * NOTE: the use of %si is not a standard. * * This boot block first relocates itself at a different address (0:0x600), * to free the space at 0:0x7c00 for the next stage boot block. ==== //depot/projects/smpng/sys/boot/i386/btx/btxldr/btxldr.S#4 (text+ko) ==== @@ -12,9 +12,12 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.17 2004/05/14 20:29:30 ru Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.20 2008/12/09 00:25:57 sobomax Exp $ */ +#define RBX_MUTE 0x10 /* -m */ +#define OPT_SET(opt) (1 << (opt)) + /* * Prototype BTX loader program, written in a couple of hours. The * real thing should probably be more flexible, and in C. @@ -64,6 +67,8 @@ * BTX program loader for ELF clients. */ start: cld # String ops inc + testl $OPT_SET(RBX_MUTE), 4(%esp) # Check first argument + setnz muted # for RBX_MUTE, set flag movl $m_logo,%esi # Identify call putstr # ourselves movzwl BDA_MEM,%eax # Get base memory @@ -288,7 +293,9 @@ /* * Output character AL to the console. */ -putchr: pusha # Save +putchr: testb $1,muted # Check muted + jnz putchr.5 # do a nop + pusha # Save xorl %ecx,%ecx # Zero for loops movb $SCR_MAT,%ah # Mode/attribute movl $BDA_POS,%ebx # BDA pointer @@ -325,7 +332,7 @@ movb $SCR_ROW-1,%dh # Bottom line putchr.4: movw %dx,(%ebx) # Update position popa # Restore - ret # To caller +putchr.5: ret # To caller /* * Convert EAX, AX, or AL to hex, saving the result to [EDI]. */ @@ -390,6 +397,12 @@ .asciz " memsz=\0\n" m_done: .asciz "Loading complete\n" #endif + +/* + * Flags + */ +muted: .byte 0x0 + /* * Uninitialized data area. */ ==== //depot/projects/smpng/sys/boot/zfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.2 2008/11/22 14:24:55 dfr Exp $ +# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.3 2008/12/06 14:45:03 ps Exp $ LIB= zfsboot INTERNALLIB= @@ -29,7 +29,7 @@ .if ${MACHINE_ARCH} == "amd64" CLEANFILES+= machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${.CURDIR}/../../i386/include machine .endif .include ==== //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.2 2008/11/19 16:59:19 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.3 2008/12/10 10:46:34 dfr Exp $"); /* * Stand-alone ZFS file reader. @@ -623,7 +623,7 @@ uint64_t pool_txg, pool_guid; const char *pool_name; const unsigned char *vdevs; - int i; + int i, rc; char upbuf[1024]; const struct uberblock *up; @@ -723,7 +723,9 @@ DATA_TYPE_NVLIST, 0, &vdevs)) { return (EIO); } - vdev_init_from_nvlist(vdevs, &top_vdev); + rc = vdev_init_from_nvlist(vdevs, &top_vdev); + if (rc) + return (rc); /* * Add the toplevel vdev to the pool if its not already there. ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#70 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.128 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.131 2008/12/10 16:11:09 kib Exp $"); #include #include @@ -273,8 +273,7 @@ /* XXX per-cpu vendor / class / model / id? */ } - sbuf_cat(sb, - "flags\t\t:"); + sbuf_cat(sb, "flags\t\t:"); if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) { flags[16] = "fcmov"; @@ -876,10 +875,12 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) { vm_map_t map = &p->p_vmspace->vm_map; - vm_map_entry_t entry; + vm_map_entry_t entry, tmp_entry; vm_object_t obj, tobj, lobj; - vm_offset_t saved_end; + vm_offset_t e_start, e_end; vm_ooffset_t off = 0; + vm_prot_t e_prot; + unsigned int last_timestamp; char *name = "", *freename = NULL; ino_t ino; int ref_count, shadow_count, flags; @@ -905,7 +906,9 @@ freename = NULL; if (entry->eflags & MAP_ENTRY_IS_SUB_MAP) continue; - saved_end = entry->end; + e_prot = entry->protection; + e_start = entry->start; + e_end = entry->end; obj = entry->object.vm_object; for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) { VM_OBJECT_LOCK(tobj); @@ -913,6 +916,8 @@ VM_OBJECT_UNLOCK(lobj); lobj = tobj; } + last_timestamp = map->timestamp; + vm_map_unlock_read(map); ino = 0; if (lobj) { off = IDX_TO_OFF(lobj->size); @@ -950,10 +955,10 @@ */ error = sbuf_printf(sb, "%08lx-%08lx %s%s%s%s %08lx %02x:%02x %lu%s%s\n", - (u_long)entry->start, (u_long)entry->end, - (entry->protection & VM_PROT_READ)?"r":"-", - (entry->protection & VM_PROT_WRITE)?"w":"-", - (entry->protection & VM_PROT_EXECUTE)?"x":"-", + (u_long)e_start, (u_long)e_end, + (e_prot & VM_PROT_READ)?"r":"-", + (e_prot & VM_PROT_WRITE)?"w":"-", + (e_prot & VM_PROT_EXECUTE)?"x":"-", "p", (u_long)off, 0, @@ -964,10 +969,20 @@ ); if (freename) free(freename, M_TEMP); + vm_map_lock_read(map); if (error == -1) { error = 0; break; } + if (last_timestamp + 1 != map->timestamp) { + /* + * Look again for the entry because the map was + * modified while it was unlocked. Specifically, + * the entry may have been clipped, merged, or deleted. + */ + vm_map_lookup_entry(map, e_end - 1, &tmp_entry); + entry = tmp_entry; + } } vm_map_unlock_read(map); ==== //depot/projects/smpng/sys/contrib/pf/net/pf_table.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.9 2007/10/24 20:57:17 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_table.c,v 1.10 2008/12/07 21:15:43 kmacy Exp $"); #endif #include @@ -43,6 +43,8 @@ #include #include #include +#include +#include #ifdef __FreeBSD__ #include #endif ==== //depot/projects/smpng/sys/dev/adb/adb.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb.h,v 1.1 2008/10/26 19:37:38 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adb.h,v 1.2 2008/12/06 23:26:02 nwhitehorn Exp $ */ #ifndef _POWERPC_ADB_H_ @@ -68,7 +68,7 @@ uint8_t adb_get_device_handler(device_t dev); uint8_t adb_set_device_handler(device_t dev, uint8_t newhandler); -uint8_t adb_read_register(device_t dev, u_char reg, size_t *len, void *data); +size_t adb_read_register(device_t dev, u_char reg, void *data); /* Bits for implementing ADB host bus adapters */ extern devclass_t adb_devclass; ==== //depot/projects/smpng/sys/dev/adb/adb_bus.c#3 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb_bus.c,v 1.3 2008/11/12 17:33:36 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adb_bus.c,v 1.4 2008/12/06 23:26:02 nwhitehorn Exp $ */ #include @@ -48,7 +48,7 @@ static void adb_probe_nomatch(device_t dev, device_t child); static int adb_print_child(device_t dev, device_t child); -static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, uint8_t reg, int len, u_char *data); +static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, uint8_t reg, int len, u_char *data, u_char *reply); static char *adb_device_string[] = { "HOST", "dongle", "keyboard", "mouse", "tablet", "modem", "RESERVED", "misc" @@ -118,9 +118,8 @@ sc->packet_reply = 0; sc->autopoll_mask = 0; + sc->sync_packet = 0xffff; - mtx_init(&sc->sc_sync_mtx,"adbsyn",NULL,MTX_DEF | MTX_RECURSE); - /* Initialize devinfo */ for (i = 0; i < 16; i++) { sc->devinfo[i].address = i; @@ -128,7 +127,7 @@ } /* Reset ADB bus */ - adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL); + adb_send_raw_packet_sync(dev,0,ADB_COMMAND_BUS_RESET,0,0,NULL,NULL); DELAY(1500); /* Enumerate bus */ @@ -140,7 +139,7 @@ do { reply = adb_send_raw_packet_sync(dev,i, - ADB_COMMAND_TALK,3,0,NULL); + ADB_COMMAND_TALK,3,0,NULL,NULL); if (reply) { /* If we got a response, relocate to next_free */ @@ -150,10 +149,10 @@ r3 |= 0x00fe; adb_send_raw_packet_sync(dev,i, ADB_COMMAND_LISTEN,3, - sizeof(uint16_t),(u_char *)(&r3)); + sizeof(uint16_t),(u_char *)(&r3),NULL); adb_send_raw_packet_sync(dev,next_free, - ADB_COMMAND_TALK,3,0,NULL); + ADB_COMMAND_TALK,3,0,NULL,NULL); sc->devinfo[next_free].default_address = i; if (first_relocated < 0) @@ -169,9 +168,9 @@ adb_send_raw_packet_sync(dev,first_relocated, ADB_COMMAND_LISTEN,3, - sizeof(uint16_t),(u_char *)(&r3)); + sizeof(uint16_t),(u_char *)(&r3),NULL); adb_send_raw_packet_sync(dev,i, - ADB_COMMAND_TALK,3,0,NULL); + ADB_COMMAND_TALK,3,0,NULL,NULL); sc->devinfo[i].default_address = i; sc->devinfo[(int)(first_relocated)].default_address = 0; @@ -194,10 +193,6 @@ static int adb_bus_detach(device_t dev) { - struct adb_softc *sc = device_get_softc(dev); - - mtx_destroy(&sc->sc_sync_mtx); - return (bus_generic_detach(dev)); } @@ -230,6 +225,7 @@ if (sc->sync_packet == command) { memcpy(sc->syncreg,data,(len > 8) ? 8 : len); atomic_store_rel_int(&sc->packet_reply,len + 1); + wakeup(sc); } if (sc->children[addr] != NULL) { @@ -317,12 +313,12 @@ static int adb_send_raw_packet_sync(device_t dev, uint8_t to, uint8_t command, - uint8_t reg, int len, u_char *data) + uint8_t reg, int len, u_char *data, u_char *reply) { u_char command_byte = 0; struct adb_softc *sc; int result = -1; - int i = 0; + int i = 1; sc = device_get_softc(dev); @@ -331,7 +327,8 @@ command_byte |= reg; /* Wait if someone else has a synchronous request pending */ - mtx_lock(&sc->sc_sync_mtx); + while (!atomic_cmpset_int(&sc->sync_packet, 0xffff, command_byte)) + tsleep(sc, 0, "ADB sync", hz/10); sc->packet_reply = 0; sc->sync_packet = command_byte; @@ -343,21 +340,27 @@ * Maybe the command got lost? Try resending and polling the * controller. */ - if (i > 40) + if (i % 40 == 0) ADB_HB_SEND_RAW_PACKET(sc->parent, command_byte, len, data, 1); - DELAY(100); + tsleep(sc, 0, "ADB sync", hz/10); i++; } result = sc->packet_reply - 1; + if (reply != NULL && result > 0) + memcpy(reply,sc->syncreg,result); + /* Clear packet sync */ sc->packet_reply = 0; - sc->sync_packet = 0xffff; /* We can't match a 16 bit value */ - mtx_unlock(&sc->sc_sync_mtx); + /* + * We can't match a value beyond 8 bits, so set sync_packet to + * 0xffff to avoid collisions. + */ + atomic_set_int(&sc->sync_packet, 0xffff); return (result); } @@ -375,37 +378,27 @@ newr3 = dinfo->register3 & 0xff00; newr3 |= (uint16_t)(newhandler); + adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, ADB_COMMAND_LISTEN, + 3, sizeof(uint16_t), (u_char *)(&newr3), NULL); adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, - ADB_COMMAND_LISTEN, 3, sizeof(uint16_t), (u_char *)(&newr3)); - adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, - ADB_COMMAND_TALK, 3, 0, NULL); + ADB_COMMAND_TALK, 3, 0, NULL, NULL); return (dinfo->handler_id); } -uint8_t -adb_read_register(device_t dev, u_char reg, - size_t *len, void *data) +size_t +adb_read_register(device_t dev, u_char reg, void *data) { struct adb_softc *sc; struct adb_devinfo *dinfo; - size_t orig_len; + size_t result; dinfo = device_get_ivars(dev); sc = device_get_softc(device_get_parent(dev)); - orig_len = *len; + result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, + ADB_COMMAND_TALK, reg, 0, NULL, data); - mtx_lock(&sc->sc_sync_mtx); - - *len = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address, - ADB_COMMAND_TALK, reg, 0, NULL); - - if (*len > 0) - memcpy(data,sc->syncreg,*len); - - mtx_unlock(&sc->sc_sync_mtx); - - return ((*len > 0) ? 0 : -1); + return (result); } ==== //depot/projects/smpng/sys/dev/adb/adb_kbd.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb_kbd.c,v 1.1 2008/10/26 19:37:38 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adb_kbd.c,v 1.2 2008/12/06 23:26:02 nwhitehorn Exp $ */ #include @@ -271,12 +271,13 @@ } #endif + /* Check if we can read out the LED state from + this keyboard by reading the key state register */ + if (adb_read_register(dev, 2, NULL) == 2) + sc->have_led_control = 1; + adb_set_autopoll(dev,1); - /* Check (asynchronously) if we can read out the LED state from - this keyboard by reading the key state register */ - adb_send_packet(dev,ADB_COMMAND_TALK,2,0,NULL); - return (0); } @@ -323,11 +324,6 @@ if (command != ADB_COMMAND_TALK) return 0; - if (reg == 2 && len == 2) { - sc->have_led_control = 1; - return 0; - } - if (reg != 0 || len != 2) return (0); ==== //depot/projects/smpng/sys/dev/adb/adb_mouse.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adb_mouse.c,v 1.3 2008/11/02 19:08:10 ed Exp $ + * $FreeBSD: src/sys/dev/adb/adb_mouse.c,v 1.4 2008/12/06 23:26:02 nwhitehorn Exp $ */ #include @@ -181,7 +181,7 @@ sc->mode.resolution = 200; break; case 4: - adb_read_register(dev,1,&r1_len,r1); + r1_len = adb_read_register(dev,1,r1); if (r1_len < 8) break; ==== //depot/projects/smpng/sys/dev/adb/adbvar.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/adb/adbvar.h,v 1.2 2008/10/30 15:27:13 nwhitehorn Exp $ + * $FreeBSD: src/sys/dev/adb/adbvar.h,v 1.3 2008/12/06 23:26:02 nwhitehorn Exp $ */ #ifndef _POWERPC_ADBVAR_H_ @@ -40,7 +40,6 @@ device_t parent; struct intr_config_hook enum_hook; - struct mtx sc_sync_mtx; volatile int sync_packet; volatile int packet_reply; ==== //depot/projects/smpng/sys/dev/ae/if_ae.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.1 2008/10/03 10:31:31 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ae/if_ae.c,v 1.2 2008/12/06 14:23:45 stas Exp $"); #include #include @@ -1105,12 +1105,9 @@ static int ae_alloc_rings(ae_softc_t *sc) { - bus_dma_tag_t bustag; bus_addr_t busaddr; int error; - bustag = bus_get_dma_tag(sc->dev); - /* * Create parent DMA tag. */ @@ -1903,8 +1900,8 @@ if_printf(ifp, "Rx interrupt occuried.\n"); #endif size = le16toh(rxd->len) - ETHER_CRC_LEN; - if (size < 0) { - if_printf(ifp, "Negative length packet received."); + if (size < (ETHER_MIN_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)) { + if_printf(ifp, "Runt frame received."); return (EIO); } ==== //depot/projects/smpng/sys/dev/ath/if_ath.c#61 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.221 2008/12/01 16:53:01 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.223 2008/12/07 19:29:11 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -219,9 +219,15 @@ SYSCTL_DECL(_hw_ath); /* XXX validate sysctl values */ -static int ath_calinterval = 30; /* calibrate every 30 secs */ -SYSCTL_INT(_hw_ath, OID_AUTO, calibrate, CTLFLAG_RW, &ath_calinterval, - 0, "chip calibration interval (secs)"); +static int ath_longcalinterval = 30; /* long cals every 30 secs */ +SYSCTL_INT(_hw_ath, OID_AUTO, longcal, CTLFLAG_RW, &ath_longcalinterval, + 0, "long chip calibration interval (secs)"); +static int ath_shortcalinterval = 100; /* short cals every 100 ms */ +SYSCTL_INT(_hw_ath, OID_AUTO, shortcal, CTLFLAG_RW, &ath_shortcalinterval, + 0, "short chip calibration interval (msecs)"); +static int ath_resetcalinterval = 20*60; /* reset cal state 20 mins */ +SYSCTL_INT(_hw_ath, OID_AUTO, resetcal, CTLFLAG_RW, &ath_resetcalinterval, + 0, "reset chip calibration results (secs)"); static int ath_rxbuf = ATH_RXBUF; /* # rx buffers to allocate */ SYSCTL_INT(_hw_ath, OID_AUTO, rxbuf, CTLFLAG_RW, &ath_rxbuf, @@ -1433,8 +1439,9 @@ * state cached in the driver. */ sc->sc_diversity = ath_hal_getdiversity(ah); - sc->sc_calinterval = 1; - sc->sc_caltries = 0; + sc->sc_lastlongcal = 0; + sc->sc_resetcal = 1; + sc->sc_lastcalreset = 0; /* * Setup the hardware after reset: the key cache @@ -1566,8 +1573,6 @@ if_printf(ifp, "%s: unable to reset hardware; hal status %u\n", __func__, status); sc->sc_diversity = ath_hal_getdiversity(ah); - sc->sc_calinterval = 1; - sc->sc_caltries = 0; if (ath_startrecv(sc) != 0) /* restart recv */ if_printf(ifp, "%s: unable to start recv logic\n", __func__); /* @@ -5493,8 +5498,6 @@ } sc->sc_curchan = hchan; sc->sc_diversity = ath_hal_getdiversity(ah); - sc->sc_calinterval = 1; - sc->sc_caltries = 0; /* * Re-enable rx framework. @@ -5528,54 +5531,76 @@ { struct ath_softc *sc = arg; struct ath_hal *ah = sc->sc_ah; - HAL_BOOL iqCalDone; + struct ifnet *ifp = sc->sc_ifp; + HAL_BOOL longCal, isCalDone; + int nextcal; - sc->sc_stats.ast_per_cal++; - - if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) { + longCal = (ticks - sc->sc_lastlongcal >= ath_longcalinterval*hz); + if (longCal) { + sc->sc_stats.ast_per_cal++; + if (ath_hal_getrfgain(ah) == HAL_RFGAIN_NEED_CHANGE) { + /* + * Rfgain is out of bounds, reset the chip + * to load new gain values. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 10 22:35:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E421065679; Wed, 10 Dec 2008 22:35:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0353F1065670 for ; Wed, 10 Dec 2008 22:35:43 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1A288FC16 for ; Wed, 10 Dec 2008 22:35:42 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAMZgrw085631 for ; Wed, 10 Dec 2008 22:35:42 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAMZg6N085629 for perforce@freebsd.org; Wed, 10 Dec 2008 22:35:42 GMT (envelope-from sson@FreeBSD.org) Date: Wed, 10 Dec 2008 22:35:42 GMT Message-Id: <200812102235.mBAMZg6N085629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 154466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 22:35:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=154466 Change 154466 by sson@sson_amd64 on 2008/12/10 22:35:02 Major auditd rewrite for launchd(8) support. This required: (1) Adding libauditd library that is shared between launchd and auditd. (2) Adding the AUDIT_TRIGGER_INITIALIZE trigger (sent via 'audit -i') for (re)starting auditing under launchd(8) on Mac OS X. (3) Separating Mac OS X and FreeBSD dependent code in auditd.c into auditd_darwin.c and auditd_fbsd.c files. This changeset also includes: (1) Crash recovery of previous audit trail file when detected on audit startup that it has not been properly terminated. (2) Add the event AUE_audit_recovery to indicated when an audit trail file has been recovered from not being properly terminated. This event is stored in the new audit trail file and includes the path of recovered audit trail file. (3) Add an event for the posix_spawn(2) and fsgetpath(2) Mac OS X system calls. (4) For Mac OS X, we use ASL(3) instead of syslog(3) for logging. Add support for NOTICE level logging. Affected files ... .. //depot/projects/trustedbsd/openbsm/Makefile.am#4 edit .. //depot/projects/trustedbsd/openbsm/Makefile.in#9 edit .. //depot/projects/trustedbsd/openbsm/NEWS#21 edit .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#9 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#5 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#12 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#12 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#10 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#15 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#12 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#1 add .. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/Makefile.in#7 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/Makefile.in#9 edit .. //depot/projects/trustedbsd/openbsm/bin/praudit/Makefile.in#9 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.am#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/Makefile.in#9 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#10 edit .. //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#1 add .. //depot/projects/trustedbsd/openbsm/configure#43 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#45 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_event#34 edit .. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.am#1 add .. //depot/projects/trustedbsd/openbsm/libauditd/Makefile.in#1 add .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#12 edit .. //depot/projects/trustedbsd/openbsm/man/Makefile.in#8 edit .. //depot/projects/trustedbsd/openbsm/modules/Makefile.in#6 edit .. //depot/projects/trustedbsd/openbsm/modules/auditfilter_noop/Makefile.in#7 edit .. //depot/projects/trustedbsd/openbsm/sys/Makefile.in#3 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#4 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#2 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 edit .. //depot/projects/trustedbsd/openbsm/test/Makefile.in#7 edit .. //depot/projects/trustedbsd/openbsm/test/bsm/Makefile.in#7 edit .. //depot/projects/trustedbsd/openbsm/tools/Makefile.in#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/Makefile.am#4 (text+ko) ==== @@ -1,15 +1,23 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#3 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.am#4 $ # SUBDIRS = \ - bsm \ + bsm + +if HAVE_AUDIT_SYSCALLS +SUBDIRS += \ + libauditd +endif + +SUBDIRS += \ libbsm \ bin \ man \ modules \ sys + EXTRA_DIST = \ CHANGELOG \ LICENSE \ ==== //depot/projects/trustedbsd/openbsm/Makefile.in#9 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#8 $ +# $P4: //depot/projects/trustedbsd/openbsm/Makefile.in#9 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -35,6 +35,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ +@HAVE_AUDIT_SYSCALLS_TRUE@ libauditd + subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/config/config.h.in \ @@ -63,7 +66,7 @@ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = bsm libauditd libbsm bin man modules sys DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -183,14 +186,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = \ - bsm \ - libbsm \ - bin \ - man \ - modules \ - sys - +SUBDIRS = bsm $(am__append_1) libbsm bin man modules sys EXTRA_DIST = \ CHANGELOG \ LICENSE \ ==== //depot/projects/trustedbsd/openbsm/NEWS#21 (text+ko) ==== @@ -13,6 +13,22 @@ directly, rather than requiring applications to map to the local error space, which might not be able to entirely represent the BSM error number space. +- Major auditd rewrite for launchd(8) support. Add libauditd library that is + shared between launchd and auditd. +- Add AUDIT_TRIGGER_INITIALIZE trigger (sent via 'audit -i') for (re)starting + auditing under launchd(8) on Mac OS X. +- Add 'current' symlink to active audit trail. +- Add crash recovery of previous audit trail file when detected on audit + startup that it has not been properly terminated. +- Add the event AUE_audit_recovery to indicated when an audit trail file has + been recovered from not being properly terminated. This event is stored + in the new audit trail file and includes the path of recovered audit trail + file. +- Mac OS X and FreeBSD dependent code in auditd.c is separated into + auditd_darwin.c and auditd_fbsd.c files. +- Add an event for the posix_spawn(2) and fsgetpath(2) Mac OS X system calls. +- For Mac OS X, we use ASL(3) instead of syslog(3) for logging. +- Add support for NOTICE level logging. OpenBSM 1.1 alpha 3 @@ -377,4 +393,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#20 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#21 $ ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#9 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#8 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#9 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -36,8 +36,8 @@ build_triplet = @build@ host_triplet = @host@ @HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ -@HAVE_AUDIT_SYSCALLS_TRUE@ audit \ -@HAVE_AUDIT_SYSCALLS_TRUE@ auditd +@HAVE_AUDIT_SYSCALLS_TRUE@ auditd \ +@HAVE_AUDIT_SYSCALLS_TRUE@ audit subdir = bin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -61,7 +61,7 @@ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = auditfilterd auditreduce praudit audit auditd +DIST_SUBDIRS = auditfilterd auditreduce praudit auditd audit DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#5 $ # if USE_NATIVE_INCLUDES @@ -13,11 +13,11 @@ man8_MANS = audit.8 if USE_MACH_IPC -audit_SOURCES = auditd_control_user.c audit.c -CLEANFILES = auditd_control_user.c auditd_control_user.h +audit_SOURCES = auditd_controlUser.c audit.c +CLEANFILES = auditd_controlUser.c auditd_controlUser.h -auditd_control_user.c: $(top_srcdir)/bin/auditd/auditd_control.defs - $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs +auditd_controlUser.c auditd_controlUser.h: $(top_srcdir)/bin/auditd/auditd_control.defs + $(MIG) -user auditd_controlUser.c -header auditd_controlUser.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs else audit_SOURCES = audit.c endif ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#10 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#10 $ # VPATH = @srcdir@ @@ -49,9 +49,9 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) -am__audit_SOURCES_DIST = audit.c auditd_control_user.c +am__audit_SOURCES_DIST = audit.c auditd_controlUser.c @USE_MACH_IPC_FALSE@am_audit_OBJECTS = audit.$(OBJEXT) -@USE_MACH_IPC_TRUE@am_audit_OBJECTS = auditd_control_user.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@am_audit_OBJECTS = auditd_controlUser.$(OBJEXT) \ @USE_MACH_IPC_TRUE@ audit.$(OBJEXT) audit_OBJECTS = $(am_audit_OBJECTS) audit_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la @@ -188,8 +188,8 @@ audit_LDADD = $(top_builddir)/libbsm/libbsm.la man8_MANS = audit.8 @USE_MACH_IPC_FALSE@audit_SOURCES = audit.c -@USE_MACH_IPC_TRUE@audit_SOURCES = auditd_control_user.c audit.c -@USE_MACH_IPC_TRUE@CLEANFILES = auditd_control_user.c auditd_control_user.h +@USE_MACH_IPC_TRUE@audit_SOURCES = auditd_controlUser.c audit.c +@USE_MACH_IPC_TRUE@CLEANFILES = auditd_controlUser.c auditd_controlUser.h all: all-am .SUFFIXES: @@ -262,7 +262,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_control_user.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_controlUser.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -521,8 +521,8 @@ uninstall-sbinPROGRAMS -@USE_MACH_IPC_TRUE@auditd_control_user.c: $(top_srcdir)/bin/auditd/auditd_control.defs -@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_control_user.c -header auditd_control_user.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@auditd_controlUser.c auditd_controlUser.h: $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_controlUser.c -header auditd_controlUser.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#12 (text+ko) ==== @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#12 $ .\" .Dd October 2, 2006 .Dt AUDIT 8 @@ -35,7 +35,7 @@ .Nd audit management utility .Sh SYNOPSIS .Nm -.Fl n | s | t +.Fl i | n | s | t .Sh DESCRIPTION The .Nm @@ -43,6 +43,10 @@ One of the following flags is required as an argument to .Nm : .Bl -tag -width indent +.It Fl i +Initializes and starts auditing. This option is currently for Mac OS X only +and requires auditd to be configured to run under +.Xr Launchd 8 . .It Fl n Forces the audit system to close the existing audit log file and rotate to a new log file in a location specified in the audit control file. @@ -58,7 +62,13 @@ .Sh NOTES The .Xr auditd 8 -daemon must already be running. +daemon must already be running. Optionally, it can be configured to be started +on-demand by +.Xr Launchd 8 +(Mac OS X only). +The +.Nm +utility requires audit administrator privileges for successful operation. .Sh FILES .Bl -tag -width ".Pa /etc/security/audit_control" -compact .It Pa /etc/security/audit_control @@ -67,7 +77,8 @@ .Sh SEE ALSO .Xr audit 4 , .Xr audit_control 5 , -.Xr auditd 8 +.Xr auditd 8 , +.Xr launchd 8 .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#12 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -47,6 +47,7 @@ #include +#include #include #include #include @@ -64,7 +65,15 @@ #include #include -#include "auditd_control_user.h" +#include "auditd_controlUser.h" + +/* + * XXX the following is temporary until this can be added to the kernel + * audit.h header. + */ +#ifndef AUDIT_TRIGGER_INITIALIZE +#define AUDIT_TRIGGER_INITIALIZE 7 +#endif static int send_trigger(unsigned int trigger) @@ -74,7 +83,12 @@ error = host_get_audit_control_port(mach_host_self(), &serverPort); if (error != KERN_SUCCESS) { - mach_error("Cannot get auditd_control Mach port: ", error); + if (geteuid() != 0) { + errno = EPERM; + perror("audit requires root privileges"); + } else + mach_error("Cannot get auditd_control Mach port:", + error); return (-1); } @@ -96,7 +110,10 @@ error = auditon(A_SENDTRIGGER, &trigger, sizeof(trigger)); if (error != 0) { - perror("Error sending trigger"); + if (error == EPERM) + perror("audit requires root privileges"); + else + perror("Error sending trigger"); return (-1); } @@ -108,7 +125,7 @@ usage(void) { - (void)fprintf(stderr, "Usage: audit -n | -s | -t \n"); + (void)fprintf(stderr, "Usage: audit -i | -n | -s | -t \n"); exit(-1); } @@ -124,9 +141,13 @@ if (argc != 2) usage(); - while ((ch = getopt(argc, argv, "nst")) != -1) { + while ((ch = getopt(argc, argv, "inst")) != -1) { switch(ch) { + case 'i': + trigger = AUDIT_TRIGGER_INITIALIZE; + break; + case 'n': trigger = AUDIT_TRIGGER_ROTATE_USER; break; ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#4 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.am#5 $ # if USE_NATIVE_INCLUDES @@ -9,18 +9,18 @@ endif sbin_PROGRAMS = auditd -auditd_LDADD = $(top_builddir)/libbsm/libbsm.la +auditd_LDADD = $(top_builddir)/libbsm/libbsm.la $(top_builddir)/libauditd/libauditd.la man8_MANS = auditd.8 if USE_MACH_IPC -auditd_SOURCES = auditd_control_server.c audit_triggers_server.c audit_warn.c auditd.c -CLEANFILES = auditd_control_server.c auditd_control_server.h audit_triggers_server.c audit_triggers_server.h +auditd_SOURCES = auditd_controlServer.c audit_triggersServer.c audit_warn.c auditd.c auditd_darwin.c +CLEANFILES = auditd_control_server.c auditd_controlServer.h audit_triggersServer.c audit_triggersServer.h -auditd_control_server.c: auditd_control.defs - $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h $(top_srcdir)/bin/auditd/auditd_control.defs +auditd_controlServer.c auditd_controlServer.h: auditd_control.defs + $(MIG) -user /dev/null -header /dev/null -server auditd_controlServer.c -sheader auditd_controlServer.h $(top_srcdir)/bin/auditd/auditd_control.defs -audit_triggers_server.c: audit_triggers.defs - $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h $(top_srcdir)/bin/auditd/audit_triggers.defs +audit_triggersServer.c audit_triggersServer.h: audit_triggers.defs + $(MIG) -user /dev/null -header /dev/null -server audit_triggersServer.c -sheader audit_triggersServer.h $(top_srcdir)/bin/auditd/audit_triggers.defs else -auditd_SOURCES = audit_warn.c auditd.c +auditd_SOURCES = audit_warn.c auditd.c auditd_fbsd.c endif ==== //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#10 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/Makefile.in#10 $ # VPATH = @srcdir@ @@ -49,16 +49,17 @@ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(sbin_PROGRAMS) -am__auditd_SOURCES_DIST = audit_warn.c auditd.c \ - auditd_control_server.c audit_triggers_server.c +am__auditd_SOURCES_DIST = audit_warn.c auditd.c auditd_fbsd.c \ + auditd_controlServer.c audit_triggersServer.c auditd_darwin.c @USE_MACH_IPC_FALSE@am_auditd_OBJECTS = audit_warn.$(OBJEXT) \ -@USE_MACH_IPC_FALSE@ auditd.$(OBJEXT) -@USE_MACH_IPC_TRUE@am_auditd_OBJECTS = \ -@USE_MACH_IPC_TRUE@ auditd_control_server.$(OBJEXT) \ -@USE_MACH_IPC_TRUE@ audit_triggers_server.$(OBJEXT) \ -@USE_MACH_IPC_TRUE@ audit_warn.$(OBJEXT) auditd.$(OBJEXT) +@USE_MACH_IPC_FALSE@ auditd.$(OBJEXT) auditd_fbsd.$(OBJEXT) +@USE_MACH_IPC_TRUE@am_auditd_OBJECTS = auditd_controlServer.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit_triggersServer.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ audit_warn.$(OBJEXT) auditd.$(OBJEXT) \ +@USE_MACH_IPC_TRUE@ auditd_darwin.$(OBJEXT) auditd_OBJECTS = $(am_auditd_OBJECTS) -auditd_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la +auditd_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la \ + $(top_builddir)/libauditd/libauditd.la DEFAULT_INCLUDES = -I. -I$(top_builddir)/config@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -189,11 +190,11 @@ top_srcdir = @top_srcdir@ @USE_NATIVE_INCLUDES_FALSE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sys @USE_NATIVE_INCLUDES_TRUE@INCLUDES = -I$(top_builddir) -I$(top_srcdir) -auditd_LDADD = $(top_builddir)/libbsm/libbsm.la +auditd_LDADD = $(top_builddir)/libbsm/libbsm.la $(top_builddir)/libauditd/libauditd.la man8_MANS = auditd.8 -@USE_MACH_IPC_FALSE@auditd_SOURCES = audit_warn.c auditd.c -@USE_MACH_IPC_TRUE@auditd_SOURCES = auditd_control_server.c audit_triggers_server.c audit_warn.c auditd.c -@USE_MACH_IPC_TRUE@CLEANFILES = auditd_control_server.c auditd_control_server.h audit_triggers_server.c audit_triggers_server.h +@USE_MACH_IPC_FALSE@auditd_SOURCES = audit_warn.c auditd.c auditd_fbsd.c +@USE_MACH_IPC_TRUE@auditd_SOURCES = auditd_controlServer.c audit_triggersServer.c audit_warn.c auditd.c auditd_darwin.c +@USE_MACH_IPC_TRUE@CLEANFILES = auditd_control_server.c auditd_controlServer.h audit_triggersServer.c audit_triggersServer.h all: all-am .SUFFIXES: @@ -265,10 +266,12 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit_triggers_server.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit_triggersServer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audit_warn.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_control_server.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_controlServer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_darwin.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auditd_fbsd.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -527,11 +530,11 @@ uninstall-sbinPROGRAMS -@USE_MACH_IPC_TRUE@auditd_control_server.c: auditd_control.defs -@USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server auditd_control_server.c -sheader auditd_control_server.h $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@auditd_controlServer.c auditd_controlServer.h: auditd_control.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server auditd_controlServer.c -sheader auditd_controlServer.h $(top_srcdir)/bin/auditd/auditd_control.defs -@USE_MACH_IPC_TRUE@audit_triggers_server.c: audit_triggers.defs -@USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server audit_triggers_server.c -sheader audit_triggers_server.h $(top_srcdir)/bin/auditd/audit_triggers.defs +@USE_MACH_IPC_TRUE@audit_triggersServer.c audit_triggersServer.h: audit_triggers.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user /dev/null -header /dev/null -server audit_triggersServer.c -sheader audit_triggersServer.h $(top_srcdir)/bin/auditd/audit_triggers.defs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#10 $ */ #include @@ -71,20 +71,15 @@ } /* - * Indicates that the hard limit for all filesystems has been exceeded count - * times. + * Indicates that the hard limit for all filesystems has been exceeded. */ int -audit_warn_allhard(int count) +audit_warn_allhard(void) { - char intstr[12]; - char *args[3]; - - snprintf(intstr, 12, "%d", count); + char *args[2]; args[0] = HARDLIM_ALL_WARN; - args[1] = intstr; - args[2] = NULL; + args[1] = NULL; return (auditwarnlog(args)); } ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#15 (text+ko) ==== @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#14 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#15 $ .\" .Dd October 2, 2006 .Dt AUDITD 8 @@ -35,7 +35,7 @@ .Nd audit log management daemon .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl d | l .Sh DESCRIPTION The .Nm @@ -50,7 +50,15 @@ .Bl -tag -width indent .It Fl d Starts the daemon in debug mode \[em] it will not daemonize. +.It Fl l +This option is for when +.Nm +is configured to start on-demand using +.Xr launchd 8 . .El +.Pp +Optionally, the audit review group "audit" may be created. Non-privileged +users that are members of this group may read the audit trail log files. .Sh NOTE To assure uninterrupted audit support, the .Nm @@ -63,20 +71,32 @@ .Pa audit_control file. .Pp -.\" Sending a -.\" .Dv SIGHUP -.\" to a running -.\" .Nm -.\" daemon will force it to exit. -Sending a -.Dv SIGTERM -to a running +If +.Nm +is started on-demand by +.Xr launchd 8 +then auditing should only be started and stopped with +.Xr audit 8 . +.Pp +On Mac OS X, .Nm -daemon will force it to exit. +uses the +.Xr asl 3 +API for writing system log messages. Therefore, only the audit administrator +and members of the audit review group will be able to read the +system log enties. .Sh FILES -.Bl -tag -width ".Pa /var/audit" -compact +.Bl -tag -width ".Pa /etc/security" -compact .It Pa /var/audit Default directory for storing audit log files. +.Pp +.It Pa /etc/security +The directory containing the auditing configuration files +.Xr audit_class 5 , +.Xr audit_control 5 , +.Xr audit_event 5 , +and +.Xr audit_warn 5 . .El .Sh COMPATIBILITY The historical @@ -92,9 +112,14 @@ and are no longer available as arguments to .Nm . .Sh SEE ALSO +.Xr asl 3 , .Xr audit 4 , +.Xr audit_class 5 , .Xr audit_control 5 , -.Xr audit 8 +.Xr audit_event 5 , +.Xr audit_warn 5 , +.Xr audit 8 , +.Xr launchd 8 .Sh HISTORY The OpenBSM implementation was created by McAfee Research, the security division of McAfee Inc., under contract to Apple Computer Inc.\& in 2004. ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 (text+ko) ==== @@ -26,30 +26,29 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#39 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#40 $ */ -#include +#include #include #include -#include -#include #ifdef HAVE_FULL_QUEUE_H #include #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ +#include +#include #include #include #include #include +#include #include -#include - #include #include #include @@ -60,54 +59,54 @@ #include #include #include -#include -#include #include "auditd.h" -#ifdef USE_MACH_IPC -#include -#include -#include -#include -#include -#include - -#include "auditd_control_server.h" -#include "audit_triggers_server.h" -#endif /* USE_MACH_IPC */ #ifndef HAVE_STRLCPY #include #endif -#define NA_EVENT_STR_SIZE 25 -#define POL_STR_SIZE 128 -static int ret, minval; -static char *lastfile = NULL; -static int allhardcount = 0; -static int sigchlds, sigchlds_handled; -static int sighups, sighups_handled; -#ifndef USE_MACH_IPC -static int sigterms, sigterms_handled; -static int triggerfd = 0; +/* + * XXX the following is temporary until this can be added to the kernel + * audit.h header. + */ +#ifndef AUDIT_TRIGGER_INITIALIZE +#define AUDIT_TRIGGER_INITIALIZE 7 +#endif -#else /* USE_MACH_IPC */ +/* + * LaunchD flag (Mac OS X and, maybe, FreeBSD only.) See launchd(8) and + * http://wiki.freebsd.org/launchd for more information. + * + * In order for auditd to work "on demand" with launchd(8) it can't: + * call daemon(3) + * call fork and having the parent process exit + * change uids or gids. + * set up the current working directory or chroot. + * set the session id + * change stdio to /dev/null. + * call setrusage(2) + * call setpriority(2) + * Ignore SIGTERM. + * auditd (in 'launchd mode') is launched on demand so it must catch + * SIGTERM to exit cleanly. + */ +static int launchd_flag = 0; -static mach_port_t control_port = MACH_PORT_NULL; -static mach_port_t signal_port = MACH_PORT_NULL; -static mach_port_t port_set = MACH_PORT_NULL; +/* + * The GID of the audit review group (if used). The audit trail files and + * system logs (Mac OS X only) can only be reviewed by members of this group + * or the audit administrator (aka. "root"). + */ +static gid_t audit_review_gid = -1; -#ifndef __BSM_INTERNAL_NOTIFY_KEY -#define __BSM_INTERNAL_NOTIFY_KEY "com.apple.audit.change" -#endif /* __BSM_INTERNAL_NOTIFY_KEY */ -#endif /* USE_MACH_IPC */ - -static TAILQ_HEAD(, dir_ent) dir_q; - -static int config_audit_controls(void); +/* + * The path and file name of the last audit trail file. + */ +static char *lastfile = NULL; /* - * Error starting auditd + * Error starting auditd. Run warn script and exit. */ static void fail_exit(void) @@ -118,60 +117,33 @@ } /* - * Free our local list of directory names. + * Follow the 'current' symlink to get the active trail file name. */ -static void -free_dir_q(void) +static char * +get_curfile(void) { - struct dir_ent *dirent; + char *cf; + int len; + + cf = malloc(MAXPATHLEN); + if (cf == NULL) { + auditd_log_err("malloc failed: %m"); + return (NULL); + } - while ((dirent = TAILQ_FIRST(&dir_q))) { - TAILQ_REMOVE(&dir_q, dirent, dirs); - free(dirent->dirname); - free(dirent); + len = readlink(AUDIT_CURRENT_LINK, cf, MAXPATHLEN - 1); + if (len < 0) { + free(cf); + return (NULL); } -} -/* - * Generate the timestamp string. - */ -static int -getTSstr(char *buf, int len) -{ - struct timeval ts; - struct timezone tzp; - time_t tt; + /* readlink() doesn't terminate string. */ + cf[len] = '\0'; - if (gettimeofday(&ts, &tzp) != 0) - return (-1); - tt = (time_t)ts.tv_sec; - if (!strftime(buf, len, "%Y%m%d%H%M%S", gmtime(&tt))) - return (-1); - return (0); + return (cf); } /* - * Concat the directory name to the given file name. - * XXX We should affix the hostname also - */ -static char * -affixdir(char *name, struct dir_ent *dirent) -{ - char *fn = NULL; - - syslog(LOG_DEBUG, "dir = %s", dirent->dirname); - /* - * Sanity check on file name. - */ - if (strlen(name) != (FILENAME_LEN - 1)) { - syslog(LOG_ERR, "Invalid file name: %s", name); - return (NULL); - } - asprintf(&fn, "%s/%s", dirent->dirname, name); - return (fn); -} - -/* * Close the previous audit trail file. */ static int @@ -181,6 +153,10 @@ char *oldname; size_t len; + /* If lastfile is NULL try to get it from the 'current' link. */ + if (lastfile == NULL) + lastfile = get_curfile(); + if (lastfile != NULL) { len = strlen(lastfile) + 1; oldname = (char *)malloc(len); @@ -192,16 +168,21 @@ if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) { strlcpy(ptr, TS, TIMESTAMP_LEN); if (rename(oldname, lastfile) != 0) - syslog(LOG_ERR, + auditd_log_err( "Could not rename %s to %s: %m", oldname, lastfile); else { - syslog(LOG_INFO, "renamed %s to %s", + /* + * Remove the 'current' symlink since the link + * is now invalid. + */ + (void) unlink(AUDIT_CURRENT_LINK); + auditd_log_notice( "renamed %s to %s", oldname, lastfile); audit_warn_closefile(lastfile); } } else - syslog(LOG_ERR, "Could not rename %s to %s", oldname, + auditd_log_err( "Could not rename %s to %s", oldname, lastfile); free(lastfile); free(oldname); @@ -211,168 +192,81 @@ } /* - * Create the new audit file with appropriate permissions and ownership. Try - * to clean up if something goes wrong. - */ -static int -#ifdef AUDIT_REVIEW_GROUP -open_trail(const char *fname, uid_t uid, gid_t gid) -#else -open_trail(const char *fname) -#endif -{ - int error, fd; - - fd = open(fname, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP); - if (fd < 0) - return (-1); -#ifdef AUDIT_REVIEW_GROUP - if (fchown(fd, uid, gid) < 0) { - error = errno; - close(fd); - (void)unlink(fname); - errno = error; - return (-1); - } -#endif - return (fd); -} - -/* * Create the new file name, swap with existing audit file. */ static int swap_audit_file(void) { - char timestr[FILENAME_LEN]; - char *fn; + int err; + char *newfile; char TS[TIMESTAMP_LEN]; - struct dir_ent *dirent; -#ifdef AUDIT_REVIEW_GROUP - struct group *grp; - gid_t gid; - uid_t uid; -#endif - int error, fd; + time_t tt; - if (getTSstr(TS, TIMESTAMP_LEN) != 0) + if (getTSstr(tt, TS, TIMESTAMP_LEN) != 0) return (-1); + err = auditd_swap_trail(TS, &newfile, audit_review_gid, + audit_warn_getacdir); + if (err != ADE_NOERR) { + auditd_log_err( "%s: %m", auditd_strerror(err)); + if (err != ADE_ACTL) + return (-1); + } - snprintf(timestr, FILENAME_LEN, "%s.%s", TS, NOT_TERMINATED); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 11 06:45:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ADA51065676; Thu, 11 Dec 2008 06:45:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4EDD01065670 for ; Thu, 11 Dec 2008 06:45:41 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DC768FC08 for ; Thu, 11 Dec 2008 06:45:41 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBB6jfur057180 for ; Thu, 11 Dec 2008 06:45:41 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBB6jeQU057143 for perforce@freebsd.org; Thu, 11 Dec 2008 06:45:40 GMT (envelope-from zec@icir.org) Date: Thu, 11 Dec 2008 06:45:40 GMT Message-Id: <200812110645.mBB6jeQU057143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 06:45:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=154482 Change 154482 by zec@zec_tca51 on 2008/12/11 06:45:01 IFC @ 154481 Affected files ... .. //depot/projects/vimage-commit2/src/sys/boot/zfs/zfs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#20 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#18 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_prf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/aio/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#19 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/libalias/alias_db.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#18 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#17 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/aio.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kernel.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#26 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/boot/zfs/zfs.c#3 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.2 2008/11/19 16:39:01 dfr Exp $ + * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.2 2008/11/19 16:39:01 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $"); /* * Stand-alone file reading package. @@ -474,7 +474,6 @@ * the pool. */ unit = dev->d_unit; - free(dev); i = 0; STAILQ_FOREACH(spa, &zfs_pools, spa_link) { ==== //depot/projects/vimage-commit2/src/sys/boot/zfs/zfsimpl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.2 2008/11/19 16:59:19 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.3 2008/12/10 10:46:34 dfr Exp $"); /* * Stand-alone ZFS file reader. @@ -623,7 +623,7 @@ uint64_t pool_txg, pool_guid; const char *pool_name; const unsigned char *vdevs; - int i; + int i, rc; char upbuf[1024]; const struct uberblock *up; @@ -723,7 +723,9 @@ DATA_TYPE_NVLIST, 0, &vdevs)) { return (EIO); } - vdev_init_from_nvlist(vdevs, &top_vdev); + rc = vdev_init_from_nvlist(vdevs, &top_vdev); + if (rc) + return (rc); /* * Add the toplevel vdev to the pool if its not already there. ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.97 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.98 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -215,6 +215,18 @@ char rqtp_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * rqtp; char rqtp_r_[PADR_(const struct timespec32 *)]; char rmtp_l_[PADL_(struct timespec32 *)]; struct timespec32 * rmtp; char rmtp_r_[PADR_(struct timespec32 *)]; }; +struct freebsd32_aio_read_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_write_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_lio_listio_args { + char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char acb_list_l_[PADL_(struct aiocb32 *const *)]; struct aiocb32 *const * acb_list; char acb_list_r_[PADR_(struct aiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char sig_l_[PADL_(struct sigevent *)]; struct sigevent * sig; char sig_r_[PADR_(struct sigevent *)]; +}; struct freebsd32_lutimes_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)]; @@ -235,6 +247,33 @@ char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)]; }; +struct freebsd32_aio_return_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_suspend_args { + char aiocbp_l_[PADL_(struct aiocb32 *const *)]; struct aiocb32 *const * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; +}; +struct freebsd32_aio_cancel_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_error_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_oaio_read_args { + char aiocbp_l_[PADL_(struct oaiocb32 *)]; struct oaiocb32 * aiocbp; char aiocbp_r_[PADR_(struct oaiocb32 *)]; +}; +struct freebsd32_oaio_write_args { + char aiocbp_l_[PADL_(struct oaiocb32 *)]; struct oaiocb32 * aiocbp; char aiocbp_r_[PADR_(struct oaiocb32 *)]; +}; +struct freebsd32_olio_listio_args { + char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char acb_list_l_[PADL_(struct oaiocb32 *const *)]; struct oaiocb32 *const * acb_list; char acb_list_r_[PADR_(struct oaiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char sig_l_[PADL_(struct osigevent32 *)]; struct osigevent32 * sig; char sig_r_[PADR_(struct osigevent32 *)]; +}; struct freebsd32_jail_args { char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char jail_r_[PADR_(struct jail32 *)]; }; @@ -247,6 +286,10 @@ char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; }; +struct freebsd32_aio_waitcomplete_args { + char aiocbp_l_[PADL_(struct aiocb32 **)]; struct aiocb32 ** aiocbp; char aiocbp_r_[PADR_(struct aiocb32 **)]; + char timeout_l_[PADL_(struct timespec32 *)]; struct timespec32 * timeout; char timeout_r_[PADR_(struct timespec32 *)]; +}; struct freebsd32_kevent_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char changelist_l_[PADL_(const struct kevent32 *)]; const struct kevent32 * changelist; char changelist_r_[PADR_(const struct kevent32 *)]; @@ -308,6 +351,10 @@ char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; +struct freebsd32_aio_fsync_args { + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; struct freebsd32_pread_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; @@ -427,13 +474,24 @@ int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *); int freebsd32_clock_getres(struct thread *, struct freebsd32_clock_getres_args *); int freebsd32_nanosleep(struct thread *, struct freebsd32_nanosleep_args *); +int freebsd32_aio_read(struct thread *, struct freebsd32_aio_read_args *); +int freebsd32_aio_write(struct thread *, struct freebsd32_aio_write_args *); +int freebsd32_lio_listio(struct thread *, struct freebsd32_lio_listio_args *); int freebsd32_lutimes(struct thread *, struct freebsd32_lutimes_args *); int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *); int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *); int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *); +int freebsd32_aio_return(struct thread *, struct freebsd32_aio_return_args *); +int freebsd32_aio_suspend(struct thread *, struct freebsd32_aio_suspend_args *); +int freebsd32_aio_cancel(struct thread *, struct freebsd32_aio_cancel_args *); +int freebsd32_aio_error(struct thread *, struct freebsd32_aio_error_args *); +int freebsd32_oaio_read(struct thread *, struct freebsd32_oaio_read_args *); +int freebsd32_oaio_write(struct thread *, struct freebsd32_oaio_write_args *); +int freebsd32_olio_listio(struct thread *, struct freebsd32_olio_listio_args *); int freebsd32_jail(struct thread *, struct freebsd32_jail_args *); int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *); int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *); +int freebsd32_aio_waitcomplete(struct thread *, struct freebsd32_aio_waitcomplete_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); @@ -447,6 +505,7 @@ int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); +int freebsd32_aio_fsync(struct thread *, struct freebsd32_aio_fsync_args *); int freebsd32_pread(struct thread *, struct freebsd32_pread_args *); int freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *); int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *); @@ -641,13 +700,24 @@ #define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME #define FREEBSD32_SYS_AUE_freebsd32_clock_getres AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_nanosleep AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES #define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV #define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_return AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_suspend AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_cancel AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_error AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_oaio_read AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_oaio_write AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_olio_listio AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL #define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT #define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_waitcomplete AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT #define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE @@ -661,6 +731,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_fsync AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD #define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE #define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_signal.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_signal.h,v 1.1 2006/10/05 01:58:08 davidxu Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_signal.h,v 1.2 2008/12/11 00:58:05 bz Exp $ */ #ifndef _COMPAT_FREEBSD32_SIGNAL_H_ @@ -36,6 +36,9 @@ }; union sigval32 { + int sival_int; + u_int32_t sival_ptr; + /* 6.0 compatibility */ int sigval_int; u_int32_t sigval_ptr; }; @@ -70,6 +73,29 @@ } _reason; }; +struct osigevent32 { + int sigev_notify; /* Notification type */ + union { + int __sigev_signo; /* Signal number */ + int __sigev_notify_kqueue; + } __sigev_u; + union sigval32 sigev_value; /* Signal value */ +}; + +struct sigevent32 { + int sigev_notify; /* Notification type */ + int sigev_signo; /* Signal number */ + union sigval32 sigev_value; /* Signal value */ + union { + __lwpid_t _threadid; + struct { + uint32_t _function; + uint32_t _attribute; + } _sigev_thread; + uint32_t __spare__[8]; + } _sigev_un; +}; + void siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst); #endif /* !_COMPAT_FREEBSD32_SIGNAL_H_ */ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.96 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.97 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -210,6 +210,9 @@ #define FREEBSD32_SYS_openbsd_poll 252 #define FREEBSD32_SYS_issetugid 253 #define FREEBSD32_SYS_lchown 254 +#define FREEBSD32_SYS_freebsd32_aio_read 255 +#define FREEBSD32_SYS_freebsd32_aio_write 256 +#define FREEBSD32_SYS_freebsd32_lio_listio 257 #define FREEBSD32_SYS_getdents 272 #define FREEBSD32_SYS_lchmod 274 #define FREEBSD32_SYS_netbsd_lchown 275 @@ -237,6 +240,13 @@ #define FREEBSD32_SYS_setresuid 311 #define FREEBSD32_SYS_setresgid 312 /* 313 is obsolete signanosleep */ +#define FREEBSD32_SYS_freebsd32_aio_return 314 +#define FREEBSD32_SYS_freebsd32_aio_suspend 315 +#define FREEBSD32_SYS_freebsd32_aio_cancel 316 +#define FREEBSD32_SYS_freebsd32_aio_error 317 +#define FREEBSD32_SYS_freebsd32_oaio_read 318 +#define FREEBSD32_SYS_freebsd32_oaio_write 319 +#define FREEBSD32_SYS_freebsd32_olio_listio 320 #define FREEBSD32_SYS_yield 321 /* 322 is obsolete thr_sleep */ /* 323 is obsolete thr_wakeup */ @@ -274,6 +284,7 @@ #define FREEBSD32_SYS_extattr_set_file 356 #define FREEBSD32_SYS_extattr_get_file 357 #define FREEBSD32_SYS_extattr_delete_file 358 +#define FREEBSD32_SYS_freebsd32_aio_waitcomplete 359 #define FREEBSD32_SYS_getresuid 360 #define FREEBSD32_SYS_getresgid 361 #define FREEBSD32_SYS_kqueue 362 @@ -321,6 +332,7 @@ #define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 #define FREEBSD32_SYS_thr_set_name 464 +#define FREEBSD32_SYS_freebsd32_aio_fsync 465 #define FREEBSD32_SYS_rtprio_thread 466 #define FREEBSD32_SYS_sctp_peeloff 471 #define FREEBSD32_SYS_sctp_generic_sendmsg 472 ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.87 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.88 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ const char *freebsd32_syscallnames[] = { @@ -262,9 +262,9 @@ "openbsd_poll", /* 252 = openbsd_poll */ "issetugid", /* 253 = issetugid */ "lchown", /* 254 = lchown */ - "#255", /* 255 = nosys */ - "#256", /* 256 = nosys */ - "#257", /* 257 = nosys */ + "freebsd32_aio_read", /* 255 = freebsd32_aio_read */ + "freebsd32_aio_write", /* 256 = freebsd32_aio_write */ + "freebsd32_lio_listio", /* 257 = freebsd32_lio_listio */ "#258", /* 258 = nosys */ "#259", /* 259 = nosys */ "#260", /* 260 = nosys */ @@ -321,13 +321,13 @@ "setresuid", /* 311 = setresuid */ "setresgid", /* 312 = setresgid */ "obs_signanosleep", /* 313 = obsolete signanosleep */ - "#314", /* 314 = aio_return */ - "#315", /* 315 = aio_suspend */ - "#316", /* 316 = aio_cancel */ - "#317", /* 317 = aio_error */ - "#318", /* 318 = aio_read */ - "#319", /* 319 = aio_write */ - "#320", /* 320 = lio_listio */ + "freebsd32_aio_return", /* 314 = freebsd32_aio_return */ + "freebsd32_aio_suspend", /* 315 = freebsd32_aio_suspend */ + "freebsd32_aio_cancel", /* 316 = freebsd32_aio_cancel */ + "freebsd32_aio_error", /* 317 = freebsd32_aio_error */ + "freebsd32_oaio_read", /* 318 = freebsd32_oaio_read */ + "freebsd32_oaio_write", /* 319 = freebsd32_oaio_write */ + "freebsd32_olio_listio", /* 320 = freebsd32_olio_listio */ "yield", /* 321 = yield */ "obs_thr_sleep", /* 322 = obsolete thr_sleep */ "obs_thr_wakeup", /* 323 = obsolete thr_wakeup */ @@ -366,7 +366,7 @@ "extattr_set_file", /* 356 = extattr_set_file */ "extattr_get_file", /* 357 = extattr_get_file */ "extattr_delete_file", /* 358 = extattr_delete_file */ - "#359", /* 359 = aio_waitcomplete */ + "freebsd32_aio_waitcomplete", /* 359 = freebsd32_aio_waitcomplete */ "getresuid", /* 360 = getresuid */ "getresgid", /* 361 = getresgid */ "kqueue", /* 362 = kqueue */ @@ -472,7 +472,7 @@ "#462", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ - "#465", /* 465 = aio_fsync */ + "freebsd32_aio_fsync", /* 465 = freebsd32_aio_fsync */ "rtprio_thread", /* 466 = rtprio_thread */ "#467", /* 467 = nosys */ "#468", /* 468 = nosys */ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#11 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.97 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.98 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #include "opt_compat.h" @@ -293,9 +293,9 @@ { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0 }, /* 252 = openbsd_poll */ { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0 }, /* 253 = issetugid */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 254 = lchown */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 255 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 256 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 257 = nosys */ + { AS(freebsd32_aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 255 = freebsd32_aio_read */ + { AS(freebsd32_aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 256 = freebsd32_aio_write */ + { AS(freebsd32_lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 257 = freebsd32_lio_listio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 258 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 259 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 260 = nosys */ @@ -352,13 +352,13 @@ { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 311 = setresuid */ { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 313 = obsolete signanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 314 = aio_return */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 315 = aio_suspend */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 316 = aio_cancel */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 317 = aio_error */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 318 = aio_read */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 319 = aio_write */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 320 = lio_listio */ + { AS(freebsd32_aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 314 = freebsd32_aio_return */ + { AS(freebsd32_aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 315 = freebsd32_aio_suspend */ + { AS(freebsd32_aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 316 = freebsd32_aio_cancel */ + { AS(freebsd32_aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 317 = freebsd32_aio_error */ + { AS(freebsd32_oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 318 = freebsd32_oaio_read */ + { AS(freebsd32_oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 319 = freebsd32_oaio_write */ + { AS(freebsd32_olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 320 = freebsd32_olio_listio */ { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0 }, /* 321 = yield */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 322 = obsolete thr_sleep */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ @@ -397,7 +397,7 @@ { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */ { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */ { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */ + { AS(freebsd32_aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 359 = freebsd32_aio_waitcomplete */ { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */ @@ -503,7 +503,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 462 = kmq_unlink */ { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ + { AS(freebsd32_aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 465 = freebsd32_aio_fsync */ { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ ==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#11 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.112 2008/11/29 14:32:14 bz Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.113 2008/12/10 20:56:19 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -454,9 +454,13 @@ u_int nfds, int timeout); } 253 AUE_ISSETUGID NOPROTO { int issetugid(void); } 254 AUE_LCHOWN NOPROTO { int lchown(char *path, int uid, int gid); } -255 AUE_NULL UNIMPL nosys -256 AUE_NULL UNIMPL nosys -257 AUE_NULL UNIMPL nosys +255 AUE_NULL NOSTD { int freebsd32_aio_read( \ + struct aiocb32 *aiocbp); } +256 AUE_NULL NOSTD { int freebsd32_aio_write( \ + struct aiocb32 *aiocbp); } +257 AUE_NULL NOSTD { int freebsd32_lio_listio(int mode, \ + struct aiocb32 * const *acb_list, \ + int nent, struct sigevent *sig); } 258 AUE_NULL UNIMPL nosys 259 AUE_NULL UNIMPL nosys 260 AUE_NULL UNIMPL nosys @@ -535,13 +539,22 @@ 312 AUE_SETRESGID NOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } 313 AUE_NULL OBSOL signanosleep -314 AUE_NULL UNIMPL aio_return -315 AUE_NULL UNIMPL aio_suspend -316 AUE_NULL UNIMPL aio_cancel -317 AUE_NULL UNIMPL aio_error -318 AUE_NULL UNIMPL aio_read -319 AUE_NULL UNIMPL aio_write -320 AUE_NULL UNIMPL lio_listio +314 AUE_NULL NOSTD { int freebsd32_aio_return( \ + struct aiocb32 *aiocbp); } +315 AUE_NULL NOSTD { int freebsd32_aio_suspend( \ + struct aiocb32 * const * aiocbp, int nent, \ + const struct timespec32 *timeout); } +316 AUE_NULL NOSTD { int freebsd32_aio_cancel(int fd, \ + struct aiocb32 *aiocbp); } +317 AUE_NULL NOSTD { int freebsd32_aio_error( \ + struct aiocb32 *aiocbp); } +318 AUE_NULL NOSTD { int freebsd32_oaio_read( \ + struct oaiocb32 *aiocbp); } +319 AUE_NULL NOSTD { int freebsd32_oaio_write( \ + struct oaiocb32 *aiocbp); } +320 AUE_NULL NOSTD { int freebsd32_olio_listio(int mode, \ + struct oaiocb32 * const *acb_list, \ + int nent, struct osigevent32 *sig); } 321 AUE_NULL NOPROTO { int yield(void); } 322 AUE_NULL OBSOL thr_sleep 323 AUE_NULL OBSOL thr_wakeup @@ -618,7 +631,9 @@ 358 AUE_EXTATTR_DELETE_FILE NOPROTO { int extattr_delete_file( \ const char *path, int attrnamespace, \ const char *attrname); } -359 AUE_NULL UNIMPL aio_waitcomplete +359 AUE_NULL NOSTD { int freebsd32_aio_waitcomplete( \ + struct aiocb32 **aiocbp, \ + struct timespec32 *timeout); } 360 AUE_GETRESUID NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } 361 AUE_GETRESGID NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ @@ -766,7 +781,8 @@ 462 AUE_NULL UNIMPL kmq_unlink 463 AUE_NULL NOPROTO { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL NOPROTO { int thr_set_name(long id, const char *name); } -465 AUE_NULL UNIMPL aio_fsync +465 AUE_NULL NOSTD { int freebsd32_aio_fsync(int op, \ + struct aiocb32 *aiocbp); } 466 AUE_RTPRIO NOPROTO { int rtprio_thread(int function, \ lwpid_t lwpid, struct rtprio *rtp); } 467 AUE_NULL UNIMPL nosys ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#16 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.130 2008/12/08 13:15:31 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.131 2008/12/10 16:11:09 kib Exp $"); #include #include @@ -969,11 +969,11 @@ ); if (freename) free(freename, M_TEMP); + vm_map_lock_read(map); if (error == -1) { error = 0; break; } - vm_map_lock_read(map); if (last_timestamp + 1 != map->timestamp) { /* * Look again for the entry because the map was ==== //depot/projects/vimage-commit2/src/sys/conf/files#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1354 2008/12/04 07:59:05 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1355 2008/12/10 23:12:39 zec Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/vimage-commit2/src/sys/conf/options#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.649 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.650 2008/12/10 23:12:39 zec Exp $ # # On the handling of kernel options # ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.7 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.8 2008/12/10 23:12:39 zec Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_eeprom_v14.c,v 1.4 2008/11/10 19:04:26 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v14.c,v 1.2 2008/12/11 04:03:13 sam Exp $ */ #include "opt_ah.h" @@ -54,6 +54,7 @@ __func__, ath_hal_ether_sprintf(macaddr)); return HAL_EEBADMAC; } + return HAL_OK; case AR_EEP_REGDMN_0: return pBase->regDmn[0]; case AR_EEP_REGDMN_1: ==== //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5212_misc.c,v 1.12 2008/11/27 22:30:00 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c,v 1.2 2008/12/11 04:03:50 sam Exp $ */ #include "opt_ah.h" @@ -803,6 +803,7 @@ return (ahp->ah_staId1Defaults & AR_STA_ID1_CRPT_MIC_ENABLE) ? HAL_OK : HAL_ENXIO; } + return HAL_EINVAL; case HAL_CAP_TKIP_SPLIT: /* hardware TKIP uses split keys */ switch (capability) { case 0: /* hardware capability */ ==== //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#5 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.31 2008/12/07 18:32:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.32 2008/12/11 06:27:18 imp Exp $"); #include #include @@ -682,40 +682,67 @@ return (0); } -#define DELTA (CBB_SOCKET_MASK_CD) static int cbb_pci_filt(void *arg) { struct cbb_softc *sc = arg; uint32_t sockevent; + uint8_t csc; int retval = FILTER_STRAY; /* - * Read the socket event. Sometimes, the theory goes, the PCI - * bus is so loaded that it cannot satisfy the read request, so - * we get garbage back from the following read. We have to filter - * out the garbage so that we don't spontaneously reset the card - * under high load. PCI isn't supposed to act like this. No doubt - * this is a bug in the PCI bridge chipset (or cbb brige) that's being - * used in certain amd64 laptops today. Work around the issue by - * assuming that any bits we don't know about being set means that - * we got garbage. + * Some chips also require us to read the old ExCA registe for card + * status change when we route CSC vis PCI. This isn't supposed to be + * required, but it clears the interrupt state on some chipsets. + * Maybe there's a setting that would obviate its need. Maybe we + * should test the status bits and deal with them, but so far we've + * not found any machines that don't also give us the socket status + * indication above. + * + * This call used to be unconditional. However, further research + * suggests that we hit this condition when the card READY interrupt + * fired. So now we only read it for 16-bit cards, and we only claim + * the interrupt if READY is set. If this still causes problems, then + * the next step would be to read this if we have a 16-bit card *OR* + * we have no card. We treat the READY signal as if it were the power + * completion signal. Some bridges may double signal things here, bit + * signalling twice should be OK since we only sleep on the powerintr + * in one place and a double wakeup would be benign there. + */ + if (sc->flags & CBB_16BIT_CARD) { + csc = exca_getb(&sc->exca[0], EXCA_CSC); + if (csc & EXCA_CSC_READY) { + atomic_add_int(&sc->powerintr, 1); + wakeup((void *)&sc->powerintr); + retval = FILTER_HANDLED; + } + } + + /* + * Read the socket event. Sometimes, the theory goes, the PCI bus is + * so loaded that it cannot satisfy the read request, so we get + * garbage back from the following read. We have to filter out the + * garbage so that we don't spontaneously reset the card under high + * load. PCI isn't supposed to act like this. No doubt this is a bug + * in the PCI bridge chipset (or cbb brige) that's being used in + * certain amd64 laptops today. Work around the issue by assuming + * that any bits we don't know about being set means that we got + * garbage. */ sockevent = cbb_get(sc, CBB_SOCKET_EVENT); if (sockevent != 0 && (sockevent & ~CBB_SOCKET_EVENT_VALID_MASK) == 0) { /* - * If anything has happened to the socket, we assume that - * the card is no longer OK, and we shouldn't call its - * ISR. We set cardok as soon as we've attached the - * card. This helps in a noisy eject, which happens - * all too often when users are ejecting their PC Cards. + * If anything has happened to the socket, we assume that the + * card is no longer OK, and we shouldn't call its ISR. We + * set cardok as soon as we've attached the card. This helps + * in a noisy eject, which happens all too often when users + * are ejecting their PC Cards. * - * We use this method in preference to checking to see if - * the card is still there because the check suffers from - * a race condition in the bouncing case. Prior versions - * of the pccard software used a similar trick and achieved - * excellent results. + * We use this method in preference to checking to see if the + * card is still there because the check suffers from a race + * condition in the bouncing case. */ +#define DELTA (CBB_SOCKET_MASK_CD) if (sockevent & DELTA) { cbb_clrb(sc, CBB_SOCKET_MASK, DELTA); cbb_set(sc, CBB_SOCKET_EVENT, DELTA); @@ -723,9 +750,11 @@ cbb_disable_func_intr(sc); wakeup(&sc->intrhand); } +#undef DELTA + /* - * If we get a power interrupt, wakeup anybody that might - * be waiting for one. + * Wakeup anybody waiting for a power interrupt. We have to + * use atomic_add_int for wakups on other cores. */ if (sockevent & CBB_SOCKET_EVENT_POWER) { cbb_clrb(sc, CBB_SOCKET_MASK, CBB_SOCKET_EVENT_POWER); @@ -733,21 +762,15 @@ atomic_add_int(&sc->powerintr, 1); wakeup((void *)&sc->powerintr); } + + /* + * Status change interrupts aren't presently used in the + * rest of the driver. For now, just ACK them. + */ + if (sockevent & CBB_SOCKET_EVENT_CSTS) + cbb_set(sc, CBB_SOCKET_EVENT, CBB_SOCKET_EVENT_CSTS); retval = FILTER_HANDLED; } - /* - * Some chips also require us to read the old ExCA registe for - * card status change when we route CSC vis PCI. This isn't supposed - * to be required, but it clears the interrupt state on some chipsets. - * Maybe there's a setting that would obviate its need. Maybe we - * should test the status bits and deal with them, but so far we've - * not found any machines that don't also give us the socket status - * indication above. - * - * We have to call this unconditionally because some bridges deliver - * the event independent of the CBB_SOCKET_EVENT_CD above. - */ - exca_getb(&sc->exca[0], EXCA_CSC); return retval; } ==== //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.139 2008/12/08 02:48:41 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.144 2008/12/11 02:24:11 yongari Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -419,10 +419,10 @@ CSR_WRITE_4(sc, RL_PHYAR, reg << 16); for (i = 0; i < RL_TIMEOUT; i++) { - DELAY(30); rval = CSR_READ_4(sc, RL_PHYAR); if (rval & RL_PHYAR_BUSY) break; + DELAY(100); } if (i == RL_TIMEOUT) { @@ -446,10 +446,10 @@ (data & RL_PHYAR_PHYDATA) | RL_PHYAR_BUSY); for (i = 0; i < RL_TIMEOUT; i++) { - DELAY(30); rval = CSR_READ_4(sc, RL_PHYAR); if (!(rval & RL_PHYAR_BUSY)) break; + DELAY(100); } if (i == RL_TIMEOUT) { @@ -700,7 +700,12 @@ if (i == RL_TIMEOUT) device_printf(sc->rl_dev, "reset never completed!\n"); - CSR_WRITE_1(sc, 0x82, 1); + if ((sc->rl_flags & RL_FLAG_PHY8169) != 0) + CSR_WRITE_1(sc, 0x82, 1); + if ((sc->rl_flags & RL_FLAG_PHY8110S) != 0) { + CSR_WRITE_1(sc, 0x82, 1); + re_gmii_writereg(sc->rl_dev, 1, 0x0B, 0); + } } #ifdef RE_DIAG @@ -756,7 +761,6 @@ ifp->if_flags |= IFF_PROMISC; sc->rl_testmode = 1; - re_reset(sc); re_init_locked(sc); sc->rl_flags |= RL_FLAG_LINK; if (sc->rl_type == RL_8169) @@ -1236,6 +1240,9 @@ case RL_HWREV_8139CPLUS: sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_FASTETHER; break; + case RL_HWREV_8110S: + sc->rl_flags |= RL_FLAG_PHY8110S; + break; case RL_HWREV_8100E: case RL_HWREV_8101E: sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_INVMAR | @@ -1245,10 +1252,12 @@ case RL_HWREV_8102EL: sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_INVMAR | RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | - RL_FLAG_MACSTAT | RL_FLAG_FASTETHER; + RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP; break; case RL_HWREV_8168_SPIN1: case RL_HWREV_8168_SPIN2: + sc->rl_flags |= RL_FLAG_WOLRXENB; + /* FALLTHROUGH */ case RL_HWREV_8168_SPIN3: sc->rl_flags |= RL_FLAG_INVMAR | RL_FLAG_PHYWAKE | RL_FLAG_MACSTAT; @@ -1258,7 +1267,8 @@ case RL_HWREV_8168CP: case RL_HWREV_8168D: sc->rl_flags |= RL_FLAG_INVMAR | RL_FLAG_PHYWAKE | - RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT; + RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | + RL_FLAG_CMDSTOP; /* * These controllers support jumbo frame but it seems * that enabling it requires touching additional magic @@ -1271,10 +1281,14 @@ */ sc->rl_flags |= RL_FLAG_NOJUMBO; break; + case RL_HWREV_8169: + case RL_HWREV_8169S: + sc->rl_flags |= RL_FLAG_PHY8169; + break; case RL_HWREV_8169_8110SB: case RL_HWREV_8169_8110SC: case RL_HWREV_8169_8110SBL: - sc->rl_flags |= RL_FLAG_PHYWAKE; + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHY8169; break; default: break; @@ -2091,10 +2105,8 @@ * XXX check behaviour on receiver stalls. */ - if (status & RL_ISR_SYSTEM_ERR) { - re_reset(sc); + if (status & RL_ISR_SYSTEM_ERR) re_init_locked(sc); - } } } #endif /* DEVICE_POLLING */ @@ -2158,10 +2170,8 @@ RL_ISR_TX_ERR|RL_ISR_TX_DESC_UNAVAIL)) re_txeof(sc); - if (status & RL_ISR_SYSTEM_ERR) { - re_reset(sc); + if (status & RL_ISR_SYSTEM_ERR) re_init_locked(sc); - } if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) taskqueue_enqueue_fast(taskqueue_fast, &sc->rl_txtask); @@ -2482,6 +2492,9 @@ */ re_stop(sc); + /* Put controller into known state. */ + re_reset(sc); + /* * Enable C+ RX and TX mode, as well as VLAN stripping and * RX checksum offload. We must configure the C+ register @@ -2870,7 +2883,12 @@ callout_stop(&sc->rl_stat_callout); ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - CSR_WRITE_1(sc, RL_COMMAND, 0x00); + if ((sc->rl_flags & RL_FLAG_CMDSTOP) != 0) + CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_STOPREQ | RL_CMD_TX_ENB | + RL_CMD_RX_ENB); + else + CSR_WRITE_1(sc, RL_COMMAND, 0x00); + DELAY(1000); CSR_WRITE_2(sc, RL_IMR, 0x0000); CSR_WRITE_2(sc, RL_ISR, 0xFFFF); @@ -3000,6 +3018,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 11 06:53:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09B561065675; Thu, 11 Dec 2008 06:53:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C2076106564A for ; Thu, 11 Dec 2008 06:53:49 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 99A398FC13 for ; Thu, 11 Dec 2008 06:53:49 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBB6rnvY089100 for ; Thu, 11 Dec 2008 06:53:49 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBB6rnWx089094 for perforce@freebsd.org; Thu, 11 Dec 2008 06:53:49 GMT (envelope-from zec@icir.org) Date: Thu, 11 Dec 2008 06:53:49 GMT Message-Id: <200812110653.mBB6rnWx089094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 06:53:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=154483 Change 154483 by zec@zec_tca51 on 2008/12/11 06:53:11 misintegration Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/kern/kern_vimage.c,v 1.1 2008/12/10 23:12:39 zec Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Thu Dec 11 07:09:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 864871065678; Thu, 11 Dec 2008 07:09:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4970E1065676 for ; Thu, 11 Dec 2008 07:09:06 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 35D078FC13 for ; Thu, 11 Dec 2008 07:09:06 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBB796CZ048103 for ; Thu, 11 Dec 2008 07:09:06 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBB795UC048095 for perforce@freebsd.org; Thu, 11 Dec 2008 07:09:05 GMT (envelope-from zec@icir.org) Date: Thu, 11 Dec 2008 07:09:05 GMT Message-Id: <200812110709.mBB795UC048095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 07:09:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=154485 Change 154485 by zec@zec_tca51 on 2008/12/11 07:08:59 IFC @ 154481 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#22 integrate .. //depot/projects/vimage/src/sys/boot/common/loader.8#6 integrate .. //depot/projects/vimage/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/vimage/src/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/vimage/src/sys/boot/zfs/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfs.c#3 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#18 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#30 integrate .. //depot/projects/vimage/src/sys/conf/files#48 integrate .. //depot/projects/vimage/src/sys/conf/options#39 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#14 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_table.c#5 integrate .. //depot/projects/vimage/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/adb/adb_bus.c#4 integrate .. //depot/projects/vimage/src/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/adb/adb_mouse.c#3 integrate .. //depot/projects/vimage/src/sys/dev/adb/adbvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#25 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#14 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#13 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#22 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#11 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dcreg.h#6 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#12 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#20 integrate .. //depot/projects/vimage/src/sys/dev/sdhci/sdhci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sis/if_sis.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#16 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_map.c#7 integrate .. //depot/projects/vimage/src/sys/geom/geom_subr.c#6 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#10 integrate .. //depot/projects/vimage/src/sys/geom/journal/g_journal.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/atomic.h#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_linker.c#22 integrate .. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#19 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#70 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_prf.c#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#20 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#8 integrate .. //depot/projects/vimage/src/sys/kern/vfs_export.c#17 integrate .. //depot/projects/vimage/src/sys/modules/aio/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/if.c#55 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#24 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#34 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#22 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#9 integrate .. //depot/projects/vimage/src/sys/net/radix.c#3 integrate .. //depot/projects/vimage/src/sys/net/radix.h#3 integrate .. //depot/projects/vimage/src/sys/net/route.c#37 integrate .. //depot/projects/vimage/src/sys/net/route.h#6 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#23 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#18 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#18 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#46 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_bridge.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#21 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#17 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ipfw.c#4 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#46 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#22 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#22 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#57 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#44 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#14 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_db.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#36 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#15 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.h#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#25 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_header.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#29 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#29 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#25 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.h#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#22 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#33 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#18 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#48 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#68 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#29 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#45 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#41 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#37 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#26 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#42 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#39 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#26 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#28 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#30 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#34 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#23 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#17 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#9 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cuda.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cudavar.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/macgpio.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/macgpiovar.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/pmuvar.h#2 integrate .. //depot/projects/vimage/src/sys/sys/aio.h#2 integrate .. //depot/projects/vimage/src/sys/sys/kernel.h#15 integrate .. //depot/projects/vimage/src/sys/sys/rwlock.h#9 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#30 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#72 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_quota.c#7 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#22 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.645 2008/08/09 05:46:13 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.646 2008/12/06 19:37:52 alc Exp $"); /* * Manages physical address maps. @@ -180,7 +180,7 @@ SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); -static int pg_ps_enabled; +static int pg_ps_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0, "Are large page mappings enabled?"); ==== //depot/projects/vimage/src/sys/boot/common/loader.8#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.94 2007/11/08 11:59:38 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.95 2008/12/06 11:21:10 danger Exp $ .\" .Dd November 8, 2007 .Dt LOADER 8 @@ -454,7 +454,7 @@ or if a SIGTERM is delivered to the .Xr init 8 process (PID 1). -.It Va init_script +.It Va init_shell Defines the shell binary to be used for executing the various shell scripts. The default is .Dq Li /bin/sh . ==== //depot/projects/vimage/src/sys/boot/forth/support.4th#3 (text+ko) ==== @@ -22,7 +22,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.17 2007/12/19 17:06:32 ambrisko Exp $ +\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.18 2008/12/07 19:42:20 luigi Exp $ \ Loader.rc support functions: \ @@ -288,6 +288,17 @@ : free-memory free if free_error throw then ; +: strget { var -- addr len } var .addr @ var .len @ ; + +\ assign addr len to variable. +: strset { addr len var -- } addr var .addr ! len var .len ! ; + +\ free memory and reset fields +: strfree { var -- } var .addr @ ?dup if free-memory 0 0 var strset then ; + +\ free old content, make a copy of the string and assign to variable +: string= { addr len var -- } var strfree addr len strdup var strset ; + \ Assignment data temporary storage string name_buffer @@ -712,19 +723,6 @@ module_loaderror_suffix suffix_type? ; -: set_conf_files - conf_files .addr @ ?dup if - free-memory - then - value_buffer .addr @ c@ [char] " = if - value_buffer .addr @ char+ value_buffer .len @ 2 chars - - else - value_buffer .addr @ value_buffer .len @ - then - strdup - conf_files .len ! conf_files .addr ! -; - : set_nextboot_conf nextboot_conf_file .addr @ ?dup if free-memory @@ -888,6 +886,11 @@ then ; +: set_conf_files + set_environment_variable + s" loader_conf_files" getenv conf_files string= +; + : set_nextboot_flag yes_value? to nextboot? ; @@ -1045,7 +1048,6 @@ \ Variables used for processing multiple conf files string current_file_name -variable current_conf_files \ Indicates if any conf file was succesfully read @@ -1053,18 +1055,10 @@ \ loader_conf_files processing support functions -: set_current_conf_files - conf_files .addr @ current_conf_files ! +: get_conf_files ( -- addr len ) \ put addr/len on stack, reset var + conf_files strget 0 0 conf_files strset ; -: get_conf_files - conf_files .addr @ conf_files .len @ strdup -; - -: recurse_on_conf_files? - current_conf_files @ conf_files .addr @ <> -; - : skip_leading_spaces { addr len pos -- addr len pos' } begin pos len = if addr len pos exit then @@ -1133,7 +1127,6 @@ \ Interface to loader_conf_files processing : include_conf_files - set_current_conf_files get_conf_files 0 begin get_next_file ?dup @@ -1141,7 +1134,7 @@ set_current_file_name ['] load_conf catch process_conf_errors - recurse_on_conf_files? if recurse then + conf_files .addr @ if recurse then repeat ; ==== //depot/projects/vimage/src/sys/boot/i386/boot0/boot0.S#6 (text+ko) ==== @@ -14,7 +14,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.20 2008/12/03 14:53:59 luigi Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.21 2008/12/08 20:53:27 sobomax Exp $ */ /* build options: */ @@ -93,7 +93,7 @@ * %si pointer to the partition table from which we were loaded. * Some boot code (e.g. syslinux) use this info to relocate * themselves, so we want to pass a valid one to the next stage. - * NOTE: the use of %is is not a standard. + * NOTE: the use of %si is not a standard. * * This boot block first relocates itself at a different address (0:0x600), * to free the space at 0:0x7c00 for the next stage boot block. ==== //depot/projects/vimage/src/sys/boot/i386/btx/btxldr/btxldr.S#2 (text+ko) ==== @@ -12,9 +12,12 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.17 2004/05/14 20:29:30 ru Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btxldr/btxldr.S,v 1.20 2008/12/09 00:25:57 sobomax Exp $ */ +#define RBX_MUTE 0x10 /* -m */ +#define OPT_SET(opt) (1 << (opt)) + /* * Prototype BTX loader program, written in a couple of hours. The * real thing should probably be more flexible, and in C. @@ -64,6 +67,8 @@ * BTX program loader for ELF clients. */ start: cld # String ops inc + testl $OPT_SET(RBX_MUTE), 4(%esp) # Check first argument + setnz muted # for RBX_MUTE, set flag movl $m_logo,%esi # Identify call putstr # ourselves movzwl BDA_MEM,%eax # Get base memory @@ -288,7 +293,9 @@ /* * Output character AL to the console. */ -putchr: pusha # Save +putchr: testb $1,muted # Check muted + jnz putchr.5 # do a nop + pusha # Save xorl %ecx,%ecx # Zero for loops movb $SCR_MAT,%ah # Mode/attribute movl $BDA_POS,%ebx # BDA pointer @@ -325,7 +332,7 @@ movb $SCR_ROW-1,%dh # Bottom line putchr.4: movw %dx,(%ebx) # Update position popa # Restore - ret # To caller +putchr.5: ret # To caller /* * Convert EAX, AX, or AL to hex, saving the result to [EDI]. */ @@ -390,6 +397,12 @@ .asciz " memsz=\0\n" m_done: .asciz "Loading complete\n" #endif + +/* + * Flags + */ +muted: .byte 0x0 + /* * Uninitialized data area. */ ==== //depot/projects/vimage/src/sys/boot/zfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.2 2008/11/22 14:24:55 dfr Exp $ +# $FreeBSD: src/sys/boot/zfs/Makefile,v 1.3 2008/12/06 14:45:03 ps Exp $ LIB= zfsboot INTERNALLIB= @@ -29,7 +29,7 @@ .if ${MACHINE_ARCH} == "amd64" CLEANFILES+= machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ln -sf ${.CURDIR}/../../i386/include machine .endif .include ==== //depot/projects/vimage/src/sys/boot/zfs/zfs.c#3 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.2 2008/11/19 16:39:01 dfr Exp $ + * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.2 2008/11/19 16:39:01 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.3 2008/12/11 02:23:49 ps Exp $"); /* * Stand-alone file reading package. @@ -474,7 +474,6 @@ * the pool. */ unit = dev->d_unit; - free(dev); i = 0; STAILQ_FOREACH(spa, &zfs_pools, spa_link) { ==== //depot/projects/vimage/src/sys/boot/zfs/zfsimpl.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.2 2008/11/19 16:59:19 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.3 2008/12/10 10:46:34 dfr Exp $"); /* * Stand-alone ZFS file reader. @@ -623,7 +623,7 @@ uint64_t pool_txg, pool_guid; const char *pool_name; const unsigned char *vdevs; - int i; + int i, rc; char upbuf[1024]; const struct uberblock *up; @@ -723,7 +723,9 @@ DATA_TYPE_NVLIST, 0, &vdevs)) { return (EIO); } - vdev_init_from_nvlist(vdevs, &top_vdev); + rc = vdev_init_from_nvlist(vdevs, &top_vdev); + if (rc) + return (rc); /* * Add the toplevel vdev to the pool if its not already there. ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.97 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.98 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -215,6 +215,18 @@ char rqtp_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * rqtp; char rqtp_r_[PADR_(const struct timespec32 *)]; char rmtp_l_[PADL_(struct timespec32 *)]; struct timespec32 * rmtp; char rmtp_r_[PADR_(struct timespec32 *)]; }; +struct freebsd32_aio_read_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_write_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_lio_listio_args { + char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char acb_list_l_[PADL_(struct aiocb32 *const *)]; struct aiocb32 *const * acb_list; char acb_list_r_[PADR_(struct aiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char sig_l_[PADL_(struct sigevent *)]; struct sigevent * sig; char sig_r_[PADR_(struct sigevent *)]; +}; struct freebsd32_lutimes_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)]; @@ -235,6 +247,33 @@ char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)]; }; +struct freebsd32_aio_return_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_suspend_args { + char aiocbp_l_[PADL_(struct aiocb32 *const *)]; struct aiocb32 *const * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; +}; +struct freebsd32_aio_cancel_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_error_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_oaio_read_args { + char aiocbp_l_[PADL_(struct oaiocb32 *)]; struct oaiocb32 * aiocbp; char aiocbp_r_[PADR_(struct oaiocb32 *)]; +}; +struct freebsd32_oaio_write_args { + char aiocbp_l_[PADL_(struct oaiocb32 *)]; struct oaiocb32 * aiocbp; char aiocbp_r_[PADR_(struct oaiocb32 *)]; +}; +struct freebsd32_olio_listio_args { + char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char acb_list_l_[PADL_(struct oaiocb32 *const *)]; struct oaiocb32 *const * acb_list; char acb_list_r_[PADR_(struct oaiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char sig_l_[PADL_(struct osigevent32 *)]; struct osigevent32 * sig; char sig_r_[PADR_(struct osigevent32 *)]; +}; struct freebsd32_jail_args { char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char jail_r_[PADR_(struct jail32 *)]; }; @@ -247,6 +286,10 @@ char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; }; +struct freebsd32_aio_waitcomplete_args { + char aiocbp_l_[PADL_(struct aiocb32 **)]; struct aiocb32 ** aiocbp; char aiocbp_r_[PADR_(struct aiocb32 **)]; + char timeout_l_[PADL_(struct timespec32 *)]; struct timespec32 * timeout; char timeout_r_[PADR_(struct timespec32 *)]; +}; struct freebsd32_kevent_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char changelist_l_[PADL_(const struct kevent32 *)]; const struct kevent32 * changelist; char changelist_r_[PADR_(const struct kevent32 *)]; @@ -308,6 +351,10 @@ char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; +struct freebsd32_aio_fsync_args { + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; struct freebsd32_pread_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; @@ -427,13 +474,24 @@ int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *); int freebsd32_clock_getres(struct thread *, struct freebsd32_clock_getres_args *); int freebsd32_nanosleep(struct thread *, struct freebsd32_nanosleep_args *); +int freebsd32_aio_read(struct thread *, struct freebsd32_aio_read_args *); +int freebsd32_aio_write(struct thread *, struct freebsd32_aio_write_args *); +int freebsd32_lio_listio(struct thread *, struct freebsd32_lio_listio_args *); int freebsd32_lutimes(struct thread *, struct freebsd32_lutimes_args *); int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *); int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *); int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *); +int freebsd32_aio_return(struct thread *, struct freebsd32_aio_return_args *); +int freebsd32_aio_suspend(struct thread *, struct freebsd32_aio_suspend_args *); +int freebsd32_aio_cancel(struct thread *, struct freebsd32_aio_cancel_args *); +int freebsd32_aio_error(struct thread *, struct freebsd32_aio_error_args *); +int freebsd32_oaio_read(struct thread *, struct freebsd32_oaio_read_args *); +int freebsd32_oaio_write(struct thread *, struct freebsd32_oaio_write_args *); +int freebsd32_olio_listio(struct thread *, struct freebsd32_olio_listio_args *); int freebsd32_jail(struct thread *, struct freebsd32_jail_args *); int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *); int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *); +int freebsd32_aio_waitcomplete(struct thread *, struct freebsd32_aio_waitcomplete_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); @@ -447,6 +505,7 @@ int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); +int freebsd32_aio_fsync(struct thread *, struct freebsd32_aio_fsync_args *); int freebsd32_pread(struct thread *, struct freebsd32_pread_args *); int freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *); int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *); @@ -641,13 +700,24 @@ #define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME #define FREEBSD32_SYS_AUE_freebsd32_clock_getres AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_nanosleep AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES #define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV #define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_return AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_suspend AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_cancel AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_error AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_oaio_read AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_oaio_write AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_olio_listio AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL #define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT #define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_waitcomplete AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT #define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE @@ -661,6 +731,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_fsync AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD #define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE #define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_signal.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_signal.h,v 1.1 2006/10/05 01:58:08 davidxu Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_signal.h,v 1.2 2008/12/11 00:58:05 bz Exp $ */ #ifndef _COMPAT_FREEBSD32_SIGNAL_H_ @@ -36,6 +36,9 @@ }; union sigval32 { + int sival_int; + u_int32_t sival_ptr; + /* 6.0 compatibility */ int sigval_int; u_int32_t sigval_ptr; }; @@ -70,6 +73,29 @@ } _reason; }; +struct osigevent32 { + int sigev_notify; /* Notification type */ + union { + int __sigev_signo; /* Signal number */ + int __sigev_notify_kqueue; + } __sigev_u; + union sigval32 sigev_value; /* Signal value */ +}; + +struct sigevent32 { + int sigev_notify; /* Notification type */ + int sigev_signo; /* Signal number */ + union sigval32 sigev_value; /* Signal value */ + union { + __lwpid_t _threadid; + struct { + uint32_t _function; + uint32_t _attribute; + } _sigev_thread; + uint32_t __spare__[8]; + } _sigev_un; +}; + void siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst); #endif /* !_COMPAT_FREEBSD32_SIGNAL_H_ */ ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.96 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.97 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -210,6 +210,9 @@ #define FREEBSD32_SYS_openbsd_poll 252 #define FREEBSD32_SYS_issetugid 253 #define FREEBSD32_SYS_lchown 254 +#define FREEBSD32_SYS_freebsd32_aio_read 255 +#define FREEBSD32_SYS_freebsd32_aio_write 256 +#define FREEBSD32_SYS_freebsd32_lio_listio 257 #define FREEBSD32_SYS_getdents 272 #define FREEBSD32_SYS_lchmod 274 #define FREEBSD32_SYS_netbsd_lchown 275 @@ -237,6 +240,13 @@ #define FREEBSD32_SYS_setresuid 311 #define FREEBSD32_SYS_setresgid 312 /* 313 is obsolete signanosleep */ +#define FREEBSD32_SYS_freebsd32_aio_return 314 +#define FREEBSD32_SYS_freebsd32_aio_suspend 315 +#define FREEBSD32_SYS_freebsd32_aio_cancel 316 +#define FREEBSD32_SYS_freebsd32_aio_error 317 +#define FREEBSD32_SYS_freebsd32_oaio_read 318 +#define FREEBSD32_SYS_freebsd32_oaio_write 319 +#define FREEBSD32_SYS_freebsd32_olio_listio 320 #define FREEBSD32_SYS_yield 321 /* 322 is obsolete thr_sleep */ /* 323 is obsolete thr_wakeup */ @@ -274,6 +284,7 @@ #define FREEBSD32_SYS_extattr_set_file 356 #define FREEBSD32_SYS_extattr_get_file 357 #define FREEBSD32_SYS_extattr_delete_file 358 +#define FREEBSD32_SYS_freebsd32_aio_waitcomplete 359 #define FREEBSD32_SYS_getresuid 360 #define FREEBSD32_SYS_getresgid 361 #define FREEBSD32_SYS_kqueue 362 @@ -321,6 +332,7 @@ #define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 #define FREEBSD32_SYS_thr_set_name 464 +#define FREEBSD32_SYS_freebsd32_aio_fsync 465 #define FREEBSD32_SYS_rtprio_thread 466 #define FREEBSD32_SYS_sctp_peeloff 471 #define FREEBSD32_SYS_sctp_generic_sendmsg 472 ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.87 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.88 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ const char *freebsd32_syscallnames[] = { @@ -262,9 +262,9 @@ "openbsd_poll", /* 252 = openbsd_poll */ "issetugid", /* 253 = issetugid */ "lchown", /* 254 = lchown */ - "#255", /* 255 = nosys */ - "#256", /* 256 = nosys */ - "#257", /* 257 = nosys */ + "freebsd32_aio_read", /* 255 = freebsd32_aio_read */ + "freebsd32_aio_write", /* 256 = freebsd32_aio_write */ + "freebsd32_lio_listio", /* 257 = freebsd32_lio_listio */ "#258", /* 258 = nosys */ "#259", /* 259 = nosys */ "#260", /* 260 = nosys */ @@ -321,13 +321,13 @@ "setresuid", /* 311 = setresuid */ "setresgid", /* 312 = setresgid */ "obs_signanosleep", /* 313 = obsolete signanosleep */ - "#314", /* 314 = aio_return */ - "#315", /* 315 = aio_suspend */ - "#316", /* 316 = aio_cancel */ - "#317", /* 317 = aio_error */ - "#318", /* 318 = aio_read */ - "#319", /* 319 = aio_write */ - "#320", /* 320 = lio_listio */ + "freebsd32_aio_return", /* 314 = freebsd32_aio_return */ + "freebsd32_aio_suspend", /* 315 = freebsd32_aio_suspend */ + "freebsd32_aio_cancel", /* 316 = freebsd32_aio_cancel */ + "freebsd32_aio_error", /* 317 = freebsd32_aio_error */ + "freebsd32_oaio_read", /* 318 = freebsd32_oaio_read */ + "freebsd32_oaio_write", /* 319 = freebsd32_oaio_write */ + "freebsd32_olio_listio", /* 320 = freebsd32_olio_listio */ "yield", /* 321 = yield */ "obs_thr_sleep", /* 322 = obsolete thr_sleep */ "obs_thr_wakeup", /* 323 = obsolete thr_wakeup */ @@ -366,7 +366,7 @@ "extattr_set_file", /* 356 = extattr_set_file */ "extattr_get_file", /* 357 = extattr_get_file */ "extattr_delete_file", /* 358 = extattr_delete_file */ - "#359", /* 359 = aio_waitcomplete */ + "freebsd32_aio_waitcomplete", /* 359 = freebsd32_aio_waitcomplete */ "getresuid", /* 360 = getresuid */ "getresgid", /* 361 = getresgid */ "kqueue", /* 362 = kqueue */ @@ -472,7 +472,7 @@ "#462", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ - "#465", /* 465 = aio_fsync */ + "freebsd32_aio_fsync", /* 465 = freebsd32_aio_fsync */ "rtprio_thread", /* 466 = rtprio_thread */ "#467", /* 467 = nosys */ "#468", /* 468 = nosys */ ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#18 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.97 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.98 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #include "opt_compat.h" @@ -293,9 +293,9 @@ { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0 }, /* 252 = openbsd_poll */ { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0 }, /* 253 = issetugid */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 254 = lchown */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 255 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 256 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 257 = nosys */ + { AS(freebsd32_aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 255 = freebsd32_aio_read */ + { AS(freebsd32_aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 256 = freebsd32_aio_write */ + { AS(freebsd32_lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 257 = freebsd32_lio_listio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 258 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 259 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 260 = nosys */ @@ -352,13 +352,13 @@ { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 311 = setresuid */ { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 313 = obsolete signanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 314 = aio_return */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 315 = aio_suspend */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 316 = aio_cancel */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 317 = aio_error */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 318 = aio_read */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 319 = aio_write */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 320 = lio_listio */ + { AS(freebsd32_aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 314 = freebsd32_aio_return */ + { AS(freebsd32_aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 315 = freebsd32_aio_suspend */ + { AS(freebsd32_aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 316 = freebsd32_aio_cancel */ + { AS(freebsd32_aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 317 = freebsd32_aio_error */ + { AS(freebsd32_oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 318 = freebsd32_oaio_read */ + { AS(freebsd32_oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 319 = freebsd32_oaio_write */ + { AS(freebsd32_olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 320 = freebsd32_olio_listio */ { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0 }, /* 321 = yield */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 322 = obsolete thr_sleep */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ @@ -397,7 +397,7 @@ { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */ { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */ { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */ + { AS(freebsd32_aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 359 = freebsd32_aio_waitcomplete */ { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */ @@ -503,7 +503,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 462 = kmq_unlink */ { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ + { AS(freebsd32_aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 465 = freebsd32_aio_fsync */ { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ ==== //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#19 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.112 2008/11/29 14:32:14 bz Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.113 2008/12/10 20:56:19 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -454,9 +454,13 @@ u_int nfds, int timeout); } 253 AUE_ISSETUGID NOPROTO { int issetugid(void); } 254 AUE_LCHOWN NOPROTO { int lchown(char *path, int uid, int gid); } -255 AUE_NULL UNIMPL nosys -256 AUE_NULL UNIMPL nosys -257 AUE_NULL UNIMPL nosys +255 AUE_NULL NOSTD { int freebsd32_aio_read( \ + struct aiocb32 *aiocbp); } +256 AUE_NULL NOSTD { int freebsd32_aio_write( \ + struct aiocb32 *aiocbp); } +257 AUE_NULL NOSTD { int freebsd32_lio_listio(int mode, \ + struct aiocb32 * const *acb_list, \ + int nent, struct sigevent *sig); } 258 AUE_NULL UNIMPL nosys 259 AUE_NULL UNIMPL nosys 260 AUE_NULL UNIMPL nosys @@ -535,13 +539,22 @@ 312 AUE_SETRESGID NOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } 313 AUE_NULL OBSOL signanosleep -314 AUE_NULL UNIMPL aio_return -315 AUE_NULL UNIMPL aio_suspend -316 AUE_NULL UNIMPL aio_cancel -317 AUE_NULL UNIMPL aio_error -318 AUE_NULL UNIMPL aio_read -319 AUE_NULL UNIMPL aio_write -320 AUE_NULL UNIMPL lio_listio +314 AUE_NULL NOSTD { int freebsd32_aio_return( \ + struct aiocb32 *aiocbp); } +315 AUE_NULL NOSTD { int freebsd32_aio_suspend( \ + struct aiocb32 * const * aiocbp, int nent, \ + const struct timespec32 *timeout); } +316 AUE_NULL NOSTD { int freebsd32_aio_cancel(int fd, \ + struct aiocb32 *aiocbp); } +317 AUE_NULL NOSTD { int freebsd32_aio_error( \ + struct aiocb32 *aiocbp); } +318 AUE_NULL NOSTD { int freebsd32_oaio_read( \ + struct oaiocb32 *aiocbp); } +319 AUE_NULL NOSTD { int freebsd32_oaio_write( \ + struct oaiocb32 *aiocbp); } +320 AUE_NULL NOSTD { int freebsd32_olio_listio(int mode, \ + struct oaiocb32 * const *acb_list, \ + int nent, struct osigevent32 *sig); } 321 AUE_NULL NOPROTO { int yield(void); } 322 AUE_NULL OBSOL thr_sleep 323 AUE_NULL OBSOL thr_wakeup @@ -618,7 +631,9 @@ 358 AUE_EXTATTR_DELETE_FILE NOPROTO { int extattr_delete_file( \ const char *path, int attrnamespace, \ const char *attrname); } -359 AUE_NULL UNIMPL aio_waitcomplete +359 AUE_NULL NOSTD { int freebsd32_aio_waitcomplete( \ + struct aiocb32 **aiocbp, \ + struct timespec32 *timeout); } 360 AUE_GETRESUID NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } 361 AUE_GETRESGID NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ @@ -766,7 +781,8 @@ 462 AUE_NULL UNIMPL kmq_unlink 463 AUE_NULL NOPROTO { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL NOPROTO { int thr_set_name(long id, const char *name); } -465 AUE_NULL UNIMPL aio_fsync +465 AUE_NULL NOSTD { int freebsd32_aio_fsync(int op, \ + struct aiocb32 *aiocbp); } 466 AUE_RTPRIO NOPROTO { int rtprio_thread(int function, \ lwpid_t lwpid, struct rtprio *rtp); } 467 AUE_NULL UNIMPL nosys ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#30 (text+ko) ==== @@ -42,7 +42,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.128 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.131 2008/12/10 16:11:09 kib Exp $"); #include #include @@ -273,8 +273,7 @@ /* XXX per-cpu vendor / class / model / id? */ } - sbuf_cat(sb, - "flags\t\t:"); + sbuf_cat(sb, "flags\t\t:"); if (!strcmp(cpu_vendor, "AuthenticAMD") && (class < 6)) { flags[16] = "fcmov"; @@ -876,10 +875,12 @@ linprocfs_doprocmaps(PFS_FILL_ARGS) { vm_map_t map = &p->p_vmspace->vm_map; - vm_map_entry_t entry; + vm_map_entry_t entry, tmp_entry; vm_object_t obj, tobj, lobj; - vm_offset_t saved_end; + vm_offset_t e_start, e_end; vm_ooffset_t off = 0; + vm_prot_t e_prot; + unsigned int last_timestamp; char *name = "", *freename = NULL; ino_t ino; int ref_count, shadow_count, flags; @@ -905,7 +906,9 @@ freename = NULL; if (entry->eflags & MAP_ENTRY_IS_SUB_MAP) continue; - saved_end = entry->end; + e_prot = entry->protection; + e_start = entry->start; + e_end = entry->end; obj = entry->object.vm_object; for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) { VM_OBJECT_LOCK(tobj); @@ -913,6 +916,8 @@ VM_OBJECT_UNLOCK(lobj); lobj = tobj; } + last_timestamp = map->timestamp; + vm_map_unlock_read(map); ino = 0; if (lobj) { off = IDX_TO_OFF(lobj->size); @@ -950,10 +955,10 @@ */ error = sbuf_printf(sb, "%08lx-%08lx %s%s%s%s %08lx %02x:%02x %lu%s%s\n", - (u_long)entry->start, (u_long)entry->end, - (entry->protection & VM_PROT_READ)?"r":"-", - (entry->protection & VM_PROT_WRITE)?"w":"-", - (entry->protection & VM_PROT_EXECUTE)?"x":"-", + (u_long)e_start, (u_long)e_end, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 11 07:38:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CACB41065677; Thu, 11 Dec 2008 07:38:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73F0C106564A for ; Thu, 11 Dec 2008 07:38:09 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id 2CAF78FC08 for ; Thu, 11 Dec 2008 07:38:09 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from [10.123.2.178] (p53.kientzle.com [66.166.149.53]) by kientzle.com (8.12.9/8.12.9) with ESMTP id mBB6xjtv069618; Wed, 10 Dec 2008 22:59:45 -0800 (PST) (envelope-from kientzle@freebsd.org) Message-ID: <4940BA5C.1030804@freebsd.org> Date: Wed, 10 Dec 2008 22:59:40 -0800 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20060422 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Anselm Strauss References: <200812091600.mB9G0wwI029886@repoman.freebsd.org> In-Reply-To: <200812091600.mB9G0wwI029886@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 07:38:10 -0000 Anselm, Glad to see you working on this again. This looks like good progress. You're seeing linking problems? I'm not seeing those here. Could you send me details? Maybe I can help figure those out. I am seeing a lot of test failures here. I haven't looked into them closely yet, but I did notice that you have the wrong value for "COMPRESSION_DEFLATE"; it should be 8, not 6. Tim Anselm Strauss wrote: > http://perforce.freebsd.org/chv.cgi?CH=154398 > > Change 154398 by strauss@strauss_silversurfer on 2008/12/09 16:00:15 > > Added deflate compression, still compile problems (linking) > > Affected files ... > > .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#42 edit > > Differences ... > > ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#42 (text+ko) ==== > > @@ -76,6 +76,11 @@ > #define ZIP_VERSION_BY 0x0314 /* Made by UNIX, using ZIP version 2.0. */ > #define ZIP_FLAGS 0x08 /* Flagging bit 3 (count from 0) for using data descriptor. */ > > +enum compression { > + COMPRESSION_STORE = 0, > + COMPRESSION_DEFLATE = 6 > +}; > + > static ssize_t archive_write_zip_data(struct archive_write *, const void *buff, size_t s); > static int archive_write_zip_finish(struct archive_write *); > static int archive_write_zip_destroy(struct archive_write *); > @@ -177,11 +182,6 @@ > char comment_length[2]; > }; > > -static enum compression { > - COMPRESSION_STORE = 0, > - COMPRESSION_DEFLATE = 6 > -}; > - > int > archive_write_set_format_zip(struct archive *_a) > { > @@ -294,7 +294,7 @@ > zip_encode(path_length(entry), &h.filename_length, sizeof(h.filename_length)); > zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); > > - if (zip->compression = COMPRESSION_STORE) { > + if (zip->compression == COMPRESSION_STORE) { > /* Setting compressed and uncompressed sizes even when specification says > * to set to zero when using data descriptors. Otherwise the end of the > * data for an entry is rather difficult to find. */ > @@ -342,35 +342,62 @@ > struct zip *zip = a->format_data; > struct zip_file_header_link *l = zip->central_directory_end; > z_stream stream; > + size_t chunk = sizeof(*buff); > + unsigned char buff_out[chunk]; > > if (s > zip->remaining_data_bytes) > s = zip->remaining_data_bytes; > + > + if (s == 0) return 0; > > switch (zip->compression) { > > case COMPRESSION_STORE: > > ret = (a->compressor.write)(a, buff, s); > + if (ret < 0) return (ret); > + zip->written_bytes += s; > + zip->remaining_data_bytes -= s; > + l->crc32 = crc32(l->crc32, buff, s); > + return (ret); > > case COMPRESSION_DEFLATE: > > - deflateInit2( > - stream, > - > - ); > + stream.zalloc = Z_NULL; > + stream.zfree = Z_NULL; > + stream.opaque = Z_NULL; > + ret = deflateInit(&stream, Z_DEFAULT_COMPRESSION); > + if (ret != Z_OK) return (ARCHIVE_FATAL); > + stream.next_in = (unsigned char*) buff; > + stream.avail_in = s; > + do { > + stream.next_out = buff_out; > + stream.avail_out = chunk; > + ret = deflate(&stream, Z_FINISH); > + if (ret == Z_STREAM_ERROR) { > + deflateEnd(&stream); > + return (ARCHIVE_FATAL); > + } > + ret = (a->compressor.write)(a, buff_out, stream.avail_out); > + if (ret < 0) { > + deflateEnd(&stream); > + return (ret); > + } > + zip->written_bytes += ret; > + } while (stream.avail_out == 0); > + zip->remaining_data_bytes -= s; > + l->crc32 = crc32(l->crc32, buff, s); > + deflateEnd(&stream); > + return (s); > > + default: > + > + archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Invalid ZIP compression type"); > + return ARCHIVE_FATAL; > } > > /* TODO: set compressed size in data descriptor and local file header link */ > > - if (ret >= 0) { > - zip->written_bytes += s; > - zip->remaining_data_bytes -= s; > - l->crc32 = crc32(l->crc32, buff, s); > - return (s); > - } else { > - return (ret); > - } > } > > static int > @@ -434,7 +461,7 @@ > zip_encode(dos_time(archive_entry_mtime(l->entry)), &h.timedate, sizeof(h.timedate)); > zip_encode(l->crc32, &h.crc32, sizeof(h.crc32)); > /* TODO: write compressed size */ > - zip_encode(archive_entry_size(entry), &h.uncompressed_size, sizeof(h.uncompressed_size)); > + zip_encode(archive_entry_size(l->entry), &h.uncompressed_size, sizeof(h.uncompressed_size)); > zip_encode(path_length(l->entry), &h.filename_length, sizeof(h.filename_length)); > zip_encode(sizeof(e), &h.extra_length, sizeof(h.extra_length)); > mode = archive_entry_mode(l->entry); > @@ -588,7 +615,7 @@ > set_compression(struct archive_write *a, enum compression compression) > { > /* TODO: check archive state, should not switch between header and data */ > - /* TODO: check if valid compression? */ > > - a->format_data->compression = compression; > + struct zip *zip = a->format_data; > + zip->compression = compression; > } > > From owner-p4-projects@FreeBSD.ORG Thu Dec 11 08:37:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 762D11065672; Thu, 11 Dec 2008 08:37:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39E07106564A for ; Thu, 11 Dec 2008 08:37:36 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29F708FC13 for ; Thu, 11 Dec 2008 08:37:36 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBB8baMr088851 for ; Thu, 11 Dec 2008 08:37:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBB8bawf088844 for perforce@freebsd.org; Thu, 11 Dec 2008 08:37:36 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 11 Dec 2008 08:37:36 GMT Message-Id: <200812110837.mBB8bawf088844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 08:37:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=154488 Change 154488 by pgj@kolbasz on 2008/12/11 08:36:36 Add Hungarian translation of chapter "The Website" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#2 (text+ko) ==== @@ -31,79 +31,118 @@ --> - The Website + A honlap - Preparation + Elõkészületek - Use a disk with sufficient free space. You may need anything from - 200 MB to over 500 MB, depending on the method you choose. - This space will hold the SGML tools, a subset of the - CVS tree, temporary build space and the - installed web pages. + A honlap elõállításához + elsõsorban elegendõ szabad területet kell + keresnünk valamelyik merevlemezünkön. Ennek + mennyisége a választott módszertõl + függõen úgy nagyjából + 200 MB-tól 500 MB-ig terjedhet. Ez a + becslés magában foglalja az SGML + eszközökhöz, a CVS + repository megfelelõ részeihez, valamint a honlap + generálásához szükséges + lemezterületet. - Make sure your documentation ports are up to date! When in - doubt, remove the old ports using &man.pkg.delete.1; command before - installing the port. For example, we currently depend on - jade-1.2 and if you have installed jade-1.1, please do: + Mindig ellenõrizzük, hogy a + dokumentáció + elõállításához használt + portok frissek legyenek. Ha nem vagyunk benne biztosak, akkor a + portok telepítése elõtt a &man.pkg.delete.1; + paranccsal töröljük a korábbi + változatukat. Például ha a jade-1.2 + csomagra van szükségünk és a + rendszerünkön már megtalálható a + jade-1.1, akkor a következõt kell tennünk: &prompt.root; pkg_delete jade-1.1 - There are two methods to get the files required for the website - build: + A honlap elõállításához ebben + a fejezetben most két módszert adunk meg: - Use csup to get a local copy of the files - from a CVSup server. This is the - easiest method, and does not require installation of additional - software. The supfile presented in the next section will always - checkout the latest version of the required files. This is - sufficient if you are simply rebuilding the website and do not - intend to commit any changes. + A csup parancs + használatával hozzuk létre és + tartsunk karban a gépünkön a források + helyi másolatát valamelyik + CVSup szerverrõl. Ez a + legegyszerûbb megoldás, mivel semmilyen + további szoftver telepítését nem + igényli. Ehhez a következõ szakaszban + megadott supfile állomány mindig a + szükséges állományok legfrissebb + változatát kéri le. Ez abban az esetben + tökéletesen megfelelõ, ha egyszerûen + csak le akarjuk generálni a honlapokat és nem + kívánunk a forrásokkal dolgozni. - &man.csup.1; became part of the base system in - &os; 6.2-RELEASE. If you are using an earlier version of &os; - you will need to install net/csup - from the Ports Collection. - + A &man.csup.1; a &os; 6.2-RELEASE + kiadástól az alaprendszer része. + Amennyiben még a &os; egy korábbi + változatát használjuk, akkor ezt a + programot a Portgyûjteménybõl a net/csup port + telepítésével érhetjük + el. + - Use cvsup in cvs mode to - create and maintain a local CVS - repository with the required files. This will require you to - install a program like - net/cvsup-without-gui, but it is - a more flexible method if you need to have quick access to different - revisions of the doc/www files, revision histories, or if you - intend to commit changes to the central &os; - CVS repository. + A cvsup parancs + használatával CVS módban + hozzunk létre és tartsunk karban egy helyi + CVS repositoryt a + szükséges állományokkal. Ehhez + például a net/cvsup-without-gui port + telepítését kell elvégeznünk, + ezáltal viszont egy sokkal rugalmasabb módszert + nyerünk abban az esetben, ha gyorsan és + könnyedén hozzá szeretnénk + férni a doc és www repositorykban tárolt + állományok különbözõ + revízióihoz, elõzményeihez vagy + éppen tárolni szeretnénk a &os; + központi CVS + repositoryjába. - Simple method: Using <command>csup</command> + Az egyszerû megoldás: a <command>csup</command> + használata - The csup command is part of the base system and - already used extensively by most people for updating the - Ports Collection. The following sample supfile can be used to - obtain a checkout of the files required for the website build: + A csup az alaprendszer része lett, + de egy ideje már nagyon sokan használják, + többek közt a saját + portgyûjteményük + frissítésére. A most következõ + példa supfile állománnyal a honlapok + elõállításához + szükséges állományokat tudjuk + elérni: # -# This file checks out all collections required to rebuild -# the FreeBSD website +# Ezzel a konfigurációs állománnyal a &os; honlapjának +# legenerálásához szükséges gyûjteményeket tudjuk elérni. # -# Use the nearest CVSup mirror -# listed at http://www.freebsd.org/doc/handbook/mirrors.html. +# A http://www.freebsd.org/doc/handbook/mirrors.html honlapon található +# felsorolásból válasszuk ki a hozzánk legközelebb elhelyezkedõ CVSup +# tükrözést. *default host=cvsup10.FreeBSD.org *default base=/var/db @@ -112,78 +151,109 @@ *default delete use-rel-suffix *default compress -# This will retrieve the entire doc branch of the FreeBSD repository. +# A &os; repository teljes doc ágát lekérjük. doc-all -# This will retrieve the files required for the website +# Lekérjük a honlap forrásait. www -# This will retrieve some basic ports info required for the build +# A holnapok elõállításához szükséges néhány alapvetõ port lekérése. ports-base - You should, of course, change the default host - entry to a CVSup mirror near your - location, and the default prefix entry to the - location where you intend to store the checked out files. Save this - file as e.g. - doc-www-supfile, and - then execute the following command: + A default host helyére + természetesen ne felejtsük el megadni a hozzánk + legközelebb elhelyezkedõ + CVSup tükrözést + (például cvsup.hu.FreeBSD.org), + illetve a default prefix + bejegyzésnél azt a könyvtárat, + ahová a lekért állományokat + szeretnénk elhelyezni. Ezután az így + kitöltött mintát mentsük el + például + doc-www-supfile + néven és adjuk ki a következõ + parancsot: &prompt.root; csup doc-www-supfile - When this command finishes, you will find the directories - doc/, - www/ and - ports/ under the directory you - specified in default prefix - (A parancs lefutásának + eredményeképpen ekkor tehát a + default prefix + értékeként megadott könyvtáron + belül létrejönnek a doc/, www/ és ports/ alkönyvtárak + (amely a példánkban a /usr/build - in our example). We will use this same directory for the build - process itself, so it would be better to use a filesystem with - sufficient free space. + volt). Ebben a könyvtárban fogjuk + egyébként létrehozni az + állományokat, ezért ezt érdemes egy + olyan állományrendszerre tenni, ahol tehát + elegendõ szabad terület áll + rendelkezésre. - That's it! You can now proceed with the - website build. + Remek! Most lépjünk tovább a honlap + elõállításáról + szóló részhez. - Advanced method: Maintaining a local - <application>CVS</application> doc/www repository + A rugalmasabb megoldás: saját doc és + www repositoryk létrehozása és + karbantartása - This method will give you more advanced options, but will require - you to install the - net/cvsup-without-gui port or - package. + Ez a módszer több lehetõséget + kínál, viszont cserébe + telepítenünk kell hozzá a net/cvsup-without-gui portot vagy + csomagot. - The net/cvsup-without-gui - port has a build dependency on - lang/ezm3, a Modula 3 - compiler. This compiler takes quite some time to build, and since - most people will not need it for anything else, it is perhaps best - to use a package to install CVSup. + A net/cvsup-without-gui port + fordításához szükséges a + lang/ezm3 port, vagyis egy + Modula 3 fordító. Ennek a + fordítása viszonylag sok idõt vesz + igénybe és ráadásul a + legtöbben nem is használják másra, + ezért a CVSup + telepítéséhez elsõsorban a csomagok + használatát javasoljuk. - The CVSup utility has a special - cvs mode that allows the retrieval of the - ,v files that make up a CVS - repository. This function is not currently available in - csup. For detailed information on - CVSup, please read the CVSup introduction in the &os; Handbook. + A CVSup program rendelkezik egy + speciális, ún. CVS móddal, + amelynek köszönhetõen lehetõvé teszi + a CVS repositoryt alkotó + ,v állományok + elérését. Ez a funkció jelenleg + még nem érhetõ el a + csup programban. A + CVSup részletes + bemutatását a &os; kézikönyv A + források szinkronizálása + címû részében olvashatjuk. - The supfile shown below will fetch the cvs collections required - for the website build, and create a local - CVS repository: + A most következõ supfile állomány + lekéri a holnapok + elõállításához + szükséges gyûjteményeket és + létrehozza a CVS repository + helyi másolatát: # -# This file will create a local CVS repository -# with the collections required for a complete -# FreeBSD website rebuild. It should be used with -# cvsup *only* (csup will not work) +# Ezzel az állománnyal létre tudjuk hozni a CVS repository egy olyan +# helyi másolatát, amelyben csak a &os; holnapjának elõállításához +# szükséges gyûjtemények találhatóak meg. Jelen pillanatban *kizárólag* +# a cvsup paranccsal fog mûködni (a csup programmal tehát nem) *default host=cvsup10.FreeBSD.org *default base=/var/db @@ -192,84 +262,114 @@ *default delete use-rel-suffix *default compress -# The following collections are needed -# for the website build +# A honlapok generálásához az alábbi gyûjteményekre lesz szükségünk: ports-base doc-all www -# These collections are needed -# for CVS functionality +# A CVS funkciókhoz még ezek a gyûjtemények is kelleni fognak: cvsroot-common cvsroot-ports cvsroot-doc - You should, of course, change the default host - entry to a CVSup mirror near your - location, and the default prefix entry to the - location where you intend to store the repository files. Save this - file as e.g. - doc-www-cvsfile, and - then execute the following command: + A default host sorban + értelemszerûen a hozzánk legközelebb + elhelyezkedõ CVSup + tükrözést adjuk meg (például + cvsup.hu.FreeBSD.org), illetve a + default prefix bejegyzésnél + pedig azt a könyvtárat, ahol a repository + állományait kívánjuk tárolni. + Valamilyen, például + doc-ww-cvsfile + néven mentsük el ezt a mintát és adjuk + ki a következõ parancsot: &prompt.root; cvsup doc-www-cvsfile - It is also advisable to set the CVSROOT environment - variable in your shell's startup files. For example, use - the following entry in your ~/.cshrc file: + Továbbá érdemes még a + parancsértelmezõnk + indítóállományaiban + beállítani a CVSROOT + környezeti változó + értékét is. Például + vegyük fel az alábbi sort a + .cshrc állományunkba: setenv CVSROOT /usr/dcvs - If you set this variable, you may omit the - argument (shown below) when performing repository operations using - the cvs command. + Ennek megadásával a repositoryval kapcsolatos + mûveletek elvégzésekor a (lentebb + látható) parancsból elhagyhatjuk a + paraméter + megadását. - Currently, you will need more than 400 MB of free space to - host the repository files. An additional 200 MB will be needed - for the temporary build space. Once the cvsup - command completes, you are ready to check out the files to your build - directory: + Jelenleg a repositoryban tárolt + állományok befogadásához + legalább 400 MB tárterületre lesz + szükségünk. A honlapok + elõállítása során ezen + felül ideiglenesen még nagyjából + további 200 MB hely kellhet. A + cvsup parancs lefutása után + már ki is kérhetjük a forrásokat a + munkakönyvtárunkba: &prompt.root; mkdir /usr/build &prompt.root; cd /usr/build &prompt.root; cvs /usr/dcvs co doc www ports - The above command is consistent with the way - csup checks out the files from the - CVSup servers. When it completes, you - will have a build directory with similar contents to the one used in - the simple csup method. + Ez a parancs lényegében ugyanannak felel meg, + ahogy a csup kéri le az + állományokat a CVSup + szervertõl. A folyamat befejezõdése + után a munkakönyvtárban tehát + tulajdonképpen ugyanazokat fogjuk találni, mint az + egyszerûbb, csup alapú + módszer esetében. - You can continue to use the cvsup command - shown above, to update your local CVS - repository on a regular basis. After the initial somewhat lengthy - download, regular updates will only take a few minutes. + Az imént bemutatott cvsup parancs + folyamatos használatával tudjuk rendszeresen + karbantartani a CVS repository helyi + másolatát. Az elsõ esetben még + viszonylag sok állomány fog letöltõdni, + azonban a késõbbiekben már viszont csak + néhány percet vesz igénybe a + frissítés. - Build the web pages from scratch + A honlapok elõállítása - Having completed either of the two methods, you will be ready to - start the website build. In our example, the build directory is - /usr/build - and all the required files are already in place. + Miután az elõbb tárgyalt módszerek + valamelyikével elõkészítettük + rendszerünkön a honlapok forrásainak egy + naprakész másolatát, készen + állunk a honlapok létrehozására. A + példánkban az ehhez használt + munkakönyvtár a /usr/build + volt, ahol már minden szükséges + állomány megtalálható. - Change into the build directory: + Lépjünk be a + munkakönyvtárba: &prompt.root; cd /usr/build - The website build starts from the - www/en directory by executing - the &man.make.1; all target, to create - the web pages. + A honlapok elõállítása a + www/en + könyvtárból indul, az + all &man.make.1; cél + végrehajtásával megkezdõdik a + honlapok készítése. &prompt.root; cd www/en &prompt.root; make all @@ -278,31 +378,39 @@ - Install the web pages into your web server + A generált honlapok telepítése a + webszerverre - If you have moved out of the - en directory, change back to - it. + Ha nem az en + könyvtárban állunk, akkor váltsunk + vissza rá. &prompt.root; cd /usr/build/www/en - Run the &man.make.1; install target, - setting the DESTDIR variable to the name of the - directory you want to install the files to. + A DESTDIR változóban + állítsuk be a honlapok tényleges + helyét, és futtassuk le vele a + install &man.make.1; + célt. &prompt.root; env DESTDIR=/usr/local/www make install - If you have previously installed the web pages into the same - directory the install process will not have deleted any old or - outdated pages. For example, if you build and install a new copy - of the site every day, this command will find and delete all - files that have not been updated in three days. + Ha az elõbb megadott könyvtárba + korábban már másoltunk honlapokat, akkor az + újabb másolás során nem + törlõdnek a régi vagy elavult lapok. + Például ha a honlapokat napi + rendszereséggel frissítjük, akkor a + következõ paranccsal meg tudjuk keresni és + törölhetjük azokat a lapokat, amelyeket + már három napja nem + frissítettünk. &prompt.root; find /usr/local/www 3 | xargs rm @@ -310,24 +418,34 @@ - Environment variables + Környezeti változók CVSROOT - Location of the CVS tree. We suggest you set this - variable, if you use the CVSup - method: + A CVS állományait tároló + könyvtár gyökere. Ha a + CVSup alapú + módszert alkalmazzuk, akkor érdemes a + hozzátartozó változót + beállítanunk: &prompt.root; CVSROOT=/usr/dcvs; export CVSROOT - CVSROOT is an environment variable. You must - set it on the command line or in your dot files - (e.g., ~/.profile). The exact syntax will - differ depending on your shell (the above example is for - bash and bash-like shells). + A CVSROOT egy környezeti + változó. Vagy a paranccsorban, vagy pedig a + parancsértelmezõnknek megfelelõ + konfigurációs állományban + (például .profile) kell + beállítanunk. Ennek pontos + mikéntjét maga a parancsértelmezõ + határozza meg (a fenti parancsban + például a bash + és a hozzá hasonló + parancsértelmezõk által alkalmazott + megadási mód látható). @@ -335,16 +453,20 @@ ENGLISH_ONLY - If set and not empty, the makefiles will build and - install only the English documents. All translations will be - ignored. E.g.: + Ha beállítjuk és nem üres, + akkor a folyamat során csak az angol nyelvû + oldalak fognak elkészülni, a + fordítások figyelmen kívül + maradnak. Például: &prompt.root; make ENGLISH_ONLY=YES all install - If you want to unset the variable - ENGLISH_ONLY and build all pages, including - translations, set the variable ENGLISH_ONLY - to an empty value: + Ha le akarjuk tiltani az ENGLISH_ONLY + hatását és az összes oldalt az + összes elérhetõ fordítással + létrehozni, akkor az ENGLISH_ONLY + változónak adjunk üres + értéket: &prompt.root; make ENGLISH_ONLY="" all install clean @@ -354,10 +476,17 @@ WEB_ONLY - If set and not empty, the makefiles will build and install - only the HTML pages from the www directory. All documents from - the doc directory (Handbook, - FAQ, Tutorials) will be ignored. E.g.: + Ha beállítottuk és az + értéke nem üres, akkor + hatására csak a www könyvtárban + található HTML oldalak + állítódnak elõ és + telepítõdnek. Ilyenkor a doc könyvtár teljes + tartalma (kézikönyv, GYIK és egyéb + leírások) figyelmen kívül + marad. &prompt.root; make WEB_ONLY=YES all install @@ -367,19 +496,29 @@ NOPORTSCVS - If set, the makefiles will not checkout files from the ports - cvs repository. Instead, it will copy the files from - /usr/ports (or where the - variable PORTSBASE points to). + Ennek megadásakor a Makefile + állományok nem kérnek ki + állományokat a portokhoz tartozó + repositoryból. Ehelyett a szükséges + állományokat közvetlenül a /usr/ports + könyvtárból (vagy ahova a + PORTSBASE változó + értéke mutat) fogják + átmásolni. - WEB_ONLY, ENGLISH_ONLY and - NOPORTSCVS are make variables. You can set the - variables in /etc/make.conf, - Makefile.inc, as environment variables on the - command line, or in your dot files. + A WEB_ONLY, ENGLISH_ONLY + és NOPORTSCVS változók a + make programhoz tartoznak. Ezek + értékét az + /etc/make.conf állományban, + vagy környezeti változókhoz hasonlóan + parancssorból, illetve a parancsértelmezõ + konfigurációs állományaiban + állíthatjuk be. From owner-p4-projects@FreeBSD.ORG Thu Dec 11 11:54:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EDF41065675; Thu, 11 Dec 2008 11:54:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 235E21065670 for ; Thu, 11 Dec 2008 11:54:56 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EF1688FC0C for ; Thu, 11 Dec 2008 11:54:55 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBBsteg004077 for ; Thu, 11 Dec 2008 11:54:55 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBBBstda004075 for perforce@freebsd.org; Thu, 11 Dec 2008 11:54:55 GMT (envelope-from bz@freebsd.org) Date: Thu, 11 Dec 2008 11:54:55 GMT Message-Id: <200812111154.mBBBstda004075@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 11:54:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=154491 Change 154491 by bz@bz_dumpster on 2008/12/11 11:54:08 FIx a mis-integ. Affected files ... .. //depot/projects/vimage/src/sys/net/if_gif.h#10 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gif.h#10 (text+ko) ==== @@ -126,6 +126,7 @@ #ifndef VIMAGE_GLOBALS extern struct vnet_gif vnet_gif_0; #endif +#endif #define INIT_VNET_GIF(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif) From owner-p4-projects@FreeBSD.ORG Thu Dec 11 12:56:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 675131065673; Thu, 11 Dec 2008 12:56:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B79C1065670 for ; Thu, 11 Dec 2008 12:56:59 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1AE528FC2B for ; Thu, 11 Dec 2008 12:56:59 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBCuwdm019665 for ; Thu, 11 Dec 2008 12:56:58 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBBCuwn0019663 for perforce@freebsd.org; Thu, 11 Dec 2008 12:56:58 GMT (envelope-from bz@freebsd.org) Date: Thu, 11 Dec 2008 12:56:58 GMT Message-Id: <200812111256.mBBCuwn0019663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 154492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 12:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=154492 Change 154492 by bz@bz_dumpster on 2008/12/11 12:56:30 Diff reduction to SVN. Sponsored by: The FreeBSD Foundation Affected files ... .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#47 edit .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#22 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.c#18 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.h#5 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#23 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#58 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#16 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#35 edit .. //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#4 edit .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#13 edit Differences ... ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#47 (text+ko) ==== @@ -175,10 +175,8 @@ /* XXX Don't need to initialise them because it's a LIST */ #ifdef VIMAGE_GLOBALS static LIST_HEAD(, ng_node) ng_ID_hash[NG_ID_HASH_SIZE]; -static LIST_HEAD(, ng_node) ng_name_hash[NG_NAME_HASH_SIZE]; #endif static struct mtx ng_idhash_mtx; -static struct mtx ng_namehash_mtx; /* Method to find a node.. used twice so do it here */ #define NG_IDHASH_FN(ID) ((ID) % (NG_ID_HASH_SIZE)) #define NG_IDHASH_FIND(ID, node) \ @@ -193,6 +191,10 @@ } \ } while (0) +#ifdef VIMAGE_GLOBALS +static LIST_HEAD(, ng_node) ng_name_hash[NG_NAME_HASH_SIZE]; +#endif +static struct mtx ng_namehash_mtx; #define NG_NAMEHASH(NAME, HASH) \ do { \ u_char h = 0; \ ==== //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#22 (text+ko) ==== @@ -116,7 +116,7 @@ static vnet_attach_fn ng_eiface_iattach; static vnet_detach_fn ng_eiface_idetach; -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS static struct unrhdr *ng_eiface_unit; #endif ==== //depot/projects/vimage/src/sys/netinet/in_gif.c#18 (text+ko) ==== @@ -86,6 +86,9 @@ .pr_usrreqs = &rip_usrreqs }; +#ifdef VIMAGE_GLOBALS +extern int ip_gif_ttl; +#endif SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, ip_gif_ttl, 0, ""); ==== //depot/projects/vimage/src/sys/netinet/in_gif.h#5 (text+ko) ==== @@ -35,9 +35,6 @@ #define GIF_TTL 30 -#ifdef VIMAGE_GLOBALS -extern int ip_gif_ttl; -#endif struct gif_softc; void in_gif_input(struct mbuf *, int); int in_gif_output(struct ifnet *, int, struct mbuf *); ==== //depot/projects/vimage/src/sys/netinet/in_pcb.h#23 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#58 (text+ko) ==== @@ -110,6 +110,12 @@ #include +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +struct vnet_ipfw vnet_ipfw_0; +#endif +#endif + static int vnet_ipfw_iattach(const void *); static int vnet_ipfw_idetach(const void *); @@ -242,7 +248,6 @@ static u_int32_t dyn_rst_lifetime; static u_int32_t dyn_udp_lifetime; static u_int32_t dyn_short_lifetime; -#endif /* * Keepalives are sent if dyn_keepalive is set. They are sent every @@ -251,7 +256,6 @@ * dyn_rst_lifetime and dyn_fin_lifetime should be strictly lower * than dyn_keepalive_period. */ -#ifdef VIMAGE_GLOBALS static u_int32_t dyn_keepalive_interval; static u_int32_t dyn_keepalive_period; ==== //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#11 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#16 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#35 (text+ko) ==== @@ -97,6 +97,12 @@ #include +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +struct vnet_ipsec vnet_ipsec_0; +#endif +#endif + static int vnet_ipsec_iattach(const void *); #ifdef VIMAGE static int vnet_ipsec_idetach(const void *); ==== //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#4 (text+ko) ==== @@ -82,7 +82,6 @@ static int tcpsignature_init(struct secasvar *sav, struct xformsw *xsp) { - INIT_VNET_IPSEC(curvnet); int keylen; if (sav->spi != htonl(TCP_SIG_SPI)) { ==== //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#13 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Dec 11 15:12:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EB1E1065677; Thu, 11 Dec 2008 15:12:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 283C1106564A for ; Thu, 11 Dec 2008 15:12:17 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 156758FC1B for ; Thu, 11 Dec 2008 15:12:17 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBFCGDw034849 for ; Thu, 11 Dec 2008 15:12:16 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBBFCGKB034847 for perforce@freebsd.org; Thu, 11 Dec 2008 15:12:16 GMT (envelope-from brueffer@freebsd.org) Date: Thu, 11 Dec 2008 15:12:16 GMT Message-Id: <200812111512.mBBFCGKB034847@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 154497 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 15:12:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=154497 Change 154497 by brueffer@brueffer_haakonia on 2008/12/11 15:11:43 Various mdoc and typo fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#13 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#13 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#13 $ .\" -.Dd October 2, 2006 +.Dd December 11, 2008 .Dt AUDIT 8 .Os .Sh NAME @@ -44,9 +44,12 @@ .Nm : .Bl -tag -width indent .It Fl i -Initializes and starts auditing. This option is currently for Mac OS X only -and requires auditd to be configured to run under -.Xr Launchd 8 . +Initializes and starts auditing. +This option is currently for Mac OS X only +and requires +.Xr auditd 8 +to be configured to run under +.Xr launchd 8 . .It Fl n Forces the audit system to close the existing audit log file and rotate to a new log file in a location specified in the audit control file. @@ -62,9 +65,10 @@ .Sh NOTES The .Xr auditd 8 -daemon must already be running. Optionally, it can be configured to be started +daemon must already be running. +Optionally, it can be configured to be started on-demand by -.Xr Launchd 8 +.Xr launchd 8 (Mac OS X only). The .Nm ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#15 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#16 $ .\" -.Dd October 2, 2006 +.Dd December 11, 2008 .Dt AUDITD 8 .Os .Sh NAME @@ -57,7 +57,8 @@ .Xr launchd 8 . .El .Pp -Optionally, the audit review group "audit" may be created. Non-privileged +Optionally, the audit review group "audit" may be created. +Non-privileged users that are members of this group may read the audit trail log files. .Sh NOTE To assure uninterrupted audit support, the @@ -82,9 +83,10 @@ .Nm uses the .Xr asl 3 -API for writing system log messages. Therefore, only the audit administrator +API for writing system log messages. +Therefore, only the audit administrator and members of the audit review group will be able to read the -system log enties. +system log entries. .Sh FILES .Bl -tag -width ".Pa /etc/security" -compact .It Pa /var/audit From owner-p4-projects@FreeBSD.ORG Thu Dec 11 19:45:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A3411065676; Thu, 11 Dec 2008 19:45:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2AF3106564A for ; Thu, 11 Dec 2008 19:45:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D404A8FC16 for ; Thu, 11 Dec 2008 19:45:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBJjuWs071496 for ; Thu, 11 Dec 2008 19:45:56 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBBJju4R071494 for perforce@freebsd.org; Thu, 11 Dec 2008 19:45:56 GMT (envelope-from rene@FreeBSD.org) Date: Thu, 11 Dec 2008 19:45:56 GMT Message-Id: <200812111945.mBBJju4R071494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 154510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 19:45:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=154510 Change 154510 by rene@rene_self on 2008/12/11 19:45:40 Remove mention of the free CD/DVD subscription for committers. Reviewed by: manolis on doc@ Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#7 (text+ko) ==== @@ -3309,20 +3309,6 @@ a busy machine. - - - A Free 4-CD Set or DVD Subscription - - - FreeBSD Mall, - Inc. offers a free subscription of the 4-CD set or - the DVD product to all FreeBSD committers. Information about how - to obtain your free media is mailed to - developers@FreeBSD.org following each major - release. - - - From owner-p4-projects@FreeBSD.ORG Thu Dec 11 20:27:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 312D41065678; Thu, 11 Dec 2008 20:27:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E790C1065676 for ; Thu, 11 Dec 2008 20:27:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D5A8B8FC18 for ; Thu, 11 Dec 2008 20:27:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBKRd7L078620 for ; Thu, 11 Dec 2008 20:27:39 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBBKRdIo078614 for perforce@freebsd.org; Thu, 11 Dec 2008 20:27:39 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Dec 2008 20:27:39 GMT Message-Id: <200812112027.mBBKRdIo078614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 154513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 20:27:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=154513 Change 154513 by jhb@jhb_mutex on 2008/12/11 20:26:40 IFC @154512 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#37 integrate .. //depot/projects/smpng/sys/amd64/include/apicreg.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#19 integrate .. //depot/projects/smpng/sys/boot/zfs/zfs.c#3 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#50 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#50 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#50 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#50 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#54 integrate .. //depot/projects/smpng/sys/conf/files#224 integrate .. //depot/projects/smpng/sys/conf/options#157 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_subr.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#67 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#59 integrate .. //depot/projects/smpng/sys/i386/include/apicreg.h#5 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#30 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#96 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_vimage.c#1 branch .. //depot/projects/smpng/sys/kern/subr_prf.c#54 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#118 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#83 integrate .. //depot/projects/smpng/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/smpng/sys/modules/aio/Makefile#3 integrate .. //depot/projects/smpng/sys/net/if.c#108 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#53 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#93 integrate .. //depot/projects/smpng/sys/net/if_gif.c#47 integrate .. //depot/projects/smpng/sys/net/if_gif.h#16 integrate .. //depot/projects/smpng/sys/net/raw_cb.h#8 integrate .. //depot/projects/smpng/sys/net/vnet.h#3 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#35 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#62 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#32 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#33 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#6 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#57 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#29 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#61 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#51 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#43 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#99 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_nat.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip_fw_pfil.c#22 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#92 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#99 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#38 integrate .. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#9 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#73 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#18 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#24 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#28 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#104 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#63 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#86 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#10 integrate .. //depot/projects/smpng/sys/netinet/vinet.h#3 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#27 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#19 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#55 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#25 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#47 integrate .. //depot/projects/smpng/sys/netinet6/nd6.h#14 integrate .. //depot/projects/smpng/sys/netinet6/tcp6_var.h#6 integrate .. //depot/projects/smpng/sys/netinet6/vinet6.h#3 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#29 integrate .. //depot/projects/smpng/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#31 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#47 integrate .. //depot/projects/smpng/sys/sys/kernel.h#42 integrate .. //depot/projects/smpng/sys/sys/resource.h#19 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#52 integrate .. //depot/projects/smpng/sys/sys/vimage.h#4 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#37 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.49 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.50 2008/12/11 15:56:30 jhb Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -299,6 +299,7 @@ /* Program LINT[01] LVT entries. */ lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0); lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1); + #ifdef HWPMC_HOOKS /* Program the PMC LVT entry if present. */ if (maxlvt >= LVT_PMC) @@ -644,6 +645,18 @@ lapic->eoi = 0; } +/* + * Read the contents of the error status register. We have to write + * to the register first before reading from it. + */ +u_int +lapic_error(void) +{ + + lapic->esr = 0; + return (lapic->esr); +} + void lapic_handle_intr(int vector, struct trapframe *frame) { ==== //depot/projects/smpng/sys/amd64/include/apicreg.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.28 2005/01/21 06:01:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/apicreg.h,v 1.29 2008/12/11 15:56:30 jhb Exp $ */ #ifndef _MACHINE_APICREG_H_ @@ -260,6 +260,14 @@ # define APIC_TPR_INT 0x000000f0 # define APIC_TPR_SUB 0x0000000f +/* fields in ESR */ +#define APIC_ESR_SEND_CS_ERROR 0x00000001 +#define APIC_ESR_RECEIVE_CS_ERROR 0x00000002 +#define APIC_ESR_SEND_ACCEPT 0x00000004 +#define APIC_ESR_RECEIVE_ACCEPT 0x00000008 +#define APIC_ESR_SEND_ILLEGAL_VECTOR 0x00000020 +#define APIC_ESR_RECEIVE_ILLEGAL_VECTOR 0x00000040 +#define APIC_ESR_ILLEGAL_REGISTER 0x00000080 /* fields in ICR_LOW */ #define APIC_VECTOR_MASK 0x000000ff ==== //depot/projects/smpng/sys/amd64/include/apicvar.h#19 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.25 2007/05/08 22:01:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.26 2008/12/11 15:56:30 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -200,6 +200,7 @@ void lapic_disable(void); void lapic_dump(const char *str); void lapic_eoi(void); +u_int lapic_error(void); int lapic_id(void); void lapic_init(vm_paddr_t addr); int lapic_intr_pending(u_int vector); ==== //depot/projects/smpng/sys/boot/zfs/zfs.c#3 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.2 2008/11/19 16:39:01 dfr Exp $ + * $FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.2 2008/11/19 16:39:01 dfr Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfs.c,v 1.4 2008/12/11 16:48:35 ps Exp $"); /* * Stand-alone file reading package. @@ -474,7 +474,6 @@ * the pool. */ unit = dev->d_unit; - free(dev); i = 0; STAILQ_FOREACH(spa, &zfs_pools, spa_link) { @@ -487,6 +486,7 @@ } f->f_devdata = spa; + free(dev); return (0); } ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#50 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.97 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.98 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -215,6 +215,18 @@ char rqtp_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * rqtp; char rqtp_r_[PADR_(const struct timespec32 *)]; char rmtp_l_[PADL_(struct timespec32 *)]; struct timespec32 * rmtp; char rmtp_r_[PADR_(struct timespec32 *)]; }; +struct freebsd32_aio_read_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_write_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_lio_listio_args { + char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char acb_list_l_[PADL_(struct aiocb32 *const *)]; struct aiocb32 *const * acb_list; char acb_list_r_[PADR_(struct aiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char sig_l_[PADL_(struct sigevent *)]; struct sigevent * sig; char sig_r_[PADR_(struct sigevent *)]; +}; struct freebsd32_lutimes_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)]; @@ -235,6 +247,33 @@ char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; char stat_l_[PADL_(struct module_stat32 *)]; struct module_stat32 * stat; char stat_r_[PADR_(struct module_stat32 *)]; }; +struct freebsd32_aio_return_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_suspend_args { + char aiocbp_l_[PADL_(struct aiocb32 *const *)]; struct aiocb32 *const * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)]; +}; +struct freebsd32_aio_cancel_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_aio_error_args { + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; +struct freebsd32_oaio_read_args { + char aiocbp_l_[PADL_(struct oaiocb32 *)]; struct oaiocb32 * aiocbp; char aiocbp_r_[PADR_(struct oaiocb32 *)]; +}; +struct freebsd32_oaio_write_args { + char aiocbp_l_[PADL_(struct oaiocb32 *)]; struct oaiocb32 * aiocbp; char aiocbp_r_[PADR_(struct oaiocb32 *)]; +}; +struct freebsd32_olio_listio_args { + char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char acb_list_l_[PADL_(struct oaiocb32 *const *)]; struct oaiocb32 *const * acb_list; char acb_list_r_[PADR_(struct oaiocb32 *const *)]; + char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; + char sig_l_[PADL_(struct osigevent32 *)]; struct osigevent32 * sig; char sig_r_[PADR_(struct osigevent32 *)]; +}; struct freebsd32_jail_args { char jail_l_[PADL_(struct jail32 *)]; struct jail32 * jail; char jail_r_[PADR_(struct jail32 *)]; }; @@ -247,6 +286,10 @@ char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)]; char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)]; }; +struct freebsd32_aio_waitcomplete_args { + char aiocbp_l_[PADL_(struct aiocb32 **)]; struct aiocb32 ** aiocbp; char aiocbp_r_[PADR_(struct aiocb32 **)]; + char timeout_l_[PADL_(struct timespec32 *)]; struct timespec32 * timeout; char timeout_r_[PADR_(struct timespec32 *)]; +}; struct freebsd32_kevent_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char changelist_l_[PADL_(const struct kevent32 *)]; const struct kevent32 * changelist; char changelist_r_[PADR_(const struct kevent32 *)]; @@ -308,6 +351,10 @@ char param_l_[PADL_(struct thr_param32 *)]; struct thr_param32 * param; char param_r_[PADR_(struct thr_param32 *)]; char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)]; }; +struct freebsd32_aio_fsync_args { + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char aiocbp_r_[PADR_(struct aiocb32 *)]; +}; struct freebsd32_pread_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; @@ -427,13 +474,24 @@ int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *); int freebsd32_clock_getres(struct thread *, struct freebsd32_clock_getres_args *); int freebsd32_nanosleep(struct thread *, struct freebsd32_nanosleep_args *); +int freebsd32_aio_read(struct thread *, struct freebsd32_aio_read_args *); +int freebsd32_aio_write(struct thread *, struct freebsd32_aio_write_args *); +int freebsd32_lio_listio(struct thread *, struct freebsd32_lio_listio_args *); int freebsd32_lutimes(struct thread *, struct freebsd32_lutimes_args *); int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *); int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *); int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *); +int freebsd32_aio_return(struct thread *, struct freebsd32_aio_return_args *); +int freebsd32_aio_suspend(struct thread *, struct freebsd32_aio_suspend_args *); +int freebsd32_aio_cancel(struct thread *, struct freebsd32_aio_cancel_args *); +int freebsd32_aio_error(struct thread *, struct freebsd32_aio_error_args *); +int freebsd32_oaio_read(struct thread *, struct freebsd32_oaio_read_args *); +int freebsd32_oaio_write(struct thread *, struct freebsd32_oaio_write_args *); +int freebsd32_olio_listio(struct thread *, struct freebsd32_olio_listio_args *); int freebsd32_jail(struct thread *, struct freebsd32_jail_args *); int freebsd32_sigtimedwait(struct thread *, struct freebsd32_sigtimedwait_args *); int freebsd32_sigwaitinfo(struct thread *, struct freebsd32_sigwaitinfo_args *); +int freebsd32_aio_waitcomplete(struct thread *, struct freebsd32_aio_waitcomplete_args *); int freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *); int freebsd32_nmount(struct thread *, struct freebsd32_nmount_args *); int freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *); @@ -447,6 +505,7 @@ int freebsd32_thr_suspend(struct thread *, struct freebsd32_thr_suspend_args *); int freebsd32_umtx_op(struct thread *, struct freebsd32_umtx_op_args *); int freebsd32_thr_new(struct thread *, struct freebsd32_thr_new_args *); +int freebsd32_aio_fsync(struct thread *, struct freebsd32_aio_fsync_args *); int freebsd32_pread(struct thread *, struct freebsd32_pread_args *); int freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *); int freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *); @@ -641,13 +700,24 @@ #define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME #define FREEBSD32_SYS_AUE_freebsd32_clock_getres AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_nanosleep AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES #define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV #define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV #define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_return AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_suspend AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_cancel AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_error AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_oaio_read AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_oaio_write AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_olio_listio AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_jail AUE_JAIL #define FREEBSD32_SYS_AUE_freebsd32_sigtimedwait AUE_SIGWAIT #define FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_waitcomplete AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_nmount AUE_NMOUNT #define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE @@ -661,6 +731,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_umtx_op AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_thr_new AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_aio_fsync AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD #define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE #define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_signal.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_signal.h,v 1.1 2006/10/05 01:58:08 davidxu Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_signal.h,v 1.2 2008/12/11 00:58:05 bz Exp $ */ #ifndef _COMPAT_FREEBSD32_SIGNAL_H_ @@ -36,6 +36,9 @@ }; union sigval32 { + int sival_int; + u_int32_t sival_ptr; + /* 6.0 compatibility */ int sigval_int; u_int32_t sigval_ptr; }; @@ -70,6 +73,29 @@ } _reason; }; +struct osigevent32 { + int sigev_notify; /* Notification type */ + union { + int __sigev_signo; /* Signal number */ + int __sigev_notify_kqueue; + } __sigev_u; + union sigval32 sigev_value; /* Signal value */ +}; + +struct sigevent32 { + int sigev_notify; /* Notification type */ + int sigev_signo; /* Signal number */ + union sigval32 sigev_value; /* Signal value */ + union { + __lwpid_t _threadid; + struct { + uint32_t _function; + uint32_t _attribute; + } _sigev_thread; + uint32_t __spare__[8]; + } _sigev_un; +}; + void siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst); #endif /* !_COMPAT_FREEBSD32_SIGNAL_H_ */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#50 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.96 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.97 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -210,6 +210,9 @@ #define FREEBSD32_SYS_openbsd_poll 252 #define FREEBSD32_SYS_issetugid 253 #define FREEBSD32_SYS_lchown 254 +#define FREEBSD32_SYS_freebsd32_aio_read 255 +#define FREEBSD32_SYS_freebsd32_aio_write 256 +#define FREEBSD32_SYS_freebsd32_lio_listio 257 #define FREEBSD32_SYS_getdents 272 #define FREEBSD32_SYS_lchmod 274 #define FREEBSD32_SYS_netbsd_lchown 275 @@ -237,6 +240,13 @@ #define FREEBSD32_SYS_setresuid 311 #define FREEBSD32_SYS_setresgid 312 /* 313 is obsolete signanosleep */ +#define FREEBSD32_SYS_freebsd32_aio_return 314 +#define FREEBSD32_SYS_freebsd32_aio_suspend 315 +#define FREEBSD32_SYS_freebsd32_aio_cancel 316 +#define FREEBSD32_SYS_freebsd32_aio_error 317 +#define FREEBSD32_SYS_freebsd32_oaio_read 318 +#define FREEBSD32_SYS_freebsd32_oaio_write 319 +#define FREEBSD32_SYS_freebsd32_olio_listio 320 #define FREEBSD32_SYS_yield 321 /* 322 is obsolete thr_sleep */ /* 323 is obsolete thr_wakeup */ @@ -274,6 +284,7 @@ #define FREEBSD32_SYS_extattr_set_file 356 #define FREEBSD32_SYS_extattr_get_file 357 #define FREEBSD32_SYS_extattr_delete_file 358 +#define FREEBSD32_SYS_freebsd32_aio_waitcomplete 359 #define FREEBSD32_SYS_getresuid 360 #define FREEBSD32_SYS_getresgid 361 #define FREEBSD32_SYS_kqueue 362 @@ -321,6 +332,7 @@ #define FREEBSD32_SYS_sigqueue 456 #define FREEBSD32_SYS_abort2 463 #define FREEBSD32_SYS_thr_set_name 464 +#define FREEBSD32_SYS_freebsd32_aio_fsync 465 #define FREEBSD32_SYS_rtprio_thread 466 #define FREEBSD32_SYS_sctp_peeloff 471 #define FREEBSD32_SYS_sctp_generic_sendmsg 472 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#50 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.87 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.88 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ const char *freebsd32_syscallnames[] = { @@ -262,9 +262,9 @@ "openbsd_poll", /* 252 = openbsd_poll */ "issetugid", /* 253 = issetugid */ "lchown", /* 254 = lchown */ - "#255", /* 255 = nosys */ - "#256", /* 256 = nosys */ - "#257", /* 257 = nosys */ + "freebsd32_aio_read", /* 255 = freebsd32_aio_read */ + "freebsd32_aio_write", /* 256 = freebsd32_aio_write */ + "freebsd32_lio_listio", /* 257 = freebsd32_lio_listio */ "#258", /* 258 = nosys */ "#259", /* 259 = nosys */ "#260", /* 260 = nosys */ @@ -321,13 +321,13 @@ "setresuid", /* 311 = setresuid */ "setresgid", /* 312 = setresgid */ "obs_signanosleep", /* 313 = obsolete signanosleep */ - "#314", /* 314 = aio_return */ - "#315", /* 315 = aio_suspend */ - "#316", /* 316 = aio_cancel */ - "#317", /* 317 = aio_error */ - "#318", /* 318 = aio_read */ - "#319", /* 319 = aio_write */ - "#320", /* 320 = lio_listio */ + "freebsd32_aio_return", /* 314 = freebsd32_aio_return */ + "freebsd32_aio_suspend", /* 315 = freebsd32_aio_suspend */ + "freebsd32_aio_cancel", /* 316 = freebsd32_aio_cancel */ + "freebsd32_aio_error", /* 317 = freebsd32_aio_error */ + "freebsd32_oaio_read", /* 318 = freebsd32_oaio_read */ + "freebsd32_oaio_write", /* 319 = freebsd32_oaio_write */ + "freebsd32_olio_listio", /* 320 = freebsd32_olio_listio */ "yield", /* 321 = yield */ "obs_thr_sleep", /* 322 = obsolete thr_sleep */ "obs_thr_wakeup", /* 323 = obsolete thr_wakeup */ @@ -366,7 +366,7 @@ "extattr_set_file", /* 356 = extattr_set_file */ "extattr_get_file", /* 357 = extattr_get_file */ "extattr_delete_file", /* 358 = extattr_delete_file */ - "#359", /* 359 = aio_waitcomplete */ + "freebsd32_aio_waitcomplete", /* 359 = freebsd32_aio_waitcomplete */ "getresuid", /* 360 = getresuid */ "getresgid", /* 361 = getresgid */ "kqueue", /* 362 = kqueue */ @@ -472,7 +472,7 @@ "#462", /* 462 = kmq_unlink */ "abort2", /* 463 = abort2 */ "thr_set_name", /* 464 = thr_set_name */ - "#465", /* 465 = aio_fsync */ + "freebsd32_aio_fsync", /* 465 = freebsd32_aio_fsync */ "rtprio_thread", /* 466 = rtprio_thread */ "#467", /* 467 = nosys */ "#468", /* 468 = nosys */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#50 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.97 2008/11/29 14:34:30 bz Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185435 2008-11-29 14:32:14Z bz + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.98 2008/12/10 20:57:16 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 185878 2008-12-10 20:56:19Z jhb */ #include "opt_compat.h" @@ -293,9 +293,9 @@ { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0 }, /* 252 = openbsd_poll */ { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0 }, /* 253 = issetugid */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 254 = lchown */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 255 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 256 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 257 = nosys */ + { AS(freebsd32_aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 255 = freebsd32_aio_read */ + { AS(freebsd32_aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 256 = freebsd32_aio_write */ + { AS(freebsd32_lio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 257 = freebsd32_lio_listio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 258 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 259 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 260 = nosys */ @@ -352,13 +352,13 @@ { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 311 = setresuid */ { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 313 = obsolete signanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 314 = aio_return */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 315 = aio_suspend */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 316 = aio_cancel */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 317 = aio_error */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 318 = aio_read */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 319 = aio_write */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 320 = lio_listio */ + { AS(freebsd32_aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 314 = freebsd32_aio_return */ + { AS(freebsd32_aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 315 = freebsd32_aio_suspend */ + { AS(freebsd32_aio_cancel_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 316 = freebsd32_aio_cancel */ + { AS(freebsd32_aio_error_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 317 = freebsd32_aio_error */ + { AS(freebsd32_oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 318 = freebsd32_oaio_read */ + { AS(freebsd32_oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 319 = freebsd32_oaio_write */ + { AS(freebsd32_olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 320 = freebsd32_olio_listio */ { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0 }, /* 321 = yield */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 322 = obsolete thr_sleep */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */ @@ -397,7 +397,7 @@ { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */ { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */ { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */ + { AS(freebsd32_aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 359 = freebsd32_aio_waitcomplete */ { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */ { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */ { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */ @@ -503,7 +503,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 462 = kmq_unlink */ { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0 }, /* 463 = abort2 */ { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0 }, /* 464 = thr_set_name */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 465 = aio_fsync */ + { AS(freebsd32_aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 465 = freebsd32_aio_fsync */ { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0 }, /* 466 = rtprio_thread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = nosys */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#54 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.112 2008/11/29 14:32:14 bz Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.113 2008/12/10 20:56:19 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -454,9 +454,13 @@ u_int nfds, int timeout); } 253 AUE_ISSETUGID NOPROTO { int issetugid(void); } 254 AUE_LCHOWN NOPROTO { int lchown(char *path, int uid, int gid); } -255 AUE_NULL UNIMPL nosys -256 AUE_NULL UNIMPL nosys -257 AUE_NULL UNIMPL nosys +255 AUE_NULL NOSTD { int freebsd32_aio_read( \ + struct aiocb32 *aiocbp); } +256 AUE_NULL NOSTD { int freebsd32_aio_write( \ + struct aiocb32 *aiocbp); } +257 AUE_NULL NOSTD { int freebsd32_lio_listio(int mode, \ + struct aiocb32 * const *acb_list, \ + int nent, struct sigevent *sig); } 258 AUE_NULL UNIMPL nosys 259 AUE_NULL UNIMPL nosys 260 AUE_NULL UNIMPL nosys @@ -535,13 +539,22 @@ 312 AUE_SETRESGID NOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } 313 AUE_NULL OBSOL signanosleep -314 AUE_NULL UNIMPL aio_return -315 AUE_NULL UNIMPL aio_suspend -316 AUE_NULL UNIMPL aio_cancel -317 AUE_NULL UNIMPL aio_error -318 AUE_NULL UNIMPL aio_read -319 AUE_NULL UNIMPL aio_write -320 AUE_NULL UNIMPL lio_listio +314 AUE_NULL NOSTD { int freebsd32_aio_return( \ + struct aiocb32 *aiocbp); } +315 AUE_NULL NOSTD { int freebsd32_aio_suspend( \ + struct aiocb32 * const * aiocbp, int nent, \ + const struct timespec32 *timeout); } +316 AUE_NULL NOSTD { int freebsd32_aio_cancel(int fd, \ + struct aiocb32 *aiocbp); } +317 AUE_NULL NOSTD { int freebsd32_aio_error( \ + struct aiocb32 *aiocbp); } +318 AUE_NULL NOSTD { int freebsd32_oaio_read( \ + struct oaiocb32 *aiocbp); } +319 AUE_NULL NOSTD { int freebsd32_oaio_write( \ + struct oaiocb32 *aiocbp); } +320 AUE_NULL NOSTD { int freebsd32_olio_listio(int mode, \ + struct oaiocb32 * const *acb_list, \ + int nent, struct osigevent32 *sig); } 321 AUE_NULL NOPROTO { int yield(void); } 322 AUE_NULL OBSOL thr_sleep 323 AUE_NULL OBSOL thr_wakeup @@ -618,7 +631,9 @@ 358 AUE_EXTATTR_DELETE_FILE NOPROTO { int extattr_delete_file( \ const char *path, int attrnamespace, \ const char *attrname); } -359 AUE_NULL UNIMPL aio_waitcomplete +359 AUE_NULL NOSTD { int freebsd32_aio_waitcomplete( \ + struct aiocb32 **aiocbp, \ + struct timespec32 *timeout); } 360 AUE_GETRESUID NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } 361 AUE_GETRESGID NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ @@ -766,7 +781,8 @@ 462 AUE_NULL UNIMPL kmq_unlink 463 AUE_NULL NOPROTO { int abort2(const char *why, int nargs, void **args); } 464 AUE_NULL NOPROTO { int thr_set_name(long id, const char *name); } -465 AUE_NULL UNIMPL aio_fsync +465 AUE_NULL NOSTD { int freebsd32_aio_fsync(int op, \ + struct aiocb32 *aiocbp); } 466 AUE_RTPRIO NOPROTO { int rtprio_thread(int function, \ lwpid_t lwpid, struct rtprio *rtp); } 467 AUE_NULL UNIMPL nosys ==== //depot/projects/smpng/sys/conf/files#224 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1354 2008/12/04 07:59:05 kmacy Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1355 2008/12/10 23:12:39 zec Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1953,6 +1953,7 @@ kern/kern_umtx.c standard kern/kern_uuid.c standard kern/kern_xxx.c standard +kern/kern_vimage.c standard kern/link_elf.c standard kern/linker_if.m standard kern/md4c.c optional netsmb ==== //depot/projects/smpng/sys/conf/options#157 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.649 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/options,v 1.651 2008/12/11 16:13:17 bz Exp $ # # On the handling of kernel options # @@ -785,3 +785,4 @@ # Virtualize the network stack VIMAGE opt_global.h +VIMAGE_GLOBALS opt_global.h ==== //depot/projects/smpng/sys/contrib/pf/net/pf_subr.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ #include "opt_inet6.h" #include -__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.7 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.8 2008/12/10 23:12:39 zec Exp $"); #include #include @@ -124,15 +124,14 @@ u_int32_t pf_new_isn(struct pf_state *s) { - INIT_VNET_INET(curvnet); u_int32_t md5_buffer[4]; u_int32_t new_isn; struct pf_state_host *src, *dst; /* Seed if this is the first use, reseed if requested. */ - if (V_isn_last_reseed == 0) { - read_random(&V_isn_secret, sizeof(V_isn_secret)); - V_isn_last_reseed = ticks; + if (isn_last_reseed == 0) { + read_random(&isn_secret, sizeof(isn_secret)); + isn_last_reseed = ticks; } if (s->direction == PF_IN) { @@ -144,28 +143,28 @@ } /* Compute the md5 hash and return the ISN. */ - MD5Init(&V_isn_ctx); - MD5Update(&V_isn_ctx, (u_char *) &dst->port, sizeof(u_short)); - MD5Update(&V_isn_ctx, (u_char *) &src->port, sizeof(u_short)); + MD5Init(&isn_ctx); + MD5Update(&isn_ctx, (u_char *) &dst->port, sizeof(u_short)); + MD5Update(&isn_ctx, (u_char *) &src->port, sizeof(u_short)); #ifdef INET6 if (s->af == AF_INET6) { - MD5Update(&V_isn_ctx, (u_char *) &dst->addr, + MD5Update(&isn_ctx, (u_char *) &dst->addr, sizeof(struct in6_addr)); - MD5Update(&V_isn_ctx, (u_char *) &src->addr, + MD5Update(&isn_ctx, (u_char *) &src->addr, sizeof(struct in6_addr)); } else #endif { - MD5Update(&V_isn_ctx, (u_char *) &dst->addr, + MD5Update(&isn_ctx, (u_char *) &dst->addr, sizeof(struct in_addr)); - MD5Update(&V_isn_ctx, (u_char *) &src->addr, + MD5Update(&isn_ctx, (u_char *) &src->addr, sizeof(struct in_addr)); } - MD5Update(&V_isn_ctx, (u_char *) &V_isn_secret, sizeof(V_isn_secret)); - MD5Final((u_char *) &md5_buffer, &V_isn_ctx); + MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret)); + MD5Final((u_char *) &md5_buffer, &isn_ctx); new_isn = (tcp_seq) md5_buffer[0]; - V_isn_offset += ISN_STATIC_INCREMENT + + isn_offset += ISN_STATIC_INCREMENT + (arc4random() & ISN_RANDOM_INCREMENT); - new_isn += V_isn_offset; + new_isn += isn_offset; return (new_isn); } ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ah_eeprom_v14.c,v 1.4 2008/11/10 19:04:26 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ah_eeprom_v14.c,v 1.2 2008/12/11 04:03:13 sam Exp $ */ #include "opt_ah.h" @@ -54,6 +54,7 @@ __func__, ath_hal_ether_sprintf(macaddr)); return HAL_EEBADMAC; } + return HAL_OK; case AR_EEP_REGDMN_0: return pBase->regDmn[0]; case AR_EEP_REGDMN_1: ==== //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5212_misc.c,v 1.12 2008/11/27 22:30:00 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c,v 1.2 2008/12/11 04:03:50 sam Exp $ */ #include "opt_ah.h" @@ -803,6 +803,7 @@ return (ahp->ah_staId1Defaults & AR_STA_ID1_CRPT_MIC_ENABLE) ? HAL_OK : HAL_ENXIO; } + return HAL_EINVAL; case HAL_CAP_TKIP_SPLIT: /* hardware TKIP uses split keys */ switch (capability) { case 0: /* hardware capability */ ==== //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#18 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.31 2008/12/07 18:32:09 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.32 2008/12/11 06:27:18 imp Exp $"); #include #include @@ -682,40 +682,67 @@ return (0); } -#define DELTA (CBB_SOCKET_MASK_CD) static int cbb_pci_filt(void *arg) { struct cbb_softc *sc = arg; uint32_t sockevent; + uint8_t csc; int retval = FILTER_STRAY; /* - * Read the socket event. Sometimes, the theory goes, the PCI - * bus is so loaded that it cannot satisfy the read request, so - * we get garbage back from the following read. We have to filter - * out the garbage so that we don't spontaneously reset the card - * under high load. PCI isn't supposed to act like this. No doubt - * this is a bug in the PCI bridge chipset (or cbb brige) that's being - * used in certain amd64 laptops today. Work around the issue by - * assuming that any bits we don't know about being set means that - * we got garbage. + * Some chips also require us to read the old ExCA registe for card + * status change when we route CSC vis PCI. This isn't supposed to be + * required, but it clears the interrupt state on some chipsets. + * Maybe there's a setting that would obviate its need. Maybe we + * should test the status bits and deal with them, but so far we've + * not found any machines that don't also give us the socket status + * indication above. + * + * This call used to be unconditional. However, further research + * suggests that we hit this condition when the card READY interrupt + * fired. So now we only read it for 16-bit cards, and we only claim + * the interrupt if READY is set. If this still causes problems, then + * the next step would be to read this if we have a 16-bit card *OR* + * we have no card. We treat the READY signal as if it were the power + * completion signal. Some bridges may double signal things here, bit + * signalling twice should be OK since we only sleep on the powerintr + * in one place and a double wakeup would be benign there. + */ + if (sc->flags & CBB_16BIT_CARD) { + csc = exca_getb(&sc->exca[0], EXCA_CSC); + if (csc & EXCA_CSC_READY) { + atomic_add_int(&sc->powerintr, 1); + wakeup((void *)&sc->powerintr); + retval = FILTER_HANDLED; + } + } + + /* + * Read the socket event. Sometimes, the theory goes, the PCI bus is + * so loaded that it cannot satisfy the read request, so we get + * garbage back from the following read. We have to filter out the + * garbage so that we don't spontaneously reset the card under high + * load. PCI isn't supposed to act like this. No doubt this is a bug + * in the PCI bridge chipset (or cbb brige) that's being used in + * certain amd64 laptops today. Work around the issue by assuming + * that any bits we don't know about being set means that we got + * garbage. */ sockevent = cbb_get(sc, CBB_SOCKET_EVENT); if (sockevent != 0 && (sockevent & ~CBB_SOCKET_EVENT_VALID_MASK) == 0) { /* - * If anything has happened to the socket, we assume that - * the card is no longer OK, and we shouldn't call its - * ISR. We set cardok as soon as we've attached the - * card. This helps in a noisy eject, which happens - * all too often when users are ejecting their PC Cards. + * If anything has happened to the socket, we assume that the + * card is no longer OK, and we shouldn't call its ISR. We + * set cardok as soon as we've attached the card. This helps + * in a noisy eject, which happens all too often when users + * are ejecting their PC Cards. * - * We use this method in preference to checking to see if - * the card is still there because the check suffers from - * a race condition in the bouncing case. Prior versions - * of the pccard software used a similar trick and achieved - * excellent results. + * We use this method in preference to checking to see if the + * card is still there because the check suffers from a race + * condition in the bouncing case. */ +#define DELTA (CBB_SOCKET_MASK_CD) if (sockevent & DELTA) { cbb_clrb(sc, CBB_SOCKET_MASK, DELTA); cbb_set(sc, CBB_SOCKET_EVENT, DELTA); @@ -723,9 +750,11 @@ cbb_disable_func_intr(sc); wakeup(&sc->intrhand); } +#undef DELTA + /* - * If we get a power interrupt, wakeup anybody that might - * be waiting for one. + * Wakeup anybody waiting for a power interrupt. We have to + * use atomic_add_int for wakups on other cores. */ if (sockevent & CBB_SOCKET_EVENT_POWER) { cbb_clrb(sc, CBB_SOCKET_MASK, CBB_SOCKET_EVENT_POWER); @@ -733,21 +762,15 @@ atomic_add_int(&sc->powerintr, 1); wakeup((void *)&sc->powerintr); } + + /* + * Status change interrupts aren't presently used in the + * rest of the driver. For now, just ACK them. + */ + if (sockevent & CBB_SOCKET_EVENT_CSTS) + cbb_set(sc, CBB_SOCKET_EVENT, CBB_SOCKET_EVENT_CSTS); retval = FILTER_HANDLED; } - /* - * Some chips also require us to read the old ExCA registe for - * card status change when we route CSC vis PCI. This isn't supposed - * to be required, but it clears the interrupt state on some chipsets. - * Maybe there's a setting that would obviate its need. Maybe we - * should test the status bits and deal with them, but so far we've - * not found any machines that don't also give us the socket status - * indication above. - * - * We have to call this unconditionally because some bridges deliver - * the event independent of the CBB_SOCKET_EVENT_CD above. - */ - exca_getb(&sc->exca[0], EXCA_CSC); return retval; } ==== //depot/projects/smpng/sys/dev/re/if_re.c#67 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.139 2008/12/08 02:48:41 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.144 2008/12/11 02:24:11 yongari Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -419,10 +419,10 @@ CSR_WRITE_4(sc, RL_PHYAR, reg << 16); for (i = 0; i < RL_TIMEOUT; i++) { - DELAY(30); rval = CSR_READ_4(sc, RL_PHYAR); if (rval & RL_PHYAR_BUSY) break; + DELAY(100); } if (i == RL_TIMEOUT) { @@ -446,10 +446,10 @@ (data & RL_PHYAR_PHYDATA) | RL_PHYAR_BUSY); for (i = 0; i < RL_TIMEOUT; i++) { - DELAY(30); rval = CSR_READ_4(sc, RL_PHYAR); if (!(rval & RL_PHYAR_BUSY)) break; + DELAY(100); } if (i == RL_TIMEOUT) { @@ -700,7 +700,12 @@ if (i == RL_TIMEOUT) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 11 20:52:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D6C5106567A; Thu, 11 Dec 2008 20:52:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C57FC1065670 for ; Thu, 11 Dec 2008 20:52:07 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B47E98FC18 for ; Thu, 11 Dec 2008 20:52:07 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBBKq7eV090292 for ; Thu, 11 Dec 2008 20:52:07 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBBKq79a090290 for perforce@freebsd.org; Thu, 11 Dec 2008 20:52:07 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 11 Dec 2008 20:52:07 GMT Message-Id: <200812112052.mBBKq79a090290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 154515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2008 20:52:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=154515 Change 154515 by sson@sson_amd64 on 2008/12/11 20:52:06 Changes to silence compile time warnings: - Added missing prototypes for au_bsm_to_errno(), au_errno_to_bsm(), and auditd_set_host(). - Made parse_object_type() static. - Added default case in switch for au_assemble(). Fixed mig problem with Mac OS X build using xcode. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#6 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 edit .. //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#38 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#33 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#9 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/Makefile.in#10 $ # VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -36,8 +36,8 @@ build_triplet = @build@ host_triplet = @host@ @HAVE_AUDIT_SYSCALLS_TRUE@am__append_1 = \ -@HAVE_AUDIT_SYSCALLS_TRUE@ auditd \ -@HAVE_AUDIT_SYSCALLS_TRUE@ audit +@HAVE_AUDIT_SYSCALLS_TRUE@ audit \ +@HAVE_AUDIT_SYSCALLS_TRUE@ auditd subdir = bin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -61,7 +61,7 @@ distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = auditfilterd auditreduce praudit auditd audit +DIST_SUBDIRS = auditfilterd auditreduce praudit audit auditd DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#5 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.am#6 $ # if USE_NATIVE_INCLUDES @@ -14,10 +14,10 @@ if USE_MACH_IPC audit_SOURCES = auditd_controlUser.c audit.c -CLEANFILES = auditd_controlUser.c auditd_controlUser.h +CLEANFILES = auditd_controlUser.c auditd_control.h -auditd_controlUser.c auditd_controlUser.h: $(top_srcdir)/bin/auditd/auditd_control.defs - $(MIG) -user auditd_controlUser.c -header auditd_controlUser.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs +auditd_controlUser.c auditd_control.h: $(top_srcdir)/bin/auditd/auditd_control.defs + $(MIG) -user auditd_controlUser.c -header auditd_control.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs else audit_SOURCES = audit.c endif ==== //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#10 $ +# $P4: //depot/projects/trustedbsd/openbsm/bin/audit/Makefile.in#11 $ # VPATH = @srcdir@ @@ -189,7 +189,7 @@ man8_MANS = audit.8 @USE_MACH_IPC_FALSE@audit_SOURCES = audit.c @USE_MACH_IPC_TRUE@audit_SOURCES = auditd_controlUser.c audit.c -@USE_MACH_IPC_TRUE@CLEANFILES = auditd_controlUser.c auditd_controlUser.h +@USE_MACH_IPC_TRUE@CLEANFILES = auditd_controlUser.c auditd_control.h all: all-am .SUFFIXES: @@ -521,8 +521,8 @@ uninstall-sbinPROGRAMS -@USE_MACH_IPC_TRUE@auditd_controlUser.c auditd_controlUser.h: $(top_srcdir)/bin/auditd/auditd_control.defs -@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_controlUser.c -header auditd_controlUser.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@auditd_controlUser.c auditd_control.h: $(top_srcdir)/bin/auditd/auditd_control.defs +@USE_MACH_IPC_TRUE@ $(MIG) -user auditd_controlUser.c -header auditd_control.h -server /dev/null -sheader /dev/null $(top_srcdir)/bin/auditd/auditd_control.defs # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#28 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#29 $ */ /* @@ -567,7 +567,7 @@ * The -o option has the form object_type=object_value. Identify the object * components. */ -void +static void parse_object_type(char *name, char *val) { if (val == NULL) ==== //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/auditd_lib.h#2 $ */ #ifndef _BSM_AUDITD_LIB_H_ @@ -93,6 +93,7 @@ int auditd_set_namask(void); int auditd_set_policy(void); int auditd_set_fsize(void); +int auditd_set_host(void); int auditd_swap_trail(char *TS, char **newfile, gid_t gid, int (*warn_getacdir)(char *)); int auditd_prevent_audit(void); ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#38 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#38 $ */ #ifndef _LIBBSM_H_ @@ -826,6 +826,8 @@ /* * Functions relating to BSM<->errno conversion. */ +int au_bsm_to_errno(u_char bsm_error, int *errorp); +u_char au_errno_to_bsm(int error); char *au_strerror(u_char bsm_error); /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#33 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#33 $ */ #include @@ -242,6 +242,8 @@ (IN6_IS_ADDR_UNSPECIFIED(aptr)) ? AUDIT_HEADER_SIZE : AUDIT_HEADER_EX_SIZE(&aia); break; + default: + return (-1); } tot_rec_size = rec->len + hdrsize + AUDIT_TRAILER_SIZE; /* From owner-p4-projects@FreeBSD.ORG Fri Dec 12 01:08:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA0B91065767; Fri, 12 Dec 2008 01:08:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AF231065746 for ; Fri, 12 Dec 2008 01:08:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A11578FC16 for ; Fri, 12 Dec 2008 01:08:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBC18YhK033121 for ; Fri, 12 Dec 2008 01:08:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBC18YOc033119 for perforce@freebsd.org; Fri, 12 Dec 2008 01:08:34 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Dec 2008 01:08:34 GMT Message-Id: <200812120108.mBC18YOc033119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2008 01:08:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=154535 Change 154535 by sam@sam_ebb on 2008/12/12 01:08:15 change module_t to struct module * to eliminate an include file dependency Affected files ... .. //depot/projects/vap/sys/dev/usb/usbdi.h#8 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/usbdi.h#8 (text+ko) ==== @@ -256,7 +256,8 @@ #define USBD_SHOW_DEVICE_CLASS 0x1 #define USBD_SHOW_INTERFACE_CLASS 0x2 -int usbd_driver_load(module_t mod, int what, void *arg); +struct module; +int usbd_driver_load(struct module *mod, int what, void *arg); static inline int usb_get_port(device_t dev) From owner-p4-projects@FreeBSD.ORG Fri Dec 12 01:09:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A71B1065673; Fri, 12 Dec 2008 01:09:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2E9E1065670 for ; Fri, 12 Dec 2008 01:09:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C9CBE8FC13 for ; Fri, 12 Dec 2008 01:09:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBC19Z4A033203 for ; Fri, 12 Dec 2008 01:09:35 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBC19ZSZ033201 for perforce@freebsd.org; Fri, 12 Dec 2008 01:09:35 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Dec 2008 01:09:35 GMT Message-Id: <200812120109.mBC19ZSZ033201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2008 01:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=154536 Change 154536 by sam@sam_ebb on 2008/12/12 01:08:52 add QTD status bit defs for %b Affected files ... .. //depot/projects/vap/sys/dev/usb/ehcireg.h#8 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/ehcireg.h#8 (text+ko) ==== @@ -288,6 +288,9 @@ } ehci_qtd_t; #define EHCI_QTD_ALIGN 32 +#define EHCI_QTD_STATUS_BITS \ + "\20\10ACTIVE\7HALTED\6BUFERR\5BABBLE\4XACTERR\3MISSED\2SPLIT\1PING" + /* Queue Head */ typedef struct { ehci_link_t qh_link; From owner-p4-projects@FreeBSD.ORG Fri Dec 12 23:26:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B24E1065678; Fri, 12 Dec 2008 23:26:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E8C5106564A for ; Fri, 12 Dec 2008 23:26:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DF898FC13 for ; Fri, 12 Dec 2008 23:26:33 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBCNQXk2024513 for ; Fri, 12 Dec 2008 23:26:33 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBCNQX6w024511 for perforce@freebsd.org; Fri, 12 Dec 2008 23:26:33 GMT (envelope-from sam@freebsd.org) Date: Fri, 12 Dec 2008 23:26:33 GMT Message-Id: <200812122326.mBCNQX6w024511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Dec 2008 23:26:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=154573 Change 154573 by sam@sam_ebb on 2008/12/12 23:25:40 Checkpoint cambria/ixp435 ehci support: add EHCI_SCFLG_BIGEDESC flag to force descriptor contents to be left in big-endian byte order intead of little-endian; this is required by the ixp435 builtin controllers. Operations now go through the controller and are returned but always w/ an error; still working on why. Part of this also adds ddb cmds for inspecting ehci data structures; this needs more work but is something that should be done for all usb components. Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp435_ehci.c#3 edit .. //depot/projects/vap/sys/conf/files#61 edit .. //depot/projects/vap/sys/dev/usb/ehci.c#17 edit .. //depot/projects/vap/sys/dev/usb/ehci_ddb.c#1 add .. //depot/projects/vap/sys/dev/usb/ehci_pci.c#13 edit .. //depot/projects/vap/sys/dev/usb/ehcivar.h#11 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp435_ehci.c#3 (text+ko) ==== @@ -228,6 +228,7 @@ sc->sc_flags |= EHCI_SCFLG_SETMODE | EHCI_SCFLG_NORESTERM | EHCI_SCFLG_FORCESPEED + | EHCI_SCFLG_BIGEDESC ; err = ehci_init(sc); if (!err) { ==== //depot/projects/vap/sys/conf/files#61 (text+ko) ==== @@ -1485,6 +1485,7 @@ # # USB support dev/usb/ehci.c optional ehci +dev/usb/ehci_ddb.c optional ehci dev/usb/ehci_pci.c optional ehci pci dev/usb/hid.c optional usb dev/usb/if_aue.c optional aue ==== //depot/projects/vap/sys/dev/usb/ehci.c#17 (text+ko) ==== @@ -99,7 +99,6 @@ SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW, &ehcidebug, 0, "ehci debug level"); -#define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) #else #define DPRINTF(x) #define DPRINTFN(n,x) @@ -221,34 +220,20 @@ static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *, int ival); -static void ehci_add_qh(ehci_soft_qh_t *, ehci_soft_qh_t *); +static void ehci_add_qh(ehci_softc_t *, ehci_soft_qh_t *, + ehci_soft_qh_t *); static void ehci_rem_qh(ehci_softc_t *, ehci_soft_qh_t *, ehci_soft_qh_t *); -static void ehci_activate_qh(ehci_soft_qh_t *, ehci_soft_qtd_t *); +static void ehci_activate_qh(ehci_softc_t *sc, ehci_soft_qh_t *, + ehci_soft_qtd_t *); static void ehci_sync_hc(ehci_softc_t *); static void ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *); static void ehci_abort_xfer(usbd_xfer_handle, usbd_status); -#ifdef EHCI_DEBUG -static void ehci_dump_regs(ehci_softc_t *); -void ehci_dump(void); -static ehci_softc_t *theehci; -static void ehci_dump_link(ehci_link_t, int); -static void ehci_dump_sqtds(ehci_soft_qtd_t *); -static void ehci_dump_sqtd(ehci_soft_qtd_t *); -static void ehci_dump_qtd(ehci_qtd_t *); -static void ehci_dump_sqh(ehci_soft_qh_t *); -#ifdef notyet -static void ehci_dump_sitd(struct ehci_soft_itd *); -static void ehci_dump_itd(struct ehci_soft_itd *); -#endif -#ifdef DIAGNOSTIC -static void ehci_dump_exfer(struct ehci_xfer *); -#endif -#endif +ehci_softc_t *theehci; -#define EHCI_NULL htole32(EHCI_LINK_TERMINATE) +#define EHCI_NULL(sc) htohc32(sc, EHCI_LINK_TERMINATE) #define EHCI_INTR_ENDPT 1 @@ -446,7 +431,7 @@ sc->sc_flist = KERNADDR(&sc->sc_fldma, 0); for (i = 0; i < sc->sc_flsize; i++) { - sc->sc_flist[i] = EHCI_NULL; + sc->sc_flist[i] = EHCI_NULL(sc); } EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0)); @@ -461,11 +446,6 @@ sc->sc_bus.methods = &ehci_bus_methods; sc->sc_bus.pipe_size = sizeof(struct ehci_pipe); -#if defined(__NetBSD__) || defined(__OpenBSD__) - sc->sc_powerhook = powerhook_establish(ehci_power, sc); - sc->sc_shutdownhook = shutdownhook_establish(ehci_shutdown, sc); -#endif - sc->sc_eintrs = EHCI_NORMAL_INTRS; /* @@ -487,27 +467,26 @@ sqh = sc->sc_islots[i].sqh; if (i == 0) { /* The last (1ms) QH terminates. */ - sqh->qh.qh_link = EHCI_NULL; + sqh->qh.qh_link = EHCI_NULL(sc); sqh->next = NULL; } else { /* Otherwise the next QH has half the poll interval */ sqh->next = sc->sc_islots[EHCI_IQHIDX(lev - 1, i + 1)].sqh; - sqh->qh.qh_link = htole32(sqh->next->physaddr | + sqh->qh.qh_link = htohc32(sc, sqh->next->physaddr | EHCI_LINK_QH); } - sqh->qh.qh_endp = htole32(EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH)); - sqh->qh.qh_endphub = htole32(EHCI_QH_SET_MULT(1)); - sqh->qh.qh_curqtd = EHCI_NULL; - sqh->qh.qh_qtd.qtd_next = EHCI_NULL; - sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL; - sqh->qh.qh_qtd.qtd_status = htole32(EHCI_QTD_HALTED); + sqh->qh.qh_endp = htohc32(sc, EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH)); + sqh->qh.qh_endphub = htohc32(sc, EHCI_QH_SET_MULT(1)); + sqh->qh.qh_curqtd = EHCI_NULL(sc); + sqh->qh.qh_qtd.qtd_next = EHCI_NULL(sc); + sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL(sc); + sqh->qh.qh_qtd.qtd_status = htohc32(sc, EHCI_QTD_HALTED); } /* Point the frame list at the last level (128ms). */ for (i = 0; i < sc->sc_flsize; i++) { - sc->sc_flist[i] = htole32(EHCI_LINK_QH | - sc->sc_islots[EHCI_IQHIDX(EHCI_IPOLLRATES - 1, - i)].sqh->physaddr); + sc->sc_flist[i] = htohc32(sc, EHCI_LINK_QH | + sc->sc_islots[EHCI_IQHIDX(EHCI_IPOLLRATES - 1, i)].sqh->physaddr); } /* Allocate dummy QH that starts the async list. */ @@ -518,19 +497,19 @@ } /* Fill the QH */ sqh->qh.qh_endp = - htole32(EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_HRECL); + htohc32(sc, EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_HRECL); sqh->qh.qh_link = - htole32(sqh->physaddr | EHCI_LINK_QH); - sqh->qh.qh_curqtd = EHCI_NULL; + htohc32(sc, sqh->physaddr | EHCI_LINK_QH); + sqh->qh.qh_curqtd = EHCI_NULL(sc); sqh->prev = sqh; /*It's a circular list.. */ sqh->next = sqh; /* Fill the overlay qTD */ - sqh->qh.qh_qtd.qtd_next = EHCI_NULL; - sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL; - sqh->qh.qh_qtd.qtd_status = htole32(0); + sqh->qh.qh_qtd.qtd_next = EHCI_NULL(sc); + sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL(sc); + sqh->qh.qh_qtd.qtd_status = htohc32(sc, 0); #ifdef EHCI_DEBUG if (ehcidebug) { - ehci_dump_sqh(sqh); + ehci_dump_sqh(sc, sqh); } #endif @@ -788,10 +767,10 @@ * is a an error somewhere in the middle, or whether there was a * short packet (SPD and not ACTIVE). */ - if (le32toh(lsqtd->qtd.qtd_status) & EHCI_QTD_ACTIVE) { + if (hc32toh(sc, lsqtd->qtd.qtd_status) & EHCI_QTD_ACTIVE) { DPRINTFN(12, ("ehci_check_intr: active ex=%p\n", ex)); for (sqtd = ex->sqtdstart; sqtd != lsqtd; sqtd=sqtd->nextqtd) { - status = le32toh(sqtd->qtd.qtd_status); + status = hc32toh(sc, sqtd->qtd.qtd_status); /* If there's an active QTD the xfer isn't done. */ if (status & EHCI_QTD_ACTIVE) break; @@ -836,7 +815,7 @@ * Step 1, check no active transfers in last itd, meaning we're finished */ for (i = 0; i < 8; i++) { - if (le32toh(itd->itd.itd_ctl[i]) & EHCI_ITD_ACTIVE) + if (hc32toh(sc, itd->itd.itd_ctl[i]) & EHCI_ITD_ACTIVE) break; } @@ -852,7 +831,7 @@ for (itd = ex->itdstart; itd != ex->itdend; itd = itd->xfer_next) { for (i = 0; i < 8; i++) { - if (le32toh(itd->itd.itd_ctl[i]) & (EHCI_ITD_BUF_ERR | + if (hc32toh(sc, itd->itd.itd_ctl[i]) & (EHCI_ITD_BUF_ERR | EHCI_ITD_BABBLE | EHCI_ITD_ERROR)) break; } @@ -876,6 +855,7 @@ { usbd_xfer_handle xfer = &ex->xfer; struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe; + ehci_softc_t *sc = (ehci_softc_t *)epipe->pipe.device->bus; ehci_soft_qtd_t *sqtd, *lsqtd; u_int32_t status = 0, nstatus = 0; ehci_physaddr_t nextphys, altnextphys; @@ -889,7 +869,7 @@ splx(s); #ifdef EHCI_DEBUG printf("ehci_idone: ex is done!\n "); - ehci_dump_exfer(ex); + ehci_dump_exfer(sc, ex); #else printf("ehci_idone: ex=%p is done!\n", ex); #endif @@ -909,7 +889,7 @@ #ifdef EHCI_DEBUG DPRINTFN(/*10*/2, ("ehci_idone: xfer=%p, pipe=%p ready\n", xfer, epipe)); if (ehcidebug > 10) - ehci_dump_sqtds(ex->sqtdstart); + ehci_dump_sqtds(sc, ex->sqtdstart); #endif /* @@ -917,14 +897,14 @@ * of the qTDs we are about to free. This is probably only * necessary if the transfer is marked as HALTED. */ - nextphys = EHCI_LINK_ADDR(le32toh(epipe->sqh->qh.qh_qtd.qtd_next)); + nextphys = EHCI_LINK_ADDR(hc32toh(sc, epipe->sqh->qh.qh_qtd.qtd_next)); altnextphys = - EHCI_LINK_ADDR(le32toh(epipe->sqh->qh.qh_qtd.qtd_altnext)); + EHCI_LINK_ADDR(hc32toh(sc, epipe->sqh->qh.qh_qtd.qtd_altnext)); for (sqtd = ex->sqtdstart; sqtd != ex->sqtdend->nextqtd; sqtd = sqtd->nextqtd) { if (sqtd->physaddr == nextphys) { epipe->sqh->qh.qh_qtd.qtd_next = - htole32(ex->sqtdend->nextqtd->physaddr); + htohc32(sc, ex->sqtdend->nextqtd->physaddr); DPRINTFN(4, ("ehci_idone: updated overlay next ptr\n")); } @@ -932,7 +912,7 @@ DPRINTFN(4, ("ehci_idone: updated overlay altnext ptr\n")); epipe->sqh->qh.qh_qtd.qtd_altnext = - htole32(ex->sqtdend->nextqtd->physaddr); + htohc32(sc, ex->sqtdend->nextqtd->physaddr); } } @@ -975,7 +955,7 @@ if (nframes >= xfer->nframes) break; - status = le32toh(itd->itd.itd_ctl[i]); + status = hc32toh(sc, itd->itd.itd_ctl[i]); len = EHCI_ITD_GET_LEN(status); xfer->frlengths[nframes++] = len; actlen += len; @@ -995,7 +975,7 @@ actlen = 0; for (sqtd = ex->sqtdstart; sqtd != lsqtd->nextqtd; sqtd =sqtd->nextqtd) { - nstatus = le32toh(sqtd->qtd.qtd_status); + nstatus = hc32toh(sc, sqtd->qtd.qtd_status); if (nstatus & EHCI_QTD_ACTIVE) break; @@ -1012,24 +992,11 @@ "status=0x%x\n", xfer->length, actlen, cerr, status)); xfer->actlen = actlen; if ((status & EHCI_QTD_HALTED) != 0) { -#ifdef EHCI_DEBUG - char sbuf[128]; - - bitmask_snprintf((u_int32_t)status, - "\20\7HALTED\6BUFERR\5BABBLE\4XACTERR" - "\3MISSED\2SPLIT\1PING", sbuf, sizeof(sbuf)); - DPRINTFN(2, - ("ehci_idone: error, addr=%d, endpt=0x%02x, " - "status 0x%s\n", + ("ehci_idone: error, addr=%d, endpt=0x%02x, status %b\n", xfer->pipe->device->address, xfer->pipe->endpoint->edesc->bEndpointAddress, - sbuf)); - if (ehcidebug > 2) { - ehci_dump_sqh(epipe->sqh); - ehci_dump_sqtds(ex->sqtdstart); - } -#endif + status, EHCI_QTD_STATUS_BITS)); if ((status & EHCI_QTD_BABBLE) == 0 && cerr > 0) xfer->status = USBD_STALLED; else @@ -1037,6 +1004,12 @@ } else { xfer->status = USBD_NORMAL_COMPLETION; } +#ifdef EHCI_DEBUG + if (ehcidebug > 2) { + ehci_dump_sqh(sc, epipe->sqh); + ehci_dump_sqtds(sc, ex->sqtdstart); + } +#endif end: /* XXX transfer_complete memcpys out transfer data (for in endpoints) * during this call, before methods->done is called: dma sync required @@ -1113,12 +1086,6 @@ (void) ehci_hcreset(sc); callout_stop(&sc->sc_tmo_intrlist); -#if defined(__NetBSD__) || defined(__OpenBSD__) - if (sc->sc_powerhook != NULL) - powerhook_disestablish(sc->sc_powerhook); - if (sc->sc_shutdownhook != NULL) - shutdownhook_disestablish(sc->sc_shutdownhook); -#endif usb_delay_ms(&sc->sc_bus, 300); /* XXX let stray task complete */ usb_freemem(&sc->sc_bus, &sc->sc_fldma); @@ -1348,6 +1315,7 @@ ehci_device_clear_toggle(usbd_pipe_handle pipe) { struct ehci_pipe *epipe = (struct ehci_pipe *)pipe; + ehci_softc_t *sc = (ehci_softc_t *)epipe->pipe.device->bus; DPRINTF(("ehci_device_clear_toggle: epipe=%p status=0x%x\n", epipe, epipe->sqh->qh.qh_qtd.qtd_status)); @@ -1356,9 +1324,9 @@ usbd_dump_pipe(pipe); #endif KASSERT((epipe->sqh->qh.qh_qtd.qtd_status & - htole32(EHCI_QTD_ACTIVE)) == 0, + htohc32(sc, EHCI_QTD_ACTIVE)) == 0, ("ehci_device_clear_toggle: queue active")); - epipe->sqh->qh.qh_qtd.qtd_status &= htole32(~EHCI_QTD_TOGGLE_MASK); + epipe->sqh->qh.qh_qtd.qtd_status &= htohc32(sc, ~EHCI_QTD_TOGGLE_MASK); } static void @@ -1366,178 +1334,6 @@ { } -#ifdef EHCI_DEBUG -void -ehci_dump_regs(ehci_softc_t *sc) -{ - int i; - printf("cmd=0x%08x, sts=0x%08x, ien=0x%08x\n", - EOREAD4(sc, EHCI_USBCMD), - EOREAD4(sc, EHCI_USBSTS), - EOREAD4(sc, EHCI_USBINTR)); - printf("frindex=0x%08x ctrdsegm=0x%08x periodic=0x%08x async=0x%08x\n", - EOREAD4(sc, EHCI_FRINDEX), - EOREAD4(sc, EHCI_CTRLDSSEGMENT), - EOREAD4(sc, EHCI_PERIODICLISTBASE), - EOREAD4(sc, EHCI_ASYNCLISTADDR)); - for (i = 1; i <= sc->sc_noport; i++) - printf("port %d status=0x%08x\n", i, - EOREAD4(sc, EHCI_PORTSC(i))); -} - -/* - * Unused function - this is meant to be called from a kernel - * debugger. - */ -void -ehci_dump() -{ - ehci_dump_regs(theehci); -} - -void -ehci_dump_link(ehci_link_t link, int type) -{ - link = le32toh(link); - printf("0x%08x", link); - if (link & EHCI_LINK_TERMINATE) - printf(""); - else { - printf("<"); - if (type) { - switch (EHCI_LINK_TYPE(link)) { - case EHCI_LINK_ITD: printf("ITD"); break; - case EHCI_LINK_QH: printf("QH"); break; - case EHCI_LINK_SITD: printf("SITD"); break; - case EHCI_LINK_FSTN: printf("FSTN"); break; - } - } - printf(">"); - } -} - -void -ehci_dump_sqtds(ehci_soft_qtd_t *sqtd) -{ - int i; - u_int32_t stop; - - stop = 0; - for (i = 0; sqtd && i < 20 && !stop; sqtd = sqtd->nextqtd, i++) { - ehci_dump_sqtd(sqtd); - stop = sqtd->qtd.qtd_next & htole32(EHCI_LINK_TERMINATE); - } - if (sqtd) - printf("dump aborted, too many TDs\n"); -} - -void -ehci_dump_sqtd(ehci_soft_qtd_t *sqtd) -{ - printf("QTD(%p) at 0x%08x:\n", sqtd, sqtd->physaddr); - ehci_dump_qtd(&sqtd->qtd); -} - -void -ehci_dump_qtd(ehci_qtd_t *qtd) -{ - u_int32_t s; - char sbuf[128]; - - printf(" next="); ehci_dump_link(qtd->qtd_next, 0); - printf(" altnext="); ehci_dump_link(qtd->qtd_altnext, 0); - printf("\n"); - s = le32toh(qtd->qtd_status); - bitmask_snprintf(EHCI_QTD_GET_STATUS(s), - "\20\10ACTIVE\7HALTED\6BUFERR\5BABBLE\4XACTERR" - "\3MISSED\2SPLIT\1PING", sbuf, sizeof(sbuf)); - printf(" status=0x%08x: toggle=%d bytes=0x%x ioc=%d c_page=0x%x\n", - s, EHCI_QTD_GET_TOGGLE(s), EHCI_QTD_GET_BYTES(s), - EHCI_QTD_GET_IOC(s), EHCI_QTD_GET_C_PAGE(s)); - printf(" cerr=%d pid=%d stat=0x%s\n", EHCI_QTD_GET_CERR(s), - EHCI_QTD_GET_PID(s), sbuf); - for (s = 0; s < 5; s++) - printf(" buffer[%d]=0x%08x\n", s, le32toh(qtd->qtd_buffer[s])); -} - -void -ehci_dump_sqh(ehci_soft_qh_t *sqh) -{ - ehci_qh_t *qh = &sqh->qh; - u_int32_t endp, endphub; - - printf("QH(%p) at 0x%08x:\n", sqh, sqh->physaddr); - printf(" sqtd=%p inactivesqtd=%p\n", sqh->sqtd, sqh->inactivesqtd); - printf(" link="); ehci_dump_link(qh->qh_link, 1); printf("\n"); - endp = le32toh(qh->qh_endp); - printf(" endp=0x%08x\n", endp); - printf(" addr=0x%02x inact=%d endpt=%d eps=%d dtc=%d hrecl=%d\n", - EHCI_QH_GET_ADDR(endp), EHCI_QH_GET_INACT(endp), - EHCI_QH_GET_ENDPT(endp), EHCI_QH_GET_EPS(endp), - EHCI_QH_GET_DTC(endp), EHCI_QH_GET_HRECL(endp)); - printf(" mpl=0x%x ctl=%d nrl=%d\n", - EHCI_QH_GET_MPL(endp), EHCI_QH_GET_CTL(endp), - EHCI_QH_GET_NRL(endp)); - endphub = le32toh(qh->qh_endphub); - printf(" endphub=0x%08x\n", endphub); - printf(" smask=0x%02x cmask=0x%02x huba=0x%02x port=%d mult=%d\n", - EHCI_QH_GET_SMASK(endphub), EHCI_QH_GET_CMASK(endphub), - EHCI_QH_GET_HUBA(endphub), EHCI_QH_GET_PORT(endphub), - EHCI_QH_GET_MULT(endphub)); - printf(" curqtd="); ehci_dump_link(qh->qh_curqtd, 0); printf("\n"); - printf("Overlay qTD:\n"); - ehci_dump_qtd(&qh->qh_qtd); -} - -#ifdef notyet -void -ehci_dump_itd(struct ehci_soft_itd *itd) -{ - ehci_isoc_trans_t t; - ehci_isoc_bufr_ptr_t b, b2, b3; - int i; - - printf("ITD: next phys=%X\n", itd->itd.itd_next); - - for (i = 0; i < 8;i++) { - t = le32toh(itd->itd.itd_ctl[i]); - printf("ITDctl %d: stat=%X len=%X ioc=%X pg=%X offs=%X\n", i, - EHCI_ITD_GET_STATUS(t), EHCI_ITD_GET_LEN(t), - EHCI_ITD_GET_IOC(t), EHCI_ITD_GET_PG(t), - EHCI_ITD_GET_OFFS(t)); - } - printf("ITDbufr: "); - for (i = 0; i < 7; i++) - printf("%X,", EHCI_ITD_GET_BPTR(le32toh(itd->itd.itd_bufr[i]))); - - b = le32toh(itd->itd.itd_bufr[0]); - b2 = le32toh(itd->itd.itd_bufr[1]); - b3 = le32toh(itd->itd.itd_bufr[2]); - printf("\nep=%X daddr=%X dir=%d maxpkt=%X multi=%X\n", - EHCI_ITD_GET_EP(b), EHCI_ITD_GET_DADDR(b), EHCI_ITD_GET_DIR(b2), - EHCI_ITD_GET_MAXPKT(b2), EHCI_ITD_GET_MULTI(b3)); -} - -void -ehci_dump_sitd(struct ehci_soft_itd *itd) -{ - printf("SITD %p next=%p prev=%p xfernext=%p physaddr=%X slot=%d\n", - itd, itd->u.frame_list.next, itd->u.frame_list.prev, - itd->xfer_next, itd->physaddr, itd->slot); -} -#endif - -#ifdef DIAGNOSTIC -void -ehci_dump_exfer(struct ehci_xfer *ex) -{ - printf("ehci_dump_exfer: ex=%p sqtdstart=%p end=%p itdstart=%p " - "end=%p isdone=%d\n", ex, ex->sqtdstart, ex->sqtdend, ex->itdstart, - ex->itdend, ex->isdone); -} -#endif -#endif - usbd_status ehci_open(usbd_pipe_handle pipe) { @@ -1553,8 +1349,8 @@ int ival, speed, naks; int hshubaddr, hshubport; - DPRINTFN(1, ("ehci_open: pipe=%p, addr=%d, endpt=%d (%d)\n", - pipe, addr, ed->bEndpointAddress, sc->sc_addr)); + DPRINTFN(1, ("ehci_open: pipe=%p, xfertype=%d, addr=%d, endpt=%d (%d)\n", + pipe, addr, ed->bEndpointAddress, sc->sc_addr, xfertype)); if (dev->myhsport) { hshubaddr = dev->myhsport->parent->address; @@ -1606,7 +1402,7 @@ if (sqh == NULL) goto bad0; /* qh_link filled when the QH is added */ - sqh->qh.qh_endp = htole32( + sqh->qh.qh_endp = htohc32(sc, EHCI_QH_SET_ADDR(addr) | EHCI_QH_SET_ENDPT(UE_GET_ADDR(ed->bEndpointAddress)) | EHCI_QH_SET_EPS(speed) | @@ -1616,17 +1412,17 @@ EHCI_QH_CTL : 0) | EHCI_QH_SET_NRL(naks) ); - sqh->qh.qh_endphub = htole32( + sqh->qh.qh_endphub = htohc32(sc, EHCI_QH_SET_MULT(1) | EHCI_QH_SET_HUBA(hshubaddr) | EHCI_QH_SET_PORT(hshubport) | EHCI_QH_SET_CMASK(0x1c) | EHCI_QH_SET_SMASK(xfertype == UE_INTERRUPT ? 0x01 : 0) ); - sqh->qh.qh_curqtd = EHCI_NULL; + sqh->qh.qh_curqtd = EHCI_NULL(sc); /* The overlay qTD was already set up by ehci_alloc_sqh(). */ sqh->qh.qh_qtd.qtd_status = - htole32(EHCI_QTD_SET_TOGGLE(pipe->endpoint->savedtoggle)); + htohc32(sc, EHCI_QTD_SET_TOGGLE(pipe->endpoint->savedtoggle)); epipe->sqh = sqh; } else { sqh = NULL; @@ -1644,13 +1440,13 @@ goto bad1; pipe->methods = &ehci_device_ctrl_methods; s = splusb(); - ehci_add_qh(sqh, sc->sc_async_head); + ehci_add_qh(sc, sqh, sc->sc_async_head); splx(s); break; case UE_BULK: pipe->methods = &ehci_device_bulk_methods; s = splusb(); - ehci_add_qh(sqh, sc->sc_async_head); + ehci_add_qh(sc, sqh, sc->sc_async_head); splx(s); break; case UE_INTERRUPT: @@ -1694,7 +1490,7 @@ * If in the intr schedule it may not. */ void -ehci_add_qh(ehci_soft_qh_t *sqh, ehci_soft_qh_t *head) +ehci_add_qh(ehci_softc_t *sc, ehci_soft_qh_t *sqh, ehci_soft_qh_t *head) { SPLUSBCHECK; @@ -1704,12 +1500,12 @@ head->next = sqh; if (sqh->next) sqh->next->prev = sqh; - head->qh.qh_link = htole32(sqh->physaddr | EHCI_LINK_QH); + head->qh.qh_link = htohc32(sc, sqh->physaddr | EHCI_LINK_QH); #ifdef EHCI_DEBUG if (ehcidebug > 5) { printf("ehci_add_qh:\n"); - ehci_dump_sqh(sqh); + ehci_dump_sqh(sc, sqh); } #endif } @@ -1732,9 +1528,9 @@ /* Restart a QH following the addition of a qTD. */ void -ehci_activate_qh(ehci_soft_qh_t *sqh, ehci_soft_qtd_t *sqtd) +ehci_activate_qh(ehci_softc_t *sc, ehci_soft_qh_t *sqh, ehci_soft_qtd_t *sqtd) { - KASSERT((sqtd->qtd.qtd_status & htole32(EHCI_QTD_ACTIVE)) == 0, + KASSERT((sqtd->qtd.qtd_status & htohc32(sc, EHCI_QTD_ACTIVE)) == 0, ("ehci_activate_qh: already active")); /* @@ -1745,23 +1541,23 @@ */ if (sqtd == sqh->sqtd) { /* Check that the hardware is in the state we expect. */ - if (EHCI_LINK_ADDR(le32toh(sqh->qh.qh_qtd.qtd_next)) != + if (EHCI_LINK_ADDR(hc32toh(sc, sqh->qh.qh_qtd.qtd_next)) != sqtd->physaddr) { #ifdef EHCI_DEBUG printf("ehci_activate_qh: unexpected next ptr\n"); - ehci_dump_sqh(sqh); - ehci_dump_sqtds(sqh->sqtd); + ehci_dump_sqh(sc, sqh); + ehci_dump_sqtds(sc, sqh->sqtd); #endif - sqh->qh.qh_qtd.qtd_next = htole32(sqtd->physaddr); - sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL; + sqh->qh.qh_qtd.qtd_next = htohc32(sc, sqtd->physaddr); + sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL(sc); } /* Ensure the flags are correct. */ - sqh->qh.qh_qtd.qtd_status &= htole32(EHCI_QTD_PINGSTATE | + sqh->qh.qh_qtd.qtd_status &= htohc32(sc, EHCI_QTD_PINGSTATE | EHCI_QTD_TOGGLE_MASK); } /* Now activate the qTD. */ - sqtd->qtd.qtd_status |= htole32(EHCI_QTD_ACTIVE); + sqtd->qtd.qtd_status |= htohc32(sc, EHCI_QTD_ACTIVE); } /* @@ -2482,16 +2278,16 @@ sqtd = ehci_alloc_sqtd(sc); if (sqtd == NULL) return (NULL); - sqtd->qtd.qtd_status = htole32(0); - sqtd->qtd.qtd_next = EHCI_NULL; - sqtd->qtd.qtd_altnext = EHCI_NULL; + sqtd->qtd.qtd_status = htohc32(sc, 0); + sqtd->qtd.qtd_next = EHCI_NULL(sc); + sqtd->qtd.qtd_altnext = EHCI_NULL(sc); sqh = sc->sc_freeqhs; sc->sc_freeqhs = sqh->next; /* The overlay QTD should begin zeroed. */ - sqh->qh.qh_qtd.qtd_next = htole32(sqtd->physaddr); - sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL; + sqh->qh.qh_qtd.qtd_next = htohc32(sc, sqtd->physaddr); + sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL(sc); sqh->qh.qh_qtd.qtd_status = 0; for (i = 0; i < EHCI_QTD_NBUFFERS; i++) { sqh->qh.qh_qtd.qtd_buffer[i] = 0; @@ -2545,8 +2341,8 @@ s = splusb(); sqtd = sc->sc_freeqtds; sc->sc_freeqtds = sqtd->nextqtd; - sqtd->qtd.qtd_next = EHCI_NULL; - sqtd->qtd.qtd_altnext = EHCI_NULL; + sqtd->qtd.qtd_next = EHCI_NULL(sc); + sqtd->qtd.qtd_altnext = EHCI_NULL(sc); sqtd->qtd.qtd_status = 0; for (i = 0; i < EHCI_QTD_NBUFFERS; i++) { sqtd->qtd.qtd_buffer[i] = 0; @@ -2643,7 +2439,7 @@ segoff = 0; } - cur->qtd.qtd_buffer[i] = htole32(dataphys); + cur->qtd.qtd_buffer[i] = htohc32(sc, dataphys); cur->qtd.qtd_buffer_hi[i] = 0; curlen += pagelen; @@ -2678,18 +2474,18 @@ next = ehci_alloc_sqtd(sc); if (next == NULL) goto nomem; - nextphys = htole32(next->physaddr); + nextphys = htohc32(sc, next->physaddr); } else { next = NULL; - nextphys = EHCI_NULL; + nextphys = EHCI_NULL(sc); } cur->nextqtd = next; cur->qtd.qtd_next = nextphys; /* Make sure to stop after a short transfer. */ - cur->qtd.qtd_altnext = htole32(newinactive->physaddr); + cur->qtd.qtd_altnext = htohc32(sc, newinactive->physaddr); cur->qtd.qtd_status = - htole32(qtdstatus | EHCI_QTD_SET_BYTES(curlen)); + htohc32(sc, qtdstatus | EHCI_QTD_SET_BYTES(curlen)); cur->xfer = xfer; cur->len = curlen; DPRINTFN(10,("ehci_alloc_sqtd_chain: curlen=%d\n", curlen)); @@ -2711,7 +2507,7 @@ offset += curlen; cur = next; } - cur->qtd.qtd_status |= htole32(EHCI_QTD_IOC); + cur->qtd.qtd_status |= htohc32(sc, EHCI_QTD_IOC); *ep = cur; DPRINTFN(10,("ehci_alloc_sqtd_chain: return sqtd=%p sqtdend=%p\n", @@ -2840,7 +2636,7 @@ ehci_rem_qh(sc, sqh, head); splx(s); pipe->endpoint->savedtoggle = - EHCI_QTD_GET_TOGGLE(le32toh(sqh->qh.qh_qtd.qtd_status)); + EHCI_QTD_GET_TOGGLE(hc32toh(sc, sqh->qh.qh_qtd.qtd_status)); ehci_free_sqh(sc, epipe->sqh); } @@ -2949,7 +2745,7 @@ * the aborting xfer. (If there is something past us). * Hardware and software. */ - cur = EHCI_LINK_ADDR(le32toh(sqh->qh.qh_curqtd)); + cur = EHCI_LINK_ADDR(hc32toh(sc, sqh->qh.qh_curqtd)); hit = 0; /* If they initially point here. */ @@ -2957,7 +2753,7 @@ /* We will change them to point here */ snext = exfer->sqtdend->nextqtd; - next = htole32(snext->physaddr); + next = htohc32(sc, snext->physaddr); /* * Now loop through any qTDs before us and keep track of the pointer @@ -2966,9 +2762,9 @@ sqtd = sqh->sqtd; while (sqtd && sqtd != exfer->sqtdstart) { hit |= (cur == sqtd->physaddr); - if (EHCI_LINK_ADDR(le32toh(sqtd->qtd.qtd_next)) == us) + if (EHCI_LINK_ADDR(hc32toh(sc, sqtd->qtd.qtd_next)) == us) sqtd->qtd.qtd_next = next; - if (EHCI_LINK_ADDR(le32toh(sqtd->qtd.qtd_altnext)) == us) + if (EHCI_LINK_ADDR(hc32toh(sc, sqtd->qtd.qtd_altnext)) == us) sqtd->qtd.qtd_altnext = next; sqtd = sqtd->nextqtd; } @@ -2997,17 +2793,17 @@ * that we are removing. */ if (hit) { - sqh->qh.qh_qtd.qtd_next = htole32(snext->physaddr); - sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL; + sqh->qh.qh_qtd.qtd_next = htohc32(sc, snext->physaddr); + sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL(sc); sqh->qh.qh_qtd.qtd_status &= - htole32(EHCI_QTD_TOGGLE_MASK); + htohc32(sc, EHCI_QTD_TOGGLE_MASK); for (i = 0; i < EHCI_QTD_NBUFFERS; i++) { sqh->qh.qh_qtd.qtd_buffer[i] = 0; sqh->qh.qh_qtd.qtd_buffer_hi[i] = 0; } } } - ehci_add_qh(sqh, psqh); + ehci_add_qh(sc, sqh, psqh); /* * Step 5: Execute callback. */ @@ -3101,9 +2897,9 @@ for (itd = exfer->itdstart; itd != NULL; itd = itd->xfer_next) { for (i = 0; i < 8; i++) { - trans_status = le32toh(itd->itd.itd_ctl[i]); + trans_status = hc32toh(sc, itd->itd.itd_ctl[i]); trans_status &= ~EHCI_ITD_ACTIVE; - itd->itd.itd_ctl[i] = htole32(trans_status); + itd->itd.itd_ctl[i] = htohc32(sc, trans_status); } } @@ -3280,9 +3076,10 @@ err = USBD_NOMEM; goto bad1; } - newinactive->qtd.qtd_status = htole32(0); - newinactive->qtd.qtd_next = EHCI_NULL; - newinactive->qtd.qtd_altnext = EHCI_NULL; + newinactive->qtd.qtd_status = htohc32(sc, 0); + newinactive->qtd.qtd_next = EHCI_NULL(sc); + newinactive->qtd.qtd_altnext = EHCI_NULL(sc); + stat = ehci_alloc_sqtd(sc); if (stat == NULL) { err = USBD_NOMEM; @@ -3302,10 +3099,10 @@ NULL, newinactive, &next, &end); if (err) goto bad3; - end->qtd.qtd_status &= htole32(~EHCI_QTD_IOC); + end->qtd.qtd_status &= htohc32(sc, ~EHCI_QTD_IOC); end->nextqtd = stat; - end->qtd.qtd_next = htole32(stat->physaddr); - end->qtd.qtd_altnext = htole32(newinactive->physaddr); + end->qtd.qtd_next = htohc32(sc, stat->physaddr); + end->qtd.qtd_altnext = htohc32(sc, newinactive->physaddr); } else { next = stat; } @@ -3313,21 +3110,21 @@ memcpy(KERNADDR(&epipe->u.ctl.reqdma, 0), req, sizeof *req); /* Clear toggle, and do not activate until complete */ - setup->qtd.qtd_status = htole32( + setup->qtd.qtd_status = htohc32(sc, EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) | EHCI_QTD_SET_CERR(3) | EHCI_QTD_SET_TOGGLE(0) | EHCI_QTD_SET_BYTES(sizeof *req) ); - setup->qtd.qtd_buffer[0] = htole32(DMAADDR(&epipe->u.ctl.reqdma, 0)); + setup->qtd.qtd_buffer[0] = htohc32(sc, DMAADDR(&epipe->u.ctl.reqdma, 0)); setup->qtd.qtd_buffer_hi[0] = 0; setup->nextqtd = next; - setup->qtd.qtd_next = htole32(next->physaddr); - setup->qtd.qtd_altnext = htole32(newinactive->physaddr); + setup->qtd.qtd_next = htohc32(sc, next->physaddr); + setup->qtd.qtd_altnext = htohc32(sc, newinactive->physaddr); setup->xfer = xfer; setup->len = sizeof *req; - stat->qtd.qtd_status = htole32( + stat->qtd.qtd_status = htohc32(sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(isread ? EHCI_QTD_PID_OUT : EHCI_QTD_PID_IN) | EHCI_QTD_SET_CERR(3) | @@ -3337,16 +3134,16 @@ stat->qtd.qtd_buffer[0] = 0; /* XXX not needed? */ stat->qtd.qtd_buffer_hi[0] = 0; /* XXX not needed? */ stat->nextqtd = newinactive; - stat->qtd.qtd_next = htole32(newinactive->physaddr); - stat->qtd.qtd_altnext = htole32(newinactive->physaddr); + stat->qtd.qtd_next = htohc32(sc, newinactive->physaddr); + stat->qtd.qtd_altnext = htohc32(sc, newinactive->physaddr); stat->xfer = xfer; stat->len = 0; #ifdef EHCI_DEBUG if (ehcidebug > 5) { DPRINTF(("ehci_device_request:\n")); - ehci_dump_sqh(sqh); - ehci_dump_sqtds(setup); + ehci_dump_sqh(sc, sqh); + ehci_dump_sqtds(sc, setup); } #endif @@ -3361,7 +3158,7 @@ /* Activate the new qTD in the QH list. */ s = splusb(); - ehci_activate_qh(sqh, setup); + ehci_activate_qh(sc, sqh, setup); if (xfer->timeout && !sc->sc_bus.use_polling) { callout_reset(&xfer->timeout_handle, MS_TO_TICKS(xfer->timeout), ehci_timeout, xfer); @@ -3376,9 +3173,9 @@ EOREAD4(sc, EHCI_USBSTS))); delay(10000); ehci_dump_regs(sc); - ehci_dump_sqh(sc->sc_async_head); - ehci_dump_sqh(sqh); - ehci_dump_sqtds(setup); + ehci_dump_sqh(sc, sc->sc_async_head); + ehci_dump_sqh(sc, sqh); + ehci_dump_sqtds(sc, setup); } #endif @@ -3452,9 +3249,9 @@ usb_transfer_complete(xfer); return (err); } - newinactive->qtd.qtd_status = htole32(0); - newinactive->qtd.qtd_next = EHCI_NULL; - newinactive->qtd.qtd_altnext = EHCI_NULL; + newinactive->qtd.qtd_status = htohc32(sc, 0); + newinactive->qtd.qtd_next = EHCI_NULL(sc); + newinactive->qtd.qtd_altnext = EHCI_NULL(sc); err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer, sqh->inactivesqtd, newinactive, &data, &dataend); if (err) { @@ -3465,15 +3262,15 @@ return (err); } dataend->nextqtd = newinactive; - dataend->qtd.qtd_next = htole32(newinactive->physaddr); - dataend->qtd.qtd_altnext = htole32(newinactive->physaddr); + dataend->qtd.qtd_next = htohc32(sc, newinactive->physaddr); + dataend->qtd.qtd_altnext = htohc32(sc, newinactive->physaddr); sqh->inactivesqtd = newinactive; #ifdef EHCI_DEBUG if (ehcidebug > 5) { DPRINTF(("ehci_device_bulk_start: data(1)\n")); - ehci_dump_sqh(sqh); - ehci_dump_sqtds(data); + ehci_dump_sqh(sc, sqh); + ehci_dump_sqtds(sc, data); } #endif @@ -3488,7 +3285,7 @@ #endif s = splusb(); - ehci_activate_qh(sqh, data); + ehci_activate_qh(sc, sqh, data); if (xfer->timeout && !sc->sc_bus.use_polling) { callout_reset(&xfer->timeout_handle, MS_TO_TICKS(xfer->timeout), ehci_timeout, xfer); @@ -3508,8 +3305,8 @@ ehci_dump_sqh(sc->sc_async_head); #endif printf("sqh:\n"); - ehci_dump_sqh(sqh); - ehci_dump_sqtds(data); + ehci_dump_sqh(sc, sqh); + ehci_dump_sqtds(sc, data); } #endif @@ -3577,7 +3374,7 @@ sqh->islot = islot; isp = &sc->sc_islots[islot]; - ehci_add_qh(sqh, isp->sqh); + ehci_add_qh(sc, sqh, isp->sqh); return (USBD_NORMAL_COMPLETION); } @@ -3638,9 +3435,9 @@ usb_transfer_complete(xfer); return (err); } - newinactive->qtd.qtd_status = htole32(0); - newinactive->qtd.qtd_next = EHCI_NULL; - newinactive->qtd.qtd_altnext = EHCI_NULL; + newinactive->qtd.qtd_status = htohc32(sc, 0); + newinactive->qtd.qtd_next = EHCI_NULL(sc); + newinactive->qtd.qtd_altnext = EHCI_NULL(sc); err = ehci_alloc_sqtd_chain(epipe, sc, len, isread, xfer, sqh->inactivesqtd, newinactive, &data, &dataend); if (err) { @@ -3650,15 +3447,15 @@ return (err); } dataend->nextqtd = newinactive; - dataend->qtd.qtd_next = htole32(newinactive->physaddr); - dataend->qtd.qtd_altnext = htole32(newinactive->physaddr); + dataend->qtd.qtd_next = htohc32(sc, newinactive->physaddr); + dataend->qtd.qtd_altnext = htohc32(sc, newinactive->physaddr); sqh->inactivesqtd = newinactive; #ifdef EHCI_DEBUG if (ehcidebug > 5) { DPRINTF(("ehci_device_intr_start: data(1)\n")); - ehci_dump_sqh(sqh); - ehci_dump_sqtds(data); + ehci_dump_sqh(sc, sqh); + ehci_dump_sqtds(sc, data); } #endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 13 05:39:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 819BC1065673; Sat, 13 Dec 2008 05:39:56 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2500D106564A for ; Sat, 13 Dec 2008 05:39:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1369A8FC18 for ; Sat, 13 Dec 2008 05:39:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBD5dtMf081233 for ; Sat, 13 Dec 2008 05:39:55 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBD5dtrI081231 for perforce@freebsd.org; Sat, 13 Dec 2008 05:39:55 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 13 Dec 2008 05:39:55 GMT Message-Id: <200812130539.mBD5dtrI081231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 154577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 05:39:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=154577 Change 154577 by pgj@kolbasz on 2008/12/13 05:39:15 Add Hungarian translation of chapter "Translations" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/translations/chapter.sgml#2 (text+ko) ==== @@ -31,224 +31,310 @@ --> - Translations + Fordítások + + Ebben a fejezetben gyakran ismételt + kérdések és válaszok + formájában próbálunk + segítséget nyújtani a &os; + dokumentációjának (a kézikönyv, a + GYIK, különbözõ leírások, man + oldalak és egyebek) különbözõ nyelvekre + fordításában. - This is the FAQ for people translating the FreeBSD documentation - (FAQ, Handbook, tutorials, manual pages, and others) to different - languages. - - It is very heavily based on the translation FAQ - from the FreeBSD German Documentation Project, originally written by Frank - Gründer elwood@mc5sys.in-berlin.de and translated back to - English by Bernd Warken bwarken@mayn.de. + Az itt szereplõ bejegyzések + nagyrészt az eredetileg Frank Gründer + (elwood@mc5sys.in-berlin.de) által a + Német &os; Dokumentációs Projekt + számára összeállított GYIK + tartalmán alapszanak, amelyet Bernd Warken + (bwarken@mayn.de) fordított késõbb + angolra. - The FAQ is maintained by the &a.doceng;. + A bejegyzéseket jelenleg a &a.doceng; tartja + karban. - Why a FAQ? + Miért éppen GYIK? - More and more people are approaching the freebsd-doc mailing - list and volunteering to translate FreeBSD documentation to other - languages. This FAQ aims to answer their questions so they can start - translating documentation as quickly as possible. + A &a.doc.name; levelezési listán egyre + többen és többen jelzik, hogy + szeretnék lefordítani a &os; + dokumentációját + különbözõ idegennyelvekre. Az itt + összegyûjtött kérdésekben + ezért most igyekszünk megválaszolni az + ilyenkor általában elõkerülõ + problémákat, hogy minél gyorsabban el + tudják kezdeni a munkát. - What do i18n and l10n - mean? + Mit az az i18n és + l10n? - + - i18n means - internationalization and l10n - means localization. They are just a convenient - shorthand. + Az i18n jelentése + internationalization + (idegennyelvûség), az l10n + jelentése pedig localization + (honosítás). Ezeket + egyszerûsítették le és + rövidítették. - i18n can be read as i followed by - 18 letters, followed by n. Similarly, - l10n is l followed by 10 letters, - followed by n. + Az i18n úgy + értelmezhetõ, hogy elõször egy + i, majd 18 betû, aztán egy + n. Ehhez hasonlóan, az + l10n egy l, amelyet 10 + betû követ és egy n + zár. - Is there a mailing list for translators? + Van külön levelezési lista a + fordítók számára is? - Yes. Different translation groups have their own mailing - lists. The list - of translation projects has more information about the - mailing lists and web sites run by each translation project. + Igen. Az egyes fordítói csapatoknak + többnyire van saját önálló + levelezési listájuk. Ezzel, illetve a csapatok + által mûködtetett webhelyekkel kapcsolatban + a + fordítói projektekkel + foglalkozó oldalon találhatunk bõvebb + információkat. - Are more translators needed? + Szükség van még + fordítókra? - Yes. The more people work on translation the faster it gets - done, and the faster changes to the English documentation are - mirrored in the translated documents. + Igen. Minél többen dolgoznak egy + fordításon, annál gyorsabban + készül el, illetve annál gyorsabban + frissül az eredeti angol dokumentáció + változásai szerint. - You do not have to be a professional translator to be able to - help. + Nem kell képzett szakfordítónak lenni + ahhoz, hogy segíteni tudjunk. - What languages do I need to know? + Milyen nyelveket kell ismerni? - Ideally, you will have a good knowledge of written English, and - obviously you will need to be fluent in the language you are - translating to. + Nem árt jól ismernünk az írott + angolt és értelemszerûen folyékonyan + beszélni a fordítás + célnyelvét. - English is not strictly necessary. For example, you could do a - Hungarian translation of the FAQ from the Spanish - translation. + Az angol nyelv ismerete egyébként nem + kötelezõ. Például a GYIK spanyol + fordítását + elkészíthetjük a magyar változat + alapján is. - + - What software do I need to know? + Milyen szoftvereket kell ismerni? - It is strongly recommended that you maintain a local copy of the - FreeBSD CVS repository (at least the documentation part) either - using CTM or - CVSup. The "Staying current with FreeBSD" - chapter in the Handbook explains how to use these - applications. + Mindenképpen javasoljuk, hogy hozzunk létre + magunknak egy helyi másolatot a &os; + repositoryjáról (legalább a + dokumentációról) a + CTM vagy a + CVSup + segítségével. Az említett + alkalmazások használatáról a &os; + kézikönyv A forrás + szinkronizálása címû + szakaszában olvashatunk részletesebben. - You should be comfortable using CVS. - This will allow you to see what has changed between different - versions of the files that make up the documentation. - - [XXX To Do -- write a tutorial that shows how to use CVSup to - get just the documentation, check it out, and see what has changed - between two arbitrary revisions] + Hasznos, ha járatosak vagyunk a + CVS használatában. + Segítségével meg tudjuk nézni, + hogy mi változott a különbözõ + revíziókban, így mindig csak a + változások lefordításával + karban tudjuk tartani a lefordított + dokumentációkat. - How do I find out who else might be translating to the same - language? + Honnan lehet kideríteni, hogy esetleg valaki + más már dolgozik ugyanazon nyelv + fordításán? - The Documentation - Project translations page lists the translation efforts - that are currently known about. If others are already working - on translating documentation to your language, please do not - duplicate their efforts. Instead, contact them to see how you can - help. + A Dokumentációs + Projekt fordításokkal foglalkozó + oldalán megtalálhatjuk a jelenleg + ismert összes fordítást. Ha valaki vagy + valakik már dolgoznak fordításon a + kiválasztott nyelvhez, akkor inkább vegyük + fel velük a kapcsolatot, hogy ne dolgozzon senki sem + feleslegesen. - If no one is listed on that page as translating for your - language, then send a message to the &a.doc; in case someone else - is thinking of doing a translation, but has not announced it yet. - + Attól függetlenül, hogy az + említett oldal szerint senki sem foglalkozik az adott + nyelvre fordítással, a biztonság + kedvéért küldjünk még egy + levelet a &a.doc; címére. Elõfordulhat + ugyanis, hogy hozzánk hasonlóan valaki + szintén szeretne fordítani, de hivatalosan + még nem jelentette be. - + - No one else is translating to my language. What do I do? + Senki sem fordít a kiválasztott nyelvre. Mi + a teendõ? - Congratulations, you have just started the FreeBSD - your-language-here Documentation - Translation Project. Welcome aboard. + Nos, ebben az esetben gratulálunk, miénk a + Nyelv &os; + Dokumentációs Projekt! Isten hozott a + fedélzeten! + + Elsõként alaposan fontoljuk meg, hogy + valóban hajlandóak vagyunk kellõ idõt + szentelni rá. Mivel jelen pillanatban egyedül + csak mi foglalkozunk az adott nyelvi + fordítással, nekünk magunknak kell + képviselnünk és + népszerûsítenünk a munkánkat, + illetve irányítani a késõbb + csatlakozni kívánó önkéntesek + munkáját. - First, decide whether or not you have got the time to spare. Since - you are the only person working on your language at the moment it is - going to be your responsibility to publicize your work and - coordinate any volunteers that might want to help you. + Írjunk egy levelet a &os; + Dokumentációs Projekt levelezési + listájára, amelyben bejelentjük, hogy + nekikezdünk fordítani az adott nyelvre, + ezáltal felkerül az elõbb említett + honlapra. - Write an email to the Documentation Project mailing list, - announcing that you are going to translate the documentation, so the - Documentation Project translations page can be maintained. + Ha az adott nyelvhez tartozó országban van a + &os; Projektnek valamilyen tükrözése, akkor + érdemes kapcsolatba lépnünk az + üzemeltetõitõl és kérni a + munkánkhoz némi tárhelyet, esetleg a + levelezés támogatását vagy + saját egy levelezési listát. - If there is already someone in your country providing FreeBSD - mirroring services you should contact them and ask if you can - have some webspace for your project, and possibly an email - address or mailing list services. - - Then pick a document and start translating. It is best to start - with something fairly small—either the FAQ, or one of the - tutorials. + Válasszunk egy dokumentumot és kezdjük + el fordítani. Érdemes valamelyik rövidebb + résszel kezdeni, például a GYIK-kal vagy + valamelyik leírással. - I have translated some documentation, where do I send it? + Hova lehet küldeni fordításokat? - That depends. If you are already working with a translation team - (such as the Japanese team, or the German team) then they will have - their own procedures for handling submitted documentation, and these - will be outlined on their web pages. + Ez változó. Ha már az adott nyelven + dolgozik egy fordítócsapat (például + a magyar vagy a német), akkor a saját + honlapjukon valószínûleg megadják + hogyan kezelik és hogy lehet hozzájuk eljuttatni + a fordításokat. - If you are the only person working on a particular language (or - you are responsible for a translation project and want to submit - your changes back to the FreeBSD project) then you should send your - translation to the FreeBSD project (see the next question). + Amennyiben viszont még csak egyedül dolgozunk + az érintett nyelven (vagy a + fordítócsapatunk képviseletében + szeretnénk eljuttatni a munkánkat a &os; + Projektnek), akkor érdemes közvetlenül a &os; + Projektnek küldeni a fordításainkat + (lásd a következõ + kérdést). - I am the only person working on translating to this language, how - do I submit my translation? + Hova lehet beküldeni a fordításokat, ha + senki más nem dolgozik még + fordításon az adott nyelvhez? - or + avagy: - We are a translation team, and want to submit documentation that - our members have translated for us? + A fordítócsapatok hova tudják + küldeni a tagjaik által készített + fordításokat? - First, make sure your translation is organized properly. This - means that it should drop into the existing documentation tree and - build straight away. + Elõször is az elkészült + fordításokat a megfelelõ formára kell + hoznunk. Ez nagyjából azt jelenti, hogy + tegyük a már meglevõ + dokumentációk közé és + próbáljuk meg elõállítani + belõle a különbözõ + formátumokat. - Currently, the FreeBSD documentation is stored in a top level - directory called doc/. Directories below this - are named according to the language code they are written in, as - defined in ISO639 (/usr/share/misc/iso639 on a - version of FreeBSD newer than 20th January 1999). + A &os; dokumentációja jelenleg a + legfelsõ szinten egy doc/ könyvtárba + szervezõdik. A benne található + könyvtárakat az adott nyelvek ISO639 + szabványú (a &os; 1999. január 20. + utáni változataiban a + /usr/share/misc/iso639 + állományban definiált) kódja + szerint nevezik el. - If your language can be encoded in different ways (for example, - Chinese) then there should be directories below this, one for each - encoding format you have provided. + Ha az adott nyelv többféle + kódolással is rendelkezik (mint + például a kínai), akkor ezen a szinten az + egyes kódolásokhoz külön + könyvtárak fognak tartozni. - Finally, you should have directories for each document. + Végezetül az egyes dokumentumokat tegyünk + külön könyvtárakba. - For example, a hypothetical Swedish translation might look - like: + Például egy képzeletbeli svéd + fordítás körülbelül így + nézne ki: doc/ sv_SE.ISO8859-1/ @@ -258,192 +344,265 @@ Makefile book.sgml - sv_SE.ISO8859-1 is the name of the - translation, in - lang.encoding - form. Note the - two Makefiles, which will be used to build the documentation. + Az sv_SE.ISO8859-1 a + fordítás neve, amely tehát a + korábban tárgyalt + nyelv.kódolás + alakban szerepel. A dokumentáció + elõállításához + elhelyeztünk még benne két + Makefile állományt + is. - Use &man.tar.1; and &man.gzip.1; to compress up your - documentation, and send it to the project. + A &man.tar.1; és &man.gzip.1; programok + segítségével + tömörítsük össze az így + összekészített dokumentációt + és juttassuk el a Projekthez. &prompt.user; cd doc &prompt.user; tar cf swedish-docs.tar sv_SE.ISO8859-1 &prompt.user; gzip -9 swedish-docs.tar - Put swedish-docs.tar.gz somewhere. If you - do not have access to your own webspace (perhaps your ISP does not - let you have any) then you can email &a.doceng;, and arrange to email - the files when it is convenient. + Az így keletkezõ + swedish-docs.tar.gz állományt + töltsük fel valahova. Ha nincs saját + tárhelyünk az interneten (mert + például a szolgáltatónk nem + bocsátott a rendelkezésünkre), akkor + küldjünk egy levelet a &a.doceng; + címére és segítenek megszervezni + az állomány + átvételét. - Either way, you should use &man.send-pr.1; to submit a report - indicating that you have submitted the documentation. It would be - very helpful if you could get other people to look over your - translation and double check it first, since it is unlikely that the - person committing it will be fluent in the language. + Akármelyik megoldást is választjuk, a + &man.send-pr.1; használatával ne felejtsük el + jelezni, hogy beküldtük a fordítást. + Mivel nem nagyon valószínû, hogy a + fordítást ténylegesen + tároló személy folyékonyan + beszélné az adott nyelvet, ezért + mielõtt elküldjük, érdemes rendesen + átnézetni a fordításunkat. - Someone (probably the Documentation Project Manager, currently - &a.doceng;) will then take your translation and confirm that it builds. - In particular, the following things will be looked at: + Valaki (valószínûleg a + Dokumentációs Projekt valamelyik vezetõje, a + &a.doceng; tagja) ezután ellenõrzi, hogy + beküldött fordítás nem tartalmaz + semmilyen technikai hibát. Különösen a + következõkre figyelnek ilyenkor: - Do all your files use RCS strings (such as "ID")? + Minden állományban megvan a + verziókezeléshez szükséges + azonosító (mint például a + Projekt esetében a FreeBSD)? - Does make all in the - sv_SE.ISO8859-1 directory work correctly? + Az sv_SE.ISO8859-1 + könyvtárban hibamentesen lefut a make + all parancs? - + - Does make install work correctly? + A fordítással kiegészítve + a teljesen &os; dokumentációra hibamentesen + lefut a make install parancs? - - - If there are any problems then whoever is looking at the - submission will get back to you to work them out. + + + Akárki is nézi majd át a + beküldött fordítást, ha az elõbb + felsoroltak bármelyikével probléma akad, + vissza fogják küldeni, hogy javítsuk + ki. - If there are no problems your translation will be committed - as soon as possible. + Ha viszont mindent rendben találnak, akkor a + fordításunk hamarosan bekerül a &os; + repositoryjába. - Can I include language or country specific text in my - translation? + A fordítás tartalmazhat a nyelvre vagy + országra vonatkozó további + információkat? - We would prefer that you did not. + Alapvetõen ezt nem javasoljuk. - For example, suppose that you are translating the Handbook to - Korean, and want to include a section about retailers in Korea in - your Handbook. + Például a kézikönyv koreai + fordításában szeretnénk + hozzáadni egy szakaszt a Koreában + található boltokról. - There is no real reason why that information should not be in the - English (or German, or Spanish, or Japanese, or …) versions - as well. It is feasible that an English speaker in Korea might try - to pick up a copy of FreeBSD whilst over there. It also helps - increase FreeBSD's perceived presence around the globe, which is not - a bad thing. + Igazából nem látjuk indokoltnak, hogy + ez az információ miért ne lehetne + része az angol (vagy német, spanyol, magyar + stb.) változatoknak. Könnyen elõfordulhat + ugyanis, hogy egy Koreában elõ, angol nyelvi + beszélõ szeretne a környéken keresni + egy ilyen üzletet. Mellesleg ezzel inkább jobban + láthatóvá válik mindenki + számára, hogy a &os; a világ mennyi + országában elérhetõ. Ez + azért nem is olyan rossz. - If you have country specific information, please submit it as a - change to the English Handbook (using &man.send-pr.1;) and then - translate the change back to your language in the translated - Handbook. + Ha tehát valamilyen országfüggõ + információt szeretnénk betenni a + dokumentációba, akkor elõször + küldjünk róla egy hibajelentést (a + &man.send-pr.1; segítségével) a + kézikönyv számára, és csak + ezután fordítsuk vissza az adott nyelvre. - Thanks. + Köszönjük az + együttmûködést! - How should language specific characters be included? + Hogyan illeszthetõek be a + dokumentációba nemzeti karakterek? - Non-ASCII characters in the documentation should be included - using SGML entities. + Az alap ASCII készletben meg nem jelenõ + karaktereket hivatalosan SGML egyedek formájában + kell használnunk. - Briefly, these look like an ampersand (&), the name of the - entity, and a semi-colon (;). + Röviden: egy és jellel (&) + kezdõdnek, majd az azonosítójukat + követõen egy pontosvesszõvel (;) + zárulnak. - The entity names are defined in ISO8879, which is in the ports - tree as textproc/iso8879. + A nemzeti karakterek + ábrázolására + használható egyedeket az ISO8879 + szabványban definiálták, amely a + Portgyûjteménybõl a textproc/iso8879 porton + keresztül érhetõ el. - A few examples include: + Néhány példaképpen ezek + közül: - Entity + Egyed - Appearance + Megjelenés - Description + Leírás &eacute; é - Small e with an acute accent + Ékezetes e. &Eacute; É - Large E with an acute accent + Ékezetes E. &uuml; ü - Small u with an umlaut + Trémás (umlautos, kétpontos) + u. - After you have installed the iso8879 port, the files in - /usr/local/share/sgml/iso8879 contain the - complete list. + Miután telepítettük az említett + portot, a /usr/local/share/sgml/iso8879 + könyvtárban található + állományokban lesz a + szabvány szerint elfogadott összes egyed. - Addressing the reader + Hogyan szólítsuk meg az + Olvasót? - In the English documents, the reader is addressed as - you, there is no formal/informal distinction as there - is in some languages. + Az angol nyelvû dokumentációban az + Olvasót általában a you + szóval szokták megszólítani, + azonban ezzel sok más nyelvtõl + eltérõen nem választják + külön az informális és formális + stílust. - If you are translating to a language which does distinguish, use - whichever form is typically used in other technical documentation in - your language. If in doubt, use a mildly polite form. + Ha olyan nyelvre fordítunk, amelyben létezik + ez a megkülönböztetés, + próbáljunk az adott nyelven írott + szakszövegek stílusához illeszkedni. Ha + nincs semmilyen ötletünk, akkor írjunk + visszafogott, illedelmes megfogalmazásban. - Do I need to include any additional information in my - translations? + Kell más egyéb információt + elhelyeznünk a fordításokban? - Yes. + Igen! - The header of the English version of each document will look - something like this: + Az angol nyelvû dokumentumok fejléce + általában valahogy így szokott + kinézni: <!-- - The FreeBSD Documentation Project + The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.5 2000/07/07 18:38:38 dannyboy Exp $ + $&os;: doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.5 2000/07/07 18:38:38 dannyboy Exp $ --> - The exact boilerplate may change, but it will always include a - $FreeBSD$ line and the phrase The FreeBSD Documentation - Project. - Note that the $FreeBSD part is expanded automatically by - CVS, so it should be empty (just - $FreeBSD$) for new files. + A pontos felépítés ettõl + némileg eltérhet, de szinte biztos, hogy mindig + találunk benne egy $&os;$ kezdetû + sort, illetve egy The &os; Documentation + Project szöveget. A $&os;$ + részt a verziókezelõ rendszer fogja + magától behelyettesíteni, ezért az + új állományok esetében ennek + üresnek kell lennie (egyszerûen csak + $&os;$). + + A fordításoknak tartalmazniuk kell egy + saját $&os;$ sort, illetve a &os; + Documentation Project nevet cseréljük ki + az adott nyelvhez tartozó The &os; + nyelv-angolul Documentation + Project névre. - Your translated documents should include their own - $FreeBSD$ line, and change the - FreeBSD Documentation Project line to - The FreeBSD language - Documentation Project. + Mindezek mellett érdemes még egy harmadik + sort is felvenni a dokumentumba, amellyel jelezzük a + forráskódban, hogy a fordítás + melyik angol nyelvû szöveg alapján + készült. - In addition, you should add a third line which indicates which - revision of the English text this is based on. - - So, the Spanish version of this file might start: + Ennek megfelelõen tehát a magyar + fordításokban általában a + következõ szöveg szerepel: <!-- - The FreeBSD Spanish Documentation Project + The FreeBSD Hungarian Documentation Project - $FreeBSD: doc/es_ES.ISO8859-1/books/fdp-primer/translations/chapter.sgml,v 1.3 1999/06/24 19:12:32 jesusr Exp $ - Original revision: 1.11 + $FreeBSD$ + Original revision: 1.31 --> From owner-p4-projects@FreeBSD.ORG Sat Dec 13 09:03:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3D521065673; Sat, 13 Dec 2008 09:03:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54F5E1065672 for ; Sat, 13 Dec 2008 09:03:20 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe08.swip.net [212.247.154.225]) by mx1.freebsd.org (Postfix) with ESMTP id DEBF38FC21 for ; Sat, 13 Dec 2008 09:03:19 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=9QZaWaqL03AA:10 a=P3SC899gXHkOLDnkTYxLZw==:17 a=6I5d2MoRAAAA:8 a=hJzKuLrDb6rRpbuRkswA:9 a=dl01UOpP-r3UNllpzWwA:7 a=FxBZ5948YNcW08clmwfgYjQj7CQA:4 a=LY0hPdMaydYA:10 Received: from [62.113.133.240] (account mc467741@c2i.net [62.113.133.240] verified) by mailfe08.swip.net (CommuniGate Pro SMTP 5.2.6) with ESMTPA id 1163397365; Sat, 13 Dec 2008 10:03:17 +0100 From: Hans Petter Selasky To: Sam Leffler Date: Sat, 13 Dec 2008 10:05:32 +0100 User-Agent: KMail/1.9.7 References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> In-Reply-To: <200812122326.mBCNQX6w024511@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200812131005.33499.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 09:03:21 -0000 On Saturday 13 December 2008, Sam Leffler wrote: > http://perforce.freebsd.org/chv.cgi?CH=154573 > > Change 154573 by sam@sam_ebb on 2008/12/12 23:25:40 > > Checkpoint cambria/ixp435 ehci support: add EHCI_SCFLG_BIGEDESC > flag to force descriptor contents to be left in big-endian byte > order intead of little-endian; this is required by the ixp435 > builtin controllers. I would prefer if you could implement this using ifdefs. ehcireg.h: #ifdef HOST_ENDIAN_BUILD #undef htole32 #define htole32 htobe32 ... #define EXTERNAL(name) name##_be #else #define EXTERNAL(name) name##_le #endif ehci_wrap.c: (new file) void ehci_init(ehci_sc_t *sc) { if (force use bigendian) ehci_init_be(sc); else ehci_init_le(sc); return; } And the same for all other globally exported functions from ehci.c which are not so many! ehci.c: void EXTERNAL(ehci_init)(ehci_sc_t *sc) { ... same like before ... } ehci_be.c: #define HOST_ENDIAN_BUILD #include > Operations now go through the controller > and are returned but always w/ an error; still working on why. > Maybe a cache sync issue. --HPS From owner-p4-projects@FreeBSD.ORG Sat Dec 13 14:32:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01949106567F; Sat, 13 Dec 2008 14:32:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEC671065679 for ; Sat, 13 Dec 2008 14:32:36 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 83DEB8FC13 for ; Sat, 13 Dec 2008 14:32:36 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDEWa44053216 for ; Sat, 13 Dec 2008 14:32:36 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBDEWaDA053214 for perforce@freebsd.org; Sat, 13 Dec 2008 14:32:36 GMT (envelope-from bms@incunabulum.net) Date: Sat, 13 Dec 2008 14:32:36 GMT Message-Id: <200812131432.mBDEWaDA053214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 14:32:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=154594 Change 154594 by bms@bms_anglepoise on 2008/12/13 14:31:52 Import Intersil/Xicor X1226 RTC driver for i2c bus. Affected files ... .. //depot/projects/mips2/src/sys/dev/iicbus/x1226rtc.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Dec 13 14:36:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5577E1065678; Sat, 13 Dec 2008 14:36:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1989C1065670 for ; Sat, 13 Dec 2008 14:36:41 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2BF68FC16 for ; Sat, 13 Dec 2008 14:36:40 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDEaexM053596 for ; Sat, 13 Dec 2008 14:36:40 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBDEaeqt053594 for perforce@freebsd.org; Sat, 13 Dec 2008 14:36:40 GMT (envelope-from bms@incunabulum.net) Date: Sat, 13 Dec 2008 14:36:40 GMT Message-Id: <200812131436.mBDEaeqt053594@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 14:36:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=154596 Change 154596 by bms@bms_anglepoise on 2008/12/13 14:36:20 add x1226rtc to source files lists for static compilation Affected files ... .. //depot/projects/mips2/src/sys/conf/files#33 edit Differences ... ==== //depot/projects/mips2/src/sys/conf/files#33 (text+ko) ==== @@ -755,6 +755,7 @@ dev/iicbus/iiconf.c optional iicbus dev/iicbus/iicsmb.c optional iicsmb \ dependency "iicbus_if.h" +dev/iicbus/x1226rtc.c optional x1226rtc dev/iir/iir.c optional iir dev/iir/iir_ctrl.c optional iir dev/iir/iir_pci.c optional iir pci From owner-p4-projects@FreeBSD.ORG Sat Dec 13 14:40:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AFAA1065670; Sat, 13 Dec 2008 14:40:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EF9A1065676 for ; Sat, 13 Dec 2008 14:40:50 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D57E8FC14 for ; Sat, 13 Dec 2008 14:40:50 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDEeloY053910 for ; Sat, 13 Dec 2008 14:40:47 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBDEej9f053908 for perforce@freebsd.org; Sat, 13 Dec 2008 14:40:45 GMT (envelope-from bms@incunabulum.net) Date: Sat, 13 Dec 2008 14:40:45 GMT Message-Id: <200812131440.mBDEej9f053908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 14:40:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=154597 Change 154597 by bms@bms_anglepoise on 2008/12/13 14:39:53 add BCM5365 internal PHY definitions Affected files ... .. //depot/projects/mips2/src/sys/dev/mii/bmtphy.c#4 edit .. //depot/projects/mips2/src/sys/dev/mii/miidevs#15 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/mii/bmtphy.c#4 (text+ko) ==== @@ -124,6 +124,7 @@ MII_PHY_DESC(BROADCOM, BCM4401), MII_PHY_DESC(BROADCOM, BCM5201), MII_PHY_DESC(BROADCOM, BCM5221), + MII_PHY_DESC(BROADCOM, BCM5365), MII_PHY_END }; ==== //depot/projects/mips2/src/sys/dev/mii/miidevs#15 (text+ko) ==== @@ -130,6 +130,7 @@ model BROADCOM BCM5201 0x0021 BCM5201 10/100baseTX PHY model BROADCOM BCM5221 0x001e BCM5221 10/100baseTX PHY model BROADCOM BCM4401 0x0036 BCM4401 10/100baseTX PHY +model BROADCOM BCM5365 0x0037 BCM5365 10/100baseTX PHY model xxBROADCOM BCM5400 0x0004 Broadcom 1000baseTX PHY model xxBROADCOM BCM5401 0x0005 BCM5401 10/100/1000baseTX PHY model xxBROADCOM BCM5411 0x0007 BCM5411 10/100/1000baseTX PHY From owner-p4-projects@FreeBSD.ORG Sat Dec 13 17:04:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FD1C1065675; Sat, 13 Dec 2008 17:04:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 63BBA106564A for ; Sat, 13 Dec 2008 17:04:16 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 523138FC13 for ; Sat, 13 Dec 2008 17:04:16 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDH4GDG078796 for ; Sat, 13 Dec 2008 17:04:16 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBDH4F5Z078794 for perforce@freebsd.org; Sat, 13 Dec 2008 17:04:15 GMT (envelope-from bms@incunabulum.net) Date: Sat, 13 Dec 2008 17:04:15 GMT Message-Id: <200812131704.mBDH4F5Z078794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 154600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 17:04:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=154600 Change 154600 by bms@bms_anglepoise on 2008/12/13 17:04:10 Merge changes from my private branch which enable bfe(4) on the BCM5365P SoC to get as far as attaching the PHY; it doesn't get any interrupts, though, most likely due to bfe_pci_setup() needing to be rewritten for SiBa. Affected files ... .. //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#11 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#11 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.45 2008/04/30 02:49:24 yongari Exp $"); #include +#include #include #include #include @@ -79,7 +80,6 @@ static void bfe_init_locked (void *); static void bfe_stop (struct bfe_softc *); static void bfe_watchdog (struct bfe_softc *); -static int bfe_shutdown (device_t); static void bfe_tick (void *); static void bfe_txeof (struct bfe_softc *); static void bfe_rxeof (struct bfe_softc *); @@ -622,8 +622,33 @@ return (0); } +/* + * XXX: The SiBa version of bfe does not have an eeprom. + * We may also need to know the external clock speed of + * the SoC to set up the MDIO registers correctly. + */ +static void +bfe_siba_get_config(struct bfe_softc *sc) +{ + + /* XXX this is bogus */ + sc->bfe_enaddr[0] = 0x00; + sc->bfe_enaddr[1] = 0x0f; + sc->bfe_enaddr[2] = 0xb5; + sc->bfe_enaddr[3] = 0x3d; + sc->bfe_enaddr[4] = 0x52; + sc->bfe_enaddr[5] = 0x90; + + sc->bfe_phyaddr = 0x01; /* XXX */ + + /* unused fields */ + sc->bfe_mdc_port = 0; + sc->bfe_core_unit = 0; + sc->bfe_dma_offset = 0; +} + static void -bfe_get_config(struct bfe_softc *sc) +bfe_pci_get_config(struct bfe_softc *sc) { u_int8_t eeprom[128]; @@ -647,6 +672,17 @@ } static void +bfe_get_config(struct bfe_softc *sc) +{ + + if (sc->bfe_bus_type == BFE_BUS_PCI) { + bfe_pci_get_config(sc); + } else if (sc->bfe_bus_type == BFE_BUS_SIBA) { + bfe_siba_get_config(sc); + } +} + +static void bfe_pci_setup(struct bfe_softc *sc, u_int32_t cores) { u_int32_t bar_orig, pci_rev, val; From owner-p4-projects@FreeBSD.ORG Sat Dec 13 20:09:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B78CA106567D; Sat, 13 Dec 2008 20:09:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A5F81065679; Sat, 13 Dec 2008 20:09:20 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 3B3F08FC18; Sat, 13 Dec 2008 20:09:20 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.14.2/8.14.1) with ESMTP id mBDK8Hg9092309; Sat, 13 Dec 2008 13:08:17 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Sat, 13 Dec 2008 13:08:16 -0700 (MST) Message-Id: <20081213.130816.74659290.imp@bsdimp.com> To: hselasky@c2i.net From: Warner Losh In-Reply-To: <200812131005.33499.hselasky@c2i.net> References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812131005.33499.hselasky@c2i.net> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: sam@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 20:09:21 -0000 From: Hans Petter Selasky Subject: Re: PERFORCE change 154573 for review Date: Sat, 13 Dec 2008 10:05:32 +0100 > On Saturday 13 December 2008, Sam Leffler wrote: > > http://perforce.freebsd.org/chv.cgi?CH=154573 > > > > Change 154573 by sam@sam_ebb on 2008/12/12 23:25:40 > > > > Checkpoint cambria/ixp435 ehci support: add EHCI_SCFLG_BIGEDESC > > flag to force descriptor contents to be left in big-endian byte > > order intead of little-endian; this is required by the ixp435 > > builtin controllers. > > I would prefer if you could implement this using ifdefs. > > ehcireg.h: > > #ifdef HOST_ENDIAN_BUILD > #undef htole32 > #define htole32 htobe32 > ... > #define EXTERNAL(name) name##_be > #else > #define EXTERNAL(name) name##_le > #endif > > ehci_wrap.c: (new file) > > void > ehci_init(ehci_sc_t *sc) > { > if (force use bigendian) > ehci_init_be(sc); > else > ehci_init_le(sc); > return; > } > > And the same for all other globally exported functions from ehci.c which are > not so many! > > ehci.c: > > void > EXTERNAL(ehci_init)(ehci_sc_t *sc) > { > ... same like before ... > } > > ehci_be.c: > #define HOST_ENDIAN_BUILD > #include This is absoultely the wrong way to implement this. It is so wrong, I don't even know where to begin. Consider this an 'over my dead body' level of objection to this design. Warner From owner-p4-projects@FreeBSD.ORG Sat Dec 13 20:14:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C294106568A; Sat, 13 Dec 2008 20:14:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 006741065687 for ; Sat, 13 Dec 2008 20:14:36 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id AB95F8FC28 for ; Sat, 13 Dec 2008 20:14:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id mBDK2tD5094677 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 13 Dec 2008 12:02:56 -0800 (PST) (envelope-from sam@freebsd.org) Message-ID: <494414EF.3080403@freebsd.org> Date: Sat, 13 Dec 2008 12:02:55 -0800 From: Sam Leffler Organization: FreeBSD Project User-Agent: Thunderbird 2.0.0.9 (X11/20071125) MIME-Version: 1.0 To: Hans Petter Selasky References: <200812122326.mBCNQX6w024511@repoman.freebsd.org> <200812131005.33499.hselasky@c2i.net> In-Reply-To: <200812131005.33499.hselasky@c2i.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DCC-sonic.net-Metrics: ebb.errno.com; whitelist Cc: Perforce Change Reviews Subject: Re: PERFORCE change 154573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 20:14:36 -0000 Hans Petter Selasky wrote: > On Saturday 13 December 2008, Sam Leffler wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=154573 >> >> Change 154573 by sam@sam_ebb on 2008/12/12 23:25:40 >> >> Checkpoint cambria/ixp435 ehci support: add EHCI_SCFLG_BIGEDESC >> flag to force descriptor contents to be left in big-endian byte >> order intead of little-endian; this is required by the ixp435 >> builtin controllers. >> > > I would prefer if you could implement this using ifdefs. > > ehcireg.h: > > #ifdef HOST_ENDIAN_BUILD > #undef htole32 > #define htole32 htobe32 > ... > #define EXTERNAL(name) name##_be > #else > #define EXTERNAL(name) name##_le > #endif > I intend to add a global #define to control inclusion of this feature before I push it to the tree. > ehci_wrap.c: (new file) > > void > ehci_init(ehci_sc_t *sc) > { > if (force use bigendian) > ehci_init_be(sc); > else > ehci_init_le(sc); > return; > } > > And the same for all other globally exported functions from ehci.c which are > not so many! > > ehci.c: > > void > EXTERNAL(ehci_init)(ehci_sc_t *sc) > { > ... same like before ... > } > > ehci_be.c: > #define HOST_ENDIAN_BUILD > #include > Er, that's about as bad a coding practice as computed goto's. I haven't decided whether to make the initial ehci controller attach logic generic or leave it buried in the bus space ops as currently done. > >> Operations now go through the controller >> and are returned but always w/ an error; still working on why. >> >> > > Maybe a cache sync issue. > > No. But if you are interested in helping debug the problem I'm happy to send you debug output. The controller rejects all cmds setting the ERRINT status bit. The qTD contents and xfer contents look fine but I haven't been able to identify the cause given the overlay qTD contents. I'm in the process of collecting comparative traces from linux where usb works. Sam From owner-p4-projects@FreeBSD.ORG Sat Dec 13 20:20:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C26671065678; Sat, 13 Dec 2008 20:20:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C9901065672 for ; Sat, 13 Dec 2008 20:20:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 594708FC13 for ; Sat, 13 Dec 2008 20:20:38 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBDKKcWu096938 for ; Sat, 13 Dec 2008 20:20:38 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBDKKbO1096936 for perforce@freebsd.org; Sat, 13 Dec 2008 20:20:37 GMT (envelope-from ed@FreeBSD.org) Date: Sat, 13 Dec 2008 20:20:37 GMT Message-Id: <200812132020.mBDKKbO1096936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 154612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2008 20:20:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=154612 Change 154612 by ed@ed_dull on 2008/12/13 20:20:12 IFC. Affected files ... .. //depot/projects/mpsafetty/contrib/binutils/bfd/config.bfd#2 integrate .. //depot/projects/mpsafetty/contrib/binutils/gas/config/tc-mips.c#2 integrate .. //depot/projects/mpsafetty/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/as/mips-freebsd/itbl-cpu.h#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/as/mips-freebsd/targ-cpu.h#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/ld/Makefile.mips#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/libbfd/Makefile.mips#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/libbfd/bfd.h#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/binutils/libopcodes/Makefile.mips#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/cc/libiberty/config.h#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/sort/config.h#2 integrate .. //depot/projects/mpsafetty/include/string.h#2 integrate .. //depot/projects/mpsafetty/kerberos5/include/config.h#2 integrate .. //depot/projects/mpsafetty/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/mpsafetty/lib/libc/string/strdup.3#3 integrate .. //depot/projects/mpsafetty/lib/libmagic/config.h#2 integrate .. //depot/projects/mpsafetty/sbin/geom/misc/subr.c#2 integrate .. //depot/projects/mpsafetty/sbin/newfs/newfs.c#3 integrate .. //depot/projects/mpsafetty/share/man/man4/acpi_aiboost.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/cxgb.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/ddb.4#12 integrate .. //depot/projects/mpsafetty/share/man/man9/Makefile#12 integrate .. //depot/projects/mpsafetty/share/man/man9/VOP_VPTOCNP.9#1 branch .. //depot/projects/mpsafetty/share/man/man9/ifnet.9#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/mpsafetty/sys/amd64/include/apicreg.h#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/mpsafetty/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/mpsafetty/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/mpsafetty/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_signal.h#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/mpsafetty/sys/conf/files#33 integrate .. //depot/projects/mpsafetty/sys/conf/options#17 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ah_eeprom_v14.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ah_eeprom_v3.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ar5212/ar5111.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ar5312/ar5312.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/re/if_re.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/sis/if_sis.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#19 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/ng_ubt2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/ubtbcmfw2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/at91dci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/musb2_otg.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/musb2_otg_atmelarm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ohci2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/uhci2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/usb2_controller.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_busdma.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_busdma.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_compat_linux.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_compat_linux.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_config_td.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_config_td.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_core.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_debug.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dev.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dev.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_device.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_device.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dynamic.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dynamic.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_error.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_handle_request.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hid.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hub.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hub.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_lookup.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_mbuf.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_msctest.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_msctest.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_parse.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_process.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_process.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_request.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_request.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_sw_transfer.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_sw_transfer.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_transfer.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_transfer.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_util.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_aue2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_axe2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_cdce2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_cue2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_kue2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_rue2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_udav2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/usb2_ethernet.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/usb2_ethernet.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/image/uscanner2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/input/uhid2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/input/ukbd2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/input/ums2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/misc/udbp2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/misc/ufm2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/quirk/usb2_quirk.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/uark2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ubsa2.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ubser2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/uchcom2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ucycom2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ufoma2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/uftdi2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ugensa2.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/uipaq2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ulpt2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/umct2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/umodem2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/umoscom2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/uplcom2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/usb2_serial.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/usb2_serial.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/uvisor2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/uvscom2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/sound/uaudio2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/sound/uaudio2.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/storage/ata-usb2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/storage/umass2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/storage/urio2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/storage/ustorage2_fs.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/template/usb2_template.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_rum2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_ural2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/wlan/if_zyd2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/vr/if_vr.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/mpsafetty/sys/fs/procfs/procfs_map.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/exception.s#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/mpsafetty/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/mpsafetty/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/specialreg.h#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_jail.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/kern_linker.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_poll.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#15 integrate .. //depot/projects/mpsafetty/sys/kern/kern_prot.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_vimage.c#1 branch .. //depot/projects/mpsafetty/sys/kern/subr_param.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_prf.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/subr_trap.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#25 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_cache.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_default.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vnode_if.src#4 integrate .. //depot/projects/mpsafetty/sys/mips/adm5120/adm5120_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/modules/aio/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/net/if.c#12 integrate .. //depot/projects/mpsafetty/sys/net/if_bridge.c#7 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.c#6 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.h#3 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#8 integrate .. //depot/projects/mpsafetty/sys/net/if_var.h#6 integrate .. //depot/projects/mpsafetty/sys/net/pfil.h#2 integrate .. //depot/projects/mpsafetty/sys/net/raw_cb.h#3 integrate .. //depot/projects/mpsafetty/sys/net/route.c#11 integrate .. //depot/projects/mpsafetty/sys/net/rtsock.c#8 integrate .. //depot/projects/mpsafetty/sys/net/vnet.h#3 integrate .. //depot/projects/mpsafetty/sys/netgraph/netgraph.h#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_bridge.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#8 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_ipfw.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/icmp6.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/icmp_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/mpsafetty/sys/netinet/in_proto.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/in_var.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_divert.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw_pfil.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_output.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_var.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_sack.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/vinet.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_ifattach.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_proto.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/vinet6.h#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipip_var.h#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#8 integrate .. //depot/projects/mpsafetty/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/mpsafetty/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/mpsafetty/sys/pci/if_rlreg.h#9 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/cuda.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/cudavar.h#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/pmu.c#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/pmuvar.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/aio.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/kernel.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#22 integrate .. //depot/projects/mpsafetty/sys/sys/pmc.h#6 integrate .. //depot/projects/mpsafetty/sys/sys/resource.h#4 integrate .. //depot/projects/mpsafetty/sys/sys/rwlock.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/sysctl.h#6 integrate .. //depot/projects/mpsafetty/sys/sys/vimage.h#6 integrate .. //depot/projects/mpsafetty/sys/sys/vnode.h#9 integrate .. //depot/projects/mpsafetty/usr.bin/cpuset/cpuset.1#4 integrate .. //depot/projects/mpsafetty/usr.bin/fetch/fetch.1#2 integrate .. //depot/projects/mpsafetty/usr.bin/fetch/fetch.c#3 integrate .. //depot/projects/mpsafetty/usr.bin/file/config.h#2 integrate .. //depot/projects/mpsafetty/usr.sbin/fifolog/lib/fifolog_int.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/fifolog/lib/fifolog_reader.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/fwcontrol/fwmpegts.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/jexec/jexec.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/jls/jls.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/install.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.h#4 integrate Differences ... ==== //depot/projects/mpsafetty/contrib/binutils/bfd/config.bfd#2 (text+ko) ==== @@ -768,6 +768,10 @@ targ_defvec=bfd_elf32_littlemips_vec targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; + mips*-*-freebsd*) + targ_defvec=bfd_elf32_tradbigmips_vec + targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec" + ;; mips*-*-netbsd*) targ_defvec=bfd_elf32_bigmips_vec targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" ==== //depot/projects/mpsafetty/contrib/binutils/gas/config/tc-mips.c#2 (text+ko) ==== @@ -281,6 +281,9 @@ #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI) +/* True if relocations are stored in-place. */ +#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI) + /* We can only have 64bit addresses if the object file format supports it. */ #define HAVE_32BIT_ADDRESSES \ @@ -13020,6 +13023,26 @@ if (fixp->fx_addsy == NULL) return 1; + /* If symbol SYM is in a mergeable section, relocations of the form + SYM + 0 can usually be made section-relative. The mergeable data + is then identified by the section offset rather than by the symbol. + + However, if we're generating REL LO16 relocations, the offset is split + between the LO16 and parterning high part relocation. The linker will + need to recalculate the complete offset in order to correctly identify + the merge data. + + The linker has traditionally not looked for the parterning high part + relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be + placed anywhere. Rather than break backwards compatibility by changing + this, it seems better not to force the issue, and instead keep the + original symbol. This will work with either linker behavior. */ + if ((fixp->fx_r_type == BFD_RELOC_LO16 + || reloc_needs_lo_p (fixp->fx_r_type)) + && HAVE_IN_PLACE_ADDENDS + && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0) + return 0; + #ifdef OBJ_ELF if (OUTPUT_FLAVOR == bfd_target_elf_flavour && S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16 ==== //depot/projects/mpsafetty/gnu/usr.bin/binutils/as/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.18 2006/10/09 04:52:14 kmacy Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.19 2008/12/11 08:15:14 imp Exp $ # BINDIR @@ -20,6 +20,10 @@ # DEO: why not used? #SRCS+= itbl-ops.c +.if ${TARGET_ARCH} == "mips" +SRCS+= itbl-ops.c itbl-parse.y itbl-lex.l +.endif + .if ${TARGET_ARCH} == "amd64" SRCS+= tc-i386.c .elif ${TARGET_ARCH} == "powerpc" ==== //depot/projects/mpsafetty/gnu/usr.bin/binutils/libbfd/bfd.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.4 2007/02/11 07:15:06 marcel Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/bfd.h,v 1.5 2008/12/11 08:20:34 imp Exp $ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", @@ -57,7 +57,7 @@ #define BFD_ARCH_SIZE 64 -#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) +#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__) #define BFD_HOST_64BIT_LONG 0 #define BFD_HOST_64_BIT long long #define BFD_HOST_U_64_BIT unsigned long long ==== //depot/projects/mpsafetty/gnu/usr.bin/cc/libiberty/config.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* config.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ -/* $FreeBSD: src/gnu/usr.bin/cc/libiberty/config.h,v 1.1 2007/05/19 04:25:59 kan Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/libiberty/config.h,v 1.2 2008/12/08 21:04:24 kib Exp $ */ /* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. This function is required for alloca.c support on those systems. */ @@ -235,7 +235,7 @@ #define HAVE_STRNCASECMP 1 /* Define to 1 if you have the `strndup' function. */ -/* #undef HAVE_STRNDUP */ +#define HAVE_STRNDUP 1 /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 ==== //depot/projects/mpsafetty/gnu/usr.bin/groff/tmac/mdoc.local#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.64 2008/08/06 14:02:05 dfr Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.66 2008/12/13 16:13:37 ru Exp $ .\" .\" %beginstrip% . @@ -69,6 +69,8 @@ . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.3 6.3 +.ds doc-operating-system-FreeBSD-6.4 6.4 +.ds doc-operating-system-FreeBSD-7.1 7.1 .ds doc-operating-system-FreeBSD-8.0 8.0 . .ec ==== //depot/projects/mpsafetty/gnu/usr.bin/sort/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.10 2008/05/05 16:12:28 jhb Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.11 2008/12/08 21:04:24 kib Exp $ */ /* config.h. Generated by configure. */ /* config.hin. Generated from configure.ac by autoheader. */ @@ -759,7 +759,7 @@ #define HAVE_STRNCASECMP 1 /* Define to 1 if you have the `strndup' function. */ -/* #undef HAVE_STRNDUP */ +#define HAVE_STRNDUP 1 /* Define to 1 if you have the `strpbrk' function. */ #define HAVE_STRPBRK 1 ==== //depot/projects/mpsafetty/include/string.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.26 2008/04/10 00:12:43 delphij Exp $ + * $FreeBSD: src/include/string.h,v 1.27 2008/12/08 21:04:24 kib Exp $ */ #ifndef _STRING_H_ @@ -96,6 +96,7 @@ int strncmp(const char *, const char *, size_t) __pure; char *strncpy(char * __restrict, const char * __restrict, size_t); #if __BSD_VISIBLE +char *strndup(const char *, size_t); char *strnstr(const char *, const char *, size_t) __pure; #endif char *strpbrk(const char *, const char *) __pure; ==== //depot/projects/mpsafetty/kerberos5/include/config.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* include/config.h. Generated from config.h.in by configure. */ /* include/config.h.in. Generated from configure.in by autoheader. */ -/* $FreeBSD: src/kerberos5/include/config.h,v 1.16 2008/05/07 13:53:03 dfr Exp $ */ +/* $FreeBSD: src/kerberos5/include/config.h,v 1.17 2008/12/08 21:04:24 kib Exp $ */ #include @@ -785,7 +785,7 @@ #define HAVE_STRNCASECMP 1 /* Define if you have the function `strndup'. */ -/* #undef HAVE_STRNDUP */ +#define HAVE_STRNDUP 1 /* Define if you have the function `strnlen'. */ /* #undef HAVE_STRNLEN */ ==== //depot/projects/mpsafetty/lib/bind/bind/port_after.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.3 2006/12/10 07:11:03 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/bind/port_after.h,v 1.4 2008/12/08 21:04:24 kib Exp $ */ #ifndef port_after_h #define port_after_h @@ -30,7 +30,7 @@ #undef HAS_IN_ADDR6 #define HAVE_SOCKADDR_STORAGE 1 #undef NEED_GETTIMEOFDAY -#undef HAVE_STRNDUP +#define HAVE_STRNDUP 1 #undef USE_FIONBIO_IOCTL #undef USE_SYSERROR_LIST #undef INNETGR_ARGS ==== //depot/projects/mpsafetty/lib/libc/stdio/vfprintf.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.81 2008/06/29 22:54:26 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.83 2008/12/11 02:39:27 das Exp $"); /* * Actual printf innards. @@ -396,12 +396,6 @@ char sign; /* sign prefix (' ', '+', '-', or \0) */ char thousands_sep; /* locale specific thousands separator */ const char *grouping; /* locale specific numeric grouping rules */ - - if (__use_xprintf == 0 && getenv("USE_XPRINTF")) - __use_xprintf = 1; - if (__use_xprintf > 0) - return (__xvprintf(fp, fmt0, ap)); - #ifndef NO_FLOATING_POINT /* * We can decompose the printed representation of floating @@ -568,14 +562,11 @@ val = GETARG (int); \ } + if (__use_xprintf == 0 && getenv("USE_XPRINTF")) + __use_xprintf = 1; + if (__use_xprintf > 0) + return (__xvprintf(fp, fmt0, ap)); - thousands_sep = '\0'; - grouping = NULL; - convbuf = NULL; -#ifndef NO_FLOATING_POINT - dtoaresult = NULL; - decimal_point = localeconv()->decimal_point; -#endif /* sorry, fprintf(read_only_file, "") returns EOF, not 0 */ if (prepwrite(fp) != 0) return (EOF); @@ -585,6 +576,9 @@ fp->_file >= 0) return (__sbprintf(fp, fmt0, ap)); + thousands_sep = '\0'; + grouping = NULL; + convbuf = NULL; fmt = (char *)fmt0; argtable = NULL; nextarg = 1; @@ -593,6 +587,10 @@ uio.uio_resid = 0; uio.uio_iovcnt = 0; ret = 0; +#ifndef NO_FLOATING_POINT + dtoaresult = NULL; + decimal_point = localeconv()->decimal_point; +#endif /* * Scan the format for conversions (`%' character). ==== //depot/projects/mpsafetty/lib/libc/stdio/vfwprintf.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* LIBC_SCCS and not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.33 2008/08/04 06:55:42 cperciva Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.34 2008/12/11 02:39:27 das Exp $"); /* * Actual wprintf innards. @@ -575,12 +575,6 @@ } - thousands_sep = '\0'; - grouping = NULL; -#ifndef NO_FLOATING_POINT - decimal_point = localeconv()->decimal_point; -#endif - convbuf = NULL; /* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */ if (prepwrite(fp) != 0) return (EOF); @@ -590,11 +584,17 @@ fp->_file >= 0) return (__sbprintf(fp, fmt0, ap)); + thousands_sep = '\0'; + grouping = NULL; + convbuf = NULL; fmt = (wchar_t *)fmt0; argtable = NULL; nextarg = 1; va_copy(orgap, ap); ret = 0; +#ifndef NO_FLOATING_POINT + decimal_point = localeconv()->decimal_point; +#endif /* * Scan the format for conversions (`%' character). ==== //depot/projects/mpsafetty/lib/libc/string/strdup.3#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)strdup.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/strdup.3,v 1.12 2008/12/06 09:37:54 kib Exp $ +.\" $FreeBSD: src/lib/libc/string/strdup.3,v 1.13 2008/12/09 09:24:25 maxim Exp $ .\" -.Dd Dec 5, 2008 +.Dd December 5, 2008 .Dt STRDUP 3 .Os .Sh NAME ==== //depot/projects/mpsafetty/lib/libmagic/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libmagic/config.h,v 1.7 2008/01/13 20:37:19 obrien Exp $ */ +/* $FreeBSD: src/lib/libmagic/config.h,v 1.8 2008/12/08 21:04:24 kib Exp $ */ #include @@ -77,7 +77,7 @@ #define HAVE_STRING_H 1 /* Define to 1 if you have the `strndup' function. */ -/* #undef HAVE_STRNDUP */ +#define HAVE_STRNDUP 1 /* Define to 1 if you have the `strtof' function. */ #define HAVE_STRTOF 1 ==== //depot/projects/mpsafetty/sbin/geom/misc/subr.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.8 2008/06/06 22:44:03 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/misc/subr.c,v 1.9 2008/12/13 14:14:56 lulf Exp $"); #include #include @@ -211,7 +211,7 @@ sector = NULL; error = 0; - fd = open(path, O_WRONLY); + fd = open(path, O_RDWR); if (fd == -1) return (errno); mediasize = g_get_mediasize(name); ==== //depot/projects/mpsafetty/sbin/newfs/newfs.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.86 2008/12/03 18:36:59 luigi Exp $"); +__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.87 2008/12/12 15:56:38 luigi Exp $"); /* * newfs: friendly front end to mkfs @@ -354,11 +354,6 @@ mediasize = st.st_size; /* set fssize from the partition */ } else { - part_name = special[strlen(special) - 1]; - if ((part_name < 'a' || part_name > 'h') && !isdigit(part_name)) - errx(1, "%s: can't figure out file system partition", - special); - if (sectorsize == 0) if (ioctl(disk.d_fd, DIOCGSECTORSIZE, §orsize) == -1) sectorsize = 0; /* back out on error for safety */ @@ -368,6 +363,12 @@ pp = NULL; lp = getdisklabel(special); if (lp != NULL) { + if (!is_file) /* already set for files */ + part_name = special[strlen(special) - 1]; + if ((part_name < 'a' || part_name - 'a' >= MAXPARTITIONS) && + !isdigit(part_name)) + errx(1, "%s: can't figure out file system partition", + special); cp = &part_name; if (isdigit(*cp)) pp = &lp->d_partitions[RAW_PART]; ==== //depot/projects/mpsafetty/share/man/man4/acpi_aiboost.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (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: src/share/man/man4/acpi_aiboost.4,v 1.1 2008/08/21 00:40:55 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man4/acpi_aiboost.4,v 1.2 2008/12/13 09:33:03 schweikh Exp $ .\" .Dd March 14, 2007 .Dt ACPI_AIBOOST 4 @@ -56,8 +56,8 @@ descriptions and provides its data via the .Xr sysctl 8 interface, under dev.acpi_aiboost.0 namespace. -Descriptions for these values are set to sysctl description, -which can be see with sysctl -d. +Descriptions for these values are available +with sysctl -d. .Pp The .Nm ==== //depot/projects/mpsafetty/share/man/man4/cxgb.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007, Chelsio Inc +.\" Copyright (c) 2007-2008, Chelsio Inc .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.\" $FreeBSD: src/share/man/man4/cxgb.4,v 1.8 2007/09/26 21:31:47 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/cxgb.4,v 1.9 2008/12/12 05:45:39 kmacy Exp $ .\" .Dd March 14, 2007 .Dt CXGB 4 @@ -56,7 +56,8 @@ The .Nm driver supports Transmit/Receive checksum offload, -Jumbo Frames as well as TCP segmentation offload (TSO). +Jumbo Frames, TCP segmentation offload (TSO), Large Receive Offload (LRO), +VLAN hardware insertion / extraction, and VLAN checksum offload. For further hardware information, see .Pa http://www.chelsio.com/ . .Pp @@ -76,7 +77,7 @@ .Sh HARDWARE The .Nm -driver supports 10 Gigabit Ethernet adapters based on the T3 and T3B chipset: +driver supports 10 Gigabit and 1 Gigabit Ethernet adapters based on the T3 and T3B chipset: .Pp .Bl -bullet -compact .It @@ -111,7 +112,7 @@ If an issue is identified with the released source code on the supported kernel with a supported adapter, email the specific information related to the issue to -.Aq help@chelsio.com . +.Aq support@chelsio.com . .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , ==== //depot/projects/mpsafetty/share/man/man4/ddb.4#12 (text+ko) ==== @@ -58,7 +58,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.62 2008/11/29 14:32:14 bz Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.63 2008/12/12 05:42:57 jhb Exp $ .\" .Dd November 29, 2008 .Dt DDB 4 @@ -102,10 +102,7 @@ .Sh DESCRIPTION The .Nm -kernel debugger has most of the features of the old -.Nm kdb , -but with a more rational syntax -inspired by +kernel debugger is an interactive debugger with a syntax inspired by .Xr gdb 1 . If linked into the running kernel, it can be invoked locally with the @@ -202,7 +199,7 @@ .Nm emacs control keys, the usual .Tn ANSI -arrow keys might be used to +arrow keys may be used to browse through the history buffer, and move the cursor within the current line. .Sh COMMANDS @@ -254,8 +251,6 @@ display as an instruction with possible alternate formats depending on the machine: .Bl -tag -width ".Tn powerpc" -compact -.It Tn alpha -Show the registers of the instruction. .It Tn amd64 No alternate format. .It Tn i386 ==== //depot/projects/mpsafetty/share/man/man9/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.344 2008/11/23 20:05:12 hrs Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.345 2008/12/12 01:08:28 marcus Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -352,6 +352,7 @@ VOP_SETACL.9 \ VOP_SETEXTATTR.9 \ VOP_STRATEGY.9 \ + VOP_VPTOCNP.9 \ VOP_VPTOFH.9 \ vput.9 \ vref.9 \ ==== //depot/projects/mpsafetty/share/man/man9/ifnet.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.53 2007/03/14 13:19:50 bms Exp $ +.\" $FreeBSD: src/share/man/man9/ifnet.9,v 1.54 2008/12/11 22:51:11 kmacy Exp $ .\" .Dd March 14, 2007 .Os @@ -103,6 +103,10 @@ .Ft void .Fn \*(lp*if_start\*(rp "struct ifnet *ifp" .Ft int +.Fn \*(lp*if_transmit\*(rp "struct ifnet *ifp" "struct mbuf *m" +.Ft void +.Fn \*(lp*if_qflush\*(rp "struct ifnet *ifp" +.Ft int .Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "int cmd" "caddr_t data" .Ft void .Fn \*(lp*if_watchdog\*(rp "struct ifnet *ifp" @@ -350,6 +354,20 @@ Output a packet on interface .Fa ifp , or queue it on the output queue if the interface is already active. +.It Fn if_transmit +Transmit a packet on an interface or queue it if the interface is +in use. This function will return +.Dv ENOBUFS +if the devices software and hardware queues are both full. This +function must be installed after +.It Fn if_qflush +Free mbufs in internally managed queues when the interface is marked down. +This function must be installed after +.Fn if_attach +to override the default implementation. This function is exposed in order +to allow drivers to manage their own queues and to reduce the latency +caused by a frequently gratuitous enqueue / dequeue pair to ifq. The +suggested internal software queueing mechanism is buf_ring. .It Fn if_start Start queued output on an interface. This function is exposed in @@ -363,7 +381,8 @@ (Thus, .Dv IFF_OACTIVE does not literally mean that output is active, but rather that the -device's internal output queue is full.) +device's internal output queue is full.) Please note that this function +will soon be deprecated. .It Fn if_done Not used. We are not even sure what it was ever for. ==== //depot/projects/mpsafetty/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.133 2008/08/18 08:47:27 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.134 2008/12/13 13:07:12 jkoshy Exp $ */ #include "opt_atpic.h" @@ -480,16 +480,20 @@ /* * At this point the processor has exited NMI mode and is running * with interrupts turned off on the normal kernel stack. - * We turn interrupts back on, and take the usual 'doreti' exit - * path. * * If a pending NMI gets recognized at or after this point, it - * will cause a kernel callchain to be traced. Since this path - * is only taken for NMI interrupts from user space, our `swapgs' - * state is correct for taking the doreti path. + * will cause a kernel callchain to be traced. + * + * We turn interrupts back on, and call the user callchain capture hook. */ + movq pmc_hook,%rax + orq %rax,%rax + jz nocallchain + movq PCPU(CURTHREAD),%rdi /* thread */ + movq $PMC_FN_USER_CALLCHAIN,%rsi /* command */ + movq %rsp,%rdx /* frame */ sti - jmp doreti + call *%rax nocallchain: #endif testl %ebx,%ebx ==== //depot/projects/mpsafetty/sys/amd64/amd64/genassym.c#4 (text+ko) ==== @@ -33,9 +33,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.170 2008/09/08 09:59:05 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.171 2008/12/12 16:09:34 jkoshy Exp $"); #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include "opt_kstack_pages.h" #include @@ -44,6 +45,9 @@ #include #include #include +#ifdef HWPMC_HOOKS +#include +#endif #include #include #include @@ -216,3 +220,7 @@ ASSYM(SEL_RPL_MASK, SEL_RPL_MASK); ASSYM(MSR_GSBASE, MSR_GSBASE); + +#ifdef HWPMC_HOOKS +ASSYM(PMC_FN_USER_CALLCHAIN, PMC_FN_USER_CALLCHAIN); +#endif ==== //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.167 2008/11/30 00:10:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.168 2008/12/12 23:17:00 jkim Exp $"); #include "opt_cpu.h" @@ -322,15 +322,15 @@ "\003SVM" /* Secure Virtual Mode */ "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ - "\006" - "\007" - "\010" + "\006ABM" /* LZCNT instruction */ + "\007SSE4A" /* SSE4A */ + "\010MAS" /* Misaligned SSE mode */ "\011Prefetch" /* 3DNow! Prefetch/PrefetchW */ - "\012" - "\013" - "\014" - "\015" - "\016" + "\012OSVW" /* OS visible workaround */ + "\013IBS" /* Instruction based sampling */ + "\014SSE5" /* SSE5 */ + "\015SKINIT" /* SKINIT/STGI */ + "\016WDT" /* Watchdog timer */ "\017" "\020" "\021" ==== //depot/projects/mpsafetty/sys/amd64/amd64/local_apic.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.49 2008/11/26 19:25:13 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.50 2008/12/11 15:56:30 jhb Exp $"); #include "opt_hwpmc_hooks.h" >>> TRUNCATED FOR MAIL (1000 lines) <<<