PERFORCE change 102842 for review
Paolo Pisati
piso at FreeBSD.org
Mon Jul 31 09:48:53 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=102842
Change 102842 by piso at piso_newluxor on 2006/07/31 09:48:15
IFC
Affected files ...
.. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_cpio.c#2 integrate
.. //depot/projects/soc2005/libalias/lib/libmp/mpasbn.c#3 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#1 branch
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#1 branch
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#1 branch
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#1 branch
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#1 branch
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#1 branch
.. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#1 branch
.. //depot/projects/soc2005/libalias/release/doc/share/examples/Makefile.relnotesng#2 integrate
.. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/soc2005/libalias/usr.bin/tar/read.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.bin/tar/write.c#2 integrate
.. //depot/projects/soc2005/libalias/usr.sbin/kldxref/Makefile#3 integrate
Differences ...
==== //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_cpio.c#2 (text+ko) ====
@@ -25,9 +25,12 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.17 2006/03/21 16:55:46 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.18 2006/07/30 18:33:20 kientzle Exp $");
#include <sys/stat.h>
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#endif
#include <errno.h>
/* #include <stdint.h> */ /* See archive_platform.h */
==== //depot/projects/soc2005/libalias/lib/libmp/mpasbn.c#3 (text+ko) ====
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.4 2006/07/28 23:00:16 simon Exp $");
+__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.5 2006/07/30 19:29:26 simon Exp $");
#include <ctype.h>
#include <err.h>
@@ -95,15 +95,16 @@
static MINT *_itom(const char *, short);
static void _madd(const char *, const MINT *, const MINT *, MINT *);
static int _mcmpa(const char *, const MINT *, const MINT *);
-static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *);
+static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *,
+ BN_CTX *);
static void _mfree(const char *, MINT *);
static void _moveb(const char *, const BIGNUM *, MINT *);
static void _movem(const char *, const MINT *, MINT *);
static void _msub(const char *, const MINT *, const MINT *, MINT *);
static char *_mtod(const char *, const MINT *);
static char *_mtox(const char *, const MINT *);
-static void _mult(const char *, const MINT *, const MINT *, MINT *);
-static void _sdiv(const char *, const MINT *, short, MINT *, short *);
+static void _mult(const char *, const MINT *, const MINT *, MINT *, BN_CTX *);
+static void _sdiv(const char *, const MINT *, short, MINT *, short *, BN_CTX *);
static MINT *_xtom(const char *, const char *);
/*
@@ -223,14 +224,11 @@
* Compute qmp=nmp/dmp and rmp=nmp%dmp.
*/
static void
-_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp)
+_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp,
+ BN_CTX *c)
{
BIGNUM q, r;
- BN_CTX *c;
- c = BN_CTX_new();
- if (c == NULL)
- _bnerr(msg);
BN_init(&r);
BN_init(&q);
BN_ERRCHECK(msg, BN_div(&q, &r, nmp->bn, dmp->bn, c));
@@ -238,14 +236,18 @@
_moveb(msg, &r, rmp);
BN_free(&q);
BN_free(&r);
- BN_CTX_free(c);
}
void
mdiv(const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp)
{
+ BN_CTX *c;
- _mdiv("mdiv", nmp, dmp, qmp, rmp);
+ c = BN_CTX_new();
+ if (c == NULL)
+ _bnerr("mdiv");
+ _mdiv("mdiv", nmp, dmp, qmp, rmp, c);
+ BN_CTX_free(c);
}
/*
@@ -357,11 +359,15 @@
void
msqrt(const MINT *nmp, MINT *xmp, MINT *rmp)
{
+ BN_CTX *c;
MINT *tolerance;
MINT *ox, *x;
MINT *z1, *z2, *z3;
short i;
+ c = BN_CTX_new();
+ if (c == NULL)
+ _bnerr("msqrt");
tolerance = _itom("msqrt", 1);
x = _itom("msqrt", 1);
ox = _itom("msqrt", 0);
@@ -370,13 +376,13 @@
z3 = _itom("msqrt", 0);
do {
_movem("msqrt", x, ox);
- _mdiv("msqrt", nmp, x, z1, z2);
+ _mdiv("msqrt", nmp, x, z1, z2, c);
_madd("msqrt", x, z1, z2);
- _sdiv("msqrt", z2, 2, x, &i);
+ _sdiv("msqrt", z2, 2, x, &i, c);
_msub("msqrt", ox, x, z3);
} while (_mcmpa("msqrt", z3, tolerance) == 1);
_movem("msqrt", x, xmp);
- _mult("msqrt", x, x, z1);
+ _mult("msqrt", x, x, z1, c);
_msub("msqrt", nmp, z1, z2);
_movem("msqrt", z2, rmp);
_mfree("msqrt", tolerance);
@@ -385,6 +391,7 @@
_mfree("msqrt", z1);
_mfree("msqrt", z2);
_mfree("msqrt", z3);
+ BN_CTX_free(c);
}
/*
@@ -470,26 +477,26 @@
* Compute rmp=mp1*mp2.
*/
static void
-_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp)
+_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp, BN_CTX *c)
{
BIGNUM b;
- BN_CTX *c;
- c = BN_CTX_new();
- if (c == NULL)
- _bnerr(msg);
BN_init(&b);
BN_ERRCHECK(msg, BN_mul(&b, mp1->bn, mp2->bn, c));
_moveb(msg, &b, rmp);
BN_free(&b);
- BN_CTX_free(c);
}
void
mult(const MINT *mp1, const MINT *mp2, MINT *rmp)
{
+ BN_CTX *c;
- _mult("mult", mp1, mp2, rmp);
+ c = BN_CTX_new();
+ if (c == NULL)
+ _bnerr("mult");
+ _mult("mult", mp1, mp2, rmp, c);
+ BN_CTX_free(c);
}
/*
@@ -538,16 +545,13 @@
* Compute qmp=nmp/d and ro=nmp%d.
*/
static void
-_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro)
+_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro,
+ BN_CTX *c)
{
MINT *dmp, *rmp;
BIGNUM q, r;
- BN_CTX *c;
char *s;
- c = BN_CTX_new();
- if (c == NULL)
- _bnerr(msg);
BN_init(&q);
BN_init(&r);
dmp = _itom(msg, d);
@@ -565,14 +569,18 @@
_mfree(msg, rmp);
BN_free(&r);
BN_free(&q);
- BN_CTX_free(c);
}
void
sdiv(const MINT *nmp, short d, MINT *qmp, short *ro)
{
+ BN_CTX *c;
- _sdiv("sdiv", nmp, d, qmp, ro);
+ c = BN_CTX_new();
+ if (c == NULL)
+ _bnerr("sdiv");
+ _sdiv("sdiv", nmp, d, qmp, ro, c);
+ BN_CTX_free(c);
}
/*
==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../..
@@ -6,6 +6,7 @@
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
+SUBDIR+= powerpc
SUBDIR+= sparc64
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ====
@@ -1,5 +1,5 @@
<!-- -*- sgml -*- -->
-<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent,v 1.5 2003/06/27 03:50:35 bmah Exp $ -->
+<!-- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent,v 1.6 2006/07/31 01:32:29 marcel Exp $ -->
<!-- Text constants which probably don't need to be changed.-->
@@ -11,6 +11,7 @@
<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.sgml">
<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
+<!ENTITY sect.proc.powerpc SYSTEM "../powerpc/proc-powerpc.sgml">
<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.4 2006/07/31 01:27:16 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../../..
@@ -11,7 +11,7 @@
# SGML content
SRCS+= article.sgml
-# SRCS+= proc-ia64.sgml
+SRCS+= proc-ia64.sgml
SRCS+= ../common/hw.ent
SRCS+= ../common/artheader.sgml
SRCS+= ../common/dev.sgml
==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/installation/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../..
@@ -6,6 +6,7 @@
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
+SUBDIR+= powerpc
SUBDIR+= sparc64
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
==== //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $
+# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $
RELN_ROOT?= ${.CURDIR}/../..
@@ -6,6 +6,7 @@
SUBDIR+= ia64
SUBDIR+= i386
SUBDIR+= pc98
+SUBDIR+= powerpc
SUBDIR+= sparc64
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
==== //depot/projects/soc2005/libalias/release/doc/share/examples/Makefile.relnotesng#2 (text+ko) ====
@@ -1,12 +1,12 @@
# -*- makefile -*-
#
-# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.12 2006/05/16 16:12:45 bmah Exp $
+# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.13 2006/07/31 01:32:30 marcel Exp $
#
# Sample makefile for rendering and uploading RELNOTESng files outside
# the build tree.
#
-ARCHS= amd64 ia64 i386 pc98 sparc64
+ARCHS= amd64 ia64 i386 pc98 powerpc sparc64
MULTITEXTS= installation relnotes hardware
UNITEXTS= readme errata
==== //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.69 2006/06/28 16:04:54 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.70 2006/07/30 23:25:21 wpaul Exp $");
/*
* RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
@@ -172,17 +172,17 @@
"RealTek 8139C+ 10/100BaseTX" },
{ RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E,
"RealTek 8101E PCIe 10/100baseTX" },
- { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168,
- "RealTek 8168B PCIe Gigabit Ethernet" },
- { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8111,
- "RealTek 8111B PCIe Gigabit Ethernet" },
+ { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168_SPIN1,
+ "RealTek 8168/8111B PCIe Gigabit Ethernet" },
+ { RT_VENDORID, RT_DEVICEID_8168, RL_HWREV_8168_SPIN2,
+ "RealTek 8168/8111B PCIe Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169,
"RealTek 8169 Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169S,
"RealTek 8169S Single-chip Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SB,
"RealTek 8169SB/8110SB Single-chip Gigabit Ethernet" },
- { RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8169_8110SC,
+ { RT_VENDORID, RT_DEVICEID_8169SC, RL_HWREV_8169_8110SC,
"RealTek 8169SC/8110SC Single-chip Gigabit Ethernet" },
{ RT_VENDORID, RT_DEVICEID_8169, RL_HWREV_8110S,
"RealTek 8110S Single-chip Gigabit Ethernet" },
@@ -202,7 +202,7 @@
{ RL_HWREV_8139C, RL_8139, "C" },
{ RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C" },
{ RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+"},
- { RL_HWREV_8168, RL_8169, "8168"},
+ { RL_HWREV_8168_SPIN1, RL_8169, "8168"},
{ RL_HWREV_8169, RL_8169, "8169"},
{ RL_HWREV_8169S, RL_8169, "8169S"},
{ RL_HWREV_8110S, RL_8169, "8110S"},
@@ -212,7 +212,7 @@
{ RL_HWREV_8101, RL_8139, "8101"},
{ RL_HWREV_8100E, RL_8169, "8100E"},
{ RL_HWREV_8101E, RL_8169, "8101E"},
- { RL_HWREV_8111, RL_8169, "8111"},
+ { RL_HWREV_8168_SPIN2, RL_8169, "8168"},
{ 0, 0, NULL }
};
@@ -935,6 +935,8 @@
struct rl_dmaload_arg *ctx;
struct rl_desc *d = NULL;
int i = 0, idx;
+ u_int32_t cmdstat;
+ int totlen = 0;
if (error)
return;
@@ -960,13 +962,13 @@
*/
idx = ctx->rl_idx;
for (;;) {
- u_int32_t cmdstat;
d = &ctx->rl_ring[idx];
if (le32toh(d->rl_cmdstat) & RL_RDESC_STAT_OWN) {
ctx->rl_maxsegs = 0;
return;
}
cmdstat = segs[i].ds_len;
+ totlen += segs[i].ds_len;
d->rl_bufaddr_lo = htole32(RL_ADDR_LO(segs[i].ds_addr));
d->rl_bufaddr_hi = htole32(RL_ADDR_HI(segs[i].ds_addr));
if (i == 0)
@@ -982,6 +984,26 @@
RL_DESC_INC(idx);
}
+ /*
+ * With some of the RealTek chips, using the checksum offload
+ * support in conjunction with the autopadding feature results
+ * in the transmission of corrupt frames. For example, if we
+ * need to send a really small IP fragment that's less than 60
+ * bytes in size, and IP header checksumming is enabled, the
+ * resulting ethernet frame that appears on the wire will
+ * have garbled payload. To work around this, if TX checksum
+ * offload is enabled, we always manually pad short frames out
+ * to the minimum ethernet frame size. We do this by lying
+ * about the size of the final fragment in the DMA map.
+ */
+
+ if (ctx->rl_flags && totlen < (ETHER_MIN_LEN - ETHER_CRC_LEN)) {
+ i = cmdstat & 0xFFFF;
+ i += ETHER_MIN_LEN - ETHER_CRC_LEN - totlen;
+ cmdstat = (cmdstat & 0xFFFF) | i;
+ d->rl_cmdstat = htole32(cmdstat | ctx->rl_flags);
+ }
+
d->rl_cmdstat |= htole32(RL_TDESC_CMD_EOF);
ctx->rl_maxsegs = nseg;
ctx->rl_idx = idx;
@@ -1131,8 +1153,6 @@
mtx_init(&sc->rl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF);
- mtx_init(&sc->rl_intlock, device_get_nameunit(dev), MTX_NETWORK_LOCK,
- MTX_SPIN);
callout_init_mtx(&sc->rl_stat_callout, &sc->rl_mtx, 0);
/*
@@ -1249,7 +1269,7 @@
ifp->if_start = re_start;
ifp->if_hwassist = RE_CSUM_FEATURES;
ifp->if_capabilities |= IFCAP_HWCSUM|IFCAP_VLAN_HWTAGGING;
- ifp->if_capenable = ifp->if_capabilities & ~IFCAP_HWCSUM;
+ ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
ifp->if_capabilities |= IFCAP_POLLING;
#endif
@@ -1416,7 +1436,6 @@
bus_dma_tag_destroy(sc->rl_parent_tag);
mtx_destroy(&sc->rl_mtx);
- mtx_destroy(&sc->rl_intlock);
return (0);
}
@@ -1895,14 +1914,10 @@
sc = arg;
ifp = sc->rl_ifp;
- mtx_lock_spin(&sc->rl_intlock);
status = CSR_READ_2(sc, RL_ISR);
- if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0) {
- mtx_unlock_spin(&sc->rl_intlock);
+ if (status == 0xFFFF || (status & RL_INTRS_CPLUS) == 0)
return;
- }
CSR_WRITE_2(sc, RL_IMR, 0);
- mtx_unlock_spin(&sc->rl_intlock);
taskqueue_enqueue_fast(taskqueue_fast, &sc->rl_inttask);
@@ -1970,9 +1985,7 @@
return;
}
- mtx_lock_spin(&sc->rl_intlock);
CSR_WRITE_2(sc, RL_IMR, RL_INTRS_CPLUS);
- mtx_unlock_spin(&sc->rl_intlock);
return;
}
@@ -2305,13 +2318,11 @@
/*
* Enable interrupts.
*/
- mtx_lock_spin(&sc->rl_intlock);
if (sc->rl_testmode)
CSR_WRITE_2(sc, RL_IMR, 0);
else
CSR_WRITE_2(sc, RL_IMR, RL_INTRS_CPLUS);
CSR_WRITE_2(sc, RL_ISR, RL_INTRS_CPLUS);
- mtx_unlock_spin(&sc->rl_intlock);
/* Set initial TX threshold */
sc->rl_txthresh = RL_TX_THRESH_INIT;
==== //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#3 (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/pci/if_rlreg.h,v 1.58 2006/06/28 16:04:54 wpaul Exp $
+ * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.59 2006/07/30 23:25:20 wpaul Exp $
*/
/*
@@ -147,25 +147,25 @@
/* Known revision codes. */
-#define RL_HWREV_8169 0x00000000
-#define RL_HWREV_8110S 0x00800000
-#define RL_HWREV_8169S 0x04000000
-#define RL_HWREV_8169_8110SB 0x10000000
-#define RL_HWREV_8169_8110SC 0x18000000
-#define RL_HWREV_8168 0x30000000
-#define RL_HWREV_8100E 0x30800000
-#define RL_HWREV_8101E 0x34000000
-#define RL_HWREV_8111 0x38000000
-#define RL_HWREV_8139 0x60000000
-#define RL_HWREV_8139A 0x70000000
-#define RL_HWREV_8139AG 0x70800000
-#define RL_HWREV_8139B 0x78000000
-#define RL_HWREV_8130 0x7C000000
-#define RL_HWREV_8139C 0x74000000
-#define RL_HWREV_8139D 0x74400000
-#define RL_HWREV_8139CPLUS 0x74800000
-#define RL_HWREV_8101 0x74c00000
-#define RL_HWREV_8100 0x78800000
+#define RL_HWREV_8169 0x00000000
+#define RL_HWREV_8110S 0x00800000
+#define RL_HWREV_8169S 0x04000000
+#define RL_HWREV_8169_8110SB 0x10000000
+#define RL_HWREV_8169_8110SC 0x18000000
+#define RL_HWREV_8168_SPIN1 0x30000000
+#define RL_HWREV_8100E 0x30800000
+#define RL_HWREV_8101E 0x34000000
+#define RL_HWREV_8168_SPIN2 0x38000000
+#define RL_HWREV_8139 0x60000000
+#define RL_HWREV_8139A 0x70000000
+#define RL_HWREV_8139AG 0x70800000
+#define RL_HWREV_8139B 0x78000000
+#define RL_HWREV_8130 0x7C000000
+#define RL_HWREV_8139C 0x74000000
+#define RL_HWREV_8139D 0x74400000
+#define RL_HWREV_8139CPLUS 0x74800000
+#define RL_HWREV_8101 0x74c00000
+#define RL_HWREV_8100 0x78800000
#define RL_TXDMA_16BYTES 0x00000000
#define RL_TXDMA_32BYTES 0x00000100
==== //depot/projects/soc2005/libalias/usr.bin/tar/read.c#2 (text+ko) ====
@@ -25,11 +25,14 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.25 2006/03/21 17:03:51 kientzle Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.26 2006/07/30 18:34:40 kientzle Exp $");
+#ifdef MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+#endif
#include <sys/param.h>
+#include <sys/stat.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <errno.h>
#include <grp.h>
==== //depot/projects/soc2005/libalias/usr.bin/tar/write.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "bsdtar_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.46 2006/04/02 07:13:11 kientzle Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.47 2006/07/31 04:57:46 kientzle Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -276,7 +276,6 @@
off_t end_offset;
struct archive *a;
struct archive_entry *entry;
- const char *filename;
int format;
struct archive_dir_entry *p;
struct archive_dir archive_dir;
@@ -284,7 +283,6 @@
bsdtar->archive_dir = &archive_dir;
memset(&archive_dir, 0, sizeof(archive_dir));
- filename = NULL;
format = ARCHIVE_FORMAT_TAR_PAX_RESTRICTED;
/* Sanity-test some arguments and the file. */
@@ -906,13 +904,9 @@
/* If the links cache is getting too full, enlarge the hash table. */
if (links_cache->number_entries > links_cache->number_buckets * 2)
{
- int count;
-
new_size = links_cache->number_buckets * 2;
new_buckets = malloc(new_size * sizeof(struct links_entry *));
- count = 0;
-
if (new_buckets != NULL) {
memset(new_buckets, 0,
new_size * sizeof(struct links_entry *));
==== //depot/projects/soc2005/libalias/usr.sbin/kldxref/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/kldxref/Makefile,v 1.8 2006/07/29 19:43:26 marcel Exp $
+# $FreeBSD: src/usr.sbin/kldxref/Makefile,v 1.9 2006/07/30 20:51:41 marcel Exp $
PROG= kldxref
MAN= kldxref.8
@@ -7,7 +7,7 @@
WARNS?= 2
.if ${MACHINE_ARCH} == powerpc
-LDFLAGS+=-static
+NO_SHARED=YES
.endif
.if exists(ef_${MACHINE_ARCH}.c)
More information about the p4-projects
mailing list