From owner-p4-projects@FreeBSD.ORG Sun Oct 19 03:20:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B1981065694; Sun, 19 Oct 2008 03:20: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 BB0761065687 for ; Sun, 19 Oct 2008 03:20:16 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA0AA8FC14 for ; Sun, 19 Oct 2008 03:20:16 +0000 (UTC) (envelope-from andrew@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 m9J3KG4l009680 for ; Sun, 19 Oct 2008 03:20:16 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J3KGJg009662 for perforce@freebsd.org; Sun, 19 Oct 2008 03:20:16 GMT (envelope-from andrew@freebsd.org) Date: Sun, 19 Oct 2008 03:20:16 GMT Message-Id: <200810190320.m9J3KGJg009662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 151539 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, 19 Oct 2008 03:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=151539 Change 151539 by andrew@andrew_bender on 2008/10/19 03:19:19 Add the s3c2410 MMC/SD registers in preparation for a read only MMC driver Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#4 (text+ko) ==== @@ -204,7 +204,48 @@ #define EXTINTR_BOTH 0x06 /* SD interface */ -/* XXX */ +#define SDI_CON 0x00 +#define SDI_PRE 0x04 +#define SDI_CARG 0x08 +#define SDI_CCON 0x0c +#define CCON_ABORDCMD (1<<12) /* Abort SDIO CMD12/52 */ +#define CCON_WITHDATA (1<<11) /* CMD with data */ +#define CCON_LONGRSP (1<<10) /* 136 bit response */ +#define CCON_WAITRSP (1<<9) /* Host waits for response */ +#define CCON_CMD_START (1<<8) +#define CCON_CMDINDEX_MASK (0x7F) /* Command number index */ +#define SDI_CSTA 0x10 +#define CSTA_RSPFAIL (1<<12) +#define CSTA_CMDSENT (1<<11) +#define CSTA_CMDTOUT (1<<10) +#define CSTA_RSPFIN (1<<9) +#define CSTA_CMDON (1<<8) +#define SDI_RSP0 0x14 +#define SDI_RSP1 0x18 +#define SDI_RSP2 0x1c +#define SDI_RSP3 0x20 +#define SDI_DTIMER 0x24 +#define SDI_BSIZE 0x28 +#define SDI_DCON 0x2c +#define DCON_PRDTYPE (1<<21) +#define DCON_TARSP (1<<20) /* Transmit after response */ +#define DCON_RACMD (1<<19) /* Receive after command */ +#define DCON_BACMD (1<<18) /* Busy after command */ +#define DCON_BLKMODE (1<<17) /* Stream/Block mode */ +#define DCON_WIDEBUS (1<<16) /* Standard/Wide bus */ +#define DCON_ENDMA (1<<15) /* DMA Enable */ +#define DCON_STOP (1<<14) /* Force the transfer to stop */ +/* Determine the direction of the data transfer */ +#define DCON_DATA_READY (0<<12) /* No transfer */ +#define DCON_ONLYBUST (1<<12) /* Check if busy */ +#define DCON_DATA_RECEIVE (2<<12) /* Receive data from SD */ +#define DCON_DATA_TRANSMIT (3<<12) /* Send data to SD */ +#define DCON_BLKNUM_MASK (0x7FF) /* Block number */ +#define SDI_DCNT 0x30 +#define SDI_DSTA 0x34 +#define SDI_FSTA 0x38 +#define SDI_DAT 0x3c +#define SDI_IMSK 0x40 /* Interrupt mask */ /* ADC */ /* XXX: ADCCON register is common to both S3C2410 and S3C2400, From owner-p4-projects@FreeBSD.ORG Sun Oct 19 06:10:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F491065695; Sun, 19 Oct 2008 06:10: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 C0C7A1065755 for ; Sun, 19 Oct 2008 06:10:09 +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 F22E78FC17 for ; Sun, 19 Oct 2008 06:10:08 +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 m9J6A843036898 for ; Sun, 19 Oct 2008 06:10:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J6A82W036896 for perforce@freebsd.org; Sun, 19 Oct 2008 06:10:08 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 06:10:08 GMT Message-Id: <200810190610.m9J6A82W036896@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 151540 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, 19 Oct 2008 06:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=151540 Change 151540 by sam@sam_ebb on 2008/10/19 06:09:59 use ic_opmode instead of hal version when checking for ibss mode; I was thinking ahdemo mode used adhoc mode but it doesn't, it uses ap mode so there's no reason to make this check more obtuse Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#106 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#106 (text+ko) ==== @@ -2601,7 +2601,7 @@ if (ic->ic_opmode == IEEE80211_M_MONITOR || (ifp->if_flags & IFF_PROMISC)) rfilt |= HAL_RX_FILTER_PROM; if (ic->ic_opmode == IEEE80211_M_STA || - sc->sc_opmode == HAL_M_IBSS || + ic->ic_opmode == IEEE80211_M_IBSS || sc->sc_swbmiss || sc->sc_scanning) rfilt |= HAL_RX_FILTER_BEACON; /* From owner-p4-projects@FreeBSD.ORG Sun Oct 19 06:11:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0208106568E; Sun, 19 Oct 2008 06: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 640B71065687 for ; Sun, 19 Oct 2008 06:11:14 +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 39E698FC0C for ; Sun, 19 Oct 2008 06:11:14 +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 m9J6BBX5036998 for ; Sun, 19 Oct 2008 06:11:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J6BA2e036995 for perforce@freebsd.org; Sun, 19 Oct 2008 06:11:10 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 06:11:10 GMT Message-Id: <200810190611.m9J6BA2e036995@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 151541 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, 19 Oct 2008 06:11:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=151541 Change 151541 by sam@sam_ebb on 2008/10/19 06:10:40 track noise floor for athstats Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#107 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#107 (text+ko) ==== @@ -3989,6 +3989,7 @@ DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s: pending %u\n", __func__, npending); ngood = 0; nf = ath_hal_getchannoise(ah, &sc->sc_curchan); + sc->sc_stats.ast_rx_noise = nf; tsf = ath_hal_gettsf64(ah); do { bf = STAILQ_FIRST(&sc->sc_rxbuf); From owner-p4-projects@FreeBSD.ORG Sun Oct 19 06:16:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEA4410656A2; Sun, 19 Oct 2008 06:16: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 A2713106569E for ; Sun, 19 Oct 2008 06:16:24 +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 9101A8FC0C for ; Sun, 19 Oct 2008 06:16:24 +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 m9J6GOxI037409 for ; Sun, 19 Oct 2008 06:16:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J6GO02037407 for perforce@freebsd.org; Sun, 19 Oct 2008 06:16:24 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 06:16:24 GMT Message-Id: <200810190616.m9J6GO02037407@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 151542 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, 19 Oct 2008 06:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=151542 Change 151542 by sam@sam_ebb on 2008/10/19 06:16:08 add support for ubiquiti XR9 cards; they have a different way of mapping between 900MHz and 2.4GHz frequencies than SR9 cards, we use hack country codes to identify them (note this requires a new hal) Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#108 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#108 (text+ko) ==== @@ -119,6 +119,8 @@ (HAL_MODE_11NG_HT40PLUS | HAL_MODE_11NG_HT40MINUS | \ HAL_MODE_11NA_HT40PLUS | HAL_MODE_11NA_HT40MINUS) +#define CTRY_XR9 5001 /* Ubiquiti XR9 */ + static struct ieee80211vap *ath_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], @@ -1324,7 +1326,8 @@ * the frequency possibly mapped for GSM channels. */ static void -ath_mapchan(HAL_CHANNEL *hc, const struct ieee80211_channel *chan) +ath_mapchan(const struct ieee80211com *ic, + HAL_CHANNEL *hc, const struct ieee80211_channel *chan) { #define N(a) (sizeof(a) / sizeof(a[0])) static const u_int modeflags[IEEE80211_MODE_MAX] = { @@ -1355,8 +1358,13 @@ if (IEEE80211_IS_CHAN_HT40U(chan)) hc->channelFlags |= CHANNEL_HT40PLUS; - hc->channel = IEEE80211_IS_CHAN_GSM(chan) ? - 2422 + (922 - chan->ic_freq) : chan->ic_freq; + if (IEEE80211_IS_CHAN_GSM(chan)) { + if (ic->ic_regdomain.country == CTRY_XR9) + hc->channel = 2427 + (chan->ic_freq - 907); + else + hc->channel = 2422 + (922 - chan->ic_freq); + } else + hc->channel = chan->ic_freq; #undef N } @@ -1409,7 +1417,7 @@ * be followed by initialization of the appropriate bits * and then setup of the interrupt mask. */ - ath_mapchan(&sc->sc_curchan, ic->ic_curchan); + ath_mapchan(ic, &sc->sc_curchan, ic->ic_curchan); ath_settkipmic(sc); if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) { if_printf(ifp, "unable to reset hardware; hal status %u\n", @@ -1546,7 +1554,7 @@ * Convert to a HAL channel description with the flags * constrained to reflect the current operating mode. */ - ath_mapchan(&sc->sc_curchan, ic->ic_curchan); + ath_mapchan(ic, &sc->sc_curchan, ic->ic_curchan); ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* stop xmit side */ @@ -3731,7 +3739,7 @@ *rssi = ic->ic_node_getrssi(ni); if (ni->ni_chan != IEEE80211_CHAN_ANYC) { - ath_mapchan(&hchan, ni->ni_chan); + ath_mapchan(ic, &hchan, ni->ni_chan); *noise = ath_hal_getchannoise(ah, &hchan); } else *noise = -95; /* nominally correct */ @@ -5449,7 +5457,7 @@ * the flags constrained to reflect the current * operating mode. */ - ath_mapchan(&hchan, chan); + ath_mapchan(ic, &hchan, chan); DPRINTF(sc, ATH_DEBUG_RESET, "%s: %u (%u MHz, hal flags 0x%x) -> %u (%u MHz, hal flags 0x%x)\n", @@ -5925,8 +5933,15 @@ } if (ath_hal_isgsmsku(ah)) { - /* remap to true frequencies */ - ichan->ic_freq = 922 + (2422 - ichan->ic_freq); + /* + * Remap to true frequencies: Ubiquiti XR9 cards use a + * frequency mapping different from their SR9 cards. + * We define special country codes to deal with this. + */ + if (cc == CTRY_XR9) + ichan->ic_freq = 907 + (ichan->ic_freq - 2427); + else + ichan->ic_freq = 922 + (2422 - ichan->ic_freq); ichan->ic_flags |= IEEE80211_CHAN_GSM; ichan->ic_ieee = ieee80211_mhz2ieee(ichan->ic_freq, ichan->ic_flags); From owner-p4-projects@FreeBSD.ORG Sun Oct 19 06:24:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 772FE1065689; Sun, 19 Oct 2008 06:24: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 3B90C1065686 for ; Sun, 19 Oct 2008 06:24: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 2AA008FC17 for ; Sun, 19 Oct 2008 06:24: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 m9J6OWxo037986 for ; Sun, 19 Oct 2008 06:24:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J6OWnV037984 for perforce@freebsd.org; Sun, 19 Oct 2008 06:24:32 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 06:24:32 GMT Message-Id: <200810190624.m9J6OWnV037984@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 151543 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, 19 Oct 2008 06:24:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=151543 Change 151543 by sam@sam_ebb on 2008/10/19 06:24:00 Extend -o option: add predefined output formats selectable by name. For now there's just "default". In the future these might come from a dot file to simplify use. Affected files ... .. //depot/projects/vap/tools/tools/ath/athstats/main.c#4 edit Differences ... ==== //depot/projects/vap/tools/tools/ath/athstats/main.c#4 (text+ko) ==== @@ -49,8 +49,27 @@ #include "athstats.h" -#define S_DEFAULT \ - "input,output,altrate,short,long,xretry,crcerr,crypt,phyerr,rssi,rate" +static struct { + const char *tag; + const char *fmt; +} tags[] = { + { "default", + "input,output,altrate,short,long,xretry,crcerr,crypt,phyerr,rssi,rate" + }, +}; + +static const char * +getfmt(const char *tag) +{ +#define N(a) (sizeof(a)/sizeof(a[0])) + int i; + for (i = 0; i < N(tags); i++) + if (strcasecmp(tags[i].tag, tag) == 0) + return tags[i].fmt; + errx(-1, "unknown tag \%s\"", tag); + /*NOTREACHED*/ +#undef N +} static int signalled; @@ -70,7 +89,7 @@ ifname = getenv("ATH"); if (ifname == NULL) ifname = "ath0"; - wf = athstats_new(ifname, S_DEFAULT); + wf = athstats_new(ifname, getfmt("default")); while ((c = getopt(argc, argv, "i:lo:")) != -1) { switch (c) { case 'i': @@ -80,7 +99,7 @@ wf->print_fields(wf, stdout); return 0; case 'o': - wf->setfmt(wf, optarg); + wf->setfmt(wf, getfmt(optarg)); break; default: errx(-1, "usage: %s [-a] [-i ifname] [-l] [-o fmt] [interval]\n", argv[0]); From owner-p4-projects@FreeBSD.ORG Sun Oct 19 06:40:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24038106568C; Sun, 19 Oct 2008 06: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 DB73E1065688 for ; Sun, 19 Oct 2008 06:40:49 +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 C99868FC15 for ; Sun, 19 Oct 2008 06:40:49 +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 m9J6enGB039264 for ; Sun, 19 Oct 2008 06:40:49 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J6enI6039262 for perforce@freebsd.org; Sun, 19 Oct 2008 06:40:49 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 06:40:49 GMT Message-Id: <200810190640.m9J6enI6039262@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 151544 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, 19 Oct 2008 06:40:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=151544 Change 151544 by sam@sam_ebb on 2008/10/19 06:40:26 add support to display ani state; this isn't useful without the new hal (that enables the ioctl support) Affected files ... .. //depot/projects/vap/tools/tools/ath/athstats/Makefile#4 edit .. //depot/projects/vap/tools/tools/ath/athstats/athstats.c#4 edit .. //depot/projects/vap/tools/tools/ath/athstats/main.c#5 edit Differences ... ==== //depot/projects/vap/tools/tools/ath/athstats/Makefile#4 (text+ko) ==== @@ -8,12 +8,16 @@ .include -CFLAGS+= -I. +SRCDIR= ${.CURDIR}/../../../.. + CLEANFILES+= opt_ah.h ah_osdep.h -CFLAGS+=-I../../../../sys/contrib/dev/ath -CFLAGS+=-I../../../../sys/net80211 -CFLAGS+=-I../../../../sys/dev/ath +CFLAGS+=-DATH_SUPPORT_ANI + +CFLAGS+=-I${.CURDIR} +CFLAGS+=-I${SRCDIR}/sys/contrib/dev/ath +CFLAGS+=-I${SRCDIR}/sys/net80211 +CFLAGS+=-I${SRCDIR}/sys/dev/ath athstats.o: opt_ah.h ah_osdep.h ==== //depot/projects/vap/tools/tools/ath/athstats/athstats.c#4 (text+ko) ==== @@ -55,6 +55,12 @@ #include "athstats.h" +#ifdef ATH_SUPPORT_ANI +#define HAL_EP_RND(x,mul) \ + ((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul)) +#define HAL_RSSI(x) HAL_EP_RND(x, HAL_RSSI_EP_MULTIPLIER) +#endif + #define NOTPRESENT { 0, "", "" } #define AFTER(prev) ((prev)+1) @@ -258,7 +264,71 @@ { 5, "defsw", "defsw", "switched default/rx antenna" }, #define S_ANT_TXSWITCH AFTER(S_ANT_DEFSWITCH) { 5, "txsw", "txsw", "tx used alternate antenna" }, +#ifdef ATH_SUPPORT_ANI +#define S_ANI_NOISE AFTER(S_ANT_TXSWITCH) + { 2, "ni", "NI", "noise immunity level" }, +#define S_ANI_SPUR AFTER(S_ANI_NOISE) + { 2, "si", "SI", "spur immunity level" }, +#define S_ANI_STEP AFTER(S_ANI_SPUR) + { 2, "step", "ST", "first step level" }, +#define S_ANI_OFDM AFTER(S_ANI_STEP) + { 4, "owsd", "OWSD", "OFDM weak signal detect" }, +#define S_ANI_CCK AFTER(S_ANI_OFDM) + { 4, "cwst", "CWST", "CCK weak signal threshold" }, +#define S_ANI_MAXSPUR AFTER(S_ANI_CCK) + { 3, "maxsi","MSI", "max spur immunity level" }, +#define S_ANI_LISTEN AFTER(S_ANI_MAXSPUR) + { 6, "listen","LISTEN", "listen time" }, +#define S_ANI_NIUP AFTER(S_ANI_LISTEN) + { 4, "ni+", "NI-", "ANI increased noise immunity" }, +#define S_ANI_NIDOWN AFTER(S_ANI_NIUP) + { 4, "ni-", "NI-", "ANI decrease noise immunity" }, +#define S_ANI_SIUP AFTER(S_ANI_NIDOWN) + { 4, "si+", "SI+", "ANI increased spur immunity" }, +#define S_ANI_SIDOWN AFTER(S_ANI_SIUP) + { 4, "si-", "SI-", "ANI decrease spur immunity" }, +#define S_ANI_OFDMON AFTER(S_ANI_SIDOWN) + { 5, "ofdm+","OFDM+", "ANI enabled OFDM weak signal detect" }, +#define S_ANI_OFDMOFF AFTER(S_ANI_OFDMON) + { 5, "ofdm-","OFDM-", "ANI disabled OFDM weak signal detect" }, +#define S_ANI_CCKHI AFTER(S_ANI_OFDMOFF) + { 5, "cck+", "CCK+", "ANI enabled CCK weak signal threshold" }, +#define S_ANI_CCKLO AFTER(S_ANI_CCKHI) + { 5, "cck-", "CCK-", "ANI disabled CCK weak signal threshold" }, +#define S_ANI_STEPUP AFTER(S_ANI_CCKLO) + { 5, "step+","STEP+", "ANI increased first step level" }, +#define S_ANI_STEPDOWN AFTER(S_ANI_STEPUP) + { 5, "step-","STEP-", "ANI decreased first step level" }, +#define S_ANI_OFDMERRS AFTER(S_ANI_STEPDOWN) + { 8, "ofdm", "OFDM", "cumulative ofdm phy error count" }, +#define S_ANI_CCKERRS AFTER(S_ANI_OFDMERRS) + { 8, "cck", "CCK", "cumulative cck phy error count" }, +#define S_ANI_RESET AFTER(S_ANI_CCKERRS) + { 5, "reset","RESET", "ANI parameters zero'd for non-STA operation" }, +#define S_ANI_LZERO AFTER(S_ANI_RESET) + { 5, "lzero","LZERO", "ANI forced listen time to zero" }, +#define S_ANI_LNEG AFTER(S_ANI_LZERO) + { 5, "lneg", "LNEG", "ANI calculated listen time < 0" }, +#define S_MIB_ACKBAD AFTER(S_ANI_LNEG) + { 5, "ackbad","ACKBAD", "bad ACK's" }, +#define S_MIB_RTSBAD AFTER(S_MIB_ACKBAD) + { 5, "rtsbad","RTSBAD", "bad RTS" }, +#define S_MIB_RTSGOOD AFTER(S_MIB_RTSBAD) + { 5, "rtsgood","RTSGOOD", "good RTS" }, +#define S_MIB_FCSBAD AFTER(S_MIB_RTSGOOD) + { 5, "fcsbad","FCSBAD", "bad FCS" }, +#define S_MIB_BEACONS AFTER(S_MIB_FCSBAD) + { 5, "beacons","beacons", "beacons received" }, +#define S_NODE_AVGBRSSI AFTER(S_MIB_BEACONS) + { 3, "avgbrssi","BSI", "average rssi (beacons only)" }, +#define S_NODE_AVGRSSI AFTER(S_NODE_AVGBRSSI) + { 3, "avgrssi","DSI", "average rssi (all rx'd frames)" }, +#define S_NODE_AVGARSSI AFTER(S_NODE_AVGRSSI) + { 3, "avgtxrssi","TSI", "average rssi (ACKs only)" }, +#define S_ANT_TX0 AFTER(S_NODE_AVGARSSI) +#else #define S_ANT_TX0 AFTER(S_ANT_TXSWITCH) +#endif /* ATH_SUPPORT_ANI */ { 8, "tx0", "ant0(tx)", "frames tx on antenna 0" }, #define S_ANT_TX1 AFTER(S_ANT_TX0) { 8, "tx1", "ant1(tx)", "frames tx on antenna 1" }, @@ -302,12 +372,41 @@ struct _athstats { struct ath_stats ath; +#ifdef ATH_SUPPORT_ANI + struct { + uint32_t ast_ani_niup; /* increased noise immunity */ + uint32_t ast_ani_nidown; /* decreased noise immunity */ + uint32_t ast_ani_spurup; /* increased spur immunity */ + uint32_t ast_ani_spurdown; /* descreased spur immunity */ + uint32_t ast_ani_ofdmon; /* OFDM weak signal detect on */ + uint32_t ast_ani_ofdmoff; /* OFDM weak signal detect off*/ + uint32_t ast_ani_cckhigh; /* CCK weak signal thr high */ + uint32_t ast_ani_ccklow; /* CCK weak signal thr low */ + uint32_t ast_ani_stepup; /* increased first step level */ + uint32_t ast_ani_stepdown; /* decreased first step level */ + uint32_t ast_ani_ofdmerrs; /* cumulative ofdm phy err cnt*/ + uint32_t ast_ani_cckerrs; /* cumulative cck phy err cnt */ + uint32_t ast_ani_reset; /* params zero'd for non-STA */ + uint32_t ast_ani_lzero; /* listen time forced to zero */ + uint32_t ast_ani_lneg; /* listen time calculated < 0 */ + HAL_MIB_STATS ast_mibstats; /* MIB counter stats */ + HAL_NODE_STATS ast_nodestats; /* latest rssi stats */ + } ani_stats; + struct { + uint8_t noiseImmunityLevel; + uint8_t spurImmunityLevel; + uint8_t firstepLevel; + uint8_t ofdmWeakSigDetectOff; + uint32_t listenTime; + } ani_state; +#endif }; struct athstatfoo_p { struct athstatfoo base; int s; int optstats; +#define ATHSTATS_ANI 0x0001 struct ifreq ifr; struct ath_diag atd; struct _athstats cur; @@ -320,6 +419,10 @@ struct athstatfoo_p *wf = (struct athstatfoo_p *) wf0; strncpy(wf->ifr.ifr_name, ifname, sizeof (wf->ifr.ifr_name)); +#ifdef ATH_SUPPORT_ANI + strncpy(wf->atd.ad_name, ifname, sizeof (wf->atd.ad_name)); + wf->optstats |= ATHSTATS_ANI; +#endif } static void @@ -328,6 +431,22 @@ wf->ifr.ifr_data = (caddr_t) &stats->ath; if (ioctl(wf->s, SIOCGATHSTATS, &wf->ifr) < 0) err(1, wf->ifr.ifr_name); +#ifdef ATH_SUPPORT_ANI + if (wf->optstats & ATHSTATS_ANI) { + wf->atd.ad_id = 5; + wf->atd.ad_out_data = (caddr_t) &stats->ani_state; + wf->atd.ad_out_size = sizeof(stats->ani_state); + if (ioctl(wf->s, SIOCGATHDIAG, &wf->atd) < 0) { + warn(wf->atd.ad_name); + wf->optstats &= ~ATHSTATS_ANI; + } + wf->atd.ad_id = 8; + wf->atd.ad_out_data = (caddr_t) &stats->ani_stats; + wf->atd.ad_out_size = sizeof(stats->ani_stats); + if (ioctl(wf->s, SIOCGATHDIAG, &wf->atd) < 0) + warn(wf->atd.ad_name); + } +#endif /* ATH_SUPPORT_ANI */ } static void @@ -362,6 +481,12 @@ snprintf(b, bs, "%u", wf->cur.ath.ast_##x - wf->total.ath.ast_##x); return 1 #define PHY(x) \ snprintf(b, bs, "%u", wf->cur.ath.ast_rx_phy[x] - wf->total.ath.ast_rx_phy[x]); return 1 +#define ANI(x) \ + snprintf(b, bs, "%u", wf->cur.ani_state.x); return 1 +#define ANISTAT(x) \ + snprintf(b, bs, "%u", wf->cur.ani_stats.ast_ani_##x - wf->total.ani_stats.ast_ani_##x); return 1 +#define MIBSTAT(x) \ + snprintf(b, bs, "%u", wf->cur.ani_stats.ast_mibstats.x - wf->total.ani_stats.ast_mibstats.x); return 1 #define TXANT(x) \ snprintf(b, bs, "%u", wf->cur.ath.ast_ant_tx[x] - wf->total.ath.ast_ant_tx[x]); return 1 #define RXANT(x) \ @@ -472,6 +597,45 @@ case S_RATE_DROP: STAT(rate_drop); case S_ANT_DEFSWITCH: STAT(ant_defswitch); case S_ANT_TXSWITCH: STAT(ant_txswitch); +#ifdef S_ANI_NOISE + case S_ANI_NOISE: ANI(noiseImmunityLevel); + case S_ANI_SPUR: ANI(spurImmunityLevel); + case S_ANI_STEP: ANI(firstepLevel); + case S_ANI_OFDM: ANI(ofdmWeakSigDetectOff); + case S_ANI_LISTEN: ANI(listenTime); + case S_ANI_NIUP: ANISTAT(niup); + case S_ANI_NIDOWN: ANISTAT(nidown); + case S_ANI_SIUP: ANISTAT(spurup); + case S_ANI_SIDOWN: ANISTAT(spurdown); + case S_ANI_OFDMON: ANISTAT(ofdmon); + case S_ANI_OFDMOFF: ANISTAT(ofdmoff); + case S_ANI_CCKHI: ANISTAT(cckhigh); + case S_ANI_CCKLO: ANISTAT(ccklow); + case S_ANI_STEPUP: ANISTAT(stepup); + case S_ANI_STEPDOWN: ANISTAT(stepdown); + case S_ANI_OFDMERRS: ANISTAT(ofdmerrs); + case S_ANI_CCKERRS: ANISTAT(cckerrs); + case S_ANI_RESET: ANISTAT(reset); + case S_ANI_LZERO: ANISTAT(lzero); + case S_ANI_LNEG: ANISTAT(lneg); + case S_MIB_ACKBAD: MIBSTAT(ackrcv_bad); + case S_MIB_RTSBAD: MIBSTAT(rts_bad); + case S_MIB_RTSGOOD: MIBSTAT(rts_good); + case S_MIB_FCSBAD: MIBSTAT(fcs_bad); + case S_MIB_BEACONS: MIBSTAT(beacons); + case S_NODE_AVGBRSSI: + snprintf(b, bs, "%u", + HAL_RSSI(wf->cur.ani_stats.ast_nodestats.ns_avgbrssi)); + return 1; + case S_NODE_AVGRSSI: + snprintf(b, bs, "%u", + HAL_RSSI(wf->cur.ani_stats.ast_nodestats.ns_avgrssi)); + return 1; + case S_NODE_AVGARSSI: + snprintf(b, bs, "%u", + HAL_RSSI(wf->cur.ani_stats.ast_nodestats.ns_avgtxrssi)); + return 1; +#endif case S_ANT_TX0: TXANT(0); case S_ANT_TX1: TXANT(1); case S_ANT_TX2: TXANT(2); @@ -513,6 +677,9 @@ return 0; #undef RXANT #undef TXANT +#undef ANI +#undef ANISTAT +#undef MIBSTAT #undef PHY #undef STAT } @@ -525,6 +692,12 @@ snprintf(b, bs, "%u", wf->total.ath.ast_##x); return 1 #define PHY(x) \ snprintf(b, bs, "%u", wf->total.ath.ast_rx_phy[x]); return 1 +#define ANI(x) \ + snprintf(b, bs, "%u", wf->total.ani_state.x); return 1 +#define ANISTAT(x) \ + snprintf(b, bs, "%u", wf->total.ani_stats.ast_ani_##x); return 1 +#define MIBSTAT(x) \ + snprintf(b, bs, "%u", wf->total.ani_stats.ast_mibstats.x); return 1 #define TXANT(x) \ snprintf(b, bs, "%u", wf->total.ath.ast_ant_tx[x]); return 1 #define RXANT(x) \ @@ -633,6 +806,44 @@ case S_RATE_DROP: STAT(rate_drop); case S_ANT_DEFSWITCH: STAT(ant_defswitch); case S_ANT_TXSWITCH: STAT(ant_txswitch); +#ifdef S_ANI_NOISE + case S_ANI_NOISE: ANI(noiseImmunityLevel); + case S_ANI_SPUR: ANI(spurImmunityLevel); + case S_ANI_STEP: ANI(firstepLevel); + case S_ANI_LISTEN: ANI(listenTime); + case S_ANI_NIUP: ANISTAT(niup); + case S_ANI_NIDOWN: ANISTAT(nidown); + case S_ANI_SIUP: ANISTAT(spurup); + case S_ANI_SIDOWN: ANISTAT(spurdown); + case S_ANI_OFDMON: ANISTAT(ofdmon); + case S_ANI_OFDMOFF: ANISTAT(ofdmoff); + case S_ANI_CCKHI: ANISTAT(cckhigh); + case S_ANI_CCKLO: ANISTAT(ccklow); + case S_ANI_STEPUP: ANISTAT(stepup); + case S_ANI_STEPDOWN: ANISTAT(stepdown); + case S_ANI_OFDMERRS: ANISTAT(ofdmerrs); + case S_ANI_CCKERRS: ANISTAT(cckerrs); + case S_ANI_RESET: ANISTAT(reset); + case S_ANI_LZERO: ANISTAT(lzero); + case S_ANI_LNEG: ANISTAT(lneg); + case S_MIB_ACKBAD: MIBSTAT(ackrcv_bad); + case S_MIB_RTSBAD: MIBSTAT(rts_bad); + case S_MIB_RTSGOOD: MIBSTAT(rts_good); + case S_MIB_FCSBAD: MIBSTAT(fcs_bad); + case S_MIB_BEACONS: MIBSTAT(beacons); + case S_NODE_AVGBRSSI: + snprintf(b, bs, "%u", + HAL_RSSI(wf->total.ani_stats.ast_nodestats.ns_avgbrssi)); + return 1; + case S_NODE_AVGRSSI: + snprintf(b, bs, "%u", + HAL_RSSI(wf->total.ani_stats.ast_nodestats.ns_avgrssi)); + return 1; + case S_NODE_AVGARSSI: + snprintf(b, bs, "%u", + HAL_RSSI(wf->total.ani_stats.ast_nodestats.ns_avgtxrssi)); + return 1; +#endif case S_ANT_TX0: TXANT(0); case S_ANT_TX1: TXANT(1); case S_ANT_TX2: TXANT(2); @@ -674,6 +885,9 @@ return 0; #undef RXANT #undef TXANT +#undef ANI +#undef ANISTAT +#undef MIBSTAT #undef PHY #undef STAT } ==== //depot/projects/vap/tools/tools/ath/athstats/main.c#5 (text+ko) ==== @@ -56,6 +56,9 @@ { "default", "input,output,altrate,short,long,xretry,crcerr,crypt,phyerr,rssi,rate" }, + { "ani", + "avgbrssi,avgrssi,avgtxrssi,NI,SI,step,owsd,cwst,NI+,NI-,SI+,SI-,OFDM,CCK,LISTEN" + }, }; static const char * From owner-p4-projects@FreeBSD.ORG Sun Oct 19 06:43:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59A2D10656A6; Sun, 19 Oct 2008 06:43: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 1D2D110656A1 for ; Sun, 19 Oct 2008 06:43:53 +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 0C3758FC12 for ; Sun, 19 Oct 2008 06:43:53 +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 m9J6hqqR039458 for ; Sun, 19 Oct 2008 06:43:52 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J6hqxN039456 for perforce@freebsd.org; Sun, 19 Oct 2008 06:43:52 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 06:43:52 GMT Message-Id: <200810190643.m9J6hqxN039456@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 151545 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, 19 Oct 2008 06:43:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=151545 Change 151545 by sam@sam_ebb on 2008/10/19 06:43:32 handle tx rate display better Affected files ... .. //depot/projects/vap/tools/tools/ath/athstats/athstats.c#5 edit Differences ... ==== //depot/projects/vap/tools/tools/ath/athstats/athstats.c#5 (text+ko) ==== @@ -91,7 +91,7 @@ #else #define S_RATE AFTER(S_MIB) #endif - { 4, "rate", "rate", "current transmit rate" }, + { 5, "rate", "rate", "current transmit rate" }, #define S_WATCHDOG AFTER(S_RATE) { 5, "wdog", "wdog", "watchdog timeouts" }, #define S_FATAL AFTER(S_WATCHDOG) @@ -473,6 +473,17 @@ wf->total = wf->cur; } +static void +snprintrate(char b[], size_t bs, int rate) +{ + if (rate & IEEE80211_RATE_MCS) + snprintf(b, bs, "MCS%u", rate &~ IEEE80211_RATE_MCS); + else if (rate & 1) + snprintf(b, bs, "%u.5M", rate / 2); + else + snprintf(b, bs, "%uM", rate / 2); +} + static int ath_get_curstat(struct statfoo *sf, int s, char b[], size_t bs) { @@ -503,7 +514,7 @@ wf->cur.ath.ast_tx_packets - wf->total.ath.ast_tx_packets); return 1; case S_RATE: - snprintf(b, bs, "%uM", wf->cur.ath.ast_tx_rate / 2); + snprintrate(b, bs, wf->cur.ath.ast_tx_rate); return 1; case S_WATCHDOG: STAT(watchdog); case S_FATAL: STAT(hardware); @@ -712,7 +723,7 @@ snprintf(b, bs, "%lu", wf->total.ath.ast_tx_packets); return 1; case S_RATE: - snprintf(b, bs, "%uM", wf->total.ath.ast_tx_rate / 2); + snprintrate(b, bs, wf->total.ath.ast_tx_rate); return 1; case S_WATCHDOG: STAT(watchdog); case S_FATAL: STAT(hardware); From owner-p4-projects@FreeBSD.ORG Sun Oct 19 06:45:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88C1E10656A8; Sun, 19 Oct 2008 06:45:55 +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 4C5F7106569F for ; Sun, 19 Oct 2008 06:45:55 +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 3B6018FC17 for ; Sun, 19 Oct 2008 06:45:55 +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 m9J6jtLi039671 for ; Sun, 19 Oct 2008 06:45:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J6jtb1039669 for perforce@freebsd.org; Sun, 19 Oct 2008 06:45:55 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 06:45:55 GMT Message-Id: <200810190645.m9J6jtb1039669@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 151546 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, 19 Oct 2008 06:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=151546 Change 151546 by sam@sam_ebb on 2008/10/19 06:45:36 narrow columns for various phy errors; the new headers are not so great, will accept better names Affected files ... .. //depot/projects/vap/tools/tools/ath/athstats/athstats.c#6 edit Differences ... ==== //depot/projects/vap/tools/tools/ath/athstats/athstats.c#6 (text+ko) ==== @@ -161,21 +161,21 @@ #define S_RX_PHY_ERR AFTER(S_RX_CTL) { 7, "phyerr", "phyerr", "rx failed 'cuz of PHY err" }, #define S_RX_PHY_UNDERRUN AFTER(S_RX_PHY_ERR) - { 6, "phyund", "phyund", "transmit underrun" }, + { 4, "phyund", "TUnd", "transmit underrun" }, #define S_RX_PHY_TIMING AFTER(S_RX_PHY_UNDERRUN) - { 6, "phytim", "phytim", "timing error" }, + { 4, "phytim", "Tim", "timing error" }, #define S_RX_PHY_PARITY AFTER(S_RX_PHY_TIMING) - { 6, "phypar", "phypar", "illegal parity" }, + { 4, "phypar", "IPar", "illegal parity" }, #define S_RX_PHY_RATE AFTER(S_RX_PHY_PARITY) - { 6, "phyrate", "phyrate", "illegal rate" }, + { 4, "phyrate", "IRate", "illegal rate" }, #define S_RX_PHY_LENGTH AFTER(S_RX_PHY_RATE) - { 6, "phylen", "phylen", "illegal length" }, + { 4, "phylen", "ILen", "illegal length" }, #define S_RX_PHY_RADAR AFTER(S_RX_PHY_LENGTH) - { 6, "phyradar", "phyradar", "radar detect" }, + { 4, "phyradar", "Radar", "radar detect" }, #define S_RX_PHY_SERVICE AFTER(S_RX_PHY_RADAR) - { 6, "physervice", "physervice", "illegal service" }, + { 4, "physervice", "Service", "illegal service" }, #define S_RX_PHY_TOR AFTER(S_RX_PHY_SERVICE) - { 6, "phytor", "phytor", "transmit override receive" }, + { 4, "phytor", "TOR", "transmit override receive" }, #define S_RX_PHY_OFDM_TIMING AFTER(S_RX_PHY_TOR) { 6, "ofdmtim", "ofdmtim", "OFDM timing" }, #define S_RX_PHY_OFDM_SIGNAL_PARITY AFTER(S_RX_PHY_OFDM_TIMING) From owner-p4-projects@FreeBSD.ORG Sun Oct 19 07:11:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D7BD1065690; Sun, 19 Oct 2008 07:11: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 215CE106568A for ; Sun, 19 Oct 2008 07:11:21 +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 104D28FC34 for ; Sun, 19 Oct 2008 07:11:21 +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 m9J7BKnU042697 for ; Sun, 19 Oct 2008 07:11:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J7BKTg042695 for perforce@freebsd.org; Sun, 19 Oct 2008 07:11:20 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 07:11:20 GMT Message-Id: <200810190711.m9J7BKTg042695@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 151547 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, 19 Oct 2008 07:11:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=151547 Change 151547 by sam@sam_ebb on 2008/10/19 07:10:49 invoke the new assoc callback on joining a bss in sta and adhoc modes Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#17 edit .. //depot/projects/vap/sys/net80211/ieee80211_sta.c#20 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#17 (text+ko) ==== @@ -208,6 +208,12 @@ */ if (ni->ni_authmode != IEEE80211_AUTH_8021X) ieee80211_node_authorize(ni); + /* + * Fake association when joining an existing bss. + */ + if (!IEEE80211_ADDR_EQ(ni->ni_macaddr, vap->iv_myaddr) && + ic->ic_newassoc != NULL) + ic->ic_newassoc(ni, ostate != IEEE80211_S_RUN); break; case IEEE80211_S_SLEEP: ieee80211_sta_pwrsave(vap, 0); ==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#20 (text+ko) ==== @@ -400,6 +400,11 @@ */ if (ni->ni_authmode != IEEE80211_AUTH_8021X) ieee80211_node_authorize(ni); + /* + * Fake association when joining an existing bss. + */ + if (ic->ic_newassoc != NULL) + ic->ic_newassoc(vap->iv_bss, ostate != IEEE80211_S_RUN); break; case IEEE80211_S_SLEEP: ieee80211_sta_pwrsave(vap, 0); From owner-p4-projects@FreeBSD.ORG Sun Oct 19 07:11:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D2611065744; Sun, 19 Oct 2008 07:11: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 59AF41065739 for ; Sun, 19 Oct 2008 07:11:22 +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 3BF338FC0A for ; Sun, 19 Oct 2008 07:11:22 +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 m9J7BMa8042702 for ; Sun, 19 Oct 2008 07:11:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J7BLeY042700 for perforce@freebsd.org; Sun, 19 Oct 2008 07:11:21 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 07:11:21 GMT Message-Id: <200810190711.m9J7BLeY042700@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 151548 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, 19 Oct 2008 07:11:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=151548 Change 151548 by sam@sam_ebb on 2008/10/19 07:11:03 IFC @ 151538 Affected files ... .. //depot/projects/vap/UPDATING#20 integrate .. //depot/projects/vap/etc/Makefile#8 integrate .. //depot/projects/vap/etc/etc.mips/ttys#3 integrate .. //depot/projects/vap/etc/mtree/BSD.usr.dist#5 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#14 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/arch/amd64/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/man/man/man.c#5 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#17 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#14 integrate .. //depot/projects/vap/lib/libarchive/test/test_acl_basic.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_acl_freebsd.c#1 branch .. //depot/projects/vap/lib/libc/arm/gen/_setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libc/string/strxfrm.c#3 integrate .. //depot/projects/vap/lib/libkvm/kvm.c#4 integrate .. //depot/projects/vap/lib/libkvm/kvm_minidump_amd64.c#3 integrate .. //depot/projects/vap/lib/libkvm/kvm_minidump_i386.c#3 integrate .. //depot/projects/vap/lib/libpmc/Makefile#4 integrate .. //depot/projects/vap/lib/libpmc/libpmc.c#6 integrate .. //depot/projects/vap/lib/libpmc/pmc.3#7 integrate .. //depot/projects/vap/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/vap/lib/libpmc/pmc.k7.3#3 integrate .. //depot/projects/vap/lib/libpmc/pmc.k8.3#3 integrate .. //depot/projects/vap/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.p5.3#3 integrate .. //depot/projects/vap/lib/libpmc/pmc.p6.3#3 integrate .. //depot/projects/vap/lib/libpmc/pmc.tsc.3#2 integrate .. //depot/projects/vap/lib/libstand/Makefile#5 integrate .. //depot/projects/vap/lib/libutil/login_times.c#3 integrate .. //depot/projects/vap/lib/libutil/logwtmp.c#3 integrate .. //depot/projects/vap/lib/libutil/pty.c#4 integrate .. //depot/projects/vap/lib/libutil/realhostname.c#3 integrate .. //depot/projects/vap/libexec/rtld-elf/mips/reloc.c#2 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/vap/release/Makefile#6 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#14 integrate .. //depot/projects/vap/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 integrate .. //depot/projects/vap/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#3 integrate .. //depot/projects/vap/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/vap/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/vap/release/scripts/package-trees.sh#3 integrate .. //depot/projects/vap/sbin/dhclient/dhclient.c#9 integrate .. //depot/projects/vap/sbin/dhclient/dhcp.h#3 integrate .. //depot/projects/vap/sbin/dhclient/tables.c#3 integrate .. //depot/projects/vap/sbin/fsck_ffs/pass5.c#3 integrate .. //depot/projects/vap/sbin/geom/class/part/gpart.8#5 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#19 integrate .. //depot/projects/vap/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/vap/share/Makefile#5 integrate .. //depot/projects/vap/share/man/man4/Makefile#21 integrate .. //depot/projects/vap/share/man/man4/ae.4#1 branch .. //depot/projects/vap/share/man/man4/ata.4#4 integrate .. //depot/projects/vap/share/man/man4/bce.4#3 integrate .. //depot/projects/vap/share/man/man4/ddb.4#13 integrate .. //depot/projects/vap/share/man/man4/em.4#3 integrate .. //depot/projects/vap/share/man/man4/igb.4#1 branch .. //depot/projects/vap/share/man/man4/jme.4#2 integrate .. //depot/projects/vap/share/man/man4/mmc.4#3 integrate .. //depot/projects/vap/share/man/man4/ng_netflow.4#3 integrate .. //depot/projects/vap/share/man/man4/ng_tty.4#3 integrate .. //depot/projects/vap/share/man/man4/snd_hda.4#7 integrate .. //depot/projects/vap/share/man/man4/u3g.4#1 branch .. //depot/projects/vap/share/man/man4/ubsa.4#6 integrate .. //depot/projects/vap/share/man/man4/umass.4#3 integrate .. //depot/projects/vap/share/man/man4/vlan.4#5 integrate .. //depot/projects/vap/share/man/man4/vr.4#4 integrate .. //depot/projects/vap/share/man/man4/wpi.4#6 integrate .. //depot/projects/vap/share/man/man5/Makefile#5 integrate .. //depot/projects/vap/share/man/man5/nullfs.5#1 branch .. //depot/projects/vap/share/misc/committers-src.dot#12 integrate .. //depot/projects/vap/share/mk/bsd.kmod.mk#3 integrate .. //depot/projects/vap/share/syscons/keymaps/INDEX.keymaps#4 integrate .. //depot/projects/vap/share/syscons/keymaps/eee_nordic.kbd#1 branch .. //depot/projects/vap/share/zoneinfo/Makefile#4 integrate .. //depot/projects/vap/share/zoneinfo/africa#5 integrate .. //depot/projects/vap/share/zoneinfo/asia#7 integrate .. //depot/projects/vap/share/zoneinfo/southamerica#9 integrate .. //depot/projects/vap/share/zoneinfo/zone.tab#6 integrate .. //depot/projects/vap/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/vap/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/vap/sys/arm/arm/busdma_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/vap/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/vap/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/vap/sys/arm/arm/elf_trampoline.c#6 integrate .. //depot/projects/vap/sys/arm/arm/genassym.c#7 integrate .. //depot/projects/vap/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/vap/sys/arm/arm/locore.S#8 integrate .. //depot/projects/vap/sys/arm/arm/pmap.c#13 integrate .. //depot/projects/vap/sys/arm/arm/swtch.S#8 integrate .. //depot/projects/vap/sys/arm/at91/at91_mci.c#5 integrate .. //depot/projects/vap/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/vap/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/vap/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/vap/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/vap/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/vap/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/vap/sys/arm/include/armreg.h#5 integrate .. //depot/projects/vap/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/vap/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/vap/sys/arm/include/intr.h#9 integrate .. //depot/projects/vap/sys/arm/include/metadata.h#3 integrate .. //depot/projects/vap/sys/arm/include/resource.h#3 integrate .. //depot/projects/vap/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/vap/sys/arm/mv/common.c#1 branch .. //depot/projects/vap/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/vap/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/vap/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/vap/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/vap/sys/arm/mv/files.mv#1 branch .. //depot/projects/vap/sys/arm/mv/gpio.c#1 branch .. //depot/projects/vap/sys/arm/mv/ic.c#1 branch .. //depot/projects/vap/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/vap/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/vap/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/vap/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/vap/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/vap/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/vap/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/vap/sys/arm/mv/obio.c#1 branch .. //depot/projects/vap/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/vap/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/vap/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/vap/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/vap/sys/arm/mv/rtc.c#1 branch .. //depot/projects/vap/sys/arm/mv/std.mv#1 branch .. //depot/projects/vap/sys/arm/mv/timer.c#1 branch .. //depot/projects/vap/sys/arm/mv/twsi.c#1 branch .. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/vap/sys/boot/Makefile#8 integrate .. //depot/projects/vap/sys/boot/arm/Makefile#3 integrate .. //depot/projects/vap/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/vap/sys/boot/arm/at91/boot2/centipad_board.c#3 integrate .. //depot/projects/vap/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/vap/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/vap/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/vap/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/vap/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/vap/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/vap/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/vap/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/vap/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/vap/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/vap/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/vap/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/vap/sys/boot/arm/uboot/version#1 branch .. //depot/projects/vap/sys/boot/common/Makefile.inc#5 integrate .. //depot/projects/vap/sys/boot/common/load_elf.c#6 integrate .. //depot/projects/vap/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/vap/sys/boot/i386/libi386/bootinfo64.c#5 integrate .. //depot/projects/vap/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/vap/sys/boot/powerpc/Makefile#5 integrate .. //depot/projects/vap/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/vap/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/vap/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/vap/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/vap/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/vap/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/vap/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/vap/sys/boot/uboot/lib/api_public.h#4 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.c#6 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.h#5 integrate .. //depot/projects/vap/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/vap/sys/compat/linprocfs/linprocfs.c#12 integrate .. //depot/projects/vap/sys/compat/linux/linux_futex.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_futex.h#5 integrate .. //depot/projects/vap/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/vap/sys/conf/Makefile.arm#10 integrate .. //depot/projects/vap/sys/conf/NOTES#29 integrate .. //depot/projects/vap/sys/conf/files#51 edit .. //depot/projects/vap/sys/conf/files.powerpc#16 integrate .. //depot/projects/vap/sys/conf/ldscript.mips.cfe#3 integrate .. //depot/projects/vap/sys/conf/newvers.sh#9 integrate .. //depot/projects/vap/sys/conf/options.arm#7 integrate .. //depot/projects/vap/sys/contrib/pf/net/pf.c#12 integrate .. //depot/projects/vap/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/vap/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/vap/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/vap/sys/dev/aha/aha_isa.c#6 integrate .. //depot/projects/vap/sys/dev/aha/aha_mca.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/vap/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/vap/sys/dev/ata/ata-chipset.c#18 delete .. //depot/projects/vap/sys/dev/ata/ata-dma.c#10 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#13 integrate .. //depot/projects/vap/sys/dev/ata/ata-sata.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-acard.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-adaptec.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-ahci.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-amd.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-ati.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-cenatek.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-cypress.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-cyrix.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-highpoint.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-intel.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-ite.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-jmicron.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-marvell.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-micron.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-national.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-netcell.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-nvidia.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-promise.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-serverworks.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-sis.c#1 branch .. //depot/projects/vap/sys/dev/ata/chipsets/ata-via.c#1 branch .. //depot/projects/vap/sys/dev/atkbdc/psm.c#8 integrate .. //depot/projects/vap/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/vap/sys/dev/bge/if_bgereg.h#12 integrate .. //depot/projects/vap/sys/dev/bm/if_bm.c#5 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#14 integrate .. //depot/projects/vap/sys/dev/drm/ati_pcigart.c#7 integrate .. //depot/projects/vap/sys/dev/drm/drm.h#7 integrate .. //depot/projects/vap/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/vap/sys/dev/drm/drm_agpsupport.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_atomic.h#5 integrate .. //depot/projects/vap/sys/dev/drm/drm_auth.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/vap/sys/dev/drm/drm_context.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_dma.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_drawable.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/vap/sys/dev/drm/drm_fops.c#7 integrate .. //depot/projects/vap/sys/dev/drm/drm_ioctl.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_irq.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_linux_list.h#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_lock.c#7 integrate .. //depot/projects/vap/sys/dev/drm/drm_memory.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_pci.c#7 integrate .. //depot/projects/vap/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/vap/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_sysctl.c#6 integrate .. //depot/projects/vap/sys/dev/drm/drm_vm.c#6 integrate .. //depot/projects/vap/sys/dev/drm/i915_dma.c#8 integrate .. //depot/projects/vap/sys/dev/drm/i915_drm.h#6 integrate .. //depot/projects/vap/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/vap/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/vap/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/vap/sys/dev/drm/mach64_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/mga_drv.c#7 integrate .. //depot/projects/vap/sys/dev/drm/r128_drv.c#7 integrate .. //depot/projects/vap/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/vap/sys/dev/drm/radeon_drv.c#7 integrate .. //depot/projects/vap/sys/dev/drm/radeon_drv.h#7 integrate .. //depot/projects/vap/sys/dev/drm/savage_drv.c#6 integrate .. //depot/projects/vap/sys/dev/drm/sis_drv.c#7 integrate .. //depot/projects/vap/sys/dev/drm/tdfx_drv.c#7 integrate .. //depot/projects/vap/sys/dev/hptiop/hptiop.h#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_ppro.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/pmc_events.h#5 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#30 integrate .. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#16 integrate .. //depot/projects/vap/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/vap/sys/dev/jme/if_jmereg.h#4 integrate .. //depot/projects/vap/sys/dev/mge/if_mge.c#1 branch .. //depot/projects/vap/sys/dev/mge/if_mgevar.h#1 branch .. //depot/projects/vap/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/vap/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/vap/sys/dev/mii/miidevs#15 integrate .. //depot/projects/vap/sys/dev/mmc/bridge.h#3 integrate .. //depot/projects/vap/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/vap/sys/dev/mmc/mmcbrvar.h#4 integrate .. //depot/projects/vap/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/vap/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/vap/sys/dev/mmc/mmcvar.h#4 integrate .. //depot/projects/vap/sys/dev/powermac_nvram/powermac_nvram.c#5 integrate .. //depot/projects/vap/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/vap/sys/dev/sio/sio.c#8 integrate .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/vap/sys/dev/sym/sym_hipd.c#9 integrate .. //depot/projects/vap/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/vap/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/vap/sys/dev/uart/uart_cpu_mv.c#1 branch .. //depot/projects/vap/sys/dev/usb/ehci.c#14 integrate .. //depot/projects/vap/sys/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/vap/sys/dev/usb/ehci_pci.c#12 integrate .. //depot/projects/vap/sys/dev/usb/ehcivar.h#8 integrate .. //depot/projects/vap/sys/dev/usb/ohci_pci.c#7 integrate .. //depot/projects/vap/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/vap/sys/dev/usb/u3g.c#1 branch .. //depot/projects/vap/sys/dev/usb/uark.c#4 integrate .. //depot/projects/vap/sys/dev/usb/ubsa.c#12 integrate .. //depot/projects/vap/sys/dev/usb/ucom.c#10 integrate .. //depot/projects/vap/sys/dev/usb/uhci_pci.c#9 integrate .. //depot/projects/vap/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/vap/sys/dev/usb/umass.c#12 integrate .. //depot/projects/vap/sys/dev/usb/umct.c#5 integrate .. //depot/projects/vap/sys/dev/usb/usb_quirks.c#8 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/vap/sys/fs/fdescfs/fdesc_vnops.c#12 integrate .. //depot/projects/vap/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/vap/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/vap/sys/fs/nwfs/nwfs_io.c#7 integrate .. //depot/projects/vap/sys/fs/portalfs/portal_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_io.c#9 integrate .. //depot/projects/vap/sys/fs/udf/udf_vfsops.c#8 integrate .. //depot/projects/vap/sys/geom/geom_vfs.c#6 integrate .. //depot/projects/vap/sys/geom/geom_vfs.h#4 integrate .. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#5 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#5 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#12 integrate .. //depot/projects/vap/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/vap/sys/i386/include/cpufunc.h#10 integrate .. //depot/projects/vap/sys/i386/include/trap.h#6 integrate .. //depot/projects/vap/sys/i386/linux/linux.h#7 integrate .. //depot/projects/vap/sys/i386/xen/locore.s#4 integrate .. //depot/projects/vap/sys/i386/xen/xen_machdep.c#7 integrate .. //depot/projects/vap/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/vap/sys/kern/kern_exit.c#13 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#11 integrate .. //depot/projects/vap/sys/kern/kern_prot.c#6 integrate .. //depot/projects/vap/sys/kern/kern_sig.c#14 integrate .. //depot/projects/vap/sys/kern/kern_synch.c#14 integrate .. //depot/projects/vap/sys/kern/kern_thr.c#9 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#15 integrate .. //depot/projects/vap/sys/kern/subr_bus.c#13 integrate .. //depot/projects/vap/sys/kern/subr_firmware.c#7 integrate .. //depot/projects/vap/sys/kern/subr_trap.c#10 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#20 integrate .. //depot/projects/vap/sys/kern/sys_process.c#8 integrate .. //depot/projects/vap/sys/kern/sys_socket.c#8 integrate .. //depot/projects/vap/sys/kern/tty.c#15 integrate .. //depot/projects/vap/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/vap/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_bio.c#16 integrate .. //depot/projects/vap/sys/kern/vfs_mount.c#23 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#23 integrate .. //depot/projects/vap/sys/libkern/qdivrem.c#3 integrate .. //depot/projects/vap/sys/mips/conf/SENTRY5#5 integrate .. //depot/projects/vap/sys/mips/mips/machdep.c#5 integrate .. //depot/projects/vap/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/vap/sys/modules/Makefile#41 integrate .. //depot/projects/vap/sys/modules/ae/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/Makefile#3 integrate .. //depot/projects/vap/sys/modules/ata/ata/Makefile#3 delete .. //depot/projects/vap/sys/modules/ata/atacore/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atadevel/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atadevel/ata-devel.c#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/Makefile#3 integrate .. //depot/projects/vap/sys/modules/ata/atapci/Makefile.inc#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch .. //depot/projects/vap/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch .. //depot/projects/vap/sys/modules/ehci/Makefile#1 branch .. //depot/projects/vap/sys/modules/ohci/Makefile#1 branch .. //depot/projects/vap/sys/modules/slhci/Makefile#3 integrate .. //depot/projects/vap/sys/modules/u3g/Makefile#1 branch .. //depot/projects/vap/sys/modules/uhci/Makefile#1 branch .. //depot/projects/vap/sys/modules/usb/Makefile#6 integrate .. //depot/projects/vap/sys/modules/wpifw/Makefile#3 integrate .. //depot/projects/vap/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/vap/sys/netgraph/netflow/netflow.c#9 integrate .. //depot/projects/vap/sys/netgraph/netflow/ng_netflow.c#9 integrate .. //depot/projects/vap/sys/netgraph/netflow/ng_netflow.h#6 integrate .. //depot/projects/vap/sys/netgraph/ng_tty.c#5 integrate .. //depot/projects/vap/sys/netgraph/ng_tty.h#3 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#14 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/vap/sys/netinet/ip_fw.h#14 integrate .. //depot/projects/vap/sys/netinet/ip_fw2.c#20 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#14 integrate .. //depot/projects/vap/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/vap/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/vap/sys/netinet/sctp_sysctl.c#6 integrate .. //depot/projects/vap/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/vap/sys/netinet/sctp_usrreq.c#10 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#12 integrate .. //depot/projects/vap/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#15 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#12 integrate .. //depot/projects/vap/sys/netinet6/ip6_output.c#14 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#16 integrate .. //depot/projects/vap/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/vap/sys/nfsserver/nfs_serv.c#13 integrate .. //depot/projects/vap/sys/powerpc/aim/nexus.c#3 integrate .. //depot/projects/vap/sys/powerpc/aim/ofw_machdep.c#3 integrate .. //depot/projects/vap/sys/powerpc/include/nexusvar.h#3 delete .. //depot/projects/vap/sys/powerpc/ofw/ofw_pci.c#3 delete .. //depot/projects/vap/sys/powerpc/ofw/ofw_pci.h#3 delete .. //depot/projects/vap/sys/powerpc/ofw/ofw_pcib_pci.c#5 integrate .. //depot/projects/vap/sys/powerpc/ofw/ofw_pcibus.c#1 branch .. //depot/projects/vap/sys/powerpc/ofw/ofw_syscons.c#7 integrate .. //depot/projects/vap/sys/powerpc/powermac/ata_kauai.c#8 integrate .. //depot/projects/vap/sys/powerpc/powermac/grackle.c#7 integrate .. //depot/projects/vap/sys/powerpc/powermac/hrowpic.c#6 integrate .. //depot/projects/vap/sys/powerpc/powermac/macio.c#8 integrate .. //depot/projects/vap/sys/powerpc/powermac/openpic_macio.c#7 integrate .. //depot/projects/vap/sys/powerpc/powermac/uninorth.c#7 integrate .. //depot/projects/vap/sys/powerpc/powermac/uninorthvar.h#3 integrate .. //depot/projects/vap/sys/powerpc/psim/iobus.c#6 integrate .. //depot/projects/vap/sys/powerpc/psim/openpic_iobus.c#8 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/vap/sys/security/mac/mac_inet.c#10 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/vap/sys/security/mac_lomac/mac_lomac.c#10 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#12 integrate .. //depot/projects/vap/sys/security/mac_partition/mac_partition.c#7 integrate .. //depot/projects/vap/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate .. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#11 integrate .. //depot/projects/vap/sys/security/mac_test/mac_test.c#11 integrate .. //depot/projects/vap/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/vap/sys/sys/bufobj.h#8 integrate .. //depot/projects/vap/sys/sys/pmc.h#7 integrate .. //depot/projects/vap/sys/sys/proc.h#23 integrate .. //depot/projects/vap/sys/sys/systm.h#13 integrate .. //depot/projects/vap/sys/sys/tty.h#10 integrate .. //depot/projects/vap/sys/sys/un.h#4 integrate .. //depot/projects/vap/sys/sys/vnode.h#17 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_inode.c#8 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#18 integrate .. //depot/projects/vap/sys/vm/vm_object.c#11 integrate .. //depot/projects/vap/tools/regression/netinet/udpzerobyte/Makefile#1 branch .. //depot/projects/vap/tools/regression/netinet/udpzerobyte/udpzerobyte.c#1 branch .. //depot/projects/vap/tools/regression/sockets/fstat/Makefile#1 branch .. //depot/projects/vap/tools/regression/sockets/fstat/fstat.c#1 branch .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#10 integrate .. //depot/projects/vap/usr.bin/ministat/Makefile#2 integrate .. //depot/projects/vap/usr.bin/ministat/ministat.c#3 integrate .. //depot/projects/vap/usr.bin/netstat/inet.c#8 integrate .. //depot/projects/vap/usr.bin/netstat/route.c#7 integrate .. //depot/projects/vap/usr.bin/tftp/extern.h#3 integrate .. //depot/projects/vap/usr.bin/tftp/main.c#3 integrate .. //depot/projects/vap/usr.bin/tftp/tftp.c#3 integrate .. //depot/projects/vap/usr.bin/tftp/tftpsubs.c#3 integrate .. //depot/projects/vap/usr.sbin/Makefile#16 integrate .. //depot/projects/vap/usr.sbin/gstat/gstat.8#3 integrate .. //depot/projects/vap/usr.sbin/gstat/gstat.c#4 integrate .. //depot/projects/vap/usr.sbin/nscd/agent.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/cachelib.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/cacheplcs.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/config.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/hashtable.h#3 integrate .. //depot/projects/vap/usr.sbin/nscd/mp_rs_query.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/mp_ws_query.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/nscd.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/nscdcli.c#3 integrate .. //depot/projects/vap/usr.sbin/nscd/query.c#3 integrate .. //depot/projects/vap/usr.sbin/pkg_install/add/main.c#6 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.8#6 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.c#6 integrate .. //depot/projects/vap/usr.sbin/setfib/setfib.c#5 integrate .. //depot/projects/vap/usr.sbin/sysinstall/config.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/devices.c#6 integrate .. //depot/projects/vap/usr.sbin/sysinstall/globals.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/index.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/keymap.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/package.c#4 integrate .. //depot/projects/vap/usr.sbin/sysinstall/sysinstall.h#6 integrate Differences ... ==== //depot/projects/vap/UPDATING#20 (text+ko) ==== @@ -22,6 +22,21 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081009: + The uhci, ohci, ehci and slhci USB Host controller drivers have + been put into separate modules. If you load the usb module + separately through loader.conf you will need to load the + appropriate *hci module as well. E.g. for a UHCI-based USB 2.0 + controller add the following to loader.conf: + + uhci_load="YES" + ehci_load="YES" + +20081009: + The ABI used by the PMC toolset has changed. Please keep + userland (libpmc(3)) and the kernel module (hwpmc(4)) in + sync. + 20080820: The TTY subsystem of the kernel has been replaced by a new implementation, which provides better scalability and an @@ -59,6 +74,11 @@ option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh command line. + Please note that the sequence of keys offered for + authentication has been changed as well. You may want to + specify IdentityFile in a different order to revert this + behavior. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1018,7 +1038,7 @@ - + @@ -1126,4 +1146,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.542 2008/09/14 19:25:57 ed Exp $ +$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $ ==== //depot/projects/vap/etc/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.370 2008/09/22 15:37:47 sam Exp $ +# $FreeBSD: src/etc/Makefile,v 1.371 2008/10/08 13:28:02 des Exp $ .include @@ -251,6 +251,7 @@ .endif cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* . + cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* . cd ${DESTDIR}/usr/share/man; \ set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; \ ==== //depot/projects/vap/etc/etc.mips/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.3 2008/08/24 08:41:29 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.4 2008/10/12 06:58:03 imp Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -33,10 +33,10 @@ console none unknown off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyU0 "/usr/libexec/getty std.9600" dialup off secure -ttyU1 "/usr/libexec/getty std.9600" dialup off secure -ttyU2 "/usr/libexec/getty std.9600" dialup off secure -ttyU3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.115200" dialup on secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu3 "/usr/libexec/getty std.115200" dialup off secure # Pseudo terminals ttyp0 none network ttyp1 none network ==== //depot/projects/vap/etc/mtree/BSD.usr.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.335 2008/07/28 17:42:37 antoine Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.336 2008/10/08 13:28:02 des Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -740,6 +740,46 @@ cat9 .. .. + en.UTF-8 uname=root + cat1 + .. + cat1aout + .. + cat2 + .. + cat3 + .. + cat4 + amd64 + .. + arm + .. + i386 + .. + powerpc + .. + sparc64 + .. + .. + cat5 + .. + cat6 + .. + cat7 + .. + cat8 + amd64 + .. + i386 + .. + powerpc + .. + sparc64 + .. + .. + cat9 + .. + .. ja uname=root cat1 .. ==== //depot/projects/vap/games/fortune/datfiles/fortunes#14 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.270 2008/08/02 20:11:56 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.272 2008/10/08 19:39:22 phk Exp $ % ======================================================================= || || @@ -23951,6 +23951,9 @@ that kidnaped Europa. -- Marcus Tullius Cicero % +I like paying taxes. With them I buy civilization. + -- Oliver Wendell Holmes +% I like to believe that people in the long run are going to do more to promote peace than our governments. Indeed, I think that people want peace so much that one of these days governments had better get out of @@ -26583,6 +26586,9 @@ % If you can lead it to water and force it to drink, it isn't a horse. % +If you can not say it, you can not whistle it, either. + -- Wittgenstein +% If you can read this, you're too close. % If you can survive death, you can probably survive anything. ==== //depot/projects/vap/gnu/usr.bin/gdb/arch/amd64/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.4 2007/05/19 03:22:18 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.5 2008/10/16 18:09:27 obrien Exp $ GENSRCS+= xm.h .if !defined(GDB_CROSS_DEBUGGER) @@ -7,7 +7,7 @@ .endif LIBSRCS+= solib.c solib-svr4.c LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ - i386fbsd-tdep-fixed.c i387-tdep.c + i386fbsd-tdep-fixed.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd64.h"' > ${.TARGET} @@ -18,7 +18,7 @@ xm.h: echo '#include "i386/xm-i386.h"' > ${.TARGET} +# Fix source static/extern mismatch nits that GCC 4.2 warns about. +CLEANFILES+= i386fbsd-tdep-fixed.c i386fbsd-tdep-fixed.c: i386fbsd-tdep.c sed -e '48s/^static //' ${.ALLSRC} > ${.TARGET} - -CLEANFILES+= i386fbsd-tdep-fixed.c ==== //depot/projects/vap/gnu/usr.bin/gdb/arch/i386/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.5 2007/05/19 03:22:19 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.6 2008/10/16 18:09:27 obrien Exp $ GENSRCS+= xm.h .if !defined(GDB_CROSS_DEBUGGER) @@ -17,6 +17,7 @@ xm.h: echo '#include "i386/xm-i386.h"' > ${.TARGET} +# Fix source static/extern mismatch nits that GCC 4.2 warns about. +CLEANFILES += i386fbsd-tdep-fixed.c i386fbsd-tdep-fixed.c: i386fbsd-tdep.c sed -e '48s/^static\ //' ${.ALLSRC} > ${.TARGET} -CLEANFILES += i386fbsd-tdep-fixed.c ==== //depot/projects/vap/gnu/usr.bin/man/man/man.c#5 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.68 2008/05/14 17:18:12 ru Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.69 2008/10/08 13:16:20 des Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -105,6 +105,7 @@ {"KOI8-R", "koi8-r"}, {"ISO8859-1", "latin1"}, {"ISO8859-15", "latin1"}, + {"UTF-8", "utf8"}, {NULL} }; #endif ==== //depot/projects/vap/lib/libarchive/archive_write_disk.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.41 2008/10/19 00:18:44 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -710,10 +710,6 @@ int r2 = set_mode(a, a->mode); if (r2 < ret) ret = r2; } - if (a->todo & TODO_TIMES) { - int r2 = set_times(a); - if (r2 < ret) ret = r2; - } if (a->todo & TODO_ACLS) { int r2 = set_acls(a); if (r2 < ret) ret = r2; @@ -726,6 +722,10 @@ int r2 = set_fflags(a); if (r2 < ret) ret = r2; } + if (a->todo & TODO_TIMES) { + int r2 = set_times(a); + if (r2 < ret) ret = r2; + } /* If there's an fd, we can close it now. */ if (a->fd >= 0) { ==== //depot/projects/vap/lib/libarchive/test/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.27 2008/09/30 04:02:36 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.28 2008/10/19 00:18:44 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -9,6 +9,7 @@ TESTS= \ test_acl_basic.c \ + test_acl_freebsd.c \ test_acl_pax.c \ test_archive_api_feature.c \ test_bad_fd.c \ ==== //depot/projects/vap/lib/libarchive/test/test_acl_basic.c#4 (text+ko) ==== @@ -23,12 +23,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.6 2008/10/19 00:13:57 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. - * Check that archive_entry objects can save and restore ACL data - * and that pax archive can save and restore ACL data. + * Check that archive_entry objects can save and restore ACL data. * * This should work on all systems, regardless of whether local * filesystems support ACLs or not. @@ -42,7 +41,7 @@ const char *name; /* Name of user/group, depending on tag. */ }; -struct acl_t acls0[] = { +static struct acl_t acls0[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE, ARCHIVE_ENTRY_ACL_USER_OBJ, 0, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, @@ -51,7 +50,7 @@ ARCHIVE_ENTRY_ACL_OTHER, 0, "" }, }; -struct acl_t acls1[] = { +static struct acl_t acls1[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE, ARCHIVE_ENTRY_ACL_USER_OBJ, -1, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, @@ -62,7 +61,7 @@ ARCHIVE_ENTRY_ACL_OTHER, -1, "" }, }; -struct acl_t acls2[] = { +static struct acl_t acls2[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE | ARCHIVE_ENTRY_ACL_READ, ARCHIVE_ENTRY_ACL_USER_OBJ, -1, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, ==== //depot/projects/vap/lib/libc/arm/gen/_setjmp.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.4 2008/10/14 09:53:47 raj Exp $"); /* * C library -- _setjmp, _longjmp @@ -101,6 +101,10 @@ /* validation failed, die die die. */ botch: +#if !defined(_STANDALONE) bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(_C_LABEL(abort), PLT) b . - 8 /* Cannot get here */ +#else + b . +#endif ==== //depot/projects/vap/lib/libc/stdlib/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.55 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.56 2008/10/17 08:30:20 netchild Exp $ # machine-independent stdlib sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib @@ -48,3 +48,8 @@ MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 malloc.conf.5 \ malloc.3 realloc.3 malloc.3 reallocf.3 malloc.3 malloc_usable_size.3 MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3 + +.if defined(MALLOC_PRODUCTION) +CFLAGS+= -DMALLOC_PRODUCTION +.endif + ==== //depot/projects/vap/lib/libc/string/strxfrm.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.16 2008/10/17 21:29:05 delphij Exp $"); #include #include @@ -51,8 +51,7 @@ if (slen < len) strcpy(dest, src); else { - strncpy(dest, src, len - 1); - dest[len - 1] = '\0'; + strlcpy(dest, src, len); } } return slen; ==== //depot/projects/vap/lib/libkvm/kvm.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.32 2008/01/12 00:54:47 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.33 2008/10/17 20:11:28 delphij Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -244,11 +244,10 @@ { kvm_t *kd; - if ((kd = malloc(sizeof(*kd))) == NULL) { + if ((kd = calloc(1, sizeof(*kd))) == NULL) { (void)strlcpy(errout, strerror(errno), _POSIX2_LINE_MAX); return (0); } - memset(kd, 0, sizeof(*kd)); kd->program = 0; return (_kvm_open(kd, uf, mf, flag, errout)); } @@ -263,13 +262,12 @@ { kvm_t *kd; - if ((kd = malloc(sizeof(*kd))) == NULL) { + if ((kd = calloc(1, sizeof(*kd))) == NULL) { if (errstr != NULL) (void)fprintf(stderr, "%s: %s\n", errstr, strerror(errno)); return (0); } - memset(kd, 0, sizeof(*kd)); kd->program = errstr; return (_kvm_open(kd, uf, mf, flag, NULL)); } ==== //depot/projects/vap/lib/libkvm/kvm_minidump_amd64.c#3 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.2 2006/06/05 08:51:14 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.3 2008/10/17 20:09:00 delphij Exp $"); /* * AMD64 machine dependent routines for kvm and minidumps. @@ -146,7 +146,6 @@ return (-1); } kd->vmst = vmst; - bzero(vmst, sizeof(*vmst)); vmst->minidump = 1; if (pread(kd->pmfd, &vmst->hdr, sizeof(vmst->hdr), 0) != sizeof(vmst->hdr)) { ==== //depot/projects/vap/lib/libkvm/kvm_minidump_i386.c#3 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.2 2006/06/05 08:51:14 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.3 2008/10/17 20:09:00 delphij Exp $"); /* * AMD64 machine dependent routines for kvm and minidumps. @@ -148,7 +148,6 @@ return (-1); } kd->vmst = vmst; - bzero(vmst, sizeof(*vmst)); vmst->minidump = 1; if (pread(kd->pmfd, &vmst->hdr, sizeof(vmst->hdr), 0) != sizeof(vmst->hdr)) { ==== //depot/projects/vap/lib/libpmc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpmc/Makefile,v 1.11 2008/09/16 16:57:14 jkoshy Exp $ +# $FreeBSD: src/lib/libpmc/Makefile,v 1.12 2008/10/04 12:27:49 jkoshy Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 19 07:14:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 221011065694; Sun, 19 Oct 2008 07:14:26 +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 DC29C1065690 for ; Sun, 19 Oct 2008 07:14:25 +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 CB80E8FC15 for ; Sun, 19 Oct 2008 07:14:25 +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 m9J7EP4m042909 for ; Sun, 19 Oct 2008 07:14:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J7EPAb042907 for perforce@freebsd.org; Sun, 19 Oct 2008 07:14:25 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 07:14:25 GMT Message-Id: <200810190714.m9J7EPAb042907@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 151550 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, 19 Oct 2008 07:14:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=151550 Change 151550 by sam@sam_ebb on 2008/10/19 07:13:26 add sr9+xr9 support Affected files ... .. //depot/projects/vap/etc/regdomain.xml#4 edit Differences ... ==== //depot/projects/vap/etc/regdomain.xml#4 (text+ko) ==== @@ -1081,10 +1081,10 @@ - - GSM - 0x09 - + + SR9 + 0x0298 + @@ -1103,6 +1103,29 @@ + + + XR9 + 0x299 + + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + + 30 + IEEE80211_CHAN_G + + + @@ -1221,10 +1244,6 @@ 300 Greece - - - 843 GSM - 320 Guatemala @@ -1423,6 +1442,12 @@ 792 Turkey + + 5000 Ubiquiti SR9 + + + 5001 Ubiquiti XR9 + 804 Ukraine @@ -1606,17 +1631,39 @@ 2422 2437 5 5 + IEEE80211_CHAN_GSM IEEE80211_CHAN_QUARTER 2422 2437 10 5 + IEEE80211_CHAN_GSM IEEE80211_CHAN_HALF 2427 2432 20 5 + IEEE80211_CHAN_GSM + + + 2427 2442 + 5 5 + IEEE80211_CHAN_GSM + IEEE80211_CHAN_QUARTER + + + 2427 2442 + 10 5 + IEEE80211_CHAN_GSM + IEEE80211_CHAN_HALF + + + 2432 2437 + 20 5 + IEEE80211_CHAN_GSM + + From owner-p4-projects@FreeBSD.ORG Sun Oct 19 09:12:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 186911065687; Sun, 19 Oct 2008 09:12:26 +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 CFDA3106568D for ; Sun, 19 Oct 2008 09:12: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 BEA5F8FC18 for ; Sun, 19 Oct 2008 09:12: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 m9J9CPh8064030 for ; Sun, 19 Oct 2008 09:12:25 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J9CPHV064028 for perforce@freebsd.org; Sun, 19 Oct 2008 09:12:25 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Oct 2008 09:12:25 GMT Message-Id: <200810190912.m9J9CPHV064028@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 151554 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, 19 Oct 2008 09:12:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=151554 Change 151554 by rene@rene_self on 2008/10/19 09:11:59 MFen: add the freebsd-xen mailing list. mailing-lists.ent -> 1.65 eresources -> 1.194 Checked spelling, build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#10 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#10 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.193 + %SRCID% 1.194 --> @@ -536,7 +536,7 @@ &a.proliant.name; - Technische dicussie over &os; op HP Proliant + Technische discussie over &os; op HP Proliant serverplatforms @@ -665,6 +665,13 @@ Onderhoud en ondersteuning voor X11 op &os; + + + &a.xen.name; + + Discussies over het porteren van &os; naar xen - + implementatie en gebruik + @@ -1672,7 +1679,7 @@ &a.proliant.name; - Technische dicussie over &os; op HP + Technische discussie over &os; op HP Proliant serverplatforms Deze mailinglijst wordt gebruikt voor technische @@ -1907,6 +1914,21 @@ vinden. + + + &a.xen.name; + + + Discussies over het porteren van &os; naar + xen - implementatie en gebruik + + Een lijst die zich richt op de &os; Xen port. De + verwachte hoeveelheid verkeer is laag genoeg zodat het + voor zowel technische discussies over de implementatie- en + ontwerpdetails als voor zaken over administratief gebruik + bedoeld is. + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#9 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.64 + %SRCID% 1.65 --> @@ -496,6 +496,10 @@ FreeBSD X11 mailinglijst"> freebsd-x11"> + +Discussies voer het porteren van FreeBSD naar xen - implementatie en gebruik"> +freebsd-xen"> + bug-followup@FreeBSD.org"> From owner-p4-projects@FreeBSD.ORG Sun Oct 19 12:26:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 615251065699; Sun, 19 Oct 2008 12:26: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 0BEBD1065692 for ; Sun, 19 Oct 2008 12:26:43 +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 E5E048FC15 for ; Sun, 19 Oct 2008 12:26:42 +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 m9JCQgMb082061 for ; Sun, 19 Oct 2008 12:26:42 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JCQgus082059 for perforce@freebsd.org; Sun, 19 Oct 2008 12:26:42 GMT (envelope-from brueffer@freebsd.org) Date: Sun, 19 Oct 2008 12:26:42 GMT Message-Id: <200810191226.m9JCQgus082059@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 151559 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, 19 Oct 2008 12:26:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=151559 Change 151559 by brueffer@brueffer_haakonia on 2008/10/19 12:25:50 Consistently use mdoc macros, improve style. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/getaudit.2#10 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#10 $ .\" -.Dd April 19, 2005 +.Dd October 19, 2008 .Dt GETAUDIT 2 .Os .Sh NAME @@ -58,9 +58,7 @@ The .Fa auditinfo_t data structure is defined as follows: -.nf -.in +4n - +.Bd -literal -offset indent struct auditinfo { au_id_t ai_auid; /* Audit user ID */ au_mask_t ai_mask; /* Audit masks */ @@ -68,47 +66,39 @@ au_asid_t ai_asid; /* Audit session ID */ }; typedef struct auditinfo auditinfo_t; -.in -.fi +.Ed .Pp The .Fa ai_auid variable contains the audit identifier which is recorded in the audit log for each event the process caused. -.PP - +.Pp The .Fa au_mask_t data structure defines the bit mask for auditing successful and failed events -out of the predefined list of event classes. It is defined as follows: -.nf -.in +4n - +out of the predefined list of event classes. +It is defined as follows: +.Bd -literal -offset indent struct au_mask { unsigned int am_success; /* success bits */ unsigned int am_failure; /* failure bits */ }; typedef struct au_mask au_mask_t; -.in -.fi -.PP - +.Ed +.Pp The .Fa au_termid_t data structure defines the Terminal ID recorded with every event caused by the -process. It is defined as follows: -.nf -.in +4n - +process. +It is defined as follows: +.Bd -literal -offset indent struct au_tid { dev_t port; u_int32_t machine; }; typedef struct au_tid au_tid_t; -.in -.fi -.PP - +.Ed +.Pp The .Fa ai_asid variable contains the audit session ID which is recorded with every event @@ -119,11 +109,10 @@ system call uses the expanded .Fa auditinfo_addr_t -data structure supports Terminal IDs with larger addresses such as those used -in IP version 6. It is defined as follows: -.nf -.in +4n - +data structure and supports Terminal IDs with larger addresses +such as those used in IP version 6. +It is defined as follows: +.Bd -literal -offset indent struct auditinfo_addr { au_id_t ai_auid; /* Audit user ID. */ au_mask_t ai_mask; /* Audit masks. */ @@ -131,25 +120,20 @@ au_asid_t ai_asid; /* Audit session ID. */ }; typedef struct auditinfo_addr auditinfo_addr_t; -.in -.fi +.Ed .Pp - The .Fa au_tid_addr_t data structure which includes a larger address storage field and an additional field with the type of address stored: -.nf -.in +4n - +.Bd -literal -offset indent struct au_tid_addr { dev_t at_port; u_int32_t at_type; u_int32_t at_addr[4]; }; typedef struct au_tid_addr au_tid_addr_t; -.in -.fi +.Ed .Pp These system calls require an appropriate privilege to complete. .Sh RETURN VALUES From owner-p4-projects@FreeBSD.ORG Sun Oct 19 16:13:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFFAB1065694; Sun, 19 Oct 2008 16:13: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 585AF1065686 for ; Sun, 19 Oct 2008 16:13:33 +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 461088FC1E for ; Sun, 19 Oct 2008 16:13:33 +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 m9JGDX1C015391 for ; Sun, 19 Oct 2008 16:13:33 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JGDX0c015389 for perforce@freebsd.org; Sun, 19 Oct 2008 16:13:33 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Oct 2008 16:13:33 GMT Message-Id: <200810191613.m9JGDX0c015389@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 151562 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, 19 Oct 2008 16:13:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=151562 Change 151562 by rene@rene_self on 2008/10/19 16:13:29 Finish translation of DTrace chapter (rev 1.3). Checked build, spelling, whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#3 (text+ko) ==== @@ -48,7 +48,7 @@ DTrace, ook bekend als Dynamic Tracing, was ontwikkeld door &sun; als een gereedschap om prestatie-bottlenecks in productie- en preproductiesystemen op te sporen. Het is in geen enkel opzicht - een debug-gereedschap, maar een gereedscahp voor real-time analyse + een debug-gereedschap, maar een gereedschap voor real-time analyse om prestatie- en andere zaken op te sporen. DTrace is een opmerkelijk profileringsgereedschap, met een @@ -57,7 +57,7 @@ scripts te draaien om zo voordeel te halen uit de mogelijkheden. Gebruikers kunnen zelfs hun eigen middelen schrijven door gebruik te maken van de DTrace D Language, wat ze in staat stelt om hun - profiling aan te passen aan hun specifieke behoeften. + profilering aan te passen aan hun specifieke behoeften. Na het lezen van dit hoofdstuk weet u: @@ -115,77 +115,83 @@ - Implementation Differences + Implementatieverschillen - While the DTrace in &os; is very similar to that found - in &solaris;, differences exist that should be explained before - continuing. The primary difference users will notice is that - on &os;, DTrace needs to be specifically enabled. There are - kernel options and modules which must be enabled for DTrace to - work properly. These will be explained later. + Hoewel DTrace in &os; erg lijkt op degene die in &solaris; + zit, zijn er verschillen die uitgelegd moeten worden voordat er + verder wordt gegaan. Het primaire verschil dat gebruikers zullen + zien is dat DTrace specifiek moet worden aangezet op &os;. Er + zijn kernelopties en modulen die aangezet moeten worden om DTrace + juist te laten werken. Deze zullen later worden uitgelegd. - There is a DDB_CTF kernel option which - is used to enable support for loading the CTF - data from kernel modules and the kernel itself. - CTF is the &solaris; Compact C Type Format - which encapsulates a reduced form of debugging information - similar to DWARF and the venerable stabs. - This CTF data is added to the binaries by the - ctfconvert and ctfmerge - build tools. The ctfconvert utility parses - DWARF debug ELF sections - created by the compiler and ctfmerge merges - CTF ELF sections from - objects into either executables or shared libraries. More on - how to enable this for the kernel and &os; build is - forthcoming. + Er is een kerneloptie DDB_CTF die gebruikt + wordt om ondersteuning voor het laden van + CTF-gegevens van kernelmodulen en de kernel + zelf. CTF is het Compact C Type Format van + &solaris; welke een beperkte vorm van debuginformatie bevat + die vergelijkbaar is met DWARF en de befaamde + steken. Deze CTF-gegevens worden door de + bouwmiddelen ctfconvert en + ctfmerge aan de binairen toegevoegd. Het + hulpmiddel ctfconvert parst + DWARF-debug ELF-secties die + door de compiler zijn aangemaakt en ctfmerge + voegt CTF ELF-secties van + objecten samen in hun executables of gedeelde bibliotheken. Meer + informatie over hoe dit voor de bouw van de kernel en &os; aan te + zetten komt eraan. - Some different providers exist for &os; than for &solaris;. - Most notable is the dtmalloc provider, which - allows tracing malloc() by type in the - &os; kernel. + Sommige aanbieders voor &os; verschillen van die voor + &solaris;. De meest opmerkelijke is de aanbieder + dtmalloc, welke het volgen van + malloc() op soort in de &os;-kernel + toestaat. - Only root may use DTrace on &os;. - This is related to security differences, &solaris; has a few - low level security checks which do not yet exist in &os;. As - such, the /dev/dtrace/dtrace is strictly - limited to root users only. + Alleen root mag DTrace op &os; gebruiken. + Dit heeft te maken met beveiligingsverschillen, &solaris; heeft + enkele beveiligingscontroles op laag niveau die nog niet bestaan + in &os;. Hierom is /dev/dtrace/dtrace + strikt beperkt tot root. - Finally, the DTrace software falls under &sun;'s - CDDL license. The Common Development - and Distribution License comes with &os;, see the + Tenslotte valt de DTrace-software onder de + CDDL-licentie van &sun;. De Common + Development and Distribution License wordt bij &os; + geleverd, zie /usr/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE - or view it online at + of bekijk het online op . - This license means that a &os; kernel with the DTrace options - is still BSD licensed; however the - CDDL kicks in when the modules are distributed - in binary form, or the binaries are loaded. + Deze licentie houdt in dat een &os;-kernel met de + DTrace-opties nog steeds onder de BSD-licentie + valt; de CDDL komt echter op de proppen wanneer + de modulen in binaire vorm worden verspreid, of wanneer de + binairen zijn geladen. - Enabling DTrace Support + Ondersteuning voor DTrace aanzetten - To enable support for DTrace, add the following lines to - the kernel configuration file: + Voeg de volgende regels toe aan het kernelinstellingenbestand + om ondersteuning voor DTrace aan te zetten: options KDTRACE_HOOKS options DDB_CTF - Users of the AMD64 architecture will want to add the - following line to their kernel configuration file: + Gebruikers van de AMD64-architectuur zullen de volgende + regel aan hun kernelinstellingenbestand willen toevoegen: options KDTRACE_FRAME - This option provides support for the FBT - feature. DTrace will work without this option; however, there - will be limited support for function boundary tracing. - + Deze optie biedt ondersteuning voor de mogelijkheid + FBT. DTrace zal zonder deze optie werken; + er zal echter beperkte ondersteuning zijn voor het volgen van + functiegrenzen. + - All sources must be rebuilt and installed with CTF options. - To accomplish this task, rebuild the &os; sources using: + Alle broncode moet herbouwd en geherinstalleerd worden met de + CTF-opties. Om deze taak te volbrengen, wordt + de &os;-broncode herbouwd met: &prompt.root; cd /usr/src &prompt.root; make WITH_CTF=1 buildworld @@ -193,92 +199,95 @@ &prompt.root; make WITH_CFT=1 installworld &prompt.root; mergemaster -Ui - The system will need to be restarted. + Het systeem moet opnieuw gestart worden. - After rebooting and allowing the new kernel to be loaded - into memory, support for the Korn shell should be added. This - is needed as the DTrace toolkit has several utilities written - in ksh. Install the - shells/ksh93. It is also - possible to run these tools under - shells/pdksh or - shells/mksh. + Nadat opnieuw is opgestart en de nieuwe kernel in het geheugen + is geladen, dient ondersteuning voor de Korn-shell te worden + toegevoegd. Dit is nodig omdat de verschillende hulpmiddelen van + DTrace in ksh zijn geschreven. Installeer + shells/ksh93. Het is ook + mogelijk om deze hulpmiddelen in shells/pdksh of shells/mksh te draaien. - Finally, obtain the current DTrace toolkit. The current - version is available at + Als laatste dient de huidige DTrace-gereedschapskist verkregen + te worden. De huidige versie is beschikbaar op . - There is an install mechanism included; however, installation - is not required to make use of the bundled utilities. + Het bevat een installatiemechanisme; om gebruik te maken van de + bijgeleverde hulpmiddelen is installatie echter niet nodig. - Using DTrace + DTrace gebruiken - Before making use of DTrace functionality, the DTrace device - must exist. To load the device, issue the following - command: + Voordat er gebruik wordt gemaakt van de functionaliteit van + DTrace, moet het DTrace-apparaat bestaan. Geef het volgende + commando om het apparaat te laten: &prompt.root; kldload dtraceall - DTrace support should now be available. To view all probes - the administrator may now execute the following command: + Ondersteuning van DTrace zou nu beschikbaar moeten zijn. De + beheerder kan het volgende commando uitvoeren om alle sondes te + bekijken: &prompt.root; dtrace -l | more - All output is passed to the more - utility as it will quickly overflow the screen buffer. At - this point, DTrace should be considered working. It is now - time to review the toolkit. + Alle uitvoer wordt aan het hulpmiddel more + doorgegeven omdat het snel de schermbuffer zal laten overstromen. + DTrace kan nu als werkend worden beschouwd. Het is nu tijd om de + gereedschapskist te bekijken. - The toolkit is a collection of ready-made scripts to run - with DTrace to collect system information. There are scripts - to check open files, memory, CPU usage and - a lot more. Extract the scripts with the following - command: + De gereedschapskist is een verzameling van kant-en-klare + scripts die met DTrace gedraaid kunnen worden om informatie over + het systeem te verzamelen. Er zijn scripts om open bestanden, + geheugen, CPU-gebruik, en nog veel meer te + controleren. Pak de scripts uit met het volgende commando: &prompt.root; gunzip -c DTraceToolkit* | tar xvf - - Change into that directory with the cd - and change the execution permissions on all files, designated - as those files with lower case names, to - 755. + Ga naar die map met cd en zet de + uitvoerpermissies voor alle bestanden waarvan de naam uit kleine + letters bestaat, op 755. - All of these scripts will need modifications to their - contents. The ones which refer to - /usr/bin/ksh need that changed to - /usr/local/bin/ksh, the others which - use /usr/bin/sh need to be altered to use - /bin/sh, and finally the ones which - use /usr/bin/perl will need altered to - use /usr/local/bin/perl. + De inhoud van al deze scripts moet veranderd worden. Degenen + die naar /usr/bin/ksh verwijzen dienen naar + /usr/local/bin/ksh te verwijzen, de anderen + die /usr/bin/sh gebruiken dienen gewijzigd te + worden om /bin/sh te gebruiken, en tenslotte + dienen degenen die /usr/bin/perl gebruiken + veranderd te worden om /usr/local/bin/perl te + gebruiken. - At this point it is prudent to remind the reader that - DTrace support in &os; is incomplete - and experimental. Many of these scripts - will not work as they are either too &solaris;-specific or - use probes which are unsupported at this time. + Op dit moment is het voorzichtig om de lezer eraan te + herinneren dat de ondersteuning voor DTrace in &os; + niet compleet en + experimenteel is. Veel van deze scripts + zullen niet werken omdat ze of te &solaris;-specifiek zijn of + omdat ze sondes gebruiken die momenteel niet ondersteund + worden. - At the time of this writing only two of the scripts of the - DTrace Toolkit are fully supported in &os;: - the hotkernel - and procsystime scripts. These are the two - we will explore in the following parts of this section. + Op het moment van schrijven worden slechts twee scripts van de + DTrace Toolkit volledig ondersteund in &os;: de scripts + hotkernel en + procsystime. Dit zijn de twee die we in de + volgende gedeelten van deze sectie zullen bekijken. - The hotkernel is designed to identify - which function is using the most kernel time. Run normally, it - will produce output similar to the following: + De hotkernel is ontworpen om te + identificeren welke functie de meeste kerneltijd gebruikt. Als + het normaal gedraaid wordt, zal het uitvoer die op de volgende + lijkt produceren: &prompt.root; ./hotkernel Sampling... Hit Ctrl-C to end. - The system administrator must use the - CtrlC - key combination to stop the process. Upon - termination, the script will display a list of kernel functions and - timing information, sorting the output in increasing order of - time: + De systeembeheerder moet de toetsencombinatie CtrlC + gebruiken om het proces te stoppen. Nadat het gestopt is, zal het + script een lijst van kernelfuncties en timinginformatie weergeven, + waarbij de uitvoer in volgorde van toenemende tijd is + gesorteerd: kernel`_thread_lock_flags 2 0.0% 0xc1097063 2 0.0% @@ -311,8 +320,9 @@ to find 0xc10981a5, but to no avail. It would be nice to know how we should look that up. --> - This script will also work with kernel modules. To use this - feature, run the script with the flag: + Het script werkt ook met kernelmodules. Draai het script met + de vlag om deze mogelijkheid te + gebruiken: &prompt.root; ./hotkernel -m Sampling... Hit Ctrl-C to end. @@ -335,14 +345,14 @@ kldstat and kldstat -v and grep. Maybe I'm missing something seriously obvious. It is 5AM btw. --> - The procsystime script captures and - prints the system call time usage for a given - PID or process name. In the following - example, a new instance of /bin/csh - was spawned. The procsystime was executed - and remained waiting while a few commands were typed on the - other incarnation of csh. These are the - results of this test: + Het script procsystime vangt en beeldt + het tijdsgebruik van systeemaanroepen af voor een gegeven + PID of procesnaam. In het volgende voorbeeld + wordt er een nieuwe instantie van /bin/csh + gedraaid. Het procsystime werd uitgevoerd en + bleef wachten terwijl er enkele commando's op de andere instantie + van csh werden getypt. Dit zijn de resultaten + van deze test: &prompt.root; ./procsystime -n csh Tracing... Hit Ctrl-C to end... @@ -370,20 +380,21 @@ sigsuspend 6985124 read 3988049784 - As shown, the read() system call seems to use the - most time in nanoseconds with the getpid() - system call used the least amount of time. + Zoals te zien is, lijkt de systeemaanroep + read() de meeste tijd in nanoseconden te + gebruiken en gebruikte de systeemaanroep + getpid() de minste hoeveelheid tijd. - The D Language + De taal D - The DTrace Toolkit includes many scripts in the special language of - DTrace. This language is called the D language by &sun; - documentation, and it is very similar to C++. An in depth - discussion of the language is beyond the scope of this document. It is - extensively discussed - at . + De DTrace-gereedschapskist bevat vele scripts in de speciale + taal van DTrace. Deze taal wordt de taal D genoemd + door de documentatie van &sun;, en lijkt sterk op C++. Een + diepgaande discussie over de taal valt buiten het bereik van dit + document. Het wordt uitgebreid behandeld op + . From owner-p4-projects@FreeBSD.ORG Sun Oct 19 17:03:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5986B106568C; Sun, 19 Oct 2008 17:03: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 1B166106568A for ; Sun, 19 Oct 2008 17:03:24 +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 09DCD8FC14 for ; Sun, 19 Oct 2008 17:03:24 +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 m9JH3NH8030035 for ; Sun, 19 Oct 2008 17:03:23 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JH3NLP030033 for perforce@freebsd.org; Sun, 19 Oct 2008 17:03:23 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Oct 2008 17:03:23 GMT Message-Id: <200810191703.m9JH3NLP030033@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 151563 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, 19 Oct 2008 17:03:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=151563 Change 151563 by rene@rene_self on 2008/10/19 17:03:01 Better translate 'stabs' literally. It seems to be a shorthand of 'symbol tabs' (or something similar). Obtained from: private mail from ed@ Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#4 (text+ko) ==== @@ -130,7 +130,7 @@ zelf. CTF is het Compact C Type Format van &solaris; welke een beperkte vorm van debuginformatie bevat die vergelijkbaar is met DWARF en de befaamde - steken. Deze CTF-gegevens worden door de + stabs. Deze CTF-gegevens worden door de bouwmiddelen ctfconvert en ctfmerge aan de binairen toegevoegd. Het hulpmiddel ctfconvert parst From owner-p4-projects@FreeBSD.ORG Sun Oct 19 17:16:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3ED81065670; Sun, 19 Oct 2008 17:16: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 B5DF2106566B for ; Sun, 19 Oct 2008 17:16:37 +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 A3BD68FC57 for ; Sun, 19 Oct 2008 17:16:37 +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 m9JHGb0V031078 for ; Sun, 19 Oct 2008 17:16:37 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JHGbV7031076 for perforce@freebsd.org; Sun, 19 Oct 2008 17:16:37 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Oct 2008 17:16:37 GMT Message-Id: <200810191716.m9JHGbV7031076@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 151565 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, 19 Oct 2008 17:16:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=151565 Change 151565 by rene@rene_self on 2008/10/19 17:16:07 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#8 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#3 (text+ko) ==== @@ -8,7 +8,7 @@ @@ -174,11 +174,17 @@ All sources must be rebuilt and installed with CTF options. To accomplish this task, rebuild the &os; sources using: + + &prompt.root; cd /usr/src -&prompt.root; make WITH_CTF=1 buildworld -&prompt.root; make WITH_CFT=1 kernel -&prompt.root; make WITH_CFT=1 installworld -&prompt.root; mergemaster -Ui + +&prompt.root; make WITH_CFT=1 kernel + The system will need to be restarted. ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#8 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2507,7 +2507,7 @@ wilko Asus AP1400R 1U server rink - Waiting for pickup + Received From owner-p4-projects@FreeBSD.ORG Sun Oct 19 17:22:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46B151065670; Sun, 19 Oct 2008 17:22: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 0AB53106566B for ; Sun, 19 Oct 2008 17:22:44 +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 ED5EF8FC08 for ; Sun, 19 Oct 2008 17:22:43 +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 m9JHMhd2031607 for ; Sun, 19 Oct 2008 17:22:43 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JHMhvr031605 for perforce@freebsd.org; Sun, 19 Oct 2008 17:22:43 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 19 Oct 2008 17:22:43 GMT Message-Id: <200810191722.m9JHMhvr031605@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 151566 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, 19 Oct 2008 17:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=151566 Change 151566 by rene@rene_self on 2008/10/19 17:21:55 MFen dtrace 1.3 -> 1.4 Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#5 (text+ko) ==== @@ -11,7 +11,7 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml,v 1.3 2008/10/10 15:37:53 pgj Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml - %SRCID% 1.3 + %SRCID% 1.4 --> @@ -193,11 +193,17 @@ CTF-opties. Om deze taak te volbrengen, wordt de &os;-broncode herbouwd met: + + &prompt.root; cd /usr/src -&prompt.root; make WITH_CTF=1 buildworld -&prompt.root; make WITH_CFT=1 kernel -&prompt.root; make WITH_CFT=1 installworld -&prompt.root; mergemaster -Ui + +&prompt.root; make WITH_CFT=1 kernel + Het systeem moet opnieuw gestart worden. From owner-p4-projects@FreeBSD.ORG Sun Oct 19 20:37:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84FB6106567D; Sun, 19 Oct 2008 20:37:01 +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 485B0106567B for ; Sun, 19 Oct 2008 20:37:01 +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 36EDB8FC21 for ; Sun, 19 Oct 2008 20:37:01 +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 m9JKb00c049517 for ; Sun, 19 Oct 2008 20:37:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JKb0p9049514 for perforce@freebsd.org; Sun, 19 Oct 2008 20:37:00 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 20:37:00 GMT Message-Id: <200810192037.m9JKb0p9049514@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 151569 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, 19 Oct 2008 20:37:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=151569 Change 151569 by sam@sam_ebb on 2008/10/19 20:36:42 Fix calculation of the table that maps ieee rates to indices into the hal phy/rate table: HT rate tables have overlapping ieee rates as there are entries for both legacy rates and MCS. Distinguish MCS using the IEEE80211_RATE_MCS bit. This fixes complaints in sample about bogus rate codes when associated to an 11n ap on an 11n channel. Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#109 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#109 (text+ko) ==== @@ -6171,8 +6171,13 @@ memset(sc->sc_rixmap, 0xff, sizeof(sc->sc_rixmap)); rt = sc->sc_rates[mode]; KASSERT(rt != NULL, ("no h/w rate set for phy mode %u", mode)); - for (i = 0; i < rt->rateCount; i++) - sc->sc_rixmap[rt->info[i].dot11Rate & IEEE80211_RATE_VAL] = i; + for (i = 0; i < rt->rateCount; i++) { + uint8_t ieeerate = rt->info[i].dot11Rate & IEEE80211_RATE_VAL; + if (rt->info[i].phy != IEEE80211_T_HT) + sc->sc_rixmap[ieeerate] = i; + else + sc->sc_rixmap[ieeerate | IEEE80211_RATE_MCS] = i; + } memset(sc->sc_hwmap, 0, sizeof(sc->sc_hwmap)); for (i = 0; i < N(sc->sc_hwmap); i++) { if (i >= rt->rateCount) { @@ -6183,7 +6188,7 @@ sc->sc_hwmap[i].ieeerate = rt->info[i].dot11Rate & IEEE80211_RATE_VAL; if (rt->info[i].phy == IEEE80211_T_HT) - sc->sc_hwmap[i].ieeerate |= 0x80; /* MCS */ + sc->sc_hwmap[i].ieeerate |= IEEE80211_RATE_MCS; sc->sc_hwmap[i].txflags = IEEE80211_RADIOTAP_F_DATAPAD; if (rt->info[i].shortPreamble || rt->info[i].phy == IEEE80211_T_OFDM) From owner-p4-projects@FreeBSD.ORG Sun Oct 19 20:44:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5C80106567B; Sun, 19 Oct 2008 20:44: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 60EC31065673 for ; Sun, 19 Oct 2008 20:44:08 +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 4F42B8FC0A for ; Sun, 19 Oct 2008 20:44:08 +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 m9JKi8iL051682 for ; Sun, 19 Oct 2008 20:44:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JKi81X051680 for perforce@freebsd.org; Sun, 19 Oct 2008 20:44:08 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 20:44:08 GMT Message-Id: <200810192044.m9JKi81X051680@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 151570 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, 19 Oct 2008 20:44:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=151570 Change 151570 by sam@sam_ebb on 2008/10/19 20:43:58 move complaints about bad rate codes up a level so we can print the h/w rate code and other useful info Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#15 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#15 (text+ko) ==== @@ -393,11 +393,8 @@ size_bin = size_to_bin(frame_size); size = bin_to_size(size_bin); - if (!(0 <= ndx0 && ndx0 < sn->num_rates)) { - printf("%s: bogus ndx0 %d, max %u, mode %u\n", - __func__, ndx0, sn->num_rates, sc->sc_curmode); + if (!(0 <= ndx0 && ndx0 < sn->num_rates)) return; - } rate = sn->rates[ndx0].rate; tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx0].rix, @@ -405,11 +402,8 @@ MIN(tries0, tries) - 1); tries_so_far += tries0; if (tries1 && tries0 < tries) { - if (!(0 <= ndx1 && ndx1 < sn->num_rates)) { - printf("%s: bogus ndx1 %d, max %u, mode %u\n", - __func__, ndx1, sn->num_rates, sc->sc_curmode); + if (!(0 <= ndx1 && ndx1 < sn->num_rates)) return; - } tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx1].rix, short_tries, MIN(tries1 + tries_so_far, tries) - tries_so_far - 1); @@ -417,11 +411,8 @@ tries_so_far += tries1; if (tries2 && tries0 + tries1 < tries) { - if (!(0 <= ndx2 && ndx2 < sn->num_rates)) { - printf("%s: bogus ndx2 %d, max %u, mode %u\n", - __func__, ndx2, sn->num_rates, sc->sc_curmode); + if (!(0 <= ndx2 && ndx2 < sn->num_rates)) return; - } tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx2].rix, short_tries, MIN(tries2 + tries_so_far, tries) - tries_so_far - 1); @@ -430,11 +421,8 @@ tries_so_far += tries2; if (tries3 && tries0 + tries1 + tries2 < tries) { - if (!(0 <= ndx3 && ndx3 < sn->num_rates)) { - printf("%s: bogus ndx3 %d, max %u, mode %u\n", - __func__, ndx3, sn->num_rates, sc->sc_curmode); + if (!(0 <= ndx3 && ndx3 < sn->num_rates)) return; - } tt += calc_usecs_unicast_packet(sc, size, sn->rates[ndx3].rix, short_tries, MIN(tries3 + tries_so_far, tries) - tries_so_far - 1); @@ -488,6 +476,13 @@ } } +static void +badrate(struct ifnet *ifp, int series, int hwrate, int tries, int status) +{ + if_printf(ifp, "bad series%d hwrate 0x%x, tries %u ts_status 0x%x\n", + series, hwrate, tries, status); +} + void ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an, const struct ath_buf *bf) @@ -523,6 +518,10 @@ if (!mrr || !(ts->ts_rate & HAL_TXSTAT_ALTRATE)) { int ndx = rate_to_ndx(sn, final_rate); + if (ndx < 0) { + badrate(ifp, 0, ts->ts_rate, long_tries, ts->ts_status); + return; + } /* * Only one rate was used; optimize work. */ @@ -576,6 +575,15 @@ tries3 = MS(ds0->ds_ctl2, AR_XmitDataTries3); ndx3 = rate_to_ndx(sn, rate3); + if (tries0 && ndx0 < 0) + badrate(ifp, 0, hwrate0, tries0, ts->ts_status); + if (tries1 && ndx1 < 0) + badrate(ifp, 1, hwrate1, tries1, ts->ts_status); + if (tries2 && ndx2 < 0) + badrate(ifp, 2, hwrate2, tries2, ts->ts_status); + if (tries3 && ndx3 < 0) + badrate(ifp, 3, hwrate3, tries3, ts->ts_status); + IEEE80211_NOTE(an->an_node.ni_vap, IEEE80211_MSG_RATECTL, &an->an_node, "%s: size %d finaltsidx %d tries %d %s rate/try [%d/%d %d/%d %d/%d %d/%d]", From owner-p4-projects@FreeBSD.ORG Sun Oct 19 21:21:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5640106567A; Sun, 19 Oct 2008 21:21: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 A26E81065670 for ; Sun, 19 Oct 2008 21:21:46 +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 77D7A8FC14 for ; Sun, 19 Oct 2008 21:21:46 +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 m9JLLkw9065147 for ; Sun, 19 Oct 2008 21:21:46 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JLLk20065145 for perforce@freebsd.org; Sun, 19 Oct 2008 21:21:46 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 21:21:46 GMT Message-Id: <200810192121.m9JLLk20065145@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 151571 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, 19 Oct 2008 21:21:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=151571 Change 151571 by sam@sam_ebb on 2008/10/19 21:21:19 add debug msg Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#21 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_crypto.c#21 (text+ko) ==== @@ -267,6 +267,10 @@ void *keyctx; int oflags; + IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, + "%s: cipher %u flags 0x%x keyix %u\n", + __func__, cipher, flags, key->wk_keyix); + /* * Validate cipher and set reference to cipher routines. */ From owner-p4-projects@FreeBSD.ORG Sun Oct 19 21:38:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A64E4106567A; Sun, 19 Oct 2008 21:38:03 +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 6A65A1065675 for ; Sun, 19 Oct 2008 21:38:03 +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 593538FC1C for ; Sun, 19 Oct 2008 21:38:03 +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 m9JLc3Lw066391 for ; Sun, 19 Oct 2008 21:38:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9JLc3Hk066389 for perforce@freebsd.org; Sun, 19 Oct 2008 21:38:03 GMT (envelope-from sam@freebsd.org) Date: Sun, 19 Oct 2008 21:38:03 GMT Message-Id: <200810192138.m9JLc3Hk066389@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 151573 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, 19 Oct 2008 21:38:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=151573 Change 151573 by sam@sam_ebb on 2008/10/19 21:37:47 change driver key alloc routines to honor a requested key index so static key wep works Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#110 edit .. //depot/projects/vap/sys/dev/mwl/if_mwl.c#19 edit .. //depot/projects/vap/sys/dev/ral/rt2661.c#41 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#110 (text+ko) ==== @@ -2439,7 +2439,8 @@ * it permits us to support multiple users for adhoc and/or * multi-station operation. */ - if ((k->wk_flags & IEEE80211_KEY_GROUP) && !sc->sc_mcastkey) { + if (k->wk_keyix != IEEE80211_KEYIX_NONE || /* global key */ + ((k->wk_flags & IEEE80211_KEY_GROUP) && !sc->sc_mcastkey)) { if (!(&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) { /* should not happen */ ==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#19 (text+ko) ==== @@ -1883,7 +1883,8 @@ { struct mwl_softc *sc = vap->iv_ic->ic_ifp->if_softc; - if (k->wk_flags & IEEE80211_KEY_GROUP) { + if (k->wk_keyix != IEEE80211_KEYIX_NONE || + (k->wk_flags & IEEE80211_KEY_GROUP)) { if (!(&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) { /* should not happen */ ==== //depot/projects/vap/sys/dev/ral/rt2661.c#41 (text) ==== @@ -935,7 +935,8 @@ struct rt2661_softc *sc = vap->iv_ic->ic_ifp->if_softc; u_int i, keyix; - if (k->wk_flags & IEEE80211_KEY_GROUP) { + if (k->wk_keyix != IEEE80211_KEYIX_NONE || + (k->wk_flags & IEEE80211_KEY_GROUP)) { if (!(&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) { /* should not happen */ From owner-p4-projects@FreeBSD.ORG Mon Oct 20 06:10:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A49B1065683; Mon, 20 Oct 2008 06:10: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 43FA3106567B for ; Mon, 20 Oct 2008 06:10:44 +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 324C08FC16 for ; Mon, 20 Oct 2008 06:10:44 +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 m9K6Ah89036071 for ; Mon, 20 Oct 2008 06:10:43 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9K6AhxE036069 for perforce@freebsd.org; Mon, 20 Oct 2008 06:10:43 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 20 Oct 2008 06:10:43 GMT Message-Id: <200810200610.m9K6AhxE036069@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 151586 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, 20 Oct 2008 06:10:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=151586 Change 151586 by pgj@kolbasz on 2008/10/20 06:09:50 MFen (doc): 1.193 -> 1.194 hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml 1.3 -> 1.4 hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml 1.1100 -> 1.1102 hu_HU.ISO8859-2/books/faq/book.sgml 1.64 -> 1.65 hu_HU.ISO8859-2/share/sgml/mailing-lists.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#26 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#7 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#17 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#18 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#26 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -8563,6 +8563,15 @@ &prompt.root; sysctl hw.syscons.kbd_reboot=0 + + Az elõbb említett két + módszer kizárja egymást. A + &man.sysctl.8; változó nem létezik, + ha a rendszermagot a SC_DISABLE_REBOOT + beállítással fordítjuk + újra. + + Ha viszont a &man.pcvt.4; konzolt használjuk, akkor a következõ konfigurációs beállítást kell megadnunk a rendszermag ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#7 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -241,10 +241,7 @@ parancsokat kell kiadnunk: &prompt.root; cd /usr/src -&prompt.root; make WITH_CTF=1 buildworld -&prompt.root; make WITH_CFT=1 kernel -&prompt.root; make WITH_CFT=1 installworld -&prompt.root; mergemaster -Ui +&prompt.root; make WITH_CFT=1 kernel A fordítás befejezõdése után indítsuk újra a rendszerünket. ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#17 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -664,6 +664,13 @@ Az X11 karbantartása és támogata &os; alatt + + + &a.xen.name; + A &xen; &os; portjának + (implementációk, használat) + tárgyalása + @@ -2160,6 +2167,26 @@ + + &a.xen.name; + + + A &xen; &os; portjának + (implementáció és használat) + megvitatása + + A lista elsõsorban a &xen; &os;-re + készült változatával foglalkozik. + Elõreláthatólag elég kevesen + fognak írni erre a listára ahhoz, hogy + helyet kapjanak rajta az implementációt + és a kialakítást érintõ + szakmai jellegû megbeszélések és + a telepítéssel kapcsolatos + kérdések egyaránt. + + + ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#18 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -497,6 +497,10 @@ FreeBSD X11 levelezési lista"> freebsd-x11"> + +A &xen; &os; portjának tárgyalása — implementáció és használat"> +freebsd-xen"> + bug-followup@FreeBSD.org"> From owner-p4-projects@FreeBSD.ORG Mon Oct 20 06:11:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87E3A1065671; Mon, 20 Oct 2008 06:11:45 +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 4C36E106566C for ; Mon, 20 Oct 2008 06:11:45 +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 3ADA18FC1C for ; Mon, 20 Oct 2008 06:11:45 +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 m9K6BjGt036145 for ; Mon, 20 Oct 2008 06:11:45 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9K6BjJ7036143 for perforce@freebsd.org; Mon, 20 Oct 2008 06:11:45 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 20 Oct 2008 06:11:45 GMT Message-Id: <200810200611.m9K6BjJ7036143@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 151587 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, 20 Oct 2008 06:11:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=151587 Change 151587 by pgj@kolbasz on 2008/10/20 06:10:45 MFen (www): 1.21 -> 1.23 hu/administration.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#14 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#14 (text+ko) ==== @@ -9,13 +9,13 @@ &header; -

Bevezetés

+

Bevezetés

Ez az oldal tartalmazza a &os; Projektben kiemelt szereppel és felelõsséggel bíró csoportokat @@ -355,7 +355,6 @@

  • &a.tabthorpe; <tabthorpe@FreeBSD.org>
  • &a.wilko; <wilko@FreeBSD.org>
    • -
  • &a.brueffer; <brueffer@FreeBSD.org>
  • &a.gahr; <gahr@FreeBSD.org>
  • &a.obrien; <obrien@FreeBSD.org>
  • &a.trhodes; <trhodes@FreeBSD.org>
    • @@ -441,8 +440,12 @@ Officer feladatait és kötelezettségeit.

      -
    • &a.mnag; <mnag@FreeBSD.org> +
    • &a.qingli; <qingli@FreeBSD.org> +
      • + +
    • &a.delphij; <delphij@FreeBSD.org>
    • &a.remko; <csjp@FreeBSD.org>
      • -
    • &a.des; <des@FreeBSD.org> +
    • &a.stas; <stas@FreeBSD.org>
    • &a.rwatson; <rwatson@FreeBSD.org> (Core Team kapcsolattartó)
      • +
    • &a.miwi; <miwi@FreeBSD.org> +
      • +
    • &a.bz; <bz@FreeBSD.org>
      • From owner-p4-projects@FreeBSD.ORG Mon Oct 20 06:31:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 333CD106569D; Mon, 20 Oct 2008 06:31: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 EAA98106567C for ; Mon, 20 Oct 2008 06:31:04 +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 D95468FC21 for ; Mon, 20 Oct 2008 06:31:04 +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 m9K6V4OX037719 for ; Mon, 20 Oct 2008 06:31:04 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9K6V4gw037717 for perforce@freebsd.org; Mon, 20 Oct 2008 06:31:04 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 20 Oct 2008 06:31:04 GMT Message-Id: <200810200631.m9K6V4gw037717@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 151588 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, 20 Oct 2008 06:31:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=151588 Change 151588 by pgj@kolbasz on 2008/10/20 06:30:22 MFen (doc): 1.194 -> 1.195 hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml 1.65 -> 1.66 hu_HU.ISO8859-2/share/sgml/mailing-lists.ent Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#18 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#19 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#18 (text+ko) ==== @@ -7,7 +7,7 @@ ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#19 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -498,7 +498,7 @@ freebsd-x11"> -A &xen; &os; portjának tárgyalása — implementáció és használat"> +FreeBSD Xen port levelezési lista"> freebsd-xen"> From owner-p4-projects@FreeBSD.ORG Mon Oct 20 10:39:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CE7110656AE; Mon, 20 Oct 2008 10:39:26 +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 0EF5610656A8 for ; Mon, 20 Oct 2008 10:39:26 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D32D98FC1F for ; Mon, 20 Oct 2008 10:39:25 +0000 (UTC) (envelope-from andrew@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 m9KAdPD1070495 for ; Mon, 20 Oct 2008 10:39:25 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KAdP9X070493 for perforce@freebsd.org; Mon, 20 Oct 2008 10:39:25 GMT (envelope-from andrew@freebsd.org) Date: Mon, 20 Oct 2008 10:39:25 GMT Message-Id: <200810201039.m9KAdP9X070493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 151595 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, 20 Oct 2008 10:39:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=151595 Change 151595 by andrew@andrew_bender on 2008/10/20 10:39:25 Add a teardown_intr function and store the start, end and count of an allocation in it's resource list Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#16 (text+ko) ==== @@ -62,6 +62,8 @@ static void s3c2410_identify(driver_t *, device_t); static int s3c2410_setup_intr(device_t, device_t, struct resource *, int, driver_filter_t *, driver_intr_t *, void *, void **); +static int s3c2410_teardown_intr(device_t, device_t, struct resource *, + void *); static struct resource *s3c2410_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); static int s3c2410_activate_resource(device_t, device_t, int, int, @@ -75,6 +77,7 @@ DEVMETHOD(device_attach, s3c2410_attach), DEVMETHOD(device_identify, s3c2410_identify), DEVMETHOD(bus_setup_intr, s3c2410_setup_intr), + DEVMETHOD(bus_teardown_intr, s3c2410_teardown_intr), DEVMETHOD(bus_alloc_resource, s3c2410_alloc_resource), DEVMETHOD(bus_activate_resource, s3c2410_activate_resource), DEVMETHOD(bus_release_resource, s3c2410_release_resource), @@ -135,6 +138,13 @@ return (0); } +static int +s3c2410_teardown_intr(device_t dev, device_t child, struct resource *res, + void *cookie) +{ + return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); +} + static struct resource * s3c2410_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -209,8 +219,12 @@ if (res != NULL) { rman_set_rid(res, *rid); - if (rle != NULL) + if (rle != NULL) { rle->res = res; + rle->start = rman_get_start(res); + rle->end = rman_get_end(res); + rle->count = count; + } } return (res); From owner-p4-projects@FreeBSD.ORG Mon Oct 20 13:45:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFC5E1065681; Mon, 20 Oct 2008 13:45: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 A1C3B106567F for ; Mon, 20 Oct 2008 13:45: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 8EA4C8FC1E for ; Mon, 20 Oct 2008 13:45: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 m9KDjZwt097942 for ; Mon, 20 Oct 2008 13:45:35 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KDjZxl097940 for perforce@freebsd.org; Mon, 20 Oct 2008 13:45:35 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 20 Oct 2008 13:45:35 GMT Message-Id: <200810201345.m9KDjZxl097940@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 151604 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, 20 Oct 2008 13:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=151604 Change 151604 by nwhitehorn@nwhitehorn_trantor on 2008/10/20 13:44:36 Mega-commit for beginnings of real Mambo support. This includes the following: 1. Finish transformation of PPC PCI code to use sparc64's OFW PCI stuff. 2. Merge some of sparc64's OFW code to sys/dev/ofw. The sparc64 side of this still needs cleaning. 3. Add ISA support on PowerPC. 4. Add support for real device drivers hanging off nexus by implementing bus_alloc_resource() to do something intelligent. This is necessary for ISA and OpenPIC support on Mambo, and for SMU support and u3 PIC support on real hardware. 4. Add a driver for Mambo's OpenPIC. This apparently tries to access registers it shouldn't, causing Mambo to die with FATAL ERROR: accessing area for non existent proc after probing the PIC. Affected files ... .. //depot/projects/ppc-g5/sys/conf/files.powerpc#6 edit .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_imap.c#1 add .. //depot/projects/ppc-g5/sys/dev/ofw/ofw_imap.h#1 add .. //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/mambo/openpic_mambo.c#1 add .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_isa.c#1 add .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_isa.h#1 add .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#4 edit .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#5 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#4 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#5 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#5 edit .. //depot/projects/ppc-g5/sys/powerpc/powerpc/autoconf.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/conf/files.powerpc#6 (text+ko) ==== @@ -37,6 +37,7 @@ dev/ofw/ofw_bus_subr.c optional aim dev/ofw/ofw_console.c optional aim dev/ofw/ofw_disk.c optional ofwd aim +dev/ofw/ofw_imap.c optional aim dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx dev/scc/scc_bfe_macio.c optional scc powermac @@ -105,6 +106,7 @@ powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/opic.c optional mpc85xx powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx +powerpc/ofw/ofw_isa.c optional isa aim powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim powerpc/ofw/ofw_syscons.c optional sc aim @@ -149,6 +151,7 @@ powerpc/powerpc/suswintr.c standard powerpc/powerpc/syncicache.c standard powerpc/powerpc/sys_machdep.c standard +powerpc/mambo/openpic_mambo.c optional mambo powerpc/psim/iobus.c optional psim powerpc/psim/ata_iobus.c optional ata psim powerpc/psim/openpic_iobus.c optional psim ==== //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#3 (text+ko) ==== @@ -64,6 +64,8 @@ #include #include #include +#include +#include #include @@ -105,7 +107,8 @@ }; struct nexus_softc { - struct rman sc_rman; + struct rman sc_intr_rman; + struct rman sc_mem_rman; }; /* @@ -212,23 +215,24 @@ phandle_t root; phandle_t child; struct nexus_softc *sc; - u_long start, end; if ((root = OF_peer(0)) == -1) panic("nexus_probe: OF_peer failed."); sc = device_get_softc(dev); - start = 0; - end = INTR_VECTORS - 1; + sc->sc_intr_rman.rm_type = RMAN_ARRAY; + sc->sc_intr_rman.rm_descr = "Interrupt request lines"; + if (rman_init(&sc->sc_intr_rman) || + rman_manage_region(&sc->sc_intr_rman, 0, INTR_VECTORS - 1)) + panic("nexus_probe IRQ rman"); + + sc->sc_mem_rman.rm_type = RMAN_ARRAY; + sc->sc_mem_rman.rm_descr = "Device Memory"; + if (rman_init(&sc->sc_mem_rman) || + rman_manage_region(&sc->sc_mem_rman, 0, ~0UL)) + panic("nexus_probe mem rman"); - sc->sc_rman.rm_start = start; - sc->sc_rman.rm_end = end; - sc->sc_rman.rm_type = RMAN_ARRAY; - sc->sc_rman.rm_descr = "Interrupt request lines"; - if (rman_init(&sc->sc_rman) || - rman_manage_region(&sc->sc_rman, start, end)) - panic("nexus_probe IRQ rman"); /* * Now walk the OFW tree to locate top-level devices @@ -386,84 +390,116 @@ { struct nexus_softc *sc; struct resource *rv; + struct rman *rman; + int needactivate; + + needactivate = flags & RF_ACTIVE; + flags &= ~RF_ACTIVE; + + sc = device_get_softc(bus); + + if (type == SYS_RES_IRQ) { + rman = &sc->sc_intr_rman; - if (type != SYS_RES_IRQ) { + if (count == 0 || start + count - 1 != end) { + device_printf(bus, "invalid IRQ allocation from %s\n", + device_get_nameunit(child)); + return (NULL); + } + } else if (type == SYS_RES_IOPORT || type == SYS_RES_MEMORY) { + rman = &sc->sc_mem_rman; + } else { device_printf(bus, "unknown resource request from %s\n", device_get_nameunit(child)); return (NULL); } - if (count == 0 || start + count - 1 != end) { - device_printf(bus, "invalid IRQ allocation from %s\n", + rv = rman_reserve_resource(rman, start, end, count, flags, child); + if (rv == NULL) { + device_printf(bus, "Resource allocation failed for %s\n", device_get_nameunit(child)); return (NULL); } - sc = device_get_softc(bus); + rman_set_rid(rv, *rid); - rv = rman_reserve_resource(&sc->sc_rman, start, end, count, - flags, child); - if (rv == NULL) { - device_printf(bus, "IRQ allocation failed for %s\n", - device_get_nameunit(child)); - } else - rman_set_rid(rv, *rid); + if (needactivate) { + if (nexus_activate_resource(bus, child, type, *rid, rv) != 0) { + device_printf(bus, + "Resource activation failed for %s\n", + device_get_nameunit(child)); + rman_release_resource(rv); + return (NULL); + } + } return (rv); } static int nexus_activate_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) +struct resource *res) { + if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { + vm_offset_t start; + void *p; + + start = (vm_offset_t)rman_get_start(res); - /* Not much to be done yet... */ + p = pmap_mapdev(start, (vm_size_t)rman_get_size(res)); + if (p == NULL) + return (ENOMEM); + rman_set_virtual(res, p); + rman_set_bustag(res, &bs_be_tag); + rman_set_bushandle(res, (u_long)p); + } + return (rman_activate_resource(res)); } static int nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) +struct resource *res) { - /* Not much to be done yet... */ - return (rman_deactivate_resource(res)); +/* Not much to be done yet... */ +return (rman_deactivate_resource(res)); } static int nexus_release_resource(device_t bus, device_t child, int type, int rid, - struct resource *res) +struct resource *res) { - if (type != SYS_RES_IRQ) { - device_printf(bus, "unknown resource request from %s\n", - device_get_nameunit(child)); - return (EINVAL); - } +if (type != SYS_RES_IRQ) { + device_printf(bus, "unknown resource request from %s\n", + device_get_nameunit(child)); + return (EINVAL); +} - return (rman_release_resource(res)); +return (rman_release_resource(res)); } static device_t nexus_device_from_node(device_t parent, phandle_t node) { - device_t cdev; - struct nexus_devinfo *dinfo; - char *name, *type, *compatible; +device_t cdev; +struct nexus_devinfo *dinfo; +char *name, *type, *compatible; - OF_getprop_alloc(node, "name", 1, (void **)&name); - OF_getprop_alloc(node, "device_type", 1, (void **)&type); - OF_getprop_alloc(node, "compatible", 1, (void **)&compatible); - cdev = device_add_child(parent, NULL, -1); - if (cdev != NULL) { - dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK); - dinfo->ndi_node = node; - dinfo->ndi_name = name; - dinfo->ndi_device_type = type; - dinfo->ndi_compatible = compatible; - device_set_ivars(cdev, dinfo); - } else - free(name, M_OFWPROP); +OF_getprop_alloc(node, "name", 1, (void **)&name); +OF_getprop_alloc(node, "device_type", 1, (void **)&type); +OF_getprop_alloc(node, "compatible", 1, (void **)&compatible); +cdev = device_add_child(parent, NULL, -1); +if (cdev != NULL) { + dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK); + dinfo->ndi_node = node; + dinfo->ndi_name = name; + dinfo->ndi_device_type = type; + dinfo->ndi_compatible = compatible; + device_set_ivars(cdev, dinfo); +} else + free(name, M_OFWPROP); return (cdev); } ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#4 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -46,6 +47,8 @@ static int ofw_pcib_pci_probe(device_t bus); static int ofw_pcib_pci_attach(device_t bus); static phandle_t ofw_pcib_pci_get_node(device_t bus, device_t dev); +static int ofw_pcib_pci_route_interrupt(device_t bridge, device_t dev, + int intpin); static device_method_t ofw_pcib_pci_methods[] = { /* Device interface */ @@ -70,7 +73,7 @@ DEVMETHOD(pcib_maxslots, pcib_maxslots), DEVMETHOD(pcib_read_config, pcib_read_config), DEVMETHOD(pcib_write_config, pcib_write_config), - DEVMETHOD(pcib_route_interrupt, pcib_route_interrupt), + DEVMETHOD(pcib_route_interrupt, ofw_pcib_pci_route_interrupt), /* ofw_bus interface */ DEVMETHOD(ofw_bus_get_node, ofw_pcib_pci_get_node), @@ -80,8 +83,20 @@ static devclass_t pcib_devclass; +struct ofw_pcib_softc { + /* + * This is here so that we can use pci bridge methods, too - the + * generic routines only need the dev, secbus and subbus members + * filled. + */ + struct pcib_softc ops_pcib_sc; + phandle_t ops_node; + struct ofw_bus_iinfo ops_iinfo; +}; + + DEFINE_CLASS_0(pcib, ofw_pcib_pci_driver, ofw_pcib_pci_methods, - sizeof(struct pcib_softc)); + sizeof(struct ofw_pcib_softc)); DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_pci_driver, pcib_devclass, 0, 0); static int @@ -103,6 +118,15 @@ static int ofw_pcib_pci_attach(device_t dev) { + struct ofw_pcib_softc *sc; + + sc = device_get_softc(dev); + sc->ops_pcib_sc.dev = dev; + sc->ops_node = ofw_bus_get_node(dev); + + ofw_bus_setup_iinfo(sc->ops_node, &sc->ops_iinfo, + sizeof(cell_t)); + pcib_attach_common(dev); device_add_child(dev, "pci", -1); @@ -110,7 +134,7 @@ return (bus_generic_attach(dev)); } -phandle_t +static phandle_t ofw_pcib_pci_get_node(device_t bridge, device_t dev) { /* We have only one child, the PCI bus, so pass it our node */ @@ -118,3 +142,37 @@ return (ofw_bus_get_node(bridge)); } +static int +ofw_pcib_pci_route_interrupt(device_t bridge, device_t dev, int intpin) +{ + struct ofw_pcib_softc *sc; + struct ofw_bus_iinfo *ii; + struct ofw_pci_register reg; + cell_t pintr, mintr; + uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; + + sc = device_get_softc(bridge); + ii = &sc->ops_iinfo; + if (ii->opi_imapsz > 0) { + pintr = intpin; + if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), ii, ®, + sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), + maskbuf)) { + /* + * If we've found a mapping, return it and don't map + * it again on higher levels - that causes problems + * in some cases, and never seems to be required. + */ + return (mintr); + } + } else if (intpin >= 1 && intpin <= 4) { + /* + * When an interrupt map is missing, we need to do the + * standard PCI swizzle and continue mapping at the parent. + */ + return (pcib_route_interrupt(bridge, dev, intpin)); + } + return (PCIB_ROUTE_INTERRUPT(device_get_parent(device_get_parent( + bridge)), bridge, intpin)); +} + ==== //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcibus.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ /*- - * Copyright (c) 1994 Charles M. Hannum. All rights reserved. - * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1997, Stefan Esser * Copyright (c) 2000, Michael Smith * Copyright (c) 2000, BSDi @@ -30,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/powerpc/pci/ofw_pcibus.c 182108 2008-08-24 15:05:46Z marius $"); +__FBSDID("$FreeBSD: src/sys/sparc64/pci/ofw_pcibus.c,v 1.21 2008/08/24 15:05:46 marius Exp $"); #include #include @@ -42,6 +40,7 @@ #include #include #include +#include #include #include @@ -54,10 +53,11 @@ #include "pcib_if.h" #include "pci_if.h" +typedef uint32_t ofw_pci_intr_t; + /* Helper functions */ -static int find_node_intr(phandle_t, u_int32_t *, u_int32_t *); -static int ofw_pci_find_intline(phandle_t node, uint32_t *irqs); -static void ofw_pci_fixup_node(device_t dev, phandle_t node); +static void ofw_pcibus_setup_device(device_t bridge, uint32_t clock, + u_int busno, u_int slot, u_int func); /* Methods */ static device_probe_t ofw_pcibus_probe; @@ -70,6 +70,8 @@ DEVMETHOD(device_probe, ofw_pcibus_probe), DEVMETHOD(device_attach, ofw_pcibus_attach), + /* Bus interface */ + /* PCI interface */ DEVMETHOD(pci_assign_interrupt, ofw_pcibus_assign_interrupt), @@ -100,6 +102,7 @@ static int ofw_pcibus_probe(device_t dev) { + if (ofw_bus_get_node(dev) == 0) return (ENXIO); device_set_desc(dev, "OFW PCI bus"); @@ -107,6 +110,22 @@ return (0); } +/* + * Perform miscellaneous setups the firmware usually does not do for us. + */ +static void +ofw_pcibus_setup_device(device_t bridge, uint32_t clock, u_int busno, + u_int slot, u_int func) +{ + /* + * The preset in the intline register is usually wrong. Reset + * it to 255, so that the PCI code will reroute the interrupt if + * needed. + */ + PCIB_WRITE_CONFIG(bridge, busno, slot, func, PCIR_INTLINE, + PCI_INVALID_IRQ, 1); +} + static int ofw_pcibus_attach(device_t dev) { @@ -114,6 +133,7 @@ struct ofw_pci_register pcir; struct ofw_pcibus_devinfo *dinfo; phandle_t node, child; + uint32_t clock; u_int busno, domain, func, slot; pcib = device_get_parent(dev); @@ -124,44 +144,44 @@ domain, busno); node = ofw_bus_get_node(dev); + if (OF_getprop(ofw_bus_get_node(pcib), "clock-frequency", &clock, + sizeof(clock)) == -1) + clock = 33000000; for (child = OF_child(node); child != 0; child = OF_peer(child)) { if (OF_getprop(child, "reg", &pcir, sizeof(pcir)) == -1) continue; slot = OFW_PCI_PHYS_HI_DEVICE(pcir.phys_hi); func = OFW_PCI_PHYS_HI_FUNCTION(pcir.phys_hi); - /* Some OFW device trees contain dupes. */ if (pci_find_dbsf(domain, busno, slot, func) != NULL) continue; - - ofw_pci_fixup_node(pcib, child); - + ofw_pcibus_setup_device(pcib, clock, busno, slot, func); dinfo = (struct ofw_pcibus_devinfo *)pci_read_device(pcib, domain, busno, slot, func, sizeof(*dinfo)); - if (dinfo == NULL) continue; - - /* Set up OFW devinfo */ if (ofw_bus_gen_setup_devinfo(&dinfo->opd_obdinfo, child) != 0) { pci_freecfg((struct pci_devinfo *)dinfo); continue; } - pci_add_child(dev, (struct pci_devinfo *)dinfo); /* - * Some devices don't have an intpin set, but do have - * interrupts. Add them to the appropriate resource list. - */ - if (dinfo->opd_dinfo.cfg.intpin == 0) { - uint32_t irqs[4]; + * Some devices don't have an intpin set, but do have + * interrupts. These are fully specified, and set in the + * interrupts property, so add that value to the device's + * resource list. + */ + if (dinfo->opd_dinfo.cfg.intpin == 0) { + ofw_pci_intr_t intr; - if (ofw_pci_find_intline(child, irqs) > 0) - resource_list_add(&dinfo->opd_dinfo.resources, - SYS_RES_IRQ, 0, irqs[0], irqs[0], 1); - } + if (OF_getprop(child, "interrupts", &intr, + sizeof(intr)) > 0) { + resource_list_add(&dinfo->opd_dinfo.resources, + SYS_RES_IRQ, 0, intr, intr, 1); + } + } } return (bus_generic_attach(dev)); @@ -170,18 +190,34 @@ static int ofw_pcibus_assign_interrupt(device_t dev, device_t child) { - uint32_t irqs[4]; + ofw_pci_intr_t intr; + int isz; - device_printf(child,"Assigning interrupt\n"); + /* Any AAPL,interrupts property gets priority and is fully spec'ed */ - if (ofw_pci_find_intline(ofw_bus_get_node(child), irqs) < 0) - return PCI_INVALID_IRQ; + isz = OF_getprop(ofw_bus_get_node(child), "AAPL,interrupts", &intr, + sizeof(intr)); + if (isz == sizeof(intr)) { + return (intr); + } - device_printf(child,"IRQ %d\n",irqs[0]); - - return irqs[0]; - -// return (PCIB_ROUTE_INTERRUPT(device_get_parent(dev), child, intr)); + isz = OF_getprop(ofw_bus_get_node(child), "interrupts", &intr, + sizeof(intr)); + if (isz != sizeof(intr)) { + /* No property; our best guess is the intpin. */ + intr = pci_get_intpin(child); + } + /* + * If we got intr from a property, it may or may not be an intpin. + * For on-board devices, it frequently is not, and is completely out + * of the valid intpin range. For PCI slots, it hopefully is, + * otherwise we will have trouble interfacing with non-OFW buses + * such as cardbus. + * Since we cannot tell which it is without violating layering, we + * will always use the route_interrupt method, and treat exceptions + * on the level they become apparent. + */ + return (PCIB_ROUTE_INTERRUPT(device_get_parent(dev), child, intr)); } static const struct ofw_bus_devinfo * @@ -193,167 +229,3 @@ return (&dinfo->opd_obdinfo); } -static void -ofw_pci_fixup_node(device_t dev, phandle_t node) -{ - uint32_t csr, intr, irqs[4]; - struct ofw_pci_register addr[8]; - int len, i; - - len = OF_getprop(node, "assigned-addresses", addr, sizeof(addr)); - if (len < (int)sizeof(struct ofw_pci_register)) { - return; - } - - csr = PCIB_READ_CONFIG(dev, OFW_PCI_PHYS_HI_BUS(addr[0].phys_hi), - OFW_PCI_PHYS_HI_DEVICE(addr[0].phys_hi), - OFW_PCI_PHYS_HI_FUNCTION(addr[0].phys_hi), PCIR_COMMAND, 4); - csr &= ~(PCIM_CMD_PORTEN | PCIM_CMD_MEMEN); - - for (i = 0; i < len / sizeof(struct ofw_pci_register); i++) { - switch (addr[i].phys_hi & OFW_PCI_PHYS_HI_SPACEMASK) { - case OFW_PCI_PHYS_HI_SPACE_IO: - csr |= PCIM_CMD_PORTEN; - break; - case OFW_PCI_PHYS_HI_SPACE_MEM32: - csr |= PCIM_CMD_MEMEN; - break; - } - } - - PCIB_WRITE_CONFIG(dev, OFW_PCI_PHYS_HI_BUS(addr[0].phys_hi), - OFW_PCI_PHYS_HI_DEVICE(addr[0].phys_hi), - OFW_PCI_PHYS_HI_FUNCTION(addr[0].phys_hi), PCIR_COMMAND, csr, 4); - - if (ofw_pci_find_intline(node, irqs) != -1) { - intr = PCIB_READ_CONFIG(dev, - OFW_PCI_PHYS_HI_BUS(addr[0].phys_hi), - OFW_PCI_PHYS_HI_DEVICE(addr[0].phys_hi), - OFW_PCI_PHYS_HI_FUNCTION(addr[0].phys_hi), PCIR_INTLINE, 2); - intr &= ~(0xff); - intr |= irqs[0] & 0xff; - PCIB_WRITE_CONFIG(dev, - OFW_PCI_PHYS_HI_BUS(addr[0].phys_hi), - OFW_PCI_PHYS_HI_DEVICE(addr[0].phys_hi), - OFW_PCI_PHYS_HI_FUNCTION(addr[0].phys_hi), PCIR_INTLINE, - intr, 2); - } -} - -static int -ofw_pci_find_intline(phandle_t node, uint32_t *irqs) -{ - uint32_t npintr, paddr[4]; - struct ofw_pci_register addr[8]; - int len; - - len = OF_getprop(node, "assigned-addresses", addr, sizeof(addr)); - if (len < (int)sizeof(struct ofw_pci_register)) - return -1; - /* - * Create PCI interrupt-map array element. pci-mid/pci-lo - * aren't required, but the 'interrupts' property needs - * to be appended - */ - npintr = 0; - OF_getprop(node, "interrupts", &npintr, 4); - paddr[0] = addr[0].phys_hi; - paddr[1] = 0; - paddr[2] = 0; - paddr[3] = npintr; - - return find_node_intr(node, paddr, irqs); -} - -static int -find_node_intr(phandle_t node, u_int32_t *addr, u_int32_t *intr) -{ - phandle_t parent, iparent; - int len, mlen, match, i; - u_int32_t map[160], *mp, imask[8], maskedaddr[8], icells; - char name[32]; - - len = OF_getprop(node, "AAPL,interrupts", intr, 4); - if (len == 4) { - return (len); - } - - parent = OF_parent(node); - len = OF_getprop(parent, "interrupt-map", map, sizeof(map)); - mlen = OF_getprop(parent, "interrupt-map-mask", imask, sizeof(imask)); - - if (len == -1 || mlen == -1) - goto nomap; - - memcpy(maskedaddr, addr, mlen); - for (i = 0; i < mlen/4; i++) - maskedaddr[i] &= imask[i]; - - mp = map; - while (len > mlen) { - match = bcmp(maskedaddr, mp, mlen); - mp += mlen / 4; - len -= mlen; - - /* - * We must read "#interrupt-cells" for each time because - * interrupt-parent may be different. - */ - iparent = *mp++; - len -= 4; - if (OF_getprop(iparent, "#interrupt-cells", &icells, 4) != 4) - goto nomap; - - /* Found. */ - if (match == 0) { - bcopy(mp, intr, icells * 4); - return (icells * 4); - } - - mp += icells; - len -= icells * 4; - } - -nomap: - /* - * Check for local properties indicating interrupts - */ - - len = OF_getprop(node, "interrupts", intr, 16); - if (OF_getprop(node, "interrupt-parent", &iparent, sizeof(iparent)) == - sizeof(iparent)) { - OF_getprop(iparent, "#interrupt-cells", &icells, sizeof(icells)); - for (i = 0; i < len/icells/4; i++) - intr[i] = intr[i*icells]; - - return (len); - } - - - /* - * If the node has no interrupt property and the parent is a PCI - * bridge, use the parent's interrupt. This occurs on a PCI slot. - */ - bzero(name, sizeof(name)); - OF_getprop(parent, "name", name, sizeof(name)); - if (strcmp(name, "pci-bridge") == 0) { - len = OF_getprop(parent, "AAPL,interrupts", intr, 4); - if (len == 4) { - return (len); - } - - /* - * XXX I don't know what is the correct local address. - * XXX Use the first entry for now. - */ - len = OF_getprop(parent, "interrupt-map", map, sizeof(map)); - if (len >= 36) { - addr = &map[5]; - /* XXX Use 0 for 'interrupts' for compat */ - return (find_node_intr(parent, addr, intr)); - } - } - - return (-1); -} - ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#5 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#include #include #include @@ -46,6 +47,7 @@ #include #include +#include #include #include @@ -133,14 +135,13 @@ root = ofw_bus_get_node(dev); - if (OF_getprop(root, "reg", reg, sizeof(reg)) < 24) + if (OF_getprop(root, "reg", reg, sizeof(reg)) < 8) return (ENXIO); for (child = OF_child(root); child != 0; child = OF_peer(child)) { dinfo = malloc(sizeof(*dinfo), M_CPCHT, M_WAITOK | M_ZERO); - if (ofw_bus_gen_setup_devinfo(dinfo, child) - != 0) { + if (ofw_bus_gen_setup_devinfo(dinfo, child) != 0) { free(dinfo, M_CPCHT); continue; } @@ -165,6 +166,56 @@ } /* + * CPC ISA Device interface. + */ +static int cpcisa_probe(device_t); + +/* + * Driver methods. + */ +static device_method_t cpcisa_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, cpcisa_probe), + DEVMETHOD(device_attach, isab_attach), + + /* Bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + DEVMETHOD(bus_read_ivar, bus_generic_read_ivar), + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_activate_resource,bus_generic_activate_resource), + + {0,0} +}; + +static driver_t cpcisa_driver = { + "isab", + cpcisa_methods, + 0 +}; + +DRIVER_MODULE(cpcisa, cpcht, cpcisa_driver, isab_devclass, 0, 0); + +static int +cpcisa_probe(device_t dev) +{ + const char *type; + + type = ofw_bus_get_type(dev); + + if (type == NULL) + return (ENXIO); + + if (strcmp(type, "isa") != 0) + return (ENXIO); + + device_set_desc(dev, "HyperTransport-ISA bridge"); + + return (0); +} + +/* * CPC PCI Device interface. */ static int cpcpci_probe(device_t); @@ -351,6 +402,8 @@ } } + ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); + device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); @@ -540,6 +593,19 @@ static int cpcpci_route_interrupt(device_t bus, device_t dev, int pin) { - return (0); + struct cpcpci_softc *sc; + struct ofw_pci_register reg; + uint32_t pintr, mintr; + uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; + + sc = device_get_softc(bus); + pintr = pin; + if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, + sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) + return (mintr); + + device_printf(bus, "could not route pin %d for device %d.%d\n", + pin, pci_get_slot(dev), pci_get_function(dev)); + return (PCI_INVALID_IRQ); } ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpchtvar.h#2 (text+ko) ==== @@ -52,6 +52,7 @@ bus_space_tag_t sc_iot; bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; + struct ofw_bus_iinfo sc_pci_iinfo; }; #endif /* _POWERPC_POWERMAC_CPCHTVAR_H_ */ ==== //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#4 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -251,6 +252,8 @@ } } + ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); + device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -335,8 +338,20 @@ static int grackle_route_interrupt(device_t bus, device_t dev, int pin) { + struct grackle_softc *sc; + struct ofw_pci_register reg; + uint32_t pintr, mintr; + uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; - return (0); + sc = device_get_softc(bus); + pintr = pin; + if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, + sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) + return (mintr); + + device_printf(bus, "could not route pin %d for device %d.%d\n", + pin, pci_get_slot(dev), pci_get_function(dev)); + return (PCI_INVALID_IRQ); } static int ==== //depot/projects/ppc-g5/sys/powerpc/powermac/gracklevar.h#2 (text+ko) ==== @@ -52,6 +52,8 @@ struct rman sc_mem_rman; bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; + + struct ofw_bus_iinfo sc_pci_iinfo; }; /* ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#5 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -294,6 +295,8 @@ } } + ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t)); + device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); } @@ -360,8 +363,20 @@ static int uninorth_route_interrupt(device_t bus, device_t dev, int pin) { + struct uninorth_softc *sc; + struct ofw_pci_register reg; + uint32_t pintr, mintr; + uint8_t maskbuf[sizeof(reg) + sizeof(pintr)]; - return (0); + sc = device_get_softc(bus); + pintr = pin; + if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®, + sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr), maskbuf)) + return (mintr); + + device_printf(bus, "could not route pin %d for device %d.%d\n", + pin, pci_get_slot(dev), pci_get_function(dev)); + return (PCI_INVALID_IRQ); } static int ==== //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#5 (text+ko) ==== @@ -61,6 +61,7 @@ bus_space_tag_t sc_iot; bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; + struct ofw_bus_iinfo sc_pci_iinfo; int sc_u3; }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 20 15:21:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE86E1065683; Mon, 20 Oct 2008 15: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 73B961065670 for ; Mon, 20 Oct 2008 15:21:12 +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 5FBCE8FC25 for ; Mon, 20 Oct 2008 15:21:12 +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 m9KFLCKU010331 for ; Mon, 20 Oct 2008 15:21:12 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KFLCAf010329 for perforce@freebsd.org; Mon, 20 Oct 2008 15:21:12 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 20 Oct 2008 15:21:12 GMT Message-Id: <200810201521.m9KFLCAf010329@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 151606 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, 20 Oct 2008 15:21:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=151606 Change 151606 by rene@rene_self on 2008/10/20 15:20:18 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#9 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#9 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#4 (text+ko) ==== @@ -8,7 +8,7 @@ @@ -174,7 +174,7 @@ All sources must be rebuilt and installed with CTF options. To accomplish this task, rebuild the &os; sources using: - -&prompt.root; make WITH_CFT=1 kernel - The system will need to be restarted. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -543,7 +543,7 @@ &a.xen.name; - Discussion of the freebsd port to xen - implementation and usage + Discussion of the &os; port to &xen; — implementation and usage @@ -1671,10 +1671,10 @@ &a.xen.name; - Discussion of the freebsd port to xen - - implementation and usage + Discussion of the &os; port to &xen; + — implementation and usage - A list that focuses on the FreeBSD Xen port. The + A list that focuses on the &os; &xen; port. The anticipated traffic level is small enough that it is intended as a forum for both technical discussions of the implementation and design details as well as ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -493,7 +493,7 @@ freebsd-x11"> -Discussion of the freebsd port to xen - implementation and usage"> +FreeBSD port to Xen mailing list"> freebsd-xen"> ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2510,6 +2510,13 @@ Received + + rpaulo + VIA XinE Firewire OHCI (PCI) + mlaier + Received + + &footer; From owner-p4-projects@FreeBSD.ORG Mon Oct 20 15:26:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40DE51065684; Mon, 20 Oct 2008 15:26:18 +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 048CA1065676 for ; Mon, 20 Oct 2008 15:26:18 +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 E74EE8FC21 for ; Mon, 20 Oct 2008 15:26:17 +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 m9KFQHOT010729 for ; Mon, 20 Oct 2008 15:26:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KFQHHO010727 for perforce@freebsd.org; Mon, 20 Oct 2008 15:26:17 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 20 Oct 2008 15:26:17 GMT Message-Id: <200810201526.m9KFQHHO010727@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 151609 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, 20 Oct 2008 15:26:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=151609 Change 151609 by rene@rene_self on 2008/10/20 15:26:15 MFen dtrace 1.4 -> 1.5 Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#6 (text+ko) ==== @@ -11,7 +11,7 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml,v 1.3 2008/10/10 15:37:53 pgj Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml - %SRCID% 1.4 + %SRCID% 1.5 --> @@ -194,15 +194,15 @@ de &os;-broncode herbouwd met: &prompt.root; cd /usr/src -&prompt.root; make WITH_CFT=1 kernel - Het systeem moet opnieuw gestart worden. From owner-p4-projects@FreeBSD.ORG Mon Oct 20 15:34:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 982D0106566B; Mon, 20 Oct 2008 15:34:26 +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 5B2B3106569F for ; Mon, 20 Oct 2008 15:34:26 +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 49D3D8FC1D for ; Mon, 20 Oct 2008 15:34:26 +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 m9KFYQAt011338 for ; Mon, 20 Oct 2008 15:34:26 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KFYQS8011336 for perforce@freebsd.org; Mon, 20 Oct 2008 15:34:26 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 20 Oct 2008 15:34:26 GMT Message-Id: <200810201534.m9KFYQS8011336@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 151610 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, 20 Oct 2008 15:34:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=151610 Change 151610 by rene@rene_self on 2008/10/20 15:33:28 MFen eresources 1.194 -> 1.195 mailing-lists.ent 1.65 -> 1.66 Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#11 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#10 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#11 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml - %SRCID% 1.194 + %SRCID% 1.195 --> @@ -669,8 +669,8 @@ &a.xen.name; - Discussies over het porteren van &os; naar xen - - implementatie en gebruik + DiScussies over het porteren van &os; naar &xen; + — implementatie en gebruik @@ -1920,9 +1920,9 @@ Discussies over het porteren van &os; naar - xen - implementatie en gebruik + &xen; — implementatie en gebruik - Een lijst die zich richt op de &os; Xen port. De + Een lijst die zich richt op de &os; &xen; port. De verwachte hoeveelheid verkeer is laag genoeg zodat het voor zowel technische discussies over de implementatie- en ontwerpdetails als voor zaken over administratief gebruik ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#10 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.65 + %SRCID% 1.66 --> @@ -497,7 +497,7 @@ freebsd-x11"> -Discussies voer het porteren van FreeBSD naar xen - implementatie en gebruik"> +FreeBSD port naar Xen mailinglijst"> freebsd-xen"> From owner-p4-projects@FreeBSD.ORG Mon Oct 20 17:43:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A276106567E; Mon, 20 Oct 2008 17:43: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 ACF90106566B for ; Mon, 20 Oct 2008 17:43:37 +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 9727A8FC23 for ; Mon, 20 Oct 2008 17:43:37 +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 m9KHhbF8033496 for ; Mon, 20 Oct 2008 17:43:37 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KHhbR0033494 for perforce@freebsd.org; Mon, 20 Oct 2008 17:43:37 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 20 Oct 2008 17:43:37 GMT Message-Id: <200810201743.m9KHhbR0033494@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 151614 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, 20 Oct 2008 17:43:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=151614 Change 151614 by pgj@kolbasz on 2008/10/20 17:43:35 MFen (doc): 1.4 -> 1.5 hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#8 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#8 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -241,7 +241,7 @@ parancsokat kell kiadnunk: &prompt.root; cd /usr/src -&prompt.root; make WITH_CFT=1 kernel +&prompt.root; make WITH_CTF=1 kernel A fordítás befejezõdése után indítsuk újra a rendszerünket. From owner-p4-projects@FreeBSD.ORG Mon Oct 20 19:17:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D86D1065675; Mon, 20 Oct 2008 19:17: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 306F21065673 for ; Mon, 20 Oct 2008 19:17:13 +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 1CFD98FC1B for ; Mon, 20 Oct 2008 19:17:13 +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 m9KJHD14043899 for ; Mon, 20 Oct 2008 19:17:13 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KJHC4i043897 for perforce@freebsd.org; Mon, 20 Oct 2008 19:17:12 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 20 Oct 2008 19:17:12 GMT Message-Id: <200810201917.m9KJHC4i043897@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 151621 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, 20 Oct 2008 19:17:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=151621 Change 151621 by rene@rene_self on 2008/10/20 19:16:52 Language and whitespace fixes for eresources. Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#12 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#12 (text+ko) ==== @@ -12,19 +12,19 @@ Bronnen op Internet - Door de snelle ontwikkeling van &os; zijn gedrukte media niet - zo praktisch om de laatste ontwikkelingen te volgen. Elektronische + Door de snelle ontwikkeling van &os; zijn gedrukte media niet zo + praktisch om de laatste ontwikkelingen te volgen. Elektronische bronnen zijn de beste, en vaak de enige, om op de hoogte te blijven van de laatste ontwikkelingen. Omdat &os; draait op de inzet van vrijwilligers, is de gebruikersgemeenschap vaak een soort - technische ondersteuningsgroep, die heeft ontdekt - dat e–mail en USENET de meeste effectieve manieren zijn om de + technische ondersteuningsgroep, die heeft ontdekt dat + email en USENET de meeste effectieve manieren zijn om de gebruikersgemeenschap te bereiken. - Hieronder staan de meest belangrijke contactmogelijkheden met - de &os; gebruikersgemeenschap beschreven. Mochten er andere - bronnen zijn die hier niet beschreven zijn, laat die dan weten aan - de &a.doc;, zodat ze hier ook beschreven kunnen worden. + Hieronder staan de meest belangrijke contactmogelijkheden met de + &os; gebruikersgemeenschap beschreven. Mochten er andere bronnen + zijn die hier niet beschreven zijn, laat die dan weten aan de + &a.doc;, zodat ze hier ook beschreven kunnen worden. Mailinglijsten @@ -34,34 +34,34 @@ groepen binnen comp.unix.bsd.freebsd.* gesteld worden, op tijd beantwoord worden - als ze al beantwoord worden. Door vragen op de daarvoor bestemde mailinglijsten te stellen, - wordt het gewenste &os; publiek bereikt, waardoor een beter, of - in ieder geval tijdiger, antwoord is gegarandaard. + wordt het gewenste &os; publiek bereikt, waardoor een beter, of in + ieder geval tijdiger, antwoord is gegarandaard. - De doelstellingen van de verschillende lijsten staan - onderaan dit document. Lees alstublieft de - doelstellingen alvorens lid te worden of mail te - sturen. De meeste leden ontvangen tegenwoordig vaak - honderden &os; gerelateerde berichten per dag, en door de - doelstellingen en gebruiksregels op te stellen wordt gestreefd om - zo min mogelijk ruis op de lijn te krijgen. Door de voorgaande - adviezen te negeren zouden de mailinglijsten op termijn falen als - een effectief communicatiemedium over het project. + De doelstellingen van de verschillende lijsten staan onderaan + dit document. Lees alstublieft de doelstellingen + alvorens lid te worden of mail te sturen. De meeste + leden ontvangen tegenwoordig vaak honderden &os;-gerelateerde + berichten per dag, en door de doelstellingen en gebruiksregels op + te stellen wordt gestreefd om zo min mogelijk ruis op de lijn te + krijgen. Door de voorgaande adviezen te negeren zouden de + mailinglijsten op termijn falen als een effectief + communicatiemedium over het project. - Als u wilt testen of u naar de &os; lijsten - email kunt versturen, stuur dan een bericht naar - &a.test.name;. - Stuur alstublieft geen test berichten naar andere lijsten. + Als u wilt testen of u naar de &os; lijsten email + kunt versturen, stuur dan een bericht naar + &a.test.name;. Stuur alstublieft geen testberichten + naar andere lijsten. Bij twijfel over naar welke lijst te posten, kan de pagina Hoe de beste - resultaten uit de &os;-vragen mailinglijst te halen + resultaten uit de &os;-vragen mailinglijst te halen wellicht helpen. Alvorens naar enige lijst te posten, is het verstandig te - leren hoe de mailinglijsten het beste gebruikt kunnen worden. - Hoe bijvoorbeeld zich vaak herhalende discussies voorkomen kunnen + leren hoe de mailinglijsten het beste gebruikt kunnen worden. Hoe + bijvoorbeeld zich vaak herhalende discussies voorkomen kunnen worden door het document Veel Gestelde Mailinglijstvragen (FAQ) te lezen. @@ -69,10 +69,10 @@ Voor alle mailinglijsten worden archieven bijgehouden die doorzocht kunnen worden op de &os; World Wide Web - server. De met sleutelwoorden te doorzoeken archieven - bieden een voortreffelijke methode om antwoorden te vinden op - vaak gestelde vragen en horen geraadpleegd te worden voordat er - vragen op een lijst worden gesteld. + server. De met sleutelwoorden te doorzoeken archieven + bieden een voortreffelijke methode om antwoorden te vinden op vaak + gestelde vragen en horen geraadpleegd te worden voordat er vragen + op een lijst worden gesteld. Lijstsamenvatting @@ -101,8 +101,7 @@ &a.announce.name; - Belangrijke gebeurtenissen en - projectdoelen + Belangrijke gebeurtenissen en projectdoelen @@ -115,8 +114,7 @@ &a.bugbusters.name; Discussie over het onderhoud van de &os; - probleemrapporten database en aanverwante - zaken + probleemrapportendatabase en aanverwante zaken @@ -128,8 +126,8 @@ &a.chat.name; - Niet-technische onderwerpen met betrekking tot - de &os; gemeenschap + Niet-technische onderwerpen met betrekking tot de + &os;-gemeenschap @@ -148,8 +146,8 @@ &a.jobs.name; - Werk en mogelijkheden voor het geven van advies - met betrekking tot &os; + Werk en mogelijkheden voor het geven van advies met + betrekking tot &os; @@ -162,8 +160,7 @@ &a.questions.name; - Gebruikersvragen en technische - ondesteuning + Gebruikersvragen en technische ondersteuning @@ -188,11 +185,11 @@ - Technische lijsten: De volgende - lijsten zijn voor technische discussie. Het is van belang de - doelstellingen te lezen alvorens lid te worden of mail te - sturen omdat de richlijnen voor het gebruik en de inhoud erg - strikt zijn. + Technische lijsten: De volgende lijsten + zijn voor technische discussie. Het is van belang de + doelstellingen te lezen alvorens lid te worden of mail te sturen + omdat de richlijnen voor het gebruik en de inhoud erg strikt + zijn. @@ -208,8 +205,7 @@ &a.acpi.name; - Ontwikkeling van ACPI en - energiebeheer + Ontwikkeling van ACPI en energiebeheer @@ -221,8 +217,8 @@ &a.aic7xxx.name; - Ontwikkeling van drivers voor de &adaptec; AIC - 7xxx + Ontwikkeling van stuurprogramma's voor de &adaptec; + AIC 7xxx @@ -234,7 +230,7 @@ &a.amd64.name; - Porten van &os; naar AMD64 systemen + Porten van &os; naar AMD64-systemen @@ -247,13 +243,13 @@ &a.arm.name; - Porten van &os; naar &arm; processors + Porten van &os; naar &arm;-processors &a.atm.name; - Het gebruik van ATM netwerken met &os; + Het gebruik van ATM-netwerken met &os; @@ -297,28 +293,27 @@ &a.doc.name; - Het maken van &os; gerelateerde documenten + Het maken van &os;-gerelateerde documenten &a.drivers.name; - Apparaatstuurprogramma's schrijven voor - &os; + Apparaatstuurprogramma's schrijven voor &os; &a.eclipse.name; Gebruikers van Eclipse IDE, hulpprogramma's, - clientapplicaties en ports + cliëntapplicaties en ports &a.eol.name; - Ondersteuning voor &os; gerelateerde software welke - niet langer ondersteund worden door het &os; project. + Ondersteuning voor &os;-gerelateerde software welke + niet langer ondersteund worden door het &os;-project. @@ -331,7 +326,7 @@ &a.emulation.name; Emulatie van andere systemen zoals &linux;, - &ms-dos; en &windows; + &ms-dos;, en &windows; @@ -350,8 +345,7 @@ &a.geom.name; - GEOM-specifieke discussies en - implementaties + GEOM-specifieke discussies en implementaties @@ -389,33 +383,32 @@ &a.ia64.name; - Porten van &os; naar &intel;'s IA64 - systemen + Porten van &os; naar &intel;'s IA64 systemen &a.ipfw.name; - Technische discussie over het herontwerp van de IP - firewallcode + Technische discussie over het herontwerp van de + IP-firewallcode &a.isdn.name; - ISDN ontwikkelaars + ISDN-ontwikkelaars &a.jail.name; - Discussies over de &man.jail.8; faciliteiten. + Discussies over de &man.jail.8;-faciliteiten. &a.java.name; - &java; ontwikkelaars en mensen die &jdk;'s porten + &java; ontwikkelaars en mensen die &jdk;s porten naar &os; @@ -423,7 +416,7 @@ &a.kde.name; Porten van KDE en - KDE applications + KDE applicaties @@ -435,8 +428,8 @@ &a.libh.name; - Het tweede generatie installatie en package - systeem + Het tweede generatie installatie- en + pakketsysteem @@ -461,21 +454,19 @@ &a.multimedia.name; - Multimedia applicaties + Multimedia-applicaties &a.newbus.name; - Technische discussies over - bus-architecturen + Technische discussies over busarchitecturen &a.net.name; - Discussies over netwerken en TCP/IP - broncode + Discussies over netwerken en TCP/IP-broncode @@ -505,14 +496,13 @@ &a.pf.name; Discussies en vragen voor het pakketfilter - firewall systeem + firewallsysteem &a.platforms.name; - Ports naar niet &intel; architectuur - platforms + Ports naar niet &intel;-architectuurplatformen @@ -543,20 +533,20 @@ &a.python.name; - &os;-specifieke Python zaken + &os;-specifieke zaken over Python &a.qa.name; Discussie over Quality Assurance, meestal in een - release traject + uitgavetraject &a.realtime.name; - Ontwikkeling van realtime extensions voor + Ontwikkeling van realtime-uitbreidingen voor &os; @@ -577,7 +567,7 @@ &a.scsi.name; - Het SCSI subsysteem + Het SCSI-subsysteem @@ -589,9 +579,8 @@ &a.small.name; - &os; gebruiken in embedded toepassingen, - verouderd, gebruik in plaats hiervan: - &a.embedded.name; + &os; gebruiken in embedded toepassingen, verouderd, + gebruik in plaats hiervan &a.embedded.name; @@ -611,15 +600,15 @@ &a.standards.name; - Volgen van de C99 en de &posix; standaarden door + Volgen van de C99- en de &posix; standaarden door &os; &a.sun4v.name; - Het porteren van &os; naar &ultrasparc; T1 gebaseerde - systemen. + Het porteren van &os; naar &ultrasparc; + T1-gebaseerde systemen. @@ -643,7 +632,7 @@ &a.usb.name; - Discussie over &os; ondersteuning voor USB + Discussie over &os;-ondersteuning voor USB @@ -662,14 +651,13 @@ &a.x11.name; - Onderhoud en ondersteuning voor X11 op - &os; + Onderhoud en ondersteuning voor X11 op &os; &a.xen.name; - DiScussies over het porteren van &os; naar &xen; + Discussies over het porteren van &os; naar &xen; — implementatie en gebruik @@ -680,8 +668,8 @@ zijn voor meer gespecialiseerd publiek en algemene gebruikers hebben er waarschijnlijk niets aan. Het is verstandig om eerst naam te maken in de technische lijsten alvorens lid te worden - van een van de onderstaande beperkte lijsten, zodat de - gebruiken op die lijst bekend zijn. + van een van de onderstaande beperkte lijsten, zodat de gebruiken + op die lijst bekend zijn. @@ -704,13 +692,13 @@ &a.usergroups.name; - Gebruikersgroep coördinatie + Gebruikersgroepcoördinatie &a.vendors.name; - Coördinatie van pre-release met + Coördinatie van vooruitgaven met wederverkopers @@ -732,13 +720,13 @@ Verkorte versie van lijsten (digest): Alle hierboven beschreven lijsten zijn beschikbaar in verkorte - vorm. Na het lid worden van een lijst zijn de digest opties - te wijzigen bij de accountopties. + vorm. Na het lid worden van een lijst zijn de digest opties te + wijzigen bij de accountopties. CVS- & SVN-lijsten: De volgende lijsten zijn voor mensen met interesse in het zien van logboekberichten voor wijzigingen in verschillende onderdelen - van de broncodestructuur. Het zijn + van de broncodeboom. Het zijn Alleen-lezen-lijsten waar geen email heen gezonden hoort te worden. @@ -760,8 +748,8 @@ /usr/(CVSROOT|doc|ports) - Alle wijzigingen op welke plaats in de structuur - dan ook (som van alle andere CVS-commit-lijsten) + Alle wijzigingen op welke plaats in de boom dan ook + (som van alle andere CVS-commit-lijsten) @@ -778,7 +766,7 @@ /usr/ports - Alle wijzigingen aan de ports-structuur + Alle wijzigingen aan de ports-boom @@ -786,7 +774,7 @@ /usr/projects - Alle wijzigingen aan de projects-structuur + Alle wijzigingen aan de projects-boom @@ -794,8 +782,8 @@ /usr/src - Alle wijzigingen aan de src-structuur (gegenereerd - door de commits van de svn-naar-cvs-importer) + Alle wijzigingen aan de src-boom (gegenereerd door + de commits van de svn-naar-cvs-importer) @@ -924,20 +912,20 @@ Hoe abonneren Om te abonneren op een lijst kan geklikt worden op de naam - van de lijst hierboven of kan op &a.mailman.lists.link; - geklikt worden op de lijst waarin interesse bestaat. De pagina - waarop de lijsten staan beschreven bevat alle informatie die - nodig is om te abonneren. + van de lijst hierboven of kan op &a.mailman.lists.link; geklikt + worden op de lijst waarin interesse bestaat. De pagina waarop + de lijsten staan beschreven bevat alle informatie die nodig is + om te abonneren. - Om te posten op een lijst kan simpelweg een e–mail - gestuurd worden naar + Om te posten op een lijst kan simpelweg een email gestuurd + worden naar lijstnaam@FreeBSD.org. Daarna wordt die doorgestuurd aan leden van de lijst in de hele wereld. Om het abonnement op een lijst op te zeggen kan op de URL - die onderaan iedere e–mail van een lijst staat geklikt - worden. Het is ook mogelijk om een e–mail te sturen naar + die onderaan iedere email van een lijst staat geklikt worden. + Het is ook mogelijk om een email te sturen naar lijstnaam-unsubscribe@FreeBSD.org om een abonnement op te zeggen. @@ -951,30 +939,30 @@ Lijstdoelstellingen - Alle &os; mailinglijsten hebben eigen - regels waaraan voldaan dient te worden bij gebruik. Als - daaraan niet wordt voldaan, resulteert dat in maximaal twee (2) + Alle &os;-mailinglijsten hebben eigen + regels waaraan voldaan dient te worden bij gebruik. Als daaraan + niet wordt voldaan, resulteert dat in maximaal twee (2) schriftelijke waarschuwingen van de &os; Postmaster postmaster@FreeBSD.org, waarna na de derde - overtreding de poster verwijderd wordt van alle &os; - mailinglijsten en alle toekomstige mail van het adres van de - verzender wordt uitgefilterd. Helaas zijn deze regels nodig, - omdat het internet van vandaag de dag een onvriendelijke - omgeving is en slechts weinigen zich bewust zijn van hoe - fragiel sommige mechanismen zijn. + overtreding de poster verwijderd wordt van alle + &os;-mailinglijsten en alle toekomstige mail van het adres van + de verzender wordt uitgefilterd. Helaas zijn deze regels nodig, + omdat het Internet van vandaag de dag een onvriendelijke + omgeving is en slechts weinigen zich bewust zijn van hoe fragiel + sommige mechanismen zijn. Standaardregels: Het onderwerp van iedere mail dient te voldoen aan de - basisdoelstellingen van de lijst waarnaar wordt gepost. - Als de lijst bijvoorbeeld over technische onderwerpen gaat, - dan hoort een post ook over iets technisch te gaan. Ruis - en flaming doen alleen af aan de waarde van een - mailinglijst voor alle leden en dat wordt niet getolereerd. - Voor vrije discussie dient de &a.chat; gebruikt te worden - die daar speciaal voor is ingesteld. + basisdoelstellingen van de lijst waarnaar wordt gepost. Als + de lijst bijvoorbeeld over technische onderwerpen gaat, dan + hoort een post ook over iets technisch te gaan. Ruis en + flaming doen alleen af aan de waarde van een mailinglijst + voor alle leden en dat wordt niet getolereerd. Voor vrije + discussie dient de &a.chat; gebruikt te worden die daar + speciaal voor is ingesteld. @@ -989,35 +977,32 @@ meerdere mailinglijsten op de regel Cc staan, dan hoort de regel Cc weer ingekort te worden in een eventueel antwoord. De - verzender is verantwoordelijk voor zijn eigen - kruisposten, wie ook een eerdere zender - was. + verzender is verantwoordelijk voor zijn eigen kruisposten, + wie ook een eerdere zender was. Persoonlijke aanvallen en profane taal (in de context - van een geschil) zijn niet toegestaan. Dit geldt zowel - voor gebruikers als ontwikkelaars. Grove schending van de + van een geschil) zijn niet toegestaan. Dit geldt zowel voor + gebruikers als ontwikkelaars. Grove schending van de netiquette, zoals kopiëren uit of het volledig - doorsturen van persoonlijke e–mail zonder dat - daarvoor toestemming is gegeven, wordt niet op prijs - gesteld. Er zijn hoe dan ook zeer weinig gevallen zijn - waarin zoiets dergelijks wel binnen de doelstelling van een - lijst valt, waardoor dat soort e–mails op grond van - de inhoud alleen al vaak reden zijn voor een waarschuwing - (of ban). + doorsturen van persoonlijke email zonder dat daarvoor + toestemming is gegeven, wordt niet op prijs gesteld. Er + zijn hoe dan ook zeer weinig gevallen waarin zoiets + dergelijks wel binnen de doelstelling van een lijst valt, + waardoor dat soort emails op grond van de inhoud alleen al + vaak reden zijn voor een waarschuwing (of ban). - Adverteren voor niet-&os; gerelateerde producten is + Adverteren voor niet-&os;-gerelateerde producten is streng verboden en heeft direct een ban tot gevolg als helder is dat de overtreder adverteert door middel van spam. - Individuele - lijstdoelstellingen: + Individuele lijstdoelstellingen: @@ -1049,13 +1034,13 @@ projectdoelen Dit is de mailinglijst voor hen die alleen interesse - hebben in gelegenheidsmededelingen of belangrijke &os; - gebeurtenissen. Hieronder vallen aankondigingen over - snapshots en andere releases. De lijst omvat ook + hebben in gelegenheidsmededelingen of belangrijke + &os;-gebeurtenissen. Hieronder vallen aankondigingen over + snapshots en andere uitgaven. De lijst omvat ook aankondigingen over nieuwe mogelijkheden binnen &os;. Er kunnen ook oproepen gedaan worden voor vrijwilligers, - enzovoort. Deze lijst kent een laag volume en is - volledig gemodereerd. + enzovoort. Deze lijst kent een laag volume en is volledig + gemodereerd. @@ -1066,28 +1051,28 @@ Discussie van architectuur en ontwerp - Deze lijst is bedoeld voor het bespreken van de &os; - architectuur. Berichten zijn in het algemeen strikt - technisch van aard. Voorbeelden van geschikte - onderwerpen zijn: + Deze lijst is bedoeld voor het bespreken van de + &os;-architectuur. Berichten zijn in het algemeen strikt + technisch van aard. Voorbeelden van geschikte onderwerpen + zijn: - Hoe het buildsysteem bijgewerkt kan worden - zodat meerdere aanpaste builds tegelijkertijd kunnen + Hoe het buildsysteem bijgewerkt kan worden zodat + meerdere aanpaste builds tegelijkertijd kunnen lopen. - Wat moet er aan VPS aangepast worden om Heidemann - layers te laten werken. + Wat moet er aan VPS aangepast worden om + Heidemann-lagen te laten werken. Hoe kan de apparataatstuurprogramma interface aangepast worden zodat dezelfde stuurprogramma's - netjes op vele bussen en architecturen gebruikt - kunnen worden. + netjes op vele bussen en architecturen gebruikt kunnen + worden. @@ -1104,21 +1089,21 @@ Broncode audit project - Dit is de mailinglijst voor het &os; broncode audit - project. Hoewel in eerst instantie bedoeld voor - beveiliging gerelateerde wijzigingen, zijn de + Dit is de mailinglijst voor het &os;-broncode + auditproject. Hoewel in eerst instantie bedoeld voor + wijzigingen gerelateerd aan beveiliging, zijn de doelstellingen aangepast naar alle wijzigingen in de code. Op deze lijst komen veel patches voor en hij is - waarschijnlijk niet interessant voor de gemiddelde &os; - gebruiker. Beveiligingsdiscussies die niet gerelateerd - zijn aan een bepaalde broncodewijziging worden gehouden - op freebsd-security. Omgekeerd worden alle ontwikkelaars - aangemoedigd hun patches op deze lijst ter review aan te - bieden, zeker als hun patch een deel van het systeem - raakt waar een bug de integriteit van het systeem nadelig - kan beïnvloeden. + waarschijnlijk niet interessant voor de gemiddelde + &os;-gebruiker. Beveiligingsdiscussies die niet + gerelateerd zijn aan een bepaalde broncodewijziging worden + gehouden op freebsd-security. Omgekeerd worden alle + ontwikkelaars aangemoedigd hun patches op deze lijst ter + review aan te bieden, zeker als hun patch een deel van het + systeem raakt waar een bug de integriteit van het systeem + nadelig kan beïnvloeden. @@ -1132,11 +1117,11 @@ Project Deze lijst bestaat om de mogelijkheid te bieden tot - het bespreken van het binaire update systeem of + het bespreken van het binaire updatesysteem of binup. Onderwerpen met - betrekking tot ontwerp, implementatie details, patches, - bugreports, statusreports, feature requests, commit - logs en alle andere dingen die met + betrekking tot ontwerp, implementatiedetails, patches, + bugreports, statusreportages, feature-verzoeken, + commitlogs en alle andere dingen die met binup te maken hebben kunnen besproken worden. @@ -1151,8 +1136,8 @@ Dit is het forum waar gebruikers van &bluetooth; op &os; samenkomen. Gespreksstof op het gebied van ontwerp, implementatiedetails, patches, probleemrapportages, - statusrapportages, verzoeken voor nieuwe mogelijkheden - en al het andere dat met &bluetooth; te maken heeft is + statusrapportages, verzoeken voor nieuwe mogelijkheden en + al het andere dat met &bluetooth; te maken heeft is geschikt materiaal. @@ -1166,9 +1151,9 @@ Het doel van deze lijst is een platform zijn voor de coördinatie en discussie voor de Bugmeister, zijn - Bugbusters en anderen die interesse hebben in de PR - database. Deze lijst is niet bedoeld voor discussie van - specifieke bugs, patches of PR's. + Bugbusters en anderen die interesse hebben in de + PR-database. Deze lijst is niet bedoeld voor discussies + over specifieke bugs, patches of PR's. @@ -1181,7 +1166,7 @@ Dit is de mailinglijst voor het rapporteren van bugs in &os;. Waar mogelijk dienen bugs ingezonden te worden via &man.send-pr.1; of via de WEB interface + url="&url.base;/send-pr.html">Webinterface daarvan. @@ -1191,18 +1176,18 @@ Niet-technische onderwerpen met betrekking - tot de &os; gemeenschap + tot de &os;-gemeenschap Deze lijst bevat alle onderwerpen waar op andere - lijsten geen ruimte voor is wat betreft niet-technische - en sociale informatie. Er wordt gesproken over de moord - op Van Gogh, of er in onderkast of kapitalen geschreven - dient te worden, wie er te veel koffie drinkt, waar het - beste bier vandaan komt, enzovoort. Belangrijke - gebeurtenissen (zoals feestjes, bruiloften, geboorten, - nieuwe banen, enzovoort) kunnen op de technische lijsten - aangekondigd worden, maar antwoorden dienen naar deze - -chat lijst te gaan. + lijsten geen ruimte voor is wat betreft niet-technische en + sociale informatie. Er wordt gesproken over de moord op + Van Gogh, of er in onderkast of kapitalen geschreven dient + te worden, wie er te veel koffie drinkt, waar het beste + bier vandaan komt, enzovoort. Belangrijke gebeurtenissen + (zoals feestjes, bruiloften, geboorten, nieuwe banen, + enzovoort) kunnen op de technische lijsten aangekondigd + worden, maar antwoorden dienen naar deze -chat lijst te + gaan. @@ -1214,7 +1199,7 @@ Dit is een interne mailinglijst die wordt gebruikt door de kernleden. Er kunnen berichten naar gestuurd - worden als een belangrijke &os; gerelateerde zaak + worden als een belangrijke &os;-gerelateerde zaak arbitrage nodig heeft of een onderzoekende blik op hoog niveau nodig is. @@ -1232,9 +1217,8 @@ mogelijkheden in -CURRENT die impact hebben op gebruikers en instructies over de te nemen stappen om -CURRENT te blijven. Iedereen die CURRENT draait, zou - zich moeten abonneren. Dit is een technische - mailinglijst waarop strikt technische berichten worden - verwacht. + zich moeten abonneren. Dit is een technische mailinglijst + waarop strikt technische berichten worden verwacht. @@ -1244,8 +1228,8 @@ &os; CVSweb Project - Technische discussie over het gebruik, de - ontwikkeling en het beheer van &os;-CVSweb. + Technische discussie over het gebruik, de ontwikkeling + en het beheer van &os;-CVSweb. @@ -1253,11 +1237,11 @@ &a.doc.name; - Documentatie project + Documentatieproject Dit is de mailinglijst voor het bespreken van - onderwerpen en projecten die te maken hebben met het - maken van documentatie voor &os;. De leden van deze + onderwerpen en projecten die te maken hebben met het maken + van documentatie voor &os;. De leden van deze mailinglijst worden samen The &os; Documentation Project genoemd. Het is een open lijst waarop zonder problemen een abonnement genomen kan worden en @@ -1285,27 +1269,26 @@ &a.eclipse.name; - Gebruikers van Eclipse IDE, - hulpprogramma's, clientapplicaties en - ports + Gebruikers van Eclipse IDE, hulpprogramma's, + cliëntapplicaties en ports De doelstelling van deze lijst is wederzijdse - ondersteuning bieden voor alles dat te maken heeft met - het kiezen, installeren, gebruiken, ontwikkelen en + ondersteuning bieden voor alles dat te maken heeft met het + kiezen, installeren, gebruiken, ontwikkelen, en onderhouden van Eclipse IDE, hulpprogramma's en - clientapplicaties op het &os;-platform en te ondersteunen - bij het porten van Eclipse IDE en plugins naar de - &os;-omgeving. + cliëntapplicaties op het &os;-platform en te + ondersteunen bij het porten van Eclipse IDE en plugins + naar de &os;-omgeving. Het is ook de bedoeling om het uitwisselen van - informatie tussen de Eclipse gemeenschap en de &os; - gemeenschap te bevorderen zodat beiden ervan kunnen + informatie tussen de Eclipse gemeenschap en de + &os;-gemeenschap te bevorderen zodat beiden ervan kunnen profiteren. Hoewel deze lijst voornamelijk is gericht op de behoeften van gebruikers van Eclipse, wordt ook een forum geboden voor hen die &os;-specifieke applicaties willen - ontwikkelen met het Eclipse framwork. + ontwikkelen met het Eclipse raamwerk. @@ -1314,14 +1297,14 @@ Ondersteuning van &os; gerelateerde software - welke niet meer ondersteund wordt door het &os; - project. + welke niet meer ondersteund wordt door het + &os;-project. - Deze lijst is voor degenen die geinteresseerd zijn - in het leveren of gebruiken van ondersteuning voor &os; - gerelateerde software voor welke het &os; project geen - ondersteuning meer biedt (in de vorm van security advisories - en patches). + Deze lijst is voor degenen die geinteresseerd zijn in + het leveren of gebruiken van ondersteuning voor + &os;-gerelateerde software voor welke het &os;-project + geen ondersteuning meer biedt (in de vorm van + beveiligingsadviezen en patches). @@ -1332,17 +1315,16 @@ &os; gebruiken in embedded applicaties - Deze lijst heeft tot doel om te discussieren over - &os; in embedded systemen. Dit is een technische - mailinglijst waarbij men alleen technische inhoud - verwacht. Voor het belang van deze lijst definieren we - embedded systemen als computer systemen die geen desktop - systemen zijn en meestal slechts één doel - hebben ten opzichte van gewone systemen. Voorbeelden - bevatten onder andere: diverse soorten telefoonsets, - netwerk apparatuur zoals routers, switches en PBX'en, - op afstandbestuurbare meet apparatuur, PDA's, Point of - Sale systemen etc. + Deze lijst heeft tot doel om te discussieren over &os; + in embedded systemen. Dit is een technische mailinglijst + waarbij men alleen technische inhoud verwacht. Voor het + belang van deze lijst definiëren we embedded systemen + als computersystemen die geen desktop-systemen zijn en + meestal slechts één doel hebben ten opzichte + van gewone systemen. Voorbeelden bevatten onder andere: + diverse soorten telefoonsets, netwerkapparatuur zoals + routers, switches en PBX'en, op afstand bestuurbare + meetapparatuur, PDA's, Point of Sale systemen etc. @@ -1363,14 +1345,13 @@ &a.firewire.name; - &firewire; (iLink, IEEE - 1394) + &firewire; (iLink, IEEE 1394) Dit is de mailinglijst voor het bespreken van het ontwerp en de implementatie van een &firewire; (ook wel IEEE 1394 of iLink) subsysteem voor &os;. Relevante - onderwerpen omvatten de standaarden, bus apparaten en - hun protocollen, adapter boards/kaarten/chipssets en de + onderwerpen omvatten de standaarden, busapparaten en hun + protocollen, adapter boards/kaarten/chipssets en de architectuur en implementatie van code voor een juiste ondersteuning. @@ -1382,7 +1363,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 20 22:14:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADEC71065676; Mon, 20 Oct 2008 22:14: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 743951065672 for ; Mon, 20 Oct 2008 22:14:19 +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 6251B8FC21 for ; Mon, 20 Oct 2008 22:14:19 +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 m9KMEJEa074100 for ; Mon, 20 Oct 2008 22:14:19 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KMEJHH074098 for perforce@freebsd.org; Mon, 20 Oct 2008 22:14:19 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 20 Oct 2008 22:14:19 GMT Message-Id: <200810202214.m9KMEJHH074098@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 151633 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, 20 Oct 2008 22:14:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=151633 Change 151633 by nwhitehorn@nwhitehorn_trantor on 2008/10/20 22:13:30 Fix messed up indentation. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#4 (text+ko) ==== @@ -438,7 +438,7 @@ static int nexus_activate_resource(device_t bus, device_t child, int type, int rid, -struct resource *res) + struct resource *res) { if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { vm_offset_t start; @@ -459,47 +459,45 @@ static int nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, -struct resource *res) + struct resource *res) { - -/* Not much to be done yet... */ -return (rman_deactivate_resource(res)); + /* Not much to be done yet... */ + return (rman_deactivate_resource(res)); } static int nexus_release_resource(device_t bus, device_t child, int type, int rid, -struct resource *res) + struct resource *res) { + if (type != SYS_RES_IRQ) { + device_printf(bus, "unknown resource request from %s\n", + device_get_nameunit(child)); + return (EINVAL); + } -if (type != SYS_RES_IRQ) { - device_printf(bus, "unknown resource request from %s\n", - device_get_nameunit(child)); - return (EINVAL); + return (rman_release_resource(res)); } -return (rman_release_resource(res)); -} - static device_t nexus_device_from_node(device_t parent, phandle_t node) { -device_t cdev; -struct nexus_devinfo *dinfo; -char *name, *type, *compatible; + device_t cdev; + struct nexus_devinfo *dinfo; + char *name, *type, *compatible; -OF_getprop_alloc(node, "name", 1, (void **)&name); -OF_getprop_alloc(node, "device_type", 1, (void **)&type); -OF_getprop_alloc(node, "compatible", 1, (void **)&compatible); -cdev = device_add_child(parent, NULL, -1); -if (cdev != NULL) { - dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK); - dinfo->ndi_node = node; - dinfo->ndi_name = name; - dinfo->ndi_device_type = type; - dinfo->ndi_compatible = compatible; - device_set_ivars(cdev, dinfo); -} else - free(name, M_OFWPROP); + OF_getprop_alloc(node, "name", 1, (void **)&name); + OF_getprop_alloc(node, "device_type", 1, (void **)&type); + OF_getprop_alloc(node, "compatible", 1, (void **)&compatible); + cdev = device_add_child(parent, NULL, -1); + if (cdev != NULL) { + dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK); + dinfo->ndi_node = node; + dinfo->ndi_name = name; + dinfo->ndi_device_type = type; + dinfo->ndi_compatible = compatible; + device_set_ivars(cdev, dinfo); + } else + free(name, M_OFWPROP); return (cdev); } From owner-p4-projects@FreeBSD.ORG Mon Oct 20 22:34:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACFC81065670; Mon, 20 Oct 2008 22: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 71580106566B for ; Mon, 20 Oct 2008 22:34:40 +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 468158FC1A for ; Mon, 20 Oct 2008 22:34:40 +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 m9KMYeJr075589 for ; Mon, 20 Oct 2008 22:34:40 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9KMYexP075587 for perforce@freebsd.org; Mon, 20 Oct 2008 22:34:40 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 20 Oct 2008 22:34:40 GMT Message-Id: <200810202234.m9KMYexP075587@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 151634 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, 20 Oct 2008 22:34:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=151634 Change 151634 by nwhitehorn@nwhitehorn_trantor on 2008/10/20 22:34:15 Add a MAMBO option. Affected files ... .. //depot/projects/ppc-g5/sys/conf/options.powerpc#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/conf/options.powerpc#2 (text+ko) ==== @@ -13,6 +13,7 @@ POWERMAC opt_platform.h MPC85XX opt_platform.h PSIM +MAMBO SC_OFWFB opt_ofwfb.h From owner-p4-projects@FreeBSD.ORG Tue Oct 21 02:31:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C33C7106567A; Tue, 21 Oct 2008 02:31: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 863261065672 for ; Tue, 21 Oct 2008 02:31:56 +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 746458FC0C for ; Tue, 21 Oct 2008 02:31:56 +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 m9L2VuI9009337 for ; Tue, 21 Oct 2008 02:31:56 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9L2VuKC009335 for perforce@freebsd.org; Tue, 21 Oct 2008 02:31:56 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 21 Oct 2008 02:31:56 GMT Message-Id: <200810210231.m9L2VuKC009335@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 151640 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, 21 Oct 2008 02:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=151640 Change 151640 by nwhitehorn@nwhitehorn_trantor on 2008/10/21 02:31:49 Get serial console working on IBM-ish machines, including Mambo. Also implement what promises to be a generic solution to nastiness like moea64_find_framebuffer(). Calling bus_space_map() before pmap is bootstrapped gets you on a special list of things that need to be remapped 1:1 the instant pmap comes up. Affected files ... .. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#2 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#8 edit .. //depot/projects/ppc-g5/sys/powerpc/include/param.h#2 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#6 edit .. //depot/projects/ppc-g5/sys/powerpc/powerpc/bus_machdep.c#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#2 (text) ==== @@ -116,7 +116,14 @@ return (ENXIO); if (OF_getprop(input, "name", buf, sizeof(buf)) == -1) return (ENXIO); - if (strcmp(buf, "ch-a")) + + if (strcmp(buf, "ch-a") == 0) { + class = &uart_z8530_class; + di->bas.regshft = 4; + } else if (strcmp(buf,"serial") == 0) { + class = &uart_ns8250_class; + di->bas.regshft = 0; + } else return (ENXIO); error = OF_decode_addr(input, 0, &di->bas.bst, &di->bas.bsh); @@ -125,9 +132,10 @@ di->ops = uart_getops(class); - di->bas.rclk = 230400; + if (OF_getprop(input, "current-speed", &di->bas.rclk, + sizeof(di->bas.rclk)) == -1) + di->bas.rclk = 230400; di->bas.chan = 1; - di->bas.regshft = 4; di->baudrate = 0; di->databits = 8; ==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#8 (text+ko) ==== @@ -278,6 +278,7 @@ extern struct pmap ofw_pmap; +extern void bs_remap_earlyboot(void); /* @@ -975,11 +976,12 @@ Maxmem = powerpc_btop(phys_avail[i + 1]); /* - * Initialize MMU + * Initialize MMU and remap early physical mappings */ moea64_bridge_cpu_bootstrap(0); mtmsr(mfmsr() | PSL_DR | PSL_IR); isync(); pmap_bootstrapped++; + bs_remap_earlyboot(); /* * Set the start and end of kva. ==== //depot/projects/ppc-g5/sys/powerpc/include/param.h#2 (text+ko) ==== @@ -56,6 +56,9 @@ #ifndef _NO_NAMESPACE_POLLUTION +/* Needed to display interrupts on OFW PCI */ +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ ==== //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#6 (text+ko) ==== @@ -77,6 +77,7 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource,bus_generic_activate_resource), /* ofw_bus interface */ @@ -184,6 +185,7 @@ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource,bus_generic_activate_resource), {0,0} ==== //depot/projects/ppc-g5/sys/powerpc/powerpc/bus_machdep.c#2 (text+ko) ==== @@ -37,17 +37,28 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/bus_machdep.c,v 1.1 2007/12/19 18:00:50 marcel Exp $"); +__FBSDID("$FreeBSD: head/sys/powerpc/powerpc/bus_machdep.c 174782 2007-12-19 18:00:50Z marcel $"); #include #include #include +#include +#include #include #include +#include #define TODO panic("%s: not implemented", __func__) +static struct { + bus_addr_t addr; + bus_size_t size; +} earlyboot_mappings[6]; +static int earlyboot_map_idx = 0; + +void bs_remap_earlyboot(void); + static __inline void * __ppc_ba(bus_space_handle_t bsh, bus_size_t ofs) { @@ -58,10 +69,42 @@ bs_gen_map(bus_addr_t addr, bus_size_t size __unused, int flags __unused, bus_space_handle_t *bshp) { - *bshp = addr; + /* + * Record what we did if we haven't enabled the MMU yet. We + * will need to remap it as soon as the MMU comes up. + */ + if (!pmap_bootstrapped) { + earlyboot_mappings[earlyboot_map_idx].addr = addr; + earlyboot_mappings[earlyboot_map_idx].size = size; + earlyboot_map_idx++; + *bshp = addr; + } else { + *bshp = (bus_space_handle_t)pmap_mapdev(addr,size); + } + return (0); } +void +bs_remap_earlyboot(void) +{ + int i; + vm_offset_t pa, spa; + + if (hw_direct_map) + return; + + for (i = 0; i < earlyboot_map_idx; i++) { + spa = earlyboot_mappings[i].addr; + + pa = trunc_page(spa); + while (pa < spa + earlyboot_mappings[i].size) { + pmap_kenter(pa,pa); + pa += PAGE_SIZE; + } + } +} + static void bs_gen_unmap(bus_size_t size __unused) { From owner-p4-projects@FreeBSD.ORG Tue Oct 21 02:33:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB7681065699; Tue, 21 Oct 2008 02:33: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 7EF7B1065675 for ; Tue, 21 Oct 2008 02:33:58 +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 6D9B48FC08 for ; Tue, 21 Oct 2008 02:33:58 +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 m9L2XwPR009509 for ; Tue, 21 Oct 2008 02:33:58 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9L2Xwhv009507 for perforce@freebsd.org; Tue, 21 Oct 2008 02:33:58 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 21 Oct 2008 02:33:58 GMT Message-Id: <200810210233.m9L2Xwhv009507@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 151641 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, 21 Oct 2008 02:33:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=151641 Change 151641 by nwhitehorn@nwhitehorn_trantor on 2008/10/21 02:33:00 Missed part of the last commit in nexus. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#5 (text+ko) ==== @@ -447,6 +447,7 @@ start = (vm_offset_t)rman_get_start(res); p = pmap_mapdev(start, (vm_size_t)rman_get_size(res)); + if (p == NULL) return (ENOMEM); rman_set_virtual(res, p); @@ -461,7 +462,10 @@ nexus_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - /* Not much to be done yet... */ + if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { + pmap_unmapdev((vm_offset_t)rman_get_virtual(res), + (vm_size_t)rman_get_size(res)); + } return (rman_deactivate_resource(res)); } @@ -469,12 +473,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - if (type != SYS_RES_IRQ) { - device_printf(bus, "unknown resource request from %s\n", - device_get_nameunit(child)); - return (EINVAL); - } - + /* Not much to be done yet... */ return (rman_release_resource(res)); } From owner-p4-projects@FreeBSD.ORG Tue Oct 21 04:48:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 346E61065670; Tue, 21 Oct 2008 04:48: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 EE19A106567F for ; Tue, 21 Oct 2008 04:48:14 +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 DB5568FC20 for ; Tue, 21 Oct 2008 04:48:14 +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 m9L4mETm037320 for ; Tue, 21 Oct 2008 04:48:14 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9L4mEJV037318 for perforce@freebsd.org; Tue, 21 Oct 2008 04:48:14 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 21 Oct 2008 04:48:14 GMT Message-Id: <200810210448.m9L4mEJV037318@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 151644 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, 21 Oct 2008 04:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=151644 Change 151644 by pgj@kolbasz on 2008/10/21 04:47:22 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#27 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#19 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#20 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/docproj_hu/www/en/administration.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/docproj/translations.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#8 integrate .. //depot/projects/docproj_hu/www/en/donations/index.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/faq2.sgml#3 integrate .. //depot/projects/docproj_hu/www/hu/administration.sgml#15 integrate .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#16 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#6 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#9 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -492,6 +492,10 @@ FreeBSD X11 mailing list"> freebsd-x11"> + +FreeBSD port to Xen mailing list"> +freebsd-xen"> + bug-followup@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#27 (text+ko) ==== @@ -20,7 +20,7 @@ A &os; Dokumentációs Projekt - $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.3 2008/10/05 01:34:24 pgj Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/books/faq/book.sgml,v 1.4 2008/10/20 18:02:13 pgj Exp $ 1995 ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.36 2008/09/02 17:44:03 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.37 2008/10/18 16:55:21 erwin Exp $ @@ -609,22 +609,6 @@ - - Anthony Carmody Consulting - http://www.carmoda.com - - Anthony Carmody Consulting offers a range of Internet related - FreeBSD services including: Shared Web Hosting, Dedicated - Servers, Co-location and Remote Administration and Monitoring. - We currently maintain a list of: Mail, DNS, Web, Database, IM, - Streaming Media, Network Management and File/Backup Servers. - Customers can supply hardware or purchase directly from us. All - supplied servers are based on a high quality rack mounted 1RU - Chenbro chassis, Supermicro Mainboards, ECC registered RAM and - 3Ware Disc Controllers. Tower servers are available on request. - - - JohnCompanies http://www.johncompanies.com @@ -851,18 +835,6 @@ - - FirmbIT - http://www.firmbit.com/index.php - - FirmbIT is a high quality server management and security company - providing friendly reliable support specializing in high security - installations and scaleable solutions with support for FreeBSD, - OpenBSD, NetBSD, Redhat, Fedora, CentOS, Debian, Slackware, Gentoo, - SuSe, Mandrake and Sun Solaris servers. - - - Colocrossing http://www.colocrossing.com From owner-p4-projects@FreeBSD.ORG Tue Oct 21 14:17:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A54A1065684; Tue, 21 Oct 2008 14:17:54 +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 1993B1065682 for ; Tue, 21 Oct 2008 14:17:54 +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 08A418FC0C for ; Tue, 21 Oct 2008 14:17:54 +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 m9LEHr3K012865 for ; Tue, 21 Oct 2008 14:17:53 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LEHrIB012863 for perforce@freebsd.org; Tue, 21 Oct 2008 14:17:53 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 21 Oct 2008 14:17:53 GMT Message-Id: <200810211417.m9LEHrIB012863@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 151659 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, 21 Oct 2008 14:17:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=151659 Change 151659 by nwhitehorn@nwhitehorn_trantor on 2008/10/21 14:16:58 Make the Mambo serial console do nifty things like actually print when it is the console and figure out what baud rate it is running at. This should also make the serial console work on Apple G5s. Affected files ... .. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#3 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_powerpc.c#3 (text) ==== @@ -31,6 +31,8 @@ #include #include +#include +#include #include @@ -53,8 +55,7 @@ int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { - - return ((b1->bsh == b2->bsh) ? 1 : 0); + return ((pmap_kextract(b1->bsh) == pmap_kextract(b2->bsh)) ? 1 : 0); } #ifdef MPC85XX @@ -120,9 +121,11 @@ if (strcmp(buf, "ch-a") == 0) { class = &uart_z8530_class; di->bas.regshft = 4; + di->bas.chan = 1; } else if (strcmp(buf,"serial") == 0) { class = &uart_ns8250_class; di->bas.regshft = 0; + di->bas.chan = 0; } else return (ENXIO); @@ -132,12 +135,13 @@ di->ops = uart_getops(class); - if (OF_getprop(input, "current-speed", &di->bas.rclk, + if (OF_getprop(input, "clock-frequency", &di->bas.rclk, sizeof(di->bas.rclk)) == -1) di->bas.rclk = 230400; - di->bas.chan = 1; + if (OF_getprop(input, "current-speed", &di->baudrate, + sizeof(di->baudrate)) == -1) + di->baudrate = 0; - di->baudrate = 0; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; From owner-p4-projects@FreeBSD.ORG Tue Oct 21 14:48:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90ECC1065672; Tue, 21 Oct 2008 14:48: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 53EC2106566B for ; Tue, 21 Oct 2008 14:48:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 42F228FC23 for ; Tue, 21 Oct 2008 14:48:25 +0000 (UTC) (envelope-from hselasky@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 m9LEmPkI016263 for ; Tue, 21 Oct 2008 14:48:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LEmPgB016261 for perforce@freebsd.org; Tue, 21 Oct 2008 14:48:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 21 Oct 2008 14:48:25 GMT Message-Id: <200810211448.m9LEmPgB016261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151662 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, 21 Oct 2008 14:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=151662 Change 151662 by hselasky@hselasky_laptop001 on 2008/10/21 14:47:25 Fix witness complaints. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#27 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#27 (text+ko) ==== @@ -1303,15 +1303,20 @@ "No free USB device index for new device!\n"); return (NULL); } + if (depth > 0x10) { + device_printf(bus->bdev, + "Invalid device depth!\n"); + return (NULL); + } udev = malloc(sizeof(*udev), M_USB, M_WAITOK | M_ZERO); if (udev == NULL) { return (NULL); } /* initialise our SX-lock */ - sx_init(udev->default_sx, "USB device SX lock"); + sx_init(udev->default_sx, "0123456789ABCDEF - USB device SX lock" + depth); /* initialise our SX-lock */ - sx_init(udev->default_sx + 1, "USB config SX lock"); + sx_init(udev->default_sx + 1, "0123456789ABCDEF - USB config SX lock" + depth); usb2_cv_init(udev->default_cv, "WCTRL"); usb2_cv_init(udev->default_cv + 1, "UGONE"); From owner-p4-projects@FreeBSD.ORG Tue Oct 21 14:49:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B935E1065676; Tue, 21 Oct 2008 14:49:26 +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 7CB601065670 for ; Tue, 21 Oct 2008 14:49:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BB7D8FC14 for ; Tue, 21 Oct 2008 14:49:26 +0000 (UTC) (envelope-from hselasky@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 m9LEnQlq016328 for ; Tue, 21 Oct 2008 14:49:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LEnQbo016326 for perforce@freebsd.org; Tue, 21 Oct 2008 14:49:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 21 Oct 2008 14:49:26 GMT Message-Id: <200810211449.m9LEnQbo016326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151663 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, 21 Oct 2008 14:49:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=151663 Change 151663 by hselasky@hselasky_laptop001 on 2008/10/21 14:48:26 Add support for writing Zero Length Packets. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#36 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#36 (text+ko) ==== @@ -1878,8 +1878,8 @@ /* start write transfer, if not already started */ (f->methods->f_start_write) (f); } - while (uio->uio_resid > 0) { - + /* we allow writing zero length data */ + do { if (f->fs_ep_max == 0) { USB_IF_DEQUEUE(&f->free_q, m); } else { @@ -1931,7 +1931,7 @@ USB_IF_ENQUEUE(&f->used_q, m); (f->methods->f_start_write) (f); } - } + } while (uio->uio_resid > 0); done: mtx_unlock(f->priv_mtx); From owner-p4-projects@FreeBSD.ORG Tue Oct 21 14:54:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 107421065672; Tue, 21 Oct 2008 14:54:32 +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 BF5211065670 for ; Tue, 21 Oct 2008 14:54:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE3E98FC1B for ; Tue, 21 Oct 2008 14:54:31 +0000 (UTC) (envelope-from hselasky@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 m9LEsVxQ016687 for ; Tue, 21 Oct 2008 14:54:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LEsVFs016685 for perforce@freebsd.org; Tue, 21 Oct 2008 14:54:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 21 Oct 2008 14:54:31 GMT Message-Id: <200810211454.m9LEsVFs016685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151664 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, 21 Oct 2008 14:54:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=151664 Change 151664 by hselasky@hselasky_laptop001 on 2008/10/21 14:53:33 Improve UGEN ioctl interface by not returning EBUSY if parameters that should be set do not change value. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#28 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#28 (text+ko) ==== @@ -867,8 +867,9 @@ * Else: No access *------------------------------------------------------------------------*/ static int -ugen_check_request(struct usb2_device_request *req) +ugen_check_request(struct usb2_device *udev, struct usb2_device_request *req) { + struct usb2_pipe *pipe; int error; /* @@ -889,13 +890,21 @@ } } /* - * Clearing the stall this way is not allowed, hence it does - * not update the data toggle value in "struct usb2_pipe" ! + * Special case - handle clearing of stall */ if (req->bmRequestType == UT_WRITE_ENDPOINT) { - error = priv_check(curthread, PRIV_DRIVER); - if (error) { - return (error); + + pipe = usb2_get_pipe_by_addr(udev, req->wIndex[0]); + if (pipe == NULL) { + return (EINVAL); + } + if (usb2_check_thread_perm(udev, curthread, FREAD | FWRITE, + pipe->iface_index, req->wIndex[0] & UE_ADDR)) { + return (EPERM); + } + if ((req->bRequest == UR_CLEAR_FEATURE) && + (UGETW(req->wValue) == UF_ENDPOINT_HALT)) { + usb2_clear_data_toggle(udev, pipe); } } /* TODO: add more checks to verify the interface index */ @@ -914,7 +923,7 @@ /* control endpoint only */ return (EINVAL); } - if (ugen_check_request(&ur->ucr_request)) { + if (ugen_check_request(f->udev, &ur->ucr_request)) { return (EPERM); } len = UGETW(ur->ucr_request.wLength); @@ -1105,7 +1114,7 @@ return (error); } } - if (ugen_check_request(req)) { + if (ugen_check_request(f->udev, req)) { xfer->error = USB_ERR_INVAL; goto complete; } @@ -1652,14 +1661,22 @@ static int ugen_set_short_xfer(struct usb2_fifo *f, void *addr) { + uint8_t t; + + if (*(int *)addr) + t = 1; + else + t = 0; + + if (f->flag_short == t) { + /* same value like before - accept */ + return (0); + } if (f->xfer[0] || f->xfer[1]) { /* cannot change this during transfer */ return (EBUSY); } - if (*(int *)addr) - f->flag_short = 1; - else - f->flag_short = 0; + f->flag_short = t; return (0); } @@ -1688,16 +1705,24 @@ static int ugen_set_buffer_size(struct usb2_fifo *f, void *addr) { + uint32_t t; + + if (*(int *)addr < 1024) + t = 1024; + else if (*(int *)addr < (256 * 1024)) + t = *(int *)addr; + else + t = 256 * 1024; + + if (f->bufsize == t) { + /* same value like before - accept */ + return (0); + } if (f->xfer[0] || f->xfer[1]) { /* cannot change this during transfer */ return (EBUSY); } - if (*(int *)addr < 1024) - f->bufsize = 1024; - else if (*(int *)addr < (256 * 1024)) - f->bufsize = *(int *)addr; - else - f->bufsize = 256 * 1024; + f->bufsize = t; return (0); } From owner-p4-projects@FreeBSD.ORG Tue Oct 21 15:04:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69D941065681; Tue, 21 Oct 2008 15:04: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 2DCB8106567D for ; Tue, 21 Oct 2008 15:04:42 +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 1C9908FC14 for ; Tue, 21 Oct 2008 15:04:42 +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 m9LF4fxd018577 for ; Tue, 21 Oct 2008 15:04:42 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LF4fk4018575 for perforce@freebsd.org; Tue, 21 Oct 2008 15:04:41 GMT (envelope-from nwhitehorn@freebsd.org) Date: Tue, 21 Oct 2008 15:04:41 GMT Message-Id: <200810211504.m9LF4fk4018575@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 151665 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, 21 Oct 2008 15:04:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=151665 Change 151665 by nwhitehorn@nwhitehorn_trantor on 2008/10/21 15:04:40 On 64-bit systems with an enabled hypervisor (e.g. IBM G5 systems), the system becomes extremely unhappy if you suddenly switch hyper-privileged mode off. On a non-partitioned IBM system, you are supposed to keep MSR[HV] = 1 at all times, but our trap handlers zeroed the upper 32 bits of the MSR. Instead, or the current MSR with the new SRR1 value to preserve any stray bits right before we exit the handler. This patch results in booting multi-user under Mambo. And now we return to my regularly scheduled field theory assignment... Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/trap_subr.S#4 (text+ko) ==== @@ -224,6 +224,11 @@ lwz %r3,(savearea+CPUSAVE_SRR0)(%r2); /* restore srr0 */ \ mtsrr0 %r3; \ lwz %r3,(savearea+CPUSAVE_SRR1)(%r2); /* restore srr1 */ \ + \ + /* Make sure HV bit of MSR propagated to SRR1 */ \ + mfmsr %r2; \ + or %r3,%r2,%r3; \ + \ mtsrr1 %r3; \ mfsprg2 %r2; /* restore r2 & r3 */ \ mfsprg3 %r3 From owner-p4-projects@FreeBSD.ORG Tue Oct 21 16:31:10 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9525A1065685; Tue, 21 Oct 2008 16:31:10 +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 560631065683 for ; Tue, 21 Oct 2008 16:31:10 +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 42D338FC28 for ; Tue, 21 Oct 2008 16:31:10 +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 m9LGVANU026344 for ; Tue, 21 Oct 2008 16:31:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LGVA7L026342 for perforce@freebsd.org; Tue, 21 Oct 2008 16:31:10 GMT (envelope-from sam@freebsd.org) Date: Tue, 21 Oct 2008 16:31:10 GMT Message-Id: <200810211631.m9LGVA7L026342@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 151667 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, 21 Oct 2008 16:31:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=151667 Change 151667 by sam@sam_ebb on 2008/10/21 16:30:32 IFC @ 151661 Affected files ... .. //depot/projects/vap/contrib/tcsh/sh.c#3 integrate .. //depot/projects/vap/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/vap/crypto/openssh/loginrec.c#4 integrate .. //depot/projects/vap/crypto/openssh/sshd.c#4 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/vap/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#7 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.zip.uu#2 integrate .. //depot/projects/vap/lib/libc/string/strlcpy.c#3 integrate .. //depot/projects/vap/lib/libc/string/strxfrm.c#4 integrate .. //depot/projects/vap/lib/libutil/flopen.3#3 integrate .. //depot/projects/vap/lib/libutil/flopen.c#3 integrate .. //depot/projects/vap/lib/libutil/login_cap.h#4 integrate .. //depot/projects/vap/lib/libutil/login_class.3#4 integrate .. //depot/projects/vap/lib/libutil/login_class.c#5 integrate .. //depot/projects/vap/lib/libutil/login_times.3#3 integrate .. //depot/projects/vap/lib/libutil/login_times.c#4 integrate .. //depot/projects/vap/lib/libutil/pidfile.3#3 integrate .. //depot/projects/vap/lib/libutil/pidfile.c#3 integrate .. //depot/projects/vap/sbin/geom/class/part/geom_part.c#7 integrate .. //depot/projects/vap/sbin/ifconfig/ifconfig.8#20 integrate .. //depot/projects/vap/share/man/man4/u3g.4#2 integrate .. //depot/projects/vap/share/man/man9/vinvalbuf.9#3 integrate .. //depot/projects/vap/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/vap/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/prof_machdep.c#7 integrate .. //depot/projects/vap/sys/amd64/amd64/tsc.c#5 integrate .. //depot/projects/vap/sys/amd64/include/clock.h#8 integrate .. //depot/projects/vap/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/vap/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/vap/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/vap/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_signal.h#5 integrate .. //depot/projects/vap/sys/contrib/altq/altq/altq_subr.c#7 integrate .. //depot/projects/vap/sys/dev/age/if_age.c#5 integrate .. //depot/projects/vap/sys/dev/age/if_agevar.h#2 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#111 integrate .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#12 integrate .. //depot/projects/vap/sys/geom/part/g_part_pc98.c#6 integrate .. //depot/projects/vap/sys/i386/cpufreq/powernow.c#7 integrate .. //depot/projects/vap/sys/i386/i386/apic_vector.s#6 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/vap/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/vap/sys/i386/i386/trap.c#13 integrate .. //depot/projects/vap/sys/i386/i386/tsc.c#5 integrate .. //depot/projects/vap/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/vap/sys/i386/include/clock.h#9 integrate .. //depot/projects/vap/sys/i386/include/md_var.h#6 integrate .. //depot/projects/vap/sys/i386/include/smp.h#9 integrate .. //depot/projects/vap/sys/i386/include/specialreg.h#9 integrate .. //depot/projects/vap/sys/i386/include/xen/evtchn.h#3 integrate .. //depot/projects/vap/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/vap/sys/i386/include/xen/xen_intr.h#2 integrate .. //depot/projects/vap/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/vap/sys/i386/isa/prof_machdep.c#7 integrate .. //depot/projects/vap/sys/i386/linux/linux.h#8 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/vap/sys/i386/xen/clock.c#3 integrate .. //depot/projects/vap/sys/i386/xen/exception.s#3 integrate .. //depot/projects/vap/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/vap/sys/ia64/ia64/mp_machdep.c#9 integrate .. //depot/projects/vap/sys/kern/kern_time.c#7 integrate .. //depot/projects/vap/sys/kern/subr_stack.c#5 integrate .. //depot/projects/vap/sys/kern/subr_witness.c#21 integrate .. //depot/projects/vap/sys/kern/tty.c#16 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#24 integrate .. //depot/projects/vap/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#21 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#12 integrate .. //depot/projects/vap/sys/sys/param.h#31 integrate .. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#13 integrate .. //depot/projects/vap/tools/regression/lib/libutil/test-flopen.c#3 integrate .. //depot/projects/vap/tools/tools/nanobsd/nanobsd.sh#11 integrate Differences ... ==== //depot/projects/vap/contrib/tcsh/sh.c#3 (text+ko) ==== @@ -462,7 +462,7 @@ else cp2 = cp; if (!(((Strncmp(cp2, STRtty, 3) == 0) && Isalpha(cp2[3])) || - Strstr(cp, STRslptssl) != NULL)) { + Strstr(cp, STRptssl) != NULL)) { if (getenv("DISPLAY") == NULL) { /* NOT on X window shells */ setcopy(STRautologout, STRdefautologout, VAR_READWRITE); ==== //depot/projects/vap/contrib/tcsh/tc.const.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ Char STRhangup[] = { 'h', 'a', 'n', 'g', 'u', 'p', '\0' }; Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' }; Char STRtty[] = { 't', 't', 'y', '\0' }; -Char STRslptssl[] = { '/', 'p', 't', 's', '/', '\0' }; +Char STRptssl[] = { 'p', 't', 's', '/', '\0' }; Char STRany[] = { 'a', 'n', 'y', '\0' }; Char STRstatus[] = { 's', 't', 'a', 't', 'u', 's', '\0' }; Char STR0[] = { '0', '\0' }; ==== //depot/projects/vap/crypto/openssh/loginrec.c#4 (text+ko) ==== @@ -146,7 +146,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.15 2008/08/01 02:48:36 des Exp $"); #include #include @@ -689,8 +688,8 @@ strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username)); # ifdef HAVE_HOST_IN_UTMP - realhostname_sa(ut->ut_host, sizeof ut->ut_host, - &li->hostaddr.sa, li->hostaddr.sa.sa_len); + strncpy(ut->ut_host, li->hostname, + MIN_SIZEOF(ut->ut_host, li->hostname)); # endif # ifdef HAVE_ADDR_IN_UTMP /* this is just a 32-bit IP address */ ==== //depot/projects/vap/crypto/openssh/sshd.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.46 2008/08/01 02:48:36 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.47 2008/10/21 11:58:26 des Exp $"); #include #include @@ -72,6 +72,7 @@ #include #include #include +#include #include #include @@ -238,7 +239,7 @@ u_int session_id2_len = 0; /* record remote hostname or ip */ -u_int utmp_len = MAXHOSTNAMELEN; +u_int utmp_len = UT_HOSTSIZE; /* options.max_startup sized array of fd ints */ int *startup_pipes = NULL; ==== //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.26 2008/06/30 16:19:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.27 2008/10/21 05:08:35 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -444,7 +444,9 @@ archive_entry_set_mtime(entry, zip->mtime, 0); archive_entry_set_ctime(entry, zip->ctime, 0); archive_entry_set_atime(entry, zip->atime, 0); - archive_entry_set_size(entry, zip->uncompressed_size); + /* Set the size only if it's meaningful. */ + if (0 == (zip->flags & ZIP_LENGTH_AT_END)) + archive_entry_set_size(entry, zip->uncompressed_size); zip->entry_bytes_remaining = zip->compressed_size; zip->entry_offset = 0; @@ -573,12 +575,16 @@ } break; } + if (r != ARCHIVE_OK) + return (r); /* Update checksum */ - if (r == ARCHIVE_OK && *size) { + if (*size) zip->entry_crc32 = crc32(zip->entry_crc32, *buff, *size); - } - return (r); + /* Return EOF immediately if this is a non-regular file. */ + if (AE_IFREG != (zip->mode & AE_IFMT)) + return (ARCHIVE_EOF); + return (ARCHIVE_OK); } /* ==== //depot/projects/vap/lib/libarchive/archive_util.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.18 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.19 2008/10/21 12:10:30 des Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -168,6 +168,7 @@ va_start(ap, fmt); archive_string_vsprintf(&(a->error_string), fmt, ap); + va_end(ap); if (error_number > 0) { archive_strcat(&(a->error_string), ": "); #ifdef HAVE_STRERROR_R @@ -184,7 +185,6 @@ archive_strcat(&(a->error_string), errp); } a->error = a->error_string.s; - va_end(ap); } void ==== //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#7 (text+ko) ==== @@ -23,7 +23,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.7 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.8 2008/10/21 05:08:35 kientzle Exp $"); + +/* + * The reference file for this has been manually tweaked so that: + * * file2 has length-at-end but file1 does not + * * file2 has an invalid CRC + */ DEFINE_TEST(test_read_format_zip) { @@ -57,7 +63,8 @@ assertA(0 == archive_read_next_header(a, &ae)); assertEqualString("file2", archive_entry_pathname(ae)); assertEqualInt(1179605932, archive_entry_mtime(ae)); - assertEqualInt(18, archive_entry_size(ae)); + failure("file2 has length-at-end, so we shouldn't see a valid size"); + assertEqualInt(0, archive_entry_size_is_set(ae)); failure("file2 has a bad CRC, so reading to end should fail"); assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); ==== //depot/projects/vap/lib/libarchive/test/test_read_format_zip.zip.uu#2 (text+ko) ==== @@ -1,13 +1,14 @@ -$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.2 2008/06/26 11:50:11 des Exp $ +$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.3 2008/10/21 05:08:35 kientzle Exp $ begin 644 test_read_format_zip.zip -M4$L#!`H``````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1AE5 -M3T95>`0`Z`/H`U!+`P04````"`!O9K,V.C=F/0H````2````!0`5`&9I;&4Q -M550)``-!54]&K%M/1E5X!`#H`^@#RTC-R%8T$@H````2````!0`5`&9I;&4R550)``.L6T]&K%M/1E5X!`#H`^@#RTC- -MR%8T$@H````2````!0`-```````!````I(%Y```` -H9FEL93)55`4``ZQ;3T95>```4$L%!@`````#``,`OP```+L````````` +M4$L#!`H`"````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1M19 +M_4A5>`0`Z`/H`U!+!P@```````````````!02P,$%`````@`;V:S-CHW9CT* +M````$@````4`%0!F:6QE,554"0`#055/1L!9_4A5>`0`Z`/H`\M(S`0`Z`/H`\M(S```4$L!`A<#%``(``@`;V:S-CHW9CT*````$@````4`#0`` +M`````0```.V!1P```&9I;&4Q550%``-!54]&57@``%!+`0(7`Q0`"``(`%IJ +MLS8Z-V8]"@```!(````%``T```````$```#M@8D```!F:6QE,E54!0`#K%M/ +;1E5X``!02P4&``````,``P"_````VP`````` ` end ==== //depot/projects/vap/lib/libc/string/strlcpy.c#3 (text+ko) ==== @@ -1,37 +1,23 @@ -/* $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $ */ +/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */ /* * Copyright (c) 1998 Todd C. Miller - * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.9 2006/06/15 15:56:55 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.10 2008/10/19 10:11:35 delphij Exp $"); #include #include @@ -42,21 +28,18 @@ * Returns strlen(src); if retval >= siz, truncation occurred. */ size_t -strlcpy(dst, src, siz) - char *dst; - const char *src; - size_t siz; +strlcpy(char *dst, const char *src, size_t siz) { char *d = dst; const char *s = src; size_t n = siz; /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) { - do { - if ((*d++ = *s++) == 0) + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') break; - } while (--n != 0); + } } /* Not enough room in dst, add NUL and traverse rest of src */ ==== //depot/projects/vap/lib/libc/string/strxfrm.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.16 2008/10/17 21:29:05 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.17 2008/10/19 09:10:44 delphij Exp $"); #include #include @@ -45,17 +45,8 @@ return 0; } - if (__collate_load_error) { - slen = strlen(src); - if (len > 0) { - if (slen < len) - strcpy(dest, src); - else { - strlcpy(dest, src, len); - } - } - return slen; - } + if (__collate_load_error) + return strlcpy(dest, src, len); slen = 0; prim = sec = 0; ==== //depot/projects/vap/lib/libutil/flopen.3#3 (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/libutil/flopen.3,v 1.6 2007/09/28 15:31:44 obrien Exp $ +.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.7 2008/10/20 18:02:16 des Exp $ .\" .Dd May 10, 2007 .Dt FLOPEN 3 @@ -46,12 +46,13 @@ function opens or creates a file and acquires an exclusive lock on it. It is essentially equivalent with calling .Fn open -with the same parameters followed by -.Fn flock -with an -.Va operation -argument of -.Dv LOCK_EX , +with the same parameters followed by an +.Fn fcntl +.Dv F_SETLK +or +.Dv F_SETLKW +operation with lock type +.Dv F_WRLCK , except that .Fn flopen will attempt to detect and handle races that may occur between opening @@ -86,12 +87,12 @@ Otherwise, it returns -1, and sets .Va errno as described in -.Xr flock 2 +.Xr fcntl 2 and .Xr open 2 . .Sh SEE ALSO .Xr errno 2 , -.Xr flock 2 , +.Xr fcntl 2 , .Xr open 2 .Sh HISTORY The ==== //depot/projects/vap/lib/libutil/flopen.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,14 +26,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/flopen.c,v 1.9 2007/08/03 09:20:28 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/flopen.c,v 1.11 2008/10/20 18:11:30 des Exp $"); -#include #include #include #include #include +#include #include #include @@ -42,6 +42,7 @@ flopen(const char *path, int flags, ...) { int fd, operation, serrno, trunc; + struct flock lock; struct stat sb, fsb; mode_t mode; @@ -54,13 +55,14 @@ va_list ap; va_start(ap, flags); - mode = va_arg(ap, int); /* mode_t promoted to int */ + mode = (mode_t)va_arg(ap, int); /* mode_t promoted to int */ va_end(ap); } - operation = LOCK_EX; - if (flags & O_NONBLOCK) - operation |= LOCK_NB; + memset(&lock, 0, sizeof lock); + lock.l_type = ((flags & O_ACCMODE) == O_RDONLY) ? F_RDLCK : F_WRLCK; + lock.l_whence = SEEK_SET; + operation = (flags & O_NONBLOCK) ? F_SETLK : F_SETLKW; trunc = (flags & O_TRUNC); flags &= ~O_TRUNC; @@ -69,35 +71,35 @@ if ((fd = open(path, flags, mode)) == -1) /* non-existent or no access */ return (-1); - if (flock(fd, operation) == -1) { + if (fcntl(fd, operation, &lock) == -1) { /* unsupported or interrupted */ serrno = errno; - close(fd); + (void)close(fd); errno = serrno; return (-1); } if (stat(path, &sb) == -1) { /* disappeared from under our feet */ - close(fd); + (void)close(fd); continue; } if (fstat(fd, &fsb) == -1) { /* can't happen [tm] */ serrno = errno; - close(fd); + (void)close(fd); errno = serrno; return (-1); } if (sb.st_dev != fsb.st_dev || sb.st_ino != fsb.st_ino) { /* changed under our feet */ - close(fd); + (void)close(fd); continue; } if (trunc && ftruncate(fd, 0) != 0) { /* can't happen [tm] */ serrno = errno; - close(fd); + (void)close(fd); errno = serrno; return (-1); } ==== //depot/projects/vap/lib/libutil/login_cap.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * Low-level routines relating to the user capabilities database * * Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp - * $FreeBSD: src/lib/libutil/login_cap.h,v 1.10 2008/07/25 19:58:14 brooks Exp $ + * $FreeBSD: src/lib/libutil/login_cap.h,v 1.13 2008/10/20 17:17:58 des Exp $ */ #ifndef _LOGIN_CAP_H_ @@ -81,7 +81,7 @@ #define LTM_NONE 0x00 #define LTM_SUN 0x01 #define LTM_MON 0x02 -#define LTM_TUE 0x04 +#define LTM_TUE 0x04 #define LTM_WED 0x08 #define LTM_THU 0x10 #define LTM_FRI 0x20 @@ -104,7 +104,8 @@ login_cap_t *login_getpwclass(const struct passwd *); login_cap_t *login_getuserclass(const struct passwd *); -const char *login_getcapstr(login_cap_t*, const char *, const char *, const char *); +const char *login_getcapstr(login_cap_t *, const char *, const char *, + const char *); const char **login_getcaplist(login_cap_t *, const char *, const char *); const char *login_getstyle(login_cap_t *, const char *, const char *); rlim_t login_getcaptime(login_cap_t *, const char *, rlim_t, rlim_t); @@ -114,45 +115,51 @@ int login_getcapbool(login_cap_t *, const char *, int); const char *login_setcryptfmt(login_cap_t *, const char *, const char *); -int setclasscontext(const char*, unsigned int); -int setusercontext(login_cap_t*, const struct passwd*, uid_t, unsigned int); +int setclasscontext(const char *, unsigned int); +void setclasscpumask(login_cap_t *); +int setusercontext(login_cap_t *, const struct passwd *, uid_t, unsigned int); void setclassresources(login_cap_t *); void setclassenvironment(login_cap_t *, const struct passwd *, int); /* Most of these functions are deprecated */ -int auth_approve(login_cap_t*, const char*, const char*); +int auth_approve(login_cap_t *, const char *, const char *); int auth_check(const char *, const char *, const char *, const char *, int *); void auth_env(void); -char *auth_mkvalue(const char *n); -int auth_response(const char *, const char *, const char *, const char *, int *, const char *, const char *); +char *auth_mkvalue(const char *); +int auth_response(const char *, const char *, const char *, const char *, int *, + const char *, const char *); void auth_rmfiles(void); int auth_scan(int); -int auth_script(const char*, ...); +int auth_script(const char *, ...); int auth_script_data(const char *, int, const char *, ...); char *auth_valud(const char *); int auth_setopt(const char *, const char *); void auth_clropts(void); -void auth_checknologin(login_cap_t*); -int auth_cat(const char*); +void auth_checknologin(login_cap_t *); +int auth_cat(const char *); -int auth_ttyok(login_cap_t*, const char *); -int auth_hostok(login_cap_t*, const char *, char const *); -int auth_timeok(login_cap_t*, time_t); +int auth_ttyok(login_cap_t *, const char *); +int auth_hostok(login_cap_t *, const char *, char const *); +int auth_timeok(login_cap_t *, time_t); struct tm; login_time_t parse_lt(const char *); +int in_lt(const login_time_t *, time_t *); int in_ltm(const login_time_t *, struct tm *, time_t *); int in_ltms(const login_time_t *, struct tm *, time_t *); +int in_lts(const login_time_t *, time_t *); /* helper functions */ int login_strinlist(const char **, char const *, int); int login_str2inlist(const char **, const char *, const char *, int); -login_time_t * login_timelist(login_cap_t *, char const *, int *, login_time_t **); +login_time_t * login_timelist(login_cap_t *, char const *, int *, + login_time_t **); int login_ttyok(login_cap_t *, const char *, const char *, const char *); -int login_hostok(login_cap_t *, const char *, const char *, const char *, const char *); +int login_hostok(login_cap_t *, const char *, const char *, const char *, + const char *); __END_DECLS ==== //depot/projects/vap/lib/libutil/login_class.3#4 (text+ko) ==== @@ -17,13 +17,14 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.20 2008/07/25 19:58:14 brooks Exp $ +.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.21 2008/10/20 17:03:05 des Exp $ .\" -.Dd December 28, 1996 +.Dd October 20, 2008 .Os .Dt LOGIN_CLASS 3 .Sh NAME .Nm setclasscontext , +.Nm setclasscpumask , .Nm setclassenvironment , .Nm setclassresources , .Nm setusercontext @@ -35,12 +36,14 @@ .In login_cap.h .Ft int .Fn setclasscontext "const char *classname" "unsigned int flags" -.Ft int -.Fn setusercontext "login_cap_t *lc" "const struct passwd *pwd" "uid_t uid" "unsigned int flags" .Ft void -.Fn setclassresources "login_cap_t *lc" +.Fn setclasscpumask "login_cap_t *lc" .Ft void .Fn setclassenvironment "login_cap_t *lc" "const struct passwd *pwd" "int paths" +.Ft void +.Fn setclassresources "login_cap_t *lc" +.Ft int +.Fn setusercontext "login_cap_t *lc" "const struct passwd *pwd" "uid_t uid" "unsigned int flags" .Sh DESCRIPTION These functions provide a higher level interface to the login class database than those documented in @@ -162,7 +165,7 @@ The string may contain a comma separated list of numbers and/or number ranges as handled by the .Xr cpuset 1 -utility or the case-insensitive string +utility or the case-insensitive string .Ql default . If the string is .Ql default @@ -182,6 +185,7 @@ respectively. .Pp The +.Fn setclasscpumask , .Fn setclassresources and .Fn setclassenvironment ==== //depot/projects/vap/lib/libutil/login_class.c#5 (text+ko) ==== @@ -23,16 +23,18 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/login_class.c,v 1.27 2008/08/20 08:31:58 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/login_class.c,v 1.29 2008/10/20 16:51:43 des Exp $"); -#include #include -#include -#include -#include #include #include +#include #include +#include +#include + +#include +#include #include #include #include @@ -92,7 +94,7 @@ if (getrlimit(lr->why, &rlim) != 0) syslog(LOG_ERR, "getting %s resource limit: %m", lr->what); else { - char name_cur[40]; + char name_cur[40]; char name_max[40]; rlim_t rcur = rlim.rlim_cur; rlim_t rmax = rlim.rlim_max; @@ -104,7 +106,7 @@ rmax = (*lr->who)(lc, lr->what, rmax, rmax); rlim.rlim_cur = (*lr->who)(lc, name_cur, rcur, rcur); rlim.rlim_max = (*lr->who)(lc, name_max, rmax, rmax); - + if (setrlimit(lr->why, &rlim) == -1) syslog(LOG_WARNING, "set class '%s' resource limit %s: %m", lc->lc_class, lr->what); } @@ -185,7 +187,7 @@ } } - return np; + return (np); } @@ -309,7 +311,7 @@ case DASH: return (0); } - return 1; + return (1); } @@ -368,7 +370,7 @@ rc = lc ? setusercontext(lc, NULL, 0, flags) : -1; login_close(lc); - return rc; + return (rc); } @@ -398,7 +400,7 @@ if (flags & LOGIN_SETCPUMASK) setclasscpumask(lc); } - return mymask; + return (mymask); } @@ -468,13 +470,13 @@ if (setgid(pwd->pw_gid) != 0) { syslog(LOG_ERR, "setgid(%lu): %m", (u_long)pwd->pw_gid); login_close(llc); - return -1; + return (-1); } if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) { syslog(LOG_ERR, "initgroups(%s,%lu): %m", pwd->pw_name, (u_long)pwd->pw_gid); login_close(llc); - return -1; + return (-1); } } @@ -488,7 +490,7 @@ if (mac_from_text(&label, label_string) == -1) { syslog(LOG_ERR, "mac_from_text('%s') for %s: %m", pwd->pw_name, label_string); - return -1; + return (-1); } if (mac_set_proc(label) == -1) error = errno; @@ -498,7 +500,7 @@ if (error != 0) { syslog(LOG_ERR, "mac_set_proc('%s') for %s: %s", label_string, pwd->pw_name, strerror(error)); - return -1; + return (-1); } } } @@ -507,7 +509,7 @@ if ((flags & LOGIN_SETLOGIN) && setlogin(pwd->pw_name) != 0) { syslog(LOG_ERR, "setlogin(%s): %m", pwd->pw_name); login_close(llc); - return -1; + return (-1); } mymask = (flags & LOGIN_SETUMASK) ? umask(LOGIN_DEFUMASK) : 0; @@ -517,7 +519,7 @@ /* This needs to be done after anything that needs root privs */ if ((flags & LOGIN_SETUSER) && setuid(uid) != 0) { syslog(LOG_ERR, "setuid(%lu): %m", (u_long)uid); - return -1; /* Paranoia again */ + return (-1); /* Paranoia again */ } /* @@ -532,6 +534,5 @@ if (flags & LOGIN_SETUMASK) umask(mymask); - return 0; + return (0); } - ==== //depot/projects/vap/lib/libutil/login_times.3#3 (text+ko) ==== @@ -17,15 +17,17 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_times.3,v 1.15 2004/07/02 23:52:19 ru Exp $ +.\" $FreeBSD: src/lib/libutil/login_times.3,v 1.16 2008/10/20 17:17:58 des Exp $ .\" -.Dd January 2, 1997 +.Dd October 20, 2008 .Os .Dt LOGIN_TIMES 3 .Sh NAME .Nm parse_lt , +.Nm in_lt , .Nm in_ltm , -.Nm in_ltms +.Nm in_ltms , +.Nm in_lts .Nd functions for parsing and checking login time periods .Sh LIBRARY .Lb libutil @@ -36,9 +38,13 @@ .Ft login_time_t .Fn parse_lt "const char *str" .Ft int +.Fn in_lt "const login_time_t *lt" "time_t *ends" +.Ft int .Fn in_ltm "const login_time_t *lt" "struct tm *t" "time_t *ends" .Ft int .Fn in_ltms "const login_time_t *lt" "struct tm *t" "time_t *ends" +.Ft int +.Fn in_lts "const login_time_t *lt" "time_t *ends" .Sh DESCRIPTION This set of functions may be used for parsing and checking login and session times against a predefined list of allowed login times as @@ -135,6 +141,18 @@ .Ar lt_dow field set to .Em LTM_NONE . +.Pp +The +.Fn in_lt +and +.Fn in_lts +functions are equivalent to +.Fn in_ltm +and +.Fn in_ltms , +respectively, with the second argument set to the current time as +returned by +.Xr localtime 3 . .Sh RETURN VALUES The .Fn parse_lt ==== //depot/projects/vap/lib/libutil/login_times.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/login_times.c,v 1.12 2008/10/17 21:21:14 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/login_times.c,v 1.15 2008/10/20 17:09:50 des Exp $"); #include #include @@ -34,13 +34,13 @@ static struct { const char *dw; - u_char cn; - u_char fl; + u_char cn; + u_char fl; } dws[] = { { "su", 2, LTM_SUN }, { "mo", 2, LTM_MON }, { "tu", 2, LTM_TUE }, { "we", 2, LTM_WED }, { "th", 2, LTM_THU }, { "fr", 2, LTM_FRI }, - { "sa", 2, LTM_SAT }, { "any",3, LTM_ANY }, { "all",3, LTM_ANY }, + { "sa", 2, LTM_SAT }, { "any",3, LTM_ANY }, { "all",3, LTM_ANY }, { "wk", 2, LTM_WK }, { "wd", 2, LTM_WD }, { NULL, 0, 0 } }; @@ -54,27 +54,28 @@ *t = (u_short)((val / 100) * 60 + (val % 100)); - return ptr; + return (ptr); } login_time_t -parse_lt(const char * str) +parse_lt(const char *str) { login_time_t t; memset(&t, 0, sizeof t); t.lt_dow = LTM_NONE; if (str && *str && strcmp(str, "Never") != 0 && strcmp(str, "None") != 0) { - int i; - login_time_t m = t; + int i; + login_time_t m = t; char *p; - char buf[64]; + char buf[64]; /* Make local copy and force lowercase to simplify parsing */ - p = strlcpy(buf, str, sizeof buf); + strlcpy(buf, str, sizeof buf); for (i = 0; buf[i]; i++) buf[i] = (char)tolower(buf[i]); + p = buf; while (isalpha(*p)) { @@ -101,12 +102,12 @@ t = m; } - return t; + return (t); } int -in_ltm(const login_time_t * ltm, struct tm * tt, time_t * ends) +in_ltm(const login_time_t *ltm, struct tm *tt, time_t *ends) { int rc = 0; @@ -129,32 +130,33 @@ } } } - return rc; + return (rc); } int -in_lt(const login_time_t * ltm, time_t * t) +in_lt(const login_time_t *ltm, time_t *t) { - return in_ltm(ltm, localtime(t), t); + + return (in_ltm(ltm, localtime(t), t)); } int -in_ltms(const login_time_t * ltm, struct tm * tm, time_t * t) +in_ltms(const login_time_t *ltm, struct tm *tm, time_t *t) { int i = 0; while (i < LC_MAXTIMES && ltm[i].lt_dow != LTM_NONE) { if (in_ltm(ltm + i, tm, t)) - return i; + return (i); i++; } - return -1; + return (-1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 21 18:02:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F1CB1065675; Tue, 21 Oct 2008 18:02: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 012E81065670 for ; Tue, 21 Oct 2008 18:02: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 E3BCB8FC13 for ; Tue, 21 Oct 2008 18:02: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 m9LI2gYr043865 for ; Tue, 21 Oct 2008 18:02:42 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LI2gJd043863 for perforce@freebsd.org; Tue, 21 Oct 2008 18:02:42 GMT (envelope-from sam@freebsd.org) Date: Tue, 21 Oct 2008 18:02:42 GMT Message-Id: <200810211802.m9LI2gJd043863@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 151669 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, 21 Oct 2008 18:02:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=151669 Change 151669 by sam@sam_ebb on 2008/10/21 18:01:45 warnx implicitly adds \n, remove explicit ones Affected files ... .. //depot/projects/vap/sbin/ifconfig/regdomain.c#10 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/regdomain.c#10 (text+ko) ==== @@ -319,11 +319,11 @@ /* */ if (iseq(name, "band") && mt->netband != NULL) { if (mt->netband->band == NULL) { - warnx("no freqbands for band at line %ld\n", + warnx("no freqbands for band at line %ld", XML_GetCurrentLineNumber(mt->parser)); } if (mt->netband->maxPower == 0) { - warnx("no maxpower for band at line %ld\n", + warnx("no maxpower for band at line %ld", XML_GetCurrentLineNumber(mt->parser)); } /* default max power w/ DFS to max power */ @@ -340,15 +340,15 @@ /* */ if (iseq(name, "country") && mt->country != NULL) { if (mt->country->code == 0) { - warnx("no ISO cc for country at line %ld\n", + warnx("no ISO cc for country at line %ld", XML_GetCurrentLineNumber(mt->parser)); } if (mt->country->name == NULL) { - warnx("no name for country at line %ld\n", + warnx("no name for country at line %ld", XML_GetCurrentLineNumber(mt->parser)); } if (mt->country->rd == NULL) { - warnx("no regdomain reference for country at line %ld\n", + warnx("no regdomain reference for country at line %ld", XML_GetCurrentLineNumber(mt->parser)); } mt->country = NULL; From owner-p4-projects@FreeBSD.ORG Tue Oct 21 18:04:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5A911065682; Tue, 21 Oct 2008 18:04:45 +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 68A5B1065671 for ; Tue, 21 Oct 2008 18:04:45 +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 56C9D8FC23 for ; Tue, 21 Oct 2008 18:04:45 +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 m9LI4jBP045133 for ; Tue, 21 Oct 2008 18:04:45 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LI4iPP045131 for perforce@freebsd.org; Tue, 21 Oct 2008 18:04:44 GMT (envelope-from sam@freebsd.org) Date: Tue, 21 Oct 2008 18:04:44 GMT Message-Id: <200810211804.m9LI4iPP045131@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 151670 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, 21 Oct 2008 18:04:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=151670 Change 151670 by sam@sam_ebb on 2008/10/21 18:04:00 0 is a potential ISO CC; add a #define and set it to 0xffff for now (must be 16 bits as ieee80211_regdomain struct defines sku's and cc's as uint16_t which may need fixing) Affected files ... .. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#31 edit .. //depot/projects/vap/sbin/ifconfig/regdomain.c#11 edit .. //depot/projects/vap/sbin/ifconfig/regdomain.h#3 edit Differences ... ==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#31 (text+ko) ==== @@ -425,7 +425,7 @@ struct ieee80211_devcaps_req dc; struct regdata *rdp = getregdata(); - if (rd->country != 0) { + if (rd->country != NO_COUNTRY) { const struct country *cc; /* * Check current country seting to make sure it's @@ -456,7 +456,7 @@ errx(1, "country %s (%s) is not usable with " "regdomain %d", cc->isoname, cc->name, rd->regdomain); - else if (rp->cc != 0 && rp->cc != cc) + else if (rp->cc != NULL && rp->cc != cc) errx(1, "country %s (%s) is not usable with " "regdomain %s", cc->isoname, cc->name, rp->name); ==== //depot/projects/vap/sbin/ifconfig/regdomain.c#11 (text+ko) ==== @@ -152,6 +152,7 @@ if (iseq(name, "country") && mt->country == NULL) { mt->country = calloc(1, sizeof(struct country)); mt->country->isoname = strdup(id); + mt->country->code = NO_COUNTRY; mt->nident++; LIST_INSERT_HEAD(&mt->rdp->countries, mt->country, next); return; @@ -339,7 +340,7 @@ } /* */ if (iseq(name, "country") && mt->country != NULL) { - if (mt->country->code == 0) { + if (mt->country->code == NO_COUNTRY) { warnx("no ISO cc for country at line %ld", XML_GetCurrentLineNumber(mt->parser)); } ==== //depot/projects/vap/sbin/ifconfig/regdomain.h#3 (text+ko) ==== @@ -73,6 +73,7 @@ struct country { enum ISOCountryCode code; +#define NO_COUNTRY 0xffff const struct regdomain *rd; const char* isoname; const char* name; From owner-p4-projects@FreeBSD.ORG Tue Oct 21 18:41:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C102A106567C; Tue, 21 Oct 2008 18:41: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 83FBE1065679 for ; Tue, 21 Oct 2008 18:41:22 +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 708D38FC1F for ; Tue, 21 Oct 2008 18:41:22 +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 m9LIfM6O048219 for ; Tue, 21 Oct 2008 18:41:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LIfMSK048217 for perforce@freebsd.org; Tue, 21 Oct 2008 18:41:22 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 21 Oct 2008 18:41:22 GMT Message-Id: <200810211841.m9LIfMSK048217@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 151672 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, 21 Oct 2008 18:41:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=151672 Change 151672 by pgj@kolbasz on 2008/10/21 18:41:00 Add Hungarian translation of chapter "SGML Primer" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#2 (text+ko) ==== @@ -31,338 +31,522 @@ --> - SGML Primer + SGML alapismeretek + + Az FDP keretében készített + dokumentációk többsége az SGML valamilyen + alkalmazásában íródik. Ebben a + fejezetben részletesebben kifejtjük a mögötte + álló fogalmakat, a dokumentumok alapjául + szolgáló források + megértését és + írását, illetve a dokumentáció + forrásainak tanulmányozása során + elõkerülõ különféle + SGML-trükköket. - The majority of FDP documentation is written in applications of - SGML. This chapter explains exactly what that means, how to read - and understand the source to the documentation, and the sort of SGML - tricks you will see used in the documentation. + A bemutatás alapjául szolgáltak Mark + Galassi Get Going With DocBook + címû írásának egyes + részei. - Portions of this section were inspired by Mark Galassi's Get Going With DocBook. - - Overview + Áttekintés - Way back when, electronic text was simple to deal with. Admittedly, - you had to know which character set your document was written in (ASCII, - EBCDIC, or one of a number of others) but that was about it. Text was - text, and what you saw really was what you got. No frills, no - formatting, no intelligence. + A kezdeti idõkben még viszonylag könnyen el + lehetett boldogulni az elektronikus formában tárolt + szövegekkel. Elegendõ volt csupán annyit tudni., + hogy az adott írást milyen + karakterkódolással készítették + (ez lehetett ASCII, EBCDIC vagy éppen valami más). + A szöveg nem volt több mint egyszerû szöveg, + és közvetlenül a végleges + formáját adta. Semmi csel, semmi + formázás, semmi hozzáadott + értelem. - Inevitably, this was not enough. Once you have text in a - machine-usable format, you expect machines to be able to use it and - manipulate it intelligently. You would like to indicate that certain - phrases should be emphasized, or added to a glossary, or be hyperlinks. - You might want filenames to be shown in a typewriter style - font for viewing on screen, but as italics when printed, - or any of a myriad of other options for presentation. + Ezen a fokon aztán elkerülhetetlen módon + tovább kellett lépni. Hiszen ha egyszer a + szöveges információkat egy + számítógép által kezelhetõ + alakban tároljuk, akkor jogosan elvárhatjuk, hogy az + képes legyen felhasználni és + értelmesen feldolgozni. Szeretnénk a szöveg + bizonyos részeit például kiemelni, felvenni + egy szójegyzékbe, vagy éppen + hivatkozással ellátni. Az állományok + neveit a képernyõn + írógépszerû, a + nyomtatásban viszont már + dõltbetûs stílusban + szeretnénk látni, nem is beszélve a + szöveg megjelenésének számtalan + egyéb módjáról. - It was once hoped that Artificial Intelligence (AI) would make this - easy. Your computer would read in the document and automatically - identify key phrases, filenames, text that the reader should type in, - examples, and more. Unfortunately, real life has not happened quite - like that, and our computers require some assistance before they can - meaningfully process our text. + Egy idõben a Mesterséges Intelligencia (MI) + megjelenésétõl várták a + megváltást ezen a területen. A + számítógépünk majd szépen + beolvassa az általunk írt dokumentumot és + magától felismeri a fontosabb kulcsszavakat, + állományneveket, a felhasználó + által begépelendõ szövegeket, a + példákat és így tovább. + Sajnálatosan azonban a valóságban ez + még egyáltalán nem valósult meg, a + számítógépeknek ezért + szükségünk van némi + segítségre a szöveges adatok értelmes + feldolgozásában. - More precisely, they need help identifying what is what. You or I - can look at + Pontosabban úgy fogalmazhatnánk, hogy segítenünk kell nekik az + egyes elemek beazonosításában. Nézzük meg például ezt a + szöveget:
      - To remove /tmp/foo use &man.rm.1;. + Az &man.rm.1; parancs használatával + töröljük a /tmp/ize + állományt: - &prompt.user; rm /tmp/foo + &prompt.user; rm /tmp/ize
      - and easily see which parts are filenames, which are commands to be typed - in, which parts are references to manual pages, and so on. But the - computer processing the document cannot. For this we need - markup.       - - Markup is commonly used to describe adding - value or increasing cost. The term takes on both - these meanings when applied to text. Markup is additional text included - in the document, distinguished from the document's content in some way, - so that programs that process the document can read the markup and use - it when making decisions about the document. Editors can hide the - markup from the user, so the user is not distracted by it. + Emberi szemmel könnyedén fel tudjuk ismerni benne + az állományneveket, a parancsokat, a man oldalak + hivatkozásait és így tovább, azonban a + számítógép erre + önállóan nem képes. Ezért lesz + szükségünk jelölõkre. + + A jelölõ szó eredetijét + (markup) gyakran olyan értelemben használják + mint haszonkulcs vagy kockázati + pótlék. Kevés + elvonatkoztatással ugyanez lényegében + alkalmazható a szövegek esetében is. A + jelölõk a dokumentumban szereplõ + kiegészítõ, hasznos, az + azonosítás kockázatát + csökkentõ, a szöveg többi + részétõl egyértelmûen + megkülönböztethetõ további + szöveges információkat jelentik. Ezek + alapján a programok a dokumentumok feldolgozása + során képesek önállóan meghozni + bizonyos döntéseket. A szövegszerkesztõk el + tudják rejteni ezeket a + többletinformációkat az olvasók + elõl, így azok egyáltalán nem + zavarják õket. + + A jelölõkben tárolt adatok tehát + növelik a dokumentumok hasznát. A + jelölõk hozzáadását, a szöveg + bejelölését értelemszerûen emberek + végzik, hiszen ha erre a + számítógépek is képesek + lennének, akkor nem is lenne rájuk + egyáltalán szükség. Ezzel azonban + pótlékot kell nyújtanunk + (vagyis további költségeket + ráfordítanunk) a dokumentumok + megírásához. + + Az elõzõ példában szereplõ + szöveget ennek megfelelõen a következõ + módon írjuk meg: + + Az &man.rm.1; parancs használatával + töröljük a /tmp/ize + állományt: - The extra information stored in the markup adds - value to the document. Adding the markup to the document - must typically be done by a person—after all, if computers could - recognize the text sufficiently well to add the markup then there would - be no need to add it in the first place. This increases the - cost (i.e., the effort required) to create the - document. +&prompt.user; rm /tmp/ize]]> - The previous example is actually represented in this document like - this: + Láthatjuk, hogy a jelölõk nagyon jól + elkülöníthetõek a szöveg + tartalmától. - To remove /tmp/foo use &man.rm.1;. + A jelölõk használatához + nyilvánvalóan valamilyen módon meg kell + határoznunk, hogy az adott jelölõk mit jelentenek + és hogyan kell azokat értelmezni. A + jelölõk összefogásához tehát + szükségünk van egy ún. + jelölõnyelvre, amely alapján aztán + jelölni fogjuk a dokumentumainkat. -&prompt.user; rm /tmp/foo]]> + Ehhez természetesen egyetlen jelölõnyelv + önmagában még nem feltétlenül lesz + elég. A szaknyelven íródott + dokumentációkhoz igazított + jelölõnyelvvel szemben teljesen másak az + elvárásaink, mint például a receptek + leírásához használt nyelv + esetében, ez pedig megint más, mint amivel verseket + tudunk jelölni. Elõször tehát egy olyan + nyelvet kell megfogalmaznunk, amely ilyen jelölõnyelvek + elõírására használható. + Ezt nevezzük a jelölõnyelvek + jelölõnyelvének, vagyis a + meta-jelölõnyelvnek. - As you can see, the markup is clearly separate from the - content. + Az SGML, avagy Standard Generalized Markup + Language (Szabványos + Általánosított Jelölõnyelv) + pontosan egy ilyen nyelv. Számos jelölõnyelv + készült az SGML segítségével, + többek közt az FDP által leginkább + használt HTML és DocBook. - Obviously, if you are going to use markup you need to define what - your markup means, and how it should be interpreted. You will need a - markup language that you can follow when marking up your - documents. - - Of course, one markup language might not be enough. A markup - language for technical documentation has very different requirements - than a markup language that was to be used for cookery recipes. This, - in turn, would be very different from a markup language used to describe - poetry. What you really need is a first language that you use to write - these other markup languages. A meta markup - language. - - This is exactly what the Standard Generalized Markup Language (SGML) - is. Many markup languages have been written in SGML, including the two - most used by the FDP, HTML and DocBook. - - Each language definition is more properly called a Document Type - Definition (DTD). The DTD specifies the name of the elements that can - be used, what order they appear in (and whether some markup can be used - inside other markup) and related information. A DTD is sometimes - referred to as an application of SGML. + Az egyes nyelvek részletes + leírását hivatalosan + dokumetumtípus-definíciónak + (Documentum Type Definition, + DTD) nevezik. A DTD + felhasználásával adhatjuk meg a + szövegben jelölõként alkalmazható + elemeket, azok sorrendjét (vagy éppen + egymásba ágyazhatóságának + mikéntjét) és a hozzájuk + kapcsolódó egyéb információkat. + A DTD-ket gyakran csak úgy említik mint az SGML + alkalmazásait. - A DTD is a complete - specification of all the elements that are allowed to appear, the order - in which they should appear, which elements are mandatory, which are - optional, and so forth. This makes it possible to write an SGML - parser which reads in both the DTD and a document - which claims to conform to the DTD. The parser can then confirm whether - or not all the elements required by the DTD are in the document in the - right order, and whether there are any errors in the markup. This is - normally referred to as validating the document. + A DTD tartalmazza az + összes felhasználható elem + leírását, azok használatának + sorrendjét, megadja, hogy ezek közül melyeknek + kell szerepelniük, illetve melyek hagyhatóak el + és így tovább. Ennek + köszönhetõen készíthetõ egy + olyan SGML alapján mûködõ + elemzõ, amely a DTD és egy + dokumentum birtokában képes + megállapítani, hogy az adott dokumentum megfelel-e a + DTD által meghatározott szabályoknak: a benne + szereplõ elemek a megfelelõ sorrendben vannak, esetleg + tartalmaznak hibákat. Ezt a lépést nevezik + általában a dokumentum + érvényesítésének. - This processing simply confirms that the choice of elements, their - ordering, and so on, conforms to that listed in the DTD. It does - not check that you have used - appropriate markup for the content. If you - tried to mark up all the filenames in your document as function - names, the parser would not flag this as an error (assuming, of - course, that your DTD defines elements for filenames and functions, - and that they are allowed to appear in the same place). + Az ellenõrzés folyamán egyszerûen + annyi történik, hogy az elemzõ a megadott DTD + alapján jóváhagyja a dokumentumban + feltüntetett elemeket, azok rendezettségét + és a többit. A jelölõk + helyes használatát azonban + nem vizsgálja. Ha éppen + függvénynévként jelöljük be + a szövegben megjelenõ állományok neveit, + akkor az elemezõ ezt nem fogja hibának tekinteni + (ekkor természetesen feltételezzük, hogy a + DTD definiálja az állomány- és + függvénynevek jelölésére alkalmas + elemeket, illetve ezek ugyanazokon a helyeken + szerepelhetnek). - - It is likely that most of your contributions to the Documentation - Project will consist of content marked up in either HTML or DocBook, - rather than alterations to the DTDs. For this reason this book will - not touch on how to write a DTD. + + A Dokumentációs Projekt számára + beküldött munkáinkban jó eséllyel a + HTML vagy a DocBook nyelvek valamelyike szerint kell + dokumentumokat megjelölnünk, és nem kell a DTD + módosításával foglalkoznunk. + Ennélfogva ez a leírás sem tér ki a + DTD írásának részleteire.       - + - Elements, tags, and attributes + Elemek, címkék és + tulajdonságok - All the DTDs written in SGML share certain characteristics. This is - hardly surprising, as the philosophy behind SGML will inevitably show - through. One of the most obvious manifestations of this philosophy is - that of content and - elements. + Az SGML használatával készített + dokumentumtípus-definíciók mindegyikének + vannak közös jellemzõi. Ez viszont aligha lesz + számunkra meglepõ, ahogy majd fokozatosan + megismerkedünk az SGML kialakítása + mögött álló alapvetõ gondolatokkal. + Ezek közül a legkézenfekvõbbek a + tartalom és az + elem. - Your documentation (whether it is a single web page, or a lengthy - book) is considered to consist of content. This content is then divided - (and further subdivided) into elements. The purpose of adding markup is - to name and identify the boundaries of these elements for further - processing. + A dokumentáció minden esetben (legyen az most + egy normál honlap vagy éppen egy vaskos könyv) + rendelkezik valamilyen tartalommal, amelyet aztán + tovább (esetleg még tovább) osztunk elemekre. + A jelölõk elhelyezésének ezen elemek + határainak kijelölésében és + elnevezésében van szerepe a feldolgozás + késõbbi szakaszaiban. - For example, consider a typical book. At the very top level, the - book is itself an element. This book element obviously - contains chapters, which can be considered to be elements in their own - right. Each chapter will contain more elements, such as paragraphs, - quotations, and footnotes. Each paragraph might contain further - elements, identifying content that was direct speech, or the name of a - character in the story. + Ehhez példaként tekintsünk egy + hagyományos könyvet. A legfelsõ szinten ez a + könyv önmagában egy elemet képvisel. Ez a + könyv elem aztán magától + értetõdõ módon tartalmaz fejezeteket, + amelyek szintén önálló elemeknek + tekinthetõek. Minden ilyen fejezet további elemeket + foglal magában, például bekezdéseket, + idézeteket és lábjegyzeteket. Minden egyes + bekezdésben találhatunk újabb elemeket, + amelyek elárulják nekünk, hogy a bennük + szereplõ szövegben melyik részében + beszélnek egymással a szereplõk, vagy + éppen hogy hívják az egyes + karaktereket. - You might like to think of this as chunking content. - At the very top level you have one chunk, the book. Look a little - deeper, and you have more chunks, the individual chapters. These are - chunked further into paragraphs, footnotes, character names, and so - on. + Az egészet úgy képzelhetjük el mint + a tartalom feldarabolását. A + legfelsõ szinten adott egy darab, maga a könyv. Ahogy + haladunk kicsivel lentebb, újabb darabokat találunk, + a fejezeteket. Ezeket aztán tovább bomlanak + bekezdésekre, lábjegyzetekre, a karakterek neveire + és a többi. - Notice how you can make this differentiation between different - elements of the content without resorting to any SGML terms. It really - is surprisingly straightforward. You could do this with a highlighter - pen and a printout of the book, using different colors to indicate - different chunks of content. + Meglepõ, hogy az SGML lehetõségeinek + igénybevétele nélkül milyen könnyen + különbséget tudunk tenni az egyes elemek + közt. Ehhez valójában elegendõ a + könyv nyomtatott változata, néhány + különbözõ színû kiemelõ, + amelyekkel aztán bejelöljük a tartalom egyes + részeit. - Of course, we do not have an electronic highlighter pen, so we need - some other way of indicating which element each piece of content belongs - to. In languages written in SGML (HTML, DocBook, et al) this is done by - means of tags. + Sajnos a kiemelõknek nem létezik elektronikus + változata, ezért találnunk kell valamilyen + egyéb módot a tartalom egyes részeinek + megjelölésére. Az SGML-ben megfogalmazott + nyelvek (HTML, DocBook és társaik) ezt + címkékkel oldják + meg. - A tag is used to identify where a particular element starts, and - where the element ends. The tag is not part of the element - itself. Because each DTD was normally written to mark up - specific types of information, each one will recognize different - elements, and will therefore have different names for the tags. + A címkékkel mondhatjuk meg hol kezdõdnek + és hol fejezõdnek be az egyes elemek. A + címke nem az elem része. Mivel a DTD + általában azért készül, hogy a + szövegben adott típusú + információkat tudjunk jelölni, adott + típusú elemeket fog elfogadni, ezért ezeknek + megfelelõen kell címkéket + létrehoznunk. - For an element called element-name the - start tag will normally look like - <element-name>. The - corresponding closing tag for this element is - </element-name>. + Egy elem elemhez tartozó + kezdõcímke általános alakja az + <elem>. Az + hozzátartozó zárócímke pedig az + </elem>. - Using an element (start and end tags) + Elem (kezdõ- és + zárócímkék) használata + + A HTML-ben a bekezdéseket a p + (mint paragrafus) elemmel jelölhetjük. Ehhez az elemhez + tartozik kezdõ- és + zárócímke. - HTML has an element for indicating that the content enclosed by - the element is a paragraph, called p. This - element has both start and end tags. - - This is a paragraph. It starts with the start tag for - the 'p' element, and it will end with the end tag for the 'p' - element.

      + ]]>Ez egy bekezdés. A 'p' elem kezdõcímkéjétõl indul és a 'p' + zárócímkéjénél fejezdõdik be. -

      This is another paragraph. But this one is much shorter.

      ]]>       +

      ]]>Ez meg egy másik bekezdés. Ez viszont már rövidebb.]]> - Not all elements require an end tag. Some elements have no content. - For example, in HTML you can indicate that you want a horizontal line to - appear in the document. Obviously, this line has no content, so just - the start tag is required for this element. + Nem mindegyik elemnél kell + zárócímkét használnunk, egyes + elemekhez ugyanis nem járul semmilyen tartalom. + Például egy HTML állományban + jelölhetjük, hogy legyen a dokumentumban egy + vízszintes elválasztó. Ehhez a vonalhoz + értelemszerûen nem kapcsolódik tartalom, + ezért elég egy kezdõcímkét + beszúrni. - Using an element (start tag only) + Elem (csak kezdõcímke) + használata - HTML has an element for indicating a horizontal rule, called - hr. This element does not wrap content, so only - has a start tag. + A HTML-ben van egy hr nevû elem, + amellyel vízszintes elválasztókat (horizontal + rule) jelölhetünk. Ennek az elemnek nincs tartalma, + ezért csak kezdõcímkével + rendelkezik. - This is a paragraph.

      + ]]>Ez itt egy bekezdés.
      -

      This is another paragraph. A horizontal rule separates this - from the previous paragraph.

      ]]>       +

      ]]>Ez pedig egy másik bekezdés. Az elõzõ bekezdéstõl egy vízszintes + vonal választja el.]]> - - If it is not obvious by now, elements can contain other elements. - In the book example earlier, the book element contained all the chapter - elements, which in turn contained all the paragraph elements, and so - on. + + Ha eddig még nem sejtettük volna, + megemlítjük, hogy az elemek természetesen + elemeket is tartalmazhatnak. A korábbi könyves + példánkban a könyv elem magában foglalta + az összes fejezet elemet, amelyek pedig a bekezdés + elemeket és így tovább. - Elements within elements; <sgmltag>em</sgmltag> - - This is a simple paragraph where some - of the words have been emphasized.

      ]]>       + Elemek elemekben, az <sgmltag>em</sgmltag> elem + + ]]>Ez egy egyszerû ]]>bekezdés]]>, amelyben néhány ]]>szót]]> + szépen ]]>kiemeltünk.

      ]]>             - - The DTD will specify the rules detailing which elements can contain - other elements, and exactly what they can contain. + + A DTD pontosan tartalmazza mely elemek tartalmazhatnak + további elemeket, valamint az elemek egymásba + ágyazhatóságának + szabályait. - People often confuse the terms tags and elements, and use the - terms as if they were interchangeable. They are not. + Az emberek gyakran összetévesztik a + címkéket az általuk jelölt elemekkel, + és egymás szinonímájaként + használják ezeket a kifejezéseket. Ez + viszont helytelen. - An element is a conceptual part of your document. An element has - a defined start and end. The tags mark where the element starts and - end. + A dokumentumokat elemekbõl építjük + fel. Minden elem elõre meghatározott módon + kezdõdik és fejezõdik be. Az elemek + kezdetét és végét + címkék jelölik. - When this document (or anyone else knowledgeable about SGML) refers - to the <p> tag they mean the literal text - consisting of the three characters <, - p, and >. But the phrase - the <p> element refers to the whole - element. + Amikor ez a dokumentum (vagy bárki, az SGML + használatában járatos személy) + a p címkére + hivatkozik, akkor ez alatt a <, + p, > karakterekbõl + álló sorozatot érti. Ezzel szemben viszont + a p a teljes elemre + vonatkozik. - This distinction is very subtle. But keep it - in mind. + Ez egy nagyon kicsi + eltérés, de mindig tartsuk észben! - - Elements can have attributes. An attribute has a name and a value, - and is used for adding extra information to the element. This might be - information that indicates how the content should be rendered, or might - be something that uniquely identifies that occurrence of the element, or - it might be something else. + + Az elemeknek lehetnek tulajdonságaik. A + tulajdonságokat nevek és értékek + párosai alkotják, segítségükkel + az elemhez fejthetünk ki további + információkat. Ez lehet az adott elem által + jelölt tartalom megjelenítésére + vonatkozó utasítás, esetleg az elem + valamilyen azonosítója vagy valami + más. - An element's attributes are written inside the - start tag for that element, and take the form - attribute-name="attribute-value". + Az elemek tulajdonságait mindig az adott elem kezdõcímkéjén + belül soroljuk fel, + tulajdonság="érték" + alakban. - In sufficiently recent versions of HTML, the p - element has an attribute called align, which suggests - an alignment (justification) for the paragraph to the program displaying - the HTML. + A HTML újabb változataiban például + a p elemnek van egy align + tulajdonsága, amely a HTML megjelenítése + során javasolja, hogy az általa jelölt + bekezdést merre igazítsuk. - The align attribute can take one of four defined - values, left, center, - right and justify. If the - attribute is not specified then the default is - left. + Ez az align tulajdonság négy + elõre meghatározott érték + valamelyikét kaphatja meg: left (balra + zárt), center (középre + zárt), right (jobbra zárt) + és justify (sorkizárt). Ha nem + adjuk meg a tulajdonság értékét a + kezdõcímkében, akkor + alapértelmezés szerint left + lesz. - Using an element with an attribute - - The inclusion of the align attribute - on this paragraph was superfluous, since the default is left.

      + Tulajdonság használata elemben + + ]]>Az 'align' tulajdonság ebben a bekezdésben igazából + teljesen felesleges, hiszen alapértelmezés szerint is balra zárt + lenne.]]> -

      This may appear in the center.

      ]]>       +]]>Ennek viszont már középre kellene kerülnie.]]>             - - Some attributes will only take specific values, such as - left or justify. Others will - allow you to enter anything you want. If you need to include quotes - (") within an attribute then use single quotes around - the attribute value. + + Egyes tulajdonságok csak adott értékeket + vehetnek fel, mint például left + vagy justify, másoknál viszont + lényegében bármit megadhatunk. Ha a + tulajdonság értékének + megfogalmazása során idézõjeleket + (") is használni akarunk, akkor az + egész kifejezést tegyük egyszeres + idézõjelbe. - Single quotes around attributes - - I am on the right!

      ]]>       + A tulajdonságok értékének + megadása egyszeres idézõjellel + + ]]>Jobbra zárt!]]>       - Sometimes you do not need to use quotes around attribute values at - all. However, the rules for doing this are subtle, and it is far - simpler just to always quote your attribute - values. + Elõfordulhat, hogy az érték + megadásakor egyáltalán nem kell semmilyen + idézõjelet használni. Ennek szabályai + viszont nagyon halványak, ezért sokkal + egyszerûbb mindig idézõjelbe + tenni a tulajdonságok értékeit. - The information on attributes, elements, and tags is stored - in SGML catalogs. The various Documentation Project tools use - these catalog files to validate your work. The tools in - textproc/docproj include a variety of SGML catalog - files. The FreeBSD Documentation Project includes its own set - of catalog files. Your tools need to know about both sorts of - catalog files. + Az elemekhez, címkékhez és + tulajdonságokhoz tartozó információk + SGML katalógusokban kerülnek tárolásra. + A Dokumentációs Projektben használt + eszközök ilyen katalógusok mentén + nézik át a munkánkat. A textproc/docproj csomagban a + segédprogramok mellett rengeteg ilyen + SGML-katalógust találhatunk. A &os; + Dokumentációs Projektnek is vannak saját + katalógusai. Az alkalmazott eszközöknek mind a + két fajta katalógusokat ismerniük kell. - For you to do… + Egy kis gyakorlás… + + A szakaszban szereplõ példák + kipróbálásához + telepítenünk kell bizonyos szoftvereket, illetve + beállítani egy környezeti + változó értékét. - In order to run the examples in this document you will need to - install some software on your system and ensure that an environment - variable is set correctly. - - Download and install textproc/docproj - from the FreeBSD ports system. This is a - meta-port that should download and install - all of the programs and supporting files that are used by the - Documentation Project. + Töltsük le és telepítsük a + textproc/docproj portot a + &os; Portgyûjteményébõl. Ez + portoknak a portja, tehát egy + metaport, így a + Dokumentációs Projektben használt + összes eszköz rajta keresztül + letöltõdik és + telepítõdik. - - - Add lines to your shell startup files to set - SGML_CATALOG_FILES. (If you are not working - on the English version of the documentation, you will want - to substitute the correct directory for your - language.) - + + + A parancssorunk konfigurációs + állományában állítsuk be az + SGML_CATALOG_FILES környezeti + változó értékét. + (Amennyiben nem az angol nyelvû + dokumentációval dolgozunk, itt érdemes + a nyelvünknek megfelelõ könyvtárakat + megadni.) + - <filename>.profile</filename>, for &man.sh.1; and - &man.bash.1; users - + Minta <filename>.profile</filename> + állomány &man.sh.1; és &man.bash.1; + parancssorokhoz + SGML_ROOT=/usr/local/share/sgml SGML_CATALOG_FILES=${SGML_ROOT}/jade/catalog SGML_CATALOG_FILES=${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES @@ -374,9 +558,10 @@ - <filename>.cshrc</filename>, for &man.csh.1; and - &man.tcsh.1; users - + Minta <filename>.cshrc</filename> + állomány &man.csh.1; és &man.tcsh.1; + parancssorokhoz + setenv SGML_ROOT /usr/local/share/sgml setenv SGML_CATALOG_FILES ${SGML_ROOT}/jade/catalog setenv SGML_CATALOG_FILES ${SGML_ROOT}/docbook/4.1/catalog:$SGML_CATALOG_FILES @@ -384,215 +569,278 @@ setenv SGML_CATALOG_FILES ${SGML_ROOT}/iso8879/catalog:$SGML_CATALOG_FILES setenv SGML_CATALOG_FILES /usr/doc/share/sgml/catalog:$SGML_CATALOG_FILES setenv SGML_CATALOG_FILES /usr/doc/en_US.ISO8859-1/share/sgml/catalog:$SGML_CATALOG_FILES - - - Then either log out, and log back in again, or run those - commands from the command line to set the variable values. + + + A módosítások + elvégzése után vagy jelentkezzük ki + majd be, vagy pedig adjuk ki a közvetlenül + parancssorban az adott parancsokat. - + - Create example.sgml, and enter the - following text: + Hozzunk létre egy + próba.sgml nevû + állományt, és írjuk bele az + alábbi szöveget: - - An example HTML file + + ]]>Próba HTML állomány<![ CDATA [ - -

      This is a paragraph containing some text.

      + +

      ]]>Ebben a bekezdésben legyen valamennyi szöveg. -

      This paragraph contains some more text.

      +

      ]]>Az utána következõ bekezdésbe is rakjunk még valamennyi szöveget. -

      This paragraph might be right-justified.

      - +

      ]]>Ennek a bekezdésnek jobbra zártnak kellene lennie. + ]]> - Try to validate this file using an SGML parser. + Próbáljuk meg az állományt + érvényesíteni valamelyik SGML + elemezõvel. - Part of textproc/docproj is the - nsgmls validating - parser. Normally, nsgmls reads in a document - marked up according to an SGML DTD and returns a copy of the - document's Element Structure Information Set (ESIS, but that is - not important right now). + A textproc/docproj + csomagnak része az nsgmls + nevû érvényesítést végzõ elemezõ. + Az nsgmls beolvas egy tetszõleges + SGML DTD szerint definiált elemekkel jelölt + dokumentumot és ebbõl elkészíti a + hozzátartozó + elemstruktúra-információs halmazt + (Element Structure Information Set, ESIS, de ezzel itt most + nem foglalkozunk). - However, when nsgmls is given the - parameter, nsgmls will suppress its normal output, and - just print error messages. This makes it a useful way to check to - see if your document is valid or not. + Ha viszont az nsgmls parancsnak + megadjuk a paramétert, akkor nem + generál tényleges eredményt, + csupán a hibaüzenetek jeleníti meg. + Ennek köszönhetõen könnyen + ellenõrizni tudjuk, hogy az általunk + készített dokumentum érvényes + vagy sem. - Use nsgmls to check that your document is - valid: + Az nsgmls parancs + használatával tehát + ellenõrizzük az imént létrehozott + dokumentumunk + érvényességét: - &prompt.user; nsgmls -s example.sgml + &prompt.user; nsgmls -s próba.sgml - As you will see, nsgmls returns without displaying any - output. This means that your document validated - successfully. + Láthatjuk, hogy az nsgmls nem + jelez semmiféle hibát, ami azt jelenti, hogy a + dokumentumunk valóban érvényes. - See what happens when required elements are omitted. Try - removing the title and - /title tags, and re-run the validation. + Nézzük meg mi történik akkor, ha + kihagyjuk a kötelezõ elemeket. + Töröljük például a + title és /title + címkéket, majd próbáljuk meg + újra az + érvényesítést. - &prompt.user; nsgmls -s example.sgml -nsgmls:example.sgml:5:4:E: character data is not allowed here -nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished + &prompt.user; nsgmls -s próba.sgml +nsgmls:próba.sgml:5:4:E: character data is not allowed here +nsgmls:próba.sgml:6:8:E: end tag for "HEAD" which is not finished - The error output from nsgmls is organized into - colon-separated groups, or columns. + Az nsgmls által + generált hibaüzenetek kettõspontokkal + tagolt csoportokba vagy oszlopokba + sorolhatóak. - Column - Meaning + Oszlop + Jelentés - + 1 - The name of the program generating the error. This - will always be nsgmls. + A hibát jelzõ program neve. Ez + minden esetben az nsgmls. 2 - The name of the file that contains the error. + A hibát tartalmazó + állomány neve. 3 - Line number where the error appears. + A hibát tartalmazó sor + száma. 4 - Column number where the error appears. + A hibát tartalmazó oszlop + száma. 5 - A one letter code indicating the nature of the - message. I indicates an informational - message, W is for warnings, and - E is for errors - It is not always the fifth column either. - nsgmls -sv displays + A generált üzenet jellegét + megadó egybetûs kód. Az + I információt, a + W figyelmeztetést, az + E hibát + + Ez nem minden esetben az ötödik + oszlopban szerepel. Az nsgmls + -sv például az nsgmls:I: SP version "1.3" - (depending on the installed version). As you can see, - this is an informational message. - , and X is for - cross-references. As you can see, these messages are - errors. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Oct 21 18:57:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 997AB1065676; Tue, 21 Oct 2008 18:57:39 +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 5D6561065673 for ; Tue, 21 Oct 2008 18:57: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 4BDE18FC12 for ; Tue, 21 Oct 2008 18:57: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 m9LIvd9g049538 for ; Tue, 21 Oct 2008 18:57:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LIvdmP049536 for perforce@freebsd.org; Tue, 21 Oct 2008 18:57:39 GMT (envelope-from sam@freebsd.org) Date: Tue, 21 Oct 2008 18:57:39 GMT Message-Id: <200810211857.m9LIvdmP049536@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 151675 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, 21 Oct 2008 18:57:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=151675 Change 151675 by sam@sam_ebb on 2008/10/21 18:57:18 add debug support for setregdomain work under the "ioctl" knob Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#14 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#14 (text+ko) ==== @@ -327,12 +327,23 @@ int error, i; if (reg->rd.location != 'I' && reg->rd.location != 'O' && - reg->rd.location != ' ') + reg->rd.location != ' ') { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL, + "%s: invalid location 0x%x\n", __func__, reg->rd.location); return EINVAL; - if (reg->rd.isocc[0] == '\0' || reg->rd.isocc[1] == '\0') + } + if (reg->rd.isocc[0] == '\0' || reg->rd.isocc[1] == '\0') { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL, + "%s: invalid iso cc 0x%x:0x%x\n", __func__, + reg->rd.isocc[0], reg->rd.isocc[1]); return EINVAL; - if (reg->chaninfo.ic_nchans >= IEEE80211_CHAN_MAX) + } + if (reg->chaninfo.ic_nchans >= IEEE80211_CHAN_MAX) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL, + "%s: too many channels %u, max %u\n", __func__, + reg->chaninfo.ic_nchans, IEEE80211_CHAN_MAX); return EINVAL; + } /* * Calculate freq<->IEEE mapping and default max tx power * for channels not setup. The driver can override these @@ -340,10 +351,18 @@ */ for (i = 0; i < reg->chaninfo.ic_nchans; i++) { c = ®->chaninfo.ic_chans[i]; - if (c->ic_freq == 0 || c->ic_flags == 0) + if (c->ic_freq == 0 || c->ic_flags == 0) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL, + "%s: invalid channel spec at [%u]\n", __func__, i); return EINVAL; - if (c->ic_maxregpower == 0) + } + if (c->ic_maxregpower == 0) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL, + "%s: invalid channel spec, zero maxregpower, " + "freq %u flags 0x%x\n", __func__, + c->ic_freq, c->ic_flags); return EINVAL; + } if (c->ic_ieee == 0) c->ic_ieee = ieee80211_mhz2ieee(c->ic_freq,c->ic_flags); if (IEEE80211_IS_CHAN_HT40(c) && c->ic_extieee == 0) @@ -358,11 +377,15 @@ reg->chaninfo.ic_nchans, reg->chaninfo.ic_chans); if (error != 0) { IEEE80211_UNLOCK(ic); + IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL, + "%s: driver rejected request, error %u\n", __func__, error); return error; } /* XXX bandaid; a running vap will likely crash */ if (!allvapsdown(ic)) { IEEE80211_UNLOCK(ic); + IEEE80211_DPRINTF(vap, IEEE80211_MSG_IOCTL, + "%s: reject: vaps are running\n", __func__); return EBUSY; } /* From owner-p4-projects@FreeBSD.ORG Tue Oct 21 18:58:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C386D1065699; Tue, 21 Oct 2008 18:58: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 8563C106567D for ; Tue, 21 Oct 2008 18:58: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 747078FC1B for ; Tue, 21 Oct 2008 18:58: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 m9LIweLj049606 for ; Tue, 21 Oct 2008 18:58:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9LIweKR049604 for perforce@freebsd.org; Tue, 21 Oct 2008 18:58:40 GMT (envelope-from sam@freebsd.org) Date: Tue, 21 Oct 2008 18:58:40 GMT Message-Id: <200810211858.m9LIweKR049604@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 151676 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, 21 Oct 2008 18:58:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=151676 Change 151676 by sam@sam_ebb on 2008/10/21 18:58:03 o correct debug sku o add debug country code Affected files ... .. //depot/projects/vap/etc/regdomain.xml#5 edit Differences ... ==== //depot/projects/vap/etc/regdomain.xml#5 (text+ko) ==== @@ -39,7 +39,7 @@ --> DEBUG - 0 + 0x1ff @@ -1478,6 +1478,10 @@ 716 Zimbabwe + + + 0 Debug + @@ -494,7 +494,7 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo - /dev/dsp1.0 should be replaced with the + /dev/dsp1.0 should be replaced with the dsp device entry on your system. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.54 2008/10/11 12:40:34 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.55 2008/10/21 07:28:34 remko Exp $ @@ -2938,4 +2938,15 @@ adam@adammccarthy.co.uk + + + PontoSI + http://www.pontosi.pt + + PontoSI is portuguese company based in Vila Nova de Gaia. We are + specialized in FreeBSD and OpenBSD solutions and services. + Please visit our website at http://www.pontosi.pt or contact us + via email geral@pontosi.pt + + ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#6 (text+ko) ==== @@ -10,10 +10,34 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.57 2008/09/05 01:00:56 murray Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.58 2008/10/21 12:41:23 rwatson Exp $ + + EuroBSDCon 2009 + http://2009.eurobsdcon.org/ + + 2009 + 9 + 17 + + + 2009 + 9 + 19 + + + UK + Cambridge + Universe of Cambridge + + + The ninth annual European BSD Confernece will take place + in Cambridge, England in September, 2009, and include a technical + track, tutorials, and FreeBSD developer summit. + + MeetBSD California 2008 http://meetbsd.com/ From owner-p4-projects@FreeBSD.ORG Wed Oct 22 13:59:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6D141065748; Wed, 22 Oct 2008 13:59: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 6912E1065743 for ; Wed, 22 Oct 2008 13:59:27 +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 3D8EE8FC40 for ; Wed, 22 Oct 2008 13:59:27 +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 m9MDxRdX018916 for ; Wed, 22 Oct 2008 13:59:27 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MDxRh4018914 for perforce@freebsd.org; Wed, 22 Oct 2008 13:59:27 GMT (envelope-from nwhitehorn@freebsd.org) Date: Wed, 22 Oct 2008 13:59:27 GMT Message-Id: <200810221359.m9MDxRh4018914@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 151719 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, 22 Oct 2008 13:59:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=151719 Change 151719 by nwhitehorn@nwhitehorn_trantor on 2008/10/22 13:58:42 Mambo configuration files, in case anyone else wants to play with this. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/conf/MAMBO#1 add .. //depot/projects/ppc-g5/sys/powerpc/mambo/devices.tcl#1 add .. //depot/projects/ppc-g5/sys/powerpc/mambo/devtree.tcl#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Oct 22 16:40:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9971910656A6; Wed, 22 Oct 2008 16:40: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 5BF4C1065682 for ; Wed, 22 Oct 2008 16:40:11 +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 4A28E8FC1A for ; Wed, 22 Oct 2008 16:40:11 +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 m9MGeBSl038481 for ; Wed, 22 Oct 2008 16:40:11 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MGeBYC038479 for perforce@freebsd.org; Wed, 22 Oct 2008 16:40:11 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 22 Oct 2008 16:40:11 GMT Message-Id: <200810221640.m9MGeBYC038479@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 151729 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, 22 Oct 2008 16:40:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=151729 Change 151729 by rene@rene_self on 2008/10/22 16:39:24 MFen multimedia 1.129 -> 1.130 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.27 2005/12/10 23:40:57 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml - %SRCID% 1.129 + %SRCID% 1.130 --> @@ -557,8 +557,8 @@ Playing MPEG stream from Foobar-GreatestHits.mp3 ... MPEG 1.0 layer III, 128 kbit/s, 44100 Hz joint-stereo - /dev/dsp1.0 - dient gewijzigd te worden in het dsp apparaatingang op uw systeem. + /dev/dsp1.0 + dient gewijzigd te worden in de apparaatingang dsp op uw systeem. From owner-p4-projects@FreeBSD.ORG Wed Oct 22 17:15:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C90CE1065672; Wed, 22 Oct 2008 17:15:47 +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 8D98A106566B for ; Wed, 22 Oct 2008 17:15:47 +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 7C2E98FC0C for ; Wed, 22 Oct 2008 17:15:47 +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 m9MHFlsO052401 for ; Wed, 22 Oct 2008 17:15:47 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MHFlgC052399 for perforce@freebsd.org; Wed, 22 Oct 2008 17:15:47 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 22 Oct 2008 17:15:47 GMT Message-Id: <200810221715.m9MHFlgC052399@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 151731 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, 22 Oct 2008 17:15:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=151731 Change 151731 by ed@ed_dull on 2008/10/22 17:15:37 WIP on the ttydisc_rint(9) manpage. Commit it to make sure it won't get lost. Affected files ... .. //depot/projects/mpsafetty/share/man/man9/ttydisc_rint.9#3 edit Differences ... ==== //depot/projects/mpsafetty/share/man/man9/ttydisc_rint.9#3 (text+ko) ==== @@ -47,6 +47,18 @@ .Ft size_t .Fn ttydisc_rint_poll "struct tty *tp" .Sh DESCRIPTION +The family of +.Fn ttydisc_rint +functions can be used to deliver new data to a TTY. +This implementation supports two different methods to deliver data to +the TTY. +The +.Fn ttydisc_rint +routine is often referred to as the slow path, while +.Fn ttydisc_rint_bypass +provides an optimised input path. +.Fn ttydisc_can_bypass is used by drivers to determine whether they are +allowed to take the optimised input path. .Sh SEE ALSO .Xr tty_alloc 9 , .Xr tty_lock 9 , From owner-p4-projects@FreeBSD.ORG Wed Oct 22 17:22:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92CCD106569B; Wed, 22 Oct 2008 17:22:55 +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 5595E1065683 for ; Wed, 22 Oct 2008 17:22:55 +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 41CD68FC12 for ; Wed, 22 Oct 2008 17:22:55 +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 m9MHMtYd052914 for ; Wed, 22 Oct 2008 17:22:55 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MHMsM1052912 for perforce@freebsd.org; Wed, 22 Oct 2008 17:22:54 GMT (envelope-from ed@FreeBSD.org) Date: Wed, 22 Oct 2008 17:22:54 GMT Message-Id: <200810221722.m9MHMsM1052912@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 151732 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, 22 Oct 2008 17:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=151732 Change 151732 by ed@ed_dull on 2008/10/22 17:21:58 IFC. Affected files ... .. //depot/projects/mpsafetty/contrib/tcsh/sh.c#2 integrate .. //depot/projects/mpsafetty/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/mpsafetty/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/mpsafetty/crypto/openssh/sshd.c#3 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#10 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/Makefile#5 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_acl_freebsd.c#1 branch .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_zip.c#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_zip.zip.uu#2 integrate .. //depot/projects/mpsafetty/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/mpsafetty/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/string/strxfrm.c#2 integrate .. //depot/projects/mpsafetty/lib/libkvm/kvm.c#2 integrate .. //depot/projects/mpsafetty/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/mpsafetty/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/flopen.3#2 integrate .. //depot/projects/mpsafetty/lib/libutil/flopen.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/login_cap.h#3 integrate .. //depot/projects/mpsafetty/lib/libutil/login_class.3#3 integrate .. //depot/projects/mpsafetty/lib/libutil/login_class.c#5 integrate .. //depot/projects/mpsafetty/lib/libutil/login_times.3#2 integrate .. //depot/projects/mpsafetty/lib/libutil/login_times.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/logwtmp.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/pidfile.3#2 integrate .. //depot/projects/mpsafetty/lib/libutil/pidfile.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/realhostname.c#2 integrate .. //depot/projects/mpsafetty/release/Makefile#4 integrate .. //depot/projects/mpsafetty/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/mpsafetty/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/mpsafetty/sbin/dhclient/tables.c#2 integrate .. //depot/projects/mpsafetty/sbin/geom/class/part/geom_part.c#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/mpsafetty/share/man/man4/ddb.4#10 integrate .. //depot/projects/mpsafetty/share/man/man4/mmc.4#3 integrate .. //depot/projects/mpsafetty/share/man/man4/mmcsd.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/sdhci.4#1 branch .. //depot/projects/mpsafetty/share/man/man4/u3g.4#3 integrate .. //depot/projects/mpsafetty/share/man/man9/vinvalbuf.9#2 integrate .. //depot/projects/mpsafetty/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/mpsafetty/share/syscons/keymaps/eee_nordic.kbd#1 branch .. //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/clock.h#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/mpsafetty/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#12 integrate .. //depot/projects/mpsafetty/sys/conf/files#18 integrate .. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/age/if_age.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/age/if_agevar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-cyrix.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-national.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#10 integrate .. //depot/projects/mpsafetty/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcreg.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcvar.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/pci/pci.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/lpbb.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppb_base.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppb_msq.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/vpoio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/vpoio.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppc/ppcreg.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/sdhci/sdhci.c#1 branch .. //depot/projects/mpsafetty/sys/dev/sdhci/sdhci.h#1 branch .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/mpsafetty/sys/geom/geom_disk.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_pc98.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_vtoc8.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/cpufreq/powernow.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/i386/trap.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/clock.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/mpsafetty/sys/i386/include/md_var.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/smp.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/trap.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/evtchn.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xen_intr.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/clock.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/exception.s#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/locore.s#4 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#10 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_fork.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_prot.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_synch.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/kern_time.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_stack.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_trap.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#10 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#54 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#14 integrate .. //depot/projects/mpsafetty/sys/modules/sdhci/Makefile#1 branch .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.h#9 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctputil.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/mpsafetty/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/mpsafetty/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/mpsafetty/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/mpsafetty/sys/sys/cdefs.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/param.h#14 integrate .. //depot/projects/mpsafetty/sys/sys/systm.h#4 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/mpsafetty/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/mpsafetty/tools/regression/lib/libutil/test-flopen.c#2 integrate .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#12 integrate .. //depot/projects/mpsafetty/usr.bin/ministat/Makefile#2 integrate .. //depot/projects/mpsafetty/usr.bin/ministat/ministat.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/mpsafetty/usr.bin/netstat/route.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pciconf/pciconf.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pkg_install/add/main.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/setfib/setfib.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/keymap.c#2 integrate Differences ... ==== //depot/projects/mpsafetty/contrib/tcsh/sh.c#2 (text+ko) ==== @@ -462,7 +462,7 @@ else cp2 = cp; if (!(((Strncmp(cp2, STRtty, 3) == 0) && Isalpha(cp2[3])) || - Strstr(cp, STRslptssl) != NULL)) { + Strstr(cp, STRptssl) != NULL)) { if (getenv("DISPLAY") == NULL) { /* NOT on X window shells */ setcopy(STRautologout, STRdefautologout, VAR_READWRITE); ==== //depot/projects/mpsafetty/contrib/tcsh/tc.const.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ Char STRhangup[] = { 'h', 'a', 'n', 'g', 'u', 'p', '\0' }; Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' }; Char STRtty[] = { 't', 't', 'y', '\0' }; -Char STRslptssl[] = { '/', 'p', 't', 's', '/', '\0' }; +Char STRptssl[] = { 'p', 't', 's', '/', '\0' }; Char STRany[] = { 'a', 'n', 'y', '\0' }; Char STRstatus[] = { 's', 't', 'a', 't', 'u', 's', '\0' }; Char STR0[] = { '0', '\0' }; ==== //depot/projects/mpsafetty/crypto/openssh/loginrec.c#3 (text+ko) ==== @@ -146,7 +146,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.15 2008/08/01 02:48:36 des Exp $"); #include #include @@ -689,8 +688,8 @@ strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username)); # ifdef HAVE_HOST_IN_UTMP - realhostname_sa(ut->ut_host, sizeof ut->ut_host, - &li->hostaddr.sa, li->hostaddr.sa.sa_len); + strncpy(ut->ut_host, li->hostname, + MIN_SIZEOF(ut->ut_host, li->hostname)); # endif # ifdef HAVE_ADDR_IN_UTMP /* this is just a 32-bit IP address */ ==== //depot/projects/mpsafetty/crypto/openssh/sshd.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.46 2008/08/01 02:48:36 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.47 2008/10/21 11:58:26 des Exp $"); #include #include @@ -72,6 +72,7 @@ #include #include #include +#include #include #include @@ -238,7 +239,7 @@ u_int session_id2_len = 0; /* record remote hostname or ip */ -u_int utmp_len = MAXHOSTNAMELEN; +u_int utmp_len = UT_HOSTSIZE; /* options.max_startup sized array of fd ints */ int *startup_pipes = NULL; ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/arch/amd64/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.4 2007/05/19 03:22:18 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.5 2008/10/16 18:09:27 obrien Exp $ GENSRCS+= xm.h .if !defined(GDB_CROSS_DEBUGGER) @@ -7,7 +7,7 @@ .endif LIBSRCS+= solib.c solib-svr4.c LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ - i386fbsd-tdep-fixed.c i387-tdep.c + i386fbsd-tdep-fixed.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd64.h"' > ${.TARGET} @@ -18,7 +18,7 @@ xm.h: echo '#include "i386/xm-i386.h"' > ${.TARGET} +# Fix source static/extern mismatch nits that GCC 4.2 warns about. +CLEANFILES+= i386fbsd-tdep-fixed.c i386fbsd-tdep-fixed.c: i386fbsd-tdep.c sed -e '48s/^static //' ${.ALLSRC} > ${.TARGET} - -CLEANFILES+= i386fbsd-tdep-fixed.c ==== //depot/projects/mpsafetty/gnu/usr.bin/gdb/arch/i386/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.5 2007/05/19 03:22:19 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.6 2008/10/16 18:09:27 obrien Exp $ GENSRCS+= xm.h .if !defined(GDB_CROSS_DEBUGGER) @@ -17,6 +17,7 @@ xm.h: echo '#include "i386/xm-i386.h"' > ${.TARGET} +# Fix source static/extern mismatch nits that GCC 4.2 warns about. +CLEANFILES += i386fbsd-tdep-fixed.c i386fbsd-tdep-fixed.c: i386fbsd-tdep.c sed -e '48s/^static\ //' ${.ALLSRC} > ${.TARGET} -CLEANFILES += i386fbsd-tdep-fixed.c ==== //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_zip.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.26 2008/06/30 16:19:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.27 2008/10/21 05:08:35 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -444,7 +444,9 @@ archive_entry_set_mtime(entry, zip->mtime, 0); archive_entry_set_ctime(entry, zip->ctime, 0); archive_entry_set_atime(entry, zip->atime, 0); - archive_entry_set_size(entry, zip->uncompressed_size); + /* Set the size only if it's meaningful. */ + if (0 == (zip->flags & ZIP_LENGTH_AT_END)) + archive_entry_set_size(entry, zip->uncompressed_size); zip->entry_bytes_remaining = zip->compressed_size; zip->entry_offset = 0; @@ -573,12 +575,16 @@ } break; } + if (r != ARCHIVE_OK) + return (r); /* Update checksum */ - if (r == ARCHIVE_OK && *size) { + if (*size) zip->entry_crc32 = crc32(zip->entry_crc32, *buff, *size); - } - return (r); + /* Return EOF immediately if this is a non-regular file. */ + if (AE_IFREG != (zip->mode & AE_IFMT)) + return (ARCHIVE_EOF); + return (ARCHIVE_OK); } /* ==== //depot/projects/mpsafetty/lib/libarchive/archive_util.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.18 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.19 2008/10/21 12:10:30 des Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -168,6 +168,7 @@ va_start(ap, fmt); archive_string_vsprintf(&(a->error_string), fmt, ap); + va_end(ap); if (error_number > 0) { archive_strcat(&(a->error_string), ": "); #ifdef HAVE_STRERROR_R @@ -184,7 +185,6 @@ archive_strcat(&(a->error_string), errp); } a->error = a->error_string.s; - va_end(ap); } void ==== //depot/projects/mpsafetty/lib/libarchive/archive_write_disk.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.41 2008/10/19 00:18:44 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -710,10 +710,6 @@ int r2 = set_mode(a, a->mode); if (r2 < ret) ret = r2; } - if (a->todo & TODO_TIMES) { - int r2 = set_times(a); - if (r2 < ret) ret = r2; - } if (a->todo & TODO_ACLS) { int r2 = set_acls(a); if (r2 < ret) ret = r2; @@ -726,6 +722,10 @@ int r2 = set_fflags(a); if (r2 < ret) ret = r2; } + if (a->todo & TODO_TIMES) { + int r2 = set_times(a); + if (r2 < ret) ret = r2; + } /* If there's an fd, we can close it now. */ if (a->fd >= 0) { ==== //depot/projects/mpsafetty/lib/libarchive/test/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.27 2008/09/30 04:02:36 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.28 2008/10/19 00:18:44 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -9,6 +9,7 @@ TESTS= \ test_acl_basic.c \ + test_acl_freebsd.c \ test_acl_pax.c \ test_archive_api_feature.c \ test_bad_fd.c \ ==== //depot/projects/mpsafetty/lib/libarchive/test/test_acl_basic.c#3 (text+ko) ==== @@ -23,12 +23,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.6 2008/10/19 00:13:57 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. - * Check that archive_entry objects can save and restore ACL data - * and that pax archive can save and restore ACL data. + * Check that archive_entry objects can save and restore ACL data. * * This should work on all systems, regardless of whether local * filesystems support ACLs or not. @@ -42,7 +41,7 @@ const char *name; /* Name of user/group, depending on tag. */ }; -struct acl_t acls0[] = { +static struct acl_t acls0[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE, ARCHIVE_ENTRY_ACL_USER_OBJ, 0, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, @@ -51,7 +50,7 @@ ARCHIVE_ENTRY_ACL_OTHER, 0, "" }, }; -struct acl_t acls1[] = { +static struct acl_t acls1[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE, ARCHIVE_ENTRY_ACL_USER_OBJ, -1, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, @@ -62,7 +61,7 @@ ARCHIVE_ENTRY_ACL_OTHER, -1, "" }, }; -struct acl_t acls2[] = { +static struct acl_t acls2[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE | ARCHIVE_ENTRY_ACL_READ, ARCHIVE_ENTRY_ACL_USER_OBJ, -1, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, ==== //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_zip.c#4 (text+ko) ==== @@ -23,7 +23,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.7 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.8 2008/10/21 05:08:35 kientzle Exp $"); + +/* + * The reference file for this has been manually tweaked so that: + * * file2 has length-at-end but file1 does not + * * file2 has an invalid CRC + */ DEFINE_TEST(test_read_format_zip) { @@ -57,7 +63,8 @@ assertA(0 == archive_read_next_header(a, &ae)); assertEqualString("file2", archive_entry_pathname(ae)); assertEqualInt(1179605932, archive_entry_mtime(ae)); - assertEqualInt(18, archive_entry_size(ae)); + failure("file2 has length-at-end, so we shouldn't see a valid size"); + assertEqualInt(0, archive_entry_size_is_set(ae)); failure("file2 has a bad CRC, so reading to end should fail"); assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); ==== //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_zip.zip.uu#2 (text+ko) ==== @@ -1,13 +1,14 @@ -$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.2 2008/06/26 11:50:11 des Exp $ +$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.3 2008/10/21 05:08:35 kientzle Exp $ begin 644 test_read_format_zip.zip -M4$L#!`H``````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1AE5 -M3T95>`0`Z`/H`U!+`P04````"`!O9K,V.C=F/0H````2````!0`5`&9I;&4Q -M550)``-!54]&K%M/1E5X!`#H`^@#RTC-R%8T$@H````2````!0`5`&9I;&4R550)``.L6T]&K%M/1E5X!`#H`^@#RTC- -MR%8T$@H````2````!0`-```````!````I(%Y```` -H9FEL93)55`4``ZQ;3T95>```4$L%!@`````#``,`OP```+L````````` +M4$L#!`H`"````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1M19 +M_4A5>`0`Z`/H`U!+!P@```````````````!02P,$%`````@`;V:S-CHW9CT* +M````$@````4`%0!F:6QE,554"0`#055/1L!9_4A5>`0`Z`/H`\M(S`0`Z`/H`\M(S```4$L!`A<#%``(``@`;V:S-CHW9CT*````$@````4`#0`` +M`````0```.V!1P```&9I;&4Q550%``-!54]&57@``%!+`0(7`Q0`"``(`%IJ +MLS8Z-V8]"@```!(````%``T```````$```#M@8D```!F:6QE,E54!0`#K%M/ +;1E5X``!02P4&``````,``P"_````VP`````` ` end ==== //depot/projects/mpsafetty/lib/libc/stdlib/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.55 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.56 2008/10/17 08:30:20 netchild Exp $ # machine-independent stdlib sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib @@ -48,3 +48,8 @@ MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 malloc.conf.5 \ malloc.3 realloc.3 malloc.3 reallocf.3 malloc.3 malloc_usable_size.3 MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3 + +.if defined(MALLOC_PRODUCTION) +CFLAGS+= -DMALLOC_PRODUCTION +.endif + ==== //depot/projects/mpsafetty/lib/libc/string/strlcpy.c#2 (text+ko) ==== @@ -1,37 +1,23 @@ -/* $OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $ */ +/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */ /* * Copyright (c) 1998 Todd C. Miller - * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.9 2006/06/15 15:56:55 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.10 2008/10/19 10:11:35 delphij Exp $"); #include #include @@ -42,21 +28,18 @@ * Returns strlen(src); if retval >= siz, truncation occurred. */ size_t -strlcpy(dst, src, siz) - char *dst; - const char *src; - size_t siz; +strlcpy(char *dst, const char *src, size_t siz) { char *d = dst; const char *s = src; size_t n = siz; /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) { - do { - if ((*d++ = *s++) == 0) + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') break; - } while (--n != 0); + } } /* Not enough room in dst, add NUL and traverse rest of src */ ==== //depot/projects/mpsafetty/lib/libc/string/strxfrm.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.17 2008/10/19 09:10:44 delphij Exp $"); #include #include @@ -45,18 +45,8 @@ return 0; } - if (__collate_load_error) { - slen = strlen(src); - if (len > 0) { - if (slen < len) - strcpy(dest, src); - else { - strncpy(dest, src, len - 1); - dest[len - 1] = '\0'; - } - } - return slen; - } + if (__collate_load_error) + return strlcpy(dest, src, len); slen = 0; prim = sec = 0; ==== //depot/projects/mpsafetty/lib/libkvm/kvm.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.32 2008/01/12 00:54:47 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.33 2008/10/17 20:11:28 delphij Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -244,11 +244,10 @@ { kvm_t *kd; - if ((kd = malloc(sizeof(*kd))) == NULL) { + if ((kd = calloc(1, sizeof(*kd))) == NULL) { (void)strlcpy(errout, strerror(errno), _POSIX2_LINE_MAX); return (0); } - memset(kd, 0, sizeof(*kd)); kd->program = 0; return (_kvm_open(kd, uf, mf, flag, errout)); } @@ -263,13 +262,12 @@ { kvm_t *kd; - if ((kd = malloc(sizeof(*kd))) == NULL) { + if ((kd = calloc(1, sizeof(*kd))) == NULL) { if (errstr != NULL) (void)fprintf(stderr, "%s: %s\n", errstr, strerror(errno)); return (0); } - memset(kd, 0, sizeof(*kd)); kd->program = errstr; return (_kvm_open(kd, uf, mf, flag, NULL)); } ==== //depot/projects/mpsafetty/lib/libkvm/kvm_minidump_amd64.c#2 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.2 2006/06/05 08:51:14 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_amd64.c,v 1.3 2008/10/17 20:09:00 delphij Exp $"); /* * AMD64 machine dependent routines for kvm and minidumps. @@ -146,7 +146,6 @@ return (-1); } kd->vmst = vmst; - bzero(vmst, sizeof(*vmst)); vmst->minidump = 1; if (pread(kd->pmfd, &vmst->hdr, sizeof(vmst->hdr), 0) != sizeof(vmst->hdr)) { ==== //depot/projects/mpsafetty/lib/libkvm/kvm_minidump_i386.c#2 (text) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.2 2006/06/05 08:51:14 delphij Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_minidump_i386.c,v 1.3 2008/10/17 20:09:00 delphij Exp $"); /* * AMD64 machine dependent routines for kvm and minidumps. @@ -148,7 +148,6 @@ return (-1); } kd->vmst = vmst; - bzero(vmst, sizeof(*vmst)); vmst->minidump = 1; if (pread(kd->pmfd, &vmst->hdr, sizeof(vmst->hdr), 0) != sizeof(vmst->hdr)) { ==== //depot/projects/mpsafetty/lib/libutil/flopen.3#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/libutil/flopen.3,v 1.6 2007/09/28 15:31:44 obrien Exp $ +.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.7 2008/10/20 18:02:16 des Exp $ .\" .Dd May 10, 2007 .Dt FLOPEN 3 @@ -46,12 +46,13 @@ function opens or creates a file and acquires an exclusive lock on it. It is essentially equivalent with calling .Fn open -with the same parameters followed by -.Fn flock -with an -.Va operation -argument of -.Dv LOCK_EX , +with the same parameters followed by an +.Fn fcntl +.Dv F_SETLK +or +.Dv F_SETLKW +operation with lock type +.Dv F_WRLCK , except that .Fn flopen will attempt to detect and handle races that may occur between opening @@ -86,12 +87,12 @@ Otherwise, it returns -1, and sets .Va errno as described in -.Xr flock 2 +.Xr fcntl 2 and .Xr open 2 . .Sh SEE ALSO .Xr errno 2 , -.Xr flock 2 , +.Xr fcntl 2 , .Xr open 2 .Sh HISTORY The ==== //depot/projects/mpsafetty/lib/libutil/flopen.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,14 +26,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libutil/flopen.c,v 1.9 2007/08/03 09:20:28 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libutil/flopen.c,v 1.11 2008/10/20 18:11:30 des Exp $"); -#include #include #include #include #include +#include #include #include @@ -42,6 +42,7 @@ flopen(const char *path, int flags, ...) { int fd, operation, serrno, trunc; + struct flock lock; struct stat sb, fsb; mode_t mode; @@ -54,13 +55,14 @@ va_list ap; va_start(ap, flags); - mode = va_arg(ap, int); /* mode_t promoted to int */ + mode = (mode_t)va_arg(ap, int); /* mode_t promoted to int */ va_end(ap); } - operation = LOCK_EX; - if (flags & O_NONBLOCK) - operation |= LOCK_NB; + memset(&lock, 0, sizeof lock); + lock.l_type = ((flags & O_ACCMODE) == O_RDONLY) ? F_RDLCK : F_WRLCK; + lock.l_whence = SEEK_SET; + operation = (flags & O_NONBLOCK) ? F_SETLK : F_SETLKW; trunc = (flags & O_TRUNC); flags &= ~O_TRUNC; @@ -69,35 +71,35 @@ if ((fd = open(path, flags, mode)) == -1) /* non-existent or no access */ return (-1); - if (flock(fd, operation) == -1) { + if (fcntl(fd, operation, &lock) == -1) { /* unsupported or interrupted */ serrno = errno; - close(fd); + (void)close(fd); errno = serrno; return (-1); } if (stat(path, &sb) == -1) { /* disappeared from under our feet */ - close(fd); + (void)close(fd); continue; } if (fstat(fd, &fsb) == -1) { /* can't happen [tm] */ serrno = errno; - close(fd); + (void)close(fd); errno = serrno; return (-1); } if (sb.st_dev != fsb.st_dev || sb.st_ino != fsb.st_ino) { /* changed under our feet */ - close(fd); + (void)close(fd); continue; } if (trunc && ftruncate(fd, 0) != 0) { /* can't happen [tm] */ serrno = errno; - close(fd); + (void)close(fd); errno = serrno; return (-1); } ==== //depot/projects/mpsafetty/lib/libutil/login_cap.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * Low-level routines relating to the user capabilities database * * Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp - * $FreeBSD: src/lib/libutil/login_cap.h,v 1.10 2008/07/25 19:58:14 brooks Exp $ + * $FreeBSD: src/lib/libutil/login_cap.h,v 1.13 2008/10/20 17:17:58 des Exp $ */ #ifndef _LOGIN_CAP_H_ @@ -81,7 +81,7 @@ #define LTM_NONE 0x00 #define LTM_SUN 0x01 #define LTM_MON 0x02 -#define LTM_TUE 0x04 +#define LTM_TUE 0x04 #define LTM_WED 0x08 #define LTM_THU 0x10 #define LTM_FRI 0x20 @@ -104,7 +104,8 @@ login_cap_t *login_getpwclass(const struct passwd *); login_cap_t *login_getuserclass(const struct passwd *); -const char *login_getcapstr(login_cap_t*, const char *, const char *, const char *); +const char *login_getcapstr(login_cap_t *, const char *, const char *, + const char *); const char **login_getcaplist(login_cap_t *, const char *, const char *); const char *login_getstyle(login_cap_t *, const char *, const char *); rlim_t login_getcaptime(login_cap_t *, const char *, rlim_t, rlim_t); @@ -114,45 +115,51 @@ int login_getcapbool(login_cap_t *, const char *, int); const char *login_setcryptfmt(login_cap_t *, const char *, const char *); -int setclasscontext(const char*, unsigned int); -int setusercontext(login_cap_t*, const struct passwd*, uid_t, unsigned int); +int setclasscontext(const char *, unsigned int); +void setclasscpumask(login_cap_t *); +int setusercontext(login_cap_t *, const struct passwd *, uid_t, unsigned int); void setclassresources(login_cap_t *); void setclassenvironment(login_cap_t *, const struct passwd *, int); /* Most of these functions are deprecated */ -int auth_approve(login_cap_t*, const char*, const char*); +int auth_approve(login_cap_t *, const char *, const char *); int auth_check(const char *, const char *, const char *, const char *, int *); void auth_env(void); -char *auth_mkvalue(const char *n); -int auth_response(const char *, const char *, const char *, const char *, int *, const char *, const char *); +char *auth_mkvalue(const char *); +int auth_response(const char *, const char *, const char *, const char *, int *, + const char *, const char *); void auth_rmfiles(void); int auth_scan(int); -int auth_script(const char*, ...); +int auth_script(const char *, ...); int auth_script_data(const char *, int, const char *, ...); char *auth_valud(const char *); int auth_setopt(const char *, const char *); void auth_clropts(void); -void auth_checknologin(login_cap_t*); -int auth_cat(const char*); +void auth_checknologin(login_cap_t *); +int auth_cat(const char *); -int auth_ttyok(login_cap_t*, const char *); -int auth_hostok(login_cap_t*, const char *, char const *); -int auth_timeok(login_cap_t*, time_t); +int auth_ttyok(login_cap_t *, const char *); +int auth_hostok(login_cap_t *, const char *, char const *); +int auth_timeok(login_cap_t *, time_t); struct tm; login_time_t parse_lt(const char *); +int in_lt(const login_time_t *, time_t *); int in_ltm(const login_time_t *, struct tm *, time_t *); int in_ltms(const login_time_t *, struct tm *, time_t *); +int in_lts(const login_time_t *, time_t *); /* helper functions */ int login_strinlist(const char **, char const *, int); int login_str2inlist(const char **, const char *, const char *, int); -login_time_t * login_timelist(login_cap_t *, char const *, int *, login_time_t **); +login_time_t * login_timelist(login_cap_t *, char const *, int *, + login_time_t **); int login_ttyok(login_cap_t *, const char *, const char *, const char *); -int login_hostok(login_cap_t *, const char *, const char *, const char *, const char *); +int login_hostok(login_cap_t *, const char *, const char *, const char *, + const char *); __END_DECLS ==== //depot/projects/mpsafetty/lib/libutil/login_class.3#3 (text+ko) ==== @@ -17,13 +17,14 @@ .\" 5. Modifications may be freely made to this file providing the above .\" conditions are met. .\" -.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.20 2008/07/25 19:58:14 brooks Exp $ +.\" $FreeBSD: src/lib/libutil/login_class.3,v 1.21 2008/10/20 17:03:05 des Exp $ .\" -.Dd December 28, 1996 +.Dd October 20, 2008 .Os .Dt LOGIN_CLASS 3 .Sh NAME .Nm setclasscontext , +.Nm setclasscpumask , .Nm setclassenvironment , >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 22 17:52:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A5C71065673; Wed, 22 Oct 2008 17:52:26 +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 1E2FF106566C for ; Wed, 22 Oct 2008 17:52:26 +0000 (UTC) (envelope-from andenore@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0BF828FC1C for ; Wed, 22 Oct 2008 17:52:26 +0000 (UTC) (envelope-from andenore@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 m9MHqPlW055154 for ; Wed, 22 Oct 2008 17:52:25 GMT (envelope-from andenore@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MHqPgV055152 for perforce@freebsd.org; Wed, 22 Oct 2008 17:52:25 GMT (envelope-from andenore@FreeBSD.org) Date: Wed, 22 Oct 2008 17:52:25 GMT Message-Id: <200810221752.m9MHqPgV055152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andenore@FreeBSD.org using -f From: Anders Nore To: Perforce Change Reviews Cc: Subject: PERFORCE change 151735 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, 22 Oct 2008 17:52:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=151735 Change 151735 by andenore@andenore_laptop on 2008/10/22 17:51:56 Some edits, integrate, and testing binary package upgrading. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/Makefile#5 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#6 integrate .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#11 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#17 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/url.c#8 edit .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/Makefile#1 add .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/upgrade/main.c#1 add Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/Makefile#5 (text+ko) ==== @@ -2,7 +2,7 @@ .include -SUBDIR= lib add create delete info updating version convert +SUBDIR= lib add create delete info updating version convert upgrade .include @@ -19,4 +19,4 @@ test: - ./test.sh zip.tbz+ ./test.sh zip.tbz ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#6 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.78 2008/06/16 23:41:11 flz Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.79 2008/10/17 15:10:45 brooks Exp $"); #include #include @@ -266,7 +266,7 @@ } } /* If no packages, yelp */ - else if (!ch) { + if (!ch) { warnx("missing package name(s)"); usage(); } ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/perform.c#11 (text+ko) ==== @@ -34,6 +34,7 @@ static int pkg_do(char *); static int sanity_check(char *); +static char *check_dependencies(const char *, Package *); static char LogDir[FILENAME_MAX]; static int zapLogDir; /* Should we delete LogDir? */ char wd[FILENAME_MAX]; @@ -292,6 +293,13 @@ warnx("-f specified; proceeding anyway"); } + char *tmpName; + if ((tmpName = check_dependencies(pkg, &Plist)) != NULL) { + warnx("Cannot add package `%s', package don't exist %s", tmpName, Force ? "(but proceeding anyway)" : ""); + if (!Force) + goto bomb; + } + /* Now check the packing list for dependencies */ for (p = Plist.head; p ; p = p->next) { char *deporigin; @@ -311,6 +319,7 @@ printf(".\n"); } + /* Check if we have to add the dependency */ if (isinstalledpkg(p->name) <= 0 && !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) { char path[FILENAME_MAX], *cp = NULL; @@ -687,6 +696,34 @@ return code; } +/* Returns NULL on success */ +static char * +check_dependencies(const char *base, Package *plist) +{ + PackingList p; + static char retval[FILENAME_MAX]; + + for (p = Plist.head; p ; p = p->next) { + char *deporigin; + + if (p->type != PLIST_PKGDEP) + continue; + + deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL; + + /* Check if we have to add the dependency */ + if (isinstalledpkg(p->name) <= 0 && + !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) { + if (!fileExistsURL(base, p->name)) { + strncpy(retval, p->name, sizeof(retval)); + return retval; + } + } + } + + return NULL; +} + void cleanup(int sig) { ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#17 (text+ko) ==== @@ -197,6 +197,7 @@ Boolean issymlink(const char *); Boolean isURL(const char *); char *fileGetURL(const char *, const char *, int); +Boolean fileExistsURL(const char *base, const char *spec); char *fileFindByPath(const char *, const char *); char *fileGetContents(const char *); void write_file(const char *, const char *); ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/url.c#8 (text+ko) ==== @@ -30,6 +30,9 @@ #include #include +static char *formatURL(const char *, const char *, char *); + + /* * Try and fetch a file by URL, returning the directory name for where * it's unpacked, if successful. @@ -59,48 +62,8 @@ bzero(&oldtime, sizeof(oldtime)); rp = NULL; - /* Special tip that sysinstall left for us */ - hint = getenv("PKG_ADD_BASE"); - if (!isURL(spec)) { - if (!base && !hint) - return NULL; - /* - * We've been given an existing URL (that's known-good) and now we need - * to construct a composite one out of that and the basename we were - * handed as a dependency. - */ - if (base) { - strcpy(fname, base); - /* - * Advance back two slashes to get to the root of the package - * hierarchy - */ - cp = strrchr(fname, '/'); - if (cp) { - *cp = '\0'; /* chop name */ - cp = strrchr(fname, '/'); - } - if (cp) { - *(cp + 1) = '\0'; - strcat(cp, "All/"); - strcat(cp, spec); - strcat(cp, ".tbz"); - } - else - return NULL; - } - else { - /* - * Otherwise, we've been given an environment variable hinting - * at the right location from sysinstall - */ - strcpy(fname, hint); - strcat(fname, spec); - strcat(fname, ".tbz"); - } - } - else - strcpy(fname, spec); + + formatURL(base, spec, fname); if (keep_package) { tmp = getenv("PKGDIR"); @@ -231,3 +194,85 @@ printf("%*s \n", cols-1, "Done"); return rp; } + +/* + * Checks if a file exists + */ + +Boolean +fileExistsURL(const char *base, const char *spec) +{ + FILE *fp; + Boolean retval; + char fname[FILENAME_MAX]; + + formatURL(base, spec, fname); + + if ((fp = fetchGetURL(fname, NULL)) == NULL) { + if (Verbose) + warnx("Cannot get the file: %s", fname); + retval = FALSE; + } else { + retval = TRUE; + } + + if (fp) + fclose(fp); + return retval; +} + +/* + * Format base and spec into an url used by fetchGetURL and fetchStatURL + */ +static char * +formatURL(const char *base, const char *spec, char *result) +{ + char *hint, *cp; + + /* Special tip that sysinstall left for us */ + hint = getenv("PKG_ADD_BASE"); + if (!isURL(spec)) { + if (!base && !hint) + return FALSE; + /* + * We've been given an existing URL (that's known-good) and now we need + * to construct a composite one out of that and the basename we were + * handed as a dependency. + */ + if (base) { + strcpy(result, base); + /* + * Advance back two slashes to get to the root of the package + * hierarchy + */ + cp = strrchr(result, '/'); + if (cp) { + *cp = '\0'; /* chop name */ + cp = strrchr(result, '/'); + } + if (cp) { + *(cp + 1) = '\0'; + strcat(cp, "All/"); + strcat(cp, spec); + strcat(cp, ".tbz"); + } + else + return FALSE; + } + else { + /* + * Otherwise, we've been given an environment variable hinting + * at the right location from sysinstall + */ + strcpy(result, hint); + strcat(result, spec); + strcat(result, ".tbz"); + } + } + else + strcpy(result, spec); + + return result; +} + + From owner-p4-projects@FreeBSD.ORG Wed Oct 22 18:37:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0802E1065672; Wed, 22 Oct 2008 18:37: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 C24EC106566B for ; Wed, 22 Oct 2008 18:37:18 +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 B18AC8FC21 for ; Wed, 22 Oct 2008 18:37:18 +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 m9MIbIeV060038 for ; Wed, 22 Oct 2008 18:37:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MIbIxJ060036 for perforce@freebsd.org; Wed, 22 Oct 2008 18:37:18 GMT (envelope-from sam@freebsd.org) Date: Wed, 22 Oct 2008 18:37:18 GMT Message-Id: <200810221837.m9MIbIxJ060036@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 151740 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, 22 Oct 2008 18:37:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=151740 Change 151740 by sam@sam_ebb on 2008/10/22 18:36:27 add tool for calculating packet tx times Affected files ... .. //depot/projects/vap/tools/tools/net80211/Makefile#5 edit .. //depot/projects/vap/tools/tools/net80211/wlantxtime/Makefile#1 add .. //depot/projects/vap/tools/tools/net80211/wlantxtime/wlantxtime.c#1 add Differences ... ==== //depot/projects/vap/tools/tools/net80211/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $FreeBSD: src/tools/tools/net80211/Makefile,v 1.5 2008/04/20 20:43:13 sam Exp $ -SUBDIR= stumbler w00t wesside wlaninject wlanstats wlanwatch wlanwds +SUBDIR= stumbler w00t wesside wlaninject wlanstats wlantxtime wlanwatch wlanwds .include From owner-p4-projects@FreeBSD.ORG Wed Oct 22 20:23:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 814CF1065681; Wed, 22 Oct 2008 20:23: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 44A7F1065674 for ; Wed, 22 Oct 2008 20:23:08 +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 1AD0A8FC1B for ; Wed, 22 Oct 2008 20:23:08 +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 m9MKN71U070585 for ; Wed, 22 Oct 2008 20:23:07 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MKN7Fl070583 for perforce@freebsd.org; Wed, 22 Oct 2008 20:23:07 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 22 Oct 2008 20:23:07 GMT Message-Id: <200810222023.m9MKN7Fl070583@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 151751 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, 22 Oct 2008 20:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=151751 Change 151751 by rene@rene_self on 2008/10/22 20:22:56 Add the first article (untranslated) and the required glue (also non-localized). Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile.inc#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/Makefile#1 add .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Oct 22 20:32:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C46FA10656A2; Wed, 22 Oct 2008 20:32: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 8795D1065699 for ; Wed, 22 Oct 2008 20:32:17 +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 769418FC22 for ; Wed, 22 Oct 2008 20:32:17 +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 m9MKWHr3071262 for ; Wed, 22 Oct 2008 20:32:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MKWHNc071260 for perforce@freebsd.org; Wed, 22 Oct 2008 20:32:17 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 22 Oct 2008 20:32:17 GMT Message-Id: <200810222032.m9MKWHNc071260@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 151752 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, 22 Oct 2008 20:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=151752 Change 151752 by rene@rene_self on 2008/10/22 20:31:18 Instruct make to build Dutch articles (only explaining-bsd for now). Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/Makefile#2 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#2 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile.inc#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD: doc/nl_NL.ISO8859-1/Makefile,v 1.2 2004/09/27 00:26:48 josef Exp $ SUBDIR = books +SUBDIR+= articles COMPAT_SYMLINK = nl ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile#2 (text+ko) ==== @@ -1,63 +1,10 @@ # $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.60 2008/05/31 13:32:19 remko Exp $ +# %SOURCE% en_US.ISO8859-1/articles/Makefile +# %SRCID% 1.60 + SUBDIR = -SUBDIR+= 5-roadmap -SUBDIR+= bsdl-gpl -SUBDIR+= building-products -SUBDIR+= casestudy-argentina.com -SUBDIR+= checkpoint -SUBDIR+= committers-guide -SUBDIR+= compiz-fusion -SUBDIR+= console-server -SUBDIR+= contributing -SUBDIR+= contributing-ports -SUBDIR+= contributors -SUBDIR+= cups -SUBDIR+= cvs-freebsd -SUBDIR+= cvsup-advanced -SUBDIR+= dialup-firewall -SUBDIR+= diskless-x -SUBDIR+= euro SUBDIR+= explaining-bsd -SUBDIR+= fbsd-from-scratch -SUBDIR+= filtering-bridges -SUBDIR+= fonts -SUBDIR+= formatting-media -SUBDIR+= freebsd-questions -SUBDIR+= geom-class -SUBDIR+= gjournal-desktop -SUBDIR+= hats -SUBDIR+= hubs -SUBDIR+= ipsec-must -SUBDIR+= laptop -SUBDIR+= ldap-auth -SUBDIR+= linux-comparison -SUBDIR+= linux-emulation -SUBDIR+= linux-users -SUBDIR+= mailing-list-faq -SUBDIR+= mh -SUBDIR+= multi-os -SUBDIR+= nanobsd -SUBDIR+= new-users -SUBDIR+= p4-primer -SUBDIR+= pam -SUBDIR+= portbuild -SUBDIR+= pr-guidelines -SUBDIR+= problem-reports -SUBDIR+= pxe -SUBDIR+= rc-scripting -SUBDIR+= relaydelay -SUBDIR+= releng -SUBDIR+= releng-packages -SUBDIR+= remote-install -SUBDIR+= serial-uart -SUBDIR+= solid-state -SUBDIR+= storage-devices -SUBDIR+= version-guide -SUBDIR+= vinum -SUBDIR+= vm-design -SUBDIR+= wp-toolbox -SUBDIR+= zip-drive # ROOT_SYMLINKS+= new-users ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,7 @@ # # $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile.inc,v 1.4 2001/06/11 01:16:38 ache Exp $ # +# %SOURCE% en_US.ISO8859-1/articles/Makefile.inc +# %SRCID% 1.4 -DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/articles/${.CURDIR:T} +DESTDIR?= ${DOCDIR}/nl_NL.ISO8859-1/articles/${.CURDIR:T} From owner-p4-projects@FreeBSD.ORG Wed Oct 22 21:11:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 413751065671; Wed, 22 Oct 2008 21:11: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 055DC106566B for ; Wed, 22 Oct 2008 21:11:00 +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 E81FE8FC1C for ; Wed, 22 Oct 2008 21:10:59 +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 m9MLAxT8085068 for ; Wed, 22 Oct 2008 21:10:59 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9MLAxUd085066 for perforce@freebsd.org; Wed, 22 Oct 2008 21:10:59 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 22 Oct 2008 21:10:59 GMT Message-Id: <200810222110.m9MLAxUd085066@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 151757 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, 22 Oct 2008 21:11:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=151757 Change 151757 by rene@rene_self on 2008/10/22 21:10:38 Article-info of explaining-bsd is translated (10%). Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#2 (text+ko) ==== @@ -1,14 +1,17 @@ + + + %articles.ent; ]> -

      +
      - Explaining BSD + Uitleg over BSD Greg @@ -31,25 +34,29 @@ - In the open source world, the word Linux is almost - synonymous with Operating System, but it is not the only - open source &unix; operating system. According - to the Internet - Operating System Counter, as of April 1999 31.3% of the - world's network connected machines run Linux. 14.6% run BSD &unix;. - Some of the world's largest web operations, such as Yahoo!, run BSD. The world's - busiest FTP server of 1999 (now defunct), ftp.cdrom.com, used BSD to - transfer 1.4 TB of data a day. Clearly this is not a niche - market: BSD is a well-kept secret. + Vertaald door René Ladan. + + In de open-source wereld is het woord Linux + bijna een synoniem van besturingssysteem, maar + het is niet het enige open-source &unix; besturingssysteem. + Volgens de Internet + Operating System Counter, draait sinds april 1999 + 31.3% van de machines op de wereld die met een netwerk verbonden + zijn Linux. 14.6% draait BSD &unix;. Sommige van 's werelds + grootste webinstallaties, zoals Yahoo!, draaien BSD. De + drukste FTP-server van de wereld van 1999 (nu buiten werking), + ftp.cdrom.com, + gebruikt BSD om 1.4 TB aan gegevens per dag over te + brengen. Het is duidelijk dat dit geen nichemarkt is: BSD is + een goed bewaard geheim. - So what is the secret? Why is BSD not better known? This white - paper addresses these and other questions. + Dus wat is het geheim? Waarom is BSD niet bekender? Dit + artikel behandelt deze en andere vragen. - Throughout this paper, differences between BSD and Linux will be - noted like this. + In dit artikel zullen verschillen tussen BSD en Linux + zo worden aangegeven. From owner-p4-projects@FreeBSD.ORG Thu Oct 23 04:54:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73EBC1065676; Thu, 23 Oct 2008 04:54:54 +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 33EBA1065673 for ; Thu, 23 Oct 2008 04:54:54 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1FE798FC16 for ; Thu, 23 Oct 2008 04:54:54 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N4ssUC048179 for ; Thu, 23 Oct 2008 04:54:54 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N4spSX048173 for perforce@freebsd.org; Thu, 23 Oct 2008 04:54:51 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 04:54:51 GMT Message-Id: <200810230454.m9N4spSX048173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151773 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, 23 Oct 2008 04:54:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=151773 Change 151773 by peter@peter_cheese on 2008/10/23 04:53:58 Merge from vendor. This jumps from their 2.2 branch to trunk (3.3.1). Massive merge conflicts due to their AIX port. Sadly, in typical linux developer fashion, they did some dumbass things. eg: they put "#ifndef _AIX" around linux-specific stuff instead of "#ifdef linux". Sigh. This is NOT expected to compile. (pull out previous rev! - @151428) Affected files ... .. //depot/projects/valgrind/ACKNOWLEDGEMENTS#2 integrate .. //depot/projects/valgrind/AUTHORS#2 integrate .. //depot/projects/valgrind/Makefile.am#4 integrate .. //depot/projects/valgrind/Makefile.core.am#3 integrate .. //depot/projects/valgrind/Makefile.flags.am#3 integrate .. //depot/projects/valgrind/Makefile.install.am#2 integrate .. //depot/projects/valgrind/Makefile.tool-flags.am#3 integrate .. //depot/projects/valgrind/Makefile.tool-inplace.am#2 integrate .. //depot/projects/valgrind/Makefile.tool.am#3 integrate .. //depot/projects/valgrind/NEWS#2 integrate .. //depot/projects/valgrind/README#2 integrate .. //depot/projects/valgrind/README_DEVELOPERS#2 integrate .. //depot/projects/valgrind/README_MISSING_SYSCALL_OR_IOCTL#2 integrate .. //depot/projects/valgrind/README_PACKAGERS#2 integrate .. //depot/projects/valgrind/VEX/Makefile#3 integrate .. //depot/projects/valgrind/VEX/auxprogs/genoffsets.c#2 integrate .. //depot/projects/valgrind/VEX/newline.txt#1 branch .. //depot/projects/valgrind/VEX/priv/guest-amd64/gdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-amd64/ghelpers.c#3 integrate .. //depot/projects/valgrind/VEX/priv/guest-amd64/toIR.c#3 integrate .. //depot/projects/valgrind/VEX/priv/guest-arm/gdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-arm/ghelpers.c#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-arm/toIR.c#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-generic/bb_to_IR.c#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-generic/bb_to_IR.h#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-generic/g_generic_x87.c#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-generic/g_generic_x87.h#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-ppc/gdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-ppc/ghelpers.c#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-ppc/toIR.c#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-x86/gdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-x86/ghelpers.c#2 integrate .. //depot/projects/valgrind/VEX/priv/guest-x86/toIR.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-amd64/hdefs.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-amd64/hdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/host-amd64/isel.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-arm/hdefs.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-arm/hdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/host-arm/isel.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-generic/h_generic_regs.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-generic/h_generic_regs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/host-generic/h_generic_simd64.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-generic/h_generic_simd64.h#2 integrate .. //depot/projects/valgrind/VEX/priv/host-generic/reg_alloc2.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-ppc/hdefs.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-ppc/hdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/host-ppc/isel.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-x86/hdefs.c#2 integrate .. //depot/projects/valgrind/VEX/priv/host-x86/hdefs.h#2 integrate .. //depot/projects/valgrind/VEX/priv/host-x86/isel.c#2 integrate .. //depot/projects/valgrind/VEX/priv/ir/irdefs.c#2 integrate .. //depot/projects/valgrind/VEX/priv/ir/irmatch.c#2 integrate .. //depot/projects/valgrind/VEX/priv/ir/irmatch.h#2 integrate .. //depot/projects/valgrind/VEX/priv/ir/iropt.c#2 integrate .. //depot/projects/valgrind/VEX/priv/ir/iropt.h#2 integrate .. //depot/projects/valgrind/VEX/priv/main/vex_globals.c#2 integrate .. //depot/projects/valgrind/VEX/priv/main/vex_globals.h#2 integrate .. //depot/projects/valgrind/VEX/priv/main/vex_main.c#2 integrate .. //depot/projects/valgrind/VEX/priv/main/vex_util.c#2 integrate .. //depot/projects/valgrind/VEX/priv/main/vex_util.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_basictypes.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_emwarn.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_guest_amd64.h#3 integrate .. //depot/projects/valgrind/VEX/pub/libvex_guest_arm.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_guest_ppc32.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_guest_ppc64.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_guest_x86.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_ir.h#2 integrate .. //depot/projects/valgrind/VEX/pub/libvex_trc_values.h#2 integrate .. //depot/projects/valgrind/VEX/quote.txt#1 branch .. //depot/projects/valgrind/VEX/test/fxsave.c#2 integrate .. //depot/projects/valgrind/VEX/test/test-amd64.c#2 integrate .. //depot/projects/valgrind/VEX/test/test-i386.c#2 integrate .. //depot/projects/valgrind/VEX/test/test-i386.h#2 integrate .. //depot/projects/valgrind/VEX/test_main.c#2 integrate .. //depot/projects/valgrind/aix5libc.supp#1 branch .. //depot/projects/valgrind/autogen.sh#4 integrate .. //depot/projects/valgrind/auxprogs/Makefile.am#2 integrate .. //depot/projects/valgrind/auxprogs/Merge3Way.hs#1 branch .. //depot/projects/valgrind/auxprogs/aix5_VKI_info.c#1 branch .. //depot/projects/valgrind/auxprogs/aix5_proc_self_sysent.c#1 branch .. //depot/projects/valgrind/auxprogs/change-copyright-year#2 integrate .. //depot/projects/valgrind/auxprogs/dump_insn_ppc.sh#1 branch .. //depot/projects/valgrind/auxprogs/gsl19test#1 branch .. //depot/projects/valgrind/auxprogs/libmpiwrap.c#2 integrate .. //depot/projects/valgrind/auxprogs/libmpiwrap_aix5.exp#1 branch .. //depot/projects/valgrind/auxprogs/mpiwrap_type_test.c#2 integrate .. //depot/projects/valgrind/auxprogs/posixtestsuite-1.5.1-diff-results#1 branch .. //depot/projects/valgrind/auxprogs/posixtestsuite-1.5.1-diff.txt#1 branch .. //depot/projects/valgrind/auxprogs/valgrind-listener.c#2 integrate .. //depot/projects/valgrind/cachegrind/Makefile.am#3 integrate .. //depot/projects/valgrind/cachegrind/cg-amd64.c#2 integrate .. //depot/projects/valgrind/cachegrind/cg-ppc32.c#2 integrate .. //depot/projects/valgrind/cachegrind/cg-ppc64.c#2 integrate .. //depot/projects/valgrind/cachegrind/cg-x86.c#2 integrate .. //depot/projects/valgrind/cachegrind/cg_annotate.in#2 integrate .. //depot/projects/valgrind/cachegrind/cg_arch.h#2 integrate .. //depot/projects/valgrind/cachegrind/cg_branchpred.c#1 branch .. //depot/projects/valgrind/cachegrind/cg_main.c#2 integrate .. //depot/projects/valgrind/cachegrind/cg_merge.c#1 branch .. //depot/projects/valgrind/cachegrind/cg_sim.c#2 integrate .. //depot/projects/valgrind/cachegrind/docs/cg-manual.xml#2 integrate .. //depot/projects/valgrind/cachegrind/tests/Makefile.am#3 integrate .. //depot/projects/valgrind/cachegrind/tests/filter_stderr#2 integrate .. //depot/projects/valgrind/callgrind/Makefile.am#3 integrate .. //depot/projects/valgrind/callgrind/bb.c#2 integrate .. //depot/projects/valgrind/callgrind/bbcc.c#2 integrate .. //depot/projects/valgrind/callgrind/callgrind.h#2 integrate .. //depot/projects/valgrind/callgrind/callgrind_annotate.in#2 integrate .. //depot/projects/valgrind/callgrind/callgrind_control.in#2 integrate .. //depot/projects/valgrind/callgrind/callstack.c#2 integrate .. //depot/projects/valgrind/callgrind/clo.c#2 integrate .. //depot/projects/valgrind/callgrind/command.c#2 integrate .. //depot/projects/valgrind/callgrind/context.c#2 integrate .. //depot/projects/valgrind/callgrind/costs.c#2 integrate .. //depot/projects/valgrind/callgrind/debug.c#2 integrate .. //depot/projects/valgrind/callgrind/docs/cl-format.xml#2 integrate .. //depot/projects/valgrind/callgrind/docs/cl-manual.xml#2 integrate .. //depot/projects/valgrind/callgrind/docs/man-annotate.xml#2 integrate .. //depot/projects/valgrind/callgrind/docs/man-callgrind.xml#2 integrate .. //depot/projects/valgrind/callgrind/dump.c#2 integrate .. //depot/projects/valgrind/callgrind/events.c#2 integrate .. //depot/projects/valgrind/callgrind/fn.c#2 integrate .. //depot/projects/valgrind/callgrind/global.h#2 integrate .. //depot/projects/valgrind/callgrind/jumps.c#2 integrate .. //depot/projects/valgrind/callgrind/main.c#2 integrate .. //depot/projects/valgrind/callgrind/sim.c#2 integrate .. //depot/projects/valgrind/callgrind/tests/clreq.c#2 integrate .. //depot/projects/valgrind/callgrind/threads.c#2 integrate .. //depot/projects/valgrind/configure.in#5 integrate .. //depot/projects/valgrind/coregrind/Makefile.am#4 integrate .. //depot/projects/valgrind/coregrind/launcher-aix5-bootblock.h#1 branch .. //depot/projects/valgrind/coregrind/launcher-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/launcher-linux.c#1 branch .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#1 branch .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#1 branch .. //depot/projects/valgrind/coregrind/m_aspacemgr/priv_aspacemgr.h#1 branch .. //depot/projects/valgrind/coregrind/m_clientstate.c#2 integrate .. //depot/projects/valgrind/coregrind/m_commandline.c#2 integrate .. //depot/projects/valgrind/coregrind/m_coredump/coredump-amd64-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_coredump/coredump-elf.c#3 integrate .. //depot/projects/valgrind/coregrind/m_coredump/coredump-ppc32-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_coredump/coredump-ppc32-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_coredump/coredump-ppc64-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_coredump/coredump-ppc64-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_coredump/coredump-x86-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#2 integrate .. //depot/projects/valgrind/coregrind/m_cpuid.S#2 integrate .. //depot/projects/valgrind/coregrind/m_debugger.c#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/d3basics.c#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#3 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/misc.c#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_d3basics.h#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_misc.h#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_readdwarf.h#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_readdwarf3.h#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_readelf.h#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_readstabs.h#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_readxcoff.h#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_storage.h#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/priv_tytypes.h#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/readdwarf.c#3 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/readdwarf3.c#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/readstabs.c#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/readxcoff.c#1 branch .. //depot/projects/valgrind/coregrind/m_debuginfo/storage.c#2 integrate .. //depot/projects/valgrind/coregrind/m_debuginfo/tytypes.c#1 branch .. //depot/projects/valgrind/coregrind/m_debuglog.c#3 integrate .. //depot/projects/valgrind/coregrind/m_demangle/cp-demangle.c#2 integrate .. //depot/projects/valgrind/coregrind/m_demangle/cplus-dem.c#2 integrate .. //depot/projects/valgrind/coregrind/m_demangle/demangle.c#2 integrate .. //depot/projects/valgrind/coregrind/m_demangle/demangle.h#2 integrate .. //depot/projects/valgrind/coregrind/m_demangle/dyn-string.c#2 integrate .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-amd64-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-ppc32-aix5.S#1 branch .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-ppc32-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-ppc64-aix5.S#1 branch .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-ppc64-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-x86-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_errormgr.c#2 integrate .. //depot/projects/valgrind/coregrind/m_execontext.c#2 integrate .. //depot/projects/valgrind/coregrind/m_hashtable.c#2 integrate .. //depot/projects/valgrind/coregrind/m_initimg/initimg-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_initimg/initimg-linux.c#1 branch .. //depot/projects/valgrind/coregrind/m_initimg/simple_huffman.c#1 branch .. //depot/projects/valgrind/coregrind/m_libcassert.c#3 integrate .. //depot/projects/valgrind/coregrind/m_libcbase.c#2 integrate .. //depot/projects/valgrind/coregrind/m_libcfile.c#3 integrate .. //depot/projects/valgrind/coregrind/m_libcprint.c#2 integrate .. //depot/projects/valgrind/coregrind/m_libcproc.c#3 integrate .. //depot/projects/valgrind/coregrind/m_libcsignal.c#3 integrate .. //depot/projects/valgrind/coregrind/m_machine.c#3 integrate .. //depot/projects/valgrind/coregrind/m_main.c#4 integrate .. //depot/projects/valgrind/coregrind/m_mallocfree.c#2 integrate .. //depot/projects/valgrind/coregrind/m_options.c#2 integrate .. //depot/projects/valgrind/coregrind/m_oset.c#2 integrate .. //depot/projects/valgrind/coregrind/m_pthreadmodel.c#2 delete .. //depot/projects/valgrind/coregrind/m_redir.c#3 integrate .. //depot/projects/valgrind/coregrind/m_replacemalloc/replacemalloc_core.c#2 integrate .. //depot/projects/valgrind/coregrind/m_replacemalloc/vg_replace_malloc.c#2 integrate .. //depot/projects/valgrind/coregrind/m_scheduler/priv_sema.h#2 integrate .. //depot/projects/valgrind/coregrind/m_scheduler/scheduler.c#2 integrate .. //depot/projects/valgrind/coregrind/m_scheduler/sema.c#2 integrate .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-amd64-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-ppc32-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-ppc32-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-ppc64-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-ppc64-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_signals.c#3 integrate .. //depot/projects/valgrind/coregrind/m_stacks.c#2 integrate .. //depot/projects/valgrind/coregrind/m_stacktrace.c#3 integrate .. //depot/projects/valgrind/coregrind/m_syscall.c#3 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-aix5.h#1 branch .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-generic.h#3 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-linux-variants.h#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-linux.h#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-main.h#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#4 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-amd64-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-ppc32-aix5.S#1 branch .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-ppc32-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-ppc64-aix5.S#1 branch .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-ppc64-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-linux.S#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-amd64-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#4 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-linux-variants.c#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#5 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-ppc32-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-ppc32-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-ppc64-aix5.c#1 branch .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-ppc64-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_threadmodel.c#2 delete .. //depot/projects/valgrind/coregrind/m_threadstate.c#2 integrate .. //depot/projects/valgrind/coregrind/m_tooliface.c#2 integrate .. //depot/projects/valgrind/coregrind/m_trampoline.S#3 integrate .. //depot/projects/valgrind/coregrind/m_translate.c#2 integrate .. //depot/projects/valgrind/coregrind/m_transtab.c#2 integrate .. //depot/projects/valgrind/coregrind/m_ume.c#3 integrate .. //depot/projects/valgrind/coregrind/m_vki.c#1 branch .. //depot/projects/valgrind/coregrind/m_vkiscnums.c#1 branch .. //depot/projects/valgrind/coregrind/m_wordfm.c#1 branch .. //depot/projects/valgrind/coregrind/m_xarray.c#1 branch .. //depot/projects/valgrind/coregrind/no_op_client_for_valgrind.c#1 branch .. //depot/projects/valgrind/coregrind/pub_core_aspacemgr.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_basics.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_basics_asm.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_clientstate.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_clreq.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_commandline.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_coredump.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_cpuid.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_debugger.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_debuginfo.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_debuglog.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_demangle.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_dispatch.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_dispatch_asm.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_errormgr.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_execontext.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_hashtable.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_initimg.h#1 branch .. //depot/projects/valgrind/coregrind/pub_core_libcassert.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_libcbase.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_libcfile.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_libcprint.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_libcproc.h#3 integrate .. //depot/projects/valgrind/coregrind/pub_core_libcsignal.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_machine.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_mallocfree.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_options.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_oset.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_pthreadmodel.h#2 delete .. //depot/projects/valgrind/coregrind/pub_core_redir.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_replacemalloc.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_scheduler.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_sigframe.h#3 integrate .. //depot/projects/valgrind/coregrind/pub_core_signals.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_stacks.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_stacktrace.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_syscall.h#3 integrate .. //depot/projects/valgrind/coregrind/pub_core_syswrap.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_threadmodel.h#2 delete .. //depot/projects/valgrind/coregrind/pub_core_threadstate.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_tooliface.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_trampoline.h#3 integrate .. //depot/projects/valgrind/coregrind/pub_core_translate.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_transtab.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_transtab_asm.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_ume.h#2 integrate .. //depot/projects/valgrind/coregrind/pub_core_vki.h#1 branch .. //depot/projects/valgrind/coregrind/pub_core_vkiscnums.h#1 branch .. //depot/projects/valgrind/coregrind/pub_core_wordfm.h#1 branch .. //depot/projects/valgrind/coregrind/pub_core_xarray.h#1 branch .. //depot/projects/valgrind/coregrind/vg_preloaded.c#3 integrate .. //depot/projects/valgrind/coregrind/vki_unistd-amd64-linux.h#2 delete .. //depot/projects/valgrind/coregrind/vki_unistd-ppc32-linux.h#2 delete .. //depot/projects/valgrind/coregrind/vki_unistd-ppc64-linux.h#2 delete .. //depot/projects/valgrind/coregrind/vki_unistd-x86-linux.h#2 delete .. //depot/projects/valgrind/docs/README#2 integrate .. //depot/projects/valgrind/docs/internals/3_1_BUGSTATUS.txt#2 integrate .. //depot/projects/valgrind/docs/internals/3_2_BUGSTATUS.txt#1 branch .. //depot/projects/valgrind/docs/internals/3_3_BUGSTATUS.txt#1 branch .. //depot/projects/valgrind/docs/internals/Makefile.am#2 integrate .. //depot/projects/valgrind/docs/internals/SPEC-notes.txt#1 branch .. //depot/projects/valgrind/docs/internals/multiple-architectures.txt#2 integrate .. //depot/projects/valgrind/docs/internals/register-uses.txt#2 integrate .. //depot/projects/valgrind/docs/internals/release-HOWTO.txt#2 integrate .. //depot/projects/valgrind/docs/internals/roadmap.txt#2 integrate .. //depot/projects/valgrind/docs/internals/xml-output.txt#2 integrate .. //depot/projects/valgrind/docs/xml/FAQ.xml#2 integrate .. //depot/projects/valgrind/docs/xml/Makefile.am#2 integrate .. //depot/projects/valgrind/docs/xml/index.xml#2 integrate .. //depot/projects/valgrind/docs/xml/manual-core-adv.xml#1 branch .. //depot/projects/valgrind/docs/xml/manual-core.xml#2 integrate .. //depot/projects/valgrind/docs/xml/manual-intro.xml#2 integrate .. //depot/projects/valgrind/docs/xml/manual-writing-tools.xml#2 integrate .. //depot/projects/valgrind/docs/xml/manual.xml#2 integrate .. //depot/projects/valgrind/docs/xml/new-tech-docs.xml#1 branch .. //depot/projects/valgrind/docs/xml/quick-start-guide.xml#2 integrate .. //depot/projects/valgrind/docs/xml/tech-docs.xml#2 integrate .. //depot/projects/valgrind/docs/xml/valgrind-manpage.xml#2 integrate .. //depot/projects/valgrind/docs/xml/vg-entities.xml#2 integrate .. //depot/projects/valgrind/drd/Makefile.am#1 branch .. //depot/projects/valgrind/drd/TODO.txt#1 branch .. //depot/projects/valgrind/drd/Testing.txt#1 branch .. //depot/projects/valgrind/drd/docs/Makefile.am#1 branch .. //depot/projects/valgrind/drd/docs/drd-manual.xml#1 branch .. //depot/projects/valgrind/drd/drd.h#1 branch .. //depot/projects/valgrind/drd/drd_barrier.c#1 branch .. //depot/projects/valgrind/drd/drd_barrier.h#1 branch .. //depot/projects/valgrind/drd/drd_bitmap.c#1 branch .. //depot/projects/valgrind/drd/drd_bitmap.h#1 branch .. //depot/projects/valgrind/drd/drd_clientobj.c#1 branch .. //depot/projects/valgrind/drd/drd_clientobj.h#1 branch .. //depot/projects/valgrind/drd/drd_clientreq.c#1 branch .. //depot/projects/valgrind/drd/drd_clientreq.h#1 branch .. //depot/projects/valgrind/drd/drd_cond.c#1 branch .. //depot/projects/valgrind/drd/drd_cond.h#1 branch .. //depot/projects/valgrind/drd/drd_error.c#1 branch .. //depot/projects/valgrind/drd/drd_error.h#1 branch .. //depot/projects/valgrind/drd/drd_gomp_intercepts.c#1 branch .. //depot/projects/valgrind/drd/drd_main.c#1 branch .. //depot/projects/valgrind/drd/drd_malloc_wrappers.c#1 branch .. //depot/projects/valgrind/drd/drd_malloc_wrappers.h#1 branch .. //depot/projects/valgrind/drd/drd_mutex.c#1 branch .. //depot/projects/valgrind/drd/drd_mutex.h#1 branch .. //depot/projects/valgrind/drd/drd_pthread_intercepts.c#1 branch .. //depot/projects/valgrind/drd/drd_qtcore_intercepts.c#1 branch .. //depot/projects/valgrind/drd/drd_rwlock.c#1 branch .. //depot/projects/valgrind/drd/drd_rwlock.h#1 branch .. //depot/projects/valgrind/drd/drd_segment.c#1 branch .. //depot/projects/valgrind/drd/drd_segment.h#1 branch .. //depot/projects/valgrind/drd/drd_semaphore.c#1 branch .. //depot/projects/valgrind/drd/drd_semaphore.h#1 branch .. //depot/projects/valgrind/drd/drd_strmem_intercepts.c#1 branch .. //depot/projects/valgrind/drd/drd_suppression.c#1 branch .. //depot/projects/valgrind/drd/drd_suppression.h#1 branch .. //depot/projects/valgrind/drd/drd_thread.c#1 branch .. //depot/projects/valgrind/drd/drd_thread.h#1 branch .. //depot/projects/valgrind/drd/drd_thread_bitmap.h#1 branch .. //depot/projects/valgrind/drd/drd_track.h#1 branch .. //depot/projects/valgrind/drd/drd_vc.c#1 branch .. //depot/projects/valgrind/drd/drd_vc.h#1 branch .. //depot/projects/valgrind/drd/pub_drd_bitmap.h#1 branch .. //depot/projects/valgrind/drd/scripts/add-libjemalloc-support#1 branch .. //depot/projects/valgrind/drd/scripts/download-and-build-firefox#1 branch .. //depot/projects/valgrind/drd/scripts/download-and-build-gcc#1 branch .. //depot/projects/valgrind/drd/scripts/download-and-build-splash2.in#1 branch .. //depot/projects/valgrind/drd/scripts/measurement-functions#1 branch .. //depot/projects/valgrind/drd/scripts/run-matinv#1 branch .. //depot/projects/valgrind/drd/scripts/run-splash2#1 branch .. //depot/projects/valgrind/drd/scripts/run-splash2-water-input#1 branch .. //depot/projects/valgrind/drd/tests/Makefile.am#1 branch .. //depot/projects/valgrind/drd/tests/atomic_var.c#1 branch .. //depot/projects/valgrind/drd/tests/atomic_var.stderr.exp-with-atomic-builtins#1 branch .. //depot/projects/valgrind/drd/tests/atomic_var.stderr.exp-without-atomic-builtins#1 branch .. //depot/projects/valgrind/drd/tests/atomic_var.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/drd_bitmap_test.c#1 branch .. //depot/projects/valgrind/drd/tests/drd_bitmap_test.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/drd_bitmap_test.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/drd_bitmap_test.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/filter_cmdline0#1 branch .. //depot/projects/valgrind/drd/tests/filter_error_summary#1 branch .. //depot/projects/valgrind/drd/tests/filter_fdleak#1 branch .. //depot/projects/valgrind/drd/tests/filter_linenos#1 branch .. //depot/projects/valgrind/drd/tests/filter_none_discards#1 branch .. //depot/projects/valgrind/drd/tests/filter_stderr#1 branch .. //depot/projects/valgrind/drd/tests/fp_race.c#1 branch .. //depot/projects/valgrind/drd/tests/fp_race.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/fp_race.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/fp_race2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/fp_race2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hg01_all_ok.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hg01_all_ok.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hg02_deadlock.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hg02_deadlock.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hg03_inherit.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hg03_inherit.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hg04_race.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hg04_race.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hg05_race2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hg05_race2.stderr.exp-powerpc#1 branch .. //depot/projects/valgrind/drd/tests/hg05_race2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hg06_readshared.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hg06_readshared.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hold_lock.c#1 branch .. //depot/projects/valgrind/drd/tests/hold_lock_1.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hold_lock_1.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/hold_lock_2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/hold_lock_2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/linuxthreads_det.c#1 branch .. //depot/projects/valgrind/drd/tests/linuxthreads_det.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/linuxthreads_det.stderr.exp-linuxthreads#1 branch .. //depot/projects/valgrind/drd/tests/linuxthreads_det.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/linuxthreads_det.stdout.exp-linuxthreads#1 branch .. //depot/projects/valgrind/drd/tests/linuxthreads_det.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/matinv.c#1 branch .. //depot/projects/valgrind/drd/tests/matinv.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/matinv.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/matinv.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/memory_allocation.c#1 branch .. //depot/projects/valgrind/drd/tests/memory_allocation.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/memory_allocation.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/monitor_example.cpp#1 branch .. //depot/projects/valgrind/drd/tests/monitor_example.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/monitor_example.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/new_delete.cpp#1 branch .. //depot/projects/valgrind/drd/tests/new_delete.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/new_delete.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/omp_matinv.c#1 branch .. //depot/projects/valgrind/drd/tests/omp_matinv.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/omp_matinv.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/omp_matinv.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/omp_matinv_racy.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/omp_matinv_racy.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/omp_matinv_racy.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/omp_prime.c#1 branch .. //depot/projects/valgrind/drd/tests/omp_prime_racy.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/omp_prime_racy.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/omp_printf.c#1 branch .. //depot/projects/valgrind/drd/tests/omp_printf.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/omp_printf.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier3.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier3.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier_reinit.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier_reinit.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_barrier_reinit.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_broadcast.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_broadcast.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_broadcast.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_cancel_locked.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_cancel_locked.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_cancel_locked.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_cond_race.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_cond_race.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_cond_race.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_cond_race2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_cond_race2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_cond_race3.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_cond_race3.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_create_chain.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_create_chain.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_create_chain.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached2.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached_sem.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached_sem.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached_sem.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_detached_sem.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_inconsistent_cond_wait.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_inconsistent_cond_wait.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_inconsistent_cond_wait.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/pth_spinlock.c#1 branch .. //depot/projects/valgrind/drd/tests/pth_spinlock.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/pth_spinlock.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/qt4_mutex.cpp#1 branch .. //depot/projects/valgrind/drd/tests/qt4_mutex.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/qt4_mutex.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/qt4_rwlock.cpp#1 branch .. //depot/projects/valgrind/drd/tests/qt4_rwlock.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/qt4_rwlock.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/qt4_semaphore.cpp#1 branch .. //depot/projects/valgrind/drd/tests/qt4_semaphore.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/qt4_semaphore.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/recursive_mutex.c#1 branch .. //depot/projects/valgrind/drd/tests/recursive_mutex.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/recursive_mutex.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/recursive_mutex.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/run_openmp_test#1 branch .. //depot/projects/valgrind/drd/tests/rwlock_race.c#1 branch .. //depot/projects/valgrind/drd/tests/rwlock_race.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/rwlock_race.stderr.exp2#1 branch .. //depot/projects/valgrind/drd/tests/rwlock_race.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/rwlock_test.c#1 branch .. //depot/projects/valgrind/drd/tests/rwlock_test.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/rwlock_test.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/sem_as_mutex.c#1 branch .. //depot/projects/valgrind/drd/tests/sem_as_mutex.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/sem_as_mutex.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/sem_as_mutex2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/sem_as_mutex2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/sigalrm.c#1 branch .. //depot/projects/valgrind/drd/tests/sigalrm.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/sigalrm.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/supported_libpthread#1 branch .. //depot/projects/valgrind/drd/tests/tc01_simple_race.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc01_simple_race.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc02_simple_tls.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc02_simple_tls.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc03_re_excl.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc03_re_excl.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc04_free_lock.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc04_free_lock.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc05_simple_race.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc05_simple_race.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc06_two_races.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc06_two_races.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc07_hbl1.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc07_hbl1.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc07_hbl1.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc08_hbl2.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc08_hbl2.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc08_hbl2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc09_bad_unlock.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8#1 branch .. //depot/projects/valgrind/drd/tests/tc09_bad_unlock.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc10_rec_lock.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc10_rec_lock.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc11_XCHG.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc11_XCHG.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc11_XCHG.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc12_rwl_trivial.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc12_rwl_trivial.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc13_laog1.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc13_laog1.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc15_laog_lockdel.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc15_laog_lockdel.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc16_byterace.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc16_byterace.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc17_sembar.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc17_sembar.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc18_semabuse.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc18_semabuse.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc19_shadowmem.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc19_shadowmem.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.3#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8#1 branch .. //depot/projects/valgrind/drd/tests/tc20_verifywrap2.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc21_pthonce.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc21_pthonce.stdout.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc21_pthonce.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc22_exit_w_lock.stderr.exp-32bit#1 branch .. //depot/projects/valgrind/drd/tests/tc22_exit_w_lock.stderr.exp-64bit#1 branch .. //depot/projects/valgrind/drd/tests/tc22_exit_w_lock.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc23_bogus_condwait.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc23_bogus_condwait.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/tc24_nonzero_sem.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/tc24_nonzero_sem.vgtest#1 branch .. //depot/projects/valgrind/drd/tests/trylock.c#1 branch .. //depot/projects/valgrind/drd/tests/trylock.stderr.exp#1 branch .. //depot/projects/valgrind/drd/tests/trylock.vgtest#1 branch .. //depot/projects/valgrind/exp-omega/Makefile.am#1 branch .. //depot/projects/valgrind/exp-omega/docs/Makefile.am#1 branch .. //depot/projects/valgrind/exp-omega/docs/o-manual.xml#1 branch .. //depot/projects/valgrind/exp-omega/docs/omega_introduction.txt#1 branch .. //depot/projects/valgrind/exp-omega/exp-omega.h#1 branch .. //depot/projects/valgrind/exp-omega/o_main.c#1 branch .. //depot/projects/valgrind/exp-omega/o_replace_memops.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/Makefile.am#1 branch .. //depot/projects/valgrind/exp-omega/tests/block1.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/block2.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/block3.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/overwrite1.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/overwrite2.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/overwrite3.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/overwrite4.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/overwrite5.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/scope1.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/scope2.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/scope3.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/scope4.cpp#1 branch .. //depot/projects/valgrind/exp-omega/tests/scope5.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/scope6.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/shadow1.c#1 branch .. //depot/projects/valgrind/exp-omega/tests/static1.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck.supp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/Makefile.am#1 branch .. //depot/projects/valgrind/exp-ptrcheck/README.ABOUT.PTRCHECK.txt#1 branch .. //depot/projects/valgrind/exp-ptrcheck/docs/Makefile.am#1 branch .. //depot/projects/valgrind/exp-ptrcheck/h_intercepts.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/h_main.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/h_main.h#1 branch .. //depot/projects/valgrind/exp-ptrcheck/pc_common.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/pc_common.h#1 branch .. //depot/projects/valgrind/exp-ptrcheck/pc_main.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/sg_main.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/sg_main.h#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/Makefile.am#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/add.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/add.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/add.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/and.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/and.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/and.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/arith.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/arith.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/arith.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/arith_include1.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/arith_include2.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/bad_percentify.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/bad_percentify.stderr.exp-glibc28-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/bad_percentify.stdout.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/bad_percentify.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/base.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/base.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/base.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/base.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.cpp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.stderr.exp-glibc27-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.stderr.exp-glibc28-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/ccc.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/cmp.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/cmp.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/cmp.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/filter_add#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/filter_stderr#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/filter_suppgen#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/fp.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/fp.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/fp.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/globalerr.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/globalerr.stderr.exp-glibc28-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/globalerr.stdout.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/globalerr.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hackedbz2.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hackedbz2.stderr.exp-glibc28-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hackedbz2.stdout.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hackedbz2.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_bounds.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_bounds.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_bounds.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_dangle.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_dangle.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/hp_dangle.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/idiv.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/idiv.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/idiv.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/imul.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/imul.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/imul.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/justify.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/justify.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/justify.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/mm.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/mm.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/mm.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/neg.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/neg.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/neg.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/not.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/not.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/not.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/or.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/or.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/or.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/partial.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_bad.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_bad.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_good.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/partial_good.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/preen_invars.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/preen_invars.stderr.exp-glibc28-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/preen_invars.stdout.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/preen_invars.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/preen_invars_so.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_create.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_create.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_create.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_specific.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_specific.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/pth_specific.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/realloc.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/realloc.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/realloc.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/realloc.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/sh_script#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/sh_script.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/sh_script.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/stackerr.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/stackerr.stderr.exp-glibc27-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/stackerr.stderr.exp-glibc28-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/stackerr.stdout.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/stackerr.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strcpy.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strcpy.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strcpy.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strlen.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strlen_bad.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strlen_bad.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strlen_good.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/strlen_good.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/sub.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/sub.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/sub.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/supp.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/supp.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/supp.supp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/supp.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/suppgen.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/suppgen.stdin#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/suppgen.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/syscall.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/syscall.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/syscall.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/tricky.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/tricky.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/tricky.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/unaligned.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/unaligned.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/unaligned.vgtest#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/Makefile.am#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/asm.S#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/asm.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/asm.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/filter_stderr#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/lea.S#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/lea.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/x86/lea.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/xor.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/xor.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/xor.vgtest-disabled#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/zero.c#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/zero.stderr.exp#1 branch .. //depot/projects/valgrind/exp-ptrcheck/tests/zero.vgtest#1 branch .. //depot/projects/valgrind/glibc-2.2-LinuxThreads-helgrind.supp#1 branch .. //depot/projects/valgrind/glibc-2.2.supp#2 integrate .. //depot/projects/valgrind/glibc-2.3.supp#2 integrate .. //depot/projects/valgrind/glibc-2.34567-NPTL-helgrind.supp#1 branch .. //depot/projects/valgrind/glibc-2.4.supp#2 integrate .. //depot/projects/valgrind/glibc-2.5.supp#2 integrate .. //depot/projects/valgrind/glibc-2.6.supp#2 integrate .. //depot/projects/valgrind/glibc-2.X-drd.supp#1 branch .. //depot/projects/valgrind/glibc-2.X.supp.in#1 branch .. //depot/projects/valgrind/helgrind/Makefile.am#3 integrate .. //depot/projects/valgrind/helgrind/docs/hg-manual.xml#2 integrate .. //depot/projects/valgrind/helgrind/helgrind.h#2 integrate .. //depot/projects/valgrind/helgrind/hg_intercepts.c#1 branch .. //depot/projects/valgrind/helgrind/hg_main.c#2 integrate .. //depot/projects/valgrind/helgrind/hg_wordset.c#1 branch .. //depot/projects/valgrind/helgrind/hg_wordset.h#1 branch .. //depot/projects/valgrind/helgrind/tests/Makefile.am#3 integrate .. //depot/projects/valgrind/helgrind/tests/allok.c#2 delete .. //depot/projects/valgrind/helgrind/tests/allok.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/allok.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/deadlock.c#2 delete .. //depot/projects/valgrind/helgrind/tests/deadlock.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/deadlock.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/filter_stderr#2 integrate .. //depot/projects/valgrind/helgrind/tests/hg01_all_ok.c#1 branch .. //depot/projects/valgrind/helgrind/tests/hg01_all_ok.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/hg01_all_ok.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/hg01_all_ok.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/hg02_deadlock.c#1 branch .. //depot/projects/valgrind/helgrind/tests/hg02_deadlock.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/hg02_deadlock.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/hg02_deadlock.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/hg02_deadlock.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/hg03_inherit.c#1 branch .. //depot/projects/valgrind/helgrind/tests/hg03_inherit.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/hg03_inherit.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/hg03_inherit.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/hg03_inherit.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/hg04_race.c#1 branch .. //depot/projects/valgrind/helgrind/tests/hg04_race.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/hg04_race.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/hg04_race.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/hg04_race.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/hg05_race2.c#1 branch .. //depot/projects/valgrind/helgrind/tests/hg05_race2.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/hg05_race2.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/hg05_race2.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/hg05_race2.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/hg06_readshared.c#1 branch .. //depot/projects/valgrind/helgrind/tests/hg06_readshared.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/hg06_readshared.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/hg06_readshared.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/inherit.c#2 delete .. //depot/projects/valgrind/helgrind/tests/inherit.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/inherit.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/race.c#2 delete .. //depot/projects/valgrind/helgrind/tests/race.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/race.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/race2.c#2 delete .. //depot/projects/valgrind/helgrind/tests/race2.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/race2.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/readshared.c#2 delete .. //depot/projects/valgrind/helgrind/tests/readshared.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/readshared.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/tc01_simple_race.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc01_simple_race.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc01_simple_race.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc01_simple_race.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc01_simple_race.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc02_simple_tls.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc02_simple_tls.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc02_simple_tls.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc02_simple_tls.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc03_re_excl.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc03_re_excl.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc03_re_excl.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc03_re_excl.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc04_free_lock.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc04_free_lock.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc04_free_lock.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc04_free_lock.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc05_simple_race.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc05_simple_race.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc05_simple_race.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc05_simple_race.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc05_simple_race.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc06_two_races.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc06_two_races.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc06_two_races.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc06_two_races.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc06_two_races.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc07_hbl1.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc07_hbl1.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc07_hbl1.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc07_hbl1.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc08_hbl2.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc08_hbl2.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc08_hbl2.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc08_hbl2.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.stderr.exp-glibc23-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc09_bad_unlock.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc10_rec_lock.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc10_rec_lock.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc10_rec_lock.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc10_rec_lock.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc11_XCHG.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc11_XCHG.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc11_XCHG.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc11_XCHG.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc12_rwl_trivial.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc12_rwl_trivial.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc12_rwl_trivial.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc12_rwl_trivial.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc13_laog1.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc13_laog1.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc13_laog1.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc13_laog1.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc14_laog_dinphils.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc14_laog_dinphils.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc14_laog_dinphils.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc14_laog_dinphils.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc14_laog_dinphils.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc15_laog_lockdel.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc15_laog_lockdel.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc15_laog_lockdel.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc15_laog_lockdel.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc16_byterace.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc16_byterace.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc16_byterace.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc16_byterace.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc16_byterace.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc17_sembar.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc17_sembar.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc17_sembar.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc17_sembar.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc17_sembar.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc18_semabuse.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc18_semabuse.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc18_semabuse.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc18_semabuse.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc18_semabuse.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc19_shadowmem.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc19_shadowmem.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc19_shadowmem.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc19_shadowmem.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc19_shadowmem.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.stderr.exp-glibc23-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc20_verifywrap.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc21_pthonce.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc21_pthonce.stderr.exp-glibc23-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc21_pthonce.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc21_pthonce.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc22_exit_w_lock.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc22_exit_w_lock.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc22_exit_w_lock.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc22_exit_w_lock.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc22_exit_w_lock.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.stderr.exp-glibc25-x86#1 branch .. //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc23_bogus_condwait.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/tc24_nonzero_sem.c#1 branch .. //depot/projects/valgrind/helgrind/tests/tc24_nonzero_sem.stderr.exp-glibc25-amd64#1 branch .. //depot/projects/valgrind/helgrind/tests/tc24_nonzero_sem.stdout.exp#1 branch .. //depot/projects/valgrind/helgrind/tests/tc24_nonzero_sem.vgtest#1 branch .. //depot/projects/valgrind/helgrind/tests/toobig-allocs.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/toobig-allocs.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/Makefile.am#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/filter_stderr#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_basic.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_basic.stdout.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_basic.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_cmov.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_cmov.stdout.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_cmov.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_fpu.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_fpu.stdout.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_fpu.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_mmx.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_mmx.stdout.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_mmx.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_mmxext.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_mmxext.stdout.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_mmxext.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_sse.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_sse.stdout.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_sse.vgtest#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_sse2.stderr.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_sse2.stdout.exp#2 delete .. //depot/projects/valgrind/helgrind/tests/x86/insn_sse2.vgtest#2 delete .. //depot/projects/valgrind/include/Makefile.am#3 integrate .. //depot/projects/valgrind/include/pub_tool_aspacemgr.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_basics.h#3 integrate .. //depot/projects/valgrind/include/pub_tool_basics_asm.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_clientstate.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_clreq.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_cpuid.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_debuginfo.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_errormgr.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_execontext.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_hashtable.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_libcassert.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_libcbase.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_libcfile.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_libcprint.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_libcproc.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_libcsignal.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_machine.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_mallocfree.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_options.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_oset.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_redir.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_replacemalloc.h#2 integrate .. //depot/projects/valgrind/include/pub_tool_signals.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 23 05:24:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81A921065676; Thu, 23 Oct 2008 05:24: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 45624106566B for ; Thu, 23 Oct 2008 05:24:24 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 329838FC08 for ; Thu, 23 Oct 2008 05:24:24 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N5OOhb051668 for ; Thu, 23 Oct 2008 05:24:24 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N5OOiQ051666 for perforce@freebsd.org; Thu, 23 Oct 2008 05:24:24 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 05:24:24 GMT Message-Id: <200810230524.m9N5OOiQ051666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151775 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, 23 Oct 2008 05:24:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=151775 Change 151775 by peter@peter_cheese on 2008/10/23 05:24:08 merge freebsd changes into new MD files before re-shuffling. Affected files ... .. //depot/projects/valgrind/coregrind/launcher-linux.c#2 integrate .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#2 edit .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#2 integrate Differences ... ==== //depot/projects/valgrind/coregrind/launcher-linux.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include #include -#include +/* #include */ #include #include "pub_core_debuglog.h" @@ -241,6 +241,10 @@ mode. */ if (0==strcmp(VG_PLATFORM,"x86-linux")) default_platform = "x86-linux"; + else if (0==strcmp(VG_PLATFORM,"x86-freebsd")) + default_platform = "x86-freebsd"; + else if (0==strcmp(VG_PLATFORM,"amd64-freebsd")) + default_platform = "amd64-freebsd"; else if (0==strcmp(VG_PLATFORM,"amd64-linux")) default_platform = "amd64-linux"; else if (0==strcmp(VG_PLATFORM,"ppc32-linux")) @@ -270,14 +274,27 @@ we can tell stage2. stage2 will use the name for recursive invokations of valgrind on child processes. */ memset(launcher_name, 0, PATH_MAX+1); +#if defined(VGO_linux) r = readlink("/proc/self/exe", launcher_name, PATH_MAX); +#elif defined(VGO_freebsd) + r = readlink("/proc/curproc/file", launcher_name, PATH_MAX); +#else +#error "unknown OS" +#endif if (r == -1) { /* If /proc/self/exe can't be followed, don't give up. Instead continue with an empty string for VALGRIND_LAUNCHER. In the sys_execve wrapper, this is tested, and if found to be empty, fail the execve. */ +#if defined(VGO_linux) fprintf(stderr, "valgrind: warning (non-fatal): " "readlink(\"/proc/self/exe\") failed.\n"); +#elif defined(VGO_freebsd) + fprintf(stderr, "valgrind: warning (non-fatal): " + "readlink(\"/proc/curproc/file\") failed.\n"); +#else +#error "unknown OS" +#endif fprintf(stderr, "valgrind: continuing, however --trace-children=yes " "will not work.\n"); } ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-common.c#2 (text+ko) ==== @@ -159,6 +159,13 @@ || defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5) res = VG_(do_syscall6)(__NR_mmap, (UWord)start, length, prot, flags, fd, offset); +# elif defined(VGO_freebsd) + if (flags & VKI_MAP_ANONYMOUS && fd == 0) + fd = -1; + // AAA: fix 64 bit start + // QQQ: truncates to 32 bit offset!! + res = VG_(do_syscall7)(__NR_mmap, (UWord)start, length, + prot, flags, fd, 0, offset); # else # error Unknown platform # endif @@ -196,6 +203,10 @@ ML_(am_barf)("ML_(am_do_extend_mapping_NO_NOTIFY) on AIX5"); /* NOTREACHED, but gcc doesn't understand that */ return VG_(mk_SysRes_Error)(0); +# elif defined(VGO_freebsd) + ML_(am_barf)("ML_(am_do_extend_mapping_NO_NOTIFY) on FreeBSD"); + /* NOTREACHED, but gcc doesn't understand that */ + return VG_(mk_SysRes_Error)(0); # else # error Unknown OS # endif @@ -221,6 +232,10 @@ ML_(am_barf)("ML_(am_do_relocate_nooverlap_mapping_NO_NOTIFY) on AIX5"); /* NOTREACHED, but gcc doesn't understand that */ return VG_(mk_SysRes_Error)(0); +# elif defined(VGO_freebsd) + ML_(am_barf)("ML_(am_do_relocate_nooverlap_mapping_NO_NOTIFY) on FreeBSD"); + /* NOTREACHED, but gcc doesn't understand that */ + return VG_(mk_SysRes_Error)(0); # else # error Unknown OS # endif ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#2 (text+ko) ==== @@ -352,6 +352,7 @@ /* Given a file descriptor, attempt to deduce its filename. To do this, we use /proc/self/fd/. If this doesn't point to a file, or if it doesn't exist, we return False. */ +#if defined(VGO_linux) static Bool get_name_for_fd ( Int fd, /*OUT*/HChar* buf, Int nbuf ) { @@ -366,6 +367,49 @@ else return False; } +#elif defined(VGO_freebsd) +static +Bool get_name_for_fd ( Int fd, HChar* buf, Int nbuf ) +{ + static int nr_fromfd = -1; + SysRes res; + Int i; + + for (i = 0; i < nbuf; i++) buf[i] = 0; + if (nr_fromfd == -1) { + int oid[2]; + int real_oid[10]; + vki_size_t oidlen; + char *name = "machdep.getpath_fromfd_num"; + vki_size_t len; + int sc; + + oid[0] = 0; /* magic */ + oid[1] = 3; /* undocumented */ + oidlen = sizeof(real_oid); + res = VG_(do_syscall6)(__NR___sysctl, (UWord)oid, 2, (UWord)real_oid, (UWord)&oidlen, (UWord)name, strlen(name)); + oidlen /= sizeof(int); + if (!res.isError && oidlen > 0) { + len = sizeof(sc); + res = VG_(do_syscall6)(__NR___sysctl, (UWord)real_oid, oidlen, (UWord)&sc, (UWord)&len, 0, 0); + if (!res.isError && sc > 0) + nr_fromfd = sc; + } + if (nr_fromfd == -1) + nr_fromfd = -2; + } + if (nr_fromfd < 0) + return False; + + res = VG_(do_syscall3)(nr_fromfd, fd, (UWord)buf, nbuf); + if (!res.isError && buf[0] == '/') + return True; + else + return False; +} +#else +#error undefined os +#endif /*-----------------------------------------------------------------*/ @@ -963,12 +1007,15 @@ same = same && seg_prot == prot +#ifndef VGO_freebsd && (cmp_devino ? (nsegments[i].dev == dev && nsegments[i].ino == ino) : True) && (cmp_offsets ? nsegments[i].start-nsegments[i].offset == addr-offset - : True); + : True) +#endif + ; if (!same) { sync_check_ok = False; VG_(debugLog)( @@ -1491,8 +1538,12 @@ seg.kind = SkAnonV; if (dev != 0 && ino != 0) seg.kind = SkFileV; - if (filename) + if (filename) { +#if defined(VGO_freebsd) + seg.kind = SkFileV; +#endif seg.fnIdx = allocate_segname( filename ); + } if (0) show_nsegment( 2,0, &seg ); add_segment( &seg ); @@ -1539,7 +1590,11 @@ " sp_at_startup = 0x%010llx (supplied)\n", (ULong)sp_at_startup ); +#ifdef VGP_x86_freebsd + aspacem_minAddr = (Addr) 0x00010000; // 64K +#else aspacem_minAddr = (Addr) 0x04000000; // 64M +#endif # if VG_WORDSIZE == 8 aspacem_maxAddr = (Addr)0x800000000 - 1; // 32G @@ -1603,10 +1658,18 @@ VG_(am_show_nsegments)(2, "Initial layout"); +#ifdef VGO_freebsd + VG_(debugLog)(2, "aspacem", "Reading /proc/curproc/map\n"); +#else VG_(debugLog)(2, "aspacem", "Reading /proc/self/maps\n"); +#endif parse_procselfmaps( read_maps_callback, NULL ); +#ifdef VGO_freebsd + VG_(am_show_nsegments)(2, "With contents of /proc/curproc/map"); +#else VG_(am_show_nsegments)(2, "With contents of /proc/self/maps"); +#endif AM_SANITY_CHECK; return suggested_clstack_top; @@ -2159,7 +2222,7 @@ sres = VG_(am_do_mmap_NO_NOTIFY)( start, length, prot, VKI_MAP_FIXED|VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS, - 0, 0 + 0, 0 ); if (sres.isError) return sres; @@ -2575,6 +2638,7 @@ Addr start2 = start1; Addr end2 = end1; +//VG_(printf)("am_create_reservation start=%p, len=%p\n", start, length); if (extra < 0) start2 += extra; // this moves it down :-) if (extra > 0) end2 += extra; @@ -2590,11 +2654,15 @@ segment, we're hosed. This does rely on the assumption that all mergeable adjacent segments can be merged, but add_segment() should ensure that. */ - if (startI != endI) + if (startI != endI) { +//VG_(printf)("startI %p != endI %p\n", startI, endI); return False; + } - if (nsegments[startI].kind != SkFree) + if (nsegments[startI].kind != SkFree) { +//VG_(printf)("nsegments[startI].kind %d != SkFree %d\n", nsegments[startI].kind, SkFree); return False; + } /* Looks good - make the reservation. */ aspacem_assert(nsegments[startI].start <= start2); @@ -2914,6 +2982,12 @@ { /* Read a word-sized hex number. */ Int n = 0; + if (*buf == '0') { + n++; buf++; + if (*buf == 'x') { + n++; buf++; + } + } *val = 0; while (hexdigit(*buf) >= 0) { *val = (*val << 4) + hexdigit(*buf); @@ -2956,9 +3030,9 @@ SysRes fd; /* Read the initial memory mapping from the /proc filesystem. */ - fd = ML_(am_open)( "/proc/self/maps", VKI_O_RDONLY, 0 ); + fd = ML_(am_open)( "/proc/curproc/map", VKI_O_RDONLY, 0 ); if (fd.isError) - ML_(am_barf)("can't open /proc/self/maps"); + ML_(am_barf)("can't open /proc/curproc/map"); buf_n_tot = 0; do { @@ -2973,7 +3047,7 @@ if (buf_n_tot >= M_PROCMAP_BUF-5) ML_(am_barf_toolow)("M_PROCMAP_BUF"); if (buf_n_tot == 0) - ML_(am_barf)("I/O error on /proc/self/maps"); + ML_(am_barf)("I/O error on /proc/curproc/map"); procmap_buf[buf_n_tot] = 0; } @@ -3014,6 +3088,9 @@ UInt prot; UWord maj, min; ULong foffset, dev, ino; +#ifdef VGO_freebsd + UInt junk; +#endif foffset = ino = 0; /* keep gcc-4.1.0 happy */ @@ -3030,6 +3107,7 @@ while (True) { if (i >= buf_n_tot) break; +#if defined(VGO_linux) /* Read (without fscanf :) the pattern %16x-%16x %c%c%c%c %16x %2x:%2x %d */ j = readhex(&procmap_buf[i], &start); if (j > 0) i += j; else goto syntaxerror; @@ -3073,12 +3151,121 @@ j = readdec64(&procmap_buf[i], &ino); if (j > 0) i += j; else goto syntaxerror; +#elif defined(VGO_freebsd) + /* Read (without fscanf :) the pattern %8x %8x %d %d %8x %c%c%c%c %d %d %8x .* .* .* */ + /* 0x38000000 0x38119000 281 748 0xd76df8a0 r-x 2 1 0x0 COW NC vnode */ + j = readhex(&procmap_buf[i], &start); + if (j > 0) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + j = readhex(&procmap_buf[i], &endPlusOne); + if (j > 0) i += j; else goto syntaxerror; + + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + + j = readdec(&procmap_buf[i], &junk); + if (j > 0) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + j = readdec(&procmap_buf[i], &junk); + if (j > 0) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + j = readhex(&procmap_buf[i], &junk); + if (j > 0) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + + j = readchar(&procmap_buf[i], &rr); + if (j == 1 && (rr == 'r' || rr == '-')) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ww); + if (j == 1 && (ww == 'w' || ww == '-')) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &xx); + if (j == 1 && (xx == 'x' || xx == '-')) i += j; else goto syntaxerror; + + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + + j = readdec(&procmap_buf[i], &junk); + if (j > 0) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + j = readdec(&procmap_buf[i], &junk); + if (j > 0) i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + + j = readhex(&procmap_buf[i], &junk); + if (j > 0) i += j; else goto syntaxerror; + + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + + /* COW or NCOW */ + j = readchar(&procmap_buf[i], &ch); + if (j != 1) goto syntaxerror; + if (ch == 'N') { + i += j; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'C') i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'O') i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'W') i += j; else goto syntaxerror; + } else if (ch == 'C') { + i += j; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'O') i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'W') i += j; else goto syntaxerror; + } else { + goto syntaxerror; + } + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + + /* NC or NNC */ + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'N') i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && (ch == 'N' || ch == 'C')) i += j; else goto syntaxerror; + if (ch == 'N') { + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'C') i += j; else goto syntaxerror; + } + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == ' ') i += j; else goto syntaxerror; + + /* map type (vnode, swap, default) */ + j = readchar(&procmap_buf[i], &ch); + if (j != 1) goto syntaxerror; + if (ch == 'v') { + i += j; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'n') i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'o') i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'd') i += j; else goto syntaxerror; + j = readchar(&procmap_buf[i], &ch); + if (j == 1 && ch == 'e') i += j; else goto syntaxerror; + } + foffset = 0; +#else +#error "Unknown OS" +#endif goto read_line_ok; syntaxerror: +#ifdef VGO_freebsd + VG_(debugLog)(0, "Valgrind:", + "FATAL: syntax error reading /proc/curproc/map\n"); +#else VG_(debugLog)(0, "Valgrind:", "FATAL: syntax error reading /proc/self/maps\n"); +#endif { Int k, m; HChar buf50[51]; m = 0; @@ -3120,11 +3307,19 @@ foffset = 0; } +#if 0 +#ifdef VGO_freebsd + if (!filename) + filename = find_path(start); +#endif +#endif + prot = 0; if (rr == 'r') prot |= VKI_PROT_READ; if (ww == 'w') prot |= VKI_PROT_WRITE; if (xx == 'x') prot |= VKI_PROT_EXEC; +#if defined(VGO_linux) /* Linux has two ways to encode a device number when it is exposed to user space (via fstat etc). The old way is the traditional unix scheme that produces a 16 bit @@ -3145,7 +3340,9 @@ should always have a new style device number and everything should match. */ dev = (min & 0xff) | (maj << 8) | ((min & ~0xff) << 12); - +#else + dev = 0; +#endif if (record_gap && gapStart < start) (*record_gap) ( gapStart, start-gapStart ); From owner-p4-projects@FreeBSD.ORG Thu Oct 23 05:27:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 445D3106567C; Thu, 23 Oct 2008 05:27: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 0A87B106566B for ; Thu, 23 Oct 2008 05:27:38 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D41138FC12 for ; Thu, 23 Oct 2008 05:27:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N5RbOl052747 for ; Thu, 23 Oct 2008 05:27:37 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N5RbGV052745 for perforce@freebsd.org; Thu, 23 Oct 2008 05:27:37 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 05:27:37 GMT Message-Id: <200810230527.m9N5RbGV052745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151776 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, 23 Oct 2008 05:27:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=151776 Change 151776 by peter@peter_cheese on 2008/10/23 05:26:36 files have moved or split Affected files ... .. //depot/projects/valgrind/coregrind/launcher.c#3 delete .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr.c#3 delete .. //depot/projects/valgrind/coregrind/vki_unistd.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 23 05:47:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDD551065683; Thu, 23 Oct 2008 05:47: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 8178A1065671 for ; Thu, 23 Oct 2008 05:47:58 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6FC4D8FC16 for ; Thu, 23 Oct 2008 05:47:58 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N5lwjT054274 for ; Thu, 23 Oct 2008 05:47:58 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N5lwFC054272 for perforce@freebsd.org; Thu, 23 Oct 2008 05:47:58 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 05:47:58 GMT Message-Id: <200810230547.m9N5lwFC054272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151778 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, 23 Oct 2008 05:47:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=151778 Change 151778 by peter@peter_cheese on 2008/10/23 05:47:08 Catch up with vendor changes, or revert. Affected files ... .. //depot/projects/valgrind/cachegrind/Makefile.am#4 edit .. //depot/projects/valgrind/cachegrind/tests/Makefile.am#4 edit .. //depot/projects/valgrind/callgrind/tests/Makefile.am#3 edit .. //depot/projects/valgrind/helgrind/tests/Makefile.am#4 edit .. //depot/projects/valgrind/memcheck/tests/Makefile.am#4 edit .. //depot/projects/valgrind/none/tests/Makefile.am#4 edit .. //depot/projects/valgrind/none/tests/x86/Makefile.am#4 edit Differences ... ==== //depot/projects/valgrind/cachegrind/Makefile.am#4 (text+ko) ==== @@ -4,6 +4,7 @@ noinst_HEADERS = cg_arch.h cg_sim.c cg_branchpred.c +noinst_PROGRAMS = if VGP_X86_FREEBSD noinst_PROGRAMS += cachegrind-x86-freebsd endif ==== //depot/projects/valgrind/cachegrind/tests/Makefile.am#4 (text+ko) ==== @@ -39,7 +39,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI) # C ones -if !VG_X86_FREEBSD +if !VGP_X86_FREEBSD dlclose_LDADD = -ldl endif myprint_so_SOURCES = myprint.c ==== //depot/projects/valgrind/callgrind/tests/Makefile.am#3 (text+ko) ==== @@ -15,7 +15,7 @@ check_PROGRAMS = clreq simwork -if !VG_X86_FREEBSD +if !VGP_X86_FREEBSD check_PROGRAMS += threads endif ==== //depot/projects/valgrind/helgrind/tests/Makefile.am#4 (text+ko) ==== @@ -86,7 +86,7 @@ tc24_nonzero_sem.vgtest tc24_nonzero_sem.stdout.exp \ tc24_nonzero_sem.stderr.exp-glibc25-amd64 -if !VG_X86_FREEBSD +if !VGP_X86_FREEBSD check_PROGRAMS = \ hg01_all_ok \ hg02_deadlock \ ==== //depot/projects/valgrind/memcheck/tests/Makefile.am#4 (text+ko) ==== @@ -232,7 +232,7 @@ wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \ writev zeropage -if !VG_X86_FREEBSD +if !VGP_X86_FREEBSD check_PROGRAMS += stack_switch endif ==== //depot/projects/valgrind/none/tests/Makefile.am#4 (text+ko) ==== @@ -147,28 +147,21 @@ fdleak_cmsg fdleak_creat fdleak_dup fdleak_dup2 \ fdleak_fcntl fdleak_ipv4 fdleak_open fdleak_pipe \ fdleak_socketpair \ - floored fork fucomip \ - munmap_exe map_unaligned map_unmap \ + floored fork fucomip manythreads \ + munmap_exe map_unaligned map_unmap mq mremap mremap2 \ nestedfns \ pending \ - rcrl readline1 resolv \ - rlimit_nofile selfrun sem sha1_test \ - shortpush shorts stackgrowth sigstackgrowth \ + pth_atfork1 pth_blockedsig pth_cancel1 pth_cancel2 pth_cvsimple \ + pth_empty pth_exit pth_exit2 pth_mutexspeed pth_once pth_rwlock \ + pth_stackalign \ + rcrl readline1 res_search resolv \ + rlimit_nofile selfrun sem semlimit sha1_test \ + shortpush shorts stackgrowth sigstackgrowth susphello \ syscall-restart1 syscall-restart2 system \ - vgprintf \ + thread-exits threaded-fork threadederrno \ + tls tls.so tls2.so vgprintf \ coolo_sigaction gxx304 -#if !VG_X86_FREEBSD -#check_PROGRAMS += manythreads mq mremap mremap2 \ -# pth_atfork1 pth_blockedsig pth_cancel1 pth_cancel2 pth_cvsimple \ -# pth_empty pth_exit pth_exit2 pth_mutexspeed pth_once pth_rwlock \ -# pth_stackalign \ -# res_search \ -# semlimit susphello \ -# thread-exits threaded-fork threadederrno \ -# tls.so tls2.so \ -#endif - AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CXXFLAGS = $(AM_CFLAGS) ==== //depot/projects/valgrind/none/tests/x86/Makefile.am#4 (text+ko) ==== @@ -1,7 +1,6 @@ noinst_SCRIPTS = filter_cpuid filter_stderr gen_insn_test.pl CLEANFILES = $(addsuffix .c,$(INSN_TESTS)) -INSN_TESTS = insn_basic insn_cmov INSN_TESTS = insn_basic insn_fpu insn_cmov insn_mmx insn_mmxext \ insn_sse insn_sse2 From owner-p4-projects@FreeBSD.ORG Thu Oct 23 05:50:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 975E71065679; Thu, 23 Oct 2008 05:50:01 +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 5A7151065670 for ; Thu, 23 Oct 2008 05:50:01 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4902F8FC1D for ; Thu, 23 Oct 2008 05:50:01 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N5o0RP054394 for ; Thu, 23 Oct 2008 05:50:00 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N5o0Bg054392 for perforce@freebsd.org; Thu, 23 Oct 2008 05:50:00 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 05:50:00 GMT Message-Id: <200810230550.m9N5o0Bg054392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151779 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, 23 Oct 2008 05:50:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=151779 Change 151779 by peter@peter_cheese on 2008/10/23 05:49:50 Shuffle files around to suit new world order. Affected files ... .. //depot/projects/valgrind/include/vki-amd64-freebsd.h#2 delete .. //depot/projects/valgrind/include/vki-freebsd.h#5 delete .. //depot/projects/valgrind/include/vki-x86-freebsd.h#2 delete .. //depot/projects/valgrind/include/vki/vki-amd64-freebsd.h#1 branch .. //depot/projects/valgrind/include/vki/vki-freebsd.h#1 branch .. //depot/projects/valgrind/include/vki/vki-machine-types-amd64-freebsd.#1 branch .. //depot/projects/valgrind/include/vki/vki-machine-types-x86-freebsd.#1 branch .. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#1 branch .. //depot/projects/valgrind/include/vki_machine_types-amd64-freebsd.h#2 delete .. //depot/projects/valgrind/include/vki_machine_types-x86-freebsd.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 23 05:56:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43A0A106567C; Thu, 23 Oct 2008 05:56: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 0721A1065675 for ; Thu, 23 Oct 2008 05:56:07 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA26A8FC13 for ; Thu, 23 Oct 2008 05:56:06 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N5u6Yb054891 for ; Thu, 23 Oct 2008 05:56:06 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N5u6bI054889 for perforce@freebsd.org; Thu, 23 Oct 2008 05:56:06 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 05:56:06 GMT Message-Id: <200810230556.m9N5u6bI054889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151780 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, 23 Oct 2008 05:56:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=151780 Change 151780 by peter@peter_cheese on 2008/10/23 05:55:53 Don't insist on gnu sed. 'sed -E' works fine. Affected files ... .. //depot/projects/valgrind/configure.in#6 edit Differences ... ==== //depot/projects/valgrind/configure.in#6 (text+ko) ==== @@ -95,20 +95,20 @@ # on some pretty fancy sed expressions, and AIX sed doesn't produce the # same results, causing install to fail -AC_MSG_CHECKING([for GNU sed]) - -[sed_firstline=`sed --version | head -n 1`] - -case "${sed_firstline}" in - GNU*) - AC_MSG_RESULT([ok, looks like GNU sed]) - ;; - *) - AC_MSG_RESULT([please ensure first 'sed' in your path is GNU sed]) - AC_MSG_RESULT([note: GNU sed is only required at build/install time]) - AC_MSG_ERROR([build/install requires that 'sed' is GNU sed]) - ;; -esac +#AC_MSG_CHECKING([for GNU sed]) +# +#[sed_firstline=`sed --version | head -n 1`] +# +#case "${sed_firstline}" in +# GNU*) +# AC_MSG_RESULT([ok, looks like GNU sed]) +# ;; +# *) +# AC_MSG_RESULT([please ensure first 'sed' in your path is GNU sed]) +# AC_MSG_RESULT([note: GNU sed is only required at build/install time]) +# AC_MSG_ERROR([build/install requires that 'sed' is GNU sed]) +# ;; +#esac # We don't want gcc < 3.0 From owner-p4-projects@FreeBSD.ORG Thu Oct 23 05:57:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B58001065679; Thu, 23 Oct 2008 05:57: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 78189106566B for ; Thu, 23 Oct 2008 05:57:08 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 665A88FC25 for ; Thu, 23 Oct 2008 05:57:08 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N5v8IH054954 for ; Thu, 23 Oct 2008 05:57:08 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N5v7Dk054952 for perforce@freebsd.org; Thu, 23 Oct 2008 05:57:07 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 05:57:07 GMT Message-Id: <200810230557.m9N5v7Dk054952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151781 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, 23 Oct 2008 05:57:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=151781 Change 151781 by peter@peter_cheese on 2008/10/23 05:56:15 Connect up correct vki backend files. Affected files ... .. //depot/projects/valgrind/include/pub_tool_vki.h#2 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#2 edit .. //depot/projects/valgrind/include/vki/vki-machine-types-amd64-freebsd.#2 delete .. //depot/projects/valgrind/include/vki/vki-machine-types-amd64-freebsd.h#1 branch .. //depot/projects/valgrind/include/vki/vki-machine-types-x86-freebsd.#2 delete .. //depot/projects/valgrind/include/vki/vki-machine-types-x86-freebsd.h#1 branch Differences ... ==== //depot/projects/valgrind/include/pub_tool_vki.h#2 (text+ko) ==== @@ -47,6 +47,8 @@ #if defined(VGO_linux) # include "vki/vki-linux.h" +#elif defined(VGO_freebsd) +# include "vki/vki-freebsd.h" #elif defined(VGP_ppc32_aix5) # include "vki/vki-ppc32-aix5.h" #elif defined(VGP_ppc64_aix5) ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#2 (text+ko) ==== @@ -65,9 +65,9 @@ //---------------------------------------------------------------------- #if defined(VGA_x86) -# include "vki_machine_types-x86-freebsd.h" +# include "vki-machine-types-x86-freebsd.h" #elif defined(VGA_amd64) -# include "vki_machine_types-amd64-freebsd.h" +# include "vki-machine-types-amd64-freebsd.h" #else # error Unknown platform #endif From owner-p4-projects@FreeBSD.ORG Thu Oct 23 06:07:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0D5D1065674; Thu, 23 Oct 2008 06:07:18 +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 94EBE1065671 for ; Thu, 23 Oct 2008 06:07:18 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 83D538FC23 for ; Thu, 23 Oct 2008 06:07:18 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N67IqO056845 for ; Thu, 23 Oct 2008 06:07:18 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N67IIL056843 for perforce@freebsd.org; Thu, 23 Oct 2008 06:07:18 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 06:07:18 GMT Message-Id: <200810230607.m9N67IIL056843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151782 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, 23 Oct 2008 06:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=151782 Change 151782 by peter@peter_cheese on 2008/10/23 06:06:42 Catch up with more file renames. Affected files ... .. //depot/projects/valgrind/coregrind/vki_syscall-freebsd.h#3 delete .. //depot/projects/valgrind/include/pub_tool_vkiscnums.h#2 edit .. //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#1 branch Differences ... ==== //depot/projects/valgrind/include/pub_tool_vkiscnums.h#2 (text+ko) ==== @@ -64,6 +64,9 @@ #elif defined(VGP_ppc64_linux) # include "vki/vki-scnums-ppc64-linux.h" +#elif defined(VGO_freebsd) +# include "vki/vki-scnums-freebsd.h" + #elif defined(VGP_ppc32_aix5) || defined(VGP_ppc64_aix5) # include "vki/vki-scnums-aix5.h" From owner-p4-projects@FreeBSD.ORG Thu Oct 23 06:25:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76AE21065679; Thu, 23 Oct 2008 06:25: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 3B2F11065674 for ; Thu, 23 Oct 2008 06:25:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 298EB8FC12 for ; Thu, 23 Oct 2008 06:25:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N6PbED058278 for ; Thu, 23 Oct 2008 06:25:37 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N6PbAI058276 for perforce@freebsd.org; Thu, 23 Oct 2008 06:25:37 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 06:25:37 GMT Message-Id: <200810230625.m9N6PbAI058276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151783 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, 23 Oct 2008 06:25:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=151783 Change 151783 by peter@peter_cheese on 2008/10/23 06:25:33 Checkpoint catchup to 3.3.2 Affected files ... .. //depot/projects/valgrind/coregrind/m_debugger.c#3 edit .. //depot/projects/valgrind/coregrind/m_libcfile.c#4 edit .. //depot/projects/valgrind/coregrind/m_libcproc.c#4 edit .. //depot/projects/valgrind/coregrind/m_libcsignal.c#4 edit .. //depot/projects/valgrind/coregrind/pub_core_machine.h#3 edit .. //depot/projects/valgrind/include/pub_tool_machine.h#3 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#3 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_debugger.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + /*--------------------------------------------------------------------*/ /*--- Attaching a debugger. m_debugger.c ---*/ /*--------------------------------------------------------------------*/ @@ -211,6 +211,9 @@ #elif defined(VGP_ppc64_aix5) I_die_here; +#elif defined(VGP_x86_freebsd) || defined(VGP_amd64_freebsd) + I_die_here; + #else # error Unknown arch #endif ==== //depot/projects/valgrind/coregrind/m_libcfile.c#4 (text+ko) ==== @@ -227,6 +227,13 @@ TRANSLATE_TO_vg_stat(vgbuf, &buf); return res; } +# elif defined(VGO_freebsd) + { struct vki_stat buf; + res = VG_(do_syscall2)(__NR_stat, (UWord)file_name, (UWord)&buf); + if (!res.isError) + TRANSLATE_TO_vg_stat(vgbuf, &buf); + return res; + } # elif defined(VGO_aix5) { struct vki_stat buf; res = VG_(do_syscall4)(__NR_AIX5_statx, @@ -272,6 +279,13 @@ TRANSLATE_TO_vg_stat(vgbuf, &buf); return res.isError ? (-1) : 0; } +# elif defined(VGO_freebsd) + { struct vki_stat buf; + res = VG_(do_syscall2)(__NR_fstat, (UWord)fd, (UWord)&buf); + if (!res.isError) + TRANSLATE_TO_vg_stat(vgbuf, &buf); + return res.isError ? (-1) : 0; + } # elif defined(VGO_aix5) I_die_here; # else @@ -306,6 +320,8 @@ { # if defined(VGO_linux) return VG_(do_syscall2)(__NR_dup2, oldfd, newfd); +# elif defined(VGO_freebsd) + return VG_(do_syscall2)(__NR_dup2, oldfd, newfd); # elif defined(VGO_aix5) I_die_here; # else @@ -383,11 +399,20 @@ return True; } # elif defined(VGO_freebsd) - res = VG_(do_syscall2)(__NR___getcwd, (UWord)buf, size); + /* Simple: just ask the kernel */ + { SysRes res + = VG_(do_syscall2)(__NR___getcwd, (UWord)startup_wd, szB-1); + vg_assert(startup_wd[szB-1] == 0); + if (res.isError) { + return False; + } else { + startup_wd_acquired = True; + return True; + } + } # else # error Unknown OS # endif -#endif } /* Copy the previously acquired startup_wd into buf[0 .. size-1], ==== //depot/projects/valgrind/coregrind/m_libcproc.c#4 (text+ko) ==== @@ -228,7 +228,7 @@ Int VG_(waitpid)(Int pid, Int *status, Int options) { -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) SysRes res = VG_(do_syscall4)(__NR_wait4, pid, (UWord)status, options, 0); return res.isError ? -1 : res.res; # elif defined(VGO_aix5) @@ -372,7 +372,7 @@ Int VG_(gettid)(void) { // VG_(printf)("valgrind: gettid() faked\n"); - return VG_(do_syscall0)(__NR_getpid) . val; + return VG_(do_syscall0)(__NR_getpid).res; } #else Int VG_(gettid)(void) @@ -653,7 +653,7 @@ res = VG_(do_syscall6)(__NR___sysctl, (UWord)name, namelen, (UWord)oldp, (UWord)oldlenp, (UWord)newp, newlen); if (res.isError) return -1; - return res.val; + return res.res; } Int VG_(sysctlbyname)(const Char *name, void *oldp, vki_size_t *oldlenp, void *newp, vki_size_t newlen) @@ -681,7 +681,7 @@ res = VG_(do_syscall1)(__NR_modfind, (UWord)modname); if (res.isError) return -1; - return res.val; + return res.res; } #endif ==== //depot/projects/valgrind/coregrind/m_libcsignal.c#4 (text+ko) ==== @@ -234,7 +234,7 @@ static const struct vki_timespec zero = { 0, 0 }; /* only on freebsd6.x and higher */ SysRes res = VG_(do_syscall3)(__NR_sigtimedwait, (UWord)set, (UWord)info, - (UWord)timeout); + (UWord)&zero); return res.isError ? -1 : res.res; } #elif defined(VGO_aix5) || (defined(VGO_freebsd) && __FreeBSD__ < 6) ==== //depot/projects/valgrind/coregrind/pub_core_machine.h#3 (text+ko) ==== @@ -39,12 +39,12 @@ #include "pub_tool_machine.h" -#if defined(VGP_x86_linux) +#if defined(VGP_x86_linux) || defined(VGP_x86_freebsd) # define VG_ELF_DATA2XXX ELFDATA2LSB # define VG_ELF_MACHINE EM_386 # define VG_ELF_CLASS ELFCLASS32 # undef VG_PLAT_USES_PPCTOC -#elif defined(VGP_amd64_linux) +#elif defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) # define VG_ELF_DATA2XXX ELFDATA2LSB # define VG_ELF_MACHINE EM_X86_64 # define VG_ELF_CLASS ELFCLASS64 ==== //depot/projects/valgrind/include/pub_tool_machine.h#3 (text+ko) ==== @@ -31,13 +31,13 @@ #ifndef __PUB_TOOL_MACHINE_H #define __PUB_TOOL_MACHINE_H -#if defined(VGP_x86_linux) +#if defined(VGP_x86_linux) || defined(VGP_x86_freebsd) # define VG_MIN_INSTR_SZB 1 // min length of native instruction # define VG_MAX_INSTR_SZB 16 // max length of native instruction # define VG_CLREQ_SZB 14 // length of a client request, may // be larger than VG_MAX_INSTR_SZB # define VG_STACK_REDZONE_SZB 0 // number of addressable bytes below %RSP -#elif defined(VGP_amd64_linux) +#elif defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) # define VG_MIN_INSTR_SZB 1 # define VG_MAX_INSTR_SZB 16 # define VG_CLREQ_SZB 19 ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#3 (text+ko) ==== @@ -255,6 +255,11 @@ // From sys/time.h //---------------------------------------------------------------------- +#define VKI_CLOCK_REALTIME 0 +#define VKI_CLOCK_MONOTONIC 1 +#define VKI_CLOCK_PROCESS_CPUTIME_ID 2 +#define VKI_CLOCK_THREAD_CPUTIME_ID 3 + struct vki_timezone { int tz_minuteswest; /* minutes west of Greenwich */ int tz_dsttime; /* type of dst correction */ @@ -336,9 +341,18 @@ vki_uid_t st_uid; vki_gid_t st_gid; vki_dev_t st_rdev; +#if 0 struct vki_timespec st_atimespec; struct vki_timespec st_mtimespec; struct vki_timespec st_ctimespec; +#else + vki_time_t st_atime; + long st_atime_nsec; + vki_time_t st_mtime; + long st_mtime_nsec; + vki_time_t st_ctime; + long st_ctime_nsec; +#endif vki_off_t st_size; vki_blkcnt_t st_blocks; vki_blksize_t st_blksize; From owner-p4-projects@FreeBSD.ORG Thu Oct 23 06:50:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 887A41065676; Thu, 23 Oct 2008 06:50: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 488F11065683 for ; Thu, 23 Oct 2008 06:50:02 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 370AB8FC13 for ; Thu, 23 Oct 2008 06:50:02 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N6o2Gd060201 for ; Thu, 23 Oct 2008 06:50:02 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N6o2gu060199 for perforce@freebsd.org; Thu, 23 Oct 2008 06:50:02 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 06:50:02 GMT Message-Id: <200810230650.m9N6o2gu060199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151784 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, 23 Oct 2008 06:50:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=151784 Change 151784 by peter@peter_cheese on 2008/10/23 06:49:08 Checkpoint more compile fixes. Affected files ... .. //depot/projects/valgrind/coregrind/m_debuginfo/d3basics.c#2 edit .. //depot/projects/valgrind/coregrind/m_machine.c#4 edit .. //depot/projects/valgrind/coregrind/m_main.c#5 edit .. //depot/projects/valgrind/coregrind/m_signals.c#4 edit .. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#5 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#6 edit .. //depot/projects/valgrind/coregrind/m_trampoline.S#4 edit .. //depot/projects/valgrind/coregrind/pub_core_initimg.h#2 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_debuginfo/d3basics.c#2 (text+ko) ==== @@ -378,10 +378,10 @@ static Bool get_Dwarf_Reg( /*OUT*/Addr* a, Word regno, RegSummary* regs ) { vg_assert(regs); -# if defined(VGP_amd64_linux) +# if defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) if (regno == 6/*RBP*/) { *a = regs->fp; return True; } if (regno == 7/*RSP*/) { *a = regs->sp; return True; } -# elif defined(VGP_x86_linux) +# elif defined(VGP_x86_linux) || defined(VGP_x86_freebsd) if (regno == 5/*EBP*/) { *a = regs->fp; return True; } if (regno == 4/*ESP*/) { *a = regs->sp; return True; } # elif defined(VGP_ppc32_linux) ==== //depot/projects/valgrind/coregrind/m_machine.c#4 (text+ko) ==== @@ -100,6 +100,10 @@ VG_(threads)[tid].arch.vex_shadow2.guest_GPR3 = s2res; VG_(threads)[tid].arch.vex_shadow1.guest_GPR4 = s1err; VG_(threads)[tid].arch.vex_shadow2.guest_GPR4 = s2err; +# elif defined(VGP_x86_freebsd) + VG_(threads)[tid].arch.vex_shadow1.guest_EAX = s1res; + VG_(threads)[tid].arch.vex_shadow2.guest_EAX = s2res; + /* QQQ: this is very incomplete. EDX and EFL are affected */ # else # error "Unknown plat" # endif ==== //depot/projects/valgrind/coregrind/m_main.c#5 (text+ko) ==== @@ -1528,7 +1528,7 @@ if (!need_help) { VG_(debugLog)(1, "main", "Create initial image\n"); -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) the_iicii.argv = argv; the_iicii.envp = envp; the_iicii.toolname = toolname; ==== //depot/projects/valgrind/coregrind/m_signals.c#4 (text+ko) ==== @@ -1977,7 +1977,6 @@ "si_code=%x; Faulting address: %p; sp: %#lx", info->si_code, info->VKI_SIGINFO_si_addr, VG_UCONTEXT_STACK_PTR(uc)); -#endif if (0) VG_(kill_self)(sigNo); /* generate a core dump */ ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#5 (text+ko) ==== @@ -298,6 +298,7 @@ vg_assert(st->what == SsComplete); vg_assert(st->sres.isError); return st->sres.err; +} #ifdef VGO_freebsd /* FreeBSD syscalls have TWO return values! */ ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#6 (text+ko) ==== @@ -620,11 +620,10 @@ #elif defined(VGP_x86_freebsd) VexGuestX86State* gst = (VexGuestX86State*)gst_vanilla; - vg_assert(canonical->what == SsSuccess - || canonical->what == SsFailure); - gst->guest_EAX = canonical->val; - gst->guest_EDX = canonical->val2; - if (canonical->what == SsFailure) { + vg_assert(canonical->what == SsComplete); + gst->guest_EAX = canonical->sres.res; + gst->guest_EDX = canonical->sres.res2; + if (canonical->sres.isError) { LibVEX_GuestX86_put_eflag_c( 1, gst ); } else { LibVEX_GuestX86_put_eflag_c( 0, gst ); @@ -632,11 +631,10 @@ #elif defined(VGP_amd64_freebsd) VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla; - vg_assert(canonical->what == SsSuccess - || canonical->what == SsFailure); - gst->guest_RAX = canonical->val; - gst->guest_RDX = canonical->val2; - if (canonical->what == SsFailure) { + vg_assert(canonical->what == SsComplete); + gst->guest_RAX = canonical->sres.res; + gst->guest_RDX = canonical->sres.res2; + if (canonical->sres.isError) { LibVEX_GuestAMD64_put_rflag_c( 1, gst ); } else { LibVEX_GuestAMD64_put_rflag_c( 0, gst ); @@ -790,7 +788,7 @@ { const SyscallTableEntry* sys = NULL; -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) if (syscallno < ML_(syscall_table_size) && ML_(syscall_table)[syscallno].before != NULL) sys = &ML_(syscall_table)[syscallno]; @@ -1047,9 +1045,8 @@ PRINT("SYSCALL[%d,%d](%3ld) ... [async] --> %s(0x%llx,0x%llx)\n", VG_(getpid)(), tid, sysno, sci->status.sres.isError ? "Failure" : "Success", - (Long)sci->status.val, (Long)sci->status.val2 ); sci->status.sres.isError ? (ULong)sci->status.sres.err - : (ULong)sci->status.sres.res ); + : (ULong)sci->status.sres.res, sci->status.sres.isError ? (ULong)0 : (ULong)sci->status.sres.res2 ); #else @@ -1094,9 +1091,8 @@ #ifdef VGO_freebsd PRINT("[sync] --> %s(0x%llx, 0x%llx)\n", sci->status.sres.isError ? "Failure" : "Success", - (Long)sci->status.val, (Long)sci->status.val2 ); sci->status.sres.isError ? (ULong)sci->status.sres.err - : (ULong)sci->status.sres.res ); + : (ULong)sci->status.sres.res, sci->status.sres.isError ? (ULong)0 : (ULong)sci->status.sres.res2 ); #else ==== //depot/projects/valgrind/coregrind/m_trampoline.S#4 (text+ko) ==== @@ -803,6 +803,7 @@ #endif #endif #endif +#endif #if defined(VGO_linux) /* Let the linker know we don't need an executable stack */ ==== //depot/projects/valgrind/coregrind/pub_core_initimg.h#2 (text+ko) ==== @@ -67,7 +67,7 @@ /* ------------------------- Linux ------------------------- */ -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) struct _IICreateImageInfo { /* ------ Mandatory fields ------ */ From owner-p4-projects@FreeBSD.ORG Thu Oct 23 07:00:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B37C10656BE; Thu, 23 Oct 2008 07:00: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 4B12610656EE for ; Thu, 23 Oct 2008 07:00:14 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DA368FC14 for ; Thu, 23 Oct 2008 07:00:12 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N70CMv061029 for ; Thu, 23 Oct 2008 07:00:12 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N70Cbj061027 for perforce@freebsd.org; Thu, 23 Oct 2008 07:00:12 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 07:00:12 GMT Message-Id: <200810230700.m9N70Cbj061027@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151785 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, 23 Oct 2008 07:00:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=151785 Change 151785 by peter@peter_cheese on 2008/10/23 06:59:56 Branch from linux base Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#1 branch .. //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 23 07:27:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16028106567A; Thu, 23 Oct 2008 07:27: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 B539C1065679 for ; Thu, 23 Oct 2008 07:27:40 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2A708FC0A for ; Thu, 23 Oct 2008 07:27:40 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N7RegL064265 for ; Thu, 23 Oct 2008 07:27:40 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N7ReBY064263 for perforce@freebsd.org; Thu, 23 Oct 2008 07:27:40 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 07:27:40 GMT Message-Id: <200810230727.m9N7ReBY064263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151787 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, 23 Oct 2008 07:27:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=151787 Change 151787 by peter@peter_cheese on 2008/10/23 07:27:36 Checkpoint. libcoregrind builds. Affected files ... .. //depot/projects/valgrind/coregrind/m_coredump/coredump-x86-freebsd.c#2 edit .. //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#3 edit .. //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#2 edit .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#2 edit .. //depot/projects/valgrind/coregrind/m_syscall.c#4 edit .. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#6 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#4 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd-variants.c#3 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#9 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#5 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#6 edit .. //depot/projects/valgrind/coregrind/pub_core_syscall.h#4 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_coredump/coredump-x86-freebsd.c#2 (text+ko) ==== @@ -29,6 +29,7 @@ */ #include "pub_core_basics.h" +#include "pub_core_vki.h" #include "pub_core_libcbase.h" #include "pub_core_coredump.h" #include "pub_core_threadstate.h" ==== //depot/projects/valgrind/coregrind/m_debuginfo/readelf.c#3 (text+ko) ==== @@ -1490,7 +1490,8 @@ } /* PLT is different on different platforms, it seems. */ -# if defined(VGP_x86_linux) || defined(VGP_amd64_linux) +# if defined(VGP_x86_linux) || defined(VGP_amd64_linux) || \ + defined(VGP_x86_freebsd) || defined(VGP_amd64_freebsd) /* Accept .plt where mapped as rx (code) */ if (0 == VG_(strcmp)(name, ".plt")) { if (inrx && size > 0 && !di->plt_present) { ==== //depot/projects/valgrind/coregrind/m_initimg/initimg-freebsd.c#2 (text+ko) ==== @@ -483,15 +483,9 @@ /* now, how big is the auxv? */ auxsize = sizeof(*auxv); /* there's always at least one entry: AT_NULL */ for (cauxv = orig_auxv; cauxv->a_type != AT_NULL; cauxv++) { - if (cauxv->a_type == AT_PLATFORM) - stringsize += VG_(strlen)(cauxv->u.a_ptr) + 1; auxsize += sizeof(*cauxv); } -# if defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux) - auxsize += 2 * sizeof(*cauxv); -# endif - /* OK, now we know how big the client stack is */ stacksize = sizeof(Word) + /* argc */ @@ -639,14 +633,6 @@ auxv = (struct ume_auxv *)ptr; *client_auxv = (UInt *)auxv; -# if defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux) - auxv[0].a_type = AT_IGNOREPPC; - auxv[0].u.a_val = AT_IGNOREPPC; - auxv[1].a_type = AT_IGNOREPPC; - auxv[1].u.a_val = AT_IGNOREPPC; - auxv += 2; -# endif - for (; orig_auxv->a_type != AT_NULL; auxv++, orig_auxv++) { /* copy the entry... */ @@ -664,8 +650,6 @@ case AT_EUID: case AT_GID: case AT_EGID: - case AT_CLKTCK: - case AT_FPUCW: /* All these are pointerless, so we don't need to do anything about them. */ break; @@ -688,45 +672,15 @@ auxv->u.a_val = info->interp_base; break; - case AT_PLATFORM: - /* points to a platform description string */ - auxv->u.a_ptr = copy_str(&strtab, orig_auxv->u.a_ptr); - break; - case AT_ENTRY: auxv->u.a_val = info->entry; break; - case AT_HWCAP: - break; - case AT_DCACHEBSIZE: case AT_ICACHEBSIZE: case AT_UCACHEBSIZE: -# if defined(VGP_ppc32_linux) - /* acquire cache info */ - if (auxv->u.a_val > 0) { - VG_(machine_ppc32_set_clszB)( auxv->u.a_val ); - VG_(debugLog)(2, "initimg", - "PPC32 cache line size %u (type %u)\n", - (UInt)auxv->u.a_val, (UInt)auxv->a_type ); - } -# elif defined(VGP_ppc64_linux) - /* acquire cache info */ - if (auxv->u.a_val > 0) { - VG_(machine_ppc64_set_clszB)( auxv->u.a_val ); - VG_(debugLog)(2, "initimg", - "PPC64 cache line size %u (type %u)\n", - (UInt)auxv->u.a_val, (UInt)auxv->a_type ); - } -# endif break; -# if defined(VGP_ppc32_linux) || defined(VGP_ppc64_linux) - case AT_IGNOREPPC: - break; -# endif - case AT_SECURE: /* If this is 1, then it means that this program is running suid, and therefore the dynamic linker should @@ -738,9 +692,7 @@ break; case AT_SYSINFO: -# if !defined(VGP_ppc32_linux) && !defined(VGP_ppc64_linux) case AT_SYSINFO_EHDR: -# endif /* Trash this, because we don't reproduce it */ auxv->a_type = AT_IGNORE; break; @@ -954,7 +906,7 @@ /* On Linux we get client_{ip/sp/toc}, and start the client with all other registers zeroed. */ -# if defined(VGP_x86_linux) +# if defined(VGP_x86_freebsd) vg_assert(0 == sizeof(VexGuestX86State) % 8); /* Zero out the initial state, and set up the simulated FPU in a @@ -975,7 +927,7 @@ asm volatile("movw %%ds, %0" : : "m" (arch->vex.guest_DS)); asm volatile("movw %%ss, %0" : : "m" (arch->vex.guest_SS)); -# elif defined(VGP_amd64_linux) +# elif defined(VGP_amd64_freebsd) vg_assert(0 == sizeof(VexGuestAMD64State) % 8); /* Zero out the initial state, and set up the simulated FPU in a @@ -990,37 +942,6 @@ arch->vex.guest_RSP = iifii.initial_client_SP; arch->vex.guest_RIP = iifii.initial_client_IP; -# elif defined(VGP_ppc32_linux) - vg_assert(0 == sizeof(VexGuestPPC32State) % 8); - - /* Zero out the initial state, and set up the simulated FPU in a - sane way. */ - LibVEX_GuestPPC32_initialise(&arch->vex); - - /* Zero out the shadow areas. */ - VG_(memset)(&arch->vex_shadow1, 0, sizeof(VexGuestPPC32State)); - VG_(memset)(&arch->vex_shadow2, 0, sizeof(VexGuestPPC32State)); - - /* Put essential stuff into the new state. */ - arch->vex.guest_GPR1 = iifii.initial_client_SP; - arch->vex.guest_CIA = iifii.initial_client_IP; - -# elif defined(VGP_ppc64_linux) - vg_assert(0 == sizeof(VexGuestPPC64State) % 16); - - /* Zero out the initial state, and set up the simulated FPU in a - sane way. */ - LibVEX_GuestPPC64_initialise(&arch->vex); - - /* Zero out the shadow areas. */ - VG_(memset)(&arch->vex_shadow1, 0, sizeof(VexGuestPPC64State)); - VG_(memset)(&arch->vex_shadow2, 0, sizeof(VexGuestPPC64State)); - - /* Put essential stuff into the new state. */ - arch->vex.guest_GPR1 = iifii.initial_client_SP; - arch->vex.guest_GPR2 = iifii.initial_client_TOC; - arch->vex.guest_CIA = iifii.initial_client_IP; - # else # error Unknown platform # endif ==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#2 (text+ko) ==== @@ -30,6 +30,7 @@ */ #include "pub_core_basics.h" +#include "pub_core_vki.h" #include "pub_core_threadstate.h" #include "pub_core_aspacemgr.h" /* find_segment */ #include "pub_core_libcbase.h" @@ -98,7 +99,8 @@ /* XXX This is wrong. Surely we should store the shadow values into the shadow memory behind the actual values? */ - VexGuestX86State vex_shadow; + VexGuestX86State vex_shadow1; + VexGuestX86State vex_shadow2; /* HACK ALERT */ VexGuestX86State vex; @@ -438,7 +440,7 @@ /* For tracking memory events, indicate the entire frame has been allocated. */ VG_TRACK( new_mem_stack_signal, addr - VG_STACK_REDZONE_SZB, - size + VG_STACK_REDZONE_SZB ); + size + VG_STACK_REDZONE_SZB, tid ); return True; } @@ -454,7 +456,8 @@ { frame->sigNo_private = sigNo; frame->magicPI = 0x31415927; - frame->vex_shadow = tst->arch.vex_shadow; + frame->vex_shadow1 = tst->arch.vex_shadow1; + frame->vex_shadow2 = tst->arch.vex_shadow2; /* HACK ALERT */ frame->vex = tst->arch.vex; /* end HACK ALERT */ @@ -573,6 +576,7 @@ void VG_(sigframe_create)( ThreadId tid, Addr esp_top_of_frame, const vki_siginfo_t *siginfo, + const struct vki_ucontext *uc, void *handler, UInt flags, const vki_sigset_t *mask, @@ -643,7 +647,8 @@ } tst->sig_mask = frame->mask; tst->tmp_sig_mask = frame->mask; - tst->arch.vex_shadow = frame->vex_shadow; + tst->arch.vex_shadow1 = frame->vex_shadow1; + tst->arch.vex_shadow2 = frame->vex_shadow2; /* HACK ALERT */ tst->arch.vex = frame->vex; /* end HACK ALERT */ ==== //depot/projects/valgrind/coregrind/m_syscall.c#4 (text+ko) ==== @@ -183,6 +183,17 @@ return r; } +#ifdef VGO_freebsd +SysRes VG_(mk_SysRes_Success2) ( UWord res, UWord res2 ) { + SysRes r; + r.res = res; + r.res2 = res2; + r.err = 0; + r.isError = False; + return r; +} +#endif + /* --------------------------------------------------------------------- A function for doing syscalls. ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#6 (text+ko) ==== @@ -318,6 +318,13 @@ status->sres = VG_(mk_SysRes_Success)(zzz); \ } while (0) +#ifdef VGO_freebsd +#define SET_STATUS_Success2(zzz, zzz2) \ + do { status->what = SsComplete; \ + status->sres = VG_(mk_SysRes_Success2)(zzz, zzz2); \ + } while (0) +#endif + #define SET_STATUS_Failure(zzz) \ do { Word wzz = (Word)(zzz); \ /* Catch out wildly bogus error values. */ \ ==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include "pub_core_basics_asm.h" -#include "vki_unistd.h" +#include "pub_core_vkiscnums.h" #include "libvex_guest_offsets.h" ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd-variants.c#3 (text+ko) ==== @@ -46,6 +46,7 @@ #include "pub_core_basics.h" +#include "pub_core_vki.h" #include "pub_core_threadstate.h" #include "pub_core_aspacemgr.h" #include "pub_core_debuginfo.h" // VG_(di_notify_*) ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#9 (text+ko) ==== @@ -29,10 +29,13 @@ */ #include "pub_core_basics.h" +#include "pub_core_vki.h" +#include "pub_core_vkiscnums.h" #include "pub_core_threadstate.h" #include "pub_core_aspacemgr.h" #include "pub_core_debuginfo.h" // VG_(di_notify_*) #include "pub_core_transtab.h" // VG_(discard_translations) +#include "pub_core_xarray.h" #include "pub_core_clientstate.h" #include "pub_core_debuglog.h" #include "pub_core_libcbase.h" @@ -41,7 +44,6 @@ #include "pub_core_libcprint.h" #include "pub_core_libcproc.h" #include "pub_core_libcsignal.h" -#include "pub_core_machine.h" #include "pub_core_mallocfree.h" #include "pub_core_tooliface.h" #include "pub_core_options.h" @@ -54,8 +56,6 @@ #include "priv_syswrap-generic.h" #include "priv_syswrap-freebsd.h" -#include "vki_unistd.h" /* for the __NR_* constants */ - // Run a thread from beginning to end and return the thread's // scheduler-return-code. static VgSchedReturnCode thread_wrapper(Word /*ThreadId*/ tidW) @@ -70,14 +70,15 @@ vg_assert(tst->status == VgTs_Init); + /* make sure we get the CPU lock before doing anything significant */ - VG_(set_running)(tid); + VG_(acquire_BigLock)(tid, "thread_wrapper(starting new thread)"); if (0) VG_(printf)("thread tid %d started: stack = %p\n", tid, &tid); - VG_TRACK ( post_thread_create, tst->os_state.parent, tid ); + VG_TRACK (pre_thread_first_insn, tid); tst->os_state.lwpid = VG_(gettid)(); tst->os_state.threadgroup = VG_(getpid)(); @@ -301,7 +302,7 @@ res = VG_(do_syscall0)( __NR_fork ); - if (!res.isError && res.val == 0) { + if (!res.isError && res.res == 0) { /* child */ VG_(do_atfork_child)(tid); @@ -309,11 +310,11 @@ VG_(sigprocmask)(VKI_SIG_SETMASK, &fork_saved_mask, NULL); } else - if (!res.isError && res.val > 0) { + if (!res.isError && res.res > 0) { /* parent */ if (VG_(clo_trace_syscalls)) VG_(printf)(" clone(fork): process %d created child %d\n", - VG_(getpid)(), res.val); + VG_(getpid)(), res.res); /* restore signal mask */ VG_(sigprocmask)(VKI_SIG_SETMASK, &fork_saved_mask, NULL); ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#5 (text+ko) ==== @@ -2358,6 +2358,7 @@ PRE_REG_READ2(long, "getpriority", int, which, int, who); } +#ifdef VGO_linux PRE(sys_pwrite64_on64bitplat) { vg_assert(sizeof(UWord) == 8); @@ -2370,7 +2371,6 @@ PRE_MEM_READ( "pwrite64(buf)", ARG2, ARG3 ); } -#ifdef VGO_linux // The actual kernel definition of this routine takes a // single 64 bit offset argument. This version is for 32 bit // platforms only and treats the offset as two values - the @@ -2429,6 +2429,7 @@ PRE_REG_READ1(long, "getsid", vki_pid_t, pid); } +#ifdef VGO_linux PRE(sys_pread64_on64bitplat) { vg_assert(sizeof(UWord) == 8); @@ -2449,7 +2450,6 @@ } } -#ifdef VGO_linux // The actual kernel definition of this routine takes a // single 64 bit offset argument. This version is for 32 bit // platforms only and treats the offset as two values - the @@ -2709,9 +2709,7 @@ */ { vki_sigset_t allsigs; -#if 0 vki_siginfo_t info; -#endif for (i = 1; i < VG_(max_signal); i++) { struct vki_sigaction sa; @@ -2727,7 +2725,6 @@ VG_(sigfillset)(&allsigs); while(VG_(sigtimedwait_zero)(&allsigs, &info) > 0) ; -#endif VG_(sigprocmask)(VKI_SIG_SETMASK, &tst->sig_mask, NULL); } @@ -4349,7 +4346,6 @@ } } break; -#endif /* I2C (/dev/i2c-*) ioctls */ case VKI_I2C_SLAVE: @@ -4360,6 +4356,7 @@ case VKI_I2C_FUNCS: PRE_MEM_WRITE( "ioctl(I2C_FUNCS)", ARG3, sizeof(unsigned long) ); break; +#endif /* We don't have any specific information on it, so try to do something reasonable based on direction and @@ -5070,7 +5067,6 @@ } } break; -#endif /* I2C (/dev/i2c-*) ioctls */ case VKI_I2C_SLAVE: @@ -5081,6 +5077,7 @@ case VKI_I2C_FUNCS: POST_MEM_WRITE( ARG3, sizeof(unsigned long) ); break; +#endif /* We don't have any specific information on it, so try to do something reasonable based on direction and ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#6 (text+ko) ==== @@ -34,6 +34,8 @@ */ #include "pub_core_basics.h" +#include "pub_core_vki.h" +#include "pub_core_vkiscnums.h" #include "pub_core_threadstate.h" #include "pub_core_debuginfo.h" // VG_(di_notify_mmap) #include "pub_core_aspacemgr.h" @@ -52,14 +54,13 @@ #include "pub_core_syscall.h" #include "pub_core_syswrap.h" #include "pub_core_tooliface.h" +#include "pub_core_stacks.h" // VG_(register_stack) #include "priv_types_n_macros.h" #include "priv_syswrap-generic.h" /* for decls of generic wrappers */ #include "priv_syswrap-freebsd.h" /* for decls of linux-ish wrappers */ #include "priv_syswrap-main.h" -#include "vki_unistd.h" /* for the __NR_* constants */ - /* Simulate C-style return values for pipe(2). This does not belong here at all, it should be in m_libcfile.c. */ @@ -152,7 +153,7 @@ static VexGuestX86SegDescr* alloc_zeroed_x86_GDT ( void ) { Int nbytes = VEX_GUEST_X86_GDT_NENT * sizeof(VexGuestX86SegDescr); - return VG_(arena_calloc)(VG_AR_CORE, nbytes, 1); + return VG_(arena_calloc)(VG_AR_CORE, "di.syswrap-x86.azxG.1", nbytes, 1); } #if 0 @@ -160,7 +161,7 @@ static VexGuestX86SegDescr* alloc_zeroed_x86_LDT ( void ) { Int nbytes = VEX_GUEST_X86_LDT_NENT * sizeof(VexGuestX86SegDescr); - return VG_(arena_calloc)(VG_AR_CORE, nbytes, 1); + return VG_(arena_calloc)(VG_AR_CORE, "di.syswrap-x86.azxL.1", nbytes, 1); } /* Free up an LDT or GDT allocated by the above fns. */ ==== //depot/projects/valgrind/coregrind/pub_core_syscall.h#4 (text+ko) ==== @@ -99,6 +99,9 @@ extern SysRes VG_(mk_SysRes_amd64_freebsd) ( ULong val, ULong val2, ULong flags ); extern SysRes VG_(mk_SysRes_Error) ( UWord val ); extern SysRes VG_(mk_SysRes_Success) ( UWord val ); +#ifdef VGO_freebsd +extern SysRes VG_(mk_SysRes_Success2) ( UWord val, UWord val2 ); +#endif /* Return a string which gives the name of an error value. Note, From owner-p4-projects@FreeBSD.ORG Thu Oct 23 08:22:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5529F1065679; Thu, 23 Oct 2008 08:22: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 1986B1065676 for ; Thu, 23 Oct 2008 08:22:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E33548FC19 for ; Thu, 23 Oct 2008 08:22:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N8MaG2069563 for ; Thu, 23 Oct 2008 08:22:36 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N8MasU069561 for perforce@freebsd.org; Thu, 23 Oct 2008 08:22:36 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 08:22:36 GMT Message-Id: <200810230822.m9N8MasU069561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151790 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, 23 Oct 2008 08:22:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=151790 Change 151790 by peter@peter_cheese on 2008/10/23 08:21:41 Clone for local mods Affected files ... .. //depot/projects/valgrind/coregrind/launcher-freebsd.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Oct 23 08:35:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7BD810656AB; Thu, 23 Oct 2008 08:35: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 754421065676 for ; Thu, 23 Oct 2008 08:35:50 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62CD48FC23 for ; Thu, 23 Oct 2008 08:35:50 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N8ZobI070634 for ; Thu, 23 Oct 2008 08:35:50 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N8Zo3j070632 for perforce@freebsd.org; Thu, 23 Oct 2008 08:35:50 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 08:35:50 GMT Message-Id: <200810230835.m9N8Zo3j070632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151793 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, 23 Oct 2008 08:35:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=151793 Change 151793 by peter@peter_cheese on 2008/10/23 08:35:38 Checkpoint. Compiles and links. That's it though. Affected files ... .. //depot/projects/valgrind/Makefile.core.am#4 edit .. //depot/projects/valgrind/Makefile.flags.am#4 edit .. //depot/projects/valgrind/Makefile.tool.am#4 edit .. //depot/projects/valgrind/coregrind/Makefile.am#5 edit .. //depot/projects/valgrind/coregrind/launcher-freebsd.c#2 edit .. //depot/projects/valgrind/coregrind/launcher-linux.c#3 edit .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#2 edit .. //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#4 edit .. //depot/projects/valgrind/coregrind/m_libcbase.c#3 edit .. //depot/projects/valgrind/coregrind/m_replacemalloc/vg_replace_malloc.c#3 edit .. //depot/projects/valgrind/coregrind/m_ume.c#4 edit .. //depot/projects/valgrind/coregrind/pub_core_debuginfo.h#3 edit .. //depot/projects/valgrind/memcheck/mc_replace_strmem.c#3 edit Differences ... ==== //depot/projects/valgrind/Makefile.core.am#4 (text+ko) ==== @@ -95,5 +95,3 @@ -DVGP_ppc64_aix5=1 include $(top_srcdir)/Makefile.flags.am -PRELOAD_LDFLAGS_X86_FREEBSD = $(PRELOAD_LDFLAGS_COMMON) @FLAG_M32@ -PRELOAD_LDFLAGS_AMD64_FREEBSD = $(PRELOAD_LDFLAGS_COMMON) -m64 ==== //depot/projects/valgrind/Makefile.flags.am#4 (text+ko) ==== @@ -78,9 +78,12 @@ # Baseline link flags for making dynamic shared objects. # PRELOAD_LDFLAGS_COMMON_LINUX = -nodefaultlibs -shared -Wl,-z,interpose,-z,initfirst +PRELOAD_LDFLAGS_COMMON_FREEBSD = -nodefaultlibs -shared -Wl,-z,interpose,-z,initfirst PRELOAD_LDFLAGS_COMMON_AIX5 = -nodefaultlibs -shared -Wl,-G -Wl,-bnogc PRELOAD_LDFLAGS_X86_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@ PRELOAD_LDFLAGS_AMD64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@ +PRELOAD_LDFLAGS_X86_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M32@ +PRELOAD_LDFLAGS_AMD64_FREEBSD = $(PRELOAD_LDFLAGS_COMMON_FREEBSD) @FLAG_M64@ PRELOAD_LDFLAGS_PPC32_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@ PRELOAD_LDFLAGS_PPC64_LINUX = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@ PRELOAD_LDFLAGS_PPC32_AIX5 = $(PRELOAD_LDFLAGS_COMMON_AIX5) @FLAG_MAIX32@ ==== //depot/projects/valgrind/Makefile.tool.am#4 (text+ko) ==== @@ -117,17 +117,20 @@ TOOL_LDFLAGS_COMMON_LINUX = -static \ -Wl,-defsym,valt_load_address=@VALT_LOAD_ADDRESS@ \ -nodefaultlibs -nostartfiles -u _start +TOOL_LDFLAGS_COMMON_FREEBSD = -static \ + -Wl,-defsym,valt_load_address=@VALT_LOAD_ADDRESS@ \ + -nodefaultlibs -nostartfiles -u _start TOOL_LDFLAGS_COMMON_AIX5 = -static -Wl,-e_start_valgrind TOOL_LDADD_X86_FREEBSD = $(COREGRIND_LIBS_X86_FREEBSD) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_X86_FREEBSD = \ - $(TOOL_LDFLAGS_COMMON_X86_FREEBSD) @FLAG_M32@ \ + $(TOOL_LDFLAGS_COMMON_FREEBSD) @FLAG_M32@ \ -Wl,-T,$(top_builddir)/valt_load_address_x86_freebsd.lds TOOL_LDADD_AMD64_FREEBSD = $(COREGRIND_LIBS_AMD64_FREEBSD) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_FREEBSD = \ - $(TOOL_LDFLAGS_COMMON_AMD64_FREEBSD) -m64 \ + $(TOOL_LDFLAGS_COMMON_FREEBSD) -m64 \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_freebsd.lds TOOL_LDADD_X86_LINUX = $(COREGRIND_LIBS_X86_LINUX) $(TOOL_LDADD_COMMON) ==== //depot/projects/valgrind/coregrind/Makefile.am#5 (text+ko) ==== @@ -57,11 +57,17 @@ launcher-aix5.c \ m_debuglog.c \ m_vkiscnums.c -else +endif +if VGO_LINUX valgrind_SOURCES = \ launcher-linux.c \ m_debuglog.c endif +if VGO_FREEBSD +valgrind_SOURCES = \ + launcher-freebsd.c \ + m_debuglog.c +endif valgrind_CPPFLAGS = $(AM_CPPFLAGS_PRI) valgrind_CFLAGS = $(AM_CFLAGS_PRI) ==== //depot/projects/valgrind/coregrind/launcher-freebsd.c#2 (text+ko) ==== @@ -150,13 +150,7 @@ if (header[EI_DATA] == ELFDATA2LSB) { if (ehdr->e_machine == EM_386 && ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV) { - platform = "x86-linux"; - } - } - else if (header[EI_DATA] == ELFDATA2MSB) { - if (ehdr->e_machine == EM_PPC && - ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV) { - platform = "ppc32-linux"; + platform = "x86-freebsd"; } } } else if (header[EI_CLASS] == ELFCLASS64) { @@ -165,13 +159,8 @@ if (header[EI_DATA] == ELFDATA2LSB) { if (ehdr->e_machine == EM_X86_64 && ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV) { - platform = "amd64-linux"; + platform = "amd64-freebsd"; } - } else if (header[EI_DATA] == ELFDATA2MSB) { - if (ehdr->e_machine == EM_PPC64 && - ehdr->e_ident[EI_OSABI] == ELFOSABI_SYSV) { - platform = "ppc64-linux"; - } } } } @@ -239,18 +228,10 @@ target, because on most ppc64-linux setups, the basic /bin, /usr/bin, etc, stuff is built in 32-bit mode, not 64-bit mode. */ - if (0==strcmp(VG_PLATFORM,"x86-linux")) - default_platform = "x86-linux"; - else if (0==strcmp(VG_PLATFORM,"x86-freebsd")) + if (0==strcmp(VG_PLATFORM,"x86-freebsd")) default_platform = "x86-freebsd"; else if (0==strcmp(VG_PLATFORM,"amd64-freebsd")) default_platform = "amd64-freebsd"; - else if (0==strcmp(VG_PLATFORM,"amd64-linux")) - default_platform = "amd64-linux"; - else if (0==strcmp(VG_PLATFORM,"ppc32-linux")) - default_platform = "ppc32-linux"; - else if (0==strcmp(VG_PLATFORM,"ppc64-linux")) - default_platform = "ppc32-linux"; else barf("Unknown VG_PLATFORM '%s'", VG_PLATFORM); @@ -274,27 +255,14 @@ we can tell stage2. stage2 will use the name for recursive invokations of valgrind on child processes. */ memset(launcher_name, 0, PATH_MAX+1); -#if defined(VGO_linux) - r = readlink("/proc/self/exe", launcher_name, PATH_MAX); -#elif defined(VGO_freebsd) r = readlink("/proc/curproc/file", launcher_name, PATH_MAX); -#else -#error "unknown OS" -#endif if (r == -1) { /* If /proc/self/exe can't be followed, don't give up. Instead continue with an empty string for VALGRIND_LAUNCHER. In the sys_execve wrapper, this is tested, and if found to be empty, fail the execve. */ -#if defined(VGO_linux) fprintf(stderr, "valgrind: warning (non-fatal): " - "readlink(\"/proc/self/exe\") failed.\n"); -#elif defined(VGO_freebsd) - fprintf(stderr, "valgrind: warning (non-fatal): " "readlink(\"/proc/curproc/file\") failed.\n"); -#else -#error "unknown OS" -#endif fprintf(stderr, "valgrind: continuing, however --trace-children=yes " "will not work.\n"); } ==== //depot/projects/valgrind/coregrind/launcher-linux.c#3 (text+ko) ==== @@ -241,10 +241,6 @@ mode. */ if (0==strcmp(VG_PLATFORM,"x86-linux")) default_platform = "x86-linux"; - else if (0==strcmp(VG_PLATFORM,"x86-freebsd")) - default_platform = "x86-freebsd"; - else if (0==strcmp(VG_PLATFORM,"amd64-freebsd")) - default_platform = "amd64-freebsd"; else if (0==strcmp(VG_PLATFORM,"amd64-linux")) default_platform = "amd64-linux"; else if (0==strcmp(VG_PLATFORM,"ppc32-linux")) @@ -274,27 +270,14 @@ we can tell stage2. stage2 will use the name for recursive invokations of valgrind on child processes. */ memset(launcher_name, 0, PATH_MAX+1); -#if defined(VGO_linux) r = readlink("/proc/self/exe", launcher_name, PATH_MAX); -#elif defined(VGO_freebsd) - r = readlink("/proc/curproc/file", launcher_name, PATH_MAX); -#else -#error "unknown OS" -#endif if (r == -1) { /* If /proc/self/exe can't be followed, don't give up. Instead continue with an empty string for VALGRIND_LAUNCHER. In the sys_execve wrapper, this is tested, and if found to be empty, fail the execve. */ -#if defined(VGO_linux) fprintf(stderr, "valgrind: warning (non-fatal): " "readlink(\"/proc/self/exe\") failed.\n"); -#elif defined(VGO_freebsd) - fprintf(stderr, "valgrind: warning (non-fatal): " - "readlink(\"/proc/curproc/file\") failed.\n"); -#else -#error "unknown OS" -#endif fprintf(stderr, "valgrind: continuing, however --trace-children=yes " "will not work.\n"); } ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#2 (text+ko) ==== @@ -352,22 +352,6 @@ /* Given a file descriptor, attempt to deduce its filename. To do this, we use /proc/self/fd/. If this doesn't point to a file, or if it doesn't exist, we return False. */ -#if defined(VGO_linux) -static -Bool get_name_for_fd ( Int fd, /*OUT*/HChar* buf, Int nbuf ) -{ - Int i; - HChar tmp[64]; - - ML_(am_sprintf)(tmp, "/proc/self/fd/%d", fd); - for (i = 0; i < nbuf; i++) buf[i] = 0; - - if (ML_(am_readlink)(tmp, buf, nbuf) > 0 && buf[0] == '/') - return True; - else - return False; -} -#elif defined(VGO_freebsd) static Bool get_name_for_fd ( Int fd, HChar* buf, Int nbuf ) { @@ -407,9 +391,6 @@ else return False; } -#else -#error undefined os -#endif /*-----------------------------------------------------------------*/ @@ -1005,17 +986,7 @@ seg_prot |= VKI_PROT_EXEC; } - same = same - && seg_prot == prot -#ifndef VGO_freebsd - && (cmp_devino - ? (nsegments[i].dev == dev && nsegments[i].ino == ino) - : True) - && (cmp_offsets - ? nsegments[i].start-nsegments[i].offset == addr-offset - : True) -#endif - ; + same = same && seg_prot == prot; if (!same) { sync_check_ok = False; VG_(debugLog)( @@ -1539,9 +1510,7 @@ if (dev != 0 && ino != 0) seg.kind = SkFileV; if (filename) { -#if defined(VGO_freebsd) seg.kind = SkFileV; -#endif seg.fnIdx = allocate_segname( filename ); } @@ -1658,18 +1627,10 @@ VG_(am_show_nsegments)(2, "Initial layout"); -#ifdef VGO_freebsd VG_(debugLog)(2, "aspacem", "Reading /proc/curproc/map\n"); -#else - VG_(debugLog)(2, "aspacem", "Reading /proc/self/maps\n"); -#endif parse_procselfmaps( read_maps_callback, NULL ); -#ifdef VGO_freebsd VG_(am_show_nsegments)(2, "With contents of /proc/curproc/map"); -#else - VG_(am_show_nsegments)(2, "With contents of /proc/self/maps"); -#endif AM_SANITY_CHECK; return suggested_clstack_top; @@ -3088,9 +3049,7 @@ UInt prot; UWord maj, min; ULong foffset, dev, ino; -#ifdef VGO_freebsd - UInt junk; -#endif + ULong junk64; foffset = ino = 0; /* keep gcc-4.1.0 happy */ @@ -3107,51 +3066,6 @@ while (True) { if (i >= buf_n_tot) break; -#if defined(VGO_linux) - /* Read (without fscanf :) the pattern %16x-%16x %c%c%c%c %16x %2x:%2x %d */ - j = readhex(&procmap_buf[i], &start); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == '-') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &endPlusOne); - if (j > 0) i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &rr); - if (j == 1 && (rr == 'r' || rr == '-')) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ww); - if (j == 1 && (ww == 'w' || ww == '-')) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &xx); - if (j == 1 && (xx == 'x' || xx == '-')) i += j; else goto syntaxerror; - /* This field is the shared/private flag */ - j = readchar(&procmap_buf[i], &pp); - if (j == 1 && (pp == 'p' || pp == '-' || pp == 's')) - i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readhex64(&procmap_buf[i], &foffset); - if (j > 0) i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readhex(&procmap_buf[i], &maj); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ':') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &min); - if (j > 0) i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readdec64(&procmap_buf[i], &ino); - if (j > 0) i += j; else goto syntaxerror; -#elif defined(VGO_freebsd) /* Read (without fscanf :) the pattern %8x %8x %d %d %8x %c%c%c%c %d %d %8x .* .* .* */ /* 0x38000000 0x38119000 281 748 0xd76df8a0 r-x 2 1 0x0 COW NC vnode */ j = readhex(&procmap_buf[i], &start); @@ -3164,15 +3078,15 @@ j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readdec(&procmap_buf[i], &junk); + j = readdec64(&procmap_buf[i], &junk64); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readdec(&procmap_buf[i], &junk); + j = readdec64(&procmap_buf[i], &junk64); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &junk); + j = readhex64(&procmap_buf[i], &junk64); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; @@ -3187,16 +3101,16 @@ j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readdec(&procmap_buf[i], &junk); + j = readdec64(&procmap_buf[i], &junk64); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readdec(&procmap_buf[i], &junk); + j = readdec64(&procmap_buf[i], &junk64); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &junk); + j = readhex64(&procmap_buf[i], &junk64); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); @@ -3252,20 +3166,12 @@ if (j == 1 && ch == 'e') i += j; else goto syntaxerror; } foffset = 0; -#else -#error "Unknown OS" -#endif goto read_line_ok; syntaxerror: -#ifdef VGO_freebsd VG_(debugLog)(0, "Valgrind:", "FATAL: syntax error reading /proc/curproc/map\n"); -#else - VG_(debugLog)(0, "Valgrind:", - "FATAL: syntax error reading /proc/self/maps\n"); -#endif { Int k, m; HChar buf50[51]; m = 0; @@ -3308,11 +3214,9 @@ } #if 0 -#ifdef VGO_freebsd if (!filename) filename = find_path(start); #endif -#endif prot = 0; if (rr == 'r') prot |= VKI_PROT_READ; ==== //depot/projects/valgrind/coregrind/m_debuginfo/debuginfo.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ #include "priv_storage.h" #include "priv_readdwarf.h" #include "priv_readstabs.h" -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) # include "priv_readelf.h" # include "priv_readdwarf3.h" #elif defined(VGO_aix5) @@ -485,7 +485,7 @@ /*--- ---*/ /*--------------------------------------------------------------*/ -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) /* The debug info system is driven by notifications that a text segment has been mapped in, or unmapped. When that happens it ==== //depot/projects/valgrind/coregrind/m_libcbase.c#3 (text+ko) ==== @@ -501,6 +501,14 @@ return dest; } +#ifdef VGO_freebsd +/* Gcc generates internal inline calls for struct copies */ +void* memcpy ( void *dest, const void *src, SizeT sz ) +{ + return VG_(memcpy)(dest, src, sz); +} +#endif + void* VG_(memmove)(void *dest, const void *src, SizeT sz) { SizeT i; ==== //depot/projects/valgrind/coregrind/m_replacemalloc/vg_replace_malloc.c#3 (text+ko) ==== @@ -57,7 +57,7 @@ /* --- Soname of the standard C library. --- */ -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) # define m_libc_soname libcZdsoZa // libc.so* #elif defined(VGP_ppc32_aix5) /* AIX has both /usr/lib/libc.a and /usr/lib/libc_r.a. */ ==== //depot/projects/valgrind/coregrind/m_ume.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include "pub_core_basics.h" #include "pub_core_vki.h" -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) #include "pub_core_aspacemgr.h" // various mapping fns #include "pub_core_debuglog.h" ==== //depot/projects/valgrind/coregrind/pub_core_debuginfo.h#3 (text+ko) ==== @@ -53,7 +53,7 @@ in later queries to m_debuginfo. In this case the handle value will be one or above. If the returned value is zero, no debug info was read. */ -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) extern ULong VG_(di_notify_mmap)( Addr a, Bool allow_SkFileV ); extern void VG_(di_notify_munmap)( Addr a, SizeT len ); ==== //depot/projects/valgrind/memcheck/mc_replace_strmem.c#3 (text+ko) ==== @@ -101,7 +101,7 @@ /* --- Soname of the standard C library. --- */ -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) # define m_libc_soname libcZdsoZa // libc.so* #elif defined(VGP_ppc32_aix5) /* AIX has both /usr/lib/libc.a and /usr/lib/libc_r.a. */ From owner-p4-projects@FreeBSD.ORG Thu Oct 23 08:58:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A00ED10656A1; Thu, 23 Oct 2008 08:58: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 4B13D106567F for ; Thu, 23 Oct 2008 08:58:13 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 397AF8FC13 for ; Thu, 23 Oct 2008 08:58:13 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N8wDFD081749 for ; Thu, 23 Oct 2008 08:58:13 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N8wDlU081747 for perforce@freebsd.org; Thu, 23 Oct 2008 08:58:13 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 08:58:13 GMT Message-Id: <200810230858.m9N8wDlU081747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151794 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, 23 Oct 2008 08:58:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=151794 Change 151794 by peter@peter_cheese on 2008/10/23 08:57:58 Give up for now and use gnu sed like it wants. Add to $PATH before biuilding. Affected files ... .. //depot/projects/valgrind/Makefile.am#5 edit .. //depot/projects/valgrind/autogen.sh#5 edit .. //depot/projects/valgrind/configure.in#7 edit .. //depot/projects/valgrind/tests/filter_stderr_basic#4 edit Differences ... ==== //depot/projects/valgrind/Makefile.am#5 (text+ko) ==== @@ -213,14 +213,14 @@ # So we search for the line with a hex value "+ SIZEOF_HEADERS", and replace # all the hex values in that line with "valt_load_address". valt_load_address_x86_freebsd.lds: Makefile - $(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed -E \ - -e '1,/^=====+$$/d' \ - -e '/^=====+$$/d' \ - -e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \ + $(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \ + -e '1,/^=====\+$$/d' \ + -e '/^=====\+$$/d' \ + -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ || rm -f $@ valt_load_address_amd64_freebsd.lds: Makefile - $(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed -E \ + $(CC) -m64 -Wl,--verbose -nostdlib 2>&1 | sed \ -e '1,/^=====+$$/d' \ -e '/^=====+$$/d' \ -e '/\. = 0x[0-9A-Fa-f]+ \+ SIZEOF_HEADERS/s/0x[0-9A-Fa-f]+/valt_load_address/g' > $@ \ ==== //depot/projects/valgrind/autogen.sh#5 (text+kox) ==== @@ -1,5 +1,8 @@ #!/bin/sh +PATH=/usr/bin:$PATH +export PATH + run () { echo "running: $*" ==== //depot/projects/valgrind/configure.in#7 (text+ko) ==== @@ -95,20 +95,20 @@ # on some pretty fancy sed expressions, and AIX sed doesn't produce the # same results, causing install to fail -#AC_MSG_CHECKING([for GNU sed]) -# -#[sed_firstline=`sed --version | head -n 1`] -# -#case "${sed_firstline}" in -# GNU*) -# AC_MSG_RESULT([ok, looks like GNU sed]) -# ;; -# *) -# AC_MSG_RESULT([please ensure first 'sed' in your path is GNU sed]) -# AC_MSG_RESULT([note: GNU sed is only required at build/install time]) -# AC_MSG_ERROR([build/install requires that 'sed' is GNU sed]) -# ;; -#esac +AC_MSG_CHECKING([for GNU sed]) + +[sed_firstline=`sed --version | head -n 1`] + +case "${sed_firstline}" in + GNU*) + AC_MSG_RESULT([ok, looks like GNU sed]) + ;; + *) + AC_MSG_RESULT([please ensure first 'sed' in your path is GNU sed]) + AC_MSG_RESULT([note: GNU sed is only required at build/install time]) + AC_MSG_ERROR([build/install requires that 'sed' is GNU sed]) + ;; +esac # We don't want gcc < 3.0 ==== //depot/projects/valgrind/tests/filter_stderr_basic#4 (text+kox) ==== @@ -6,8 +6,7 @@ dir=`dirname $0` # Remove ==pid== and --pid-- and ++pid++ and **pid** strings -#sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,7\}\1 //" | -perl -pe 's/(==|--|\+\+|\*\*)\d{1,5}\1 //;' | +sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,7\}\1 //" | # Remove any --pid:0: strings (debuglog level zero output) sed "/^--[0-9]\{1,7\}:0:*/d" | From owner-p4-projects@FreeBSD.ORG Thu Oct 23 09:29:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05147106569D; Thu, 23 Oct 2008 09:29: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 922A7106566C for ; Thu, 23 Oct 2008 09:29:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7FB288FC17 for ; Thu, 23 Oct 2008 09:29:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9N9TjMk085268 for ; Thu, 23 Oct 2008 09:29:45 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9N9TjOb085265 for perforce@freebsd.org; Thu, 23 Oct 2008 09:29:45 GMT (envelope-from peter-gmail@wemm.org) Date: Thu, 23 Oct 2008 09:29:45 GMT Message-Id: <200810230929.m9N9TjOb085265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151797 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, 23 Oct 2008 09:29:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=151797 Change 151797 by peter@peter_cheese on 2008/10/23 09:29:26 Get --version to not crash. This means parsing procfs and surviving the handoff to the tool backend. $ /home/peter/vginst/bin/valgrind --version valgrind-3.4.0.SVN Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#3 edit .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#3 edit .. //depot/projects/valgrind/coregrind/m_libcbase.c#4 edit .. //depot/projects/valgrind/coregrind/m_main.c#6 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#3 (text+ko) ==== @@ -3049,6 +3049,7 @@ UInt prot; UWord maj, min; ULong foffset, dev, ino; + UInt junk; ULong junk64; foffset = ino = 0; /* keep gcc-4.1.0 happy */ @@ -3086,7 +3087,7 @@ if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex64(&procmap_buf[i], &junk64); + j = readhex(&procmap_buf[i], &junk); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; @@ -3110,7 +3111,7 @@ j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex64(&procmap_buf[i], &junk64); + j = readhex(&procmap_buf[i], &junk); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); @@ -3223,30 +3224,7 @@ if (ww == 'w') prot |= VKI_PROT_WRITE; if (xx == 'x') prot |= VKI_PROT_EXEC; -#if defined(VGO_linux) - /* Linux has two ways to encode a device number when it - is exposed to user space (via fstat etc). The old way - is the traditional unix scheme that produces a 16 bit - device number with the top 8 being the major number and - the bottom 8 the minor number. - - The new scheme allows for a 12 bit major number and - a 20 bit minor number by using a 32 bit device number - and putting the top 12 bits of the minor number into - the top 12 bits of the device number thus leaving an - extra 4 bits for the major number. - - If the minor and major number are both single byte - values then both schemes give the same result so we - use the new scheme here in case either number is - outside the 0-255 range and then use fstat64 when - available (or fstat on 64 bit systems) so that we - should always have a new style device number and - everything should match. */ - dev = (min & 0xff) | (maj << 8) | ((min & ~0xff) << 12); -#else dev = 0; -#endif if (record_gap && gapStart < start) (*record_gap) ( gapStart, start-gapStart ); ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-linux.c#3 (text+ko) ==== @@ -352,7 +352,6 @@ /* Given a file descriptor, attempt to deduce its filename. To do this, we use /proc/self/fd/. If this doesn't point to a file, or if it doesn't exist, we return False. */ -#if defined(VGO_linux) static Bool get_name_for_fd ( Int fd, /*OUT*/HChar* buf, Int nbuf ) { @@ -367,51 +366,8 @@ else return False; } -#elif defined(VGO_freebsd) -static -Bool get_name_for_fd ( Int fd, HChar* buf, Int nbuf ) -{ - static int nr_fromfd = -1; - SysRes res; - Int i; - for (i = 0; i < nbuf; i++) buf[i] = 0; - if (nr_fromfd == -1) { - int oid[2]; - int real_oid[10]; - vki_size_t oidlen; - char *name = "machdep.getpath_fromfd_num"; - vki_size_t len; - int sc; - oid[0] = 0; /* magic */ - oid[1] = 3; /* undocumented */ - oidlen = sizeof(real_oid); - res = VG_(do_syscall6)(__NR___sysctl, (UWord)oid, 2, (UWord)real_oid, (UWord)&oidlen, (UWord)name, strlen(name)); - oidlen /= sizeof(int); - if (!res.isError && oidlen > 0) { - len = sizeof(sc); - res = VG_(do_syscall6)(__NR___sysctl, (UWord)real_oid, oidlen, (UWord)&sc, (UWord)&len, 0, 0); - if (!res.isError && sc > 0) - nr_fromfd = sc; - } - if (nr_fromfd == -1) - nr_fromfd = -2; - } - if (nr_fromfd < 0) - return False; - - res = VG_(do_syscall3)(nr_fromfd, fd, (UWord)buf, nbuf); - if (!res.isError && buf[0] == '/') - return True; - else - return False; -} -#else -#error undefined os -#endif - - /*-----------------------------------------------------------------*/ /*--- ---*/ /*--- SegName array management. ---*/ @@ -1007,14 +963,12 @@ same = same && seg_prot == prot -#ifndef VGO_freebsd && (cmp_devino ? (nsegments[i].dev == dev && nsegments[i].ino == ino) : True) && (cmp_offsets ? nsegments[i].start-nsegments[i].offset == addr-offset : True) -#endif ; if (!same) { sync_check_ok = False; @@ -1539,9 +1493,6 @@ if (dev != 0 && ino != 0) seg.kind = SkFileV; if (filename) { -#if defined(VGO_freebsd) - seg.kind = SkFileV; -#endif seg.fnIdx = allocate_segname( filename ); } @@ -1590,11 +1541,7 @@ " sp_at_startup = 0x%010llx (supplied)\n", (ULong)sp_at_startup ); -#ifdef VGP_x86_freebsd - aspacem_minAddr = (Addr) 0x00010000; // 64K -#else aspacem_minAddr = (Addr) 0x04000000; // 64M -#endif # if VG_WORDSIZE == 8 aspacem_maxAddr = (Addr)0x800000000 - 1; // 32G @@ -1658,18 +1605,10 @@ VG_(am_show_nsegments)(2, "Initial layout"); -#ifdef VGO_freebsd - VG_(debugLog)(2, "aspacem", "Reading /proc/curproc/map\n"); -#else VG_(debugLog)(2, "aspacem", "Reading /proc/self/maps\n"); -#endif parse_procselfmaps( read_maps_callback, NULL ); -#ifdef VGO_freebsd - VG_(am_show_nsegments)(2, "With contents of /proc/curproc/map"); -#else VG_(am_show_nsegments)(2, "With contents of /proc/self/maps"); -#endif AM_SANITY_CHECK; return suggested_clstack_top; @@ -3088,9 +3027,6 @@ UInt prot; UWord maj, min; ULong foffset, dev, ino; -#ifdef VGO_freebsd - UInt junk; -#endif foffset = ino = 0; /* keep gcc-4.1.0 happy */ @@ -3107,7 +3043,6 @@ while (True) { if (i >= buf_n_tot) break; -#if defined(VGO_linux) /* Read (without fscanf :) the pattern %16x-%16x %c%c%c%c %16x %2x:%2x %d */ j = readhex(&procmap_buf[i], &start); if (j > 0) i += j; else goto syntaxerror; @@ -3151,121 +3086,12 @@ j = readdec64(&procmap_buf[i], &ino); if (j > 0) i += j; else goto syntaxerror; -#elif defined(VGO_freebsd) - /* Read (without fscanf :) the pattern %8x %8x %d %d %8x %c%c%c%c %d %d %8x .* .* .* */ - /* 0x38000000 0x38119000 281 748 0xd76df8a0 r-x 2 1 0x0 COW NC vnode */ - j = readhex(&procmap_buf[i], &start); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &endPlusOne); - if (j > 0) i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readdec(&procmap_buf[i], &junk); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readdec(&procmap_buf[i], &junk); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &junk); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &rr); - if (j == 1 && (rr == 'r' || rr == '-')) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ww); - if (j == 1 && (ww == 'w' || ww == '-')) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &xx); - if (j == 1 && (xx == 'x' || xx == '-')) i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readdec(&procmap_buf[i], &junk); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readdec(&procmap_buf[i], &junk); - if (j > 0) i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - j = readhex(&procmap_buf[i], &junk); - if (j > 0) i += j; else goto syntaxerror; - - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - /* COW or NCOW */ - j = readchar(&procmap_buf[i], &ch); - if (j != 1) goto syntaxerror; - if (ch == 'N') { - i += j; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'C') i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'O') i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'W') i += j; else goto syntaxerror; - } else if (ch == 'C') { - i += j; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'O') i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'W') i += j; else goto syntaxerror; - } else { - goto syntaxerror; - } - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - /* NC or NNC */ - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'N') i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && (ch == 'N' || ch == 'C')) i += j; else goto syntaxerror; - if (ch == 'N') { - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'C') i += j; else goto syntaxerror; - } - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - - /* map type (vnode, swap, default) */ - j = readchar(&procmap_buf[i], &ch); - if (j != 1) goto syntaxerror; - if (ch == 'v') { - i += j; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'n') i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'o') i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'd') i += j; else goto syntaxerror; - j = readchar(&procmap_buf[i], &ch); - if (j == 1 && ch == 'e') i += j; else goto syntaxerror; - } - foffset = 0; -#else -#error "Unknown OS" -#endif goto read_line_ok; syntaxerror: -#ifdef VGO_freebsd - VG_(debugLog)(0, "Valgrind:", - "FATAL: syntax error reading /proc/curproc/map\n"); -#else VG_(debugLog)(0, "Valgrind:", "FATAL: syntax error reading /proc/self/maps\n"); -#endif { Int k, m; HChar buf50[51]; m = 0; @@ -3307,19 +3133,11 @@ foffset = 0; } -#if 0 -#ifdef VGO_freebsd - if (!filename) - filename = find_path(start); -#endif -#endif - prot = 0; if (rr == 'r') prot |= VKI_PROT_READ; if (ww == 'w') prot |= VKI_PROT_WRITE; if (xx == 'x') prot |= VKI_PROT_EXEC; -#if defined(VGO_linux) /* Linux has two ways to encode a device number when it is exposed to user space (via fstat etc). The old way is the traditional unix scheme that produces a 16 bit @@ -3340,9 +3158,6 @@ should always have a new style device number and everything should match. */ dev = (min & 0xff) | (maj << 8) | ((min & ~0xff) << 12); -#else - dev = 0; -#endif if (record_gap && gapStart < start) (*record_gap) ( gapStart, start-gapStart ); ==== //depot/projects/valgrind/coregrind/m_libcbase.c#4 (text+ko) ==== @@ -501,14 +501,6 @@ return dest; } -#ifdef VGO_freebsd -/* Gcc generates internal inline calls for struct copies */ -void* memcpy ( void *dest, const void *src, SizeT sz ) -{ - return VG_(memcpy)(dest, src, sz); -} -#endif - void* VG_(memmove)(void *dest, const void *src, SizeT sz) { SizeT i; ==== //depot/projects/valgrind/coregrind/m_main.c#6 (text+ko) ==== @@ -339,7 +339,7 @@ VG_(message)(Vg_UserMsg, "There is a copy in valgrind/getpath/*"); #endif VG_(message)(Vg_UserMsg, ""); - VG_(nanosleep)(&ts); + VG_(do_syscall2)(__NR_nanosleep, (UWord)&ts, (UWord)NULL); } } #endif @@ -2304,7 +2304,7 @@ /*=== Getting to main() alive: LINUX (for AIX5 see below) ===*/ /*====================================================================*/ -#if defined(VGO_linux) +#if defined(VGO_linux) || defined(VGO_freebsd) /* If linking of the final executables is done with glibc present, then Valgrind starts at main() above as usual, and all of the @@ -2483,9 +2483,9 @@ "\tandl $~15, %eax\n" /* install it, and collect the original one */ "\txchgl %eax, %esp\n" - /* call _start_in_C, passing it the startup %esp */ + /* call _start_in_C_linux, passing it the startup %esp */ "\tpushl %eax\n" - "\tcall _start_in_C\n" + "\tcall _start_in_C_linux\n" "\thlt\n" ".previous\n" ); @@ -2502,8 +2502,8 @@ "\tandq $~15, %rdi\n" /* install it, and collect the original one */ "\txchgq %rdi, %rsp\n" - /* call _start_in_C, passing it the startup %rsp */ - "\tcall _start_in_C\n" + /* call _start_in_C_linux, passing it the startup %rsp */ + "\tcall _start_in_C_linux\n" "\thlt\n" ".previous\n" ); From owner-p4-projects@FreeBSD.ORG Thu Oct 23 14:23:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4B42106567C; Thu, 23 Oct 2008 14:23: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 8F6461065673 for ; Thu, 23 Oct 2008 14:23:52 +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 7E0398FC28 for ; Thu, 23 Oct 2008 14:23:52 +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 m9NENqIb024693 for ; Thu, 23 Oct 2008 14:23:52 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NENq4A024691 for perforce@freebsd.org; Thu, 23 Oct 2008 14:23:52 GMT (envelope-from nwhitehorn@freebsd.org) Date: Thu, 23 Oct 2008 14:23:52 GMT Message-Id: <200810231423.m9NENq4A024691@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 151806 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, 23 Oct 2008 14:23:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=151806 Change 151806 by nwhitehorn@nwhitehorn_trantor on 2008/10/23 14:23:37 Mambodisk supports 4K transfers -- let it use them. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/mambo/mambodisk.c#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/mambo/mambodisk.c#2 (text+ko) ==== @@ -49,6 +49,7 @@ struct proc *p; struct bio_queue_head bio_queue; int running; + int maxblocks; }; #define MAMBO_DISK_READ 116 @@ -116,8 +117,10 @@ d->d_drv1 = sc; d->d_maxsize = MAXPHYS; /* Maybe ask bridge? */ - d->d_sectorsize = mambocall(MAMBO_DISK_INFO,MAMBO_INFO_BLKSZ,d->d_unit) - / 8; /* Mambo gives an answer 8 times too large, for fun */ + d->d_sectorsize = 512; + sc->maxblocks = mambocall(MAMBO_DISK_INFO,MAMBO_INFO_BLKSZ,d->d_unit) + / 512; + d->d_unit = device_get_unit(dev); d->d_mediasize = mambocall(MAMBO_DISK_INFO,MAMBO_INFO_DEVSZ,d->d_unit) * 1024; /* Mambo gives size in KB */ @@ -221,7 +224,10 @@ char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz; - numblocks = 1; + numblocks = end - block; + if (numblocks > sc->maxblocks) + numblocks = sc->maxblocks; + if (bp->bio_cmd == BIO_READ) { result = mambocall(MAMBO_DISK_READ, vaddr, (uint32_t)block, (numblocks << 16) | unit); From owner-p4-projects@FreeBSD.ORG Thu Oct 23 15:03:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 843A5106569D; Thu, 23 Oct 2008 15:03: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 433AC1065699 for ; Thu, 23 Oct 2008 15:03:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 313E78FC27 for ; Thu, 23 Oct 2008 15:03:33 +0000 (UTC) (envelope-from hselasky@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 m9NF3Xtt029747 for ; Thu, 23 Oct 2008 15:03:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NF3XDU029745 for perforce@freebsd.org; Thu, 23 Oct 2008 15:03:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 23 Oct 2008 15:03:33 GMT Message-Id: <200810231503.m9NF3XDU029745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151807 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, 23 Oct 2008 15:03:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=151807 Change 151807 by hselasky@hselasky_laptop001 on 2008/10/23 15:03:22 Add full support for LibUSB v0.1.12 through the FreeBSD specific USB library. LibUSB applications should link with libusb20 on FreeBSD in the future. Affected files ... .. //depot/projects/usb/src/lib/libusb20/Makefile#2 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.c#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.h#4 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#1 add .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#3 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/Makefile#2 (text+ko) ==== @@ -7,8 +7,15 @@ LIB= usb20 SHLIB_MAJOR= 1 SHLIB_MINOR= 0 -SRCS= libusb20.c libusb20_desc.c libusb20_ugen20.c -INCS= libusb20.h libusb20_desc.h +SRCS= libusb20.c +SRCS+= libusb20_desc.c +SRCS+= libusb20_ugen20.c +SRCS+= libusb20_compat01.c +SRCS+= libusb20_compat10.c +INCS+= libusb20.h +INCS+= libusb20_desc.h +INCS+= libusb20_compat01.h +INCS+= libusb20_compat10.h MAN= libusb20.3 MKLINT= no NOGCCERROR= ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#3 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "libusb20.h" @@ -632,9 +633,9 @@ } int -libusb20_dev_request_sync(struct libusb20_device *pdev, struct LIBUSB20_CONTROL_SETUP_DECODED *setup, - void *data, uint16_t *pactlen, uint32_t timeout, - uint8_t flags) +libusb20_dev_request_sync(struct libusb20_device *pdev, + struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, + uint16_t *pactlen, uint32_t timeout, uint8_t flags) { int error; @@ -643,6 +644,128 @@ return (error); } +int +libusb20_dev_req_string_sync(struct libusb20_device *pdev, + uint8_t index, uint16_t langid, void *ptr, uint16_t len) +{ + struct LIBUSB20_CONTROL_SETUP_DECODED req; + int error; + + if (len < 4) { + /* invalid length */ + return (LIBUSB20_ERROR_INVALID_PARAM); + } + LIBUSB20_INIT(LIBUSB20_CONTROL_SETUP, &req); + + /* + * We need to read the USB string in two steps else some USB + * devices will complain. + */ + req.wValue = (256 * LIBUSB20_DT_STRING) | index; + req.wIndex = langid; + req.wLength = 4; /* bytes */ + + error = libusb20_dev_request_sync(pdev, &req, + ptr, NULL, 1000, LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK); + if (error) { + return (error); + } + req.wLength = *(uint8_t *)ptr; /* bytes */ + if (req.wLength > len) { + /* partial string read */ + req.wLength = len; + } + error = libusb20_dev_request_sync(pdev, &req, + ptr, NULL, 1000, LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK); + + if (error) { + return (error); + } + if (((uint8_t *)ptr)[1] != LIBUSB20_DT_STRING) { + return (LIBUSB20_ERROR_OTHER); + } + return (0); /* success */ +} + +int +libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, + uint8_t index, void *ptr, uint16_t len) +{ + char *buf; + int error; + uint16_t langid; + uint16_t n; + uint16_t i; + uint16_t c; + uint8_t temp[255]; + uint8_t swap; + + /* the following code derives from the FreeBSD USB kernel */ + + if (len < 1) { + /* too short buffer */ + return (LIBUSB20_ERROR_INVALID_PARAM); + } + error = libusb20_dev_req_string_sync(pdev, + 0, 0, temp, sizeof(temp)); + if (error < 0) + return (error); + + langid = temp[2] | (temp[3] << 8); + + error = libusb20_dev_req_string_sync(pdev, index, + langid, temp, sizeof(temp)); + if (error < 0) + return (error); + + if (temp[0] < 2) { + /* string length is too short */ + return (LIBUSB20_ERROR_OTHER); + } + /* reserve one byte for terminating zero */ + len--; + + /* find maximum length */ + n = (temp[0] / 2) - 1; + if (n > len) { + n = len; + } + /* reset swap state */ + swap = 3; + + /* setup output buffer pointer */ + buf = ptr; + + /* convert and filter */ + for (i = 0; (i != n); i++) { + c = temp[(2 * i) + 2] | (temp[(2 * i) + 3] << 8); + + /* convert from Unicode, handle buggy strings */ + if (((c & 0xff00) == 0) && (swap & 1)) { + /* Little Endian, default */ + *buf = c; + swap = 1; + } else if (((c & 0x00ff) == 0) && (swap & 2)) { + /* Big Endian */ + *buf = c >> 8; + swap = 2; + } else { + *buf = '.'; + } + /* + * Filter by default - we don't allow greater and less than + * signs because they might confuse the dmesg printouts! + */ + if ((*buf == '<') || (*buf == '>') || (!isprint(*buf))) { + *buf = '.'; + } + buf++; + } + *buf = 0; /* zero terminate string */ + + return (0); +} + struct libusb20_config * libusb20_dev_alloc_config(struct libusb20_device *pdev, uint8_t configIndex) { ==== //depot/projects/usb/src/lib/libusb20/libusb20.h#4 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -235,6 +236,8 @@ int libusb20_dev_process(struct libusb20_device *pdev); int libusb20_dev_release_interface(struct libusb20_device *pdev, uint8_t iface_index); int libusb20_dev_request_sync(struct libusb20_device *pdev, struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags); +int libusb20_dev_req_string_sync(struct libusb20_device *pdev, uint8_t index, uint16_t langid, void *ptr, uint16_t len); +int libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, uint8_t index, void *ptr, uint16_t len); int libusb20_dev_reset(struct libusb20_device *pdev); int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); ==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#3 (text+ko) ==== @@ -210,6 +210,9 @@ /* private backend data */ void *privBeData; + /* libUSB v0.1 compat data */ + void *priv01Data; + /* claimed interfaces */ uint32_t claimed_interfaces; From owner-p4-projects@FreeBSD.ORG Thu Oct 23 15:25:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 114641065676; Thu, 23 Oct 2008 15:25: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 C6EFC106566B for ; Thu, 23 Oct 2008 15:25:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B38168FC19 for ; Thu, 23 Oct 2008 15:25:56 +0000 (UTC) (envelope-from trasz@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 m9NFPumg031479 for ; Thu, 23 Oct 2008 15:25:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NFPt7t031477 for perforce@freebsd.org; Thu, 23 Oct 2008 15:25:55 GMT (envelope-from trasz@freebsd.org) Date: Thu, 23 Oct 2008 15:25:55 GMT Message-Id: <200810231525.m9NFPt7t031477@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 151808 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, 23 Oct 2008 15:25:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=151808 Change 151808 by trasz@trasz_victim7 on 2008/10/23 15:25:01 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/contrib/tcsh/sh.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/etc.mips/ttys#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/arch/i386/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_acl_basic.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_acl_freebsd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.zip.uu#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/string/strxfrm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_minidump_amd64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_minidump_i386.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/flopen.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/flopen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_cap.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_class.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_class.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_times.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/login_times.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/logwtmp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pidfile.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/pidfile.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/realhostname.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/rtld-elf/mips/reloc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/package-trees.sh#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/dhclient.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/tables.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ddb.4#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mmc.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mmcsd.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/sdhci.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/u3g.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ubsa.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/umass.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/umodem.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vinvalbuf.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/syscons/keymaps/INDEX.keymaps#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/syscons/keymaps/eee_nordic.kbd#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/africa#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/locore.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/AVILA#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/BWCT#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/CRB#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/EP80219#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/HL200#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/KB920X#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/NSLU#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/armreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/intr.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/metadata.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/resource.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/common.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/files.mv#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/gpio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/ic.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/obio.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/rtc.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/std.mv#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/timer.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/twsi.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/version#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/Makefile.arm#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.arm#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.mips#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.powerpc#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.arm#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_age.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/age/if_agevar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-cyrix.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-national.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bm/if_bm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jmereg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mge.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mge/if_mgevar.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/e1000phy.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpbb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppb_base.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppb_msq.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpoio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/vpoio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppc/ppcreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sdhci/sdhci.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sdhci/sdhci.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_cpu_mv.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/umass.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_disk.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/powernow.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/trap.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/md_var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/smp.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/trap.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/evtchn.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen_intr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xenfunc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/clock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/exception.s#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/locore.s#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/mp_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_fork.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_synch.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thread.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_time.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_rman.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_stack.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_witness.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_process.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/DEFAULTS#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/IDT#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/MALTA#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/QEMU#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/sdhci/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctputil.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/nexus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/nexusvar.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/ofw/ofw_pci.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/ofw/ofw_pci.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/ofw/ofw_pcibus.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/macio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_inet.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac/mac_policy.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_lomac/mac_lomac.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_partition/mac_partition.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_stub/mac_stub.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/cdefs.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/systm.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/tty.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_mmap.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/xen/evtchn/evtchn.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/libutil/test-flopen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/nanobsd/nanobsd.sh#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ministat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/ministat/ministat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/route.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tftp/extern.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tftp/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tftp/tftp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tftp/tftpsubs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/agent.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/agents/group.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/agents/passwd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/agents/services.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/cachelib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/cacheplcs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/hashtable.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/mp_rs_query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/mp_ws_query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/nscd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/nscdcli.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nscd/query.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pciconf/pciconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/setfib/setfib.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/globals.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/keymap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/package.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/sysinstall.h#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/tcsh/sh.c#2 (text+ko) ==== @@ -462,7 +462,7 @@ else cp2 = cp; if (!(((Strncmp(cp2, STRtty, 3) == 0) && Isalpha(cp2[3])) || - Strstr(cp, STRslptssl) != NULL)) { + Strstr(cp, STRptssl) != NULL)) { if (getenv("DISPLAY") == NULL) { /* NOT on X window shells */ setcopy(STRautologout, STRdefautologout, VAR_READWRITE); ==== //depot/projects/soc2008/trasz_nfs4acl/contrib/tcsh/tc.const.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ Char STRhangup[] = { 'h', 'a', 'n', 'g', 'u', 'p', '\0' }; Char STRaout[] = { 'a', '.', 'o', 'u', 't', '\0' }; Char STRtty[] = { 't', 't', 'y', '\0' }; -Char STRslptssl[] = { '/', 'p', 't', 's', '/', '\0' }; +Char STRptssl[] = { 'p', 't', 's', '/', '\0' }; Char STRany[] = { 'a', 'n', 'y', '\0' }; Char STRstatus[] = { 's', 't', 'a', 't', 'u', 's', '\0' }; Char STR0[] = { '0', '\0' }; ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/loginrec.c#3 (text+ko) ==== @@ -146,7 +146,6 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/loginrec.c,v 1.15 2008/08/01 02:48:36 des Exp $"); #include #include @@ -689,8 +688,8 @@ strncpy(ut->ut_name, li->username, MIN_SIZEOF(ut->ut_name, li->username)); # ifdef HAVE_HOST_IN_UTMP - realhostname_sa(ut->ut_host, sizeof ut->ut_host, - &li->hostaddr.sa, li->hostaddr.sa.sa_len); + strncpy(ut->ut_host, li->hostname, + MIN_SIZEOF(ut->ut_host, li->hostname)); # endif # ifdef HAVE_ADDR_IN_UTMP /* this is just a 32-bit IP address */ ==== //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.46 2008/08/01 02:48:36 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.47 2008/10/21 11:58:26 des Exp $"); #include #include @@ -72,6 +72,7 @@ #include #include #include +#include #include #include @@ -238,7 +239,7 @@ u_int session_id2_len = 0; /* record remote hostname or ip */ -u_int utmp_len = MAXHOSTNAMELEN; +u_int utmp_len = UT_HOSTSIZE; /* options.max_startup sized array of fd ints */ int *startup_pipes = NULL; ==== //depot/projects/soc2008/trasz_nfs4acl/etc/etc.mips/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.3 2008/08/24 08:41:29 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.4 2008/10/12 06:58:03 imp Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -33,10 +33,10 @@ console none unknown off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyU0 "/usr/libexec/getty std.9600" dialup off secure -ttyU1 "/usr/libexec/getty std.9600" dialup off secure -ttyU2 "/usr/libexec/getty std.9600" dialup off secure -ttyU3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.115200" dialup on secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu3 "/usr/libexec/getty std.115200" dialup off secure # Pseudo terminals ttyp0 none network ttyp1 none network ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/arch/amd64/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.4 2007/05/19 03:22:18 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/amd64/Makefile,v 1.5 2008/10/16 18:09:27 obrien Exp $ GENSRCS+= xm.h .if !defined(GDB_CROSS_DEBUGGER) @@ -7,7 +7,7 @@ .endif LIBSRCS+= solib.c solib-svr4.c LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \ - i386fbsd-tdep-fixed.c i387-tdep.c + i386fbsd-tdep-fixed.c i387-tdep.c nm.h: echo '#include "i386/nm-fbsd64.h"' > ${.TARGET} @@ -18,7 +18,7 @@ xm.h: echo '#include "i386/xm-i386.h"' > ${.TARGET} +# Fix source static/extern mismatch nits that GCC 4.2 warns about. +CLEANFILES+= i386fbsd-tdep-fixed.c i386fbsd-tdep-fixed.c: i386fbsd-tdep.c sed -e '48s/^static //' ${.ALLSRC} > ${.TARGET} - -CLEANFILES+= i386fbsd-tdep-fixed.c ==== //depot/projects/soc2008/trasz_nfs4acl/gnu/usr.bin/gdb/arch/i386/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.5 2007/05/19 03:22:19 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/arch/i386/Makefile,v 1.6 2008/10/16 18:09:27 obrien Exp $ GENSRCS+= xm.h .if !defined(GDB_CROSS_DEBUGGER) @@ -17,6 +17,7 @@ xm.h: echo '#include "i386/xm-i386.h"' > ${.TARGET} +# Fix source static/extern mismatch nits that GCC 4.2 warns about. +CLEANFILES += i386fbsd-tdep-fixed.c i386fbsd-tdep-fixed.c: i386fbsd-tdep.c sed -e '48s/^static\ //' ${.ALLSRC} > ${.TARGET} -CLEANFILES += i386fbsd-tdep-fixed.c ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_zip.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.26 2008/06/30 16:19:26 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.27 2008/10/21 05:08:35 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include @@ -444,7 +444,9 @@ archive_entry_set_mtime(entry, zip->mtime, 0); archive_entry_set_ctime(entry, zip->ctime, 0); archive_entry_set_atime(entry, zip->atime, 0); - archive_entry_set_size(entry, zip->uncompressed_size); + /* Set the size only if it's meaningful. */ + if (0 == (zip->flags & ZIP_LENGTH_AT_END)) + archive_entry_set_size(entry, zip->uncompressed_size); zip->entry_bytes_remaining = zip->compressed_size; zip->entry_offset = 0; @@ -573,12 +575,16 @@ } break; } + if (r != ARCHIVE_OK) + return (r); /* Update checksum */ - if (r == ARCHIVE_OK && *size) { + if (*size) zip->entry_crc32 = crc32(zip->entry_crc32, *buff, *size); - } - return (r); + /* Return EOF immediately if this is a non-regular file. */ + if (AE_IFREG != (zip->mode & AE_IFMT)) + return (ARCHIVE_EOF); + return (ARCHIVE_OK); } /* ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_util.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.18 2008/05/26 17:00:22 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_util.c,v 1.19 2008/10/21 12:10:30 des Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -168,6 +168,7 @@ va_start(ap, fmt); archive_string_vsprintf(&(a->error_string), fmt, ap); + va_end(ap); if (error_number > 0) { archive_strcat(&(a->error_string), ": "); #ifdef HAVE_STRERROR_R @@ -184,7 +185,6 @@ archive_strcat(&(a->error_string), errp); } a->error = a->error_string.s; - va_end(ap); } void ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_write_disk.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.40 2008/09/30 04:02:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.41 2008/10/19 00:18:44 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -710,10 +710,6 @@ int r2 = set_mode(a, a->mode); if (r2 < ret) ret = r2; } - if (a->todo & TODO_TIMES) { - int r2 = set_times(a); - if (r2 < ret) ret = r2; - } if (a->todo & TODO_ACLS) { int r2 = set_acls(a); if (r2 < ret) ret = r2; @@ -726,6 +722,10 @@ int r2 = set_fflags(a); if (r2 < ret) ret = r2; } + if (a->todo & TODO_TIMES) { + int r2 = set_times(a); + if (r2 < ret) ret = r2; + } /* If there's an fd, we can close it now. */ if (a->fd >= 0) { ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.27 2008/09/30 04:02:36 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.28 2008/10/19 00:18:44 kientzle Exp $ # Where to find the libarchive sources LA_SRCDIR=${.CURDIR}/.. @@ -9,6 +9,7 @@ TESTS= \ test_acl_basic.c \ + test_acl_freebsd.c \ test_acl_pax.c \ test_archive_api_feature.c \ test_bad_fd.c \ ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_acl_basic.c#3 (text+ko) ==== @@ -23,12 +23,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.5 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_acl_basic.c,v 1.6 2008/10/19 00:13:57 kientzle Exp $"); /* * Exercise the system-independent portion of the ACL support. - * Check that archive_entry objects can save and restore ACL data - * and that pax archive can save and restore ACL data. + * Check that archive_entry objects can save and restore ACL data. * * This should work on all systems, regardless of whether local * filesystems support ACLs or not. @@ -42,7 +41,7 @@ const char *name; /* Name of user/group, depending on tag. */ }; -struct acl_t acls0[] = { +static struct acl_t acls0[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE, ARCHIVE_ENTRY_ACL_USER_OBJ, 0, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, @@ -51,7 +50,7 @@ ARCHIVE_ENTRY_ACL_OTHER, 0, "" }, }; -struct acl_t acls1[] = { +static struct acl_t acls1[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE, ARCHIVE_ENTRY_ACL_USER_OBJ, -1, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, @@ -62,7 +61,7 @@ ARCHIVE_ENTRY_ACL_OTHER, -1, "" }, }; -struct acl_t acls2[] = { +static struct acl_t acls2[] = { { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_EXECUTE | ARCHIVE_ENTRY_ACL_READ, ARCHIVE_ENTRY_ACL_USER_OBJ, -1, "" }, { ARCHIVE_ENTRY_ACL_TYPE_ACCESS, ARCHIVE_ENTRY_ACL_READ, ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.c#5 (text+ko) ==== @@ -23,7 +23,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.7 2008/09/01 05:38:33 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_zip.c,v 1.8 2008/10/21 05:08:35 kientzle Exp $"); + +/* + * The reference file for this has been manually tweaked so that: + * * file2 has length-at-end but file1 does not + * * file2 has an invalid CRC + */ DEFINE_TEST(test_read_format_zip) { @@ -57,7 +63,8 @@ assertA(0 == archive_read_next_header(a, &ae)); assertEqualString("file2", archive_entry_pathname(ae)); assertEqualInt(1179605932, archive_entry_mtime(ae)); - assertEqualInt(18, archive_entry_size(ae)); + failure("file2 has length-at-end, so we shouldn't see a valid size"); + assertEqualInt(0, archive_entry_size_is_set(ae)); failure("file2 has a bad CRC, so reading to end should fail"); assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19)); assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18)); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_zip.zip.uu#2 (text+ko) ==== @@ -1,13 +1,14 @@ -$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.2 2008/06/26 11:50:11 des Exp $ +$FreeBSD: src/lib/libarchive/test/test_read_format_zip.zip.uu,v 1.3 2008/10/21 05:08:35 kientzle Exp $ begin 644 test_read_format_zip.zip -M4$L#!`H``````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1AE5 -M3T95>`0`Z`/H`U!+`P04````"`!O9K,V.C=F/0H````2````!0`5`&9I;&4Q -M550)``-!54]&K%M/1E5X!`#H`^@#RTC-R%8T$@H````2````!0`5`&9I;&4R550)``.L6T]&K%M/1E5X!`#H`^@#RTC- -MR%8T$@H````2````!0`-```````!````I(%Y```` -H9FEL93)55`4``ZQ;3T95>```4$L%!@`````#``,`OP```+L````````` +M4$L#!`H`"````%EFLS8````````````````$`!4`9&ER+U54"0`#&55/1M19 +M_4A5>`0`Z`/H`U!+!P@```````````````!02P,$%`````@`;V:S-CHW9CT* +M````$@````4`%0!F:6QE,554"0`#055/1L!9_4A5>`0`Z`/H`\M(S`0`Z`/H`\M(S```4$L!`A<#%``(``@`;V:S-CHW9CT*````$@````4`#0`` +M`````0```.V!1P```&9I;&4Q550%``-!54]&57@``%!+`0(7`Q0`"``(`%IJ +MLS8Z-V8]"@```!(````%``T```````$```#M@8D```!F:6QE,E54!0`#K%M/ +;1E5X``!02P4&``````,``P"_````VP`````` ` end ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/arm/gen/_setjmp.S#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.4 2008/10/14 09:53:47 raj Exp $"); /* * C library -- _setjmp, _longjmp @@ -101,6 +101,10 @@ /* validation failed, die die die. */ botch: +#if !defined(_STANDALONE) bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(_C_LABEL(abort), PLT) b . - 8 /* Cannot get here */ +#else + b . +#endif ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/__xuname.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/ #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.13 2007/01/09 00:27:52 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.15 2008/10/22 21:56:57 kib Exp $"); #include #include @@ -45,94 +45,102 @@ { int mib[2], rval; size_t len; - char *p; + char *p, *q; int oerrno; - struct xutsname { - char sysname[namesize]; /* Name of this OS. */ - char nodename[namesize]; /* Name of this network node. */ - char release[namesize]; /* Release level. */ - char version[namesize]; /* Version level. */ - char machine[namesize]; /* Hardware type. */ - } *name; - name = (struct xutsname *)namebuf; rval = 0; + q = (char *)namebuf; mib[0] = CTL_KERN; - mib[1] = KERN_OSTYPE; - len = sizeof(name->sysname); - oerrno = errno; - if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) { - if(errno == ENOMEM) - errno = oerrno; - else - rval = -1; + + if ((p = getenv("UNAME_s"))) + strlcpy(q, p, namesize); + else { + mib[1] = KERN_OSTYPE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; } - name->sysname[sizeof(name->sysname) - 1] = '\0'; - if ((p = getenv("UNAME_s"))) - strlcpy(name->sysname, p, sizeof(name->sysname)); + q += namesize; - mib[0] = CTL_KERN; mib[1] = KERN_HOSTNAME; - len = sizeof(name->nodename); + len = namesize; oerrno = errno; - if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) { - if(errno == ENOMEM) + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) errno = oerrno; else rval = -1; } - name->nodename[sizeof(name->nodename) - 1] = '\0'; + q[namesize - 1] = '\0'; + q += namesize; - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELEASE; - len = sizeof(name->release); - oerrno = errno; - if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) { - if(errno == ENOMEM) - errno = oerrno; - else - rval = -1; - } - name->release[sizeof(name->release) - 1] = '\0'; if ((p = getenv("UNAME_r"))) - strlcpy(name->release, p, sizeof(name->release)); - - /* The version may have newlines in it, turn them into spaces. */ - mib[0] = CTL_KERN; - mib[1] = KERN_VERSION; - len = sizeof(name->version); - oerrno = errno; - if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) { - if (errno == ENOMEM) - errno = oerrno; - else - rval = -1; - } - name->version[sizeof(name->version) - 1] = '\0'; - for (p = name->version; len--; ++p) { - if (*p == '\n' || *p == '\t') { - if (len > 1) - *p = ' '; + strlcpy(q, p, namesize); + else { + mib[1] = KERN_OSRELEASE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; else - *p = '\0'; + rval = -1; } + q[namesize - 1] = '\0'; } + q += namesize; + if ((p = getenv("UNAME_v"))) - strlcpy(name->version, p, sizeof(name->version)); + strlcpy(q, p, namesize); + else { - mib[0] = CTL_HW; - mib[1] = HW_MACHINE; - len = sizeof(name->machine); - oerrno = errno; - if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) { - if (errno == ENOMEM) - errno = oerrno; - else - rval = -1; + /* + * The version may have newlines in it, turn them into + * spaces. + */ + mib[1] = KERN_VERSION; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; + for (p = q; len--; ++p) { + if (*p == '\n' || *p == '\t') { + if (len > 1) + *p = ' '; + else + *p = '\0'; + } + } } - name->machine[sizeof(name->machine) - 1] = '\0'; + q += namesize; + if ((p = getenv("UNAME_m"))) - strlcpy(name->machine, p, sizeof(name->machine)); + strlcpy(q, p, namesize); + else { + mib[0] = CTL_HW; + mib[1] = HW_MACHINE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; + } + return (rval); } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdlib/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.55 2008/08/20 08:31:58 ed Exp $ +# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.56 2008/10/17 08:30:20 netchild Exp $ # machine-independent stdlib sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib @@ -48,3 +48,8 @@ MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 malloc.conf.5 \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 23 16:06:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9BFA1065680; Thu, 23 Oct 2008 16:06: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 8C03A1065679 for ; Thu, 23 Oct 2008 16:06:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7AB928FC19 for ; Thu, 23 Oct 2008 16:06:38 +0000 (UTC) (envelope-from hselasky@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 m9NG6cwn036062 for ; Thu, 23 Oct 2008 16:06:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NG6ck3036060 for perforce@freebsd.org; Thu, 23 Oct 2008 16:06:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 23 Oct 2008 16:06:38 GMT Message-Id: <200810231606.m9NG6ck3036060@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151812 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, 23 Oct 2008 16:06:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=151812 Change 151812 by hselasky@hselasky_laptop001 on 2008/10/23 16:06:30 Some fixes for LibUSB v0.1.12 compat layer. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.c#4 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#2 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#4 (text+ko) ==== @@ -661,7 +661,12 @@ * We need to read the USB string in two steps else some USB * devices will complain. */ - req.wValue = (256 * LIBUSB20_DT_STRING) | index; + req.bmRequestType = + LIBUSB20_REQUEST_TYPE_STANDARD | + LIBUSB20_RECIPIENT_DEVICE | + LIBUSB20_ENDPOINT_IN; + req.bRequest = LIBUSB20_REQUEST_GET_DESCRIPTOR; + req.wValue = (LIBUSB20_DT_STRING << 8) | index; req.wIndex = langid; req.wLength = 4; /* bytes */ @@ -702,10 +707,16 @@ /* the following code derives from the FreeBSD USB kernel */ - if (len < 1) { + if ((len < 1) || (ptr == NULL)) { /* too short buffer */ return (LIBUSB20_ERROR_INVALID_PARAM); } + /* + * Make sure that there is sensible contents in the buffer in case + * of an error: + */ + *(uint8_t *)ptr = 0; + error = libusb20_dev_req_string_sync(pdev, 0, 0, temp, sizeof(temp)); if (error < 0) ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#2 (text+ko) ==== @@ -213,7 +213,7 @@ if (err) return (-1); - return (0); + return (strlen(buf)); } int @@ -340,11 +340,12 @@ bifc->bDescriptorType = aifc->desc.bDescriptorType; bifc->bInterfaceNumber = aifc->desc.bInterfaceNumber; bifc->bAlternateSetting = aifc->desc.bAlternateSetting; - bifc->bNumEndpoints = aifc->desc.bNumEndpoints; + bifc->bNumEndpoints = aifc->num_endpoints; bifc->bInterfaceClass = aifc->desc.bInterfaceClass; bifc->bInterfaceSubClass = aifc->desc.bInterfaceSubClass; bifc->bInterfaceProtocol = aifc->desc.bInterfaceProtocol; bifc->iInterface = aifc->desc.iInterface; + bifc->endpoint = ps->b.currep; } for (x = 0; x != aifc->num_endpoints; x++) { ps->a.currep = aifc->endpoints + x; @@ -365,13 +366,14 @@ aifc = ps->a.currifc; bifc = ps->b.currifcw++; - usb_parse_iface_sub(ps); if (ps->preparse == 0) { /* initialise interface wrapper */ bifc->altsetting = ps->b.currifc; bifc->num_altsetting = aifc->num_altsetting + 1; } + usb_parse_iface_sub(ps); + for (x = 0; x != aifc->num_altsetting; x++) { ps->a.currifc = aifc->altsetting + x; usb_parse_iface_sub(ps); @@ -780,6 +782,7 @@ struct usb_device *udev; struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; struct libusb20_backend *pold; + int err; /* cleanup after last device search */ @@ -852,6 +855,12 @@ udev->dev = pdev; pdev->priv01Data = udev; + err = libusb20_dev_open(pdev, 0); + if (err == 0) { + /* XXX get all config descriptors by default */ + usb_fetch_and_parse_descriptors((void *)pdev); + libusb20_dev_close(pdev); + } LIST_ADD(usb_global_bus.devices, udev); } From owner-p4-projects@FreeBSD.ORG Thu Oct 23 18:44:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6884A106567E; Thu, 23 Oct 2008 18:44: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 2BE94106566C for ; Thu, 23 Oct 2008 18:44:19 +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 1AB318FC0C for ; Thu, 23 Oct 2008 18:44:19 +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 m9NIiI0Q060302 for ; Thu, 23 Oct 2008 18:44:18 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NIiIsb060300 for perforce@freebsd.org; Thu, 23 Oct 2008 18:44:18 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 23 Oct 2008 18:44:18 GMT Message-Id: <200810231844.m9NIiIsb060300@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 151816 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, 23 Oct 2008 18:44:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=151816 Change 151816 by ed@ed_dull on 2008/10/23 18:43:33 Commit some WIP patches/tests. Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#19 edit .. //depot/projects/mpsafetty/sys/dev/dcons/dcons_os.c#3 edit .. //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#4 edit .. //depot/projects/mpsafetty/sys/kern/subr_clist.c#7 delete .. //depot/projects/mpsafetty/sys/sys/clist.h#5 delete Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#19 (text+ko) ==== @@ -1662,7 +1662,6 @@ kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard -kern/subr_clist.c standard kern/subr_clock.c standard kern/subr_devstat.c standard kern/subr_disk.c standard ==== //depot/projects/mpsafetty/sys/dev/dcons/dcons_os.c#3 (text+ko) ==== @@ -126,11 +126,13 @@ extern struct gdb_dbgport *gdb_cur; #endif -static tsw_outwakeup_t dcons_outwakeup; +static tsw_outwakeup_t dcons_outwakeup; +static tsw_free_t dcons_free; static struct ttydevsw dcons_ttydevsw = { .tsw_flags = TF_NOPREFIX, .tsw_outwakeup = dcons_outwakeup, + .tsw_free = dcons_free, }; #if (defined(GDB) || defined(DDB)) && defined(ALT_BREAK_TO_DEBUGGER) @@ -219,6 +221,16 @@ } static void +dcons_free(void *arg) +{ + + /* + * XXX: dcons(4) should not reuse the device name before this + * function has been called! + */ +} + +static void dcons_timeout(void *v) { struct tty *tp; ==== //depot/projects/mpsafetty/sys/dev/uart/uart_tty.c#4 (text+ko) ==== @@ -327,6 +327,16 @@ tty_unlock(tp); } +static void +uart_tty_free(void *arg) +{ + + /* + * XXX: uart(4) could reuse the device unit number before it is + * being freed by the TTY layer! + */ +} + static struct ttydevsw uart_tty_class = { .tsw_flags = TF_INITLOCK|TF_CALLOUT, .tsw_open = uart_tty_open, @@ -335,6 +345,7 @@ .tsw_ioctl = uart_tty_ioctl, .tsw_param = uart_tty_param, .tsw_modem = uart_tty_modem, + .tsw_free = uart_tty_free, }; int From owner-p4-projects@FreeBSD.ORG Thu Oct 23 18:46:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C174A106569D; Thu, 23 Oct 2008 18:46: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 830E01065683 for ; Thu, 23 Oct 2008 18:46:21 +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 7038B8FC1B for ; Thu, 23 Oct 2008 18:46:21 +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 m9NIkLHl060615 for ; Thu, 23 Oct 2008 18:46:21 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NIkLxp060613 for perforce@freebsd.org; Thu, 23 Oct 2008 18:46:21 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 23 Oct 2008 18:46:21 GMT Message-Id: <200810231846.m9NIkLxp060613@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 151817 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, 23 Oct 2008 18:46:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=151817 Change 151817 by ed@ed_dull on 2008/10/23 18:45:35 IFC. Affected files ... .. //depot/projects/mpsafetty/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/gen/posix_spawn.c#2 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/mpsafetty/share/man/man4/umodem.4#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/mpsafetty/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/AVILA#5 integrate .. //depot/projects/mpsafetty/sys/arm/conf/BWCT#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/CRB#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/mpsafetty/sys/arm/conf/EP80219#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/HL200#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/KB920X#6 integrate .. //depot/projects/mpsafetty/sys/arm/conf/NSLU#3 integrate .. //depot/projects/mpsafetty/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/mpsafetty/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#10 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#13 integrate .. //depot/projects/mpsafetty/sys/conf/files.arm#2 integrate .. //depot/projects/mpsafetty/sys/conf/files.mips#4 integrate .. //depot/projects/mpsafetty/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mii/miidevs#5 integrate .. //depot/projects/mpsafetty/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/mpsafetty/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/smp.h#5 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xen_intr.h#3 integrate .. //depot/projects/mpsafetty/sys/i386/xen/clock.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/xen/exception.s#4 integrate .. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_sig.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thr.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thread.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/subr_rman.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/sys_process.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/mpsafetty/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/mpsafetty/sys/mips/conf/DEFAULTS#1 branch .. //depot/projects/mpsafetty/sys/mips/conf/IDT#4 integrate .. //depot/projects/mpsafetty/sys/mips/conf/MALTA#3 integrate .. //depot/projects/mpsafetty/sys/mips/conf/QEMU#2 integrate .. //depot/projects/mpsafetty/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/mpsafetty/sys/sys/proc.h#9 integrate .. //depot/projects/mpsafetty/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/mpsafetty/sys/xen/evtchn/evtchn.c#4 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/agents/group.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/agents/passwd.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/agents/services.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/cachelib.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/nscd.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/nscdcli.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/package.c#4 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libc/gen/__xuname.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ /*static char sccsid[] = "From: @(#)uname.c 8.1 (Berkeley) 1/4/94";*/ #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.13 2007/01/09 00:27:52 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.15 2008/10/22 21:56:57 kib Exp $"); #include #include @@ -45,94 +45,102 @@ { int mib[2], rval; size_t len; - char *p; + char *p, *q; int oerrno; - struct xutsname { - char sysname[namesize]; /* Name of this OS. */ - char nodename[namesize]; /* Name of this network node. */ - char release[namesize]; /* Release level. */ - char version[namesize]; /* Version level. */ - char machine[namesize]; /* Hardware type. */ - } *name; - name = (struct xutsname *)namebuf; rval = 0; + q = (char *)namebuf; mib[0] = CTL_KERN; - mib[1] = KERN_OSTYPE; - len = sizeof(name->sysname); - oerrno = errno; - if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) { - if(errno == ENOMEM) - errno = oerrno; - else - rval = -1; + + if ((p = getenv("UNAME_s"))) + strlcpy(q, p, namesize); + else { + mib[1] = KERN_OSTYPE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; } - name->sysname[sizeof(name->sysname) - 1] = '\0'; - if ((p = getenv("UNAME_s"))) - strlcpy(name->sysname, p, sizeof(name->sysname)); + q += namesize; - mib[0] = CTL_KERN; mib[1] = KERN_HOSTNAME; - len = sizeof(name->nodename); + len = namesize; oerrno = errno; - if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) { - if(errno == ENOMEM) + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) errno = oerrno; else rval = -1; } - name->nodename[sizeof(name->nodename) - 1] = '\0'; + q[namesize - 1] = '\0'; + q += namesize; - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELEASE; - len = sizeof(name->release); - oerrno = errno; - if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) { - if(errno == ENOMEM) - errno = oerrno; - else - rval = -1; - } - name->release[sizeof(name->release) - 1] = '\0'; if ((p = getenv("UNAME_r"))) - strlcpy(name->release, p, sizeof(name->release)); - - /* The version may have newlines in it, turn them into spaces. */ - mib[0] = CTL_KERN; - mib[1] = KERN_VERSION; - len = sizeof(name->version); - oerrno = errno; - if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) { - if (errno == ENOMEM) - errno = oerrno; - else - rval = -1; - } - name->version[sizeof(name->version) - 1] = '\0'; - for (p = name->version; len--; ++p) { - if (*p == '\n' || *p == '\t') { - if (len > 1) - *p = ' '; + strlcpy(q, p, namesize); + else { + mib[1] = KERN_OSRELEASE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; else - *p = '\0'; + rval = -1; } + q[namesize - 1] = '\0'; } + q += namesize; + if ((p = getenv("UNAME_v"))) - strlcpy(name->version, p, sizeof(name->version)); + strlcpy(q, p, namesize); + else { - mib[0] = CTL_HW; - mib[1] = HW_MACHINE; - len = sizeof(name->machine); - oerrno = errno; - if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) { - if (errno == ENOMEM) - errno = oerrno; - else - rval = -1; + /* + * The version may have newlines in it, turn them into + * spaces. + */ + mib[1] = KERN_VERSION; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; + for (p = q; len--; ++p) { + if (*p == '\n' || *p == '\t') { + if (len > 1) + *p = ' '; + else + *p = '\0'; + } + } } - name->machine[sizeof(name->machine) - 1] = '\0'; + q += namesize; + if ((p = getenv("UNAME_m"))) - strlcpy(name->machine, p, sizeof(name->machine)); + strlcpy(q, p, namesize); + else { + mib[0] = CTL_HW; + mib[1] = HW_MACHINE; + len = namesize; + oerrno = errno; + if (sysctl(mib, 2, q, &len, NULL, 0) == -1) { + if (errno == ENOMEM) + errno = oerrno; + else + rval = -1; + } + q[namesize - 1] = '\0'; + } + return (rval); } ==== //depot/projects/mpsafetty/lib/libc/gen/posix_spawn.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.5 2008/06/23 05:22:06 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/posix_spawn.c,v 1.6 2008/10/23 15:32:06 rdivacky Exp $"); #include "namespace.h" #include @@ -444,7 +444,7 @@ } int -posix_spawnattr_setschedparam(posix_spawnattr_t *sa __restrict, +posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict sa, const struct sched_param * __restrict schedparam) { (*sa)->sa_schedparam = *schedparam; ==== //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.340 2008/10/13 21:02:19 brueffer Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.341 2008/10/23 10:38:04 marck Exp $ 2000 @@ -90,7 +90,7 @@ - &intel; 64-bit &xeon; (Nacona). This + &intel; 64-bit &xeon; (Nocona). This processor is fabricated on 90nm process technology, and operates with 2.80 to 3.60 GHz (FSB 800MHz) and &intel; E7520/E7525/E7320 chipsets. ==== //depot/projects/mpsafetty/share/man/man4/umodem.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" 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/umodem.4,v 1.10 2007/08/21 13:20:13 sanpei Exp $ +.\" $FreeBSD: src/share/man/man4/umodem.4,v 1.11 2008/10/22 21:46:59 n_hibma Exp $ .\" .Dd November 22, 2006 .Dt UMODEM 4 @@ -96,6 +96,8 @@ Yamaha Broadband Wireless Router RTW65b .It ELSA MicroLink 56k USB modem +.It +Sony Ericsson W810i phone .El .Sh SEE ALSO .Xr tty 4 , ==== //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.163 2008/10/22 00:01:53 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $"); #include "opt_cpu.h" @@ -347,12 +347,17 @@ "AuthenticAMD") == 0) cpu_feature &= ~CPUID_HTT; + /* + * If this CPU supports P-state invariant TSC then + * mention the capability. + */ if (!tsc_is_invariant && (strcmp(cpu_vendor, "AuthenticAMD") == 0 && ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || - AMD64_CPU_FAMILY(cpu_id) >= 0x10))) { + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + cpu_id == 0x60fb2))) { tsc_is_invariant = 1; - printf("\n P-state invariant TSC"); + printf("\n TSC: P-state invariant"); } /* ==== //depot/projects/mpsafetty/sys/amd64/include/specialreg.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.48 2008/10/22 00:01:53 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.49 2008/10/22 17:36:52 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -162,12 +162,10 @@ #define CPUID_EXT_FAMILY 0x0ff00000 #define AMD64_CPU_MODEL(id) \ ((((id) & CPUID_MODEL) >> 4) | \ - ((((id) & CPUID_FAMILY) >= 0x600) ? \ - (((id) & CPUID_EXT_MODEL) >> 12) : 0)) + (((id) & CPUID_EXT_MODEL) >> 12)) #define AMD64_CPU_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ - ((((id) & CPUID_FAMILY) == 0xf00) ? \ - (((id) & CPUID_EXT_FAMILY) >> 20) : 0)) + (((id) & CPUID_EXT_FAMILY) >> 20)) /* * CPUID instruction 1 ebx info ==== //depot/projects/mpsafetty/sys/arm/conf/AVILA#5 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.16 2008/08/02 22:53:43 imp Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.17 2008/10/23 01:51:55 marcel Exp $ -machine arm ident AVILA options PHYSADDR=0x10000000 @@ -80,7 +79,6 @@ #options PREEMPTION #options VERBOSE_SYSINIT -device mem # Memory and kernel memory devices #device saarm device pci ==== //depot/projects/mpsafetty/sys/arm/conf/BWCT#4 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.6 2008/10/23 01:51:55 marcel Exp $ -machine arm ident BWCT options VERBOSE_INIT_ARM @@ -85,7 +84,6 @@ #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options DIAGNOSTIC -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: ==== //depot/projects/mpsafetty/sys/arm/conf/CRB#4 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.6 2008/10/23 01:51:55 marcel Exp $ -machine arm ident CRB options PHYSADDR=0x00000000 @@ -67,7 +66,6 @@ #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device rl ==== //depot/projects/mpsafetty/sys/arm/conf/DB-78XXX#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.1 2008/10/14 08:18:27 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $ # -machine arm ident DB-88F78XX include "../mv/discovery/std.db78xxx" @@ -49,7 +48,6 @@ # Pseudo devices device loop -device mem device md device pty device random ==== //depot/projects/mpsafetty/sys/arm/conf/DB-88F5XXX#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # Custom kernel for Marvell DB-88F5xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.1 2008/10/14 08:18:27 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $ # -machine arm ident DB-88F5XXX include "../mv/orion/std.db88f5xxx" @@ -48,7 +47,6 @@ #options WITNESS_KDB # Pseudo devices -device mem device md device loop device pty ==== //depot/projects/mpsafetty/sys/arm/conf/DB-88F6XXX#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # Custom kernel for Marvell DB-88F6xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.1 2008/10/14 08:18:27 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $ # -machine arm ident DB-88F6XXX include "../mv/kirkwood/std.db88f6xxx" @@ -49,7 +48,6 @@ # Pseudo devices device loop -device mem device md device pty device random ==== //depot/projects/mpsafetty/sys/arm/conf/EP80219#4 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.9 2008/10/23 01:51:55 marcel Exp $ -machine arm ident EP80219 options PHYSADDR=0xa0000000 @@ -69,7 +68,6 @@ #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device fxp ==== //depot/projects/mpsafetty/sys/arm/conf/GUMSTIX#4 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.1 2008/06/06 05:08:09 benno Exp $ +# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.2 2008/10/23 01:51:55 marcel Exp $ -machine arm ident GUMSTIX cpu CPU_XSCALE_PXA2X0 @@ -71,7 +70,6 @@ options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices device mii device smc device smcphy ==== //depot/projects/mpsafetty/sys/arm/conf/HL200#4 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.6 2008/10/23 01:51:55 marcel Exp $ -machine arm ident HL200 include "../at91/std.at91" @@ -89,7 +88,6 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: ==== //depot/projects/mpsafetty/sys/arm/conf/IQ31244#4 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.23 2008/10/23 01:51:55 marcel Exp $ -machine arm ident IQ31244 options PHYSADDR=0xa0000000 @@ -66,7 +65,6 @@ #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device rl ==== //depot/projects/mpsafetty/sys/arm/conf/KB920X#6 (text) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.19 2008/09/07 18:55:55 imp Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.20 2008/10/23 01:51:55 marcel Exp $ -machine arm ident KB920X include "../at91/std.kb920x" @@ -80,7 +79,6 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: ==== //depot/projects/mpsafetty/sys/arm/conf/NSLU#3 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/NSLU,v 1.2 2008/09/08 00:41:32 imp Exp $ +# $FreeBSD: src/sys/arm/conf/NSLU,v 1.3 2008/10/23 01:51:55 marcel Exp $ -machine arm ident NSLU options PHYSADDR=0x10000000 @@ -76,7 +75,6 @@ options BOOTP_WIRED_TO=npe0 options BOOTP_COMPAT -device mem # Memory and kernel memory devices device pci device uart ==== //depot/projects/mpsafetty/sys/arm/conf/SIMICS#2 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.17 2008/10/23 01:51:55 marcel Exp $ -machine arm ident SIMICS options KERNPHYSADDR=0xc0000000 @@ -68,5 +67,4 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md ==== //depot/projects/mpsafetty/sys/arm/conf/SKYEYE#2 (text) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.11 2008/10/23 01:51:55 marcel Exp $ -machine arm ident KB920X options KERNPHYSADDR=0xc0000000 @@ -79,7 +78,6 @@ #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -device mem # Memory and kernel memory devices device md options SKYEYE_WORKAROUNDS # Floppy drives ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.81 2008/10/22 21:55:48 jhb Exp $"); #include "opt_compat.h" @@ -1762,6 +1762,24 @@ return (ftruncate(td, &ap)); } +int +freebsd32_getdirentries(struct thread *td, + struct freebsd32_getdirentries_args *uap) +{ + long base; + int32_t base32; + int error; + + error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base); + if (error) + return (error); + if (uap->basep != NULL) { + base32 = base; + error = copyout(&base32, uap->basep, sizeof(int32_t)); + } + return (error); +} + #ifdef COMPAT_FREEBSD6 /* versions with the 'int pad' argument */ int ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#9 (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.93 2008/09/25 20:08:36 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.94 2008/10/22 21:56:44 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -152,6 +152,12 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; }; +struct freebsd32_getdirentries_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)]; + char basep_l_[PADL_(int32_t *)]; int32_t * basep; char basep_r_[PADR_(int32_t *)]; +}; struct freebsd32_sysctl_args { char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)]; char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; @@ -406,6 +412,7 @@ int freebsd32_stat(struct thread *, struct freebsd32_stat_args *); int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *); int freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *); +int freebsd32_getdirentries(struct thread *, struct freebsd32_getdirentries_args *); int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *); int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *); int freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *); @@ -618,6 +625,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT #define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT #define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT +#define FREEBSD32_SYS_AUE_freebsd32_getdirentries AUE_GETDIRENTRIES #define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL #define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES #define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#9 (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.92 2008/09/25 20:08:36 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.93 2008/10/22 21:56:44 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb */ #define FREEBSD32_SYS_syscall 0 @@ -177,7 +177,7 @@ #define FREEBSD32_SYS_fpathconf 192 #define FREEBSD32_SYS_getrlimit 194 #define FREEBSD32_SYS_setrlimit 195 -#define FREEBSD32_SYS_getdirentries 196 +#define FREEBSD32_SYS_freebsd32_getdirentries 196 #define FREEBSD32_SYS_freebsd6_freebsd32_mmap 197 #define FREEBSD32_SYS___syscall 198 #define FREEBSD32_SYS_freebsd6_freebsd32_lseek 199 ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#9 (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.83 2008/09/25 20:08:36 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.84 2008/10/22 21:56:44 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb */ const char *freebsd32_syscallnames[] = { @@ -203,7 +203,7 @@ "#193", /* 193 = nosys */ "getrlimit", /* 194 = getrlimit */ "setrlimit", /* 195 = setrlimit */ - "getdirentries", /* 196 = getdirentries */ + "freebsd32_getdirentries", /* 196 = freebsd32_getdirentries */ "compat6.freebsd32_mmap", /* 197 = old freebsd32_mmap */ "__syscall", /* 198 = __syscall */ "compat6.freebsd32_lseek", /* 199 = old freebsd32_lseek */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#9 (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.93 2008/09/25 20:08:36 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.94 2008/10/22 21:56:44 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb */ #include "opt_compat.h" @@ -234,7 +234,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 193 = nosys */ { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 194 = getrlimit */ { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 195 = setrlimit */ - { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = getdirentries */ + { AS(freebsd32_getdirentries_args), (sy_call_t *)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 196 = freebsd32_getdirentries */ { compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP, NULL, 0, 0 }, /* 197 = old freebsd32_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 198 = __syscall */ { compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0 }, /* 199 = old freebsd32_lseek */ ==== //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#10 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.108 2008/09/25 20:07:42 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.109 2008/10/22 21:55:48 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -350,8 +350,8 @@ 195 AUE_SETRLIMIT NOPROTO { int setrlimit(u_int which, \ struct rlimit *rlp); } setrlimit \ __setrlimit_args int -196 AUE_GETDIRENTRIES NOPROTO { int getdirentries(int fd, char *buf, \ - u_int count, long *basep); } +196 AUE_GETDIRENTRIES STD { int freebsd32_getdirentries(int fd, \ + char *buf, u_int count, int32_t *basep); } 197 AUE_MMAP COMPAT6 { caddr_t freebsd32_mmap(caddr_t addr, \ size_t len, int prot, int flags, int fd, \ int pad, u_int32_t poslo, \ ==== //depot/projects/mpsafetty/sys/conf/NOTES#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1509 2008/10/21 20:33:40 mav Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1510 2008/10/22 17:50:45 obrien Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -242,9 +242,9 @@ # SMP Debugging Options: # -# PREEMPTION allows the threads that are in the kernel to be preempted -# by higher priority threads. It helps with interactivity and -# allows interrupt threads to run sooner rather than waiting. +# PREEMPTION allows the threads that are in the kernel to be preempted by +# higher priority [interrupt] threads. It helps with interactivity +# and allows interrupt threads to run sooner rather than waiting. # WARNING! Only tested on amd64 and i386. # FULL_PREEMPTION instructs the kernel to preempt non-realtime kernel # threads. Its sole use is to expose race conditions and other ==== //depot/projects/mpsafetty/sys/conf/files.arm#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files.arm,v 1.19 2007/12/02 20:40:31 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.arm,v 1.20 2008/10/23 01:51:55 marcel Exp $ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb arm/arm/autoconf.c standard @@ -46,10 +46,10 @@ arm/fpe-arm/armfpe_glue.S optional armfpe arm/fpe-arm/armfpe_init.c optional armfpe arm/fpe-arm/armfpe.S optional armfpe -geom/geom_bsd.c standard -geom/geom_bsd_enc.c standard -geom/geom_mbr.c standard -geom/geom_mbr_enc.c standard +geom/geom_bsd.c optional geom_bsd +geom/geom_bsd_enc.c optional geom_bsd +geom/geom_mbr.c optional geom_mbr +geom/geom_mbr_enc.c optional geom_mbr hal.o optional ath_hal \ compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ no-implicit-rule ==== //depot/projects/mpsafetty/sys/conf/files.mips#4 (text+ko) ==== @@ -18,7 +18,7 @@ # Copyright (c) 2001, 2004-2005, Juniper Networks, Inc. # All rights reserved. # JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta -# $FreeBSD: src/sys/conf/files.mips,v 1.4 2008/09/19 19:46:11 imp Exp $ +# $FreeBSD: src/sys/conf/files.mips,v 1.5 2008/10/23 02:16:38 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -71,10 +71,10 @@ mips/mips/support.S standard mips/mips/swtch.S standard mips/mips/uio_machdep.c standard -geom/geom_bsd.c standard -geom/geom_bsd_enc.c standard -geom/geom_mbr.c standard -geom/geom_mbr_enc.c standard +geom/geom_bsd.c optional geom_bsd +geom/geom_bsd_enc.c optional geom_bsd +geom/geom_mbr.c optional geom_mbr +geom/geom_mbr_enc.c optional geom_mbr hal.o optional ath_hal \ compile-with "ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ no-implicit-rule ==== //depot/projects/mpsafetty/sys/dev/mii/ciphy.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.16 2008/09/30 07:30:05 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/ciphy.c,v 1.17 2008/10/23 01:27:15 yongari Exp $"); /* * Driver for the Cicada/Vitesse CS/VSC8xxx 10/100/1000 copper PHY. @@ -92,9 +92,9 @@ MII_PHY_DESC(CICADA, CS8201A), MII_PHY_DESC(CICADA, CS8201B), MII_PHY_DESC(CICADA, CS8204), + MII_PHY_DESC(CICADA, VSC8211), MII_PHY_DESC(CICADA, CS8244), MII_PHY_DESC(VITESSE, VSC8601), - MII_PHY_DESC(VITESSE, VSC8211), MII_PHY_END }; @@ -423,9 +423,9 @@ } break; + case MII_MODEL_CICADA_VSC8211: case MII_MODEL_CICADA_CS8244: case MII_MODEL_VITESSE_VSC8601: - case MII_MODEL_VITESSE_VSC8211: break; default: device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n", ==== //depot/projects/mpsafetty/sys/dev/mii/miidevs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.61 2008/10/03 10:31:31 stas Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.62 2008/10/23 01:27:15 yongari Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -155,11 +155,11 @@ /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY model CICADA CS8204 0x0004 Cicada CS8204 10/100/1000TX PHY +model CICADA VSC8211 0x000b Cicada VSC8211 10/100/1000TX PHY model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY model CICADA CS8244 0x002c Cicada CS8244 10/100/1000TX PHY model VITESSE VSC8601 0x0002 Vitesse VSC8601 10/100/1000TX PHY -model VITESSE VSC8211 0x000b Vitesse VSC8211 10/100/1000TX PHY /* Davicom Semiconductor PHYs */ model DAVICOM DM9102 0x0004 DM9102 10/100 media interface ==== //depot/projects/mpsafetty/sys/dev/ppc/ppc.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.60 2008/10/21 18:30:10 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ppc/ppc.c,v 1.61 2008/10/22 19:39:16 jhb Exp $"); #include "opt_ppc.h" @@ -751,7 +751,8 @@ if (bootverbose) { outb(csr, 0x1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:17:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FCFA1065676; Thu, 23 Oct 2008 19:17:54 +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 C6E44106566C for ; Thu, 23 Oct 2008 19:17:53 +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 B5BB68FC16 for ; Thu, 23 Oct 2008 19:17:53 +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 m9NJHr3O086239 for ; Thu, 23 Oct 2008 19:17:53 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJHr6N086237 for perforce@freebsd.org; Thu, 23 Oct 2008 19:17:53 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 23 Oct 2008 19:17:53 GMT Message-Id: <200810231917.m9NJHr6N086237@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 151820 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, 23 Oct 2008 19:17:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=151820 Change 151820 by ed@ed_dull on 2008/10/23 19:16:55 As a test, remove from drivers that are connected to the build. Affected files ... .. //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#4 edit .. //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#4 edit .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#9 edit .. //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#6 edit .. //depot/projects/mpsafetty/sys/dev/usb/ugen.c#4 edit .. //depot/projects/mpsafetty/sys/dev/usb/uhid.c#4 edit Differences ... ==== //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#4 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include -#include #include #include #include ==== //depot/projects/mpsafetty/sys/dev/usb/ucom.c#9 (text+ko) ==== @@ -78,7 +78,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/mpsafetty/sys/dev/usb/ufoma.c#6 (text+ko) ==== @@ -88,7 +88,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/mpsafetty/sys/dev/usb/ugen.c#4 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include -#include #include #include #include ==== //depot/projects/mpsafetty/sys/dev/usb/uhid.c#4 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:25:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62705106569A; Thu, 23 Oct 2008 19:25:01 +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 262BB1065685 for ; Thu, 23 Oct 2008 19:25:01 +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 147968FC2A for ; Thu, 23 Oct 2008 19:25:01 +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 m9NJP0Xc086790 for ; Thu, 23 Oct 2008 19:25:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJP0Qo086788 for perforce@freebsd.org; Thu, 23 Oct 2008 19:25:00 GMT (envelope-from sam@freebsd.org) Date: Thu, 23 Oct 2008 19:25:00 GMT Message-Id: <200810231925.m9NJP0Qo086788@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 151821 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, 23 Oct 2008 19:25:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=151821 Change 151821 by sam@sam_ebb on 2008/10/23 19:24:37 o fill in incomplete media change handling so ifconfig mode 11b (for example) works o remove media change handling of the underyling device; it only tried to handle fixed rates but did it wrong and has been replaced by the per-band tx parameters mechanism As a side-effect ic_curmode is now dead code; just need to update driver use so it can finally be purged. Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211.c#52 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211.c#52 (text+ko) ==== @@ -1063,8 +1063,7 @@ } static int -media2mode(const struct ieee80211com *ic, - const struct ifmedia_entry *ime, enum ieee80211_phymode *mode) +media2mode(const struct ifmedia_entry *ime, uint32_t flags, uint16_t *mode) { switch (IFM_MODE(ime->ifm_media)) { case IFM_IEEE80211_11A: @@ -1097,7 +1096,7 @@ */ if (ime->ifm_media & IFM_IEEE80211_TURBO) { if (*mode == IEEE80211_MODE_11A) { - if (ic->ic_flags & IEEE80211_F_TURBOP) + if (flags & IEEE80211_F_TURBOP) *mode = IEEE80211_MODE_TURBO_A; else *mode = IEEE80211_MODE_STURBO_A; @@ -1111,51 +1110,12 @@ } /* - * Handle a media change request on the underlying - * interface; we accept mode changes only. + * Handle a media change request on the underlying interface. */ int ieee80211com_media_change(struct ifnet *ifp) { - struct ieee80211com *ic = ifp->if_l2com; - struct ifmedia_entry *ime = ic->ic_media.ifm_cur; - enum ieee80211_phymode newphymode; - int error = 0; - - /* - * First, identify the phy mode. - */ - if (!media2mode(ic, ime, &newphymode)) - return EINVAL; - /* NB: mode must be supported, no need to check */ - - /* - * Handle phy mode change. - */ - IEEE80211_LOCK(ic); - if (ic->ic_curmode != newphymode) { /* change phy mode */ - struct ieee80211vap *vap; - - (void) ieee80211_setmode(ic, newphymode); - /* - * Propagate new state to each vap. - */ - TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { - } - } - IEEE80211_UNLOCK(ic); - return error; -} - -static int -findrate(const struct ieee80211com *ic, enum ieee80211_phymode m, int r) -{ - int i, nrates; - - for (i = 0, nrates = ic->ic_sup_rates[m].rs_nrates; i < nrates; i++) - if ((ic->ic_sup_rates[m].rs_rates[i] & IEEE80211_RATE_VAL) == r) - return i; - return -1; + return EINVAL; } /* @@ -1166,26 +1126,12 @@ { struct ieee80211vap *vap = ifp->if_softc; struct ifmedia_entry *ime = vap->iv_media.ifm_cur; - struct ieee80211com *ic = vap->iv_ic; - int newrate; + uint16_t newmode; - /* XXX this won't work unless ic_curmode is != IEEE80211_MODE_AUTO */ - if (ic->ic_curmode == IEEE80211_MODE_AUTO) + if (!media2mode(ime, vap->iv_flags, &newmode)) return EINVAL; - if (IFM_SUBTYPE(ime->ifm_media) != IFM_AUTO) { - /* - * NB: this can only be used to specify a legacy rate. - */ - newrate = ieee80211_media2rate(ime->ifm_media); - if (newrate == 0) - return EINVAL; - if (findrate(ic, ic->ic_curmode, newrate) == -1) - return EINVAL; - } else { - newrate = IEEE80211_FIXED_RATE_NONE; - } - if (newrate != vap->iv_txparms[ic->ic_curmode].ucastrate) { - vap->iv_txparms[ic->ic_curmode].ucastrate = newrate; + if (vap->iv_des_mode != newmode) { + vap->iv_des_mode = newmode; return ENETRESET; } return 0; From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:29:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FF3B106567C; Thu, 23 Oct 2008 19:29: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 6364F106567A for ; Thu, 23 Oct 2008 19:29:05 +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 5239D8FC1E for ; Thu, 23 Oct 2008 19:29:05 +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 m9NJT5ln087060 for ; Thu, 23 Oct 2008 19:29:05 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJT566087058 for perforce@freebsd.org; Thu, 23 Oct 2008 19:29:05 GMT (envelope-from sam@freebsd.org) Date: Thu, 23 Oct 2008 19:29:05 GMT Message-Id: <200810231929.m9NJT566087058@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 151822 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, 23 Oct 2008 19:29:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=151822 Change 151822 by sam@sam_ebb on 2008/10/23 19:28:27 o shuffle ath_debug declaration to below the debug flag definitions so it's possible to reference them in setting an initial value for ath_debug o initialize sc_debug early in attach so we can set debug flags that are honored during attach work Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#115 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#115 (text+ko) ==== @@ -239,10 +239,6 @@ TUNABLE_INT("hw.ath.txbuf", &ath_txbuf); #ifdef ATH_DEBUG -static int ath_debug = 0; -SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, - 0, "control debugging printfs"); -TUNABLE_INT("hw.ath.debug", &ath_debug); enum { ATH_DEBUG_XMIT = 0x00000001, /* basic xmit operation */ ATH_DEBUG_XMIT_DESC = 0x00000002, /* xmit descriptors */ @@ -267,6 +263,11 @@ ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ ATH_DEBUG_ANY = 0xffffffff }; +static int ath_debug = 0; +SYSCTL_INT(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug, + 0, "control debugging printfs"); +TUNABLE_INT("hw.ath.debug", &ath_debug); + #define IFF_DUMPPKTS(sc, m) \ ((sc->sc_debug & (m)) || \ (sc->sc_ifp->if_flags & (IFF_DEBUG|IFF_LINK2)) == (IFF_DEBUG|IFF_LINK2)) @@ -333,6 +334,9 @@ } sc->sc_ah = ah; sc->sc_invalid = 0; /* ready to go, enable interrupt handling */ +#ifdef ATH_DEBUG + sc->sc_debug = ath_debug; +#endif /* * Check if the MAC has multi-rate retry support. @@ -6731,7 +6735,6 @@ "regdomain", CTLFLAG_RD, &sc->sc_eerd, 0, "EEPROM regdomain code"); #ifdef ATH_DEBUG - sc->sc_debug = ath_debug; SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "debug", CTLFLAG_RW, &sc->sc_debug, 0, "control debugging printfs"); From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:31:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1BF510656A5; Thu, 23 Oct 2008 19:31: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 9463E1065682 for ; Thu, 23 Oct 2008 19:31:07 +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 831808FC13 for ; Thu, 23 Oct 2008 19:31:07 +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 m9NJV7a4087240 for ; Thu, 23 Oct 2008 19:31:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJV7kV087238 for perforce@freebsd.org; Thu, 23 Oct 2008 19:31:07 GMT (envelope-from sam@freebsd.org) Date: Thu, 23 Oct 2008 19:31:07 GMT Message-Id: <200810231931.m9NJV7kV087238@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 151823 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, 23 Oct 2008 19:31:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=151823 Change 151823 by sam@sam_ebb on 2008/10/23 19:30:58 add regdomain debug msgs Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#116 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#116 (text+ko) ==== @@ -260,6 +260,7 @@ ATH_DEBUG_LED = 0x00100000, /* led management */ ATH_DEBUG_FF = 0x00200000, /* fast frames */ ATH_DEBUG_DFS = 0x00400000, /* DFS processing */ + ATH_DEBUG_REGDOMAIN = 0x02000000, /* regulatory processing */ ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ ATH_DEBUG_ANY = 0xffffffff }; @@ -5894,6 +5895,9 @@ HAL_CHANNEL *halchans; int i, nhalchans, error; + DPRINTF(sc, ATH_DEBUG_REGDOMAIN, "%s: cc %u outdoor %u ecm %u\n", + __func__, cc, outdoor, ecm); + halchans = malloc(IEEE80211_CHAN_MAX * sizeof(HAL_CHANNEL), M_TEMP, M_NOWAIT | M_ZERO); if (halchans == NULL) { @@ -5997,6 +6001,10 @@ regdomain = 0; cc = CTRY_DEBUG; } + DPRINTF(sc, ATH_DEBUG_REGDOMAIN, + "%s: rd %u cc %u location %c ecm %u (mapped rd %u cc %u)\n", + __func__, rd->regdomain, rd->country, rd->location, rd->ecm, + regdomain, cc); ath_hal_setregdomain(ah, ath_maprd2sku(regdomain, cc)); error = getchannels(sc, &nchans, chans, cc, rd->ecm ? AH_TRUE : AH_FALSE, @@ -6023,6 +6031,10 @@ u_int32_t ord; (void) ath_hal_getregdomain(ah, &ord); + + DPRINTF(sc, ATH_DEBUG_REGDOMAIN, "%s: use rd %u cc %d, ord %u\n", + __func__, 0, CTRY_DEBUG, ord); + ath_hal_setregdomain(ah, 0); /* XXX not quite right but close enough for now */ getchannels(sc, nchans, chans, CTRY_DEBUG, AH_TRUE, AH_FALSE); @@ -6074,6 +6086,12 @@ ic->ic_regdomain.location = 'I'; ic->ic_regdomain.isocc[0] = ' '; /* XXX don't know */ ic->ic_regdomain.isocc[1] = ' '; + + DPRINTF(sc, ATH_DEBUG_REGDOMAIN, + "%s: eeprom rd %u cc %u (mapped rd %u cc %u) location %c ecm %u\n", + __func__, sc->sc_eerd, sc->sc_eecc, + ic->ic_regdomain.regdomain, ic->ic_regdomain.country, + ic->ic_regdomain.location, ic->ic_regdomain.ecm); return 0; } From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:35:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EEDA1065679; Thu, 23 Oct 2008 19:35: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 01FBB10656A6 for ; Thu, 23 Oct 2008 19:35:12 +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 E4D8F8FC26 for ; Thu, 23 Oct 2008 19:35:11 +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 m9NJZBOc087664 for ; Thu, 23 Oct 2008 19:35:11 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJZBLC087662 for perforce@freebsd.org; Thu, 23 Oct 2008 19:35:11 GMT (envelope-from sam@freebsd.org) Date: Thu, 23 Oct 2008 19:35:11 GMT Message-Id: <200810231935.m9NJZBLC087662@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 151825 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, 23 Oct 2008 19:35:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=151825 Change 151825 by sam@sam_ebb on 2008/10/23 19:34:49 cl151683 somehow broke operation on 11a channels by causing country ie to overflow the beacon frame or otherwise cause it to be malformed such that we get dma errors. Workaround this for now by redoing the mapping between Atheros sku's and net80211 regdomain codes to be more careful. Specifically only map the pair to the hal pair <0,CTRY_DEBUG> as this is the magic setup required to unlock the entire channel list (which is needed to do testing on quiet 2.4G channels like 2484). Note this does not fix the (apparent) country ie problem; still need to investigate that. Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#117 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#117 (text+ko) ==== @@ -5974,14 +5974,22 @@ /* XXX hard to include ieee80211_regdomain.h right now */ #define SKU_DEBUG 0x1ff -static int -ath_maprd2sku(u_int32_t rd, u_int32_t cc) +static void +ath_maprd(const struct ieee80211_regdomain *rd, + u_int32_t *ath_rd, u_int32_t *ath_cc) { /* map SKU's to Atheros sku's */ - switch (rd) { - case SKU_DEBUG: return 0; + switch (rd->regdomain) { + case SKU_DEBUG: + if (rd->country == 0) { + *ath_rd = 0; + *ath_cc = CTRY_DEBUG; + return; + } + break; } - return rd; + *ath_rd = rd->regdomain; + *ath_cc = rd->country; } static int @@ -5994,18 +6002,13 @@ int error; (void) ath_hal_getregdomain(ah, &ord); - regdomain = rd->regdomain; - cc = rd->country; - if (regdomain == SKU_DEBUG && cc == 0) { - /* XXX requires special handling */ - regdomain = 0; - cc = CTRY_DEBUG; - } + ath_maprd(rd, ®domain, &cc); DPRINTF(sc, ATH_DEBUG_REGDOMAIN, "%s: rd %u cc %u location %c ecm %u (mapped rd %u cc %u)\n", __func__, rd->regdomain, rd->country, rd->location, rd->ecm, regdomain, cc); - ath_hal_setregdomain(ah, ath_maprd2sku(regdomain, cc)); + ath_hal_setregdomain(ah, regdomain); + error = getchannels(sc, &nchans, chans, cc, rd->ecm ? AH_TRUE : AH_FALSE, rd->location != 'I' ? AH_TRUE : AH_FALSE); @@ -6046,14 +6049,25 @@ ic->ic_regdomain.location != 'I' ? AH_TRUE : AH_FALSE); } -static int -ath_mapsku2rd(u_int32_t sku, u_int32_t cc) +static void +ath_mapsku(u_int32_t ath_rd, u_int32_t ath_cc, struct ieee80211_regdomain *rd) { + rd->isocc[0] = ' '; /* XXX don't know */ + rd->isocc[1] = ' '; + /* map Atheros sku's to SKU's */ - switch (sku) { - case 0: return SKU_DEBUG; + switch (ath_rd) { + case 0: + if (ath_cc == CTRY_DEBUG) { + rd->regdomain = SKU_DEBUG; + rd->country = 0; + return; + } + break; } - return sku; + /* XXX net80211 types too small */ + rd->regdomain = (uint16_t) ath_rd; + rd->country = (uint16_t) ath_cc; } static int @@ -6080,12 +6094,9 @@ } return error; } - ic->ic_regdomain.regdomain = ath_mapsku2rd(sc->sc_eerd, sc->sc_eecc); - ic->ic_regdomain.country = sc->sc_eecc; ic->ic_regdomain.ecm = 1; ic->ic_regdomain.location = 'I'; - ic->ic_regdomain.isocc[0] = ' '; /* XXX don't know */ - ic->ic_regdomain.isocc[1] = ' '; + ath_mapsku(sc->sc_eerd, sc->sc_eecc, &ic->ic_regdomain); DPRINTF(sc, ATH_DEBUG_REGDOMAIN, "%s: eeprom rd %u cc %u (mapped rd %u cc %u) location %c ecm %u\n", From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:41:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1CA11065675; Thu, 23 Oct 2008 19:41:18 +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 4D2A51065671 for ; Thu, 23 Oct 2008 19:41:18 +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 3B0828FC16 for ; Thu, 23 Oct 2008 19:41:18 +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 m9NJfIu7088138 for ; Thu, 23 Oct 2008 19:41:18 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJfIx5088136 for perforce@freebsd.org; Thu, 23 Oct 2008 19:41:18 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 23 Oct 2008 19:41:18 GMT Message-Id: <200810231941.m9NJfIx5088136@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 151826 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, 23 Oct 2008 19:41:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=151826 Change 151826 by ed@ed_dull on 2008/10/23 19:40:40 Add a mockup for a replacement clist interface. Affected files ... .. //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#5 edit .. //depot/projects/mpsafetty/sys/dev/usb/ugen.c#5 edit .. //depot/projects/mpsafetty/sys/dev/usb/uhid.c#5 edit .. //depot/projects/mpsafetty/sys/sys/clist.h#6 add Differences ... ==== //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#5 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -557,7 +558,7 @@ #if 0 bzero(&sc->gkb_q, sizeof(sc->gkb_q)); #endif - clist_alloc_cblocks(&sc->gkb_q, KB_QSIZE, KB_QSIZE/2); /* XXX */ + clist_alloc(&sc->gkb_q, KB_QSIZE); splx(s); return (0); @@ -607,7 +608,7 @@ splx(s); return (ENXIO); } - while (sc->gkb_q.c_cc == 0) { + while (clist_usage(&sc->gkb_q) == 0) { if (flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); @@ -631,7 +632,7 @@ error = 0; while (uio->uio_resid > 0) { len = imin(uio->uio_resid, sizeof(buffer)); - len = q_to_b(&sc->gkb_q, buffer, len); + len = clist_read(&sc->gkb_q, buffer, len); if (len <= 0) break; error = uiomove(buffer, len, uio); @@ -683,7 +684,7 @@ if ((sc == NULL) || (kbd == NULL) || !KBD_IS_VALID(kbd)) { revents = POLLHUP; /* the keyboard has gone */ } else if (events & (POLLIN | POLLRDNORM)) { - if (sc->gkb_q.c_cc > 0) + if (clist_usage(&sc->gkb_q) > 0) revents = events & (POLLIN | POLLRDNORM); else selrecord(td, &sc->gkb_rsel); @@ -700,6 +701,7 @@ u_char *cp; int mode; int c; + char cq[3]; /* assert(KBD_IS_VALID(kbd)) */ sc = (genkbd_softc_t *)arg; @@ -737,7 +739,8 @@ /* store the byte as is for K_RAW and K_CODE modes */ if (mode != K_XLATE) { - putc(KEYCHAR(c), &sc->gkb_q); + cq[0] = KEYCHAR(c); + clist_write(&sc->gkb_q, cq, 1); continue; } @@ -752,9 +755,10 @@ /* ignore them... */ continue; case BTAB: /* a backtab: ESC [ Z */ - putc(0x1b, &sc->gkb_q); - putc('[', &sc->gkb_q); - putc('Z', &sc->gkb_q); + cq[0] = 0x1b; + cq[1] = '['; + cq[2] = 'Z'; + clist_write(&sc->gkb_q, cq, 3); continue; } } @@ -762,24 +766,24 @@ /* normal chars, normal chars with the META, function keys */ switch (KEYFLAGS(c)) { case 0: /* a normal char */ - putc(KEYCHAR(c), &sc->gkb_q); + cq[0] = KEYCHAR(c); + clist_write(&sc->gkb_q, cq, 1); break; case MKEY: /* the META flag: prepend ESC */ - putc(0x1b, &sc->gkb_q); - putc(KEYCHAR(c), &sc->gkb_q); + cq[0] = 0x1b; + cq[1] = KEYCHAR(c); + clist_write(&sc->gkb_q, cq, 2); break; case FKEY | SPCLKEY: /* a function key, return string */ cp = kbdd_get_fkeystr(kbd, KEYCHAR(c), &len); - if (cp != NULL) { - while (len-- > 0) - putc(*cp++, &sc->gkb_q); - } + if (cp != NULL) + clist_write(&sc->gkb_q, cp, len); break; } } /* wake up sleeping/polling processes */ - if (sc->gkb_q.c_cc > 0) { + if (clist_usage(&sc->gkb_q) > 0) { if (sc->gkb_flags & KB_ASLEEP) { sc->gkb_flags &= ~KB_ASLEEP; wakeup(sc); ==== //depot/projects/mpsafetty/sys/dev/usb/ugen.c#5 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -528,9 +529,7 @@ sce->ibuf = malloc(isize, M_USBDEV, M_WAITOK); DPRINTFN(5, ("ugenopen: intr endpt=%d,isize=%d\n", endpt, isize)); - if ((clist_alloc_cblocks(&sce->q, UGEN_IBSIZE, - UGEN_IBSIZE), 0) == -1) - return (ENOMEM); + clist_alloc(&sce->q, UGEN_IBSIZE); err = usbd_open_pipe_intr(sce->iface, edesc->bEndpointAddress, USBD_SHORT_XFER_OK, &sce->pipeh, sce, @@ -538,7 +537,7 @@ USBD_DEFAULT_INTERVAL); if (err) { free(sce->ibuf, M_USBDEV); - clist_free_cblocks(&sce->q); + clist_free(&sce->q); return (EIO); } DPRINTFN(5, ("ugenopen: interrupt open done\n")); @@ -648,8 +647,7 @@ switch (sce->edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: - ndflush(&sce->q, sce->q.c_cc); - clist_free_cblocks(&sce->q); + clist_free(&sce->q); break; case UE_ISOCHRONOUS: for (i = 0; i < UGEN_NISOREQS; ++i) @@ -662,7 +660,7 @@ if (sce->ibuf != NULL) { free(sce->ibuf, M_USBDEV); sce->ibuf = NULL; - clist_free_cblocks(&sce->q); + clist_free(&sce->q); } } sc->sc_is_open[endpt] = 0; @@ -706,7 +704,7 @@ case UE_INTERRUPT: /* Block until activity occurred. */ s = splusb(); - while (sce->q.c_cc == 0) { + while (clist_usage(&sce->q) == 0) { if (flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); @@ -729,13 +727,14 @@ splx(s); /* Transfer as many chunks as possible. */ - while (sce->q.c_cc > 0 && uio->uio_resid > 0 && !error) { - n = min(sce->q.c_cc, uio->uio_resid); + while ((n = clist_usage(&sce->q)) > 0 && + uio->uio_resid > 0 && !error) { + n = min(n, uio->uio_resid); if (n > sizeof(buffer)) n = sizeof(buffer); /* Remove a small chunk from the input queue. */ - q_to_b(&sce->q, buffer, n); + clist_read(&sce->q, buffer, n); DPRINTFN(5, ("ugenread: got %d chars\n", n)); /* Copy the data to the user process. */ @@ -1026,7 +1025,7 @@ DPRINTFN(5, (" data = %02x %02x %02x\n", ibuf[0], ibuf[1], ibuf[2])); - (void)b_to_q(ibuf, count, &sce->q); + clist_write(&sce->q, ibuf, count); if (sce->state & UGEN_ASLP) { sce->state &= ~UGEN_ASLP; @@ -1540,13 +1539,13 @@ switch (edesc->bmAttributes & UE_XFERTYPE) { case UE_INTERRUPT: if (sce_in != NULL && (events & (POLLIN | POLLRDNORM))) { - if (sce_in->q.c_cc > 0) + if (clist_usage(&sce_in->q) > 0) revents |= events & (POLLIN | POLLRDNORM); else selrecord(p, &sce_in->rsel); } if (sce_out != NULL && (events & (POLLOUT | POLLWRNORM))) { - if (sce_out->q.c_cc > 0) + if (clist_usage(&sce_out->q) > 0) revents |= events & (POLLOUT | POLLWRNORM); else selrecord(p, &sce_out->rsel); ==== //depot/projects/mpsafetty/sys/dev/usb/uhid.c#5 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include +#include #include #include #include @@ -389,7 +390,7 @@ return; } - (void) b_to_q(sc->sc_ibuf, sc->sc_isize, &sc->sc_q); + clist_write(&sc->sc_q, sc->sc_ibuf, sc->sc_isize); if (sc->sc_state & UHID_ASLP) { sc->sc_state &= ~UHID_ASLP; @@ -424,7 +425,7 @@ return (EBUSY); sc->sc_state |= UHID_OPEN; - clist_alloc_cblocks(&sc->sc_q, UHID_BSIZE, UHID_BSIZE); + clist_alloc(&sc->sc_q, UHID_BSIZE); sc->sc_ibuf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK); sc->sc_obuf = malloc(sc->sc_osize, M_USBDEV, M_WAITOK); @@ -464,8 +465,7 @@ usbd_close_pipe(sc->sc_intrpipe); sc->sc_intrpipe = 0; - ndflush(&sc->sc_q, sc->sc_q.c_cc); - clist_free_cblocks(&sc->sc_q); + clist_free(&sc->sc_q); free(sc->sc_ibuf, M_USBDEV); free(sc->sc_obuf, M_USBDEV); @@ -499,7 +499,7 @@ } s = splusb(); - while (sc->sc_q.c_cc == 0) { + while (clist_usage(&sc->sc_q) == 0) { if (flag & O_NONBLOCK) { splx(s); return (EWOULDBLOCK); @@ -523,13 +523,14 @@ splx(s); /* Transfer as many chunks as possible. */ - while (sc->sc_q.c_cc > 0 && uio->uio_resid > 0 && !error) { - length = min(sc->sc_q.c_cc, uio->uio_resid); + while ((length = clist_usage(&sc->sc_q)) > 0 && + uio->uio_resid > 0 && !error) { + length = min(length, uio->uio_resid); if (length > sizeof(buffer)) length = sizeof(buffer); /* Remove a small chunk from the input queue. */ - (void) q_to_b(&sc->sc_q, buffer, length); + clist_read(&sc->sc_q, buffer, length); DPRINTFN(5, ("uhidread: got %lu chars\n", (u_long)length)); /* Copy the data to the user process. */ @@ -743,7 +744,7 @@ if (events & (POLLOUT | POLLWRNORM)) revents |= events & (POLLOUT | POLLWRNORM); if (events & (POLLIN | POLLRDNORM)) { - if (sc->sc_q.c_cc > 0) + if (clist_usage(&sc->sc_q) > 0) revents |= events & (POLLIN | POLLRDNORM); else selrecord(p, &sc->sc_rsel); From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:43:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0613106569D; Thu, 23 Oct 2008 19:43: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 9421C106567B for ; Thu, 23 Oct 2008 19:43:20 +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 69CA78FC25 for ; Thu, 23 Oct 2008 19:43:20 +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 m9NJhKCh088307 for ; Thu, 23 Oct 2008 19:43:20 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJhKEW088305 for perforce@freebsd.org; Thu, 23 Oct 2008 19:43:20 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 23 Oct 2008 19:43:20 GMT Message-Id: <200810231943.m9NJhKEW088305@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 151827 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, 23 Oct 2008 19:43:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=151827 Change 151827 by ed@ed_dull on 2008/10/23 19:43:15 Remove unneeded clist block size definitions. Affected files ... .. //depot/projects/mpsafetty/sys/sys/param.h#15 edit Differences ... ==== //depot/projects/mpsafetty/sys/sys/param.h#15 (text+ko) ==== @@ -192,11 +192,6 @@ #define NODEV (dev_t)(-1) /* non-existent device */ -#define CBLOCK 128 /* Clist block size, must be a power of 2. */ - /* Data chars/clist. */ -#define CBSIZE (CBLOCK - sizeof(struct cblock *)) -#define CROUND (CBLOCK - 1) /* Clist rounding. */ - /* * File system parameters and macros. * From owner-p4-projects@FreeBSD.ORG Thu Oct 23 19:47:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A831065675; Thu, 23 Oct 2008 19:47: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 B79521065671 for ; Thu, 23 Oct 2008 19:47:24 +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 A6A808FC23 for ; Thu, 23 Oct 2008 19:47:24 +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 m9NJlOem088615 for ; Thu, 23 Oct 2008 19:47:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NJlO52088613 for perforce@freebsd.org; Thu, 23 Oct 2008 19:47:24 GMT (envelope-from sam@freebsd.org) Date: Thu, 23 Oct 2008 19:47:24 GMT Message-Id: <200810231947.m9NJlO52088613@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 151828 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, 23 Oct 2008 19:47:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=151828 Change 151828 by sam@sam_ebb on 2008/10/23 19:46:33 add regdomain knob Affected files ... .. //depot/projects/vap/tools/tools/ath/athdebug/athdebug.c#4 edit Differences ... ==== //depot/projects/vap/tools/tools/ath/athdebug/athdebug.c#4 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #define N(a) (sizeof(a)/sizeof(a[0])) @@ -68,6 +69,7 @@ ATH_DEBUG_FF = 0x00200000, /* fast frames */ ATH_DEBUG_DFS = 0x00400000, /* DFS processing */ ATH_DEBUG_TDMA = 0x00800000, /* TDMA processing */ + ATH_DEBUG_REGDOMAIN = 0x02000000, /* regulatory processing */ ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */ ATH_DEBUG_ANY = 0xffffffff }; @@ -97,6 +99,7 @@ { "ff", ATH_DEBUG_FF }, { "dfs", ATH_DEBUG_DFS }, { "tdma", ATH_DEBUG_TDMA }, + { "regdomain", ATH_DEBUG_REGDOMAIN }, { "fatal", ATH_DEBUG_FATAL }, }; From owner-p4-projects@FreeBSD.ORG Thu Oct 23 20:37:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23334106566C; Thu, 23 Oct 2008 20:37:32 +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 C25241065676 for ; Thu, 23 Oct 2008 20:37:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AEB978FC1B for ; Thu, 23 Oct 2008 20:37:31 +0000 (UTC) (envelope-from hselasky@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 m9NKbV84094076 for ; Thu, 23 Oct 2008 20:37:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NKbVaS094074 for perforce@freebsd.org; Thu, 23 Oct 2008 20:37:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 23 Oct 2008 20:37:31 GMT Message-Id: <200810232037.m9NKbVaS094074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151831 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, 23 Oct 2008 20:37:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=151831 Change 151831 by hselasky@hselasky_laptop001 on 2008/10/23 20:37:24 Massive documentation update for the FreeBSD LibUSB20 manual page. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.3#2 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.3#2 (text+ko) ==== @@ -26,10 +26,11 @@ .\" .\" $FreeBSD: $ .\" -.Dd Sep 28, 2008 +.Dd Oct 23, 2008 .Dt LIBUSB20 3 .Os .Sh NAME +.Nm libusb20 . .Nd "USB access library" . @@ -49,8 +50,779 @@ . .Sh DESCRIPTION . +The +.Nm +library implements functions to be able to easily access and control +USB through the USB file system interface. +. +. +.Sh USB TRANSFER OPERATIONS +. +.Pp +. +.Fn libusb20_tr_close +This function will release all kernel resources associated with an USB +.Fa xfer . +. +This function returns zero upon success. +. +Non-zero return values indicate a LIBUSB20_ERROR value. +. +.Pp +. +.Fn libusb20_tr_open +This function will allocate kernel resources like +.Fa MaxBufSize +and +.Fa MaxFrameCount +associated with an USB +.Fa xfer +and bind the transfer to the specified +.Fa ep_no . +. +This function returns zero upon success. +. +Non-zero return values indicate a LIBUSB20_ERROR value. +. +.Pp +. +.Fn libusb20_tr_get_pointer +This function will return a pointer to the allocated USB transfer according to the +.Fa pdev +and +.Fa tr_index +arguments. +. +This function returns NULL in case of failure. +. +.Pp +. +.Fn libusb20_tr_get_time_complete +This function will return the completion time of an USB transfer in +millisecond units. This function is most useful for isochronous USB +transfers when doing echo cancelling. +. +.Pp +. +.Fn libusb20_tr_get_actual_frames +This function will return the actual number of USB frames after an USB +transfer completed. A value of zero means that no data was transferred. +. +.Pp +. +.Fn libusb20_tr_get_actual_length +This function will return the sum of the actual length for all +transferred USB frames for the given USB transfer. +. +.Pp +. +.Fn libusb20_tr_get_max_frames +This function will return the maximum number of USB frames that were +allocated when an USB transfer was setup for the given USB transfer. +. +.Pp +. +.Fn libusb20_tr_get_max_packet_length +This function will return the maximum packet length in bytes +associated with the given USB transfer. +. +The packet length can be used round up buffer sizes so that short USB +packets are avoided for proxy buffers. +. +. +.Pp +. +.Fn libusb20_tr_get_max_total_length +This function will return the maximum value for the length sum of all +USB frames associated with an USB transfer. +. +.Pp +. +.Fn libusb20_tr_get_status +This function will return the status of an USB transfer. +. +Status values are defined by a set of LIBUSB20_TRANSFER_XXX enums. +. +.Pp +. +.Fn libusb20_tr_pending +This function will return non-zero if the given USB transfer is +pending for completion. +. +Else this function returns zero. +. +.Pp +. +.Fn libusb20_tr_callback_wrapper +This is an internal function used to wrap asynchronous USB callbacks. +. +.Pp +. +.Fn libusb20_tr_clear_stall_sync +This is an internal function used to synchronously clear the stall on +the given USB transfer. +. +Please see the USB specification for more information on stall +clearing. +. +If the given USB transfer is pending when this function is called, the +USB transfer will complete with an error after that this function has +been called. +. +.Pp +. +.Fn libusb20_tr_drain +This function will stop the given USB transfer and will not return +until the USB transfer has been stopped in hardware. +. +.Pp +. +.Fn libusb20_tr_set_buffer +This function is used to set the +.Fa buffer +pointer for the given USB transfer and +.Fa fr_index . +. +Typically the frame index is zero. +. +. +.Pp +. +.Fn libusb20_tr_set_callback +This function is used to set the USB callback for asynchronous USB +transfers. +. +The callback type is defined by libusb20_tr_callback_t. +. +.Pp +. +.Fn libusb20_tr_set_flags +This function is used to set various USB flags for the given USB transfer. +.Bl -tag +.It LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK +Report a short frame as error. +.It LIBUSB20_TRANSFER_MULTI_SHORT_NOT_OK +Multiple short frames are not allowed. +.It LIBUSB20_TRANSFER_FORCE_SHORT +All transmitted frames are short terminated. +.It LIBUSB20_TRANSFER_DO_CLEAR_STALL +Will do a clear-stall before starting the transfer. +.El +. +.Pp +. +.Fn libusb20_tr_set_length +This function sets the length of a given USB transfer and frame index. +. +.Pp +. +.Fn libusb20_tr_set_priv_sc0 +This function sets private driver pointer number zero. +. +.Pp +. +.Fn libusb20_tr_set_priv_sc1 +This function sets private driver pointer number one. +. +.Pp +. +.Fn libusb20_tr_set_timeout +This function sets the timeout for the given USB transfer. +. +A timeout value of zero means no timeout. +. +The timeout is given in milliseconds. +. +.Pp +. +.Fn libusb20_tr_set_total_frames +This function sets the total number of frames that should be executed when the USB transfer is submitted. +. +The total number of USB frames must be less than the maximum number of USB frames associated with the given USB transfer. +. +.Pp +. +.Fn libusb20_tr_setup_bulk +This function is a helper function for setting up a single frame USB BULK transfer. +. +.Pp +. +.Fn libusb20_tr_setup_control +This function is a helper function for setting up a single or dual +frame USB CONTROL transfer depending on the control transfer length. +. +.Pp +. +.Fn libusb20_tr_setup_intr +This function is a helper function for setting up a single frame USB INTERRUPT transfer. +. +.Pp +. +.Fn libusb20_tr_setup_isoc +This function is a helper function for setting up a multi frame USB ISOCHRONOUS transfer. +. +.Pp +. +.Fn libusb20_tr_start +This function will get the USB transfer started, if not already +started. +. +This function will not get the transfer queued in hardware. +. +This function is non-blocking. +. +.Pp +. +.Fn libusb20_tr_stop +This function will get the USB transfer stopped, if not already stopped. +. +This function is non-blocking, which means that the actual stop can +happen after the return of this function. +. +.Pp +. +.Fn libusb20_tr_submit +This function will get the USB transfer queued in hardware. +. +. +.Pp +. +.Fn libusb20_tr_get_priv_sc0 +This function returns private driver pointer number zero associated +with an USB transfer. +. +. +.Pp +. +.Fn libusb20_tr_get_priv_sc1 +This function returns private driver pointer number one associated +with an USB transfer. +. +. +.Sh USB DEVICE OPERATIONS +. +.Pp +. +.Fn libusb20_dev_get_backend_name +This function returns a zero terminated string describing the backend used. +. +.Pp +. +.Fn libusb20_dev_get_desc +This function returns a zero terminated string describing the given USB device. +. +.Pp +. +.Fn libusb20_dev_claim_interface +This function will try to claim the given USB interface given by +.Fa iface_index . +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_close +This function will close the given USB device. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_detach_kernel_driver +This function will try to detach the kernel driver for the USB interface given by +.Fa iface_index . +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_set_config_index +This function will try to set the configuration index on an USB +device. +. +The first configuration index is zero. +. +The un-configure index is 255. +. +This function returns zero on success else a LIBUSB20_ERROR value is returned. +. +.Pp +. +.Fn libusb20_dev_get_debug +This function returns the debug level of an USB device. +. +.Pp +. +.Fn libusb20_dev_get_fd +This function returns the file descriptor of the given USB device. +. +A negative value is returned when no file descriptor is present. +. +The file descriptor can be used for polling purposes. +. +.Pp +. +.Fn libusb20_dev_kernel_driver_active +This function returns a non-zero value if a kernel driver is active on +the given USB interface. +. +Else zero is returned. +. +.Pp +. +.Fn libusb20_dev_open +This function opens an USB device so that setting up USB transfers +becomes possible. +. +The number of USB transfers can be zero which means only control +transfers are allowed. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +A return value of LIBUSB20_ERROR_BUSY means that the device is already +opened. +. +.Pp +. +.Fn libusb20_dev_process +This function is called to sync kernel USB transfers with userland USB +transfers. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned typically indicating that the given USB device has been +detached. +. +.Pp +. +.Fn libusb20_dev_release_interface +This function will try to release a claimed USB interface for the specified USB device. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_request_sync +This function will perform a synchronous control request on the given +USB device. +. +Before this call will succeed the USB device must be opened. +. +.Fa setup +is a pointer to a decoded and host endian SETUP packet. +.Fa data +is a pointer to a data transfer buffer associated with the control transaction. This argument can be NULL. +.Fa pactlen +is a pointer to a variable that will hold the actual transfer length after the control transaction is complete. +.Fa timeout +is the transaction timeout given in milliseconds. +A timeout of zero means no timeout. +.Fa flags +is used to specify transaction flags, for example LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_req_string_sync +This function will synchronously request an USB string by language ID +and string index into the given buffer limited by a maximum length. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_req_string_simple_sync +This function will synchronously request an USB string using the +default language ID and convert the string into ASCII before storing +the string into the given buffer limited by a maximum length which +includes the terminating zero. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +. +.Pp +. +.Fn libusb20_dev_reset +This function will try to BUS reset the given USB device and restore +the last set USB configuration. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_set_power_mode +This function sets the power mode of the USB device. +. +Valid power modes: +.Bl -tag +.It LIBUSB20_POWER_OFF +.It LIBUSB20_POWER_ON +.It LIBUSB20_POWER_SAVE +.It LIBUSB20_POWER_SUSPEND +.It LIBUSB20_POWER_RESUME +.El +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_get_power_mode +This function returns the currently selected power mode for the given +USB device. +. +.Pp +. +.Fn libusb20_dev_set_alt_index +This function will try to set the given alternate index for the given +USB interface index. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_set_owner +This function will set the ownership of the given USB device. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_set_perm +This function will set the permissions of the given USB device. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_set_iface_owner +This function will set the ownership of the given USB interface. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_set_iface_perm +This function will set the permissions of the given USB interface. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_get_owner +This function will retrieve the current USB device ownership. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_get_perm +This function will retrieve the current USB device permissions. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_get_iface_owner +This function will retrieve the current USB interface ownership for +the given USB interface. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_get_iface_perm +This function will retrieve the current USB interface permissions for +the given USB interface. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_dev_get_device_desc +This function returns a pointer to the decoded and host endian version +of the device descriptor. +. +The USB device need not be opened when calling this function. +. +.Pp +. +.Fn libusb20_dev_alloc_config +This function will read out and decode the USB config descriptor for +the given USB device and config index. This function returns a pointer +to the decoded configuration which must eventually be passed to +free(). NULL is returned in case of failure. +. +.Pp +. +.Fn libusb20_dev_alloc(void) +This is an internal function to allocate a new USB device. +. +.Pp +. +.Fn libusb20_dev_get_address +This function returns the internal and not necessarily the real +hardware address of the given USB device. +. +.Pp +. +.Fn libusb20_dev_get_bus_number +This function return the internal bus number which the given USB +device belongs to. +. +.Pp +. +.Fn libusb20_dev_get_mode +This function returns the current operation mode of the USB entity. +. +Valid return values are: +.Bl -tag +.It LIBUSB20_MODE_HOST +.It LIBUSB20_MODE_DEVICE +.El +. +.Pp +. +.Fn libusb20_dev_get_speed +This function returns the current speed of the given USB device. +. +.Bl -tag +.It LIBUSB20_SPEED_UNKNOWN +.It LIBUSB20_SPEED_LOW +.It LIBUSB20_SPEED_FULL +.It LIBUSB20_SPEED_HIGH +.It LIBUSB20_SPEED_VARIABLE +.It LIBUSB20_SPEED_SUPER +.El +. +.Pp +. +.Fn libusb20_dev_get_config_index +This function returns the currently select config index for the given +USB device. +. +.Pp +. +.Fn libusb20_dev_free +This function will free the given USB device and all associated USB +transfers. +. +.Pp +. +.Fn libusb20_dev_set_debug +This function will set the debug level for the given USB device. +. +.Pp +. +.Fn libusb20_dev_wait_process +This function will wait until a pending USB transfer has completed on +the given USB device. +. +A timeout value can be specified which is passed on to the +.Xr 2 poll +function. +. +.Sh USB BUS OPERATIONS +. +.Fn libusb20_bus_set_owner +This function will set the ownership for the given USB bus. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_bus_set_perm +This function will set the permissions for the given USB bus. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_bus_get_owner +This function will retrieve the ownership for the given USB bus. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_bus_get_perm +This function will retrieve the permissions for the given USB bus. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +. +.Sh USB BACKEND OPERATIONS +. +.Fn libusb20_be_set_owner +This function will set the ownership for the given backend. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_be_set_perm +This function will set the permissions for the given backend. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_be_get_owner +This function will retrieve the ownership of the given backend. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_be_get_perm +This function will retrieve the permissions of the given backend. +. +. +This function returns zero on success else a LIBUSB20_ERROR value is +returned. +. +.Pp +. +.Fn libusb20_be_alloc +This is an internal function to allocate a USB backend. +. +.Pp +.Fn libusb20_be_alloc_default +.Fn libusb20_be_alloc_freebsd +.Fn libusb20_be_alloc_linux +These functions are used to allocate a specific USB backend or the +operating system default USB backend. Allocating a backend is a way to +scan for currently present USB devices. +. +.Pp +. +.Fn libusb20_be_device_foreach +This function is used to iterate USB devices present in a USB backend. +. +The starting value of +.Fa pdev +is NULL. . -The libusb library implements functions to be able to easily access and control USB through the USB file system interface. +This function returns the next USB device in the list. +. +If NULL is returned the end of the USB device list has been reached. +. +.Pp +. +.Fn libusb20_be_dequeue_device +This function will dequeue the given USB device pointer from the +backend USB device list. +. +Dequeued USB devices will not be freed when the backend is freed. +. +.Pp +. +.Fn libusb20_be_enqueue_device +This function will enqueue the given USB device pointer in the backend USB device list. +. +Enqueued USB devices will get freed when the backend is freed. +. +.Pp +. +.Fn libusb20_be_free +This function will free the given backend and all USB devices in its device list. +. +. +.Sh USB DESCRIPTOR PARSING +. +.Fn libusb20_me_get_1 +This function will return a byte at the given byte offset of a message +entity. +. +This function is safe against invalid offsets. +. +.Pp +. +.Fn libusb20_me_get_2 +This function will return a little endian 16-bit value at the given byte offset of a message +entity. +. +This function is safe against invalid offsets. +. +.Pp +. +.Fn libusb20_me_encode +This function will encode a so-called *DECODED structure into binary +format. +. +The total encoded length that will fit in the given buffer is +returned. +. +If the buffer pointer is NULL no data will be written to the buffer +location. +. +.Pp +. +.Fn libusb20_me_decode +This function will decode a binary structure into a so-called *DECODED +structure. +. +The total decoded length is returned. +. +The buffer pointer cannot be NULL. +. +. +.Sh LIBUSB VERSION 0.1 COMPATIBILITY +. +.Fn usb_open +.Fn usb_close +.Fn usb_get_string +.Fn usb_get_string_simple +.Fn usb_get_descriptor_by_endpoint +.Fn usb_get_descriptor +.Fn usb_parse_descriptor +.Fn usb_parse_configuration +.Fn usb_destroy_configuration +.Fn usb_fetch_and_parse_descriptors +.Fn usb_bulk_write +.Fn usb_bulk_read +.Fn usb_interrupt_write +.Fn usb_interrupt_read +.Fn usb_control_msg +.Fn usb_set_configuration +.Fn usb_claim_interface +.Fn usb_release_interface +.Fn usb_set_altinterface +.Fn usb_resetep +.Fn usb_clear_halt +.Fn usb_reset +.Fn usb_strerror +.Fn usb_init +.Fn usb_set_debug +.Fn usb_find_busses +.Fn usb_find_devices +.Fn usb_device +.Fn usb_get_busses +These functions are compliant with LibUSB version 0.1.12. . .Sh FILES . From owner-p4-projects@FreeBSD.ORG Thu Oct 23 21:21:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B310010656AB; Thu, 23 Oct 2008 21:21: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 75DB11065685 for ; Thu, 23 Oct 2008 21:21:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 642E18FC0C for ; Thu, 23 Oct 2008 21:21:16 +0000 (UTC) (envelope-from hselasky@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 m9NLLGif008068 for ; Thu, 23 Oct 2008 21:21:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NLLGtq008066 for perforce@freebsd.org; Thu, 23 Oct 2008 21:21:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 23 Oct 2008 21:21:16 GMT Message-Id: <200810232121.m9NLLGtq008066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151834 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, 23 Oct 2008 21:21:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=151834 Change 151834 by hselasky@hselasky_laptop001 on 2008/10/23 21:20:55 Correct alternate number printout. Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#4 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#4 (text+ko) ==== @@ -386,7 +386,7 @@ dump_iface(pdev, pcfg->interface + x); printf("\n"); for (y = 0; y != (pcfg->interface + x)->num_altsetting; y++) { - printf("\n Interface %u Alt %u\n", x, y); + printf("\n Interface %u Alt %u\n", x, y + 1); dump_iface(pdev, (pcfg->interface + x)->altsetting + y); printf("\n"); From owner-p4-projects@FreeBSD.ORG Thu Oct 23 22:00:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 818AF1065674; Thu, 23 Oct 2008 22:00: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 4436F106569E for ; Thu, 23 Oct 2008 22:00:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 18B2E8FC0A for ; Thu, 23 Oct 2008 22:00:57 +0000 (UTC) (envelope-from hselasky@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 m9NM0u9W011071 for ; Thu, 23 Oct 2008 22:00:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9NM0uLw011069 for perforce@freebsd.org; Thu, 23 Oct 2008 22:00:56 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 23 Oct 2008 22:00:56 GMT Message-Id: <200810232200.m9NM0uLw011069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151837 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, 23 Oct 2008 22:00:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=151837 Change 151837 by hselasky@hselasky_laptop001 on 2008/10/23 22:00:02 LibUSB01: Bug by bug compatibility. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#3 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#3 (text+ko) ==== @@ -167,6 +167,13 @@ int err; err = libusb20_dev_open(dev->dev, 16 * 2); + if (err == LIBUSB20_ERROR_BUSY) { + /* + * Workaround buggy USB applications which open the USB + * device multiple times: + */ + return (dev->dev); + } if (err) return (NULL); From owner-p4-projects@FreeBSD.ORG Fri Oct 24 02:58:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EA51106567E; Fri, 24 Oct 2008 02:58: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 52F241065670 for ; Fri, 24 Oct 2008 02:58:59 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 419298FC21 for ; Fri, 24 Oct 2008 02:58:59 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9O2wxRi048873 for ; Fri, 24 Oct 2008 02:58:59 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O2wx1b048871 for perforce@freebsd.org; Fri, 24 Oct 2008 02:58:59 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 02:58:59 GMT Message-Id: <200810240258.m9O2wx1b048871@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151839 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, 24 Oct 2008 02:58:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=151839 Change 151839 by peter@peter_cheese on 2008/10/24 02:57:59 update status notes. Affected files ... .. //depot/projects/valgrind/README_FREEBSD#3 edit Differences ... ==== //depot/projects/valgrind/README_FREEBSD#3 (text+ko) ==== @@ -1,3 +1,17 @@ +Build notes: +The wretched thing uses sed expressions that confuse ours. You have to +install ports/gsed. However, that confuses autoconf/automake etc. +autogen.sh adds a /usr/bin prefix before calling those. + +So, install ports for gsed, autoconf, automake and gmake. +$ sh autogen.sh +$ ./configure --prefix=/where/ever +$ gmake +$ gmake install + +Current status: +Thu Oct 23 13:55:53 PDT 2008: crashes at client startup. + Sun Aug 19 20:26:48 UTC 2007 PS_STRINGS Valgrind barfs all over the place on setproctitle. From owner-p4-projects@FreeBSD.ORG Fri Oct 24 02:59:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D85E71065733; Fri, 24 Oct 2008 02:58: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 7F0011065674 for ; Fri, 24 Oct 2008 02:58:59 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BA308FC23 for ; Fri, 24 Oct 2008 02:58:59 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9O2wxdw048878 for ; Fri, 24 Oct 2008 02:58:59 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O2wxeH048876 for perforce@freebsd.org; Fri, 24 Oct 2008 02:58:59 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 02:58:59 GMT Message-Id: <200810240258.m9O2wxeH048876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151840 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, 24 Oct 2008 02:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=151840 Change 151840 by peter@peter_cheese on 2008/10/24 02:58:48 Sync up with linux changes. Adjust ifdefs. Gets a little further. Affected files ... .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-amd64-freebsd.S#2 edit .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-x86-freebsd.S#2 edit .. //depot/projects/valgrind/coregrind/m_libcfile.c#5 edit .. //depot/projects/valgrind/coregrind/m_signals.c#5 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#5 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd-variants.c#4 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#10 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#7 edit .. //depot/projects/valgrind/drd/drd_strmem_intercepts.c#2 edit .. //depot/projects/valgrind/exp-ptrcheck/h_intercepts.c#2 edit .. //depot/projects/valgrind/exp-ptrcheck/h_main.c#2 edit .. //depot/projects/valgrind/memcheck/mc_replace_strmem.c#4 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_dispatch/dispatch-amd64-freebsd.S#2 (text+ko) ==== @@ -1,14 +1,14 @@ /*--------------------------------------------------------------------*/ /*--- The core dispatch loop, for jumping to a code address. ---*/ -/*--- dispatch-amd64.S ---*/ +/*--- dispatch-amd64-linux.S ---*/ /*--------------------------------------------------------------------*/ /* This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2006 Julian Seward + Copyright (C) 2000-2008 Julian Seward jseward@acm.org This program is free software; you can redistribute it and/or @@ -119,8 +119,12 @@ /* AT ENTRY: %rax is next guest addr, %rbp is possibly modified guest state ptr */ - /* Has the guest state pointer been messed with? If yes, exit. */ + /* Has the guest state pointer been messed with? If yes, exit. + Also, set %rcx to be &VG_(tt_fast), some insns before it is + used, in the hope of getting it off the critical path. This + location seems to be optimal on 2.2GHz Athlon64. */ cmpq 8(%rsp), %rbp + movq VG_(tt_fast)@GOTPCREL(%rip), %rcx jnz gsp_changed /* save the jump address in the guest state */ @@ -131,17 +135,16 @@ jz counter_is_zero /* try a fast lookup in the translation cache */ - movq VG_(tt_fast)@GOTPCREL(%rip), %rcx - movq %rax, %rbx - andq $VG_TT_FAST_MASK, %rbx - movq (%rcx,%rbx,8), %rcx - cmpq %rax, (%rcx) + movq %rax, %rbx /* next guest addr */ + andq $VG_TT_FAST_MASK, %rbx /* entry# */ + shlq $4, %rbx /* entry# * sizeof(FastCacheEntry) */ + movq 0(%rcx,%rbx,1), %r10 /* .guest */ + movq 8(%rcx,%rbx,1), %r11 /* .host */ + cmpq %rax, %r10 jnz fast_lookup_failed - /* Found a match. Call tce[1], which is 8 bytes along, since - each tce element is a 64-bit int. */ - addq $8, %rcx - jmp *%rcx + /* Found a match. Jump to .host. */ + jmp *%r11 ud2 /* persuade insn decoders not to speculate past here */ /* generated code should run, then jump back to VG_(run_innerloop__dispatch_unprofiled). */ @@ -157,8 +160,12 @@ /* AT ENTRY: %rax is next guest addr, %rbp is possibly modified guest state ptr */ - /* Has the guest state pointer been messed with? If yes, exit. */ + /* Has the guest state pointer been messed with? If yes, exit. + Also, set %rcx to be &VG_(tt_fast), some insns before it is + used, in the hope of getting it off the critical path. This + location seems to be optimal on 2.2GHz Athlon64. */ cmpq 8(%rsp), %rbp + movq VG_(tt_fast)@GOTPCREL(%rip), %rcx jnz gsp_changed /* save the jump address in the guest state */ @@ -169,22 +176,22 @@ jz counter_is_zero /* try a fast lookup in the translation cache */ - movq VG_(tt_fast)@GOTPCREL(%rip), %rcx movq %rax, %rbx - andq $VG_TT_FAST_MASK, %rbx - movq (%rcx,%rbx,8), %rcx - cmpq %rax, (%rcx) + andq $VG_TT_FAST_MASK, %rbx /* entry# */ + shlq $4, %rbx /* entry# * sizeof(FastCacheEntry) */ + movq 0(%rcx,%rbx,1), %r10 /* .guest */ + movq 8(%rcx,%rbx,1), %r11 /* .host */ + cmpq %rax, %r10 jnz fast_lookup_failed /* increment bb profile counter */ movq VG_(tt_fastN)@GOTPCREL(%rip), %rdx - movq (%rdx,%rbx,8), %rdx + shrq $1, %rbx /* entry# * sizeof(UInt*) */ + movq (%rdx,%rbx,1), %rdx addl $1, (%rdx) - /* Found a match. Call tce[1], which is 8 bytes along, since - each tce element is a 64-bit int. */ - addq $8, %rcx - jmp *%rcx + /* Found a match. Jump to .host. */ + jmp *%r11 ud2 /* persuade insn decoders not to speculate past here */ /* generated code should run, then jump back to VG_(run_innerloop__dispatch_profiled). */ ==== //depot/projects/valgrind/coregrind/m_dispatch/dispatch-x86-freebsd.S#2 (text+ko) ==== @@ -1,14 +1,14 @@ /*--------------------------------------------------------------------*/ /*--- The core dispatch loop, for jumping to a code address. ---*/ -/*--- dispatch-x86.S ---*/ +/*--- dispatch-x86-linux.S ---*/ /*--------------------------------------------------------------------*/ /* This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2005 Julian Seward + Copyright (C) 2000-2008 Julian Seward jseward@acm.org This program is free software; you can redistribute it and/or @@ -120,16 +120,15 @@ jz counter_is_zero /* try a fast lookup in the translation cache */ - movl %eax, %ebx - andl $VG_TT_FAST_MASK, %ebx - movl VG_(tt_fast)(,%ebx,4), %ecx - cmpl %eax, (%ecx) + movl %eax, %ebx /* next guest addr */ + andl $ VG_TT_FAST_MASK, %ebx /* entry# */ + movl 0+VG_(tt_fast)(,%ebx,8), %esi /* .guest */ + movl 4+VG_(tt_fast)(,%ebx,8), %edi /* .host */ + cmpl %eax, %esi jnz fast_lookup_failed - /* Found a match. Jump to tce[1], which is 8 bytes along, - since each tce element is a 64-bit int. */ - addl $8, %ecx - jmp *%ecx + /* Found a match. Jump to .host. */ + jmp *%edi ud2 /* persuade insn decoders not to speculate past here */ /* generated code should run, then jump back to VG_(run_innerloop__dispatch_unprofiled). */ @@ -157,11 +156,13 @@ jz counter_is_zero /* try a fast lookup in the translation cache */ - movl %eax, %ebx - andl $VG_TT_FAST_MASK, %ebx - movl VG_(tt_fast)(,%ebx,4), %ecx - cmpl %eax, (%ecx) + movl %eax, %ebx /* next guest addr */ + andl $ VG_TT_FAST_MASK, %ebx /* entry# */ + movl 0+VG_(tt_fast)(,%ebx,8), %esi /* .guest */ + movl 4+VG_(tt_fast)(,%ebx,8), %edi /* .host */ + cmpl %eax, %esi jnz fast_lookup_failed + /* increment bb profile counter */ /* note: innocuous as this sounds, it causes a huge amount more stress on D1 and significantly slows everything down. */ @@ -169,10 +170,8 @@ /* Use "addl $1", not "incl", to avoid partial-flags stall on P4 */ addl $1, (%edx) - /* Found a match. Jump to tce[1], which is 8 bytes along, - since each tce element is a 64-bit int. */ - addl $8, %ecx - jmp *%ecx + /* Found a match. Jump to .host. */ + jmp *%edi ud2 /* persuade insn decoders not to speculate past here */ /* generated code should run, then jump back to VG_(run_innerloop__dispatch_profiled). */ @@ -200,7 +199,7 @@ /* %EIP is up to date here */ /* back out decrement of the dispatch counter */ addl $1, VG_(dispatch_ctr) - movl $VG_TRC_INNER_COUNTERZERO, %eax + movl $ VG_TRC_INNER_COUNTERZERO, %eax jmp run_innerloop_exit /*NOTREACHED*/ @@ -208,7 +207,7 @@ /* %EIP is up to date here */ /* back out decrement of the dispatch counter */ addl $1, VG_(dispatch_ctr) - movl $VG_TRC_INNER_FASTMISS, %eax + movl $ VG_TRC_INNER_FASTMISS, %eax jmp run_innerloop_exit /*NOTREACHED*/ @@ -241,7 +240,7 @@ jmp run_innerloop_exit_REALLY invariant_violation: - movl $VG_TRC_INVARIANT_FAILED, %eax + movl $ VG_TRC_INVARIANT_FAILED, %eax jmp run_innerloop_exit_REALLY run_innerloop_exit_REALLY: ==== //depot/projects/valgrind/coregrind/m_libcfile.c#5 (text+ko) ==== @@ -209,7 +209,7 @@ { SysRes res; VG_(memset)(vgbuf, 0, sizeof(*vgbuf)); -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) # if defined(__NR_stat64) { struct vki_stat64 buf64; res = VG_(do_syscall2)(__NR_stat64, (UWord)file_name, (UWord)&buf64); @@ -227,13 +227,6 @@ TRANSLATE_TO_vg_stat(vgbuf, &buf); return res; } -# elif defined(VGO_freebsd) - { struct vki_stat buf; - res = VG_(do_syscall2)(__NR_stat, (UWord)file_name, (UWord)&buf); - if (!res.isError) - TRANSLATE_TO_vg_stat(vgbuf, &buf); - return res; - } # elif defined(VGO_aix5) { struct vki_stat buf; res = VG_(do_syscall4)(__NR_AIX5_statx, @@ -261,7 +254,7 @@ { SysRes res; VG_(memset)(vgbuf, 0, sizeof(*vgbuf)); -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) # if defined(__NR_fstat64) { struct vki_stat64 buf64; res = VG_(do_syscall2)(__NR_fstat64, (UWord)fd, (UWord)&buf64); @@ -279,13 +272,6 @@ TRANSLATE_TO_vg_stat(vgbuf, &buf); return res.isError ? (-1) : 0; } -# elif defined(VGO_freebsd) - { struct vki_stat buf; - res = VG_(do_syscall2)(__NR_fstat, (UWord)fd, (UWord)&buf); - if (!res.isError) - TRANSLATE_TO_vg_stat(vgbuf, &buf); - return res.isError ? (-1) : 0; - } # elif defined(VGO_aix5) I_die_here; # else @@ -318,10 +304,8 @@ SysRes VG_(dup2) ( Int oldfd, Int newfd ) { -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) return VG_(do_syscall2)(__NR_dup2, oldfd, newfd); -# elif defined(VGO_freebsd) - return VG_(do_syscall2)(__NR_dup2, oldfd, newfd); # elif defined(VGO_aix5) I_die_here; # else @@ -602,7 +586,7 @@ static Int my_connect ( Int sockfd, -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) struct vki_sockaddr_in* serv_addr, # else void* serv_addr, @@ -776,7 +760,7 @@ static Int my_connect ( Int sockfd, -# if defined(VGO_linux) +# if defined(VGO_linux) || defined(VGO_freebsd) struct vki_sockaddr_in* serv_addr, # else void* serv_addr, ==== //depot/projects/valgrind/coregrind/m_signals.c#5 (text+ko) ==== @@ -2094,7 +2094,6 @@ if (sip == NULL) sip = next_queued(0, &pollset); /* process-wide */ -#ifdef VGO_linux /* XXX freebsd4 does not have sigtimedwait. MUST FIX */ /* If there was nothing queued, ask the kernel for a pending signal */ if (sip == NULL && VG_(sigtimedwait_zero)(&pollset, &si) > 0) { if (VG_(clo_trace_signals)) @@ -2102,7 +2101,6 @@ "for thread %d", si.si_signo, tid); sip = &si; } -#endif if (sip != NULL) { /* OK, something to do; deliver it */ ==== //depot/projects/valgrind/coregrind/m_syswrap/syscall-x86-freebsd.S#5 (text+ko) ==== @@ -7,7 +7,7 @@ This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2005 Julian Seward + Copyright (C) 2000-2008 Julian Seward jseward@acm.org This program is free software; you can redistribute it and/or @@ -78,10 +78,8 @@ UWord arg4; // 16 UWord arg5; // 20 UWord arg6; // 24 -#ifdef VGO_freebsd UWord arg7; // 28 UWord arg8; // 32 -#endif */ @@ -101,7 +99,7 @@ 1: /* Even though we can't take a signal until the sigprocmask completes, start the range early. - If eip is in the range [1,2], the syscall hasn't been started yet */ + If eip is in the range [1,2), the syscall hasn't been started yet */ /* Set the signal mask which should be current during the syscall. */ movl $__NR_sigprocmask, %eax @@ -138,7 +136,7 @@ /* If eip==2, then the syscall was either just about to start, or was interrupted and the kernel was restarting it. */ 2: int $0x80 -3: /* In the range [3, 4], the syscall result is in %eax/%edx/eflags, +3: /* In the range [3, 4), the syscall result is in %eax/%edx/eflags, but hasn't been committed to EAX/EDX. */ pushf popl %edi /* copy flags to %edi */ @@ -153,7 +151,7 @@ %edi is saved across a syscall so we don't have to worry about it getting trashed by the sigprocmask below. */ -4: /* Re-block signals. If eip is in [4,5], then the syscall is complete and +4: /* Re-block signals. If eip is in [4,5), then the syscall is complete and we needn't worry about it. */ movl $__NR_sigprocmask, %eax movl $VKI_SIG_SETMASK, %ecx ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd-variants.c#4 (text+ko) ==== @@ -8,7 +8,7 @@ This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2005 Julian Seward + Copyright (C) 2000-2008 Julian Seward jseward@acm.org This program is free software; you can redistribute it and/or ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#10 (text+ko) ==== @@ -7,7 +7,7 @@ This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2005 Nicholas Nethercote + Copyright (C) 2000-2008 Nicholas Nethercote njn@valgrind.org This program is free software; you can redistribute it and/or @@ -54,6 +54,7 @@ #include "priv_types_n_macros.h" #include "priv_syswrap-generic.h" + #include "priv_syswrap-freebsd.h" // Run a thread from beginning to end and return the thread's @@ -70,7 +71,6 @@ vg_assert(tst->status == VgTs_Init); - /* make sure we get the CPU lock before doing anything significant */ VG_(acquire_BigLock)(tid, "thread_wrapper(starting new thread)"); @@ -128,6 +128,9 @@ c = VG_(count_living_threads)(); vg_assert(c >= 1); /* stay sane */ + // Tell the tool this thread is exiting + VG_TRACK( pre_thread_ll_exit, tid ); + if (c == 1) { VG_(debugLog)(1, "syswrap-freebsd", @@ -300,6 +303,8 @@ VG_(sigfillset)(&mask); VG_(sigprocmask)(VKI_SIG_SETMASK, &mask, &fork_saved_mask); + VG_(do_atfork_pre)(tid); + res = VG_(do_syscall0)( __NR_fork ); if (!res.isError && res.res == 0) { @@ -308,12 +313,21 @@ /* restore signal mask */ VG_(sigprocmask)(VKI_SIG_SETMASK, &fork_saved_mask, NULL); + + /* If --child-silent-after-fork=yes was specified, set the + logging file descriptor to an 'impossible' value. This is + noticed by send_bytes_to_logging_sink in m_libcprint.c, which + duly stops writing any further logging output. */ + if (!VG_(logging_to_socket) && VG_(clo_child_silent_after_fork)) + VG_(clo_log_fd) = -1; } else if (!res.isError && res.res > 0) { /* parent */ + VG_(do_atfork_parent)(tid); + if (VG_(clo_trace_syscalls)) - VG_(printf)(" clone(fork): process %d created child %d\n", + VG_(printf)(" clone(fork): process %d created child %ld\n", VG_(getpid)(), res.res); /* restore signal mask */ @@ -366,7 +380,7 @@ PRE(sys_socket) { - PRINT("sys_socket ( %d, %d, %d )",ARG1,ARG2,ARG3); + PRINT("sys_socket ( %ld, %ld, %ld )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "socket", int, domain, int, type, int, protocol); } POST(sys_socket) @@ -379,7 +393,7 @@ PRE(sys_setsockopt) { - PRINT("sys_setsockopt ( %d, %d, %d, %p, %d )",ARG1,ARG2,ARG3,ARG4,ARG5); + PRINT("sys_setsockopt ( %ld, %ld, %ld, %#lx, %ld )",ARG1,ARG2,ARG3,ARG4,ARG5); PRE_REG_READ5(long, "setsockopt", int, s, int, level, int, optname, const void *, optval, int, optlen); @@ -388,7 +402,7 @@ PRE(sys_getsockopt) { - PRINT("sys_getsockopt ( %d, %d, %d, %p, %p )",ARG1,ARG2,ARG3,ARG4,ARG5); + PRINT("sys_getsockopt ( %ld, %ld, %ld, %#lx, %#lx )",ARG1,ARG2,ARG3,ARG4,ARG5); PRE_REG_READ5(long, "getsockopt", int, s, int, level, int, optname, void *, optval, int, *optlen); @@ -404,7 +418,7 @@ PRE(sys_connect) { *flags |= SfMayBlock; - PRINT("sys_connect ( %d, %p, %d )",ARG1,ARG2,ARG3); + PRINT("sys_connect ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "connect", int, sockfd, struct sockaddr *, serv_addr, int, addrlen); ML_(generic_PRE_sys_connect)(tid, ARG1,ARG2,ARG3); @@ -413,7 +427,7 @@ PRE(sys_accept) { *flags |= SfMayBlock; - PRINT("sys_accept ( %d, %p, %d )",ARG1,ARG2,ARG3); + PRINT("sys_accept ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "accept", int, s, struct sockaddr *, addr, int, *addrlen); ML_(generic_PRE_sys_accept)(tid, ARG1,ARG2,ARG3); @@ -430,7 +444,7 @@ PRE(sys_sendto) { *flags |= SfMayBlock; - PRINT("sys_sendto ( %d, %p, %d, %u, %p, %d )",ARG1,ARG2,ARG3,ARG4,ARG5,ARG6); + PRINT("sys_sendto ( %ld, %#lx, %ld, %lu, %#lx, %ld )",ARG1,ARG2,ARG3,ARG4,ARG5,ARG6); PRE_REG_READ6(long, "sendto", int, s, const void *, msg, int, len, unsigned int, flags, @@ -441,7 +455,7 @@ PRE(sys_recvfrom) { *flags |= SfMayBlock; - PRINT("sys_recvfrom ( %d, %p, %d, %u, %p, %p )",ARG1,ARG2,ARG3,ARG4,ARG5,ARG6); + PRINT("sys_recvfrom ( %ld, %#lx, %ld, %lu, %#lx, %#lx )",ARG1,ARG2,ARG3,ARG4,ARG5,ARG6); PRE_REG_READ6(long, "recvfrom", int, s, void *, buf, int, len, unsigned int, flags, struct sockaddr *, from, int *, fromlen); @@ -457,7 +471,7 @@ PRE(sys_sendmsg) { *flags |= SfMayBlock; - PRINT("sys_sendmsg ( %d, %p, %d )",ARG1,ARG2,ARG3); + PRINT("sys_sendmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "sendmsg", int, s, const struct msghdr *, msg, int, flags); ML_(generic_PRE_sys_sendmsg)(tid, ARG1,ARG2); @@ -466,7 +480,7 @@ PRE(sys_recvmsg) { *flags |= SfMayBlock; - PRINT("sys_recvmsg ( %d, %p, %d )",ARG1,ARG2,ARG3); + PRINT("sys_recvmsg ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "recvmsg", int, s, struct msghdr *, msg, int, flags); ML_(generic_PRE_sys_recvmsg)(tid, ARG1,ARG2); } @@ -478,13 +492,13 @@ PRE(sys_shutdown) { *flags |= SfMayBlock; - PRINT("sys_shutdown ( %d, %d )",ARG1,ARG2); + PRINT("sys_shutdown ( %ld, %ld )",ARG1,ARG2); PRE_REG_READ2(int, "shutdown", int, s, int, how); } PRE(sys_bind) { - PRINT("sys_bind ( %d, %p, %d )",ARG1,ARG2,ARG3); + PRINT("sys_bind ( %ld, %#lx, %ld )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "bind", int, sockfd, struct sockaddr *, my_addr, int, addrlen); ML_(generic_PRE_sys_bind)(tid, ARG1,ARG2,ARG3); @@ -492,13 +506,13 @@ PRE(sys_listen) { - PRINT("sys_listen ( %d, %d )",ARG1,ARG2); + PRINT("sys_listen ( %ld, %ld )",ARG1,ARG2); PRE_REG_READ2(long, "listen", int, s, int, backlog); } PRE(sys_getsockname) { - PRINT("sys_getsockname ( %d, %p, %p )",ARG1,ARG2,ARG3); + PRINT("sys_getsockname ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "getsockname", int, s, struct sockaddr *, name, int *, namelen); ML_(generic_PRE_sys_getsockname)(tid, ARG1,ARG2,ARG3); @@ -512,7 +526,7 @@ PRE(sys_getpeername) { - PRINT("sys_getpeername ( %d, %p, %p )",ARG1,ARG2,ARG3); + PRINT("sys_getpeername ( %ld, %#lx, %#lx )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "getpeername", int, s, struct sockaddr *, name, int *, namelen); ML_(generic_PRE_sys_getpeername)(tid, ARG1,ARG2,ARG3); @@ -526,7 +540,7 @@ PRE(sys_socketpair) { - PRINT("sys_socketpair ( %d, %d, %d, %p )",ARG1,ARG2,ARG3,ARG4); + PRINT("sys_socketpair ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4); PRE_REG_READ4(long, "socketpair", int, d, int, type, int, protocol, int [2], sv); ML_(generic_PRE_sys_socketpair)(tid, ARG1,ARG2,ARG3,ARG4); @@ -548,7 +562,7 @@ // We are conservative and check everything, except the memory pointed to // by 'data'. *flags |= SfMayBlock; - PRINT( "sys_mount( %p, %p, %d, %p )" ,ARG1,ARG2,ARG3,ARG4); + PRINT( "sys_mount( %#lx, %#lx, %ld, %#lx )" ,ARG1,ARG2,ARG3,ARG4); PRE_REG_READ4(long, "mount", char *, type, char *, path, int, flags, void *, data); @@ -558,7 +572,7 @@ PRE(sys_unmount) { - PRINT("sys_umount( %p, %d )", ARG1, ARG2); + PRINT("sys_umount( %#lx, %ld )", ARG1, ARG2); PRE_REG_READ2(long, "unmount", char *, path, int, flags); PRE_MEM_RASCIIZ( "unmount(path)", ARG1); } @@ -570,27 +584,27 @@ #if 0 PRE(sys_setfsuid) { - PRINT("sys_setfsuid ( %d )", ARG1); + PRINT("sys_setfsuid ( %ld )", ARG1); PRE_REG_READ1(long, "setfsuid", vki_uid_t, uid); } PRE(sys_setfsgid) { - PRINT("sys_setfsgid ( %d )", ARG1); + PRINT("sys_setfsgid ( %ld )", ARG1); PRE_REG_READ1(long, "setfsgid", vki_gid_t, gid); } #endif PRE(sys_setresuid) { - PRINT("sys_setresuid ( %d, %d, %d )", ARG1, ARG2, ARG3); + PRINT("sys_setresuid ( %ld, %ld, %ld )", ARG1, ARG2, ARG3); PRE_REG_READ3(long, "setresuid", vki_uid_t, ruid, vki_uid_t, euid, vki_uid_t, suid); } PRE(sys_getresuid) { - PRINT("sys_getresuid ( %p, %p, %p )", ARG1,ARG2,ARG3); + PRINT("sys_getresuid ( %#lx, %#lx, %#lx )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "getresuid", vki_uid_t *, ruid, vki_uid_t *, euid, vki_uid_t *, suid); PRE_MEM_WRITE( "getresuid(ruid)", ARG1, sizeof(vki_uid_t) ); @@ -610,14 +624,14 @@ PRE(sys_setresgid) { - PRINT("sys_setresgid ( %d, %d, %d )", ARG1, ARG2, ARG3); + PRINT("sys_setresgid ( %ld, %ld, %ld )", ARG1, ARG2, ARG3); PRE_REG_READ3(long, "setresgid", vki_gid_t, rgid, vki_gid_t, egid, vki_gid_t, sgid); } PRE(sys_getresgid) { - PRINT("sys_getresgid ( %p, %p, %p )", ARG1,ARG2,ARG3); + PRINT("sys_getresgid ( %#lx, %#lx, %#lx )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "getresgid", vki_gid_t *, rgid, vki_gid_t *, egid, vki_gid_t *, sgid); PRE_MEM_WRITE( "getresgid(rgid)", ARG1, sizeof(vki_gid_t) ); @@ -645,7 +659,7 @@ ThreadId t; ThreadState* tst; - PRINT("exit_group( %d )", ARG1); + PRINT("exit_group( %ld )", ARG1); PRE_REG_READ1(void, "exit_group", int, exit_code); tst = VG_(get_ThreadState)(tid); @@ -675,7 +689,7 @@ PRE(sys_getlogin) { - PRINT("sys_getlogin ( %p, %d )",ARG1,ARG2); + PRINT("sys_getlogin ( %#lx, %ld )",ARG1,ARG2); PRE_REG_READ2(long, "getlogin", char *, buf, int, len); PRE_MEM_WRITE( "getlogin(buf, len)", ARG1, ARG2 ); @@ -688,13 +702,13 @@ } PRE(sys_setlogin) { - PRINT("sys_setlogin ( %p )",ARG1); + PRINT("sys_setlogin ( %#lx )",ARG1); PRE_REG_READ1(long, "setlogin", char *, buf); PRE_MEM_RASCIIZ( "setlogin(buf)", ARG1 ); } PRE(sys_mkfifo) { - PRINT("sys_mkfifo ( %p(%s), 0x%x, 0x%x )", ARG1, ARG1, ARG2 ); + PRINT("sys_mkfifo ( %#lx(%s), 0x%lx, 0x%lx )", ARG1, (char *)ARG1, ARG2, ARG3 ); PRE_REG_READ2(long, "mkfifo", const char *, pathname, int, mode); PRE_MEM_RASCIIZ( "mkfifo(pathname)", ARG1 ); } @@ -703,7 +717,7 @@ PRE(sys_quotactl) { - PRINT("sys_quotactl (%p, %d, %d, %p )", ARG1,ARG2,ARG3, ARG4); + PRINT("sys_quotactl (%#lx, %ld, %ld, %#lx )", ARG1,ARG2,ARG3, ARG4); PRE_REG_READ4(long, "quotactl", const char *, path, int, cmd, int, id, void *, addr); @@ -713,7 +727,7 @@ /* int getdomainname(char *domainname, int len); */ PRE(sys_getdomainname) { - PRINT("sys_getdomainname ( %p, %d )",ARG1,ARG2); + PRINT("sys_getdomainname ( %#lx, %ld )",ARG1,ARG2); PRE_REG_READ2(long, "getdomainname", char *, buf, int, len); PRE_MEM_WRITE( "getdomainname(buf, len)", ARG1, ARG2 ); @@ -727,14 +741,14 @@ /* int setdomainname(char *domainname, int len); */ PRE(sys_setdomainname) { - PRINT("sys_setdomainname ( %p )",ARG1); + PRINT("sys_setdomainname ( %#lx )",ARG1); PRE_REG_READ1(long, "setdomainname", char *, buf); PRE_MEM_RASCIIZ( "setdomainname(buf)", ARG1 ); } PRE(sys_uname) { - PRINT("sys_uname ( %p )", ARG1); + PRINT("sys_uname ( %#lx )", ARG1); PRE_REG_READ1(long, "uname", struct utsname *, buf); PRE_MEM_WRITE( "uname(buf)", ARG1, sizeof(struct vki_utsname) ); } @@ -748,7 +762,7 @@ PRE(sys_lstat) { - PRINT("sys_lstat ( %p(%s), %p )",ARG1,ARG1,ARG2); + PRINT("sys_lstat ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2); PRE_REG_READ2(long, "lstat", char *, file_name, struct stat *, buf); PRE_MEM_RASCIIZ( "lstat(file_name)", ARG1 ); PRE_MEM_WRITE( "lstat(buf)", ARG2, sizeof(struct vki_stat) ); @@ -764,7 +778,7 @@ PRE(sys_stat) { - PRINT("sys_stat ( %p(%s), %p )",ARG1,ARG1,ARG2); + PRINT("sys_stat ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2); PRE_REG_READ2(long, "stat", char *, file_name, struct stat *, buf); PRE_MEM_RASCIIZ( "stat(file_name)", ARG1 ); PRE_MEM_WRITE( "stat(buf)", ARG2, sizeof(struct vki_stat) ); @@ -777,7 +791,7 @@ PRE(sys_fstat) { - PRINT("sys_fstat ( %d, %p )",ARG1,ARG2); + PRINT("sys_fstat ( %ld, %#lx )",ARG1,ARG2); PRE_REG_READ2(long, "fstat", unsigned long, fd, struct stat *, buf); PRE_MEM_WRITE( "fstat(buf)", ARG2, sizeof(struct vki_stat) ); } @@ -789,20 +803,20 @@ PRE(sys_pathconf) { - PRINT("sys_pathconf ( %p(%s), %d )",ARG1,ARG1,ARG2); + PRINT("sys_pathconf ( %#lx(%s), %ld )",ARG1,(char *)ARG1,ARG2); PRE_REG_READ2(long, "pathconf", char *, file_name, int, name); PRE_MEM_RASCIIZ( "pathconf(file_name)", ARG1 ); } PRE(sys_fpathconf) { - PRINT("sys_fpathconf ( %d, %d )",ARG1,ARG2); + PRINT("sys_fpathconf ( %ld, %ld )",ARG1,ARG2); PRE_REG_READ2(long, "fpathconf", int, fd, int, name); } PRE(sys_lchmod) { - PRINT("sys_lchmod ( %p(%s), %d )", ARG1,ARG1,ARG2); + PRINT("sys_lchmod ( %#lx(%s), %ld )", ARG1,(char *)ARG1,ARG2); PRE_REG_READ2(long, "lchmod", const char *, path, vki_mode_t, mode); PRE_MEM_RASCIIZ( "lchmod(path)", ARG1 ); } @@ -821,7 +835,7 @@ PRE(sys_undelete) { *flags |= SfMayBlock; - PRINT("sys_undelete ( %p(%s) )", ARG1,ARG1); + PRINT("sys_undelete ( %#lx(%s) )", ARG1,(char *)ARG1); PRE_REG_READ1(long, "undelete", const char *, pathname); PRE_MEM_RASCIIZ( "undelete(pathname)", ARG1 ); } @@ -835,7 +849,7 @@ #if 0 PRE(sys_sysinfo) { - PRINT("sys_sysinfo ( %p )",ARG1); + PRINT("sys_sysinfo ( %#lx )",ARG1); PRE_REG_READ1(long, "sysinfo", struct sysinfo *, info); PRE_MEM_WRITE( "sysinfo(info)", ARG1, sizeof(struct vki_sysinfo) ); } @@ -851,7 +865,7 @@ PRE(sys___sysctl) { - PRINT("sys_sysctl ( %p, %d, %p, %p, %p, %d )", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6 ); + PRINT("sys_sysctl ( %#lx, %ld, %#lx, %#lx, %#lx, %ld )", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6 ); PRE_REG_READ6(long, "__sysctl", int *, name, unsigned int, namelen, void *, old, vki_size_t *, oldlenp, void *, new, vki_size_t, newlen); PRE_MEM_READ("sysctl(name)", ARG1, ARG2 * sizeof(int *)); @@ -873,7 +887,7 @@ PRE(sys_sendfile) { *flags |= SfMayBlock; - PRINT("sys_sendfile ( %d, %d, %llu, %d, %p, %p, %lu )", ARG1,ARG2,LOHI64(ARG3,ARG4),ARG5,ARG6,ARG7,ARG8); + PRINT("sys_sendfile ( %ld, %ld, %llu, %ld, %#lx, %#lx, %lu )", ARG1,ARG2,LOHI64(ARG3,ARG4),ARG5,ARG6,ARG7,ARG8); PRE_REG_READ7(ssize_t, "sendfile", int, fd, int, s, unsigned int, offset_low, unsigned int, offset_high, @@ -892,7 +906,7 @@ PRE(sys_getdirentries) { *flags |= SfMayBlock; - PRINT("sys_getdents ( %d, %p, %d )", ARG1,ARG2,ARG3); + PRINT("sys_getdents ( %ld, %#lx, %ld )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "getdirentries", unsigned int, fd, struct dirent *, dirp, unsigned int, count); @@ -911,19 +925,19 @@ PRE(sys_seteuid) { - PRINT("sys_seteuid ( %d )", ARG1); + PRINT("sys_seteuid ( %ld )", ARG1); PRE_REG_READ1(long, "seteuid", vki_uid_t, uid); } PRE(sys_setegid) { - PRINT("sys_setegid ( %d )", ARG1); + PRINT("sys_setegid ( %ld )", ARG1); PRE_REG_READ1(long, "setegid", vki_gid_t, gid); } PRE(sys_lutimes) { - PRINT("sys_lutimes ( %p(%s), %p )", ARG1,ARG1,ARG2); + PRINT("sys_lutimes ( %#lx(%s), %#lx )", ARG1,(char *)ARG1,ARG2); PRE_REG_READ2(long, "lutimes", char *, filename, struct timeval *, tvp); PRE_MEM_RASCIIZ( "lutimes(filename)", ARG1 ); if (ARG2 != 0) @@ -932,7 +946,7 @@ PRE(sys_futimes) { - PRINT("sys_lutimes ( %d, %p )", ARG1,ARG2); + PRINT("sys_lutimes ( %ld, %#lx )", ARG1,ARG2); PRE_REG_READ2(long, "futimes", int, fd, struct timeval *, tvp); if (ARG2 != 0) PRE_MEM_READ( "futimes(tvp)", ARG2, sizeof(struct vki_timeval) ); @@ -940,7 +954,7 @@ PRE(sys_utrace) { - PRINT("sys_utrace ( %p, %lu )", ARG1, ARG2); + PRINT("sys_utrace ( %#lx, %lu )", ARG1, ARG2); PRE_REG_READ2(long, "utrace", const void *, buf, vki_size_t, len); PRE_MEM_READ( "utrace(buf,len)", ARG2, ARG3 ); } @@ -982,7 +996,7 @@ const struct timespec *timeout); */ *flags |= SfMayBlock; - PRINT("sys_kevent ( %d, %p, %d, %p, %d, %p )\n", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6); + PRINT("sys_kevent ( %ld, %#lx, %ld, %#lx, %ld, %#lx )\n", ARG1,ARG2,ARG3,ARG4,ARG5,ARG6); PRE_REG_READ6(long, "kevent", int, fd, struct vki_kevent *, newev, int, num_newev, struct vki_kevent *, ret_ev, int, num_retev, @@ -1007,7 +1021,7 @@ PRE(sys___getcwd) { - PRINT("sys___getcwd ( %p, %u )", ARG1,ARG2); + PRINT("sys___getcwd ( %#lx, %lu )", ARG1,ARG2); PRE_REG_READ2(long, "__getcwd", char *, buf, unsigned int, size); PRE_MEM_WRITE( "__getcwd(buf)", ARG1, ARG2 ); } @@ -1028,7 +1042,7 @@ // returned, not a length. PRE(sys_getfsstat) { - PRINT("sys_getfsstat ( %p, %ld, %d )",ARG1,ARG2,ARG3); + PRINT("sys_getfsstat ( %#lx, %ld, %ld )",ARG1,ARG2,ARG3); PRE_REG_READ3(long, "getfsstat", struct statfs *, buf, long, len, int, flags); PRE_MEM_WRITE( "getfsstat(buf)", ARG1, ARG2 ); } @@ -1042,7 +1056,7 @@ PRE(sys_fhopen) { - PRINT("sys_open ( %p, %d )",ARG1,ARG2); + PRINT("sys_open ( %#lx, %ld )",ARG1,ARG2); PRE_REG_READ2(long, "open", struct fhandle *, fhp, int, flags); PRE_MEM_READ( "fhopen(fhp)", ARG1, sizeof(struct vki_fhandle) ); @@ -1065,7 +1079,7 @@ PRE(sys_fhstat) { - PRINT("sys_fhstat ( %p, %p )",ARG1,ARG2); + PRINT("sys_fhstat ( %#lx, %#lx )",ARG1,ARG2); PRE_REG_READ2(long, "fhstat", struct fhandle *, fhp, struct stat *, buf); PRE_MEM_READ( "fhstat(fhp)", ARG1, sizeof(struct vki_fhandle) ); PRE_MEM_WRITE( "fhstat(buf)", ARG2, sizeof(struct vki_stat) ); @@ -1078,7 +1092,7 @@ PRE(sys_fhstatfs) { - PRINT("sys_fstatfs ( %p, %p )",ARG1,ARG2); + PRINT("sys_fstatfs ( %#lx, %#lx )",ARG1,ARG2); PRE_REG_READ2(long, "fhstatfs", struct fhandle *, fhp, struct statfs *, buf); PRE_MEM_READ( "fhstatfs(fhp)", ARG1, sizeof(struct vki_fhandle) ); @@ -1092,7 +1106,7 @@ PRE(sys_fhstatfs6) { - PRINT("sys_fstatfs6 ( %p, %p )",ARG1,ARG2); + PRINT("sys_fstatfs6 ( %#lx, %#lx )",ARG1,ARG2); PRE_REG_READ2(long, "fhstatfs6", struct fhandle *, fhp, struct statfs *, buf); PRE_MEM_READ( "fhstatfs6(fhp)", ARG1, sizeof(struct vki_fhandle) ); @@ -1106,7 +1120,7 @@ PRE(sys_fstatfs6) { - PRINT("sys_fstatfs6 ( %d, %p )",ARG1,ARG2); + PRINT("sys_fstatfs6 ( %ld, %#lx )",ARG1,ARG2); PRE_REG_READ2(long, "fstatfs6", unsigned int, fd, struct statfs *, buf); PRE_MEM_WRITE( "fstatfs6(buf)", ARG2, sizeof(struct vki_statfs6) ); @@ -1119,7 +1133,7 @@ PRE(sys_statfs6) { - PRINT("sys_statfs6 ( %p(%s), %p )",ARG1,ARG1,ARG2); + PRINT("sys_statfs6 ( %#lx(%s), %#lx )",ARG1,(char *)ARG1,ARG2); PRE_REG_READ2(long, "statfs6", const char *, path, struct statfs *, buf); PRE_MEM_RASCIIZ( "statfs6(path)", ARG1 ); PRE_MEM_WRITE( "statfs(buf)", ARG2, sizeof(struct vki_statfs6) ); @@ -1141,7 +1155,7 @@ PRE(sys_io_setup) { - PRINT("sys_io_setup ( %u, %p )", ARG1,ARG2); + PRINT("sys_io_setup ( %lu, %#lx )", ARG1,ARG2); PRE_REG_READ2(long, "io_setup", unsigned, nr_events, vki_aio_context_t *, ctxp); PRE_MEM_WRITE( "io_setup(ctxp)", ARG2, sizeof(vki_aio_context_t) ); @@ -1200,7 +1214,7 @@ PRE(sys_io_getevents) { *flags |= SfMayBlock; - PRINT("sys_io_getevents ( %llu, %lld, %lld, %p, %p )", + PRINT("sys_io_getevents ( %llu, %lld, %lld, %#lx, %#lx )", (ULong)ARG1,(Long)ARG2,(Long)ARG3,ARG4,ARG5); PRE_REG_READ5(long, "io_getevents", vki_aio_context_t, ctx_id, long, min_nr, long, nr, @@ -1246,7 +1260,7 @@ { Int i; - PRINT("sys_io_submit ( %llu, %ld, %p )", (ULong)ARG1,ARG2,ARG3); + PRINT("sys_io_submit ( %llu, %ld, %#lx )", (ULong)ARG1,ARG2,ARG3); PRE_REG_READ3(long, "io_submit", vki_aio_context_t, ctx_id, long, nr, struct iocb **, iocbpp); @@ -1275,7 +1289,7 @@ PRE(sys_io_cancel) { - PRINT("sys_io_cancel ( %llu, %p, %p )", (ULong)ARG1,ARG2,ARG3); + PRINT("sys_io_cancel ( %llu, %#lx, %#lx )", (ULong)ARG1,ARG2,ARG3); PRE_REG_READ3(long, "io_cancel", vki_aio_context_t, ctx_id, struct iocb *, iocb, struct io_event *, result); @@ -1310,14 +1324,14 @@ PRE(sys_inotify_add_watch) { - PRINT( "sys_inotify_add_watch ( %d, %p, %x )", ARG1,ARG2,ARG3); + PRINT( "sys_inotify_add_watch ( %ld, %#lx, %lx )", ARG1,ARG2,ARG3); PRE_REG_READ3(long, "inotify_add_watch", int, fd, char *, path, int, mask); PRE_MEM_RASCIIZ( "inotify_add_watch(path)", ARG2 ); } PRE(sys_inotify_rm_watch) { - PRINT( "sys_inotify_rm_watch ( %d, %x )", ARG1,ARG2); + PRINT( "sys_inotify_rm_watch ( %ld, %lx )", ARG1,ARG2); PRE_REG_READ2(long, "inotify_rm_watch", int, fd, int, wd); } @@ -1327,8 +1341,8 @@ PRE(sys_mq_open) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 24 04:02:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 745121065675; Fri, 24 Oct 2008 04:02: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 2CCA31065670 for ; Fri, 24 Oct 2008 04:02:04 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B5438FC1C for ; Fri, 24 Oct 2008 04:02:04 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9O423QY054778 for ; Fri, 24 Oct 2008 04:02:03 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O423Be054776 for perforce@freebsd.org; Fri, 24 Oct 2008 04:02:03 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 04:02:03 GMT Message-Id: <200810240402.m9O423Be054776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151841 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, 24 Oct 2008 04:02:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=151841 Change 151841 by peter@peter_cheese on 2008/10/24 04:01:31 Tidy up a little Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#7 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_types_n_macros.h#7 (text+ko) ==== @@ -286,6 +286,9 @@ #define FAILURE (status->what == SsComplete && status->sres.isError) #define SWHAT (status->what) #define RES (getRES(status)) +#ifdef VGO_freebsd +#define RES2 (getRES2(status)) +#endif #define ERR (getERR(status)) static inline UWord getRES ( SyscallStatus* st ) { @@ -293,6 +296,13 @@ vg_assert(!st->sres.isError); return st->sres.res; } +#ifdef VGO_freebsd +static inline UWord getRES2 ( SyscallStatus* st ) { + vg_assert(st->what == SsComplete); + vg_assert(!st->sres.isError); + return st->sres.res2; +} +#endif static inline UWord getERR ( SyscallStatus* st ) { vg_assert(st->what == SsComplete); @@ -300,15 +310,6 @@ return st->sres.err; } -#ifdef VGO_freebsd -/* FreeBSD syscalls have TWO return values! */ -#define RES2 (getRES(status)) -static inline UWord getRES2 ( SyscallStatus* st ) { - vg_assert(st->what == SsComplete); - vg_assert(!st->sres.isError); - return st->sres.res2; -} -#endif From owner-p4-projects@FreeBSD.ORG Fri Oct 24 04:04:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 787A61065685; Fri, 24 Oct 2008 04:04: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 3CE1B1065682 for ; Fri, 24 Oct 2008 04:04:06 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1BEB58FC12 for ; Fri, 24 Oct 2008 04:04:06 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9O445CL056048 for ; Fri, 24 Oct 2008 04:04:05 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O445AU056046 for perforce@freebsd.org; Fri, 24 Oct 2008 04:04:05 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 04:04:05 GMT Message-Id: <200810240404.m9O445AU056046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151842 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, 24 Oct 2008 04:04:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=151842 Change 151842 by peter@peter_cheese on 2008/10/24 04:03:43 Try and get a better handle on err vs return value stuff in the New World Order. Hack to ignore a discrepancy in err value in client state - we have the right return anyway - this is a redundant sanity check that fails. With this, it runs /bin/ls successfully and reports a leak. Affected files ... .. //depot/projects/valgrind/coregrind/m_syscall.c#5 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#7 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syscall.c#5 (text+ko) ==== @@ -142,7 +142,13 @@ SysRes VG_(mk_SysRes_x86_freebsd) ( UInt val, UInt val2, UInt flags ) { SysRes res; res.isError = (flags & 1) != 0; /* PSL_C, carry bit */ - res.res = val; + if (res.isError) { + res.err = val; + res.res = 0; + } else { + res.err = 0; + res.res = val; + } res.res2 = val2; return res; } @@ -151,7 +157,13 @@ SysRes VG_(mk_SysRes_amd64_freebsd) ( ULong val, ULong val2, ULong flags ) { SysRes res; res.isError = (flags & 1) != 0; /* PSL_C, carry bit */ - res.res = val; + if (res.isError) { + res.err = val; + res.res = 0; + } else { + res.err = 0; + res.res = val; + } res.res2 = val2; return res; } ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#7 (text+ko) ==== @@ -286,12 +286,16 @@ static Bool eq_SyscallStatus ( SyscallStatus* s1, SyscallStatus* s2 ) { +//VG_(printf)( "eq_SyscallStatus: what %d %d res %ld %ld res2 %ld %ld err %ld %ld\n", s1->what, s2->what, s1->sres.res, s2->sres.res, s1->sres.res2, s2->sres.res2, s1->sres.err, s2->sres.err); return s1->what == s2->what && s1->sres.res == s2->sres.res #if defined(VGO_freebsd) && s1->sres.res2 == s2->sres.res2 #endif - && s1->sres.err == s2->sres.err; +#if !defined(VGO_freebsd) /* getSyscallStatusFromMumble is out of sync */ + && s1->sres.err == s2->sres.err +#endif + && s1->sres.isError == s2->sres.isError; } @@ -410,7 +414,7 @@ * Blindly copy 8 arguments from the stack. Valgrind checks * for initialized-ness elsewhere. */ - memcpy(&canonical->arg1, &argv[1], 8 * sizeof(UWord)); + VG_(memcpy)(&canonical->arg1, &argv[1], 8 * sizeof(UWord)); #else # error "getSyscallArgsFromGuestState: unknown arch" @@ -536,8 +540,7 @@ #elif defined(VGP_x86_freebsd) VexGuestX86State* gst = (VexGuestX86State*)gst_vanilla; canonical->what = SsComplete; - canonical->sres.res = (UWord)gst->guest_EAX; - canonical->sres.res2 = (UWord)gst->guest_EDX; + canonical->sres = VG_(mk_SysRes_x86_freebsd)( gst->guest_EAX, gst->guest_EDX, LibVEX_GuestX86_get_eflags(gst)); #elif defined(VGP_amd64_freebsd) VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla; From owner-p4-projects@FreeBSD.ORG Fri Oct 24 04:42:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADA451065671; Fri, 24 Oct 2008 04:42:45 +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 5913F106566C for ; Fri, 24 Oct 2008 04:42:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 468868FC13 for ; Fri, 24 Oct 2008 04:42:45 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9O4gjsi059119 for ; Fri, 24 Oct 2008 04:42:45 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O4gjDi059117 for perforce@freebsd.org; Fri, 24 Oct 2008 04:42:45 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 04:42:45 GMT Message-Id: <200810240442.m9O4gjDi059117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151843 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, 24 Oct 2008 04:42:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=151843 Change 151843 by peter@peter_cheese on 2008/10/24 04:41:44 Cosmetic tweaks to sync to linux counterparts. Affected files ... .. //depot/projects/valgrind/coregrind/m_coredump/coredump-amd64-freebsd.c#2 edit .. //depot/projects/valgrind/coregrind/m_coredump/coredump-x86-freebsd.c#3 edit .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#3 edit .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#5 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#11 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#8 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_coredump/coredump-amd64-freebsd.c#2 (text+ko) ==== @@ -7,7 +7,7 @@ This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2006 Julian Seward + Copyright (C) 2000-2008 Julian Seward jseward@acm.org This program is free software; you can redistribute it and/or @@ -29,6 +29,7 @@ */ #include "pub_core_basics.h" +#include "pub_core_vki.h" #include "pub_core_libcbase.h" #include "pub_core_coredump.h" #include "pub_core_threadstate.h" ==== //depot/projects/valgrind/coregrind/m_coredump/coredump-x86-freebsd.c#3 (text+ko) ==== @@ -7,7 +7,7 @@ This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2005 Julian Seward + Copyright (C) 2000-2008 Julian Seward jseward@acm.org This program is free software; you can redistribute it and/or @@ -83,6 +83,30 @@ //:: fill_fpu(fpu, (const Char *)&arch->m_sse); } +#if 0 +void ML_(fill_elffpxregs_from_tst)(vki_elf_fpxregset_t* xfpu, + const ThreadArchState* arch) +{ +//:: xfpu->cwd = ?; +//:: xfpu->swd = ?; +//:: xfpu->twd = ?; +//:: xfpu->fop = ?; +//:: xfpu->fip = ?; +//:: xfpu->fcs = ?; +//:: xfpu->foo = ?; +//:: xfpu->fos = ?; +//:: xfpu->mxcsr = ?; + xfpu->reserved = 0; +//:: xfpu->st_space = ?; + +# define DO(n) VG_(memcpy)(xfpu->xmm_space + n * 4, &arch->vex.guest_XMM##n, sizeof(arch->vex.guest_XMM##n)) + DO(0); DO(1); DO(2); DO(3); DO(4); DO(5); DO(6); DO(7); +# undef DO + + VG_(memset)(xfpu->padding, 0, sizeof(xfpu->padding)); +} +#endif + /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ ==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2005 Nicholas Nethercote + Copyright (C) 2000-2008 Nicholas Nethercote njn@valgrind.org This program is free software; you can redistribute it and/or @@ -38,10 +38,10 @@ #include "pub_core_libcprint.h" #include "pub_core_machine.h" #include "pub_core_options.h" -#include "pub_core_sigframe.h" #include "pub_core_signals.h" #include "pub_core_tooliface.h" #include "pub_core_trampoline.h" +#include "pub_core_sigframe.h" /* self */ /* This module creates and removes signal frames for signal deliveries @@ -414,14 +414,14 @@ if (VG_(extend_stack)(addr, tst->client_stack_szB)) { stackseg = VG_(am_find_nsegment)(addr); if (0 && stackseg) - VG_(printf)("frame=%p seg=%p-%p\n", + VG_(printf)("frame=%#lx seg=%#lx-%#lx\n", addr, stackseg->start, stackseg->end); } if (stackseg == NULL || !stackseg->hasR || !stackseg->hasW) { VG_(message)( Vg_UserMsg, - "Can't extend stack to %p during signal delivery for thread %d:", + "Can't extend stack to %#lx during signal delivery for thread %d:", addr, tid); if (stackseg == NULL) VG_(message)(Vg_UserMsg, " no stack segment"); @@ -605,8 +605,8 @@ caller to do. */ if (0) - VG_(printf)("pushed signal frame; %%ESP now = %p, " - "next %%EIP = %p, status=%d\n", + VG_(printf)("pushed signal frame; %%ESP now = %#lx, " + "next %%EIP = %#x, status=%d\n", esp, tst->arch.vex.guest_EIP, tst->status); } @@ -726,7 +726,9 @@ Int sigNo; tst = VG_(get_ThreadState)(tid); - esp = tst->arch.vex.guest_ESP; + + /* Correctly reestablish the frame base address. */ + esp = tst->arch.vex.guest_ESP; #if 0 if (isRT) @@ -742,7 +744,7 @@ if (VG_(clo_trace_signals)) VG_(message)( Vg_DebugMsg, - "VG_(signal_return) (thread %d): isRT=%d valid magic; EIP=%p", + "VG_(signal_return) (thread %d): isRT=%d valid magic; EIP=%#x", tid, isRT, tst->arch.vex.guest_EIP); /* tell the tools */ ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#5 (text+ko) ==== @@ -7,7 +7,7 @@ This file is part of Valgrind, a dynamic binary instrumentation framework. - Copyright (C) 2000-2006 Nicholas Nethercote + Copyright (C) 2000-2008 Nicholas Nethercote njn@valgrind.org This program is free software; you can redistribute it and/or ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#11 (text+ko) ==== @@ -54,8 +54,8 @@ #include "priv_types_n_macros.h" #include "priv_syswrap-generic.h" +#include "priv_syswrap-freebsd.h" -#include "priv_syswrap-freebsd.h" // Run a thread from beginning to end and return the thread's // scheduler-return-code. @@ -78,7 +78,7 @@ VG_(printf)("thread tid %d started: stack = %p\n", tid, &tid); - VG_TRACK (pre_thread_first_insn, tid); + VG_TRACK(pre_thread_first_insn, tid); tst->os_state.lwpid = VG_(gettid)(); tst->os_state.threadgroup = VG_(getpid)(); @@ -315,11 +315,11 @@ VG_(sigprocmask)(VKI_SIG_SETMASK, &fork_saved_mask, NULL); /* If --child-silent-after-fork=yes was specified, set the - logging file descriptor to an 'impossible' value. This is - noticed by send_bytes_to_logging_sink in m_libcprint.c, which - duly stops writing any further logging output. */ + logging file descriptor to an 'impossible' value. This is + noticed by send_bytes_to_logging_sink in m_libcprint.c, which + duly stops writing any further logging output. */ if (!VG_(logging_to_socket) && VG_(clo_child_silent_after_fork)) - VG_(clo_log_fd) = -1; + VG_(clo_log_fd) = -1; } else if (!res.isError && res.res > 0) { @@ -327,7 +327,7 @@ VG_(do_atfork_parent)(tid); if (VG_(clo_trace_syscalls)) - VG_(printf)(" clone(fork): process %d created child %ld\n", + VG_(printf)(" clone(fork): process %d created child %ld\n", VG_(getpid)(), res.res); /* restore signal mask */ ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-x86-freebsd.c#8 (text+ko) ==== @@ -37,7 +37,6 @@ #include "pub_core_vki.h" #include "pub_core_vkiscnums.h" #include "pub_core_threadstate.h" -#include "pub_core_debuginfo.h" // VG_(di_notify_mmap) #include "pub_core_aspacemgr.h" #include "pub_core_debuglog.h" #include "pub_core_libcbase.h" From owner-p4-projects@FreeBSD.ORG Fri Oct 24 04:43:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5C3F1065679; Fri, 24 Oct 2008 04:43: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 99D481065674 for ; Fri, 24 Oct 2008 04:43:46 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6F98D8FC20 for ; Fri, 24 Oct 2008 04:43:46 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9O4hkoU059184 for ; Fri, 24 Oct 2008 04:43:46 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O4hk0C059181 for perforce@freebsd.org; Fri, 24 Oct 2008 04:43:46 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 04:43:46 GMT Message-Id: <200810240443.m9O4hk0C059181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151844 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, 24 Oct 2008 04:43:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=151844 Change 151844 by peter@peter_cheese on 2008/10/24 04:42:55 Fix warning for missing prototype for vgPlain_get_SP() Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#12 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#12 (text+ko) ==== @@ -44,6 +44,7 @@ #include "pub_core_libcprint.h" #include "pub_core_libcproc.h" #include "pub_core_libcsignal.h" +#include "pub_core_machine.h" #include "pub_core_mallocfree.h" #include "pub_core_tooliface.h" #include "pub_core_options.h" From owner-p4-projects@FreeBSD.ORG Fri Oct 24 08:03:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6935F106567B; Fri, 24 Oct 2008 08:03: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 2ABB4106569B for ; Fri, 24 Oct 2008 08:03:08 +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 19C758FC08 for ; Fri, 24 Oct 2008 08:03:08 +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 m9O837Lo091515 for ; Fri, 24 Oct 2008 08:03:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9O837Rm091513 for perforce@freebsd.org; Fri, 24 Oct 2008 08:03:07 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 24 Oct 2008 08:03:07 GMT Message-Id: <200810240803.m9O837Rm091513@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 151845 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, 24 Oct 2008 08:03:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=151845 Change 151845 by pgj@kolbasz on 2008/10/24 08:02:12 Add Hungarian translation of article: cups Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#10 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/Makefile#1 add .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#1 add Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/Makefile#10 (text+ko) ==== @@ -9,6 +9,7 @@ MAINTAINER= gabor@FreeBSD.org SUBDIR = compiz-fusion +SUBDIR+= cups SUBDIR+= dialup-firewall SUBDIR+= explaining-bsd SUBDIR+= gjournal-desktop From owner-p4-projects@FreeBSD.ORG Fri Oct 24 10:28:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8770106567C; Fri, 24 Oct 2008 10:28: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 486ED1065679 for ; Fri, 24 Oct 2008 10:28:15 +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 373768FC25 for ; Fri, 24 Oct 2008 10:28:15 +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 m9OASFrB016500 for ; Fri, 24 Oct 2008 10:28:15 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OASFYw016498 for perforce@freebsd.org; Fri, 24 Oct 2008 10:28:15 GMT (envelope-from ed@FreeBSD.org) Date: Fri, 24 Oct 2008 10:28:15 GMT Message-Id: <200810241028.m9OASFYw016498@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 151846 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, 24 Oct 2008 10:28:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=151846 Change 151846 by ed@ed_dull on 2008/10/24 10:28:11 Add clist routine prototypes. Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#20 edit .. //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#5 edit .. //depot/projects/mpsafetty/sys/kern/subr_clist.c#8 add .. //depot/projects/mpsafetty/sys/sys/clist.h#7 edit Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#20 (text+ko) ==== @@ -1662,6 +1662,7 @@ kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard +kern/subr_clist.c standard kern/subr_clock.c standard kern/subr_devstat.c standard kern/subr_disk.c standard ==== //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#5 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -204,7 +205,7 @@ callout_deactivate(&state->ks_timo); /* queue interrupt task if needed */ - if (state->ks_inq.c_cc > 0 && !(state->ks_flags & TASK) && + if (clist_usage(&state->ks_inq) > 0 && !(state->ks_flags & TASK) && KBDMUX_QUEUE_INTR(state) == 0) state->ks_flags |= TASK; @@ -223,6 +224,7 @@ switch (event) { case KBDIO_KEYINPUT: { int c; + char cq; KBDMUX_LOCK(state); @@ -245,12 +247,13 @@ if (!KBD_IS_BUSY(kbd)) continue; /* not open - discard the input */ - putc(c, &state->ks_inq); + cq = c; + clist_write(&state->ks_inq, &cq, 1); } /* queue interrupt task if needed */ - if (state->ks_inq.c_cc > 0 && !(state->ks_flags & TASK) && - KBDMUX_QUEUE_INTR(state) == 0) + if (clist_usage(&state->ks_inq) > 0 && + !(state->ks_flags & TASK) && KBDMUX_QUEUE_INTR(state) == 0) state->ks_flags |= TASK; KBDMUX_UNLOCK(state); @@ -383,8 +386,7 @@ } KBDMUX_LOCK_INIT(state); - clist_alloc_cblocks(&state->ks_inq, - KBDMUX_Q_SIZE, KBDMUX_Q_SIZE / 2); + clist_alloc(&state->ks_inq, KBDMUX_Q_SIZE); TASK_INIT(&state->ks_task, 0, kbdmux_kbd_intr, (void *) kbd); KBDMUX_CALLOUT_INIT(state); SLIST_INIT(&state->ks_kbds); @@ -448,7 +450,7 @@ bad: if (needfree) { if (state != NULL) { - clist_free_cblocks(&state->ks_inq); + clist_free(&state->ks_inq); free(state, M_KBDMUX); } if (keymap != NULL) @@ -495,8 +497,7 @@ } /* flush input queue */ - ndflush(&state->ks_inq, state->ks_inq.c_cc); - clist_free_cblocks(&state->ks_inq); + clist_free(&state->ks_inq); KBDMUX_UNLOCK(state); @@ -573,14 +574,15 @@ kbdmux_read(keyboard_t *kbd, int wait) { kbdmux_state_t *state = (kbdmux_state_t *) kbd->kb_data; - int c; + char c; KBDMUX_LOCK(state); - c = getc(&state->ks_inq); + if (clist_read(&state->ks_inq, &c, 1) != 1) { + KBDMUX_UNLOCK(state); + return (-1); + } KBDMUX_UNLOCK(state); - - if (c != -1) - kbd->kb_count ++; + kbd->kb_count++; return (KBD_IS_ACTIVE(kbd)? c : -1); } @@ -598,7 +600,7 @@ return (FALSE); KBDMUX_LOCK(state); - ready = (state->ks_inq.c_cc > 0)? TRUE : FALSE; + ready = clist_usage(&state->ks_inq) > 0 ? TRUE : FALSE; KBDMUX_UNLOCK(state); return (ready); @@ -612,7 +614,8 @@ { kbdmux_state_t *state = (kbdmux_state_t *) kbd->kb_data; u_int action; - int scancode, keycode; + int scancode = -1, keycode; + char cq; KBDMUX_LOCK(state); @@ -634,8 +637,7 @@ } /* see if there is something in the keyboard queue */ - scancode = getc(&state->ks_inq); - if (scancode == -1) { + if (clist_read(&state->ks_inq, &cq, 1) == 1) { if (state->ks_flags & POLLING) { kbdmux_kbd_t *k; @@ -649,11 +651,12 @@ if (!KBD_IS_BUSY(k->kbd)) continue; - putc(scancode, &state->ks_inq); + cq = scancode; + clist_write(&state->ks_inq, &cq, 1); } } - if (state->ks_inq.c_cc > 0) + if (clist_usage(&state->ks_inq) > 0) goto next_code; } @@ -894,7 +897,7 @@ if (!(state->ks_flags & COMPOSE) && (state->ks_composed_char != 0)) ready = TRUE; else - ready = (state->ks_inq.c_cc > 0)? TRUE : FALSE; + ready = clist_usage(&state->ks_inq) > 0 ? TRUE : FALSE; KBDMUX_UNLOCK(state); @@ -1219,7 +1222,7 @@ state->ks_composed_char = 0; /* state->ks_prefix = 0; XXX */ - ndflush(&state->ks_inq, state->ks_inq.c_cc); + clist_flush(&state->ks_inq); } static void ==== //depot/projects/mpsafetty/sys/sys/clist.h#7 (text+ko) ==== @@ -40,7 +40,7 @@ size_t cl_len; }; -void clist_alloc(struct clist *cl, unsigned int len); +void clist_alloc(struct clist *cl, size_t len); void clist_free(struct clist *cl); size_t clist_read(struct clist *cl, void *buf, size_t len); size_t clist_write(struct clist *cl, const void *buf, size_t len); From owner-p4-projects@FreeBSD.ORG Fri Oct 24 13:22:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FAF11065676; Fri, 24 Oct 2008 13:22:18 +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 019B61065674 for ; Fri, 24 Oct 2008 13:22:18 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2F8C8FC2E for ; Fri, 24 Oct 2008 13:22:17 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9ODMH3V044469 for ; Fri, 24 Oct 2008 13:22:17 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9ODMGDm044467 for perforce@freebsd.org; Fri, 24 Oct 2008 13:22:16 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 24 Oct 2008 13:22:16 GMT Message-Id: <200810241322.m9ODMGDm044467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 151847 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, 24 Oct 2008 13:22:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=151847 Change 151847 by zec@zec_tpx32 on 2008/10/24 13:21:57 Reduce diff against head by actually introducing a bit of whitespace junk here and removing other bits there. More importantly, do not initialize global variables at instatiation (for nooptions VIMAGE builds only) in a prep for merging this further down the pipeline vimage-commi2 -> head. Affected files ... .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#9 edit .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acard.c#2 edit .. //depot/projects/vimage/src/sys/net/if.c#45 edit .. //depot/projects/vimage/src/sys/netinet/icmp_var.h#5 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#27 edit .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#37 edit .. //depot/projects/vimage/src/sys/netinet/in_var.h#11 edit .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#17 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#53 edit .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#21 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#38 edit .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#16 edit .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#40 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#55 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#43 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#18 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#37 edit .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#32 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#25 edit .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#24 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#27 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#16 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.h#3 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#16 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#18 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#18 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#15 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#19 edit .. //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#3 edit .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#13 edit .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#11 edit .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#14 integrate .. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#8 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#69 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#9 (text+ko) ==== @@ -447,6 +447,7 @@ tbr_timeout(arg) void *arg; { + VNET_ITERATOR_DECL(vnet_iter); struct ifnet *ifp; int active, s; @@ -459,17 +460,23 @@ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500000) IFNET_RLOCK(); #endif - VNET_ITERLOOP_BEGIN(); - INIT_VNET_NET(curvnet); - for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { - /* read from if_snd unlocked */ - if (!TBR_IS_ENABLED(&ifp->if_snd)) - continue; - active++; - if (!IFQ_IS_EMPTY(&ifp->if_snd) && ifp->if_start != NULL) - (*ifp->if_start)(ifp); + VNET_LIST_RLOCK(); + VNET_FOREACH(vnet_iter) { + CURVNET_SET(vnet_iter); + INIT_VNET_NET(vnet_iter); + for (ifp = TAILQ_FIRST(&V_ifnet); ifp; + ifp = TAILQ_NEXT(ifp, if_list)) { + /* read from if_snd unlocked */ + if (!TBR_IS_ENABLED(&ifp->if_snd)) + continue; + active++; + if (!IFQ_IS_EMPTY(&ifp->if_snd) && + ifp->if_start != NULL) + (*ifp->if_start)(ifp); + } + CURVNET_RESTORE(); } - VNET_ITERLOOP_END() + VNET_LIST_RUNLOCK(); #if defined(__FreeBSD__) && (__FreeBSD_version >= 500000) IFNET_RUNLOCK(); #endif ==== //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acard.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/net/if.c#45 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/icmp_var.h#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#27 (text+ko) ==== @@ -887,6 +887,10 @@ (*ifp->if_output)(ifp, hold, rt_key(rt), rt); } /* end of FIB loop */ reply: + + /* + * Decide if we have to respond to something. + */ if (op != ARPOP_REQUEST) goto drop; if (itaddr.s_addr == myaddr.s_addr) { ==== //depot/projects/vimage/src/sys/netinet/in_pcb.c#37 (text+ko) ==== @@ -120,13 +120,10 @@ static int sysctl_net_ipport_check(SYSCTL_HANDLER_ARGS) { -#ifdef VIMAGE INIT_VNET_INET(curvnet); - SYSCTL_RESOLVE_V_ARG1(); -#endif int error; - error = sysctl_handle_int(oidp, arg1, arg2, req); + error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0) { RANGECHK(V_ipport_lowfirstauto, 1, IPPORT_RESERVED - 1); RANGECHK(V_ipport_lowlastauto, 1, IPPORT_RESERVED - 1); ==== //depot/projects/vimage/src/sys/netinet/in_var.h#11 (text+ko) ==== @@ -101,16 +101,16 @@ #define IPREASS_HASH(x,y) \ (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) -/* - * Macro for finding the internet address structure (in_ifaddr) - * corresponding to one of our IP addresses (in_addr). - */ -#define INADDR_NHASH_LOG2 9 +#define INADDR_NHASH_LOG2 9 #define INADDR_NHASH (1 << INADDR_NHASH_LOG2) #define INADDR_HASHVAL(x) fnv_32_buf((&(x)), sizeof(x), FNV1_32_INIT) #define INADDR_HASH(x) \ (&V_in_ifaddrhashtbl[INADDR_HASHVAL(x) & V_in_ifaddrhmask]) +/* + * Macro for finding the internet address structure (in_ifaddr) + * corresponding to one of our IP addresses (in_addr). + */ #define INADDR_TO_IFADDR(addr, ia) \ /* struct in_addr addr; */ \ /* struct in_ifaddr *ia; */ \ ==== //depot/projects/vimage/src/sys/netinet/ip_divert.c#17 (text+ko) ==== @@ -152,7 +152,7 @@ div_init(void) { INIT_VNET_INET(curvnet); - + #ifdef VIMAGE if (IS_DEFAULT_VNET(curvnet)) { #endif @@ -304,7 +304,7 @@ m_freem(m); V_ipstat.ips_noproto++; V_ipstat.ips_delivered--; - } + } } /* @@ -318,7 +318,7 @@ div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin, struct mbuf *control) { - INIT_VNET_INET(so->so_vnet); + INIT_VNET_INET(curvnet); struct m_tag *mtag; struct divert_tag *dt; int error = 0; @@ -576,11 +576,11 @@ void div_ctlinput(int cmd, struct sockaddr *sa, void *vip) { - struct in_addr faddr; + struct in_addr faddr; faddr = ((struct sockaddr_in *)sa)->sin_addr; if (sa->sa_family != AF_INET || faddr.s_addr == INADDR_ANY) - return; + return; if (PRC_IS_REDIRECT(cmd)) return; } @@ -768,9 +768,9 @@ } static moduledata_t ipdivertmod = { - "ipdivert", - div_modevent, - 0 + "ipdivert", + div_modevent, + 0 }; DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#53 (text+ko) ==== @@ -642,7 +642,6 @@ return 1; } - static __inline int hash_packet6(struct ipfw_flow_id *id) { ==== //depot/projects/vimage/src/sys/netinet/ip_icmp.c#21 (text+ko) ==== @@ -78,17 +78,17 @@ */ #ifndef VIMAGE -struct icmpstat icmpstat; -static int icmpmaskrepl = 0; -static u_int icmpmaskfake = 0; -static int drop_redirect = 0; -static int log_redirect = 0; -static int icmplim = 200; -static int icmplim_output = 1; -static char reply_src[IFNAMSIZ]; -static int icmp_rfi = 0; -static int icmp_quotelen = 8; -static int icmpbmcastecho = 0; +struct icmpstat icmpstat; +static int icmpmaskrepl; +static u_int icmpmaskfake; +static int drop_redirect; +static int log_redirect; +static int icmplim; +static int icmplim_output; +static char reply_src[IFNAMSIZ]; +static int icmp_rfi; +static int icmp_quotelen; +static int icmpbmcastecho; #endif SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_icmp, ICMPCTL_STATS, stats, ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#38 (text+ko) ==== @@ -240,8 +240,7 @@ int i; TAILQ_INIT(&V_in_ifaddrhead); - V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, - &V_in_ifaddrhmask); + V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask); /* Initialize IP reassembly queue. */ for (i = 0; i < IPREASS_NHASH; i++) ==== //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#16 (text+ko) ==== @@ -144,7 +144,6 @@ #ifdef IPSEC INIT_VNET_IPSEC(curvnet); struct ip *ip = mtod(m, struct ip *); - INIT_VNET_IPSEC(curvnet); struct m_tag *mtag; struct tdb_ident *tdbi; struct secpolicy *sp; ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#40 (text+ko) ==== @@ -142,10 +142,8 @@ "Enable RFC 3390 (Increasing TCP's Initial Congestion Window)"); SYSCTL_NODE(_net_inet_tcp, OID_AUTO, ecn, CTLFLAG_RW, 0, "TCP ECN"); - SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, enable, CTLFLAG_RW, tcp_do_ecn, 0, "TCP ECN support"); - SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp_ecn, OID_AUTO, maxretries, CTLFLAG_RW, tcp_ecn_maxretries, 0, "Max retries before giving up on ECN"); ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#55 (text+ko) ==== @@ -292,6 +292,7 @@ static void tcp_zone_change(void *tag) { + uma_zone_set_max(tcp_ipi_zone, maxsockets); uma_zone_set_max(tcpcb_zone, maxsockets); tcp_tw_zone_change(); @@ -1616,10 +1617,10 @@ struct inpcb * tcp_drop_syn_sent(struct inpcb *inp, int errno) { - struct tcpcb *tp; #ifdef INVARIANTS INIT_VNET_INET(inp->inp_vnet); #endif + struct tcpcb *tp; INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_WLOCK_ASSERT(inp); @@ -1992,6 +1993,7 @@ tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen, u_char *buf, u_int direction) { + INIT_VNET_IPSEC(curvnet); union sockaddr_union dst; struct ippseudo ippseudo; MD5_CTX ctx; ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#43 (text+ko) ==== @@ -98,12 +98,6 @@ #include -#ifdef TCP_OFFLOAD_DISABLE -#define TOEPCB_ISSET(sc) (0) -#else -#define TOEPCB_ISSET(sc) ((sc)->sc_toepcb != NULL) -#endif - static int tcp_syncookies = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW, &tcp_syncookies, 0, @@ -114,6 +108,12 @@ &tcp_syncookiesonly, 0, "Use only TCP SYN cookies"); +#ifdef TCP_OFFLOAD_DISABLE +#define TOEPCB_ISSET(sc) (0) +#else +#define TOEPCB_ISSET(sc) ((sc)->sc_toepcb != NULL) +#endif + static void syncache_drop(struct syncache *, struct syncache_head *); static void syncache_free(struct syncache *); static void syncache_insert(struct syncache *, struct syncache_head *); ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#18 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1982, 1986, 1993, 1994, 1995 - * 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 @@ -52,8 +52,7 @@ void syncache_chkrst(struct in_conninfo *, struct tcphdr *); void syncache_badack(struct in_conninfo *); int syncache_pcbcount(void); -int syncache_pcblist(struct sysctl_req *req, int max_pcbs, - int *pcbs_exported); +int syncache_pcblist(struct sysctl_req *req, int max_pcbs, int *pcbs_exported); struct syncache { TAILQ_ENTRY(syncache) sc_hash; @@ -87,7 +86,7 @@ #ifndef TCP_OFFLOAD_DISABLE struct toe_usrreqs *sc_tu; /* TOE operations */ void *sc_toepcb; /* TOE protocol block */ -#endif +#endif #ifdef MAC struct label *sc_label; /* MAC label reference */ #endif ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#37 (text+ko) ==== @@ -154,6 +154,7 @@ static void udp_zone_change(void *tag) { + uma_zone_set_max(udp_ipi_zone, maxsockets); } ==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#32 (text+ko) ==== @@ -116,9 +116,7 @@ extern struct inpcbhead ripcb; extern int icmp6errppslim; static int icmp6errpps_count; -#endif /* !VIMAGE */ static struct timeval icmp6errppslim_last; -#ifndef VIMAGE extern int icmp6_nodeinfo; #endif /* !VIMAGE */ @@ -141,8 +139,8 @@ icmp6_init(void) { INIT_VNET_INET6(curvnet); + V_icmp6errpps_count = 0; - mld6_init(); } @@ -2814,7 +2812,7 @@ ret = 0; /* okay to send */ /* PPS limit */ - if (!ppsratecheck(&icmp6errppslim_last, &V_icmp6errpps_count, + if (!ppsratecheck(&V_icmp6errppslim_last, &V_icmp6errpps_count, V_icmp6errppslim)) { /* The packet is subject to rate limit */ ret++; ==== //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#25 (text+ko) ==== @@ -88,7 +88,7 @@ #ifndef VIMAGE int dad_ignore_ns; /* ignore NS in DAD - specwise incorrect*/ -int dad_maxtry; /* max # of *tries* to transmit DAD packet */ +int dad_maxtry; /* max # of *tries* to transmit DAD packet */ #endif /* !VIMAGE */ /* @@ -1246,11 +1246,14 @@ nd6_dad_timer(struct dadq *dp) { CURVNET_SET(dp->dad_vnet); - INIT_VNET_INET6(dp->dad_vnet); + INIT_VNET_INET6(curvnet); + int s; struct ifaddr *ifa = dp->dad_ifa; struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa; char ip6buf[INET6_ADDRSTRLEN]; + s = splnet(); /* XXX */ + /* Sanity check */ if (ia == NULL) { log(LOG_ERR, "nd6_dad_timer: called with null parameter\n"); @@ -1337,6 +1340,7 @@ } done: + splx(s); CURVNET_RESTORE(); } ==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#24 (text+ko) ==== @@ -84,7 +84,7 @@ TAILQ_HEAD(, dadq) _dadq; int _dad_init; int _icmp6errpps_count; - int _icmp6errppslim_last; + struct timeval _icmp6errppslim_last; int _ip6_forwarding; int _ip6_sendredirects; int _ip6_defhlim; ==== //depot/projects/vimage/src/sys/netipsec/key.c#27 (text+ko) ==== @@ -151,6 +151,7 @@ #define SAHTREE_LOCK() mtx_lock(&sahtree_lock) #define SAHTREE_UNLOCK() mtx_unlock(&sahtree_lock) #define SAHTREE_LOCK_ASSERT() mtx_assert(&sahtree_lock, MA_OWNED) + /* registed list */ #ifndef VIMAGE static LIST_HEAD(_regtree, secreg) regtree[SADB_SATYPE_MAX + 1]; @@ -203,6 +204,7 @@ SADB_SASTATE_LARVAL, SADB_SASTATE_DEAD }; #endif + static const int minsize[] = { sizeof(struct sadb_msg), /* SADB_EXT_RESERVED */ sizeof(struct sadb_sa), /* SADB_EXT_SA */ @@ -247,11 +249,13 @@ 0, /* SADB_X_EXT_POLICY */ sizeof(struct sadb_x_sa2), /* SADB_X_SA2 */ }; + #ifndef VIMAGE static int ipsec_esp_keymin = 256; static int ipsec_esp_auth = 0; static int ipsec_ah_keymin = 128; #endif + #ifdef SYSCTL_DECL SYSCTL_DECL(_net_key); #endif @@ -2353,7 +2357,6 @@ struct mbuf *m; const struct sadb_msghdr *mhp; { - printf("\n---> key_spdflush()..\n"); INIT_VNET_IPSEC(curvnet); struct sadb_msg *newmsg; struct secpolicy *sp; ==== //depot/projects/vimage/src/sys/netipsec/keysock.c#16 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netipsec/keysock.h#3 (text+ko) ==== @@ -57,12 +57,14 @@ /* others */ u_quad_t sockerr; /* # of socket related errors */ }; + #ifdef VIMAGE struct key_cb { int key_count; int any_count; }; #endif + #define KEY_SENDUP_ONE 0 #define KEY_SENDUP_ALL 1 #define KEY_SENDUP_REGISTERED 2 ==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#16 (text+ko) ==== @@ -115,7 +115,9 @@ }; #endif -/* Symbol translation macros */ +/* + * Symbol translation macros + */ #define INIT_VNET_IPSEC(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_IPSEC, struct vnet_ipsec, vnet_ipsec) ==== //depot/projects/vimage/src/sys/netipsec/xform_ah.c#18 (text+ko) ==== @@ -89,8 +89,8 @@ ((sav->flags & SADB_X_EXT_OLD) ? 16 : AH_HMAC_HASHLEN) #ifndef VIMAGE -int ah_enable = 1; /* control flow of packets with AH */ -int ah_cleartos = 1; /* clear ip_tos when doing AH calc */ +int ah_enable; /* control flow of packets with AH */ +int ah_cleartos; /* clear ip_tos when doing AH calc */ struct ahstat ahstat; #endif ==== //depot/projects/vimage/src/sys/netipsec/xform_esp.c#18 (text+ko) ==== @@ -77,8 +77,9 @@ #include #ifndef VIMAGE -int esp_enable = 1; +int esp_enable; struct espstat espstat; +static int esp_max_ivlen; /* max iv length over all algorithms */ #endif SYSCTL_DECL(_net_inet_esp); @@ -87,9 +88,6 @@ SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_esp, IPSECCTL_STATS, stats, CTLFLAG_RD, espstat, espstat, ""); -#ifndef VIMAGE -static int esp_max_ivlen; /* max iv length over all algorithms */ -#endif static int esp_input_cb(struct cryptop *op); static int esp_output_cb(struct cryptop *crp); ==== //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#15 (text+ko) ==== @@ -68,7 +68,7 @@ #include #ifndef VIMAGE -int ipcomp_enable = 0; +int ipcomp_enable; struct ipcompstat ipcompstat; #endif ==== //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#19 (text+ko) ==== @@ -92,7 +92,7 @@ * net.inet.ipip.allow value. Zero means drop them, all else is acceptance. */ #ifndef VIMAGE -int ipip_allow = 0; +int ipip_allow; struct ipipstat ipipstat; #endif @@ -718,10 +718,10 @@ /* attach to encapsulation framework */ /* XXX save return cookie for detach on module remove */ (void) encap_attach_func(AF_INET, -1, - ipe4_encapcheck, &ipe4_protosw, NULL); + ipe4_encapcheck, &ipe4_protosw, NULL); #ifdef INET6 (void) encap_attach_func(AF_INET6, -1, - ipe4_encapcheck, (struct protosw *)&ipe6_protosw, NULL); + ipe4_encapcheck, (struct protosw *)&ipe6_protosw, NULL); #endif return 0; ==== //depot/projects/vimage/src/sys/netipsec/xform_tcp.c#3 (text+ko) ==== @@ -82,6 +82,7 @@ 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/security/mac/mac_framework.h#13 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.101 2008/08/23 15:26:36 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_framework.h,v 1.102 2008/10/17 12:54:28 bz Exp $ */ /* @@ -131,6 +131,7 @@ struct ifnet *ifp); int mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m); +int mac_inpcb_check_visible(struct ucred *cred, struct inpcb *inp); void mac_inpcb_create(struct socket *so, struct inpcb *inp); void mac_inpcb_create_mbuf(struct inpcb *inp, struct mbuf *m); void mac_inpcb_destroy(struct inpcb *); ==== //depot/projects/vimage/src/sys/security/mac/mac_inet.c#11 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.21 2008/08/23 15:26:36 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.22 2008/10/17 12:54:28 bz Exp $"); #include "opt_mac.h" @@ -313,6 +313,18 @@ return (error); } +int +mac_inpcb_check_visible(struct ucred *cred, struct inpcb *inp) +{ + int error; + + INP_LOCK_ASSERT(inp); + + MAC_CHECK(inpcb_check_visible, cred, inp, inp->inp_label); + + return (error); +} + void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp) { ==== //depot/projects/vimage/src/sys/security/mac/mac_policy.h#14 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.111 2008/08/23 15:26:36 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.112 2008/10/17 12:54:28 bz Exp $ */ /* * Kernel interface for MAC policy modules. @@ -187,6 +187,8 @@ typedef int (*mpo_inpcb_check_deliver_t)(struct inpcb *inp, struct label *inplabel, struct mbuf *m, struct label *mlabel); +typedef int (*mpo_inpcb_check_visible_t)(struct ucred *cred, + struct inpcb *inp, struct label *inplabel); typedef void (*mpo_inpcb_create_t)(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel); @@ -689,6 +691,7 @@ mpo_ifnet_relabel_t mpo_ifnet_relabel; mpo_inpcb_check_deliver_t mpo_inpcb_check_deliver; + mpo_inpcb_check_visible_t mpo_inpcb_check_visible; mpo_inpcb_create_t mpo_inpcb_create; mpo_inpcb_create_mbuf_t mpo_inpcb_create_mbuf; mpo_inpcb_destroy_label_t mpo_inpcb_destroy_label; ==== //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.24 2008/08/23 15:26:36 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.25 2008/10/17 08:58:33 bz Exp $ */ /* @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -248,7 +249,7 @@ { int error; - error = label_on_label(cred->cr_label, solabel); + error = label_on_label(cred->cr_label, so->so_cred->cr_label); return (error ? ENOENT : 0); } ==== //depot/projects/vimage/src/sys/sys/vimage.h#69 (text+ko) ==== @@ -383,33 +383,6 @@ char _domainname[MAXHOSTNAMELEN]; int _morphing_symlinks; - -#if 0 - long _cp_time[CPUSTATES]; - - struct loadavg _averunnable; /* from kern/kern_synch.c */ - int _sched_tdcnt; /* from kern/sched_4bsd.c */ - int _tdq_sysload[32]; /* XXX MAXCPUS from kern/sched_ule.c (SMP) */ - - u_int proc_limit; /* max. number of processes */ - - struct msgbuf *msgbufp; - int msgbuftrigger; - int msg_seqn; - - pid_t log_open_pid; - int log_sc_state; - struct selinfo log_sc_selp; - struct sigio *log_sc_sigio; - struct callout log_sc_callout; - - struct timeval boottime; - long boottdelta_sec; - - char chroot[MAXPATHLEN]; /* assigned/inherited from parent */ - - int big_brother; /* manage procs in all child vprocgs */ -#endif }; struct vcpu { @@ -420,16 +393,6 @@ u_int _acc_statcalls; /* statclocks since last avg update*/ u_int _avg1_fixp; /* "fast" avg in 16:16 bit fixedpoint */ u_int _avg2_fixp; /* "slow" avg in 16:16 bit fixedpoint */ - -#if 0 - u_int cpu_min; /* Guaranteed CPU share */ - u_int cpu_max; /* Maximum average CPU usage */ - u_int intr_limit; /* Limit on CPU usage in intr ctx */ - u_int cpu_weight; /* Prop. share scheduling priority */ - u_int cpu_elimit; /* Dynamic soft CPU usage limit */ - u_int schedstamp; /* Prop. share scheduler tmp var */ - u_int forcedmin; /* Prop. share scheduler tmp var */ -#endif }; #endif /* VIMAGE */ From owner-p4-projects@FreeBSD.ORG Fri Oct 24 13:31:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61755106567E; Fri, 24 Oct 2008 13:31: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 E5E801065670 for ; Fri, 24 Oct 2008 13:31:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D23BB8FC1A for ; Fri, 24 Oct 2008 13:31:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9ODVRhJ045126 for ; Fri, 24 Oct 2008 13:31:27 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9ODVQJ3045124 for perforce@freebsd.org; Fri, 24 Oct 2008 13:31:26 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 24 Oct 2008 13:31:26 GMT Message-Id: <200810241331.m9ODVQJ3045124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 151848 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, 24 Oct 2008 13:31:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=151848 Change 151848 by zec@zec_tpx32 on 2008/10/24 13:31:17 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#10 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/prof_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/tsc.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/include/clock.h#5 integrate .. //depot/projects/vimage/src/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/vimage/src/sys/arm/arm/swtch.S#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/CRB#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/vimage/src/sys/arm/conf/EP80219#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/IQ31244#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#8 integrate .. //depot/projects/vimage/src/sys/arm/conf/NSLU#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/SIMICS#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#13 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#15 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#34 integrate .. //depot/projects/vimage/src/sys/conf/files#40 integrate .. //depot/projects/vimage/src/sys/conf/files.arm#6 integrate .. //depot/projects/vimage/src/sys/conf/files.mips#4 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#10 integrate .. //depot/projects/vimage/src/sys/dev/age/if_age.c#5 integrate .. //depot/projects/vimage/src/sys/dev/age/if_agevar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-cyrix.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-national.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#18 integrate .. //depot/projects/vimage/src/sys/dev/mii/ciphy.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#17 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#8 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcreg.h#7 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#9 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#7 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#16 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpbb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppb_base.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppb_msq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/pps.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpo.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpoio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/vpoio.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppc.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ppc/ppcreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/sdhci/sdhci.c#1 branch .. //depot/projects/vimage/src/sys/dev/sdhci/sdhci.h#1 branch .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#21 integrate .. //depot/projects/vimage/src/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#13 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#32 integrate .. //depot/projects/vimage/src/sys/geom/geom_disk.c#6 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_vtoc8.c#3 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/powernow.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/vimage/src/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#13 integrate .. //depot/projects/vimage/src/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/clock.h#5 integrate .. //depot/projects/vimage/src/sys/i386/include/cpufunc.h#7 integrate .. //depot/projects/vimage/src/sys/i386/include/md_var.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pcpu.h#7 integrate .. //depot/projects/vimage/src/sys/i386/include/smp.h#8 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/vimage/src/sys/i386/include/trap.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/evtchn.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xen-os.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xen_intr.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenfunc.h#3 integrate .. //depot/projects/vimage/src/sys/i386/isa/prof_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux.h#7 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/vimage/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/vimage/src/sys/i386/xen/exception.s#3 integrate .. //depot/projects/vimage/src/sys/i386/xen/locore.s#3 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mp_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#21 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#24 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_time.c#6 integrate .. //depot/projects/vimage/src/sys/kern/subr_rman.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#12 integrate .. //depot/projects/vimage/src/sys/kern/subr_stack.c#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_trap.c#10 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#18 integrate .. //depot/projects/vimage/src/sys/kern/sys_process.c#9 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#24 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/mips/conf/ADM5120#3 integrate .. //depot/projects/vimage/src/sys/mips/conf/DEFAULTS#1 branch .. //depot/projects/vimage/src/sys/mips/conf/IDT#4 integrate .. //depot/projects/vimage/src/sys/mips/conf/MALTA#3 integrate .. //depot/projects/vimage/src/sys/mips/conf/QEMU#2 integrate .. //depot/projects/vimage/src/sys/mips/conf/SENTRY5#4 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#31 integrate .. //depot/projects/vimage/src/sys/modules/sdhci/Makefile#1 branch .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#38 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#33 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#56 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#38 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#26 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#14 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#13 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#13 integrate .. //depot/projects/vimage/src/sys/sys/cdefs.h#4 integrate .. //depot/projects/vimage/src/sys/sys/param.h#29 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#24 integrate .. //depot/projects/vimage/src/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#15 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#12 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#4 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.160 2008/09/18 18:51:32 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $"); #include "opt_cpu.h" @@ -348,6 +348,19 @@ cpu_feature &= ~CPUID_HTT; /* + * If this CPU supports P-state invariant TSC then + * mention the capability. + */ + if (!tsc_is_invariant && + (strcmp(cpu_vendor, "AuthenticAMD") == 0 && + ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + cpu_id == 0x60fb2))) { + tsc_is_invariant = 1; + printf("\n TSC: P-state invariant"); + } + + /* * If this CPU supports HTT or CMP then mention the * number of physical/logical cores it contains. */ @@ -409,8 +422,11 @@ static void tsc_freq_changed(void *arg, const struct cf_level *level, int status) { - /* If there was an error during the transition, don't do anything. */ - if (status != 0) + /* + * If there was an error during the transition or + * TSC is P-state invariant, don't do anything. + */ + if (status != 0 || tsc_is_invariant) return; /* Total setting for this level gives the new frequency in MHz. */ @@ -451,6 +467,10 @@ amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); amd_feature2 = regs[2]; } + if (cpu_exthigh >= 0x80000007) { + do_cpuid(0x80000007, regs); + amd_pminfo = regs[3]; + } if (cpu_exthigh >= 0x80000008) { do_cpuid(0x80000008, regs); cpu_procinfo2 = regs[2]; ==== //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.50 2006/06/19 22:59:28 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.51 2008/10/21 00:17:55 jkim Exp $"); #include "opt_cpu.h" @@ -53,6 +53,7 @@ u_int cpu_feature2; /* Feature flags */ u_int amd_feature; /* AMD feature flags */ u_int amd_feature2; /* AMD feature flags */ +u_int amd_pminfo; /* AMD advanced power management info */ u_int cpu_high; /* Highest arg to CPUID */ u_int cpu_exthigh; /* Highest arg to extended CPUID */ u_int cpu_id; /* Stepping ID */ ==== //depot/projects/vimage/src/sys/amd64/amd64/prof_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.32 2008/03/26 15:03:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.33 2008/10/21 00:38:00 jkim Exp $"); #ifdef GUPROF #if 0 @@ -383,8 +383,11 @@ tsc_freq_changed(void *arg, const struct cf_level *level, int status) { - /* If there was an error during the transition, don't do anything. */ - if (status != 0) + /* + * If there was an error during the transition or + * TSC is P-state invariant, don't do anything. + */ + if (status != 0 || tsc_is_invariant) return; if (cputime_prof_active && cputime_clock == CPUTIME_CLOCK_TSC) printf("warning: cpu freq changed while profiling active\n"); ==== //depot/projects/vimage/src/sys/amd64/amd64/tsc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.208 2007/06/04 18:25:01 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.209 2008/10/21 00:38:00 jkim Exp $"); #include "opt_clock.h" @@ -48,8 +48,13 @@ uint64_t tsc_freq; int tsc_is_broken; +int tsc_is_invariant; static eventhandler_tag tsc_levels_tag, tsc_pre_tag, tsc_post_tag; +SYSCTL_INT(_kern_timecounter, OID_AUTO, invariant_tsc, CTLFLAG_RDTUN, + &tsc_is_invariant, 0, "Indicates whether the TSC is P-state invariant"); +TUNABLE_INT("kern.timecounter.invariant_tsc", &tsc_is_invariant); + #ifdef SMP static int smp_tsc; SYSCTL_INT(_kern_timecounter, OID_AUTO, smp_tsc, CTLFLAG_RDTUN, &smp_tsc, 0, @@ -174,11 +179,12 @@ tsc_freq_changing(void *arg, const struct cf_level *level, int *status) { - if (*status != 0 || timecounter != &tsc_timecounter) + if (*status != 0 || timecounter != &tsc_timecounter || + tsc_is_invariant) return; printf("timecounter TSC must not be in use when " - "changing frequencies; change denied\n"); + "changing frequencies; change denied\n"); *status = EBUSY; } @@ -186,8 +192,11 @@ static void tsc_freq_changed(void *arg, const struct cf_level *level, int status) { - /* If there was an error during the transition, don't do anything. */ - if (status != 0) + /* + * If there was an error during the transition or + * TSC is P-state invariant, don't do anything. + */ + if (status != 0 || tsc_is_invariant) return; /* Total setting for this level gives the new frequency in MHz. */ ==== //depot/projects/vimage/src/sys/amd64/include/clock.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.60 2008/04/22 19:38:27 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.61 2008/10/21 00:38:00 jkim Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -20,6 +20,7 @@ extern int i8254_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; +extern int tsc_is_invariant; void i8254_init(void); ==== //depot/projects/vimage/src/sys/amd64/include/md_var.h#4 (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/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.82 2008/10/21 00:17:55 jkim Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -44,6 +44,7 @@ extern u_int cpu_feature2; extern u_int amd_feature; extern u_int amd_feature2; +extern u_int amd_pminfo; extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; ==== //depot/projects/vimage/src/sys/amd64/include/specialreg.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.46 2008/08/08 16:26:53 stas Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.49 2008/10/22 17:36:52 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -153,6 +153,21 @@ #define AMDID2_PREFETCH 0x00000100 /* + * CPUID instruction 1 eax info + */ +#define CPUID_STEPPING 0x0000000f +#define CPUID_MODEL 0x000000f0 +#define CPUID_FAMILY 0x00000f00 +#define CPUID_EXT_MODEL 0x000f0000 +#define CPUID_EXT_FAMILY 0x0ff00000 +#define AMD64_CPU_MODEL(id) \ + ((((id) & CPUID_MODEL) >> 4) | \ + (((id) & CPUID_EXT_MODEL) >> 12)) +#define AMD64_CPU_FAMILY(id) \ + ((((id) & CPUID_FAMILY) >> 8) + \ + (((id) & CPUID_EXT_FAMILY) >> 20)) + +/* * CPUID instruction 1 ebx info */ #define CPUID_BRAND_INDEX 0x000000ff @@ -161,6 +176,19 @@ #define CPUID_LOCAL_APIC_ID 0xff000000 /* + * AMD extended function 8000_0007h edx info + */ +#define AMDPM_TS 0x00000001 +#define AMDPM_FID 0x00000002 +#define AMDPM_VID 0x00000004 +#define AMDPM_TTP 0x00000008 +#define AMDPM_TM 0x00000010 +#define AMDPM_STC 0x00000020 +#define AMDPM_100MHZ_STEPS 0x00000040 +#define AMDPM_HW_PSTATE 0x00000080 +#define AMDPM_TSC_INVARIANT 0x00000100 + +/* * AMD extended function 8000_0008h ecx info */ #define AMDID_CMP_CORES 0x000000ff ==== //depot/projects/vimage/src/sys/amd64/linux32/linux.h#7 (text+ko) ==== @@ -27,7 +27,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/sys/amd64/linux32/linux.h,v 1.18 2008/10/14 07:59:23 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.19 2008/10/19 10:02:26 kib Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -86,6 +86,8 @@ typedef l_long l_time_t; typedef l_uint l_uid_t; typedef l_ushort l_uid16_t; +typedef l_int l_timer_t; +typedef l_int l_mqd_t; typedef struct { l_int val[2]; @@ -399,10 +401,10 @@ #define LINUX_SI_MAX_SIZE 128 #define LINUX_SI_PAD_SIZE ((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3) -union l_sigval { +typedef union l_sigval { l_int sival_int; l_uintptr_t sival_ptr; -}; +} l_sigval_t; typedef struct l_siginfo { l_int lsi_signo; @@ -413,23 +415,26 @@ struct { l_pid_t _pid; - l_uid16_t _uid; + l_uid_t _uid; } __packed _kill; struct { - l_uint _timer1; - l_uint _timer2; + l_timer_t _tid; + l_int _overrun; + char _pad[sizeof(l_uid_t) - sizeof(l_int)]; + l_sigval_t _sigval; + l_int _sys_private; } __packed _timer; struct { l_pid_t _pid; /* sender's pid */ - l_uid16_t _uid; /* sender's uid */ - union l_sigval _sigval; + l_uid_t _uid; /* sender's uid */ + l_sigval_t _sigval; } __packed _rt; struct { l_pid_t _pid; /* which child */ - l_uid16_t _uid; /* sender's uid */ + l_uid_t _uid; /* sender's uid */ l_int _status; /* exit code */ l_clock_t _utime; l_clock_t _stime; @@ -440,7 +445,7 @@ } __packed _sigfault; struct { - l_int _band; /* POLL_IN,POLL_OUT,POLL_MSG */ + l_long _band; /* POLL_IN,POLL_OUT,POLL_MSG */ l_int _fd; } __packed _sigpoll; } _sifields; @@ -448,6 +453,9 @@ #define lsi_pid _sifields._kill._pid #define lsi_uid _sifields._kill._uid +#define lsi_tid _sifields._timer._tid +#define lsi_overrun _sifields._timer._overrun +#define lsi_sys_private _sifields._timer._sys_private #define lsi_status _sifields._sigchld._status #define lsi_utime _sifields._sigchld._utime #define lsi_stime _sifields._sigchld._stime @@ -860,9 +868,6 @@ #define LINUX_CLOCK_REALTIME_HR 4 #define LINUX_CLOCK_MONOTONIC_HR 5 -typedef int l_timer_t; -typedef int l_mqd_t; - #define LINUX_CLONE_VM 0x00000100 #define LINUX_CLONE_FS 0x00000200 #define LINUX_CLONE_FILES 0x00000400 ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.35 2008/09/24 10:14:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.37 2008/10/19 10:02:26 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -334,9 +334,7 @@ frame.sf_ucontext = PTROUT(&fp->sf_sc); /* Fill in POSIX parts */ - frame.sf_si.lsi_signo = sig; - frame.sf_si.lsi_code = code; - frame.sf_si.lsi_addr = PTROUT(ksi->ksi_addr); + ksiginfo_to_lsiginfo(ksi, &frame.sf_si, sig); /* * Build the signal context to be used by sigreturn. @@ -843,7 +841,8 @@ fpstate_drop(td); /* Return via doreti so that we can change to a different %cs */ - pcb->pcb_flags |= PCB_FULLCTX; + pcb->pcb_flags |= PCB_FULLCTX | PCB_32BIT; + pcb->pcb_flags &= ~PCB_GS32BIT; td->td_retval[1] = 0; } ==== //depot/projects/vimage/src/sys/arm/arm/swtch.S#7 (text+ko) ==== @@ -83,7 +83,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.24 2008/10/13 18:59:59 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.25 2008/10/16 19:06:24 raj Exp $"); /* @@ -143,8 +143,6 @@ ldr r9, .Lcpufuncs mov lr, pc ldr pc, [r9, #CF_IDCACHE_WBINV_ALL] - mov lr, pc - ldr pc, [r9, #CF_L2CACHE_WBINV_ALL] ldr r0, [r7, #(PCB_PL1VEC)] ldr r1, [r7, #(PCB_DACR)] /* @@ -174,8 +172,6 @@ movne r1, #4 movne lr, pc ldrne pc, [r9, #CF_DCACHE_WB_RANGE] - movne lr, pc - ldrne pc, [r9, #CF_L2CACHE_WB_RANGE] #endif /* PMAP_INCLUDE_PTE_SYNC */ /* @@ -332,8 +328,6 @@ ldr r1, .Lcpufuncs mov lr, pc ldr pc, [r1, #CF_IDCACHE_WBINV_ALL] - mov lr, pc - ldr pc, [r1, #CF_L2CACHE_WBINV_ALL] .Lcs_cache_purge_skipped: /* rem: r6 = lock */ /* rem: r9 = new PCB */ @@ -366,8 +360,6 @@ mov r1, #4 mov lr, pc ldr pc, [r2, #CF_DCACHE_WB_RANGE] - mov lr, pc - ldr pc, [r2, #CF_L2CACHE_WB_RANGE] .Lcs_same_vector: #endif /* PMAP_INCLUDE_PTE_SYNC */ ==== //depot/projects/vimage/src/sys/arm/conf/AVILA#8 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.16 2008/08/02 22:53:43 imp Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.17 2008/10/23 01:51:55 marcel Exp $ -machine arm ident AVILA options PHYSADDR=0x10000000 @@ -80,7 +79,6 @@ #options PREEMPTION #options VERBOSE_SYSINIT -device mem # Memory and kernel memory devices #device saarm device pci ==== //depot/projects/vimage/src/sys/arm/conf/BWCT#4 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.6 2008/10/23 01:51:55 marcel Exp $ -machine arm ident BWCT options VERBOSE_INIT_ARM @@ -85,7 +84,6 @@ #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options DIAGNOSTIC -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: ==== //depot/projects/vimage/src/sys/arm/conf/CRB#5 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.6 2008/10/23 01:51:55 marcel Exp $ -machine arm ident CRB options PHYSADDR=0x00000000 @@ -67,7 +66,6 @@ #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device rl ==== //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.1 2008/10/14 08:18:27 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $ # -machine arm ident DB-88F78XX include "../mv/discovery/std.db78xxx" @@ -49,7 +48,6 @@ # Pseudo devices device loop -device mem device md device pty device random ==== //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # Custom kernel for Marvell DB-88F5xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.1 2008/10/14 08:18:27 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $ # -machine arm ident DB-88F5XXX include "../mv/orion/std.db88f5xxx" @@ -48,7 +47,6 @@ #options WITNESS_KDB # Pseudo devices -device mem device md device loop device pty ==== //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#2 (text+ko) ==== @@ -1,10 +1,9 @@ # # Custom kernel for Marvell DB-88F6xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.1 2008/10/14 08:18:27 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.2 2008/10/23 01:51:55 marcel Exp $ # -machine arm ident DB-88F6XXX include "../mv/kirkwood/std.db88f6xxx" @@ -49,7 +48,6 @@ # Pseudo devices device loop -device mem device md device pty device random ==== //depot/projects/vimage/src/sys/arm/conf/EP80219#5 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/EP80219,v 1.9 2008/10/23 01:51:55 marcel Exp $ -machine arm ident EP80219 options PHYSADDR=0xa0000000 @@ -69,7 +68,6 @@ #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device fxp ==== //depot/projects/vimage/src/sys/arm/conf/GUMSTIX#2 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.1 2008/06/06 05:08:09 benno Exp $ +# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.2 2008/10/23 01:51:55 marcel Exp $ -machine arm ident GUMSTIX cpu CPU_XSCALE_PXA2X0 @@ -71,7 +70,6 @@ options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices device mii device smc device smcphy ==== //depot/projects/vimage/src/sys/arm/conf/HL200#3 (text+ko) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.6 2008/10/23 01:51:55 marcel Exp $ -machine arm ident HL200 include "../at91/std.at91" @@ -89,7 +88,6 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: ==== //depot/projects/vimage/src/sys/arm/conf/IQ31244#5 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.23 2008/10/23 01:51:55 marcel Exp $ -machine arm ident IQ31244 options PHYSADDR=0xa0000000 @@ -66,7 +65,6 @@ #options PREEMPTION device loop device ether -device mem # Memory and kernel memory devices #device saarm device miibus device rl ==== //depot/projects/vimage/src/sys/arm/conf/KB920X#8 (text) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.19 2008/09/07 18:55:55 imp Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.20 2008/10/23 01:51:55 marcel Exp $ -machine arm ident KB920X include "../at91/std.kb920x" @@ -80,7 +79,6 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md device at91_twi # TWI: Two Wire Interface device at91_spi # SPI: ==== //depot/projects/vimage/src/sys/arm/conf/NSLU#3 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/NSLU,v 1.2 2008/09/08 00:41:32 imp Exp $ +# $FreeBSD: src/sys/arm/conf/NSLU,v 1.3 2008/10/23 01:51:55 marcel Exp $ -machine arm ident NSLU options PHYSADDR=0x10000000 @@ -76,7 +75,6 @@ options BOOTP_WIRED_TO=npe0 options BOOTP_COMPAT -device mem # Memory and kernel memory devices device pci device uart ==== //depot/projects/vimage/src/sys/arm/conf/SIMICS#5 (text+ko) ==== @@ -15,9 +15,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.17 2008/10/23 01:51:55 marcel Exp $ -machine arm ident SIMICS options KERNPHYSADDR=0xc0000000 @@ -68,5 +67,4 @@ #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -device mem # Memory and kernel memory devices device md ==== //depot/projects/vimage/src/sys/arm/conf/SKYEYE#4 (text) ==== @@ -16,9 +16,8 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.11 2008/10/23 01:51:55 marcel Exp $ -machine arm ident KB920X options KERNPHYSADDR=0xc0000000 @@ -79,7 +78,6 @@ #options SMP # Symmetric MultiProcessor Kernel #options APIC_IO # Symmetric (APIC) I/O -device mem # Memory and kernel memory devices device md options SKYEYE_WORKAROUNDS # Floppy drives ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.80 2008/09/25 20:50:21 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.81 2008/10/22 21:55:48 jhb Exp $"); #include "opt_compat.h" @@ -1762,6 +1762,24 @@ return (ftruncate(td, &ap)); } +int +freebsd32_getdirentries(struct thread *td, + struct freebsd32_getdirentries_args *uap) +{ + long base; + int32_t base32; + int error; + + error = kern_getdirentries(td, uap->fd, uap->buf, uap->count, &base); + if (error) + return (error); + if (uap->basep != NULL) { + base32 = base; + error = copyout(&base32, uap->basep, sizeof(int32_t)); + } + return (error); +} + #ifdef COMPAT_FREEBSD6 /* versions with the 'int pad' argument */ int ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#14 (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.93 2008/09/25 20:08:36 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.94 2008/10/22 21:56:44 jhb Exp $ + * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 184183 2008-10-22 21:55:48Z jhb */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -152,6 +152,12 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; }; +struct freebsd32_getdirentries_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)]; + char basep_l_[PADL_(int32_t *)]; int32_t * basep; char basep_r_[PADR_(int32_t *)]; +}; struct freebsd32_sysctl_args { char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)]; char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; @@ -406,6 +412,7 @@ int freebsd32_stat(struct thread *, struct freebsd32_stat_args *); int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *); int freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *); +int freebsd32_getdirentries(struct thread *, struct freebsd32_getdirentries_args *); int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *); int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *); int freebsd32_semctl(struct thread *, struct freebsd32_semctl_args *); @@ -618,6 +625,7 @@ #define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT #define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT #define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT +#define FREEBSD32_SYS_AUE_freebsd32_getdirentries AUE_GETDIRENTRIES #define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL #define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES #define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#14 (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.92 2008/09/25 20:08:36 jhb Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 183361 2008-09-25 20:07:42Z jhb + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.93 2008/10/22 21:56:44 jhb Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 24 15:19:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EB3C1065670; Fri, 24 Oct 2008 15:19:18 +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 08A74106566C for ; Fri, 24 Oct 2008 15:19:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA8528FC14 for ; Fri, 24 Oct 2008 15:19:17 +0000 (UTC) (envelope-from hselasky@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 m9OFJH8S056148 for ; Fri, 24 Oct 2008 15:19:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OFJHqT056146 for perforce@freebsd.org; Fri, 24 Oct 2008 15:19:17 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 24 Oct 2008 15:19:17 GMT Message-Id: <200810241519.m9OFJHqT056146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151852 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, 24 Oct 2008 15:19:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=151852 Change 151852 by hselasky@hselasky_laptop001 on 2008/10/24 15:19:10 Patch to allow control requests while the USB FS is in use. Affected files ... .. //depot/projects/usb/src/lib/libusb20/libusb20.c#5 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#4 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#4 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#5 (text+ko) ==== @@ -558,6 +558,7 @@ pdev->pTransfer = NULL; } pdev->file = -1; + pdev->file_ctrl = -1; pdev->nTransfer = 0; } else { pdev->is_opened = 1; @@ -826,6 +827,7 @@ memset(pdev, 0, sizeof(*pdev)); pdev->file = -1; + pdev->file_ctrl = -1; pdev->methods = &libusb20_dummy_methods; return (pdev); } ==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#4 (text+ko) ==== @@ -219,6 +219,9 @@ /* device file handle */ int file; + /* device file handle (control transfers only) */ + int file_ctrl; + /* debugging level */ int debug; ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#4 (text+ko) ==== @@ -312,13 +312,24 @@ uint32_t plugtime; char buf[64]; int f; + int g; int error; snprintf(buf, sizeof(buf), "/dev/ugen%u.%u", pdev->bus_number, pdev->device_address); + /* + * We need two file handles, one for the control endpoint and one + * for BULK, INTERRUPT and ISOCHRONOUS transactions due to optimised + * kernel locking. + */ + g = open(buf, O_RDWR); + if (g < 0) { + return (LIBUSB20_ERROR_NO_DEVICE); + } f = open(buf, O_RDWR); if (f < 0) { + close(g); return (LIBUSB20_ERROR_NO_DEVICE); } if (ioctl(f, USB_GET_PLUGTIME, &plugtime)) { @@ -353,6 +364,7 @@ pdev->methods = &libusb20_ugen20_device_methods; pdev->privBeData = pfse; pdev->file = f; + pdev->file_ctrl = g; error = 0; done: if (error) { @@ -360,6 +372,7 @@ free(pfse); } close(f); + close(g); } return (error); } @@ -379,7 +392,9 @@ pdev->nTransfer = 0; pdev->privBeData = NULL; close(pdev->file); + close(pdev->file_ctrl); pdev->file = -1; + pdev->file_ctrl = -1; return (error); } @@ -403,7 +418,7 @@ gen_desc.ugd_maxlen = sizeof(cdesc); gen_desc.ugd_config_index = index; - error = ioctl(pdev->file, USB_GET_FULL_DESC, &gen_desc); + error = ioctl(pdev->file_ctrl, USB_GET_FULL_DESC, &gen_desc); if (error) { return (LIBUSB20_ERROR_OTHER); } @@ -419,7 +434,7 @@ gen_desc.ugd_data = ptr; gen_desc.ugd_maxlen = len; - error = ioctl(pdev->file, USB_GET_FULL_DESC, &gen_desc); + error = ioctl(pdev->file_ctrl, USB_GET_FULL_DESC, &gen_desc); if (error) { free(ptr); return (LIBUSB20_ERROR_OTHER); @@ -438,7 +453,7 @@ { int temp; - if (ioctl(pdev->file, USB_GET_CONFIG, &temp)) { + if (ioctl(pdev->file_ctrl, USB_GET_CONFIG, &temp)) { return (LIBUSB20_ERROR_OTHER); } *pindex = temp; @@ -451,7 +466,7 @@ { int temp = index; - if (ioctl(pdev->file, USB_SET_CONFIG, &temp)) { + if (ioctl(pdev->file_ctrl, USB_SET_CONFIG, &temp)) { return (LIBUSB20_ERROR_OTHER); } return (0); @@ -462,7 +477,7 @@ { int temp = iface_index; - if (ioctl(pdev->file, USB_CLAIM_INTERFACE, &temp)) { + if (ioctl(pdev->file_ctrl, USB_CLAIM_INTERFACE, &temp)) { return (LIBUSB20_ERROR_OTHER); } return (0); @@ -473,7 +488,7 @@ { int temp = iface_index; - if (ioctl(pdev->file, USB_RELEASE_INTERFACE, &temp)) { + if (ioctl(pdev->file_ctrl, USB_RELEASE_INTERFACE, &temp)) { return (LIBUSB20_ERROR_OTHER); } return (0); @@ -488,7 +503,7 @@ alt_iface.uai_interface_index = iface_index; alt_iface.uai_alt_index = alt_index; - if (ioctl(pdev->file, USB_SET_ALTINTERFACE, &alt_iface)) { + if (ioctl(pdev->file_ctrl, USB_SET_ALTINTERFACE, &alt_iface)) { return (LIBUSB20_ERROR_OTHER); } return (0); @@ -499,7 +514,7 @@ { int temp = 0; - if (ioctl(pdev->file, USB_DEVICEENUMERATE, &temp)) { + if (ioctl(pdev->file_ctrl, USB_DEVICEENUMERATE, &temp)) { return (LIBUSB20_ERROR_OTHER); } return (0); @@ -529,7 +544,7 @@ default: return (LIBUSB20_ERROR_INVALID_PARAM); } - if (ioctl(pdev->file, USB_SET_POWER_MODE, &temp)) { + if (ioctl(pdev->file_ctrl, USB_SET_POWER_MODE, &temp)) { return (LIBUSB20_ERROR_OTHER); } return (0); @@ -540,7 +555,7 @@ { int temp; - if (ioctl(pdev->file, USB_GET_POWER_MODE, &temp)) { + if (ioctl(pdev->file_ctrl, USB_GET_POWER_MODE, &temp)) { return (LIBUSB20_ERROR_OTHER); } switch (temp) { @@ -573,7 +588,7 @@ { int temp = iface_index; - if (ioctl(pdev->file, USB_IFACE_DRIVER_ACTIVE, &temp)) { + if (ioctl(pdev->file_ctrl, USB_IFACE_DRIVER_ACTIVE, &temp)) { return (LIBUSB20_ERROR_OTHER); } return (0); /* kernel driver is active */ @@ -585,7 +600,7 @@ { int temp = iface_index; - if (ioctl(pdev->file, USB_IFACE_DRIVER_DETACH, &temp)) { + if (ioctl(pdev->file_ctrl, USB_IFACE_DRIVER_DETACH, &temp)) { return (LIBUSB20_ERROR_OTHER); } return (0); /* kernel driver is active */ @@ -606,7 +621,7 @@ sizeof(req.ucr_request), setup)) { /* ignore */ } - if (ioctl(pdev->file, USB_DO_REQUEST, &req)) { + if (ioctl(pdev->file_ctrl, USB_DO_REQUEST, &req)) { return (LIBUSB20_ERROR_OTHER); } if (pactlen) { From owner-p4-projects@FreeBSD.ORG Fri Oct 24 16:16:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 572E21065907; Fri, 24 Oct 2008 16:16: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 1B1EE10658E4 for ; Fri, 24 Oct 2008 16:16:16 +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 094848FC1F for ; Fri, 24 Oct 2008 16:16:16 +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 m9OGGFbR061621 for ; Fri, 24 Oct 2008 16:16:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OGGFhU061619 for perforce@freebsd.org; Fri, 24 Oct 2008 16:16:15 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 24 Oct 2008 16:16:15 GMT Message-Id: <200810241616.m9OGGFhU061619@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 151853 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, 24 Oct 2008 16:16:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=151853 Change 151853 by rene@rene_self on 2008/10/24 16:15:41 Translated section 1 of explaining-bsd (20%). Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#3 (text+ko) ==== @@ -61,56 +61,61 @@ - What is BSD? + Wat is BSD? - BSD stands for Berkeley Software Distribution. It is - the name of distributions of source code from the University of - California, Berkeley, which were originally extensions to AT&T's - Research &unix; operating system. Several open source operating system - projects are based on a release of this source code known as - 4.4BSD-Lite. In addition, they comprise a number of packages from other - Open Source projects, including notably the GNU project. The overall - operating system comprises: + BSD is een afkorting van Berkeley Software + Distribution. Het is de naam van broncodedistributies van + de universiteit van California te Berkeley, wat origineel + uitbreidingen waren van het besturingssysteem &unix; van AT&T + Research. Verschillende projecten over open-source + besturingssystemen zijn gebaseerd op een uitgave van deze broncode + die bekend staat als 4.4BSD-Lite. Ze omvatten ook een aantal + pakketten van andere open-source projecten, opmerkelijk genoeg + onder andere van het GNU-project. Het besturingssysteem in het + geheel omvat: - The BSD kernel, which handles process scheduling, memory - management, symmetric multi-processing (SMP), device drivers, - etc. + De BSD-kernel, die proces-scheduling, geheugenbeheer, + symmetrische multi-processing (SMP), apparaatstuurprogramma's, + etc. afhandelt. - Unlike the Linux kernel, there are several different - BSD kernels with differing capabilities. + In tegenstelling tot de Linux-kernel zijn er + een aantal verschillende BSD-kernels met verschillende + mogelijkheden. - The C library, the base API for the system. + De C-bibliotheek, de basis-API voor het systeem. - The BSD C library is based on code from Berkeley, not - the GNU project. + De C-bibliotheek van BSD is gebaseerd op code + van Berkeley, niet van het GNU-project. - Utilities such as shells, file utilities, compilers and - linkers. + Gereedschappen zoals shells, bestandsgereedschappen, + compilers en linkers. - Some of the utilities are derived from the GNU - project, others are not. + Sommige gereedschappen zijn afgeleid van het + GNU-project, andere niet. - The X Window system, which handles graphical display. + Het X Window-systeem, wat grafisch afbeelden afhandelt. - The X Window system used in most versions of BSD is maintained - by one of two separate projects, either the - &xfree86; project or the - X.Org project. - This is the same code as Linux uses. BSD does not normally - specify a graphical desktop such as GNOME or KDE, - though these are available. + Het X Window-systeem dat in de meeste versies van BSD + wordt gegbruikt wordt onderhouden door één van + twee aparte projecten, ofwel het &xfree86; project, of + het X.Org project. Linux + gebruikt dezelfde code. BSD specificeert normialiter geen + grafisch bureaublad zoals GNOME of KDE, deze + zijn wel beschikbaar. - Many other programs and utilities. + Vele andere programma's en gereedschappen. From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:24:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E9BC1065675; Fri, 24 Oct 2008 19:24: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 0BC791065672 for ; Fri, 24 Oct 2008 19:24:02 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB5008FC16 for ; Fri, 24 Oct 2008 19:24:01 +0000 (UTC) (envelope-from marcel@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 m9OJO1Rj089387 for ; Fri, 24 Oct 2008 19:24:01 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJMoRh089314 for perforce@freebsd.org; Fri, 24 Oct 2008 19:22:50 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:22:50 GMT Message-Id: <200810241922.m9OJMoRh089314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151864 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, 24 Oct 2008 19:24:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=151864 Change 151864 by marcel@marcel_jnpr on 2008/10/24 19:22:43 IFC @151838 Affected files ... .. //depot/projects/powerpc/LOCKS#3 integrate .. //depot/projects/powerpc/MAINTAINERS#6 integrate .. //depot/projects/powerpc/Makefile#9 integrate .. //depot/projects/powerpc/Makefile.inc1#15 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#21 integrate .. //depot/projects/powerpc/UPDATING#21 integrate .. //depot/projects/powerpc/bin/Makefile#3 integrate .. //depot/projects/powerpc/bin/cp/utils.c#3 integrate .. //depot/projects/powerpc/bin/echo/echo.c#2 integrate .. //depot/projects/powerpc/bin/ln/ln.1#3 integrate .. //depot/projects/powerpc/bin/ln/ln.c#3 integrate .. //depot/projects/powerpc/bin/mv/mv.c#4 integrate .. //depot/projects/powerpc/bin/pkill/Makefile#1 branch .. //depot/projects/powerpc/bin/pkill/pkill.1#1 branch .. //depot/projects/powerpc/bin/pkill/pkill.c#1 branch .. //depot/projects/powerpc/bin/ps/ps.c#3 integrate .. //depot/projects/powerpc/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/powerpc/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/powerpc/bin/sh/alias.c#2 integrate .. //depot/projects/powerpc/bin/sh/eval.c#3 integrate .. //depot/projects/powerpc/bin/sh/expand.c#2 integrate .. //depot/projects/powerpc/bin/sh/miscbltin.c#2 integrate .. //depot/projects/powerpc/bin/sh/mknodes.c#2 integrate .. //depot/projects/powerpc/bin/sh/options.c#3 integrate .. //depot/projects/powerpc/bin/sh/parser.c#2 integrate .. //depot/projects/powerpc/bin/sh/parser.h#2 integrate .. //depot/projects/powerpc/bin/sh/sh.1#4 integrate .. //depot/projects/powerpc/bin/stty/gfmt.c#2 integrate .. //depot/projects/powerpc/bin/stty/modes.c#2 integrate .. //depot/projects/powerpc/bin/stty/print.c#2 integrate .. //depot/projects/powerpc/bin/stty/stty.1#2 integrate .. //depot/projects/powerpc/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/powerpc/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/powerpc/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/powerpc/cddl/lib/Makefile#6 integrate .. //depot/projects/powerpc/cddl/lib/drti/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libctf/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/Makefile#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/errno.d#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/net.d#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/nfs.d#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/psinfo.d#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/sched.d#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/signal.d#1 branch .. //depot/projects/powerpc/cddl/lib/libdtrace/unistd.d#1 branch .. //depot/projects/powerpc/cddl/usr.bin/Makefile#6 integrate .. //depot/projects/powerpc/cddl/usr.bin/ctfconvert/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.bin/ctfdump/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.bin/ctfmerge/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.bin/sgsmsg/Makefile#1 branch .. //depot/projects/powerpc/cddl/usr.sbin/Makefile#6 integrate .. //depot/projects/powerpc/cddl/usr.sbin/dtrace/Makefile#1 branch .. //depot/projects/powerpc/contrib/bind9/CHANGES#6 integrate .. //depot/projects/powerpc/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/powerpc/contrib/bind9/FREEBSD-Upgrade#3 delete .. //depot/projects/powerpc/contrib/bind9/FREEBSD-Xlist#2 delete .. //depot/projects/powerpc/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/powerpc/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/powerpc/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/configure.in#4 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/powerpc/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind/aclocal.m4#2 delete .. //depot/projects/powerpc/contrib/bind9/lib/bind/config.h.in#3 delete .. //depot/projects/powerpc/contrib/bind9/lib/bind/configure#4 delete .. //depot/projects/powerpc/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/api#5 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/powerpc/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/powerpc/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/powerpc/contrib/bind9/version#6 integrate .. //depot/projects/powerpc/contrib/binutils/bfd/coff-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/cpu-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/elf32-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/elf64-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/mipsbsd.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/pe-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/projects/powerpc/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/projects/powerpc/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/projects/powerpc/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/projects/powerpc/contrib/binutils/gas/config/te-tmips.h#1 branch .. //depot/projects/powerpc/contrib/binutils/gas/doc/c-mips.texi#1 branch .. //depot/projects/powerpc/contrib/binutils/gprof/mips.c#1 branch .. //depot/projects/powerpc/contrib/binutils/include/coff/mips.h#1 branch .. //depot/projects/powerpc/contrib/binutils/include/coff/mipspe.h#1 branch .. //depot/projects/powerpc/contrib/binutils/include/opcode/mips.h#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/mipslit.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emulparams/mipspe.sh#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/emultempl/mipself.em#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/scripttempl/mips.sc#1 branch .. //depot/projects/powerpc/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch .. //depot/projects/powerpc/contrib/binutils/opcodes/mips-dis.c#1 branch .. //depot/projects/powerpc/contrib/binutils/opcodes/mips-opc.c#1 branch .. //depot/projects/powerpc/contrib/binutils/opcodes/mips16-opc.c#1 branch .. //depot/projects/powerpc/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/powerpc/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/com_err/com_err.c#2 integrate .. //depot/projects/powerpc/contrib/com_err/com_err.h#2 integrate .. //depot/projects/powerpc/contrib/com_err/com_right.h#2 integrate .. //depot/projects/powerpc/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/powerpc/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/powerpc/contrib/com_err/error.c#2 integrate .. //depot/projects/powerpc/contrib/com_err/lex.c#1 branch .. //depot/projects/powerpc/contrib/com_err/lex.h#2 integrate .. //depot/projects/powerpc/contrib/com_err/lex.l#2 integrate .. //depot/projects/powerpc/contrib/com_err/parse.c#1 branch .. //depot/projects/powerpc/contrib/com_err/parse.h#1 branch .. //depot/projects/powerpc/contrib/com_err/parse.y#2 integrate .. //depot/projects/powerpc/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/powerpc/contrib/com_err/version-script.map#1 branch .. //depot/projects/powerpc/contrib/cpio/ABOUT-NLS#2 integrate .. //depot/projects/powerpc/contrib/cpio/COPYING#2 integrate .. //depot/projects/powerpc/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/powerpc/contrib/cpio/INSTALL#2 integrate .. //depot/projects/powerpc/contrib/cpio/NEWS#2 integrate .. //depot/projects/powerpc/contrib/cpio/THANKS#2 integrate .. //depot/projects/powerpc/contrib/cpio/TODO#2 integrate .. //depot/projects/powerpc/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/powerpc/contrib/cpio/doc/version.texi#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/alloca_.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-ba.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-eexst.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-fmtstream.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-fmtstream.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-fs-xinl.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-help.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-namefrob.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-parse.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-pin.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/argp-pv.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-pvh.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp-xinl.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/argp.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/basename.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/dirname.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/dirname.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/error.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/error.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/exit.h#2 delete .. //depot/projects/powerpc/contrib/cpio/lib/exitfail.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/exitfail.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/fatal.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/full-write.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/full-write.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/getopt.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/getopt1.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/getopt_.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/getopt_int.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/gettext.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/hash.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/hash.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/intprops.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/inttostr.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/inttostr.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/localedir.h#2 delete .. //depot/projects/powerpc/contrib/cpio/lib/mempcpy.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/mempcpy.h#2 delete .. //depot/projects/powerpc/contrib/cpio/lib/paxerror.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/paxexit.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/paxlib.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/paxnames.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/quote.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/quote.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/quotearg.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/quotearg.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/rmt-command.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/rmt.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/rtapelib.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/safe-read.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/safe-read.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/safe-write.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/safe-write.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/savedir.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/savedir.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/strcase.h#2 delete .. //depot/projects/powerpc/contrib/cpio/lib/strchrnul.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/strchrnul.h#2 delete .. //depot/projects/powerpc/contrib/cpio/lib/stripslash.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/strndup.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/strndup.h#2 delete .. //depot/projects/powerpc/contrib/cpio/lib/strnlen.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/system-ioctl.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/system.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/umaxtostr.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/unlocked-io.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/utimens.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/utimens.h#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/xalloc-die.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/xalloc.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/xmalloc.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/lib/xstrndup.c#1 branch .. //depot/projects/powerpc/contrib/cpio/lib/xstrndup.h#1 branch .. //depot/projects/powerpc/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/cpio.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/cpiohdr.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/defer.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/defer.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/dstring.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/dstring.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/filemode.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/filetypes.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/global.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/idcache.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/main.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/makepath.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/tar.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/tar.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/tarhdr.h#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/userspec.c#2 integrate .. //depot/projects/powerpc/contrib/cpio/src/util.c#2 integrate .. //depot/projects/powerpc/contrib/cvs/doc/HACKING.DOCS#2 integrate .. //depot/projects/powerpc/contrib/cvs/src/classify.c#4 integrate .. //depot/projects/powerpc/contrib/expat/COPYING#2 integrate .. //depot/projects/powerpc/contrib/expat/Changes#2 integrate .. //depot/projects/powerpc/contrib/expat/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/contrib/expat/MANIFEST#2 integrate .. //depot/projects/powerpc/contrib/expat/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/expat/README#2 integrate .. //depot/projects/powerpc/contrib/expat/configure#2 integrate .. //depot/projects/powerpc/contrib/expat/configure.in#2 integrate .. //depot/projects/powerpc/contrib/expat/doc/expat.png#1 branch .. //depot/projects/powerpc/contrib/expat/doc/reference.html#2 integrate .. //depot/projects/powerpc/contrib/expat/doc/style.css#2 integrate .. //depot/projects/powerpc/contrib/expat/doc/valid-xhtml10.png#1 branch .. //depot/projects/powerpc/contrib/expat/doc/xmlwf.1#2 integrate .. //depot/projects/powerpc/contrib/expat/doc/xmlwf.sgml#2 integrate .. //depot/projects/powerpc/contrib/expat/examples/elements.c#2 integrate .. //depot/projects/powerpc/contrib/expat/examples/outline.c#2 integrate .. //depot/projects/powerpc/contrib/expat/expat_config.h.in#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/ascii.h#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/expat.h#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/expat_external.h#1 branch .. //depot/projects/powerpc/contrib/expat/lib/internal.h#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/winconfig.h#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/xmlparse.c#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/xmlrole.c#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/xmlrole.h#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/xmltok.c#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/xmltok.h#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/xmltok_impl.c#2 integrate .. //depot/projects/powerpc/contrib/expat/lib/xmltok_ns.c#2 integrate .. //depot/projects/powerpc/contrib/expat/tests/README.txt#2 integrate .. //depot/projects/powerpc/contrib/expat/tests/benchmark/README.txt#1 branch .. //depot/projects/powerpc/contrib/expat/tests/benchmark/benchmark.c#1 branch .. //depot/projects/powerpc/contrib/expat/tests/benchmark/benchmark.dsp#1 branch .. //depot/projects/powerpc/contrib/expat/tests/benchmark/benchmark.dsw#1 branch .. //depot/projects/powerpc/contrib/expat/tests/chardata.c#2 integrate .. //depot/projects/powerpc/contrib/expat/tests/chardata.h#2 integrate .. //depot/projects/powerpc/contrib/expat/tests/minicheck.c#1 branch .. //depot/projects/powerpc/contrib/expat/tests/minicheck.h#1 branch .. //depot/projects/powerpc/contrib/expat/tests/runtests.c#2 integrate .. //depot/projects/powerpc/contrib/expat/tests/runtestspp.cpp#1 branch .. //depot/projects/powerpc/contrib/expat/tests/xmltest.sh#2 integrate .. //depot/projects/powerpc/contrib/expat/xmlwf/codepage.c#2 integrate .. //depot/projects/powerpc/contrib/expat/xmlwf/readfilemap.c#2 integrate .. //depot/projects/powerpc/contrib/expat/xmlwf/unixfilemap.c#2 integrate .. //depot/projects/powerpc/contrib/expat/xmlwf/xmlfile.c#2 integrate .. //depot/projects/powerpc/contrib/expat/xmlwf/xmlfile.h#2 integrate .. //depot/projects/powerpc/contrib/expat/xmlwf/xmlwf.c#2 integrate .. //depot/projects/powerpc/contrib/gcc/common.opt#3 integrate .. //depot/projects/powerpc/contrib/gcc/config/arm/arm.h#3 integrate .. //depot/projects/powerpc/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/powerpc/contrib/gcc/config/freebsd.h#3 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/powerpc/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/powerpc/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/powerpc/contrib/gcc/doc/invoke.texi#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/README#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/dtoa.c#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/gdtoa.h#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/powerpc/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoIg.c#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtodg.c#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtof.c#4 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/README#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/getround.c#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/xsum0.out#3 integrate .. //depot/projects/powerpc/contrib/gdtoa/xsum0.out#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/powerpc/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/powerpc/contrib/ipfilter/ipsend/sock.c#4 integrate .. //depot/projects/powerpc/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/n12#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/n2#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/n5#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/ni1.nat#3 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/ni2.nat#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/test/regress/ni4.nat#2 integrate .. //depot/projects/powerpc/contrib/ipfilter/tools/ipnat_y.y#4 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/powerpc/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/powerpc/contrib/ncurses/FREEBSD-upgrade#4 integrate .. //depot/projects/powerpc/contrib/ncurses/FREEBSD-vendor#2 integrate .. //depot/projects/powerpc/contrib/ncurses/INSTALL#4 integrate .. //depot/projects/powerpc/contrib/ncurses/NEWS#5 integrate .. //depot/projects/powerpc/contrib/ncurses/aclocal.m4#4 integrate .. //depot/projects/powerpc/contrib/ncurses/config.guess#4 integrate .. //depot/projects/powerpc/contrib/ncurses/config.sub#4 integrate .. //depot/projects/powerpc/contrib/ncurses/configure#4 integrate .. //depot/projects/powerpc/contrib/ncurses/configure.in#4 integrate .. //depot/projects/powerpc/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/powerpc/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_threads.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form.3x#3 integrate .. //depot/projects/powerpc/contrib/ncurses/man/terminfo.tail#4 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/terminfo.src#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_bkgd.c#3 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_newterm.c#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_newwin.c#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_restart.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_window.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/resizeterm.c#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/use_window.c#3 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/wresize.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/fifo_defs.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/init_keytry.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_data.c#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_napms.c#3 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_setup.c#5 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/lib_tstp.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/lib_twait.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/tty_update.c#4 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/projects/powerpc/contrib/netcat/nc.1#5 integrate .. //depot/projects/powerpc/contrib/netcat/netcat.c#5 integrate .. //depot/projects/powerpc/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/powerpc/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/powerpc/contrib/ntp/ChangeLog-4.1.0#2 delete .. //depot/projects/powerpc/contrib/ntp/CommitLog#1 branch .. //depot/projects/powerpc/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/powerpc/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/powerpc/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/powerpc/contrib/ntp/INSTALL#2 integrate .. //depot/projects/powerpc/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/NEWS#2 integrate .. //depot/projects/powerpc/contrib/ntp/README#2 integrate .. //depot/projects/powerpc/contrib/ntp/README.bk#2 integrate .. //depot/projects/powerpc/contrib/ntp/README.patches#2 integrate .. //depot/projects/powerpc/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/powerpc/contrib/ntp/README.versions#2 integrate .. //depot/projects/powerpc/contrib/ntp/TODO#2 integrate .. //depot/projects/powerpc/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/powerpc/contrib/ntp/acinclude.m4#2 delete .. //depot/projects/powerpc/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/powerpc/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/powerpc/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/powerpc/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/powerpc/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/powerpc/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/powerpc/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/powerpc/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/powerpc/contrib/ntp/bootstrap#1 branch .. //depot/projects/powerpc/contrib/ntp/build#2 integrate .. //depot/projects/powerpc/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/compile#2 integrate .. //depot/projects/powerpc/contrib/ntp/config.guess#2 integrate .. //depot/projects/powerpc/contrib/ntp/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/config.sub#2 integrate .. //depot/projects/powerpc/contrib/ntp/configure#2 integrate .. //depot/projects/powerpc/contrib/ntp/configure.ac#1 branch .. //depot/projects/powerpc/contrib/ntp/configure.in#2 delete .. //depot/projects/powerpc/contrib/ntp/depcomp#2 integrate .. //depot/projects/powerpc/contrib/ntp/flock-build#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/build.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/powerpc/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/config.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/powerpc/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/powerpc/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/groups.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/hints.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/solaris-dosynctodr.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/solaris.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/vxworks.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/index.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/powerpc/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/patches.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/porting.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/quick.html#2 delete .. //depot/projects/powerpc/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/release.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/powerpc/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/powerpc/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/powerpc/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/powerpc/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/powerpc/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/include/version.def#1 branch .. //depot/projects/powerpc/contrib/ntp/install-sh#2 integrate .. //depot/projects/powerpc/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/binio.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/ieee754io.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/log.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/powerpc/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/README#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/README#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/powerpc/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/powerpc/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/powerpc/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/powerpc/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/powerpc/contrib/ntp/missing#2 integrate .. //depot/projects/powerpc/contrib/ntp/mkinstalldirs#2 delete .. //depot/projects/powerpc/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_usno.c#2 delete .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/ntpq/ntpq_ops.c#2 delete .. //depot/projects/powerpc/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/powerpc/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/powerpc/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/powerpc/contrib/ntp/scripts/genver#1 branch .. //depot/projects/powerpc/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/powerpc/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/powerpc/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/powerpc/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/README#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/compile#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/powerpc/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/powerpc/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/powerpc/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/powerpc/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/powerpc/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/powerpc/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/powerpc/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/powerpc/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/powerpc/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/powerpc/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/powerpc/contrib/ntp/util/ntp-keygen.1#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:26:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F9A21065679; Fri, 24 Oct 2008 19:26: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 1E651106566B for ; Fri, 24 Oct 2008 19:26:04 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0C7B38FC2A for ; Fri, 24 Oct 2008 19:26:04 +0000 (UTC) (envelope-from marcel@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 m9OJQ3kn089568 for ; Fri, 24 Oct 2008 19:26:03 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJQ3RQ089566 for perforce@freebsd.org; Fri, 24 Oct 2008 19:26:03 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:26:03 GMT Message-Id: <200810241926.m9OJQ3RQ089566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151865 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, 24 Oct 2008 19:26:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=151865 Change 151865 by marcel@marcel_jnpr on 2008/10/24 19:25:16 Merge fodder. Affected files ... .. //depot/projects/powerpc/share/man/man4/man4.i386/sbni.4#2 edit Differences ... ==== //depot/projects/powerpc/share/man/man4/man4.i386/sbni.4#2 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/sbni.4,v 1.2 2003/05/29 21:28:36 ru Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/sbni.4,v 1.4 2008/09/10 18:36:58 jhb Exp $ .\" .Dd January 8, 2002 .Dt SBNI 4 i386 From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:29:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D777106567D; Fri, 24 Oct 2008 19:29: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 40529106566C for ; Fri, 24 Oct 2008 19:29:07 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D22E8FC30 for ; Fri, 24 Oct 2008 19:29:07 +0000 (UTC) (envelope-from marcel@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 m9OJT75a089762 for ; Fri, 24 Oct 2008 19:29:07 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJT7ae089760 for perforce@freebsd.org; Fri, 24 Oct 2008 19:29:07 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:29:07 GMT Message-Id: <200810241929.m9OJT7ae089760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151866 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, 24 Oct 2008 19:29:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=151866 Change 151866 by marcel@marcel_jnpr on 2008/10/24 19:28:37 More merge fodder. Affected files ... .. //depot/projects/powerpc/sys/dev/sbni/if_sbni.c#4 edit .. //depot/projects/powerpc/sys/dev/sbni/if_sbni_isa.c#4 edit .. //depot/projects/powerpc/sys/dev/sbni/if_sbni_pci.c#4 edit .. //depot/projects/powerpc/sys/dev/sbni/if_sbnireg.h#3 edit .. //depot/projects/powerpc/sys/dev/sbni/if_sbnivar.h#3 edit Differences ... ==== //depot/projects/powerpc/sys/dev/sbni/if_sbni.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.24 2007/07/05 07:46:33 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.28 2008/09/10 18:42:19 jhb Exp $"); /* * Device driver for Granch SBNI12 leased line adapters @@ -62,6 +62,7 @@ #include +#include #include #include #include @@ -86,12 +87,11 @@ #include #include -#define ASM_CRC 1 - static void sbni_init(void *); +static void sbni_init_locked(struct sbni_softc *); static void sbni_start(struct ifnet *); +static void sbni_start_locked(struct ifnet *); static int sbni_ioctl(struct ifnet *, u_long, caddr_t); -static void sbni_watchdog(struct ifnet *); static void sbni_stop(struct sbni_softc *); static void handle_channel(struct sbni_softc *); @@ -125,11 +125,11 @@ static u_int32_t crc32tab[]; #ifdef SBNI_DUAL_COMPOUND -struct sbni_softc *sbni_headlist; +static struct mtx headlist_lock; +MTX_SYSINIT(headlist_lock, &headlist_lock, "sbni headlist", MTX_DEF); +static struct sbni_softc *sbni_headlist; #endif -u_int32_t next_sbni_unit; - /* -------------------------------------------------------------------------- */ static __inline u_char @@ -217,7 +217,7 @@ /* * Install interface into kernel networking data structures */ -void +int sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags) { struct ifnet *ifp; @@ -225,27 +225,27 @@ ifp = sc->ifp = if_alloc(IFT_ETHER); if (ifp == NULL) - panic("sbni%d: can not if_alloc()", unit); + return (ENOMEM); sbni_outb(sc, CSR0, 0); set_initial_values(sc, flags); - callout_handle_init(&sc->wch); /* Initialize ifnet structure */ ifp->if_softc = sc; if_initname(ifp, "sbni", unit); ifp->if_init = sbni_init; ifp->if_start = sbni_start; ifp->if_ioctl = sbni_ioctl; - ifp->if_watchdog = sbni_watchdog; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); /* report real baud rate */ csr0 = sbni_inb(sc, CSR0); ifp->if_baudrate = (csr0 & 0x01 ? 500000 : 2000000) / (1 << flags.rate); - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | - IFF_NEEDSGIANT; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + + mtx_init(&sc->lock, ifp->if_xname, MTX_NETWORK_LOCK, MTX_DEF); + callout_init_mtx(&sc->wch, &sc->lock, 0); ether_ifattach(ifp, sc->enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ @@ -254,18 +254,54 @@ printf("auto\n"); else printf("%d (fixed)\n", sc->cur_rxl_index); + return (0); +} + +void +sbni_detach(struct sbni_softc *sc) +{ + + SBNI_LOCK(sc); + sbni_stop(sc); + SBNI_UNLOCK(sc); + callout_drain(&sc->wch); + ether_ifdetach(sc->ifp); + if (sc->irq_handle) + bus_teardown_intr(sc->dev, sc->irq_res, sc->irq_handle); + mtx_destroy(&sc->lock); + if_free(sc->ifp); } +void +sbni_release_resources(struct sbni_softc *sc) +{ + + if (sc->irq_res) + bus_release_resource(sc->dev, SYS_RES_IRQ, sc->irq_rid, + sc->irq_res); + if (sc->io_res && sc->io_off == 0) + bus_release_resource(sc->dev, SYS_RES_IOPORT, sc->io_rid, + sc->io_res); +} + /* -------------------------------------------------------------------------- */ static void sbni_init(void *xsc) { struct sbni_softc *sc; + + sc = (struct sbni_softc *)xsc; + SBNI_LOCK(sc); + sbni_init_locked(sc); + SBNI_UNLOCK(sc); +} + +static void +sbni_init_locked(struct sbni_softc *sc) +{ struct ifnet *ifp; - int s; - sc = (struct sbni_softc *)xsc; ifp = sc->ifp; /* @@ -275,24 +311,31 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) return; - s = splimp(); - ifp->if_timer = 0; card_start(sc); - sc->wch = timeout(sbni_timeout, sc, hz/SBNI_HZ); + callout_reset(&sc->wch, hz/SBNI_HZ, sbni_timeout, sc); ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; /* attempt to start output */ - sbni_start(ifp); - splx(s); + sbni_start_locked(ifp); } +static void +sbni_start(struct ifnet *ifp) +{ + struct sbni_softc *sc = ifp->if_softc; + SBNI_LOCK(sc); + sbni_start_locked(ifp); + SBNI_UNLOCK(sc); +} + static void -sbni_start(struct ifnet *ifp) +sbni_start_locked(struct ifnet *ifp) { struct sbni_softc *sc = ifp->if_softc; + if (sc->tx_frameno == 0) prepare_to_send(sc); } @@ -309,8 +352,8 @@ sc->rx_buf_p = NULL; } - untimeout(sbni_timeout, sc, sc->wch); - sc->wch.callout = NULL; + callout_stop(&sc->wch); + sc->ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); } /* -------------------------------------------------------------------------- */ @@ -340,14 +383,20 @@ do { repeat = 0; + SBNI_LOCK(sc); if (sbni_inb(sc, CSR0) & (RC_RDY | TR_RDY)) { handle_channel(sc); repeat = 1; } - if (sc->slave_sc && /* second channel present */ - (sbni_inb(sc->slave_sc, CSR0) & (RC_RDY | TR_RDY))) { - handle_channel(sc->slave_sc); - repeat = 1; + SBNI_UNLOCK(sc); + if (sc->slave_sc) { + /* second channel present */ + SBNI_LOCK(sc->slave_sc); + if (sbni_inb(sc->slave_sc, CSR0) & (RC_RDY | TR_RDY)) { + handle_channel(sc->slave_sc); + repeat = 1; + } + SBNI_UNLOCK(sc->slave_sc); } } while (repeat); } @@ -378,7 +427,7 @@ */ csr0 = sbni_inb(sc, CSR0); if ((csr0 & TR_RDY) == 0 || (csr0 & RC_RDY) != 0) - printf("sbni: internal error!\n"); + if_printf(sc->ifp, "internal error!\n"); /* if state & FL_NEED_RESEND != 0 then tx_frameno != 0 */ if (req_ans || sc->tx_frameno != 0) @@ -856,9 +905,11 @@ m = sc->rx_buf_p; m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = sc->inppos; + sc->rx_buf_p = NULL; + SBNI_UNLOCK(sc); (*ifp->if_input)(ifp, m); - sc->rx_buf_p = NULL; + SBNI_LOCK(sc); } /* -------------------------------------------------------------------------- */ @@ -872,11 +923,10 @@ sbni_timeout(void *xsc) { struct sbni_softc *sc; - int s; u_char csr0; sc = (struct sbni_softc *)xsc; - s = splimp(); + SBNI_ASSERT_LOCKED(sc); csr0 = sbni_inb(sc, CSR0); if (csr0 & RC_CHK) { @@ -895,9 +945,8 @@ } } - sbni_outb(sc, CSR0, csr0 | RC_CHK); - sc->wch = timeout(sbni_timeout, sc, hz/SBNI_HZ); - splx(s); + sbni_outb(sc, CSR0, csr0 | RC_CHK); + callout_reset(&sc->wch, hz/SBNI_HZ, sbni_timeout, sc); } /* -------------------------------------------------------------------------- */ @@ -918,19 +967,6 @@ /* -------------------------------------------------------------------------- */ -/* - * Device timeout/watchdog routine. Entered if the device neglects to - * generate an interrupt after a transmit has been started on it. - */ - -static void -sbni_watchdog(struct ifnet *ifp) -{ - log(LOG_ERR, "%s: device timeout\n", ifp->if_xname); - ifp->if_oerrors++; -} - - static u_char rxl_tab[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x08, 0x0a, 0x0c, 0x0f, 0x16, 0x18, 0x1a, 0x1c, 0x1f @@ -971,12 +1007,22 @@ #ifdef SBNI_DUAL_COMPOUND +void +sbni_add(struct sbni_softc *sc) +{ + + mtx_lock(&headlist_lock); + sc->link = sbni_headlist; + sbni_headlist = sc; + mtx_unlock(&headlist_lock); +} struct sbni_softc * connect_to_master(struct sbni_softc *sc) { struct sbni_softc *p, *p_prev; + mtx_lock(&headlist_lock); for (p = sbni_headlist, p_prev = NULL; p; p_prev = p, p = p->link) { if (rman_get_start(p->io_res) == rman_get_start(sc->io_res) + 4 || rman_get_start(p->io_res) == rman_get_start(sc->io_res) - 4) { @@ -985,9 +1031,11 @@ p_prev->link = p->link; else sbni_headlist = p->link; + mtx_unlock(&headlist_lock); return p; } } + mtx_unlock(&headlist_lock); return (NULL); } @@ -1049,30 +1097,29 @@ struct thread *td; struct sbni_in_stats *in_stats; struct sbni_flags flags; - int error, s; + int error; sc = ifp->if_softc; ifr = (struct ifreq *)data; td = curthread; error = 0; - s = splimp(); - switch (command) { case SIOCSIFFLAGS: /* * If the interface is marked up and stopped, then start it. * If it is marked down and running, then stop it. */ + SBNI_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - sbni_init(sc); + sbni_init_locked(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { sbni_stop(sc); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } } + SBNI_UNLOCK(sc); break; case SIOCADDMULTI: @@ -1086,29 +1133,29 @@ error = EAFNOSUPPORT; */ break; - case SIOCSIFMTU: - if (ifr->ifr_mtu > ETHERMTU) - error = EINVAL; - else - ifp->if_mtu = ifr->ifr_mtu; - break; - /* * SBNI specific ioctl */ case SIOCGHWFLAGS: /* get flags */ + SBNI_LOCK(sc); bcopy((caddr_t)IF_LLADDR(sc->ifp)+3, (caddr_t) &flags, 3); flags.rxl = sc->cur_rxl_index; flags.rate = sc->csr1.rate; flags.fixed_rxl = (sc->delta_rxl == 0); flags.fixed_rate = 1; + SBNI_UNLOCK(sc); ifr->ifr_data = *(caddr_t*) &flags; break; case SIOCGINSTATS: - in_stats = (struct sbni_in_stats *)ifr->ifr_data; - bcopy((void *)(&(sc->in_stats)), (void *)in_stats, - sizeof(struct sbni_in_stats)); + in_stats = malloc(sizeof(struct sbni_in_stats), M_DEVBUF, + M_WAITOK); + SBNI_LOCK(sc); + bcopy(&sc->in_stats, in_stats, sizeof(struct sbni_in_stats)); + SBNI_UNLOCK(sc); + error = copyout(ifr->ifr_data, in_stats, + sizeof(struct sbni_in_stats)); + free(in_stats, M_DEVBUF); break; case SIOCSHWFLAGS: /* set flags */ @@ -1117,6 +1164,7 @@ if (error) break; flags = *(struct sbni_flags*)&ifr->ifr_data; + SBNI_LOCK(sc); if (flags.fixed_rxl) { sc->delta_rxl = 0; sc->cur_rxl_index = flags.rxl; @@ -1132,11 +1180,14 @@ /* Don't be afraid... */ sbni_outb(sc, CSR1, *(char*)(&sc->csr1) | PR_RES); + SBNI_UNLOCK(sc); break; case SIOCRINSTATS: + SBNI_LOCK(sc); if (!(error = priv_check(td, PRIV_DRIVER))) /* root only */ bzero(&sc->in_stats, sizeof(struct sbni_in_stats)); + SBNI_UNLOCK(sc); break; default: @@ -1144,106 +1195,20 @@ break; } - splx(s); return (error); } /* -------------------------------------------------------------------------- */ -#ifdef ASM_CRC - static u_int32_t calc_crc32(u_int32_t crc, caddr_t p, u_int len) { - register u_int32_t _crc __asm ("ax"); - _crc = crc; - - __asm __volatile ( - "xorl %%ebx, %%ebx\n" - "movl %1, %%esi\n" - "movl %2, %%ecx\n" - "movl $crc32tab, %%edi\n" - "shrl $2, %%ecx\n" - "jz 1f\n" - - ".align 4\n" - "0:\n" - "movb %%al, %%bl\n" - "movl (%%esi), %%edx\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "shrl $8, %%edx\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "shrl $8, %%edx\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "movb %%dh, %%dl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "addl $4, %%esi\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "decl %%ecx\n" - "jnz 0b\n" - - "1:\n" - "movl %2, %%ecx\n" - "andl $3, %%ecx\n" - "jz 2f\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb (%%esi), %%bl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "decl %%ecx\n" - "jz 2f\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb 1(%%esi), %%bl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "decl %%ecx\n" - "jz 2f\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb 2(%%esi), %%bl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - "2:\n" - : "=a" (_crc) - : "g" (p), "g" (len) - : "bx", "cx", "dx", "si", "di" - ); - - return (_crc); -} - -#else /* ASM_CRC */ - -static u_int32_t -calc_crc32(u_int32_t crc, caddr_t p, u_int len) -{ while (len--) crc = CRC32(*p++, crc); return (crc); } -#endif /* ASM_CRC */ - - static u_int32_t crc32tab[] __aligned(8) = { 0xD202EF8D, 0xA505DF1B, 0x3C0C8EA1, 0x4B0BBE37, 0xD56F2B94, 0xA2681B02, 0x3B614AB8, 0x4C667A2E, ==== //depot/projects/powerpc/sys/dev/sbni/if_sbni_isa.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.15 2007/02/23 12:18:53 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.18 2008/09/10 18:36:58 jhb Exp $"); #include @@ -85,7 +85,6 @@ return (error); sc = device_get_softc(dev); - bzero(sc, sizeof(struct sbni_softc)); sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->io_rid, 0ul, ~0ul, SBNI_PORTS, RF_ACTIVE); @@ -95,12 +94,11 @@ } if (sbni_probe(sc) != 0) { - bus_release_resource(dev, SYS_RES_IOPORT, - sc->io_rid, sc->io_res); + sbni_release_resources(sc); return (ENXIO); } - device_quiet(dev); + device_set_desc(dev, "Granch SBNI12/ISA adapter"); return (0); } @@ -113,50 +111,32 @@ int error; sc = device_get_softc(dev); + sc->dev = dev; - printf("sbni%d: port 0x%lx", - next_sbni_unit, rman_get_start(sc->io_res)); sc->irq_res = bus_alloc_resource_any( dev, SYS_RES_IRQ, &sc->irq_rid, RF_ACTIVE); - if (sc->irq_res) { - printf(" irq %ld\n", rman_get_start(sc->irq_res)); - error = bus_setup_intr( - dev, sc->irq_res, INTR_TYPE_NET, - NULL, sbni_intr, sc, &sc->irq_handle); - if (error) { - printf("sbni%d: bus_setup_intr\n", next_sbni_unit); - bus_release_resource( - dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); - bus_release_resource( - dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); - return (error); - } - #ifndef SBNI_DUAL_COMPOUND - } else { - printf("\nsbni%d: irq conflict!\n", next_sbni_unit); - bus_release_resource(dev, SYS_RES_IOPORT, - sc->io_rid, sc->io_res); + if (sc->irq_res == NULL) { + device_printf(dev, "irq conflict!\n"); + sbni_release_resources(sc); return (ENOENT); } #else /* SBNI_DUAL_COMPOUND */ - sc->link = sbni_headlist; - sbni_headlist = sc; + if (sc->irq_res) { + sbni_add(sc); } else { struct sbni_softc *master; if ((master = connect_to_master(sc)) == 0) { - printf("\nsbni%d: failed to alloc irq\n", - next_sbni_unit); - bus_release_resource( - dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); + device_printf(dev, "failed to alloc irq\n"); + sbni_release_resources(sc); return (ENXIO); } else { - printf(" shared irq with %s\n", + device_printf(dev, "shared irq with %s\n", master->ifp->if_xname); } } @@ -164,6 +144,24 @@ *(u_int32_t*)&flags = device_get_flags(dev); - sbni_attach(sc, next_sbni_unit++, flags); + error = sbni_attach(sc, device_get_unit(dev) * 2, flags); + if (error) { + device_printf(dev, "cannot initialize driver\n"); + sbni_release_resources(sc); + return (error); + } + + if (sc->irq_res) { + error = bus_setup_intr( + dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, + NULL, sbni_intr, sc, &sc->irq_handle); + if (error) { + device_printf(dev, "bus_setup_intr\n"); + sbni_detach(sc); + sbni_release_resources(sc); + return (error); + } + } + return (0); } ==== //depot/projects/powerpc/sys/dev/sbni/if_sbni_pci.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.12 2007/02/23 12:18:53 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.15 2008/09/10 18:36:58 jhb Exp $"); #include #include @@ -51,11 +51,13 @@ static int sbni_pci_probe(device_t); static int sbni_pci_attach(device_t); +static int sbni_pci_detach(device_t); static device_method_t sbni_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, sbni_pci_probe), DEVMETHOD(device_attach, sbni_pci_attach), + DEVMETHOD(device_detach, sbni_pci_detach), { 0, 0 } }; @@ -75,14 +77,13 @@ { struct sbni_softc *sc; u_int32_t ports; - + ports = SBNI_PORTS; if (pci_get_vendor(dev) != SBNI_PCI_VENDOR || pci_get_device(dev) != SBNI_PCI_DEVICE) return (ENXIO); sc = device_get_softc(dev); - bzero(sc, sizeof(struct sbni_softc)); if (pci_get_subdevice(dev) == 2) { ports <<= 1; sc->slave_sc = malloc(sizeof(struct sbni_softc), @@ -97,7 +98,7 @@ sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->io_rid, 0ul, ~0ul, ports, RF_ACTIVE); if (!sc->io_res) { - printf("sbni: cannot allocate io ports!\n"); + device_printf(dev, "cannot allocate io ports!\n"); if (sc->slave_sc) free(sc->slave_sc, M_DEVBUF); return (ENOENT); @@ -108,14 +109,12 @@ sc->slave_sc->io_off = 4; } if (sbni_probe(sc) != 0) { - bus_release_resource(dev, SYS_RES_IOPORT, - sc->io_rid, sc->io_res); + sbni_release_resources(sc); if (sc->slave_sc) free(sc->slave_sc, M_DEVBUF); return (ENXIO); } - device_quiet(dev); return (0); } @@ -127,41 +126,66 @@ int error; sc = device_get_softc(dev); + sc->dev = dev; - printf("sbni%d: port 0x%lx", - next_sbni_unit, sc->slave_sc ? " Dual " : " ", - rman_get_start(sc->io_res)); sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, RF_SHAREABLE); - if (sc->irq_res) { - printf(" irq %ld\n", rman_get_start(sc->irq_res)); - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, - NULL, sbni_intr, sc, &sc->irq_handle); - if (error) { - printf("sbni%d: bus_setup_intr\n", next_sbni_unit); - goto attach_failed; - } - } else { - printf("\nsbni%d: cannot claim irq!\n", next_sbni_unit); + if (sc->irq_res == NULL) { + device_printf(dev, "cannot claim irq!\n"); error = ENOENT; goto attach_failed; } *(u_int32_t*)&flags = 0; - sbni_attach(sc, next_sbni_unit++, flags); - if (sc->slave_sc) - sbni_attach(sc->slave_sc, next_sbni_unit++, flags); + error = sbni_attach(sc, device_get_unit(dev) * 2, flags); + if (error) { + device_printf(dev, "cannot initialize driver\n"); + goto attach_failed; + } + if (sc->slave_sc) { + error = sbni_attach(sc->slave_sc, device_get_unit(dev) * 2 + 1, + flags); + if (error) { + device_printf(dev, "cannot initialize slave\n"); + sbni_detach(sc); + goto attach_failed; + } + } + + if (sc->irq_res) { + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | + INTR_MPSAFE, NULL, sbni_intr, sc, &sc->irq_handle); + if (error) { + device_printf(dev, "bus_setup_intr\n"); + sbni_detach(sc); + if (sc->slave_sc) + sbni_detach(sc); + goto attach_failed; + } + } return (0); attach_failed: - bus_release_resource(dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); - if (sc->irq_res) { - bus_release_resource( - dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); - } + sbni_release_resources(sc); if (sc->slave_sc) free(sc->slave_sc, M_DEVBUF); return (error); } + +static int +sbni_pci_detach(device_t dev) +{ + struct sbni_softc *sc; + + sc = device_get_softc(dev); + sbni_detach(sc); + if (sc->slave_sc) + sbni_detach(sc); + + sbni_release_resources(sc); + if (sc->slave_sc) + free(sc->slave_sc, M_DEVBUF); + return (0); +} ==== //depot/projects/powerpc/sys/dev/sbni/if_sbnireg.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sbni/if_sbnireg.h,v 1.2 2005/01/06 01:43:12 imp Exp $ + * $FreeBSD: src/sys/dev/sbni/if_sbnireg.h,v 1.4 2008/09/10 18:36:58 jhb Exp $ */ /* ==== //depot/projects/powerpc/sys/dev/sbni/if_sbnivar.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sbni/if_sbnivar.h,v 1.5 2005/06/10 16:49:14 brooks Exp $ + * $FreeBSD: src/sys/dev/sbni/if_sbnivar.h,v 1.8 2008/09/10 18:36:58 jhb Exp $ */ /* @@ -68,6 +68,7 @@ struct sbni_softc { struct ifnet *ifp; + device_t dev; u_char enaddr[6]; int io_rid; @@ -111,7 +112,8 @@ struct sbni_csr1 csr1; /* current value of CSR1 */ struct sbni_in_stats in_stats; /* internal statistics */ - struct callout_handle wch; + struct callout wch; + struct mtx lock; struct sbni_softc *slave_sc; @@ -120,15 +122,20 @@ #endif }; +#define SBNI_LOCK(sc) mtx_lock(&(sc)->lock) +#define SBNI_UNLOCK(sc) mtx_unlock(&(sc)->lock) +#define SBNI_ASSERT_LOCKED(sc) mtx_assert(&(sc)->lock, MA_OWNED) + void sbni_intr(void *); int sbni_probe(struct sbni_softc *); -void sbni_attach(struct sbni_softc *, int, struct sbni_flags); +int sbni_attach(struct sbni_softc *, int, struct sbni_flags); +void sbni_detach(struct sbni_softc *); +void sbni_release_resources(struct sbni_softc *); extern u_int32_t next_sbni_unit; #ifdef SBNI_DUAL_COMPOUND -extern struct sbni_softc *sbni_headlist; - +void sbni_add(struct sbni_softc *); struct sbni_softc *connect_to_master(struct sbni_softc *); #endif #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:30:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC2A31065675; Fri, 24 Oct 2008 19:30: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 7F8CF1065670 for ; Fri, 24 Oct 2008 19:30:08 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5487C8FC25 for ; Fri, 24 Oct 2008 19:30:08 +0000 (UTC) (envelope-from marcel@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 m9OJU88N089869 for ; Fri, 24 Oct 2008 19:30:08 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJU8G8089867 for perforce@freebsd.org; Fri, 24 Oct 2008 19:30:08 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:30:08 GMT Message-Id: <200810241930.m9OJU8G8089867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151867 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, 24 Oct 2008 19:30:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=151867 Change 151867 by marcel@marcel_jnpr on 2008/10/24 19:29:45 Even more merge fodder. Affected files ... .. //depot/projects/powerpc/sys/modules/sbni/Makefile#2 edit Differences ... ==== //depot/projects/powerpc/sys/modules/sbni/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.1 2001/11/21 22:29:35 fjoe Exp $ +# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.3 2008/09/10 18:36:58 jhb Exp $ .PATH: ${.CURDIR}/../../dev/sbni From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:33:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26E6410656A5; Fri, 24 Oct 2008 19:33: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 DCD461065699 for ; Fri, 24 Oct 2008 19:33:11 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B17968FC1C for ; Fri, 24 Oct 2008 19:33:11 +0000 (UTC) (envelope-from marcel@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 m9OJXBx7090145 for ; Fri, 24 Oct 2008 19:33:11 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJXBvO090143 for perforce@freebsd.org; Fri, 24 Oct 2008 19:33:11 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:33:11 GMT Message-Id: <200810241933.m9OJXBvO090143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151869 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, 24 Oct 2008 19:33:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=151869 Change 151869 by marcel@marcel_jnpr on 2008/10/24 19:32:28 Diff reduction: remove my XSERVE configuration file. Affected files ... .. //depot/projects/powerpc/sys/powerpc/conf/XSERVE#9 delete Differences ... From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:55:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1713A1065672; Fri, 24 Oct 2008 19:55: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 C88F7106566B for ; Fri, 24 Oct 2008 19:55:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B44598FC1B for ; Fri, 24 Oct 2008 19:55:45 +0000 (UTC) (envelope-from marcel@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 m9OJtj9q092130 for ; Fri, 24 Oct 2008 19:55:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJsYfu091981 for perforce@freebsd.org; Fri, 24 Oct 2008 19:54:34 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:54:34 GMT Message-Id: <200810241954.m9OJsYfu091981@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151870 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, 24 Oct 2008 19:55:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=151870 Change 151870 by marcel@marcel_jnpr on 2008/10/24 19:54:30 IFC @151838 Affected files ... .. //depot/projects/e500/LOCKS#3 integrate .. //depot/projects/e500/MAINTAINERS#4 integrate .. //depot/projects/e500/Makefile#7 integrate .. //depot/projects/e500/Makefile.inc1#12 integrate .. //depot/projects/e500/ObsoleteFiles.inc#12 integrate .. //depot/projects/e500/UPDATING#12 integrate .. //depot/projects/e500/bin/Makefile#3 integrate .. //depot/projects/e500/bin/cp/utils.c#3 integrate .. //depot/projects/e500/bin/echo/echo.c#2 integrate .. //depot/projects/e500/bin/ln/ln.1#3 integrate .. //depot/projects/e500/bin/ln/ln.c#3 integrate .. //depot/projects/e500/bin/mv/mv.c#4 integrate .. //depot/projects/e500/bin/pkill/Makefile#1 branch .. //depot/projects/e500/bin/pkill/pkill.1#1 branch .. //depot/projects/e500/bin/pkill/pkill.c#1 branch .. //depot/projects/e500/bin/ps/ps.c#4 integrate .. //depot/projects/e500/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/e500/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/e500/bin/sh/alias.c#2 integrate .. //depot/projects/e500/bin/sh/eval.c#3 integrate .. //depot/projects/e500/bin/sh/expand.c#2 integrate .. //depot/projects/e500/bin/sh/miscbltin.c#2 integrate .. //depot/projects/e500/bin/sh/mknodes.c#2 integrate .. //depot/projects/e500/bin/sh/options.c#3 integrate .. //depot/projects/e500/bin/sh/parser.c#2 integrate .. //depot/projects/e500/bin/sh/parser.h#2 integrate .. //depot/projects/e500/bin/sh/sh.1#4 integrate .. //depot/projects/e500/bin/stty/gfmt.c#2 integrate .. //depot/projects/e500/bin/stty/modes.c#2 integrate .. //depot/projects/e500/bin/stty/print.c#2 integrate .. //depot/projects/e500/bin/stty/stty.1#2 integrate .. //depot/projects/e500/cddl/compat/opensolaris/include/dtrace.h#1 branch .. //depot/projects/e500/cddl/compat/opensolaris/include/libproc.h#1 branch .. //depot/projects/e500/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/e500/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/e500/cddl/lib/Makefile#5 integrate .. //depot/projects/e500/cddl/lib/drti/Makefile#1 branch .. //depot/projects/e500/cddl/lib/libctf/Makefile#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/Makefile#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/errno.d#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/net.d#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/nfs.d#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/psinfo.d#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/sched.d#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/signal.d#1 branch .. //depot/projects/e500/cddl/lib/libdtrace/unistd.d#1 branch .. //depot/projects/e500/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/e500/cddl/usr.bin/ctfconvert/Makefile#1 branch .. //depot/projects/e500/cddl/usr.bin/ctfdump/Makefile#1 branch .. //depot/projects/e500/cddl/usr.bin/ctfmerge/Makefile#1 branch .. //depot/projects/e500/cddl/usr.bin/sgsmsg/Makefile#1 branch .. //depot/projects/e500/cddl/usr.sbin/Makefile#5 integrate .. //depot/projects/e500/cddl/usr.sbin/dtrace/Makefile#1 branch .. //depot/projects/e500/contrib/bind9/CHANGES#5 integrate .. //depot/projects/e500/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/e500/contrib/bind9/FREEBSD-Upgrade#3 delete .. //depot/projects/e500/contrib/bind9/FREEBSD-Xlist#2 delete .. //depot/projects/e500/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/e500/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/e500/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/e500/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/e500/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/e500/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/e500/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/e500/contrib/bind9/configure.in#4 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.ch06.html#5 integrate .. //depot/projects/e500/contrib/bind9/doc/arm/Bv9ARM.pdf#5 integrate .. //depot/projects/e500/contrib/bind9/lib/bind/aclocal.m4#2 delete .. //depot/projects/e500/contrib/bind9/lib/bind/config.h.in#3 delete .. //depot/projects/e500/contrib/bind9/lib/bind/configure#4 delete .. //depot/projects/e500/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/e500/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/e500/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/timer.c#4 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/app.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/resource.c#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/e500/contrib/bind9/lib/isc/unix/socket_p.h#3 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/api#4 integrate .. //depot/projects/e500/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/e500/contrib/bind9/version#5 integrate .. //depot/projects/e500/contrib/binutils/bfd/coff-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/cpu-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/elf32-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/elf64-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/elfn32-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/elfxx-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/elfxx-mips.h#1 branch .. //depot/projects/e500/contrib/binutils/bfd/hosts/mipsbsd.h#1 branch .. //depot/projects/e500/contrib/binutils/bfd/hosts/mipsmach3.h#1 branch .. //depot/projects/e500/contrib/binutils/bfd/hosts/news-mips.h#1 branch .. //depot/projects/e500/contrib/binutils/bfd/mipsbsd.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/pe-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/bfd/pei-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/gas/config/e-mipsecoff.c#1 branch .. //depot/projects/e500/contrib/binutils/gas/config/e-mipself.c#1 branch .. //depot/projects/e500/contrib/binutils/gas/config/itbl-mips.h#1 branch .. //depot/projects/e500/contrib/binutils/gas/config/tc-mips.c#1 branch .. //depot/projects/e500/contrib/binutils/gas/config/tc-mips.h#1 branch .. //depot/projects/e500/contrib/binutils/gas/config/te-tmips.h#1 branch .. //depot/projects/e500/contrib/binutils/gas/doc/c-mips.texi#1 branch .. //depot/projects/e500/contrib/binutils/gprof/mips.c#1 branch .. //depot/projects/e500/contrib/binutils/include/coff/mips.h#1 branch .. //depot/projects/e500/contrib/binutils/include/coff/mipspe.h#1 branch .. //depot/projects/e500/contrib/binutils/include/opcode/mips.h#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf32bmipn32-defs.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf32btsmip.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf32btsmipn32.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf32ltsmip.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf32ltsmipn32.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf32mipswindiss.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf64btsmip.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/elf64ltsmip.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/mipsbig.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/mipsbsd.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/mipsidt.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/mipsidtl.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/mipslit.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/mipslnews.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emulparams/mipspe.sh#1 branch .. //depot/projects/e500/contrib/binutils/ld/emultempl/mipsecoff.em#1 branch .. //depot/projects/e500/contrib/binutils/ld/emultempl/mipself.em#1 branch .. //depot/projects/e500/contrib/binutils/ld/scripttempl/mips.sc#1 branch .. //depot/projects/e500/contrib/binutils/ld/scripttempl/mipsbsd.sc#1 branch .. //depot/projects/e500/contrib/binutils/opcodes/mips-dis.c#1 branch .. //depot/projects/e500/contrib/binutils/opcodes/mips-opc.c#1 branch .. //depot/projects/e500/contrib/binutils/opcodes/mips16-opc.c#1 branch .. //depot/projects/e500/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/e500/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/e500/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/e500/contrib/com_err/com_err.c#2 integrate .. //depot/projects/e500/contrib/com_err/com_err.h#2 integrate .. //depot/projects/e500/contrib/com_err/com_right.h#2 integrate .. //depot/projects/e500/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/e500/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/e500/contrib/com_err/error.c#2 integrate .. //depot/projects/e500/contrib/com_err/lex.c#1 branch .. //depot/projects/e500/contrib/com_err/lex.h#2 integrate .. //depot/projects/e500/contrib/com_err/lex.l#2 integrate .. //depot/projects/e500/contrib/com_err/parse.c#1 branch .. //depot/projects/e500/contrib/com_err/parse.h#1 branch .. //depot/projects/e500/contrib/com_err/parse.y#2 integrate .. //depot/projects/e500/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/e500/contrib/com_err/version-script.map#1 branch .. //depot/projects/e500/contrib/cpio/ABOUT-NLS#2 integrate .. //depot/projects/e500/contrib/cpio/COPYING#2 integrate .. //depot/projects/e500/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/e500/contrib/cpio/INSTALL#2 integrate .. //depot/projects/e500/contrib/cpio/NEWS#2 integrate .. //depot/projects/e500/contrib/cpio/THANKS#2 integrate .. //depot/projects/e500/contrib/cpio/TODO#2 integrate .. //depot/projects/e500/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/e500/contrib/cpio/doc/version.texi#1 branch .. //depot/projects/e500/contrib/cpio/lib/alloca_.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-ba.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-eexst.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-fmtstream.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-fmtstream.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-fs-xinl.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-help.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-namefrob.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-parse.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-pin.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/argp-pv.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-pvh.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp-xinl.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/argp.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/basename.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/dirname.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/dirname.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/error.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/error.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/exit.h#2 delete .. //depot/projects/e500/contrib/cpio/lib/exitfail.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/exitfail.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/fatal.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/full-write.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/full-write.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/getopt.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/getopt1.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/getopt_.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/getopt_int.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/gettext.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/hash.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/hash.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/intprops.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/inttostr.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/inttostr.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/localedir.h#2 delete .. //depot/projects/e500/contrib/cpio/lib/mempcpy.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/mempcpy.h#2 delete .. //depot/projects/e500/contrib/cpio/lib/paxerror.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/paxexit.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/paxlib.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/paxnames.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/quote.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/quote.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/quotearg.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/quotearg.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/rmt-command.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/rmt.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/rtapelib.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/safe-read.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/safe-read.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/safe-write.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/safe-write.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/savedir.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/savedir.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/strcase.h#2 delete .. //depot/projects/e500/contrib/cpio/lib/strchrnul.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/strchrnul.h#2 delete .. //depot/projects/e500/contrib/cpio/lib/stripslash.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/strndup.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/strndup.h#2 delete .. //depot/projects/e500/contrib/cpio/lib/strnlen.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/system-ioctl.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/system.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/umaxtostr.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/unlocked-io.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/utimens.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/utimens.h#1 branch .. //depot/projects/e500/contrib/cpio/lib/xalloc-die.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/xalloc.h#2 integrate .. //depot/projects/e500/contrib/cpio/lib/xmalloc.c#2 integrate .. //depot/projects/e500/contrib/cpio/lib/xstrndup.c#1 branch .. //depot/projects/e500/contrib/cpio/lib/xstrndup.h#1 branch .. //depot/projects/e500/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/cpio.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/cpiohdr.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/defer.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/defer.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/dstring.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/dstring.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/filemode.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/filetypes.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/global.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/idcache.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/main.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/makepath.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/tar.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/tar.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/tarhdr.h#2 integrate .. //depot/projects/e500/contrib/cpio/src/userspec.c#2 integrate .. //depot/projects/e500/contrib/cpio/src/util.c#2 integrate .. //depot/projects/e500/contrib/cvs/doc/HACKING.DOCS#2 integrate .. //depot/projects/e500/contrib/cvs/src/classify.c#4 integrate .. //depot/projects/e500/contrib/expat/COPYING#2 integrate .. //depot/projects/e500/contrib/expat/Changes#2 integrate .. //depot/projects/e500/contrib/expat/FREEBSD-upgrade#2 integrate .. //depot/projects/e500/contrib/expat/MANIFEST#2 integrate .. //depot/projects/e500/contrib/expat/Makefile.in#2 integrate .. //depot/projects/e500/contrib/expat/README#2 integrate .. //depot/projects/e500/contrib/expat/configure#2 integrate .. //depot/projects/e500/contrib/expat/configure.in#2 integrate .. //depot/projects/e500/contrib/expat/doc/expat.png#1 branch .. //depot/projects/e500/contrib/expat/doc/reference.html#2 integrate .. //depot/projects/e500/contrib/expat/doc/style.css#2 integrate .. //depot/projects/e500/contrib/expat/doc/valid-xhtml10.png#1 branch .. //depot/projects/e500/contrib/expat/doc/xmlwf.1#2 integrate .. //depot/projects/e500/contrib/expat/doc/xmlwf.sgml#2 integrate .. //depot/projects/e500/contrib/expat/examples/elements.c#2 integrate .. //depot/projects/e500/contrib/expat/examples/outline.c#2 integrate .. //depot/projects/e500/contrib/expat/expat_config.h.in#2 integrate .. //depot/projects/e500/contrib/expat/lib/ascii.h#2 integrate .. //depot/projects/e500/contrib/expat/lib/expat.h#2 integrate .. //depot/projects/e500/contrib/expat/lib/expat_external.h#1 branch .. //depot/projects/e500/contrib/expat/lib/internal.h#2 integrate .. //depot/projects/e500/contrib/expat/lib/winconfig.h#2 integrate .. //depot/projects/e500/contrib/expat/lib/xmlparse.c#2 integrate .. //depot/projects/e500/contrib/expat/lib/xmlrole.c#2 integrate .. //depot/projects/e500/contrib/expat/lib/xmlrole.h#2 integrate .. //depot/projects/e500/contrib/expat/lib/xmltok.c#2 integrate .. //depot/projects/e500/contrib/expat/lib/xmltok.h#2 integrate .. //depot/projects/e500/contrib/expat/lib/xmltok_impl.c#2 integrate .. //depot/projects/e500/contrib/expat/lib/xmltok_ns.c#2 integrate .. //depot/projects/e500/contrib/expat/tests/README.txt#2 integrate .. //depot/projects/e500/contrib/expat/tests/benchmark/README.txt#1 branch .. //depot/projects/e500/contrib/expat/tests/benchmark/benchmark.c#1 branch .. //depot/projects/e500/contrib/expat/tests/benchmark/benchmark.dsp#1 branch .. //depot/projects/e500/contrib/expat/tests/benchmark/benchmark.dsw#1 branch .. //depot/projects/e500/contrib/expat/tests/chardata.c#2 integrate .. //depot/projects/e500/contrib/expat/tests/chardata.h#2 integrate .. //depot/projects/e500/contrib/expat/tests/minicheck.c#1 branch .. //depot/projects/e500/contrib/expat/tests/minicheck.h#1 branch .. //depot/projects/e500/contrib/expat/tests/runtests.c#2 integrate .. //depot/projects/e500/contrib/expat/tests/runtestspp.cpp#1 branch .. //depot/projects/e500/contrib/expat/tests/xmltest.sh#2 integrate .. //depot/projects/e500/contrib/expat/xmlwf/codepage.c#2 integrate .. //depot/projects/e500/contrib/expat/xmlwf/readfilemap.c#2 integrate .. //depot/projects/e500/contrib/expat/xmlwf/unixfilemap.c#2 integrate .. //depot/projects/e500/contrib/expat/xmlwf/xmlfile.c#2 integrate .. //depot/projects/e500/contrib/expat/xmlwf/xmlfile.h#2 integrate .. //depot/projects/e500/contrib/expat/xmlwf/xmlwf.c#2 integrate .. //depot/projects/e500/contrib/gcc/common.opt#3 integrate .. //depot/projects/e500/contrib/gcc/config/arm/arm.h#3 integrate .. //depot/projects/e500/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/e500/contrib/gcc/config/freebsd.h#3 integrate .. //depot/projects/e500/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/e500/contrib/gcc/config/i386/freebsd64.h#3 integrate .. //depot/projects/e500/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/e500/contrib/gcc/doc/invoke.texi#3 integrate .. //depot/projects/e500/contrib/gdtoa/README#2 integrate .. //depot/projects/e500/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/e500/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/e500/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/e500/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/e500/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/e500/contrib/gdtoa/strtod.c#3 integrate .. //depot/projects/e500/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/e500/contrib/gdtoa/strtof.c#3 integrate .. //depot/projects/e500/contrib/gdtoa/test/README#2 integrate .. //depot/projects/e500/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/e500/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/e500/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/e500/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/e500/contrib/ipfilter/ip_fil.c#4 integrate .. //depot/projects/e500/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/e500/contrib/ipfilter/ipsend/sock.c#4 integrate .. //depot/projects/e500/contrib/ipfilter/lib/printnat.c#4 integrate .. //depot/projects/e500/contrib/ipfilter/test/regress/n12#2 integrate .. //depot/projects/e500/contrib/ipfilter/test/regress/n2#2 integrate .. //depot/projects/e500/contrib/ipfilter/test/regress/n5#2 integrate .. //depot/projects/e500/contrib/ipfilter/test/regress/ni1.nat#3 integrate .. //depot/projects/e500/contrib/ipfilter/test/regress/ni2.nat#2 integrate .. //depot/projects/e500/contrib/ipfilter/test/regress/ni4.nat#2 integrate .. //depot/projects/e500/contrib/ipfilter/tools/ipnat_y.y#4 integrate .. //depot/projects/e500/contrib/libpcap/pcap-bpf.c#3 integrate .. //depot/projects/e500/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/e500/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/e500/contrib/ncurses/FREEBSD-upgrade#4 integrate .. //depot/projects/e500/contrib/ncurses/FREEBSD-vendor#2 integrate .. //depot/projects/e500/contrib/ncurses/INSTALL#3 integrate .. //depot/projects/e500/contrib/ncurses/NEWS#4 integrate .. //depot/projects/e500/contrib/ncurses/aclocal.m4#3 integrate .. //depot/projects/e500/contrib/ncurses/config.guess#3 integrate .. //depot/projects/e500/contrib/ncurses/config.sub#3 integrate .. //depot/projects/e500/contrib/ncurses/configure#3 integrate .. //depot/projects/e500/contrib/ncurses/configure.in#3 integrate .. //depot/projects/e500/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/e500/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/e500/contrib/ncurses/man/curs_threads.3x#2 integrate .. //depot/projects/e500/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/e500/contrib/ncurses/man/terminfo.tail#3 integrate .. //depot/projects/e500/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_addch.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_delwin.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_freeall.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_initscr.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_overlay.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_restart.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_ungetch.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/lib_window.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/use_window.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/base/wresize.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/curses.priv.h#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/fifo_defs.h#2 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tinfo/init_keytry.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tinfo/lib_data.c#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tinfo/lib_options.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/trace/lib_trace.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tty/lib_tstp.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tty/lib_twait.c#3 integrate .. //depot/projects/e500/contrib/ncurses/ncurses/tty/tty_update.c#3 integrate .. //depot/projects/e500/contrib/ncurses/progs/dump_entry.c#3 integrate .. //depot/projects/e500/contrib/netcat/nc.1#3 integrate .. //depot/projects/e500/contrib/netcat/netcat.c#4 integrate .. //depot/projects/e500/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/e500/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/e500/contrib/ntp/ChangeLog-4.1.0#2 delete .. //depot/projects/e500/contrib/ntp/CommitLog#1 branch .. //depot/projects/e500/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/e500/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/e500/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/e500/contrib/ntp/INSTALL#2 integrate .. //depot/projects/e500/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/NEWS#2 integrate .. //depot/projects/e500/contrib/ntp/README#2 integrate .. //depot/projects/e500/contrib/ntp/README.bk#2 integrate .. //depot/projects/e500/contrib/ntp/README.patches#2 integrate .. //depot/projects/e500/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/e500/contrib/ntp/README.versions#2 integrate .. //depot/projects/e500/contrib/ntp/TODO#2 integrate .. //depot/projects/e500/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/e500/contrib/ntp/acinclude.m4#2 delete .. //depot/projects/e500/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/e500/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/e500/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/e500/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/e500/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/e500/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/e500/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/e500/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/e500/contrib/ntp/bootstrap#1 branch .. //depot/projects/e500/contrib/ntp/build#2 integrate .. //depot/projects/e500/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/e500/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/e500/contrib/ntp/compile#2 integrate .. //depot/projects/e500/contrib/ntp/config.guess#2 integrate .. //depot/projects/e500/contrib/ntp/config.h.in#2 integrate .. //depot/projects/e500/contrib/ntp/config.sub#2 integrate .. //depot/projects/e500/contrib/ntp/configure#2 integrate .. //depot/projects/e500/contrib/ntp/configure.ac#1 branch .. //depot/projects/e500/contrib/ntp/configure.in#2 delete .. //depot/projects/e500/contrib/ntp/depcomp#2 integrate .. //depot/projects/e500/contrib/ntp/flock-build#2 integrate .. //depot/projects/e500/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/build.html#2 delete .. //depot/projects/e500/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/e500/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/config.html#2 delete .. //depot/projects/e500/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/e500/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/e500/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/e500/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/e500/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/e500/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/e500/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/e500/contrib/ntp/html/groups.html#1 branch .. //depot/projects/e500/contrib/ntp/html/hints.html#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/solaris-dosynctodr.html#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/solaris.html#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/vxworks.html#2 delete .. //depot/projects/e500/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/e500/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/index.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/e500/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/e500/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/patches.html#2 delete .. //depot/projects/e500/contrib/ntp/html/porting.html#2 delete .. //depot/projects/e500/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/quick.html#2 delete .. //depot/projects/e500/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/release.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/e500/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/e500/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/e500/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/e500/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/e500/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/e500/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/e500/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/e500/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/e500/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/e500/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/e500/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/e500/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/e500/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/e500/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/e500/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/e500/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/e500/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/e500/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/e500/contrib/ntp/include/version.def#1 branch .. //depot/projects/e500/contrib/ntp/install-sh#2 integrate .. //depot/projects/e500/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/e500/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/e500/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/e500/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/e500/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/e500/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/e500/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/e500/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/e500/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/e500/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/e500/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/e500/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/e500/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/e500/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/binio.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/ieee754io.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/log.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/e500/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/e500/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/e500/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/e500/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/e500/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/e500/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/e500/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/e500/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/e500/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/e500/contrib/ntp/libopts/README#1 branch .. //depot/projects/e500/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/e500/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/e500/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/e500/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/e500/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/e500/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/e500/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/e500/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/e500/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/e500/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/e500/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/e500/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/README#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/e500/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/e500/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/e500/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/e500/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/e500/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/e500/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/e500/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/e500/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/e500/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/e500/contrib/ntp/missing#2 integrate .. //depot/projects/e500/contrib/ntp/mkinstalldirs#2 delete .. //depot/projects/e500/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/e500/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/e500/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/e500/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_usno.c#2 delete .. //depot/projects/e500/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/e500/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/e500/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/e500/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/e500/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/e500/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/e500/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/e500/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/e500/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/e500/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/e500/contrib/ntp/ntpq/ntpq_ops.c#2 delete .. //depot/projects/e500/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/e500/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/e500/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/e500/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/e500/contrib/ntp/scripts/genver#1 branch .. //depot/projects/e500/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/e500/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/e500/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/e500/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/e500/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/e500/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/README#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/e500/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/e500/contrib/ntp/sntp/compile#1 branch .. //depot/projects/e500/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/e500/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/e500/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/e500/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/e500/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/e500/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/e500/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/e500/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/e500/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/e500/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/e500/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/e500/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/e500/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/e500/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/e500/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/e500/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/e500/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/e500/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/e500/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/e500/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/e500/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/e500/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/e500/contrib/ntp/util/ntp-keygen.1#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:57:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E2591065672; Fri, 24 Oct 2008 19:57: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 01CA91065670 for ; Fri, 24 Oct 2008 19:57:48 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E415D8FC1C for ; Fri, 24 Oct 2008 19:57:47 +0000 (UTC) (envelope-from marcel@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 m9OJvlA4092298 for ; Fri, 24 Oct 2008 19:57:47 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJvlND092296 for perforce@freebsd.org; Fri, 24 Oct 2008 19:57:47 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:57:47 GMT Message-Id: <200810241957.m9OJvlND092296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151871 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, 24 Oct 2008 19:57:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=151871 Change 151871 by marcel@marcel_jnpr on 2008/10/24 19:57:33 Previous merge fodder caused by me not paying attention. -i was needed... Affected files ... .. //depot/projects/powerpc/share/man/man4/man4.i386/sbni.4#3 integrate .. //depot/projects/powerpc/sys/dev/sbni/if_sbni.c#5 integrate .. //depot/projects/powerpc/sys/dev/sbni/if_sbni_isa.c#5 integrate .. //depot/projects/powerpc/sys/dev/sbni/if_sbni_pci.c#5 integrate .. //depot/projects/powerpc/sys/dev/sbni/if_sbnireg.h#4 integrate .. //depot/projects/powerpc/sys/dev/sbni/if_sbnivar.h#4 integrate .. //depot/projects/powerpc/sys/modules/sbni/Makefile#3 integrate Differences ... ==== //depot/projects/powerpc/share/man/man4/man4.i386/sbni.4#3 (text+ko) ==== ==== //depot/projects/powerpc/sys/dev/sbni/if_sbni.c#5 (text+ko) ==== ==== //depot/projects/powerpc/sys/dev/sbni/if_sbni_isa.c#5 (text+ko) ==== ==== //depot/projects/powerpc/sys/dev/sbni/if_sbni_pci.c#5 (text+ko) ==== ==== //depot/projects/powerpc/sys/dev/sbni/if_sbnireg.h#4 (text+ko) ==== ==== //depot/projects/powerpc/sys/dev/sbni/if_sbnivar.h#4 (text+ko) ==== ==== //depot/projects/powerpc/sys/modules/sbni/Makefile#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Oct 24 19:59:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C64321065685; Fri, 24 Oct 2008 19:59: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 8A02C106567B for ; Fri, 24 Oct 2008 19:59:51 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EDF18FC1D for ; Fri, 24 Oct 2008 19:59:51 +0000 (UTC) (envelope-from marcel@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 m9OJxnQb092425 for ; Fri, 24 Oct 2008 19:59:49 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OJxn6d092423 for perforce@freebsd.org; Fri, 24 Oct 2008 19:59:49 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 19:59:49 GMT Message-Id: <200810241959.m9OJxn6d092423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151872 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, 24 Oct 2008 19:59:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=151872 Change 151872 by marcel@marcel_jnpr on 2008/10/24 19:59:48 Merge fodder. Affected files ... .. //depot/projects/e500/share/man/man4/man4.i386/sbni.4#3 edit Differences ... ==== //depot/projects/e500/share/man/man4/man4.i386/sbni.4#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/sbni.4,v 1.2 2003/05/29 21:28:36 ru Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/sbni.4,v 1.4 2008/09/10 18:36:58 jhb Exp $ .\" .Dd January 8, 2002 .Dt SBNI 4 i386 From owner-p4-projects@FreeBSD.ORG Fri Oct 24 20:01:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA96D1065699; Fri, 24 Oct 2008 20:01: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 4A4161065674 for ; Fri, 24 Oct 2008 20:01:52 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3730C8FC14 for ; Fri, 24 Oct 2008 20:01:52 +0000 (UTC) (envelope-from marcel@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 m9OK1qQi092637 for ; Fri, 24 Oct 2008 20:01:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OK1qXt092635 for perforce@freebsd.org; Fri, 24 Oct 2008 20:01:52 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 20:01:52 GMT Message-Id: <200810242001.m9OK1qXt092635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151873 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, 24 Oct 2008 20:01:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=151873 Change 151873 by marcel@marcel_jnpr on 2008/10/24 20:01:45 More merge fodder (and more deja vu). Affected files ... .. //depot/projects/e500/sys/dev/sbni/if_sbni.c#4 edit .. //depot/projects/e500/sys/dev/sbni/if_sbni_isa.c#3 edit .. //depot/projects/e500/sys/dev/sbni/if_sbni_pci.c#3 edit .. //depot/projects/e500/sys/dev/sbni/if_sbnireg.h#3 edit .. //depot/projects/e500/sys/dev/sbni/if_sbnivar.h#3 edit Differences ... ==== //depot/projects/e500/sys/dev/sbni/if_sbni.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.24 2007/07/05 07:46:33 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.28 2008/09/10 18:42:19 jhb Exp $"); /* * Device driver for Granch SBNI12 leased line adapters @@ -62,6 +62,7 @@ #include +#include #include #include #include @@ -86,12 +87,11 @@ #include #include -#define ASM_CRC 1 - static void sbni_init(void *); +static void sbni_init_locked(struct sbni_softc *); static void sbni_start(struct ifnet *); +static void sbni_start_locked(struct ifnet *); static int sbni_ioctl(struct ifnet *, u_long, caddr_t); -static void sbni_watchdog(struct ifnet *); static void sbni_stop(struct sbni_softc *); static void handle_channel(struct sbni_softc *); @@ -125,11 +125,11 @@ static u_int32_t crc32tab[]; #ifdef SBNI_DUAL_COMPOUND -struct sbni_softc *sbni_headlist; +static struct mtx headlist_lock; +MTX_SYSINIT(headlist_lock, &headlist_lock, "sbni headlist", MTX_DEF); +static struct sbni_softc *sbni_headlist; #endif -u_int32_t next_sbni_unit; - /* -------------------------------------------------------------------------- */ static __inline u_char @@ -217,7 +217,7 @@ /* * Install interface into kernel networking data structures */ -void +int sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags) { struct ifnet *ifp; @@ -225,27 +225,27 @@ ifp = sc->ifp = if_alloc(IFT_ETHER); if (ifp == NULL) - panic("sbni%d: can not if_alloc()", unit); + return (ENOMEM); sbni_outb(sc, CSR0, 0); set_initial_values(sc, flags); - callout_handle_init(&sc->wch); /* Initialize ifnet structure */ ifp->if_softc = sc; if_initname(ifp, "sbni", unit); ifp->if_init = sbni_init; ifp->if_start = sbni_start; ifp->if_ioctl = sbni_ioctl; - ifp->if_watchdog = sbni_watchdog; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); /* report real baud rate */ csr0 = sbni_inb(sc, CSR0); ifp->if_baudrate = (csr0 & 0x01 ? 500000 : 2000000) / (1 << flags.rate); - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | - IFF_NEEDSGIANT; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + + mtx_init(&sc->lock, ifp->if_xname, MTX_NETWORK_LOCK, MTX_DEF); + callout_init_mtx(&sc->wch, &sc->lock, 0); ether_ifattach(ifp, sc->enaddr); /* device attach does transition from UNCONFIGURED to IDLE state */ @@ -254,18 +254,54 @@ printf("auto\n"); else printf("%d (fixed)\n", sc->cur_rxl_index); + return (0); +} + +void +sbni_detach(struct sbni_softc *sc) +{ + + SBNI_LOCK(sc); + sbni_stop(sc); + SBNI_UNLOCK(sc); + callout_drain(&sc->wch); + ether_ifdetach(sc->ifp); + if (sc->irq_handle) + bus_teardown_intr(sc->dev, sc->irq_res, sc->irq_handle); + mtx_destroy(&sc->lock); + if_free(sc->ifp); } +void +sbni_release_resources(struct sbni_softc *sc) +{ + + if (sc->irq_res) + bus_release_resource(sc->dev, SYS_RES_IRQ, sc->irq_rid, + sc->irq_res); + if (sc->io_res && sc->io_off == 0) + bus_release_resource(sc->dev, SYS_RES_IOPORT, sc->io_rid, + sc->io_res); +} + /* -------------------------------------------------------------------------- */ static void sbni_init(void *xsc) { struct sbni_softc *sc; + + sc = (struct sbni_softc *)xsc; + SBNI_LOCK(sc); + sbni_init_locked(sc); + SBNI_UNLOCK(sc); +} + +static void +sbni_init_locked(struct sbni_softc *sc) +{ struct ifnet *ifp; - int s; - sc = (struct sbni_softc *)xsc; ifp = sc->ifp; /* @@ -275,24 +311,31 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) return; - s = splimp(); - ifp->if_timer = 0; card_start(sc); - sc->wch = timeout(sbni_timeout, sc, hz/SBNI_HZ); + callout_reset(&sc->wch, hz/SBNI_HZ, sbni_timeout, sc); ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; /* attempt to start output */ - sbni_start(ifp); - splx(s); + sbni_start_locked(ifp); } +static void +sbni_start(struct ifnet *ifp) +{ + struct sbni_softc *sc = ifp->if_softc; + SBNI_LOCK(sc); + sbni_start_locked(ifp); + SBNI_UNLOCK(sc); +} + static void -sbni_start(struct ifnet *ifp) +sbni_start_locked(struct ifnet *ifp) { struct sbni_softc *sc = ifp->if_softc; + if (sc->tx_frameno == 0) prepare_to_send(sc); } @@ -309,8 +352,8 @@ sc->rx_buf_p = NULL; } - untimeout(sbni_timeout, sc, sc->wch); - sc->wch.callout = NULL; + callout_stop(&sc->wch); + sc->ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); } /* -------------------------------------------------------------------------- */ @@ -340,14 +383,20 @@ do { repeat = 0; + SBNI_LOCK(sc); if (sbni_inb(sc, CSR0) & (RC_RDY | TR_RDY)) { handle_channel(sc); repeat = 1; } - if (sc->slave_sc && /* second channel present */ - (sbni_inb(sc->slave_sc, CSR0) & (RC_RDY | TR_RDY))) { - handle_channel(sc->slave_sc); - repeat = 1; + SBNI_UNLOCK(sc); + if (sc->slave_sc) { + /* second channel present */ + SBNI_LOCK(sc->slave_sc); + if (sbni_inb(sc->slave_sc, CSR0) & (RC_RDY | TR_RDY)) { + handle_channel(sc->slave_sc); + repeat = 1; + } + SBNI_UNLOCK(sc->slave_sc); } } while (repeat); } @@ -378,7 +427,7 @@ */ csr0 = sbni_inb(sc, CSR0); if ((csr0 & TR_RDY) == 0 || (csr0 & RC_RDY) != 0) - printf("sbni: internal error!\n"); + if_printf(sc->ifp, "internal error!\n"); /* if state & FL_NEED_RESEND != 0 then tx_frameno != 0 */ if (req_ans || sc->tx_frameno != 0) @@ -856,9 +905,11 @@ m = sc->rx_buf_p; m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = sc->inppos; + sc->rx_buf_p = NULL; + SBNI_UNLOCK(sc); (*ifp->if_input)(ifp, m); - sc->rx_buf_p = NULL; + SBNI_LOCK(sc); } /* -------------------------------------------------------------------------- */ @@ -872,11 +923,10 @@ sbni_timeout(void *xsc) { struct sbni_softc *sc; - int s; u_char csr0; sc = (struct sbni_softc *)xsc; - s = splimp(); + SBNI_ASSERT_LOCKED(sc); csr0 = sbni_inb(sc, CSR0); if (csr0 & RC_CHK) { @@ -895,9 +945,8 @@ } } - sbni_outb(sc, CSR0, csr0 | RC_CHK); - sc->wch = timeout(sbni_timeout, sc, hz/SBNI_HZ); - splx(s); + sbni_outb(sc, CSR0, csr0 | RC_CHK); + callout_reset(&sc->wch, hz/SBNI_HZ, sbni_timeout, sc); } /* -------------------------------------------------------------------------- */ @@ -918,19 +967,6 @@ /* -------------------------------------------------------------------------- */ -/* - * Device timeout/watchdog routine. Entered if the device neglects to - * generate an interrupt after a transmit has been started on it. - */ - -static void -sbni_watchdog(struct ifnet *ifp) -{ - log(LOG_ERR, "%s: device timeout\n", ifp->if_xname); - ifp->if_oerrors++; -} - - static u_char rxl_tab[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x08, 0x0a, 0x0c, 0x0f, 0x16, 0x18, 0x1a, 0x1c, 0x1f @@ -971,12 +1007,22 @@ #ifdef SBNI_DUAL_COMPOUND +void +sbni_add(struct sbni_softc *sc) +{ + + mtx_lock(&headlist_lock); + sc->link = sbni_headlist; + sbni_headlist = sc; + mtx_unlock(&headlist_lock); +} struct sbni_softc * connect_to_master(struct sbni_softc *sc) { struct sbni_softc *p, *p_prev; + mtx_lock(&headlist_lock); for (p = sbni_headlist, p_prev = NULL; p; p_prev = p, p = p->link) { if (rman_get_start(p->io_res) == rman_get_start(sc->io_res) + 4 || rman_get_start(p->io_res) == rman_get_start(sc->io_res) - 4) { @@ -985,9 +1031,11 @@ p_prev->link = p->link; else sbni_headlist = p->link; + mtx_unlock(&headlist_lock); return p; } } + mtx_unlock(&headlist_lock); return (NULL); } @@ -1049,30 +1097,29 @@ struct thread *td; struct sbni_in_stats *in_stats; struct sbni_flags flags; - int error, s; + int error; sc = ifp->if_softc; ifr = (struct ifreq *)data; td = curthread; error = 0; - s = splimp(); - switch (command) { case SIOCSIFFLAGS: /* * If the interface is marked up and stopped, then start it. * If it is marked down and running, then stop it. */ + SBNI_LOCK(sc); if (ifp->if_flags & IFF_UP) { if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - sbni_init(sc); + sbni_init_locked(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { sbni_stop(sc); - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; } } + SBNI_UNLOCK(sc); break; case SIOCADDMULTI: @@ -1086,29 +1133,29 @@ error = EAFNOSUPPORT; */ break; - case SIOCSIFMTU: - if (ifr->ifr_mtu > ETHERMTU) - error = EINVAL; - else - ifp->if_mtu = ifr->ifr_mtu; - break; - /* * SBNI specific ioctl */ case SIOCGHWFLAGS: /* get flags */ + SBNI_LOCK(sc); bcopy((caddr_t)IF_LLADDR(sc->ifp)+3, (caddr_t) &flags, 3); flags.rxl = sc->cur_rxl_index; flags.rate = sc->csr1.rate; flags.fixed_rxl = (sc->delta_rxl == 0); flags.fixed_rate = 1; + SBNI_UNLOCK(sc); ifr->ifr_data = *(caddr_t*) &flags; break; case SIOCGINSTATS: - in_stats = (struct sbni_in_stats *)ifr->ifr_data; - bcopy((void *)(&(sc->in_stats)), (void *)in_stats, - sizeof(struct sbni_in_stats)); + in_stats = malloc(sizeof(struct sbni_in_stats), M_DEVBUF, + M_WAITOK); + SBNI_LOCK(sc); + bcopy(&sc->in_stats, in_stats, sizeof(struct sbni_in_stats)); + SBNI_UNLOCK(sc); + error = copyout(ifr->ifr_data, in_stats, + sizeof(struct sbni_in_stats)); + free(in_stats, M_DEVBUF); break; case SIOCSHWFLAGS: /* set flags */ @@ -1117,6 +1164,7 @@ if (error) break; flags = *(struct sbni_flags*)&ifr->ifr_data; + SBNI_LOCK(sc); if (flags.fixed_rxl) { sc->delta_rxl = 0; sc->cur_rxl_index = flags.rxl; @@ -1132,11 +1180,14 @@ /* Don't be afraid... */ sbni_outb(sc, CSR1, *(char*)(&sc->csr1) | PR_RES); + SBNI_UNLOCK(sc); break; case SIOCRINSTATS: + SBNI_LOCK(sc); if (!(error = priv_check(td, PRIV_DRIVER))) /* root only */ bzero(&sc->in_stats, sizeof(struct sbni_in_stats)); + SBNI_UNLOCK(sc); break; default: @@ -1144,106 +1195,20 @@ break; } - splx(s); return (error); } /* -------------------------------------------------------------------------- */ -#ifdef ASM_CRC - static u_int32_t calc_crc32(u_int32_t crc, caddr_t p, u_int len) { - register u_int32_t _crc __asm ("ax"); - _crc = crc; - - __asm __volatile ( - "xorl %%ebx, %%ebx\n" - "movl %1, %%esi\n" - "movl %2, %%ecx\n" - "movl $crc32tab, %%edi\n" - "shrl $2, %%ecx\n" - "jz 1f\n" - - ".align 4\n" - "0:\n" - "movb %%al, %%bl\n" - "movl (%%esi), %%edx\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "shrl $8, %%edx\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "shrl $8, %%edx\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "movb %%dh, %%dl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb %%dl, %%bl\n" - "addl $4, %%esi\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "decl %%ecx\n" - "jnz 0b\n" - - "1:\n" - "movl %2, %%ecx\n" - "andl $3, %%ecx\n" - "jz 2f\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb (%%esi), %%bl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "decl %%ecx\n" - "jz 2f\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb 1(%%esi), %%bl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - - "decl %%ecx\n" - "jz 2f\n" - - "movb %%al, %%bl\n" - "shrl $8, %%eax\n" - "xorb 2(%%esi), %%bl\n" - "xorl (%%edi,%%ebx,4), %%eax\n" - "2:\n" - : "=a" (_crc) - : "g" (p), "g" (len) - : "bx", "cx", "dx", "si", "di" - ); - - return (_crc); -} - -#else /* ASM_CRC */ - -static u_int32_t -calc_crc32(u_int32_t crc, caddr_t p, u_int len) -{ while (len--) crc = CRC32(*p++, crc); return (crc); } -#endif /* ASM_CRC */ - - static u_int32_t crc32tab[] __aligned(8) = { 0xD202EF8D, 0xA505DF1B, 0x3C0C8EA1, 0x4B0BBE37, 0xD56F2B94, 0xA2681B02, 0x3B614AB8, 0x4C667A2E, ==== //depot/projects/e500/sys/dev/sbni/if_sbni_isa.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.15 2007/02/23 12:18:53 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.18 2008/09/10 18:36:58 jhb Exp $"); #include @@ -85,7 +85,6 @@ return (error); sc = device_get_softc(dev); - bzero(sc, sizeof(struct sbni_softc)); sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->io_rid, 0ul, ~0ul, SBNI_PORTS, RF_ACTIVE); @@ -95,12 +94,11 @@ } if (sbni_probe(sc) != 0) { - bus_release_resource(dev, SYS_RES_IOPORT, - sc->io_rid, sc->io_res); + sbni_release_resources(sc); return (ENXIO); } - device_quiet(dev); + device_set_desc(dev, "Granch SBNI12/ISA adapter"); return (0); } @@ -113,50 +111,32 @@ int error; sc = device_get_softc(dev); + sc->dev = dev; - printf("sbni%d: port 0x%lx", - next_sbni_unit, rman_get_start(sc->io_res)); sc->irq_res = bus_alloc_resource_any( dev, SYS_RES_IRQ, &sc->irq_rid, RF_ACTIVE); - if (sc->irq_res) { - printf(" irq %ld\n", rman_get_start(sc->irq_res)); - error = bus_setup_intr( - dev, sc->irq_res, INTR_TYPE_NET, - NULL, sbni_intr, sc, &sc->irq_handle); - if (error) { - printf("sbni%d: bus_setup_intr\n", next_sbni_unit); - bus_release_resource( - dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); - bus_release_resource( - dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); - return (error); - } - #ifndef SBNI_DUAL_COMPOUND - } else { - printf("\nsbni%d: irq conflict!\n", next_sbni_unit); - bus_release_resource(dev, SYS_RES_IOPORT, - sc->io_rid, sc->io_res); + if (sc->irq_res == NULL) { + device_printf(dev, "irq conflict!\n"); + sbni_release_resources(sc); return (ENOENT); } #else /* SBNI_DUAL_COMPOUND */ - sc->link = sbni_headlist; - sbni_headlist = sc; + if (sc->irq_res) { + sbni_add(sc); } else { struct sbni_softc *master; if ((master = connect_to_master(sc)) == 0) { - printf("\nsbni%d: failed to alloc irq\n", - next_sbni_unit); - bus_release_resource( - dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); + device_printf(dev, "failed to alloc irq\n"); + sbni_release_resources(sc); return (ENXIO); } else { - printf(" shared irq with %s\n", + device_printf(dev, "shared irq with %s\n", master->ifp->if_xname); } } @@ -164,6 +144,24 @@ *(u_int32_t*)&flags = device_get_flags(dev); - sbni_attach(sc, next_sbni_unit++, flags); + error = sbni_attach(sc, device_get_unit(dev) * 2, flags); + if (error) { + device_printf(dev, "cannot initialize driver\n"); + sbni_release_resources(sc); + return (error); + } + + if (sc->irq_res) { + error = bus_setup_intr( + dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, + NULL, sbni_intr, sc, &sc->irq_handle); + if (error) { + device_printf(dev, "bus_setup_intr\n"); + sbni_detach(sc); + sbni_release_resources(sc); + return (error); + } + } + return (0); } ==== //depot/projects/e500/sys/dev/sbni/if_sbni_pci.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.12 2007/02/23 12:18:53 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.15 2008/09/10 18:36:58 jhb Exp $"); #include #include @@ -51,11 +51,13 @@ static int sbni_pci_probe(device_t); static int sbni_pci_attach(device_t); +static int sbni_pci_detach(device_t); static device_method_t sbni_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, sbni_pci_probe), DEVMETHOD(device_attach, sbni_pci_attach), + DEVMETHOD(device_detach, sbni_pci_detach), { 0, 0 } }; @@ -75,14 +77,13 @@ { struct sbni_softc *sc; u_int32_t ports; - + ports = SBNI_PORTS; if (pci_get_vendor(dev) != SBNI_PCI_VENDOR || pci_get_device(dev) != SBNI_PCI_DEVICE) return (ENXIO); sc = device_get_softc(dev); - bzero(sc, sizeof(struct sbni_softc)); if (pci_get_subdevice(dev) == 2) { ports <<= 1; sc->slave_sc = malloc(sizeof(struct sbni_softc), @@ -97,7 +98,7 @@ sc->io_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &sc->io_rid, 0ul, ~0ul, ports, RF_ACTIVE); if (!sc->io_res) { - printf("sbni: cannot allocate io ports!\n"); + device_printf(dev, "cannot allocate io ports!\n"); if (sc->slave_sc) free(sc->slave_sc, M_DEVBUF); return (ENOENT); @@ -108,14 +109,12 @@ sc->slave_sc->io_off = 4; } if (sbni_probe(sc) != 0) { - bus_release_resource(dev, SYS_RES_IOPORT, - sc->io_rid, sc->io_res); + sbni_release_resources(sc); if (sc->slave_sc) free(sc->slave_sc, M_DEVBUF); return (ENXIO); } - device_quiet(dev); return (0); } @@ -127,41 +126,66 @@ int error; sc = device_get_softc(dev); + sc->dev = dev; - printf("sbni%d: port 0x%lx", - next_sbni_unit, sc->slave_sc ? " Dual " : " ", - rman_get_start(sc->io_res)); sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irq_rid, RF_SHAREABLE); - if (sc->irq_res) { - printf(" irq %ld\n", rman_get_start(sc->irq_res)); - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, - NULL, sbni_intr, sc, &sc->irq_handle); - if (error) { - printf("sbni%d: bus_setup_intr\n", next_sbni_unit); - goto attach_failed; - } - } else { - printf("\nsbni%d: cannot claim irq!\n", next_sbni_unit); + if (sc->irq_res == NULL) { + device_printf(dev, "cannot claim irq!\n"); error = ENOENT; goto attach_failed; } *(u_int32_t*)&flags = 0; - sbni_attach(sc, next_sbni_unit++, flags); - if (sc->slave_sc) - sbni_attach(sc->slave_sc, next_sbni_unit++, flags); + error = sbni_attach(sc, device_get_unit(dev) * 2, flags); + if (error) { + device_printf(dev, "cannot initialize driver\n"); + goto attach_failed; + } + if (sc->slave_sc) { + error = sbni_attach(sc->slave_sc, device_get_unit(dev) * 2 + 1, + flags); + if (error) { + device_printf(dev, "cannot initialize slave\n"); + sbni_detach(sc); + goto attach_failed; + } + } + + if (sc->irq_res) { + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | + INTR_MPSAFE, NULL, sbni_intr, sc, &sc->irq_handle); + if (error) { + device_printf(dev, "bus_setup_intr\n"); + sbni_detach(sc); + if (sc->slave_sc) + sbni_detach(sc); + goto attach_failed; + } + } return (0); attach_failed: - bus_release_resource(dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); - if (sc->irq_res) { - bus_release_resource( - dev, SYS_RES_IRQ, sc->irq_rid, sc->irq_res); - } + sbni_release_resources(sc); if (sc->slave_sc) free(sc->slave_sc, M_DEVBUF); return (error); } + +static int +sbni_pci_detach(device_t dev) +{ + struct sbni_softc *sc; + + sc = device_get_softc(dev); + sbni_detach(sc); + if (sc->slave_sc) + sbni_detach(sc); + + sbni_release_resources(sc); + if (sc->slave_sc) + free(sc->slave_sc, M_DEVBUF); + return (0); +} ==== //depot/projects/e500/sys/dev/sbni/if_sbnireg.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sbni/if_sbnireg.h,v 1.2 2005/01/06 01:43:12 imp Exp $ + * $FreeBSD: src/sys/dev/sbni/if_sbnireg.h,v 1.4 2008/09/10 18:36:58 jhb Exp $ */ /* ==== //depot/projects/e500/sys/dev/sbni/if_sbnivar.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sbni/if_sbnivar.h,v 1.5 2005/06/10 16:49:14 brooks Exp $ + * $FreeBSD: src/sys/dev/sbni/if_sbnivar.h,v 1.8 2008/09/10 18:36:58 jhb Exp $ */ /* @@ -68,6 +68,7 @@ struct sbni_softc { struct ifnet *ifp; + device_t dev; u_char enaddr[6]; int io_rid; @@ -111,7 +112,8 @@ struct sbni_csr1 csr1; /* current value of CSR1 */ struct sbni_in_stats in_stats; /* internal statistics */ - struct callout_handle wch; + struct callout wch; + struct mtx lock; struct sbni_softc *slave_sc; @@ -120,15 +122,20 @@ #endif }; +#define SBNI_LOCK(sc) mtx_lock(&(sc)->lock) +#define SBNI_UNLOCK(sc) mtx_unlock(&(sc)->lock) +#define SBNI_ASSERT_LOCKED(sc) mtx_assert(&(sc)->lock, MA_OWNED) + void sbni_intr(void *); int sbni_probe(struct sbni_softc *); -void sbni_attach(struct sbni_softc *, int, struct sbni_flags); +int sbni_attach(struct sbni_softc *, int, struct sbni_flags); +void sbni_detach(struct sbni_softc *); +void sbni_release_resources(struct sbni_softc *); extern u_int32_t next_sbni_unit; #ifdef SBNI_DUAL_COMPOUND -extern struct sbni_softc *sbni_headlist; - +void sbni_add(struct sbni_softc *); struct sbni_softc *connect_to_master(struct sbni_softc *); #endif #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Fri Oct 24 20:02:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6E2010656A4; Fri, 24 Oct 2008 20:02: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 8A749106569E for ; Fri, 24 Oct 2008 20:02:53 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5F5BC8FC1B for ; Fri, 24 Oct 2008 20:02:53 +0000 (UTC) (envelope-from marcel@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 m9OK2rRm092698 for ; Fri, 24 Oct 2008 20:02:53 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OK2rN2092696 for perforce@freebsd.org; Fri, 24 Oct 2008 20:02:53 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 20:02:53 GMT Message-Id: <200810242002.m9OK2rN2092696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151874 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, 24 Oct 2008 20:02:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=151874 Change 151874 by marcel@marcel_jnpr on 2008/10/24 20:02:47 Even more merge fodder (...) Affected files ... .. //depot/projects/e500/sys/modules/sbni/Makefile#3 edit Differences ... ==== //depot/projects/e500/sys/modules/sbni/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.1 2001/11/21 22:29:35 fjoe Exp $ +# $FreeBSD: src/sys/modules/sbni/Makefile,v 1.3 2008/09/10 18:36:58 jhb Exp $ .PATH: ${.CURDIR}/../../dev/sbni From owner-p4-projects@FreeBSD.ORG Fri Oct 24 20:27:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C091065676; Fri, 24 Oct 2008 20:27:18 +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 3B6AD106566B for ; Fri, 24 Oct 2008 20:27:18 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 29FAA8FC0A for ; Fri, 24 Oct 2008 20:27:18 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OKRI4Q095695 for ; Fri, 24 Oct 2008 20:27:18 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OKRI3T095693 for perforce@freebsd.org; Fri, 24 Oct 2008 20:27:18 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 20:27:18 GMT Message-Id: <200810242027.m9OKRI3T095693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151875 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, 24 Oct 2008 20:27:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=151875 Change 151875 by peter@peter_cheese on 2008/10/24 20:26:34 define xmm register struct format Affected files ... .. //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#2 edit Differences ... ==== //depot/projects/valgrind/include/vki/vki-x86-freebsd.h#2 (text+ko) ==== @@ -248,6 +248,22 @@ char pad[64]; }; +struct vki_user_fxsr_struct { + unsigned short cwd; + unsigned short swd; + unsigned short twd; + unsigned short fop; + long fip; + long fcs; + long foo; + long fos; + long mxcsr; + long reserved; + long st_space[32]; /* 8*16 bytes for each FP-reg = 128 bytes */ + long xmm_space[32]; /* 8*16 bytes for each XMM-reg = 128 bytes */ + long padding[56]; +}; + /* * This is the old layout of "struct pt_regs", and * is still the layout used by user mode. @@ -269,6 +285,7 @@ typedef vki_elf_greg_t vki_elf_gregset_t[VKI_ELF_NGREG]; typedef struct vki_user_i387_struct vki_elf_fpregset_t; +typedef struct vki_user_fxsr_struct vki_elf_fpxregset_t; #define VKI_AT_SYSINFO 32 From owner-p4-projects@FreeBSD.ORG Fri Oct 24 20:28:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A067B1065684; Fri, 24 Oct 2008 20:28: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 645FD1065681 for ; Fri, 24 Oct 2008 20:28:19 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52C508FC12 for ; Fri, 24 Oct 2008 20:28:19 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OKSJh5095757 for ; Fri, 24 Oct 2008 20:28:19 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OKSJAl095755 for perforce@freebsd.org; Fri, 24 Oct 2008 20:28:19 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 20:28:19 GMT Message-Id: <200810242028.m9OKSJAl095755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151876 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, 24 Oct 2008 20:28:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=151876 Change 151876 by peter@peter_cheese on 2008/10/24 20:27:20 Use identical linux versions of these files rather than having to keep syncing up at import time. Affected files ... .. //depot/projects/valgrind/coregrind/Makefile.am#6 edit .. //depot/projects/valgrind/coregrind/m_coredump/coredump-amd64-freebsd.c#3 delete .. //depot/projects/valgrind/coregrind/m_coredump/coredump-x86-freebsd.c#4 delete .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-amd64-freebsd.S#3 delete .. //depot/projects/valgrind/coregrind/m_dispatch/dispatch-x86-freebsd.S#3 delete Differences ... ==== //depot/projects/valgrind/coregrind/Makefile.am#6 (text+ko) ==== @@ -253,8 +253,8 @@ libcoregrind_x86_freebsd_a_SOURCES = \ $(COREGRIND_SOURCES_COMMON) \ $(COREGRIND_FREEBSD_SOURCE) \ - m_coredump/coredump-x86-freebsd.c \ - m_dispatch/dispatch-x86-freebsd.S \ + m_coredump/coredump-x86-linux.c \ + m_dispatch/dispatch-x86-linux.S \ m_sigframe/sigframe-x86-freebsd.c \ m_syswrap/syscall-x86-freebsd.S \ m_syswrap/syswrap-x86-freebsd.c @@ -266,8 +266,8 @@ libcoregrind_amd64_freebsd_a_SOURCES = \ $(COREGRIND_SOURCES_COMMON) \ $(COREGRIND_FREEBSD_SOURCE) \ - m_coredump/coredump-amd64-freebsd.c \ - m_dispatch/dispatch-amd64-freebsd.S \ + m_coredump/coredump-amd64-linux.c \ + m_dispatch/dispatch-amd64-linux.S \ m_sigframe/sigframe-amd64-freebsd.c \ m_syswrap/syscall-amd64-freebsd.S \ m_syswrap/syswrap-amd64-freebsd.c @@ -409,8 +409,6 @@ libreplacemalloc_toolpreload_ppc64_aix5_a_CFLAGS = $(AM_CFLAGS_PPC64_AIX5) -fpic -fno-omit-frame-pointer libreplacemalloc_toolpreload_ppc64_aix5_a_AR = $(AR) -X64 cru -m_dispatch/dispatch-x86-freebsd.S: libvex_guest_offsets.h -m_dispatch/dispatch-amd64-freebsd.S: libvex_guest_offsets.h m_syswrap/syscall-x86-freebsd.S: libvex_guest_offsets.h m_syswrap/syscall-amd64-freebsd.S: libvex_guest_offsets.h From owner-p4-projects@FreeBSD.ORG Fri Oct 24 20:28:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E7D21065732; Fri, 24 Oct 2008 20:28: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 8B64D1065682 for ; Fri, 24 Oct 2008 20:28:19 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7951F8FC18 for ; Fri, 24 Oct 2008 20:28:19 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OKSJD7095762 for ; Fri, 24 Oct 2008 20:28:19 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OKSJZA095760 for perforce@freebsd.org; Fri, 24 Oct 2008 20:28:19 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 20:28:19 GMT Message-Id: <200810242028.m9OKSJZA095760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151877 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, 24 Oct 2008 20:28:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=151877 Change 151877 by peter@peter_cheese on 2008/10/24 20:27:54 Fix some warnings Affected files ... .. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#4 edit .. //depot/projects/valgrind/coregrind/m_libcproc.c#5 edit .. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#4 edit .. //depot/projects/valgrind/coregrind/m_signals.c#6 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#6 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#4 (text+ko) ==== @@ -371,7 +371,7 @@ oid[0] = 0; /* magic */ oid[1] = 3; /* undocumented */ oidlen = sizeof(real_oid); - res = VG_(do_syscall6)(__NR___sysctl, (UWord)oid, 2, (UWord)real_oid, (UWord)&oidlen, (UWord)name, strlen(name)); + res = VG_(do_syscall6)(__NR___sysctl, (UWord)oid, 2, (UWord)real_oid, (UWord)&oidlen, (UWord)name, VG_(strlen)(name)); oidlen /= sizeof(int); if (!res.isError && oidlen > 0) { len = sizeof(sc); @@ -3045,11 +3045,10 @@ Int i, j, i_eol; Addr start, endPlusOne, gapStart; UChar* filename; - UChar rr, ww, xx, pp, ch, tmp; + UChar rr, ww, xx, ch, tmp; UInt prot; - UWord maj, min; ULong foffset, dev, ino; - UInt junk; + UWord junkW; ULong junk64; foffset = ino = 0; /* keep gcc-4.1.0 happy */ @@ -3087,7 +3086,7 @@ if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &junk); + j = readhex(&procmap_buf[i], &junkW); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; @@ -3111,7 +3110,7 @@ j = readchar(&procmap_buf[i], &ch); if (j == 1 && ch == ' ') i += j; else goto syntaxerror; - j = readhex(&procmap_buf[i], &junk); + j = readhex(&procmap_buf[i], &junkW); if (j > 0) i += j; else goto syntaxerror; j = readchar(&procmap_buf[i], &ch); ==== //depot/projects/valgrind/coregrind/m_libcproc.c#5 (text+ko) ==== @@ -666,7 +666,7 @@ oid[0] = 0; /* magic */ oid[1] = 3; /* undocumented */ oidlen = sizeof(real_oid); - error = VG_(sysctl)(oid, 2, real_oid, &oidlen, (void *)name, strlen(name)); + error = VG_(sysctl)(oid, 2, real_oid, &oidlen, (void *)name, VG_(strlen)(name)); if (error < 0) return error; oidlen /= sizeof(int); ==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#4 (text+ko) ==== @@ -409,7 +409,7 @@ static Bool extend ( ThreadState *tst, Addr addr, SizeT size ) { ThreadId tid = tst->tid; - NSegment *stackseg = NULL; + const NSegment *stackseg = NULL; if (VG_(extend_stack)(addr, tst->client_stack_szB)) { stackseg = VG_(am_find_nsegment)(addr); @@ -735,7 +735,7 @@ size = restore_rt_sigframe(tst, (struct rt_sigframe *)uc, &sigNo); else #endif - size = restore_sigframe(tst, (struct sigframe *)uc, &sigNo); + size = restore_sigframe(tst, uc, &sigNo); /* QQQ probably not right. linux sigreturn is strange. */ VG_TRACK( die_mem_stack_signal, esp - VG_STACK_REDZONE_SZB, ==== //depot/projects/valgrind/coregrind/m_signals.c#6 (text+ko) ==== @@ -1866,7 +1866,7 @@ if (VG_(clo_trace_signals)) { VG_(message)(Vg_DebugMsg, "signal %d arrived ... si_code=%d, " - "EIP=%#lx, eip=%#lx addr=%#lx", + "EIP=%#lx, eip=%#x addr=%#lx", sigNo, info->si_code, VG_(get_IP)(tid), VG_UCONTEXT_INSTR_PTR(uc), (Addr)info->si_addr ); } @@ -1974,7 +1974,7 @@ sigNo, signame(sigNo)); VG_(message)(Vg_DebugMsg, - "si_code=%x; Faulting address: %p; sp: %#lx", + "si_code=%x; Faulting address: %p; sp: %#x", info->si_code, info->VKI_SIGINFO_si_addr, VG_UCONTEXT_STACK_PTR(uc)); ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#6 (text+ko) ==== @@ -5162,7 +5162,7 @@ } if (VG_(clo_trace_signals)) - VG_(message)(Vg_DebugMsg, "kill: sending signal %d to pid %d", + VG_(message)(Vg_DebugMsg, "kill: sending signal %ld to pid %ld", ARG2, ARG1); /* If we're sending SIGKILL, check to see if the target is one of From owner-p4-projects@FreeBSD.ORG Fri Oct 24 21:09:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B8C31065674; Fri, 24 Oct 2008 21:09:01 +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 E114B1065670 for ; Fri, 24 Oct 2008 21:09:00 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C8A0D8FC23 for ; Fri, 24 Oct 2008 21:09:00 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OL90bg009504 for ; Fri, 24 Oct 2008 21:09:00 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OL90jg009502 for perforce@freebsd.org; Fri, 24 Oct 2008 21:09:00 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 21:09:00 GMT Message-Id: <200810242109.m9OL90jg009502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151878 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, 24 Oct 2008 21:09:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=151878 Change 151878 by peter@peter_cheese on 2008/10/24 21:08:22 Add placeholders for even more new syscalls. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#6 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#13 edit .. //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#2 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#6 (text+ko) ==== @@ -221,6 +221,30 @@ DECL_TEMPLATE(freebsd, sys_pread7); DECL_TEMPLATE(freebsd, sys_pwrite7); DECL_TEMPLATE(freebsd, sys__umtx_op); +DECL_TEMPLATE(freebsd, sys_thr_kill2); +DECL_TEMPLATE(freebsd, sys_shm_open); +DECL_TEMPLATE(freebsd, sys_shm_unlink); +DECL_TEMPLATE(freebsd, sys_cpuset); +DECL_TEMPLATE(freebsd, sys_cpuset_setid); +DECL_TEMPLATE(freebsd, sys_cpuset_getid); +DECL_TEMPLATE(freebsd, sys_cpuset_getaffinity); +DECL_TEMPLATE(freebsd, sys_cpuset_setaffinity); +DECL_TEMPLATE(freebsd, sys_faccessat); +DECL_TEMPLATE(freebsd, sys_fchmodat); +DECL_TEMPLATE(freebsd, sys_fchownat); +DECL_TEMPLATE(freebsd, sys_fexecve); +DECL_TEMPLATE(freebsd, sys_fstatat); +DECL_TEMPLATE(freebsd, sys_futimesat); +DECL_TEMPLATE(freebsd, sys_linkat); +DECL_TEMPLATE(freebsd, sys_mkdirat); +DECL_TEMPLATE(freebsd, sys_mkfifoat); +DECL_TEMPLATE(freebsd, sys_mknodat); +DECL_TEMPLATE(freebsd, sys_openat); +DECL_TEMPLATE(freebsd, sys_readlinkat); +DECL_TEMPLATE(freebsd, sys_renameat); +DECL_TEMPLATE(freebsd, sys_symlinkat); +DECL_TEMPLATE(freebsd, sys_unlinkat); +DECL_TEMPLATE(freebsd, sys_posix_openpt); #endif // __PRIV_SYSWRAP_FREEBSD_H /*--------------------------------------------------------------------*/ ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#13 (text+ko) ==== @@ -2906,6 +2906,37 @@ BSDX_(__NR_truncate7, sys_truncate7), // 479 BSDX_(__NR_ftruncate7, sys_ftruncate7), // 480 + // thr_kill2 481 + // shm_open 482 + // shm_unlink 483 + + // cpuset 484 + // cpuset_setid 485 + // cpuset_getid 486 + // cpuset_getaffinity 487 + + // cpuset_setaffinity 488 + // faccessat 489 + // fchmodat 490 + // fchownat 491 + + // fexecve 492 + // fstatat 493 + // futimesat 494 + // linkat 495 + + // mkdirat 496 + // mkfifoat 497 + // mknodat 498 + // openat 499 + + // readlinkat 500 + // renameat 501 + // symlinkat 502 + // unlinkat 503 + + // posix_openpt 504 + }; ==== //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#2 (text+ko) ==== @@ -365,9 +365,9 @@ #define __NR_rtprio_thread 466 #define __NR_nosys467 467 #define __NR_nosys468 468 -#define __NR___getpath_fromfd 469 -#define __NR___getpath_fromaddr 470 -#define __NR_sctp_peeloff 471 +#define __NR___getpath_fromfd 469 +#define __NR___getpath_fromaddr 470 +#define __NR_sctp_peeloff 471 #define __NR_sctp_generic_sendmsg 472 #define __NR_sctp_generic_sendmsg_iov 473 #define __NR_sctp_generic_recvmsg 474 @@ -377,5 +377,29 @@ #define __NR_lseek7 478 #define __NR_truncate7 479 #define __NR_ftruncate7 480 +#define __NR_thr_kill2 481 +#define __NR_shm_open 482 +#define __NR_shm_unlink 483 +#define __NR_cpuset 484 +#define __NR_cpuset_setid 485 +#define __NR_cpuset_getid 486 +#define __NR_cpuset_getaffinity 487 +#define __NR_cpuset_setaffinity 488 +#define __NR_faccessat 489 +#define __NR_fchmodat 490 +#define __NR_fchownat 491 +#define __NR_fexecve 492 +#define __NR_fstatat 493 +#define __NR_futimesat 494 +#define __NR_linkat 495 +#define __NR_mkdirat 496 +#define __NR_mkfifoat 497 +#define __NR_mknodat 498 +#define __NR_openat 499 +#define __NR_readlinkat 500 +#define __NR_renameat 501 +#define __NR_symlinkat 502 +#define __NR_unlinkat 503 +#define __NR_posix_openpt 504 #endif /* __VKI_UNISTD_FREEBSD_H */ From owner-p4-projects@FreeBSD.ORG Fri Oct 24 21:22:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFAAE1065670; Fri, 24 Oct 2008 21:22: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 948D71065674 for ; Fri, 24 Oct 2008 21:22:14 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 838DF8FC08 for ; Fri, 24 Oct 2008 21:22:14 +0000 (UTC) (envelope-from marcel@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 m9OLME1g010531 for ; Fri, 24 Oct 2008 21:22:14 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OLME6s010529 for perforce@freebsd.org; Fri, 24 Oct 2008 21:22:14 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 21:22:14 GMT Message-Id: <200810242122.m9OLME6s010529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151879 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, 24 Oct 2008 21:22:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=151879 Change 151879 by marcel@marcel_jnpr on 2008/10/24 21:21:40 unbreak build & diff reduction. Affected files ... .. //depot/projects/e500/sys/rpc/rpcclnt.c#6 edit Differences ... ==== //depot/projects/e500/sys/rpc/rpcclnt.c#6 (text+ko) ==== @@ -1179,19 +1179,6 @@ } /* - * This can happen if the auth_type is neither UNIX or NULL - */ - if (m == NULL) { -#ifdef __OpenBSD__ - pool_put(&rpctask_pool, task); -#else - FREE(task, M_RPC); -#endif - error = EPROTONOSUPPORT; - goto rpcmout; - } - - /* * For stream protocols, insert a Sun RPC Record Mark. */ if (rpc->rc_sotype == SOCK_STREAM) { From owner-p4-projects@FreeBSD.ORG Fri Oct 24 21:24:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25ADE1065685; Fri, 24 Oct 2008 21:24: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 DCFC1106566B for ; Fri, 24 Oct 2008 21:24:16 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2C8B8FC1B for ; Fri, 24 Oct 2008 21:24:16 +0000 (UTC) (envelope-from marcel@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 m9OLOGXt010658 for ; Fri, 24 Oct 2008 21:24:16 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OLOG2U010656 for perforce@freebsd.org; Fri, 24 Oct 2008 21:24:16 GMT (envelope-from marcel@freebsd.org) Date: Fri, 24 Oct 2008 21:24:16 GMT Message-Id: <200810242124.m9OLOG2U010656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151880 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, 24 Oct 2008 21:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=151880 Change 151880 by marcel@marcel_jnpr on 2008/10/24 21:23:55 Call it by its name. Affected files ... .. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#3 edit Differences ... ==== //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include -#include +#include static int cfi_lbc_probe(device_t); From owner-p4-projects@FreeBSD.ORG Fri Oct 24 21:28:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BE09106567D; Fri, 24 Oct 2008 21:28: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 0FE5C1065672 for ; Fri, 24 Oct 2008 21:28:21 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1CE88FC12 for ; Fri, 24 Oct 2008 21:28:20 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OLSKxk010963 for ; Fri, 24 Oct 2008 21:28:20 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OLSKmj010961 for perforce@freebsd.org; Fri, 24 Oct 2008 21:28:20 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 21:28:20 GMT Message-Id: <200810242128.m9OLSKmj010961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151881 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, 24 Oct 2008 21:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=151881 Change 151881 by peter@peter_cheese on 2008/10/24 21:27:59 add handlers for *at syscalls, duplicated from linux code. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#7 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#14 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#4 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#7 (text+ko) ==== ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#14 (text+ko) ==== @@ -2301,6 +2301,213 @@ ML_(generic_POST_sys_semctl)(tid, RES,ARG1,ARG2,ARG3,ARG4); } +/* --------------------------------------------------------------------- + *at wrappers + ------------------------------------------------------------------ */ + +PRE(sys_openat) +{ + HChar name[30]; + SysRes sres; + + if (ARG3 & VKI_O_CREAT) { + // 4-arg version + PRINT("sys_openat ( %ld, %#lx(%s), %ld, %ld )",ARG1,ARG2,(char*)ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "openat", + int, dfd, const char *, filename, int, flags, int, mode); + } else { + // 3-arg version + PRINT("sys_openat ( %ld, %#lx(%s), %ld )",ARG1,ARG2,(char*)ARG2,ARG3); + PRE_REG_READ3(long, "openat", + int, dfd, const char *, filename, int, flags); + } + + if (ARG1 != VKI_AT_FDCWD && !ML_(fd_allowed)(ARG1, "openat", tid, False)) + SET_STATUS_Failure( VKI_EBADF ); + else + PRE_MEM_RASCIIZ( "openat(filename)", ARG2 ); + + /* Handle the case where the open is of /proc/curproc/cmdline or + /proc//cmdline, and just give it a copy of the fd for the + fake file we cooked up at startup (in m_main). Also, seek the + cloned fd back to the start. */ + + VG_(sprintf)(name, "/proc/%d/cmdline", VG_(getpid)()); + if (ML_(safe_to_deref)( (void*)ARG2, 1 ) + && (VG_(strcmp)((Char *)ARG2, name) == 0 + || VG_(strcmp)((Char *)ARG2, "/proc/curproc/cmdline") == 0)) { + sres = VG_(dup)( VG_(cl_cmdline_fd) ); + SET_STATUS_from_SysRes( sres ); + if (!sres.isError) { + OffT off = VG_(lseek)( sres.res, 0, VKI_SEEK_SET ); + if (off < 0) + SET_STATUS_Failure( VKI_EMFILE ); + } + return; + } + + /* Otherwise handle normally */ + *flags |= SfMayBlock; +} + +POST(sys_openat) +{ + vg_assert(SUCCESS); + if (!ML_(fd_allowed)(RES, "openat", tid, True)) { + VG_(close)(RES); + SET_STATUS_Failure( VKI_EMFILE ); + } else { + if (VG_(clo_track_fds)) + ML_(record_fd_open_with_given_name)(tid, RES, (Char*)ARG2); + } +} + +PRE(sys_mkdirat) +{ + *flags |= SfMayBlock; + PRINT("sys_mkdirat ( %ld, %#lx(%s), %ld )", ARG1,ARG2,(char*)ARG2,ARG3); + PRE_REG_READ3(long, "mkdirat", + int, dfd, const char *, pathname, int, mode); + PRE_MEM_RASCIIZ( "mkdirat(pathname)", ARG2 ); +} + +PRE(sys_mkfifoat) +{ + PRINT("sys_mkfifoat ( %ld, %#lx(%s), 0x%lx )", ARG1,ARG2,(char*)ARG2,ARG3 ); + PRE_REG_READ3(long, "mkfifoat", + int, dfd, const char *, pathname, int, mode); + PRE_MEM_RASCIIZ( "mkfifoat(pathname)", ARG2 ); +} + +PRE(sys_mknodat) +{ + PRINT("sys_mknodat ( %ld, %#lx(%s), 0x%lx, 0x%lx )", ARG1,ARG2,(char*)ARG2,ARG3,ARG4 ); + PRE_REG_READ4(long, "mknodat", + int, dfd, const char *, pathname, int, mode, unsigned, dev); + PRE_MEM_RASCIIZ( "mknodat(pathname)", ARG2 ); +} + +PRE(sys_fchownat) +{ + PRINT("sys_fchownat ( %ld, %#lx(%s), 0x%lx, 0x%lx )", ARG1,ARG2,(char*)ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "fchownat", + int, dfd, const char *, path, + vki_uid_t, owner, vki_gid_t, group); + PRE_MEM_RASCIIZ( "fchownat(path)", ARG2 ); +} + +PRE(sys_futimesat) +{ + PRINT("sys_futimesat ( %ld, %#lx(%s), %#lx )", ARG1,ARG2,(char*)ARG2,ARG3); + PRE_REG_READ3(long, "futimesat", + int, dfd, char *, filename, struct timeval *, tvp); + if (ARG2 != 0) + PRE_MEM_RASCIIZ( "futimesat(filename)", ARG2 ); + if (ARG3 != 0) + PRE_MEM_READ( "futimesat(tvp)", ARG3, 2 * sizeof(struct vki_timeval) ); +} + +PRE(sys_fstatat) +{ + PRINT("sys_fstatat ( %ld, %#lx(%s), %#lx )", ARG1,ARG2,(char*)ARG2,ARG3); + PRE_REG_READ3(long, "fstatat", + int, dfd, char *, file_name, struct stat *, buf); + PRE_MEM_RASCIIZ( "fstatat(file_name)", ARG2 ); + PRE_MEM_WRITE( "fstatat(buf)", ARG3, sizeof(struct vki_stat) ); +} + +POST(sys_fstatat) +{ + POST_MEM_WRITE( ARG3, sizeof(struct vki_stat) ); +} + +PRE(sys_unlinkat) +{ + *flags |= SfMayBlock; + PRINT("sys_unlinkat ( %ld, %#lx(%s) )", ARG1,ARG2,(char*)ARG2); + PRE_REG_READ2(long, "unlinkat", int, dfd, const char *, pathname); + PRE_MEM_RASCIIZ( "unlinkat(pathname)", ARG2 ); +} + +PRE(sys_renameat) +{ + PRINT("sys_renameat ( %ld, %#lx(%s), %ld, %#lx(%s) )", ARG1,ARG2,(char*)ARG2,ARG3,ARG4,(char*)ARG4); + PRE_REG_READ4(long, "renameat", + int, olddfd, const char *, oldpath, + int, newdfd, const char *, newpath); + PRE_MEM_RASCIIZ( "renameat(oldpath)", ARG2 ); + PRE_MEM_RASCIIZ( "renameat(newpath)", ARG4 ); +} + +PRE(sys_linkat) +{ + *flags |= SfMayBlock; + PRINT("sys_linkat ( %ld, %#lx(%s), %ld, %#lx(%s), %ld )",ARG1,ARG2,(char*)ARG2,ARG3,ARG4,(char*)ARG4,ARG5); + PRE_REG_READ5(long, "linkat", + int, olddfd, const char *, oldpath, + int, newdfd, const char *, newpath, + int, flags); + PRE_MEM_RASCIIZ( "linkat(oldpath)", ARG2); + PRE_MEM_RASCIIZ( "linkat(newpath)", ARG4); +} + +PRE(sys_symlinkat) +{ + *flags |= SfMayBlock; + PRINT("sys_symlinkat ( %#lx(%s), %ld, %#lx(%s) )",ARG1,(char*)ARG1,ARG2,ARG3,(char*)ARG3); + PRE_REG_READ3(long, "symlinkat", + const char *, oldpath, int, newdfd, const char *, newpath); + PRE_MEM_RASCIIZ( "symlinkat(oldpath)", ARG1 ); + PRE_MEM_RASCIIZ( "symlinkat(newpath)", ARG3 ); +} + +PRE(sys_readlinkat) +{ + HChar name[25]; + Word saved = SYSNO; + + PRINT("sys_readlinkat ( %ld, %#lx(%s), %#lx, %llu )", ARG1,ARG2,(char*)ARG2,ARG3,(ULong)ARG4); + PRE_REG_READ4(long, "readlinkat", + int, dfd, const char *, path, char *, buf, int, bufsiz); + PRE_MEM_RASCIIZ( "readlinkat(path)", ARG2 ); + PRE_MEM_WRITE( "readlinkat(buf)", ARG3,ARG4 ); + + /* + * Handle the case where readlinkat is looking at /proc/curproc/file or + * /proc//file. + */ + VG_(sprintf)(name, "/proc/%d/file", VG_(getpid)()); + if (ML_(safe_to_deref)((void*)ARG2, 1) + && (VG_(strcmp)((Char *)ARG2, name) == 0 + || VG_(strcmp)((Char *)ARG2, "/proc/curproc/file") == 0)) { + VG_(sprintf)(name, "/proc/self/fd/%d", VG_(cl_exec_fd)); + SET_STATUS_from_SysRes( VG_(do_syscall4)(saved, ARG1, (UWord)name, + ARG3, ARG4)); + } else { + /* Normal case */ + SET_STATUS_from_SysRes( VG_(do_syscall4)(saved, ARG1, ARG2, ARG3, ARG4)); + } + + if (SUCCESS && RES > 0) + POST_MEM_WRITE( ARG3, RES ); +} + +PRE(sys_fchmodat) +{ + PRINT("sys_fchmodat ( %ld, %#lx(%s), %ld )", ARG1,ARG2,(char*)ARG2,ARG3); + PRE_REG_READ3(long, "fchmodat", + int, dfd, const char *, path, vki_mode_t, mode); + PRE_MEM_RASCIIZ( "fchmodat(path)", ARG2 ); +} + +PRE(sys_faccessat) +{ + PRINT("sys_faccessat ( %ld, %#lx(%s), %ld )", ARG1,ARG2,(char*)ARG2,ARG3); + PRE_REG_READ3(long, "faccessat", + int, dfd, const char *, pathname, int, mode); + PRE_MEM_RASCIIZ( "faccessat(pathname)", ARG2 ); +} + #undef PRE #undef POST @@ -2916,24 +3123,24 @@ // cpuset_getaffinity 487 // cpuset_setaffinity 488 - // faccessat 489 - // fchmodat 490 - // fchownat 491 + BSDX_(__NR_faccessat, sys_faccessat), // 489 + BSDX_(__NR_fchmodat, sys_fchmodat), // 490 + BSDX_(__NR_fchownat, sys_fchownat), // 491 // fexecve 492 - // fstatat 493 - // futimesat 494 - // linkat 495 + BSDXY(__NR_fstatat, sys_fstatat), // 493 + BSDX_(__NR_futimesat, sys_futimesat), // 494 + BSDX_(__NR_linkat, sys_linkat), // 495 - // mkdirat 496 - // mkfifoat 497 - // mknodat 498 - // openat 499 + BSDX_(__NR_mkdirat, sys_mkdirat), // 496 + BSDX_(__NR_mkfifoat, sys_mkfifoat), // 497 + BSDX_(__NR_mknodat, sys_mknodat), // 498 + BSDXY(__NR_openat, sys_openat), // 499 - // readlinkat 500 - // renameat 501 - // symlinkat 502 - // unlinkat 503 + BSDX_(__NR_readlinkat, sys_readlinkat), // 500 + BSDX_(__NR_renameat, sys_renameat), // 501 + BSDX_(__NR_symlinkat, sys_symlinkat), // 502 + BSDX_(__NR_unlinkat, sys_unlinkat), // 503 // posix_openpt 504 ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#4 (text+ko) ==== @@ -1326,6 +1326,8 @@ #define VKI_O_TRUNC 0x0400 /* not fcntl */ #define VKI_O_EXCL 0x0800 /* not fcntl */ +#define VKI_AT_FDCWD -100 + #define VKI_F_DUPFD 0 /* dup */ #define VKI_F_GETFD 1 /* get close_on_exec */ #define VKI_F_SETFD 2 /* set/clear close_on_exec */ From owner-p4-projects@FreeBSD.ORG Fri Oct 24 22:17:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E901B1065676; Fri, 24 Oct 2008 22:17:10 +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 944F5106566B for ; Fri, 24 Oct 2008 22:17:10 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 827DF8FC0C for ; Fri, 24 Oct 2008 22:17:10 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OMHAWv015722 for ; Fri, 24 Oct 2008 22:17:10 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OMHAZq015720 for perforce@freebsd.org; Fri, 24 Oct 2008 22:17:10 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 22:17:10 GMT Message-Id: <200810242217.m9OMHAZq015720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151882 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, 24 Oct 2008 22:17:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=151882 Change 151882 by peter@peter_cheese on 2008/10/24 22:16:53 wrap acl syscalls (bsdtar uses them) Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#8 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#15 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#5 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#8 (text+ko) ==== @@ -184,6 +184,10 @@ DECL_TEMPLATE(freebsd, sys___acl_delete_fd); DECL_TEMPLATE(freebsd, sys___acl_aclcheck_file); DECL_TEMPLATE(freebsd, sys___acl_aclcheck_fd); +DECL_TEMPLATE(freebsd, sys___acl_get_link); +DECL_TEMPLATE(freebsd, sys___acl_set_link); +DECL_TEMPLATE(freebsd, sys___acl_delete_link); +DECL_TEMPLATE(freebsd, sys___acl_aclcheck_link); DECL_TEMPLATE(freebsd, sys_extattrctl); DECL_TEMPLATE(freebsd, sys_extattr_set_file); DECL_TEMPLATE(freebsd, sys_extattr_get_file); ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#15 (text+ko) ==== @@ -2508,6 +2508,127 @@ PRE_MEM_RASCIIZ( "faccessat(pathname)", ARG2 ); } +/* --------------------------------------------------------------------- + __acl* wrappers + ------------------------------------------------------------------ */ + +PRE(sys___acl_get_file) +{ + PRINT("sys___acl_get_file ( %#lx(%s), %ld, %#lx )", ARG1,(char *)ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_get_file", + const char *, path, int, acltype, struct vki_acl *, aclp); + PRE_MEM_WRITE( "__acl_get_file(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +POST(sys___acl_get_file) +{ + vg_assert(SUCCESS); + if (RES == 0) { + POST_MEM_WRITE( ARG3, sizeof(struct vki_acl) ); + } +} + +PRE(sys___acl_set_file) +{ + PRINT("sys___acl_set_file ( %#lx(%s), %ld, %#lx )", ARG1,(char *)ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_set_file", + const char *, path, int, acltype, struct vki_acl *, aclp); + PRE_MEM_READ( "__acl_set_file(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +PRE(sys___acl_get_fd) +{ + PRINT("sys___acl_get_fd ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_get_fd", + int, fd, int, acltype, struct vki_acl *, aclp); + PRE_MEM_WRITE( "__acl_get_file(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +POST(sys___acl_get_fd) +{ + vg_assert(SUCCESS); + if (RES == 0) { + POST_MEM_WRITE( ARG3, sizeof(struct vki_acl) ); + } +} + +PRE(sys___acl_set_fd) +{ + PRINT("sys___acl_set_fd ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_set_fd", + int, fd, int, acltype, struct vki_acl *, aclp); + PRE_MEM_READ( "__acl_get_file(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +PRE(sys___acl_delete_file) +{ + PRINT("sys___acl_delete_file ( %#lx(%s), %ld )", ARG1,(char *)ARG1,ARG2); + PRE_REG_READ2(long, "__acl_delete_file", + const char *, path, int, acltype); +} + +PRE(sys___acl_delete_fd) +{ + PRINT("sys___acl_delete_fd ( %ld, %ld )", ARG1,ARG2); + PRE_REG_READ2(long, "__acl_delete_fd", + int, fd, int, acltype); +} + +PRE(sys___acl_aclcheck_file) +{ + PRINT("sys___acl_aclcheck_file ( %#lx(%s), %ld, %#lx )", ARG1,(char *)ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_aclcheck_file", + const char *, path, int, acltype, struct vki_acl *, aclp); + PRE_MEM_READ( "__acl_aclcheck_file(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +PRE(sys___acl_aclcheck_fd) +{ + PRINT("sys___acl_aclcheck_fd ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_aclcheck_fd", + int, fd, int, acltype, struct vki_acl *, aclp); + PRE_MEM_READ( "__acl_aclcheck_fd(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +PRE(sys___acl_get_link) +{ + PRINT("sys___acl_get_link ( %#lx(%s), %ld, %#lx )", ARG1,(char *)ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_get_link", + const char *, path, int, acltype, struct vki_acl *, aclp); + PRE_MEM_WRITE( "__acl_get_link(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +POST(sys___acl_get_link) +{ + vg_assert(SUCCESS); + if (RES == 0) { + POST_MEM_WRITE( ARG3, sizeof(struct vki_acl) ); + } +} + +PRE(sys___acl_set_link) +{ + PRINT("sys___acl_set_link ( %#lx(%s), %ld, %#lx )", ARG1,(char *)ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_set_link", + const char *, path, int, acltype, struct vki_acl *, aclp); + PRE_MEM_READ( "__acl_set_link(aclp)", ARG3, sizeof(struct vki_acl) ); +} + +PRE(sys___acl_delete_link) +{ + PRINT("sys___acl_delete_link ( %#lx(%s), %ld )", ARG1,(char *)ARG1,ARG2); + PRE_REG_READ2(long, "__acl_delete_link", + const char *, path, int, acltype); +} + +PRE(sys___acl_aclcheck_link) +{ + PRINT("sys___acl_aclcheck_link ( %#lx(%s), %ld, %#lx )", ARG1,(char *)ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "__acl_aclcheck_link", + const char *, path, int, acltype, struct vki_acl *, aclp); + PRE_MEM_READ( "__acl_aclcheck_link(aclp)", ARG3, sizeof(struct vki_acl) ); +} + #undef PRE #undef POST @@ -2945,16 +3066,16 @@ BSDX_(__NR_sigreturn, sys_sigreturn), // 344 BSDXY(__NR_sigtimedwait, sys_sigtimedwait), // 345 BSDXY(__NR_sigwaitinfo, sys_sigwaitinfo), // 346 - // BSDXY(__NR___acl_get_file, sys___acl_get_file), // 347 + BSDXY(__NR___acl_get_file, sys___acl_get_file), // 347 - // BSDXY(__NR___acl_set_file, sys___acl_set_file), // 348 - // BSDXY(__NR___acl_get_fd, sys___acl_get_fd), // 349 - // BSDXY(__NR___acl_set_fd, sys___acl_set_fd), // 350 - // BSDXY(__NR___acl_delete_file, sys___acl_delete_file), // 351 + BSDX_(__NR___acl_set_file, sys___acl_set_file), // 348 + BSDXY(__NR___acl_get_fd, sys___acl_get_fd), // 349 + BSDX_(__NR___acl_set_fd, sys___acl_set_fd), // 350 + BSDX_(__NR___acl_delete_file, sys___acl_delete_file), // 351 - // BSDXY(__NR___acl_delete_fd, sys___acl_delete_fd), // 352 - // BSDXY(__NR___acl_aclcheck_file, sys___acl_aclcheck_file), // 353 - // BSDXY(__NR___acl_aclcheck_fd, sys___acl_aclcheck_fd), // 354 + BSDX_(__NR___acl_delete_fd, sys___acl_delete_fd), // 352 + BSDX_(__NR___acl_aclcheck_file, sys___acl_aclcheck_file), // 353 + BSDX_(__NR___acl_aclcheck_fd, sys___acl_aclcheck_fd), // 354 // BSDXY(__NR_extattrctl, sys_extattrctl), // 355 // BSDXY(__NR_extattr_set_file, sys_extattr_set_file), // 356 @@ -3043,11 +3164,11 @@ // swapcontext 423 // swapoff 424 - // __acl_get_link 425 - // __acl_set_link 426 - // __acl_delete_link 427 + BSDXY(__NR___acl_get_link, sys___acl_get_link), // 425 + BSDX_(__NR___acl_set_link, sys___acl_set_link), // 426 + BSDX_(__NR___acl_delete_link, sys___acl_delete_link), // 427 - // __acl_aclcheck_link 428 + BSDX_(__NR___acl_aclcheck_link, sys___acl_aclcheck_link), // 428 //!sigwait 429 // thr_create 430 // thr_exit 431 ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#5 (text+ko) ==== @@ -1710,6 +1710,22 @@ #define VKI_UMTX_OP_MAX 11 +//---------------------------------------------------------------------- +// From sys/acl.h +//---------------------------------------------------------------------- + +struct vki_acl_entry { + int ae_tag; + vki_uid_t ae_uid; + vki_mode_t ae_perm; +}; + +#define VKI_ACL_MAX_ENTRIES 32 +struct vki_acl { + int acl_cnt; + struct vki_acl_entry acl_entry[VKI_ACL_MAX_ENTRIES]; +}; + /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ From owner-p4-projects@FreeBSD.ORG Fri Oct 24 22:29:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EB5C106567A; Fri, 24 Oct 2008 22:29: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 12EC1106566B for ; Fri, 24 Oct 2008 22:29:23 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01A588FC08 for ; Fri, 24 Oct 2008 22:29:23 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OMTMVi016593 for ; Fri, 24 Oct 2008 22:29:22 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OMTMtm016591 for perforce@freebsd.org; Fri, 24 Oct 2008 22:29:22 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 24 Oct 2008 22:29:22 GMT Message-Id: <200810242229.m9OMTMtm016591@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151883 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, 24 Oct 2008 22:29:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=151883 Change 151883 by peter@peter_cheese on 2008/10/24 22:29:19 Add uuidgen Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#9 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#16 edit .. //depot/projects/valgrind/include/vki/vki-freebsd.h#6 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#9 (text+ko) ==== @@ -249,6 +249,7 @@ DECL_TEMPLATE(freebsd, sys_symlinkat); DECL_TEMPLATE(freebsd, sys_unlinkat); DECL_TEMPLATE(freebsd, sys_posix_openpt); +DECL_TEMPLATE(freebsd, sys_uuidgen); #endif // __PRIV_SYSWRAP_FREEBSD_H /*--------------------------------------------------------------------*/ ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#16 (text+ko) ==== @@ -2200,6 +2200,21 @@ PRE_REG_READ0(long, "lkmnosys8"); } +PRE(sys_uuidgen) +{ + PRINT("sys_uuidgen ( %#lx, %ld )", ARG1,ARG2); + PRE_REG_READ2(long, "uuidgen", + struct vki_uuid *, store, int, count); + PRE_MEM_WRITE( "uuidgen(store)", ARG1, ARG2 * sizeof(struct vki_uuid)); +} + +POST(sys_uuidgen) +{ + if (SUCCESS) + POST_MEM_WRITE( ARG1, ARG2 * sizeof(struct vki_uuid) ); +} + + PRE(sys_shmget) { PRINT("sys_shmget ( %ld, %ld, %ld )",ARG1,ARG2,ARG3); @@ -3123,7 +3138,7 @@ // kenv 390 // lchflags 391 - // uuidgen 392 + BSDXY(__NR_uuidgen, sys_uuidgen), // 392 BSDXY(__NR_sendfile, sys_sendfile), // 393 // mac_syscall 394 // getfsstat 395 ==== //depot/projects/valgrind/include/vki/vki-freebsd.h#6 (text+ko) ==== @@ -1726,6 +1726,20 @@ struct vki_acl_entry acl_entry[VKI_ACL_MAX_ENTRIES]; }; + +//---------------------------------------------------------------------- +// From sys/uuid.h +//---------------------------------------------------------------------- + +struct vki_uuid { + vki_uint32_t time_low; + vki_uint16_t time_mid; + vki_uint16_t time_hi_and_version; + vki_uint8_t clock_seq_hi_and_reserved; + vki_uint8_t clock_seq_low; + vki_uint8_t node[6]; +}; + /*--------------------------------------------------------------------*/ /*--- end ---*/ /*--------------------------------------------------------------------*/ From owner-p4-projects@FreeBSD.ORG Fri Oct 24 22:51:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B85B10656AC; Fri, 24 Oct 2008 22:51: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 C413E10656AD for ; Fri, 24 Oct 2008 22:51:45 +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 B34E68FC08 for ; Fri, 24 Oct 2008 22:51:45 +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 m9OMpjEA018295 for ; Fri, 24 Oct 2008 22:51:45 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9OMpjuH018293 for perforce@freebsd.org; Fri, 24 Oct 2008 22:51:45 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 24 Oct 2008 22:51:45 GMT Message-Id: <200810242251.m9OMpjuH018293@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 151884 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, 24 Oct 2008 22:51:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=151884 Change 151884 by pgj@kolbasz on 2008/10/24 22:51:04 Some fixes for my recent cups translation Submitted by: Oliver Pinter Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#2 (text+ko) ==== @@ -68,14 +68,14 @@ JetDirect) protokollokat is ismeri valamennyire. A CUPS a hétköznapi igényeknek megfelelõ &unix; - alapú nyomtatás megalapozásához + alapú nyomtatás megteremtéséhez ezenkívül még támogatja a hálózati nyomtatók böngészésének lehetõségét, illetve a PostScript - Printer Description (PPD, PostScript - Nyomtató Leírás) használatát. - Ennek eredményeképpen a + Printer Description (PPD, + PostScript Nyomtató Leírás) + használatát. Ennek eredményeképpen a CUPS tökéletesen alkalmas nyomtatók megosztására és elérésére &os;, &linux; &macos; X vagy @@ -157,9 +157,9 @@ devfs szabályokat. Bizonyos µsoft.windows; rendszert - használó kliensekkel csak fogunk tudni nyomtatni a - CUPS esetében, ha a - /usr/local/etc/cups/mime.types és + használó kliensekkel csak akkor fogunk tudni + nyomtatni a CUPS esetében, ha + a /usr/local/etc/cups/mime.types és /usr/local/etc/cups/mime.convs állományokban kivesszük a megjegyzésbõl ezt a sort: From owner-p4-projects@FreeBSD.ORG Fri Oct 24 23:31:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8499F10656AE; Fri, 24 Oct 2008 23:31: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 4793C10656A0 for ; Fri, 24 Oct 2008 23:31:27 +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 36C578FC1C for ; Fri, 24 Oct 2008 23:31:27 +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 m9ONVR16022436 for ; Fri, 24 Oct 2008 23:31:27 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9ONVRRw022434 for perforce@freebsd.org; Fri, 24 Oct 2008 23:31:27 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 24 Oct 2008 23:31:27 GMT Message-Id: <200810242331.m9ONVRRw022434@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 151886 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, 24 Oct 2008 23:31:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=151886 Change 151886 by pgj@kolbasz on 2008/10/24 23:30:45 MFen (doc): 1.1 -> 1.2 hu_HU.ISO8859-2/articles/cups/Makefile 1.1 -> 1.3 hu_HU.ISO8859-2/aritcles/cups/article.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/Makefile#2 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Article: CUPS on FreeBSD # # %SOURCE% en_US.ISO8859-1/articles/cups/Makefile -# %SRCID% 1.1 +# %SRCID% 1.2 # NO_TIDY= yes ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#3 (text+ko) ==== @@ -7,7 +7,7 @@
      From owner-p4-projects@FreeBSD.ORG Sat Oct 25 00:33:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9233A106566C; Sat, 25 Oct 2008 00:33:30 +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 55A5F1065671 for ; Sat, 25 Oct 2008 00:33:30 +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 440CF8FC12 for ; Sat, 25 Oct 2008 00:33:30 +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 m9P0XUkt028520 for ; Sat, 25 Oct 2008 00:33:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9P0XUDk028518 for perforce@freebsd.org; Sat, 25 Oct 2008 00:33:30 GMT (envelope-from sam@freebsd.org) Date: Sat, 25 Oct 2008 00:33:30 GMT Message-Id: <200810250033.m9P0XUDk028518@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 151888 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, 25 Oct 2008 00:33:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=151888 Change 151888 by sam@sam_ebb on 2008/10/25 00:33:13 change ieee80211_sta_join to take an explicit channel instead of taking it from the scan parameters Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#67 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.c#50 edit .. //depot/projects/vap/sys/net80211/ieee80211_node.h#30 edit .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#27 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#67 (text+ko) ==== @@ -1463,7 +1463,7 @@ if (lookup.se == NULL) return ENOENT; mlmedebug(vap, mac, IEEE80211_MLME_ASSOC, 0); - if (!ieee80211_sta_join(vap, lookup.se)) + if (!ieee80211_sta_join(vap, lookup.se->se_chan, lookup.se)) return EIO; /* XXX unique but could be better */ return 0; } ==== //depot/projects/vap/sys/net80211/ieee80211_node.c#50 (text+ko) ==== @@ -703,7 +703,7 @@ } int -ieee80211_sta_join(struct ieee80211vap *vap, +ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, const struct ieee80211_scan_entry *se) { struct ieee80211com *ic = vap->iv_ic; @@ -725,7 +725,7 @@ ni->ni_tstamp.tsf = se->se_tstamp.tsf; ni->ni_intval = se->se_intval; ni->ni_capinfo = se->se_capinfo; - ni->ni_chan = se->se_chan; + ni->ni_chan = chan; ni->ni_timoff = se->se_timoff; ni->ni_fhdwell = se->se_fhdwell; ni->ni_fhindex = se->se_fhindex; ==== //depot/projects/vap/sys/net80211/ieee80211_node.h#30 (text+ko) ==== @@ -282,7 +282,7 @@ void ieee80211_setcurchan(struct ieee80211com *, struct ieee80211_channel *); int ieee80211_ibss_merge(struct ieee80211_node *); struct ieee80211_scan_entry; -int ieee80211_sta_join(struct ieee80211vap *, +int ieee80211_sta_join(struct ieee80211vap *, struct ieee80211_channel *, const struct ieee80211_scan_entry *); void ieee80211_sta_leave(struct ieee80211_node *); void ieee80211_node_deauth(struct ieee80211_node *, int); ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#27 (text+ko) ==== @@ -1014,6 +1014,7 @@ { struct sta_table *st = ss->ss_priv; struct sta_entry *selbs; + struct ieee80211_channel *chan; KASSERT(vap->iv_opmode == IEEE80211_M_STA, ("wrong mode %u", vap->iv_opmode)); @@ -1056,7 +1057,10 @@ selbs = select_bss(ss, vap, IEEE80211_MSG_SCAN); if (ss->ss_flags & IEEE80211_SCAN_NOJOIN) return (selbs != NULL); - if (selbs == NULL || !ieee80211_sta_join(vap, &selbs->base)) + if (selbs == NULL) + goto notfound; + chan = selbs->base.se_chan; + if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; return 1; /* terminate scan */ } @@ -1138,12 +1142,16 @@ se->base.se_rssi = curRssi; selbs = select_bss(ss, vap, IEEE80211_MSG_ROAM); if (selbs != NULL && selbs != se) { + struct ieee80211_channel *chan; + IEEE80211_DPRINTF(vap, IEEE80211_MSG_ROAM | IEEE80211_MSG_DEBUG, "%s: ROAM: curRate %u, roamRate %u, " "curRssi %d, roamRssi %d\n", __func__, curRate, roamRate, curRssi, roamRssi); - ieee80211_sta_join(vap, &selbs->base); + + chan = selbs->base.se_chan; + (void) ieee80211_sta_join(vap, chan, &selbs->base); } } } @@ -1419,7 +1427,10 @@ selbs = select_bss(ss, vap, IEEE80211_MSG_SCAN); if (ss->ss_flags & IEEE80211_SCAN_NOJOIN) return (selbs != NULL); - if (selbs == NULL || !ieee80211_sta_join(vap, &selbs->base)) + if (selbs == NULL) + goto notfound; + chan = selbs->base.se_chan; + if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; return 1; /* terminate scan */ } From owner-p4-projects@FreeBSD.ORG Sat Oct 25 01:10:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDE1D1065699; Sat, 25 Oct 2008 01:10: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 A2239106567E for ; Sat, 25 Oct 2008 01:10:07 +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 909D18FC16 for ; Sat, 25 Oct 2008 01:10:07 +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 m9P1A7YD041835 for ; Sat, 25 Oct 2008 01:10:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9P1A7qj041833 for perforce@freebsd.org; Sat, 25 Oct 2008 01:10:07 GMT (envelope-from sam@freebsd.org) Date: Sat, 25 Oct 2008 01:10:07 GMT Message-Id: <200810250110.m9P1A7qj041833@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 151889 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, 25 Oct 2008 01:10:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=151889 Change 151889 by sam@sam_ebb on 2008/10/25 01:09:25 Fix joining an 11b BSS: scanning is normally done using 11g channels (unless explicitly locked to mode 11b) so when we join the bss the channel attached to the scan cache entry may need to be demoted. o demote to 11b if the ap is advertising 11b rates o skip the ap if it's 11b but we're locked to 11g (could consider this advisory but for now treat it as mandatory) o handle an odd edge case, if there is a fixed transmit rate for 11g then the rate check against the 11b ap will fail, try to demote to 11b and retry the rate check Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#28 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#28 (text+ko) ==== @@ -73,8 +73,7 @@ uint8_t se_seen; /* seen during current scan */ uint8_t se_notseen; /* not seen in previous scans */ uint8_t se_flags; -#define STA_SSID_MATCH 0x01 -#define STA_BSSID_MATCH 0x02 +#define STA_DEMOTE11B 0x01 /* match w/ demoted 11b chan */ uint32_t se_avgrssi; /* LPF rssi state */ unsigned long se_lastupdate; /* time of last update */ unsigned long se_lastfail; /* time of last failure */ @@ -675,7 +674,27 @@ ((uint16_t) \ ((((const uint8_t *)(p))[0] ) | \ (((const uint8_t *)(p))[1] << 8))) + +/* + * Demote any supplied 11g channel to 11b. There should + * always be an 11b channel but we check anyway... + */ +static struct ieee80211_channel * +demote11b(struct ieee80211vap *vap, struct ieee80211_channel *chan) +{ + struct ieee80211_channel *c; + if (IEEE80211_IS_CHAN_ANYG(chan) && + vap->iv_des_mode == IEEE80211_MODE_AUTO) { + c = ieee80211_find_channel(vap->iv_ic, chan->ic_freq, + (chan->ic_flags &~ (IEEE80211_CHAN_PUREG | IEEE80211_CHAN_G)) | + IEEE80211_CHAN_B); + if (c != NULL) + chan = c; + } + return chan; +} + static int maxrate(const struct ieee80211_scan_entry *se) { @@ -774,7 +793,8 @@ * XXX inspect MCS for HT */ static int -check_rate(struct ieee80211vap *vap, const struct ieee80211_scan_entry *se) +check_rate(struct ieee80211vap *vap, const struct ieee80211_channel *chan, + const struct ieee80211_scan_entry *se) { #define RV(v) ((v) & IEEE80211_RATE_VAL) const struct ieee80211_rateset *srs; @@ -783,11 +803,11 @@ okrate = badrate = 0; - srs = ieee80211_get_suprates(vap->iv_ic, se->se_chan); + srs = ieee80211_get_suprates(vap->iv_ic, chan); nrs = se->se_rates[1]; rs = se->se_rates+2; /* XXX MCS */ - ucastrate = vap->iv_txparms[ieee80211_chan2mode(se->se_chan)].ucastrate; + ucastrate = vap->iv_txparms[ieee80211_chan2mode(chan)].ucastrate; fixedrate = IEEE80211_FIXED_RATE_NONE; again: for (i = 0; i < nrs; i++) { @@ -903,9 +923,38 @@ if (se->se_capinfo & IEEE80211_CAPINFO_PRIVACY) fail |= MATCH_PRIVACY; } - rate = check_rate(vap, se); - if (rate & IEEE80211_RATE_BASIC) + se0->se_flags &= ~STA_DEMOTE11B; + rate = check_rate(vap, se->se_chan, se); + if (rate & IEEE80211_RATE_BASIC) { fail |= MATCH_RATE; + /* + * An 11b-only ap will give a rate mismatch if there is an + * OFDM fixed tx rate for 11g. Try downgrading the channel + * in the scan list to 11b and retry the rate check. + */ + if (IEEE80211_IS_CHAN_ANYG(se->se_chan)) { + rate = check_rate(vap, demote11b(vap, se->se_chan), se); + if ((rate & IEEE80211_RATE_BASIC) == 0) { + fail &= ~MATCH_RATE; + se0->se_flags |= STA_DEMOTE11B; + } + } + } else if (rate < 2*24) { + /* + * This is an 11b-only ap. Check the desired mode in + * case that needs to be honored (mode 11g filters out + * 11b-only ap's). Otherwise force any 11g channel used + * in scanning to be demoted. + * + * NB: we cheat a bit here by looking at the max rate; + * we could/should check the rates. + */ + if (!(vap->iv_des_mode == IEEE80211_MODE_AUTO || + vap->iv_des_mode == IEEE80211_MODE_11B)) + fail |= MATCH_RATE; + else + se0->se_flags |= STA_DEMOTE11B; + } if (ss->ss_nssid != 0 && !match_ssid(se->se_ssid, ss->ss_nssid, ss->ss_ssid)) fail |= MATCH_SSID; @@ -1060,6 +1109,8 @@ if (selbs == NULL) goto notfound; chan = selbs->base.se_chan; + if (selbs->se_flags & STA_DEMOTE11B) + chan = demote11b(vap, chan); if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; return 1; /* terminate scan */ @@ -1151,6 +1202,8 @@ curRate, roamRate, curRssi, roamRssi); chan = selbs->base.se_chan; + if (selbs->se_flags & STA_DEMOTE11B) + chan = demote11b(vap, chan); (void) ieee80211_sta_join(vap, chan, &selbs->base); } } @@ -1430,6 +1483,8 @@ if (selbs == NULL) goto notfound; chan = selbs->base.se_chan; + if (selbs->se_flags & STA_DEMOTE11B) + chan = demote11b(vap, chan); if (!ieee80211_sta_join(vap, chan, &selbs->base)) goto notfound; return 1; /* terminate scan */ From owner-p4-projects@FreeBSD.ORG Sat Oct 25 06:21:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCC921065673; Sat, 25 Oct 2008 06:21: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 93DC11065670 for ; Sat, 25 Oct 2008 06:21:27 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 692278FC14 for ; Sat, 25 Oct 2008 06:21:27 +0000 (UTC) (envelope-from marcel@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 m9P6LR5c089272 for ; Sat, 25 Oct 2008 06:21:27 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9P6LRhb089270 for perforce@freebsd.org; Sat, 25 Oct 2008 06:21:27 GMT (envelope-from marcel@freebsd.org) Date: Sat, 25 Oct 2008 06:21:27 GMT Message-Id: <200810250621.m9P6LRhb089270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151892 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, 25 Oct 2008 06:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=151892 Change 151892 by marcel@marcel_jnpr on 2008/10/25 06:21:25 Remove unused files. Affected files ... .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc_if.m#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Oct 25 11:31:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C19EB1065673; Sat, 25 Oct 2008 11:31: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 856CC1065671 for ; Sat, 25 Oct 2008 11:31:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 736BC8FC13 for ; Sat, 25 Oct 2008 11:31:42 +0000 (UTC) (envelope-from hselasky@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 m9PBVg0i030943 for ; Sat, 25 Oct 2008 11:31:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PBVgNT030941 for perforce@freebsd.org; Sat, 25 Oct 2008 11:31:42 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 25 Oct 2008 11:31:42 GMT Message-Id: <200810251131.m9PBVgNT030941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151900 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, 25 Oct 2008 11:31:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=151900 Change 151900 by hselasky@hselasky_laptop001 on 2008/10/25 11:31:21 Not all modems have capabilities. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#9 (text+ko) ==== @@ -115,9 +115,9 @@ USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL), USB_IFACE_PROTOCOL(UIPROTO_CDC_AT)}, /* Kyocera AH-K3001V */ - {USB_VPI(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, 0)}, - {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, 0)}, - {USB_VPI(USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_PC5740, 0)}, + {USB_VPI(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, 1)}, + {USB_VPI(USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, 1)}, + {USB_VPI(USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_PC5740, 1)}, }; /* @@ -297,6 +297,10 @@ if (error) { return (error); } + if (uaa->driver_info == NULL) { + /* some modems do not have any capabilities */ + return (error); + } umodem_get_caps(uaa, &cm, &acm); if (!(cm & USB_CDC_CM_DOES_CM) || !(cm & USB_CDC_CM_OVER_DATA) || From owner-p4-projects@FreeBSD.ORG Sat Oct 25 17:01:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BD561065671; Sat, 25 Oct 2008 17:01: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 C681E10656A3 for ; Sat, 25 Oct 2008 17:01:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2A258FC16 for ; Sat, 25 Oct 2008 17:01:16 +0000 (UTC) (envelope-from hselasky@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 m9PH1Gir089940 for ; Sat, 25 Oct 2008 17:01:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PH1GKQ089938 for perforce@freebsd.org; Sat, 25 Oct 2008 17:01:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 25 Oct 2008 17:01:16 GMT Message-Id: <200810251701.m9PH1GKQ089938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151902 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, 25 Oct 2008 17:01:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=151902 Change 151902 by hselasky@hselasky_laptop001 on 2008/10/25 17:01:03 Add missing copyrights and fragment USB modules into smaller parts. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#6 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#5 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#14 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#13 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#8 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#18 edit .. //depot/projects/usb/src/sys/modules/usb2/Makefile#3 edit .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#7 edit .. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#7 edit .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#5 edit .. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#5 edit .. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#4 edit .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#5 edit .. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#1 add .. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#1 add Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#8 (text+ko) ==== @@ -365,6 +365,7 @@ DRIVER_MODULE(ng_ubt, ushub, ubt_driver, ubt_devclass, ubt_modevent, 0); MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION); MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); +MODULE_DEPEND(ng_ubt, usb2_bluetooth, 1, 1, 1); MODULE_DEPEND(ng_ubt, usb2_core, 1, 1, 1); /**************************************************************************** ==== //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#7 (text+ko) ==== @@ -169,8 +169,8 @@ .size = sizeof(struct ubtbcmfw_softc), }; -DRIVER_MODULE(ubtbcmfw, ushub, ubtbcmfw_driver, ubtbcmfw_devclass, - NULL, 0); +DRIVER_MODULE(ubtbcmfw, ushub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0); +MODULE_DEPEND(ubtbcmfw, usb2_bluetooth, 1, 1, 1); MODULE_DEPEND(ubtbcmfw, usb2_core, 1, 1, 1); /* ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#12 (text+ko) ==== @@ -494,3 +494,5 @@ DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0); DRIVER_MODULE(ehci, cardbus, ehci_driver, ehci_devclass, 0, 0); +MODULE_DEPEND(ehci, usb2_controller, 1, 1, 1); +MODULE_DEPEND(ehci, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#6 (text+ko) ==== @@ -252,3 +252,5 @@ static devclass_t musbotg_devclass; DRIVER_MODULE(musbotg, atmelarm, musbotg_driver, musbotg_devclass, 0, 0); +MODULE_DEPEND(musbotg, usb2_controller, 1, 1, 1); +MODULE_DEPEND(musbotg, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#9 (text) ==== @@ -228,3 +228,5 @@ static devclass_t ohci_devclass; DRIVER_MODULE(ohci, atmelarm, ohci_driver, ohci_devclass, 0, 0); +MODULE_DEPEND(ohci, usb2_controller, 1, 1, 1); +MODULE_DEPEND(ohci, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#10 (text+ko) ==== @@ -388,3 +388,5 @@ DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0); DRIVER_MODULE(ohci, cardbus, ohci_driver, ohci_devclass, 0, 0); +MODULE_DEPEND(ohci, usb2_controller, 1, 1, 1); +MODULE_DEPEND(ohci, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#11 (text+ko) ==== @@ -449,3 +449,5 @@ DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0); DRIVER_MODULE(uhci, cardbus, uhci_driver, uhci_devclass, 0, 0); +MODULE_DEPEND(uhci, usb2_controller, 1, 1, 1); +MODULE_DEPEND(uhci, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#2 (text+ko) ==== @@ -75,6 +75,7 @@ static devclass_t uss820dci_devclass; DRIVER_MODULE(uss820, atmelarm, uss820dci_driver, uss820dci_devclass, 0, 0); +MODULE_DEPEND(uss820, usb2_controller, 1, 1, 1); MODULE_DEPEND(uss820, usb2_core, 1, 1, 1); static const char *const uss820_desc = "USS820 USB Device Controller"; ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#10 (text+ko) ==== @@ -89,6 +89,7 @@ #include #include +MODULE_DEPEND(aue, usb2_ethernet, 1, 1, 1); MODULE_DEPEND(aue, usb2_core, 1, 1, 1); MODULE_DEPEND(aue, ether, 1, 1, 1); MODULE_DEPEND(aue, miibus, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#10 (text+ko) ==== @@ -103,6 +103,7 @@ #include #include +MODULE_DEPEND(axe, usb2_ethernet, 1, 1, 1); MODULE_DEPEND(axe, usb2_core, 1, 1, 1); MODULE_DEPEND(axe, ether, 1, 1, 1); MODULE_DEPEND(axe, miibus, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#10 (text+ko) ==== @@ -184,6 +184,7 @@ DRIVER_MODULE(cdce, ushub, cdce_driver, cdce_devclass, NULL, 0); MODULE_VERSION(cdce, 1); +MODULE_DEPEND(cdce, usb2_ethernet, 1, 1, 1); MODULE_DEPEND(cdce, usb2_core, 1, 1, 1); MODULE_DEPEND(cdce, ether, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#10 (text+ko) ==== @@ -196,6 +196,7 @@ static devclass_t cue_devclass; DRIVER_MODULE(cue, ushub, cue_driver, cue_devclass, NULL, 0); +MODULE_DEPEND(cue, usb2_ethernet, 1, 1, 1); MODULE_DEPEND(cue, usb2_core, 1, 1, 1); MODULE_DEPEND(cue, ether, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#10 (text+ko) ==== @@ -237,6 +237,7 @@ static devclass_t kue_devclass; DRIVER_MODULE(kue, ushub, kue_driver, kue_devclass, NULL, 0); +MODULE_DEPEND(kue, usb2_ethernet, 1, 1, 1); MODULE_DEPEND(kue, usb2_core, 1, 1, 1); MODULE_DEPEND(kue, ether, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#10 (text+ko) ==== @@ -249,6 +249,7 @@ DRIVER_MODULE(rue, ushub, rue_driver, rue_devclass, NULL, 0); DRIVER_MODULE(miibus, rue, miibus_driver, miibus_devclass, 0, 0); +MODULE_DEPEND(rue, usb2_ethernet, 1, 1, 1); MODULE_DEPEND(rue, usb2_core, 1, 1, 1); MODULE_DEPEND(rue, ether, 1, 1, 1); MODULE_DEPEND(rue, miibus, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#10 (text+ko) ==== @@ -209,6 +209,7 @@ DRIVER_MODULE(udav, ushub, udav_driver, udav_devclass, NULL, 0); DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, 0, 0); +MODULE_DEPEND(udav, usb2_ethernet, 1, 1, 1); MODULE_DEPEND(udav, usb2_core, 1, 1, 1); MODULE_DEPEND(udav, ether, 1, 1, 1); MODULE_DEPEND(udav, miibus, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#8 (text+ko) ==== @@ -195,6 +195,7 @@ }; DRIVER_MODULE(uscanner, ushub, uscanner_driver, uscanner_devclass, NULL, 0); +MODULE_DEPEND(uscanner, usb2_image, 1, 1, 1); MODULE_DEPEND(uscanner, usb2_core, 1, 1, 1); /* ==== //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#9 (text+ko) ==== @@ -818,4 +818,5 @@ }; DRIVER_MODULE(uhid, ushub, uhid_driver, uhid_devclass, NULL, 0); +MODULE_DEPEND(uhid, usb2_input, 1, 1, 1); MODULE_DEPEND(uhid, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#9 (text+ko) ==== @@ -1499,4 +1499,5 @@ }; DRIVER_MODULE(ukbd, ushub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); +MODULE_DEPEND(ukbd, usb2_input, 1, 1, 1); MODULE_DEPEND(ukbd, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#9 (text+ko) ==== @@ -907,4 +907,5 @@ }; DRIVER_MODULE(ums, ushub, ums_driver, ums_devclass, NULL, 0); +MODULE_DEPEND(ums, usb2_input, 1, 1, 1); MODULE_DEPEND(ums, usb2_core, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#8 (text+ko) ==== @@ -248,6 +248,7 @@ DRIVER_MODULE(udbp, ushub, udbp_driver, udbp_devclass, udbp_modload, 0); MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); +MODULE_DEPEND(udbp, usb2_misc, 1, 1, 1); MODULE_DEPEND(udbp, usb2_core, 1, 1, 1); static int ==== //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#5 (text+ko) ==== @@ -104,8 +104,9 @@ .size = sizeof(struct ufm_softc), }; +MODULE_DEPEND(ufm, usb2_misc, 1, 1, 1); +DRIVER_MODULE(ufm, ushub, ufm_driver, ufm_devclass, NULL, 0); MODULE_DEPEND(ufm, usb2_core, 1, 1, 1); -DRIVER_MODULE(ufm, ushub, ufm_driver, ufm_devclass, NULL, 0); static int ufm_probe(device_t dev) ==== //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#5 (text+ko) ==== @@ -59,6 +59,7 @@ #include +MODULE_DEPEND(ndis, usb2_ndis, 1, 1, 1); MODULE_DEPEND(ndis, usb2_core, 1, 1, 1); MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); MODULE_DEPEND(ndis, if_ndis, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#7 (text+ko) ==== @@ -172,6 +172,7 @@ }; DRIVER_MODULE(uark, ushub, uark_driver, uark_devclass, NULL, 0); +MODULE_DEPEND(uark, usb2_serial, 1, 1, 1); MODULE_DEPEND(uark, usb2_core, 1, 1, 1); MODULE_DEPEND(uark, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#10 (text+ko) ==== @@ -311,6 +311,7 @@ }; DRIVER_MODULE(ubsa, ushub, ubsa_driver, ubsa_devclass, NULL, 0); +MODULE_DEPEND(ubsa, usb2_serial, 1, 1, 1); MODULE_DEPEND(ubsa, usb2_core, 1, 1, 1); MODULE_DEPEND(ubsa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#7 (text+ko) ==== @@ -225,6 +225,7 @@ }; DRIVER_MODULE(ubser, ushub, ubser_driver, ubser_devclass, NULL, 0); +MODULE_DEPEND(ubser, usb2_serial, 1, 1, 1); MODULE_DEPEND(ubser, usb2_core, 1, 1, 1); MODULE_DEPEND(ubser, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#8 (text+ko) ==== @@ -1033,5 +1033,6 @@ static devclass_t uchcom_devclass; DRIVER_MODULE(uchcom, ushub, uchcom_driver, uchcom_devclass, NULL, 0); +MODULE_DEPEND(uchcom, usb2_serial, 1, 1, 1); MODULE_DEPEND(uchcom, usb2_core, 1, 1, 1); MODULE_DEPEND(uchcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#8 (text+ko) ==== @@ -171,6 +171,7 @@ }; DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0); +MODULE_DEPEND(ucycom, usb2_serial, 1, 1, 1); MODULE_DEPEND(ucycom, usb2_core, 1, 1, 1); MODULE_DEPEND(ucycom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#10 (text+ko) ==== @@ -333,6 +333,7 @@ }; DRIVER_MODULE(ufoma, ushub, ufoma_driver, ufoma_devclass, NULL, 0); +MODULE_DEPEND(ufoma, usb2_serial, 1, 1, 1); MODULE_DEPEND(ufoma, usb2_core, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#8 (text+ko) ==== @@ -220,6 +220,7 @@ }; DRIVER_MODULE(uftdi, ushub, uftdi_driver, uftdi_devclass, NULL, 0); +MODULE_DEPEND(uftdi, usb2_serial, 1, 1, 1); MODULE_DEPEND(uftdi, usb2_core, 1, 1, 1); MODULE_DEPEND(uftdi, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#11 (text+ko) ==== @@ -170,6 +170,7 @@ }; DRIVER_MODULE(ugensa, ushub, ugensa_driver, ugensa_devclass, NULL, 0); +MODULE_DEPEND(ugensa, usb2_serial, 1, 1, 1); MODULE_DEPEND(ugensa, usb2_core, 1, 1, 1); MODULE_DEPEND(ugensa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#9 (text+ko) ==== @@ -1092,6 +1092,7 @@ }; DRIVER_MODULE(uipaq, ushub, uipaq_driver, uipaq_devclass, NULL, 0); +MODULE_DEPEND(uipaq, usb2_serial, 1, 1, 1); MODULE_DEPEND(uipaq, usb2_core, 1, 1, 1); MODULE_DEPEND(uipaq, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#8 (text+ko) ==== @@ -795,3 +795,4 @@ DRIVER_MODULE(ulpt, ushub, ulpt_driver, ulpt_devclass, NULL, 0); MODULE_DEPEND(ulpt, usb2_core, 1, 1, 1); +MODULE_DEPEND(ulpt, usb2_serial, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#7 (text+ko) ==== @@ -235,6 +235,7 @@ }; DRIVER_MODULE(umct, ushub, umct_driver, umct_devclass, NULL, 0); +MODULE_DEPEND(umct, usb2_serial, 1, 1, 1); MODULE_DEPEND(umct, usb2_core, 1, 1, 1); MODULE_DEPEND(umct, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#10 (text+ko) ==== @@ -276,6 +276,7 @@ }; DRIVER_MODULE(umodem, ushub, umodem_driver, umodem_devclass, NULL, 0); +MODULE_DEPEND(umodem, usb2_serial, 1, 1, 1); MODULE_DEPEND(umodem, usb2_core, 1, 1, 1); MODULE_DEPEND(umodem, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(umodem, UMODEM_MODVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#8 (text+ko) ==== @@ -294,6 +294,7 @@ }; DRIVER_MODULE(umoscom, ushub, umoscom_driver, umoscom_devclass, NULL, 0); +MODULE_DEPEND(umoscom, usb2_serial, 1, 1, 1); MODULE_DEPEND(umoscom, usb2_core, 1, 1, 1); MODULE_DEPEND(umoscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#9 (text+ko) ==== @@ -329,6 +329,7 @@ }; DRIVER_MODULE(uplcom, ushub, uplcom_driver, uplcom_devclass, NULL, 0); +MODULE_DEPEND(uplcom, usb2_serial, 1, 1, 1); MODULE_DEPEND(uplcom, usb2_core, 1, 1, 1); MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uplcom, UPLCOM_MODVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#8 (text+ko) ==== @@ -254,6 +254,7 @@ }; DRIVER_MODULE(uvisor, ushub, uvisor_driver, uvisor_devclass, NULL, 0); +MODULE_DEPEND(uvisor, usb2_serial, 1, 1, 1); MODULE_DEPEND(uvisor, usb2_core, 1, 1, 1); MODULE_DEPEND(uvisor, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#8 (text+ko) ==== @@ -281,6 +281,7 @@ }; DRIVER_MODULE(uvscom, ushub, uvscom_driver, uvscom_devclass, NULL, 0); +MODULE_DEPEND(uvscom, usb2_serial, 1, 1, 1); MODULE_DEPEND(uvscom, usb2_core, 1, 1, 1); MODULE_DEPEND(uvscom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uvscom, UVSCOM_MODVER); ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#14 (text+ko) ==== @@ -3780,6 +3780,7 @@ } DRIVER_MODULE(uaudio, ushub, uaudio_driver, uaudio_devclass, NULL, 0); +MODULE_DEPEND(uaudio, usb2_sound, 1, 1, 1); MODULE_DEPEND(uaudio, usb2_core, 1, 1, 1); MODULE_DEPEND(uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(uaudio, 1); ==== //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#8 (text) ==== @@ -272,6 +272,7 @@ }; DRIVER_MODULE(atausb, ushub, atausb2_driver, atausb2_devclass, 0, 0); +MODULE_DEPEND(atausb, usb2_storage, 1, 1, 1); MODULE_DEPEND(atausb, usb2_core, 1, 1, 1); MODULE_VERSION(atausb, 1); ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#13 (text+ko) ==== @@ -1263,6 +1263,7 @@ }; DRIVER_MODULE(umass, ushub, umass_driver, umass_devclass, umass_driver_loaded, 0); +MODULE_DEPEND(umass, usb2_storage, 1, 1, 1); MODULE_DEPEND(umass, usb2_core, 1, 1, 1); MODULE_DEPEND(umass, cam, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#8 (text+ko) ==== @@ -185,6 +185,7 @@ }; DRIVER_MODULE(urio, ushub, urio_driver, urio_devclass, NULL, 0); +MODULE_DEPEND(urio, usb2_storage, 1, 1, 1); MODULE_DEPEND(urio, usb2_core, 1, 1, 1); static int ==== //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#11 (text+ko) ==== @@ -231,6 +231,7 @@ DRIVER_MODULE(ustorage_fs, ushub, ustorage_fs_driver, ustorage_fs_devclass, NULL, 0); MODULE_VERSION(ustorage_fs, 0); +MODULE_DEPEND(ustorage_fs, usb2_storage, 1, 1, 1); MODULE_DEPEND(ustorage_fs, usb2_core, 1, 1, 1); struct usb2_config ustorage_fs_bbb_config[USTORAGE_FS_T_BBB_MAX] = { ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#17 (text+ko) ==== @@ -415,6 +415,7 @@ }; DRIVER_MODULE(rum, ushub, rum_driver, rum_devclass, NULL, 0); +MODULE_DEPEND(rum, usb2_wlan, 1, 1, 1); MODULE_DEPEND(rum, usb2_core, 1, 1, 1); MODULE_DEPEND(rum, wlan, 1, 1, 1); MODULE_DEPEND(rum, wlan_amrr, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#17 (text+ko) ==== @@ -406,6 +406,7 @@ }; DRIVER_MODULE(ural, ushub, ural_driver, ural_devclass, NULL, 0); +MODULE_DEPEND(ural, usb2_wlan, 1, 1, 1); MODULE_DEPEND(ural, usb2_core, 1, 1, 1); MODULE_DEPEND(ural, wlan, 1, 1, 1); MODULE_DEPEND(ural, wlan_amrr, 1, 1, 1); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#18 (text+ko) ==== @@ -304,6 +304,7 @@ }; DRIVER_MODULE(zyd, ushub, zyd_driver, zyd_devclass, NULL, 0); +MODULE_DEPEND(zyd, usb2_wlan, 1, 1, 1); MODULE_DEPEND(zyd, usb2_core, 1, 1, 1); MODULE_DEPEND(zyd, wlan, 1, 1, 1); MODULE_DEPEND(zyd, wlan_amrr, 1, 1, 1); ==== //depot/projects/usb/src/sys/modules/usb2/Makefile#3 (text+ko) ==== @@ -1,22 +1,89 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# - SUBDIR = SUBDIR += bluetooth +SUBDIR += bluetooth_ng +SUBDIR += bluetooth_fw SUBDIR += controller +SUBDIR += controller_at91dci +SUBDIR += controller_ehci +SUBDIR += controller_musb +SUBDIR += controller_ohci +SUBDIR += controller_uhci +SUBDIR += controller_uss820dci SUBDIR += core SUBDIR += ethernet +SUBDIR += ethernet_aue +SUBDIR += ethernet_axe +SUBDIR += ethernet_cdce +SUBDIR += ethernet_cue +SUBDIR += ethernet_dav +SUBDIR += ethernet_kue +SUBDIR += ethernet_rue SUBDIR += image SUBDIR += input +SUBDIR += input_hid +SUBDIR += input_kbd +SUBDIR += input_ms SUBDIR += misc +SUBDIR += misc_dbp +SUBDIR += misc_fm SUBDIR += ndis SUBDIR += quirk +SUBDIR += scanner SUBDIR += serial +SUBDIR += serial_ark +SUBDIR += serial_bsa +SUBDIR += serial_bser +SUBDIR += serial_chcom +SUBDIR += serial_cycom +SUBDIR += serial_foma +SUBDIR += serial_ftdi +SUBDIR += serial_gensa +SUBDIR += serial_ipaq +SUBDIR += serial_lpt +SUBDIR += serial_mct +SUBDIR += serial_modem +SUBDIR += serial_moscom +SUBDIR += serial_plcom +SUBDIR += serial_visor +SUBDIR += serial_vscom SUBDIR += sound SUBDIR += storage +SUBDIR += storage_ata +SUBDIR += storage_fs +SUBDIR += storage_mass +SUBDIR += storage_rio SUBDIR += template SUBDIR += wlan +SUBDIR += wlan_ral +SUBDIR += wlan_rum +SUBDIR += wlan_zyd .include + ==== //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#4 (text+ko) ==== @@ -10,9 +10,6 @@ SRCS= SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h SRCS+= opt_usb.h opt_bus.h opt_netgraph.h - SRCS+= usb2_bluetooth.c -SRCS+= ng_ubt2.c -SRCS+= ubtbcmfw2.c .include ==== //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#7 (text+ko) ==== @@ -1,6 +1,29 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# S= ${.CURDIR}/../../.. @@ -10,28 +33,6 @@ SRCS= SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h SRCS+= opt_usb.h pci_if.h opt_bus.h card_if.h - -# -# The "usb2_controller.c" file must be first to -# resolve a "MODULE_DRIVER()" race. -# - SRCS+= usb2_controller.c -.if defined(HAS_ATMELARM) -SRCS+= at91dci_atmelarm.c -SRCS+= ohci2_atmelarm.c -SRCS+= uss820dci_atmelarm.c -.endif - -SRCS+= at91dci.c -SRCS+= ehci2.c -SRCS+= ehci2_pci.c -SRCS+= musb2_otg.c -SRCS+= ohci2.c -SRCS+= ohci2_pci.c -SRCS+= uhci2.c -SRCS+= uhci2_pci.c -SRCS+= uss820dci.c - .include ==== //depot/projects/usb/src/sys/modules/usb2/core/Makefile#7 (text+ko) ==== @@ -1,6 +1,29 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# S= ${.CURDIR}/../../.. ==== //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#5 (text+ko) ==== @@ -1,6 +1,29 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# S= ${.CURDIR}/../../.. @@ -10,14 +33,6 @@ SRCS= SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h SRCS+= opt_usb.h miibus_if.h opt_inet.h opt_bus.h -SRCS+= if_aue2.c -SRCS+= if_axe2.c -SRCS+= if_cdce2.c -SRCS+= if_cue2.c -SRCS+= if_kue2.c -SRCS+= if_rue2.c -SRCS+= if_udav2.c SRCS+= usb2_ethernet.c .include - ==== //depot/projects/usb/src/sys/modules/usb2/image/Makefile#4 (text+ko) ==== @@ -1,6 +1,29 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# S= ${.CURDIR}/../../.. @@ -10,8 +33,6 @@ SRCS= SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h SRCS+= opt_usb.h opt_bus.h - SRCS+= usb2_image.c -SRCS+= uscanner2.c .include ==== //depot/projects/usb/src/sys/modules/usb2/input/Makefile#5 (text+ko) ==== @@ -1,6 +1,29 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# S= ${.CURDIR}/../../.. @@ -10,10 +33,6 @@ SRCS= SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h SRCS+= opt_usb.h opt_bus.h opt_compat.h opt_kbd.h opt_ukbd.h -SRCS+= uhid2.c -SRCS+= ukbd2.c -SRCS+= ums2.c SRCS+= usb2_input.c .include - ==== //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#4 (text+ko) ==== @@ -1,6 +1,29 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# S= ${.CURDIR}/../../.. @@ -10,9 +33,6 @@ SRCS= SRCS+= bus_if.h usb2_if.h device_if.h vnode_if.h SRCS+= opt_usb.h opt_bus.h opt_netgraph.h - SRCS+= usb2_misc.c -SRCS+= ufm2.c -SRCS+= udbp2.c .include ==== //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#4 (text+ko) ==== @@ -1,6 +1,29 @@ # # $FreeBSD$ # +# Copyright (c) 2008 Hans Petter Selasky. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 25 17:22:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04AD0106567E; Sat, 25 Oct 2008 17:22:39 +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 A25C51065674 for ; Sat, 25 Oct 2008 17:22:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F5458FC08 for ; Sat, 25 Oct 2008 17:22:38 +0000 (UTC) (envelope-from hselasky@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 m9PHMcCH093489 for ; Sat, 25 Oct 2008 17:22:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PHMc26093487 for perforce@freebsd.org; Sat, 25 Oct 2008 17:22:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 25 Oct 2008 17:22:38 GMT Message-Id: <200810251722.m9PHMc26093487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 151904 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, 25 Oct 2008 17:22:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=151904 Change 151904 by hselasky@hselasky_laptop001 on 2008/10/25 17:22:02 Fine grain USB kernel options. Affected files ... .. //depot/projects/usb/src/sys/arm/conf/KB920X#14 edit .. //depot/projects/usb/src/sys/conf/files#37 edit Differences ... ==== //depot/projects/usb/src/sys/arm/conf/KB920X#14 (text) ==== @@ -99,14 +99,21 @@ # USB support device at91rm9200 device usb2_core -device usb2_controller # EHCI/OHCI/UHCI/AT91DCI +device usb2_controller +device usb2_controller_at91dci +device usb2_controller_ohci device usb2_storage # USB mass storage support +device usb2_storage_mass +device usb2_storage_fs device usb2_ethernet # USB ethernet support +device usb2_ethernet_cdce device usb2_wlan # USB wireless LAN support device usb2_serial # USB serial support +device usb2_serial_modem device usb2_quirk # USB quirks device usb2_template # Device Side Mode USB templates -device usb2_image # USB Scanner support +device usb2_image # USB Image support +device usb2_scanner # USB Ethernet, requires miibus device miibus ==== //depot/projects/usb/src/sys/conf/files#37 (text+ko) ==== @@ -1337,26 +1337,26 @@ # # USB2 controller drivers # -dev/usb2/controller/at91dci.c optional usb2_core usb2_controller -dev/usb2/controller/at91dci_atmelarm.c optional usb2_core usb2_controller at91rm9200 -dev/usb2/controller/ehci2.c optional usb2_core usb2_controller -dev/usb2/controller/ehci2_pci.c optional usb2_core usb2_controller pci -dev/usb2/controller/ohci2.c optional usb2_core usb2_controller -dev/usb2/controller/ohci2_atmelarm.c optional usb2_core usb2_controller at91rm9200 -dev/usb2/controller/ohci2_pci.c optional usb2_core usb2_controller pci -dev/usb2/controller/uhci2.c optional usb2_core usb2_controller -dev/usb2/controller/uhci2_pci.c optional usb2_core usb2_controller pci +dev/usb2/controller/at91dci.c optional usb2_core usb2_controller usb2_controller_at91dci +dev/usb2/controller/at91dci_atmelarm.c optional usb2_core usb2_controller usb2_controller_at91dci at91rm9200 +dev/usb2/controller/musb2_otg.c optional usb2_core usb2_controller usb2_controller_musb +dev/usb2/controller/musb2_otg_atmelarm.c optional usb2_core usb2_controller usb2_controller_musb at91rm9200 +dev/usb2/controller/ehci2.c optional usb2_core usb2_controller usb2_controller_ehci +dev/usb2/controller/ehci2_pci.c optional usb2_core usb2_controller usb2_controller_ehci pci +dev/usb2/controller/ohci2.c optional usb2_core usb2_controller usb2_controller_ohci +dev/usb2/controller/ohci2_atmelarm.c optional usb2_core usb2_controller usb2_controller_ohci at91rm9200 +dev/usb2/controller/ohci2_pci.c optional usb2_core usb2_controller usb2_controller_ohci pci +dev/usb2/controller/uhci2.c optional usb2_core usb2_controller usb2_controller_uhci +dev/usb2/controller/uhci2_pci.c optional usb2_core usb2_controller usb2_controller_uhci pci dev/usb2/controller/usb2_controller.c optional usb2_core usb2_controller # # USB2 storage drivers # -# NOTE: ata-usb conflicts with umass -# dev/usb2/storage/ata-usb2.c optional usb2_core usb2_storage -# -dev/usb2/storage/umass2.c optional usb2_core usb2_storage -dev/usb2/storage/urio2.c optional usb2_core usb2_storage +dev/usb2/storage/ata-usb2.c optional usb2_core usb2_storage usb2_storage_ata +dev/usb2/storage/umass2.c optional usb2_core usb2_storage usb2_storage_mass +dev/usb2/storage/urio2.c optional usb2_core usb2_storage usb2_storage_rio dev/usb2/storage/usb2_storage.c optional usb2_core usb2_storage -dev/usb2/storage/ustorage2_fs.c optional usb2_core usb2_storage +dev/usb2/storage/ustorage2_fs.c optional usb2_core usb2_storage usb2_storage_fs # # USB2 NDIS driver # @@ -1391,60 +1391,60 @@ # # USB2 ethernet drivers # -dev/usb2/ethernet/if_aue2.c optional usb2_core usb2_ethernet -dev/usb2/ethernet/if_axe2.c optional usb2_core usb2_ethernet -dev/usb2/ethernet/if_cdce2.c optional usb2_core usb2_ethernet -dev/usb2/ethernet/if_cue2.c optional usb2_core usb2_ethernet -dev/usb2/ethernet/if_kue2.c optional usb2_core usb2_ethernet -dev/usb2/ethernet/if_rue2.c optional usb2_core usb2_ethernet -dev/usb2/ethernet/if_udav2.c optional usb2_core usb2_ethernet +dev/usb2/ethernet/if_aue2.c optional usb2_core usb2_ethernet usb2_ethernet_aue +dev/usb2/ethernet/if_axe2.c optional usb2_core usb2_ethernet usb2_ethernet_axe +dev/usb2/ethernet/if_cdce2.c optional usb2_core usb2_ethernet usb2_ethernet_cdce +dev/usb2/ethernet/if_cue2.c optional usb2_core usb2_ethernet usb2_ethernet_cue +dev/usb2/ethernet/if_kue2.c optional usb2_core usb2_ethernet usb2_ethernet_kue +dev/usb2/ethernet/if_rue2.c optional usb2_core usb2_ethernet usb2_ethernet_rue +dev/usb2/ethernet/if_udav2.c optional usb2_core usb2_ethernet usb2_ethernet_udav dev/usb2/ethernet/usb2_ethernet.c optional usb2_core usb2_ethernet # # USB2 WLAN drivers # -dev/usb2/wlan/if_rum2.c optional usb2_core usb2_wlan -dev/usb2/wlan/if_ural2.c optional usb2_core usb2_wlan -dev/usb2/wlan/if_zyd2.c optional usb2_core usb2_wlan +dev/usb2/wlan/if_rum2.c optional usb2_core usb2_wlan usb2_wlan_rum +dev/usb2/wlan/if_ural2.c optional usb2_core usb2_wlan usb2_wlan_ral +dev/usb2/wlan/if_zyd2.c optional usb2_core usb2_wlan usb2_wlan_zyd dev/usb2/wlan/usb2_wlan.c optional usb2_core usb2_wlan # # USB2 serial and parallel port drivers # -dev/usb2/serial/uark2.c optional usb2_core usb2_serial -dev/usb2/serial/ubsa2.c optional usb2_core usb2_serial -dev/usb2/serial/ubser2.c optional usb2_core usb2_serial -dev/usb2/serial/uchcom2.c optional usb2_core usb2_serial -dev/usb2/serial/ucycom2.c optional usb2_core usb2_serial -dev/usb2/serial/ufoma2.c optional usb2_core usb2_serial -dev/usb2/serial/uftdi2.c optional usb2_core usb2_serial -dev/usb2/serial/ugensa2.c optional usb2_core usb2_serial -dev/usb2/serial/uipaq2.c optional usb2_core usb2_serial -dev/usb2/serial/ulpt2.c optional usb2_core usb2_serial -dev/usb2/serial/umct2.c optional usb2_core usb2_serial -dev/usb2/serial/umodem2.c optional usb2_core usb2_serial -dev/usb2/serial/umoscom2.c optional usb2_core usb2_serial -dev/usb2/serial/uplcom2.c optional usb2_core usb2_serial +dev/usb2/serial/uark2.c optional usb2_core usb2_serial usb2_serial_ark +dev/usb2/serial/ubsa2.c optional usb2_core usb2_serial usb2_serial_bsa +dev/usb2/serial/ubser2.c optional usb2_core usb2_serial usb2_serial_bser +dev/usb2/serial/uchcom2.c optional usb2_core usb2_serial usb2_serial_chcom +dev/usb2/serial/ucycom2.c optional usb2_core usb2_serial usb2_serial_cycom +dev/usb2/serial/ufoma2.c optional usb2_core usb2_serial usb2_serial_foma +dev/usb2/serial/uftdi2.c optional usb2_core usb2_serial usb2_serial_ftdi +dev/usb2/serial/ugensa2.c optional usb2_core usb2_serial usb2_serial_gensa +dev/usb2/serial/uipaq2.c optional usb2_core usb2_serial usb2_serial_ipaq +dev/usb2/serial/ulpt2.c optional usb2_core usb2_serial usb2_serial_lpt +dev/usb2/serial/umct2.c optional usb2_core usb2_serial usb2_serial_mct +dev/usb2/serial/umodem2.c optional usb2_core usb2_serial usb2_serial_modem +dev/usb2/serial/umoscom2.c optional usb2_core usb2_serial usb2_serial_moscom +dev/usb2/serial/uplcom2.c optional usb2_core usb2_serial usb2_serial_plcom dev/usb2/serial/usb2_serial.c optional usb2_core usb2_serial -dev/usb2/serial/uvisor2.c optional usb2_core usb2_serial -dev/usb2/serial/uvscom2.c optional usb2_core usb2_serial +dev/usb2/serial/uvisor2.c optional usb2_core usb2_serial usb2_serial_visor +dev/usb2/serial/uvscom2.c optional usb2_core usb2_serial usb2_serial_vscom # # USB2 bluetooth drivers # dev/usb2/bluetooth/usb2_bluetooth.c optional usb2_core usb2_bluetooth -dev/usb2/bluetooth/ng_ubt2.c optional usb2_core usb2_bluetooth -dev/usb2/bluetooth/ubtbcmfw2.c optional usb2_core usb2_bluetooth +dev/usb2/bluetooth/ng_ubt2.c optional usb2_core usb2_bluetooth usb2_bluetooth_ng +dev/usb2/bluetooth/ubtbcmfw2.c optional usb2_core usb2_bluetooth usb2_bluetooth_fw # # USB2 misc drivers # dev/usb2/misc/usb2_misc.c optional usb2_core usb2_misc -dev/usb2/misc/ufm2.c optional usb2_core usb2_misc -dev/usb2/misc/udbp2.c optional usb2_core usb2_misc +dev/usb2/misc/ufm2.c optional usb2_core usb2_misc usb2_misc_fm +dev/usb2/misc/udbp2.c optional usb2_core usb2_misc usb2_misc_dbp # # USB2 input drivers # -dev/usb2/input/uhid2.c optional usb2_core usb2_input -dev/usb2/input/ukbd2.c optional usb2_core usb2_input -dev/usb2/input/ums2.c optional usb2_core usb2_input +dev/usb2/input/uhid2.c optional usb2_core usb2_input usb2_input_hid +dev/usb2/input/ukbd2.c optional usb2_core usb2_input usb2_input_kbd +dev/usb2/input/ums2.c optional usb2_core usb2_input usb2_input_ums dev/usb2/input/usb2_input.c optional usb2_core usb2_input # # USB2 quirks @@ -1461,7 +1461,7 @@ # USB2 image drivers # dev/usb2/image/usb2_image.c optional usb2_core usb2_image -dev/usb2/image/uscanner2.c optional usb2_core usb2_image +dev/usb2/image/uscanner2.c optional usb2_core usb2_image usb2_scanner # # USB2 sound and MIDI drivers # From owner-p4-projects@FreeBSD.ORG Sat Oct 25 19:29:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23F061065670; Sat, 25 Oct 2008 19:29: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 DD0411065681 for ; Sat, 25 Oct 2008 19:29:55 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CABB58FC0A for ; Sat, 25 Oct 2008 19:29:55 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9PJTt2E010205 for ; Sat, 25 Oct 2008 19:29:55 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PJTtOT010203 for perforce@freebsd.org; Sat, 25 Oct 2008 19:29:55 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 25 Oct 2008 19:29:55 GMT Message-Id: <200810251929.m9PJTtOT010203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151913 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, 25 Oct 2008 19:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=151913 Change 151913 by peter@peter_cheese on 2008/10/25 19:28:57 Make the sysctl wrapper work a little closer to reality. oldlenp is always written to if non null. This is used to query ideal buffer sizes. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#17 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#17 (text+ko) ==== @@ -872,16 +872,20 @@ PRE_MEM_READ("sysctl(name)", ARG1, ARG2 * sizeof(int *)); if (ARG5 != (UWord)NULL) PRE_MEM_READ("sysctl(new)", (Addr)ARG5, ARG6); - if (ARG3 != (UWord)NULL) { - PRE_MEM_READ("sysctl(oldlenp)", (Addr)ARG4, sizeof(vki_size_t)); - PRE_MEM_WRITE("sysctl(oldval)", (Addr)ARG3, *(vki_size_t *)ARG4); + if (ARG4 != (UWord)NULL) { + if (ARG3 != (UWord)NULL) { + PRE_MEM_READ("sysctl(oldlenp)", (Addr)ARG4, sizeof(vki_size_t)); + PRE_MEM_WRITE("sysctl(oldval)", (Addr)ARG3, *(vki_size_t *)ARG4); + } + PRE_MEM_WRITE("sysctl(oldlenp)", (Addr)ARG4, sizeof(vki_size_t)); } } POST(sys___sysctl) { - if (ARG3 != (UWord)NULL) { + if (ARG4 != (UWord)NULL) { POST_MEM_WRITE((Addr)ARG4, sizeof(vki_size_t)); - POST_MEM_WRITE((Addr)ARG3, *(vki_size_t *)ARG4); + if (ARG3 != (UWord)NULL) + POST_MEM_WRITE((Addr)ARG3, *(vki_size_t *)ARG4); } } From owner-p4-projects@FreeBSD.ORG Sat Oct 25 20:03:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5046C106567C; Sat, 25 Oct 2008 20:03:30 +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 13F7A1065676 for ; Sat, 25 Oct 2008 20:03:30 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 019538FC22 for ; Sat, 25 Oct 2008 20:03:30 +0000 (UTC) (envelope-from andrew@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 m9PK3Txo013931 for ; Sat, 25 Oct 2008 20:03:29 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PK3TbM013929 for perforce@freebsd.org; Sat, 25 Oct 2008 20:03:29 GMT (envelope-from andrew@freebsd.org) Date: Sat, 25 Oct 2008 20:03:29 GMT Message-Id: <200810252003.m9PK3TbM013929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 151915 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, 25 Oct 2008 20:03:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=151915 Change 151915 by andrew@andrew_bender on 2008/10/25 20:03:14 Adjust dump_avail and phys_avail to be within physical memory Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#8 (text+ko) ==== @@ -370,8 +370,8 @@ * ARM_USE_SMALL_ALLOC uses dump_avail, so it must be filled before * calling pmap_bootstrap. */ - dump_avail[0] = KERNPHYSADDR; - dump_avail[1] = KERNPHYSADDR + memsize; + dump_avail[0] = PHYSADDR; + dump_avail[1] = PHYSADDR + memsize; dump_avail[2] = 0; dump_avail[3] = 0; @@ -385,7 +385,7 @@ physmem = memsize / PAGE_SIZE; phys_avail[0] = virtual_avail - KERNVIRTADDR + KERNPHYSADDR; - phys_avail[1] = KERNPHYSADDR + memsize; + phys_avail[1] = PHYSADDR + memsize; phys_avail[2] = 0; phys_avail[3] = 0; From owner-p4-projects@FreeBSD.ORG Sat Oct 25 20:14:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B527A1065671; Sat, 25 Oct 2008 20:14: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 7854D106569A for ; Sat, 25 Oct 2008 20:14: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 6491C8FC17 for ; Sat, 25 Oct 2008 20:14:42 +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 m9PKEg7m014795 for ; Sat, 25 Oct 2008 20:14:42 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PKEg3x014793 for perforce@freebsd.org; Sat, 25 Oct 2008 20:14:42 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 25 Oct 2008 20:14:42 GMT Message-Id: <200810252014.m9PKEg3x014793@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 151916 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, 25 Oct 2008 20:14:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=151916 Change 151916 by rene@rene_self on 2008/10/25 20:14:24 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/Makefile#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#10 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#13 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/Makefile#2 (text+ko) ==== @@ -1,12 +1,11 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/articles/cups/Makefile,v 1.1 2008/05/31 13:30:22 remko Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/articles/cups/Makefile,v 1.2 2008/10/24 23:01:06 pgj Exp $ # # Article: CUPS on FreeBSD DOC?= article FORMATS?= html -WITH_ARTICLE_TOC?= YES INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#2 (text+ko) ==== @@ -7,11 +7,11 @@
      CUPS on FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/cups/article.sgml,v 1.1 2008/05/31 13:30:22 remko Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/cups/article.sgml,v 1.3 2008/10/24 23:18:46 pgj Exp $ Chess - Grifin + Griffin
      chess@chessgriffin.com
       @@ -55,221 +55,219 @@ The main site for CUPS is . + - - Installing the CUPS Print Server + + Installing the CUPS Print Server - CUPS can be installed from ports - or by using a precompiled binary package. To install - CUPS from ports, issue the following - command from a root terminal: + CUPS can be installed from ports or + by using a precompiled binary package. To install + CUPS from ports, issue the following + command from a root terminal: - &prompt.root; cd /usr/ports/print/cups && make install clean + &prompt.root; cd /usr/ports/print/cups && make install clean - To install CUPS using a - precompiled binary, issue the following command from a root - terminal: + To install CUPS using a precompiled + binary, issue the following command from a root terminal: - &prompt.root; pkg_add -r cups + &prompt.root; pkg_add -r cups - Other optional, but recommended, ports or packages are - print/gutenprint-cups and - print/hplip, both of which add - drivers and utilities for a variety of printers. Once - installed, the CUPS configuration - files can be found in the directory - /usr/local/etc/cups. - + Other optional, but recommended, ports or packages are + print/gutenprint-cups and + print/hplip, both of which add + drivers and utilities for a variety of printers. Once installed, + the CUPS configuration files can be + found in the directory + /usr/local/etc/cups. + - - Configuring the CUPS Print Server + + Configuring the CUPS Print Server - After installation, a few files must edited in order to - configure the CUPS server. First, - create or modify, as the case may be, the file - /etc/devfs.rules and add the following - information to set the proper permissions on all potential - printer devices and to associate printers with the cups user - group: + After installation, a few files must edited in order to + configure the CUPS server. First, + create or modify, as the case may be, the file + /etc/devfs.rules and add the following + information to set the proper permissions on all potential printer + devices and to associate printers with the + cups user group: - [system=10] + [system=10] add path 'unlpt*' mode 0660 group cups add path 'ulpt*' mode 0660 group cups add path 'lpt*' mode 0660 group cups - Next, add two lines to /etc/rc.conf - as follows: + Next, add two lines to /etc/rc.conf as + follows: - cupsd_enable="YES" + cupsd_enable="YES" devfs_system_ruleset="system" - These two entries will start the - CUPS print server on boot and invoke - the local devfs rule created above, respectively. + These two entries will start the + CUPS print server on boot and invoke + the local devfs rule created above, respectively. + + In order to enable CUPS printing + under certain µsoft.windows; clients, the line below should + be uncommented in + /usr/local/etc/cups/mime.types and + /usr/local/etc/cups/mime.convs: - In order to enable CUPS printing - under certain µsoft.windows; clients, the line - application/octet-stream should be - uncommented in /usr/local/etc/cups/mime.types - and /usr/local/etc/cups/mime.convs. + application/octet-stream - Once these changes have been made, the &man.devfs.8; and - CUPS systems must both be restarted, - either by rebooting the computer or issuing the following two - commands in a root terminal: + Once these changes have been made, the &man.devfs.8; and + CUPS systems must both be restarted, + either by rebooting the computer or issuing the following two + commands in a root terminal: - &prompt.root; /etc/rc.d/devfs restart + &prompt.root; /etc/rc.d/devfs restart &prompt.root; /usr/local/etc/rc.d/cupsd restart + - + + Configuring Printers on the CUPS Print Server - - Configuring Printers on the CUPS Print Server + After the CUPS system has been + installed and configured, the administrator can begin configuring + the local printers attached to the CUPS + print server. This part of the process is very similar, if not + identical, to configuring CUPS printers + on other &unix;-based operating systems, such as a &linux; + distribution. - After the CUPS system has been - installed and configured, the administrator can begin configuring - the local printers attached to the - CUPS print server. This part of the - process is very similar, if not identical, to configuring - CUPS printers on other &unix;-based - operating systems, such as a &linux; distribution. + The primary means for managing and administering the + CUPS server is through the web-based + interface, which can be found by launching a web browser and + entering in the + browser's URL bar. If the CUPS server + is on another machine on the network, substitute the server's + local IP addresss for + localhost. The CUPS + web interface is fairly self-explanatory, as there are sections + for managing printers and print jobs, authorizing users, and more. + Additionally, on the right-hand side of the Administration screen + are several check-boxes allowing easy access to commonly-changed + settings, such as whether to share published printers connected to + the system, whether to allow remote administration of the + CUPS server, and whether to allow users + additional access and privileges to the printers and print + jobs. - The primary means for managing and administering the - CUPS server is through the web-based - interface, which can be found by launching a web browser and - entering http://localhost:631 in the - browser's URL bar. If the CUPS - server is on another machine on the network, substitute the - server's local IP addresss for - localhost. The CUPS - web interface is fairly self-explanatory, as there are sections - for managing printers and print jobs, authorizing users, and - more. Additionally, on the right-hand side of the - Administration screen are several check-boxes allowing easy - access to commonly-changed settings, such as whether to share - published printers connected to the system, whether to allow - remote administration of the CUPS - server, and whether to allow users additional access and - privileges to the printers and print jobs. + Adding a printer is generally as easy as clicking Add + Printer at the Administration screen of the + CUPS web interface, or clicking one of + the New Printers Found buttons also at the + Administration screen. When presented with the + Device drop-down box, simply select the desired + locally-attached printer, and then continue through the process. + If one has added the print/gutenprint-cups or print/hplip ports or packages as + referenced above, then additional print drivers will be available + in the subsequent screens that might provide more stability or + features. + - Adding a printer is generally as easy as clicking - Add Printer at the Administration screen of - the CUPS web interface, or clicking - one of the New Printers Found buttons also - at the Administration screen. When presented with the - Device drop-down box, simply select the - desired locally-attached printer, and then continue through the - process. If one has added the - print/gutenprint-cups or - print/hplip ports or packages as - referenced above, then additional print drivers will be available - in the subsequent screens that might provide more stability or - features. - + + Configuring CUPS Clients - - Configuring CUPS Clients + Once the CUPS server has been + configured and printers have been added and published to the + network, the next step is to configure the clients, or the + machines that are going to access the + CUPS server. If one has a single + desktop machine that is acting as both server and client, then + much of this information may not be needed. - Once the CUPS server has been - configured and printers have been added and published to the - network, the next step is to configure the clients, or the - machines that are going to access the - CUPS server. If one has a single - desktop machine that is acting as both server and client, then - much of this information may not be needed. + + &unix; Clients - - &unix; Clients + CUPS will also need to be + installed on your &unix; clients. Once + CUPS is installed on the clients, + then CUPS printers that are shared + across the network are often automatically discovered by the + printer managers for various desktop environments such as + GNOME or + KDE. Alternatively, one can access + the local CUPS interface on the + client machine at and + click on Add Printer in the Administration + section. When presented with the Device + drop-down box, simply select the networked + CUPS printer, if it was automatically + discovered, or select ipp or + http and enter the IPP or + HTTP URI of the networked + CUPS printer, usually in one of the + two following syntaxes: - CUPS will also need to be - installed on your &unix; clients. Once - CUPS is installed on the clients, - then CUPS printers that are - shared across the network are often automatically discovered by - the printer managers for various desktop environments such as - GNOME or - KDE. Alternatively, one can access - the local CUPS interface on the - client machine at http://localhost:631 and - click on Add Printer in the Administration - section. When presented with the Device - drop-down box, simply select the networked - CUPS printer, if it was - automatically discovered, or select ipp or - http and enter the IPP or - HTTP URI of the networked - CUPS printer, usually in one of the - two following syntaxes: + ipp://server-name-or-ip/printers/printername - ipp://server-name-or-ip/printers/printername + http://server-name-or-ip:631/printers/printername - http://server-name-or-ip:631/printers/printername + If the CUPS clients have + difficulty finding other CUPS + printers shared across the network, sometimes it is helpful to + add or create a file + /usr/local/etc/cups/client.conf with a + single entry as follows: - If the CUPS clients have - difficulty finding other CUPS - printers shared across the network, sometimes it is helpful to - add or create a file - /usr/local/etc/cups/client.conf with a - single entry as follows: + ServerName server-ip - ServerName (server-ip) + In this case, server-ip would be + replaced by the local IP address of the + CUPS server on the network. + - In this case, (server-ip) would be replaced by the local - IP address of the - CUPS server on the network. - + + &windows; Clients - - &windows; Clients + Versions of &windows; prior to XP did not have the + capability to natively network with IPP-based + printers. However, &windowsxp; and later versions do have this + capability. Therefore, to add a CUPS + printer in these versions of &windows; is quite easy. + Generally, the &windows; administrator will run the &windows; + Add Printer wizard, select Network + Printer and then enter the URI in + the following syntax: - Versions of &windows; prior to XP did not have the - capability to natively network with - IPP-based printers. However, &windowsxp; - and later versions do have this capability. Therefore, to - add a CUPS printer in these - versions of &windows; is quite easy. Generally, the &windows; - administrator will run the &windows; - Add Printer wizard, select Network - Printer and then enter the URI - in the following syntax: + http://server-name-or-ip:631/printers/printername - http://server-name-or-ip:631/printers/printername - - If one has an older version of &windows; without native - IPP printing support, then the general - means of connecting to a CUPS - printer is to use - net/samba3 and - CUPS together, which is a topic - outside the scope of this chapter. - + If one has an older version of &windows; without native + IPP printing support, then the general means + of connecting to a CUPS printer is to + use net/samba3 and + CUPS together, which is a topic + outside the scope of this chapter. + - - CUPS Troubleshooting + + CUPS Troubleshooting - Difficulties with CUPS often lies - in permissions. First, double check the &man.devfs.8; - permissions as outlined above. Next, check the actual - permissions of the devices created in the filesystem. It is - also helpful to make sure your user is a member of the - cups group. If the permissions check boxes - in the Administration section of the - CUPS web interface do not seem to be - working, another fix might be to manually backup the main - CUPS configuration file located at - /usr/local/etc/cups/cupsd.conf and edit the - various configuration options and try different combinations of - configuration options. One sample - /usr/local/etc/cups/cupsd.conf to test is - listed below. Please note that this sample - cupsd.conf file sacrifices security for - easier configuration; once the administrator successfully - connnects to the CUPS server and - configures the clients, it is advisable to revisit this - configuration file and begin locking down access. + Difficulties with CUPS often lies + in permissions. First, double check the &man.devfs.8; permissions + as outlined above. Next, check the actual permissions of the + devices created in the file system. It is also helpful to make + sure your user is a member of the cups + group. If the permissions check boxes in the Administration + section of the CUPS web interface do + not seem to be working, another fix might be to manually backup + the main CUPS configuration file + located at /usr/local/etc/cups/cupsd.conf and + edit the various configuration options and try different + combinations of configuration options. One sample + /usr/local/etc/cups/cupsd.conf to test is + listed below. Please note that this sample + cupsd.conf file sacrifices security for + easier configuration; once the administrator successfully + connnects to the CUPS server and + configures the clients, it is advisable to revisit this + configuration file and begin locking down access. - # Log general information in error_log - change "info" to "debug" for + # Log general information in error_log - change "info" to "debug" for # troubleshooting... LogLevel info @@ -348,32 +346,32 @@ Order deny,allow </Limit> </Policy> - + - - Fine Tuning CUPS-Related Ports + + Fine Tuning CUPS-Related Ports - If CUPS is going to serve as the - primary printing system, then one may choose to optionally add - certain knobs to /etc/make.conf that will - emphasize CUPS over other printing - options. Some of these "knobs" that one may want to add - are: + If CUPS is going to serve as the + primary printing system, then one may choose to optionally add + certain knobs to /etc/make.conf that will + emphasize CUPS over other printing + options. Some of these knobs that one may want to + add are: - WITH_CUPS=YES + WITH_CUPS=YES CUPS_OVERWRITE_BASE=YES WITHOUT_LPR=YES - The first knob, WITH_CUPS, adds - CUPS support to ports where - applicable. The second knob, CUPS_OVERWRITE_BASE, will fix - certain symlinks and paths that would otherwise apply to the - default &os; printing system, LPR, - and will prevent these fixes from being reverted upon the next - "buildworld" system upgrade. The third knob, WITHOUT_LPR, will - prevent LPR support from being added - to ports where applicable. - + The first knob, WITH_CUPS, adds + CUPS support to ports where applicable. + The second knob, CUPS_OVERWRITE_BASE, will fix + certain symlinks and paths that would otherwise apply to the + default &os; printing system, LPR, and + will prevent these fixes from being reverted upon the next + buildworld system upgrade. The third + knob, WITHOUT_LPR, will prevent + LPR support from being added to ports + where applicable.
      ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -285,7 +285,7 @@ plugin should be listed there now. If it is not, as root, run the following command: - &prompt.root; ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \ + &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. @@ -378,7 +378,7 @@ Konqueror also supports &flash;; a How To guide for getting &flash; support on Konqueror - is available at . + is available at . ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1140,7 +1140,7 @@ another option is to execute make rmconfig which will remove all selected options and allow you to start over. All of these options, - and others, are explained in great detail in in the man page for + and others, are explained in great detail in the manual page for &man.ports.7;. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ 800049 + + 8.0-CURRENT after buffer cache API change. + 800050 + + + 8.0-CURRENT after the removal of the + &man.MALLOC.9; and &man.FREE.9; macros. + 800051 + ==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#4 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.37 2008/10/18 16:55:21 erwin Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.38 2008/10/22 19:52:02 jkois Exp $ @@ -861,6 +861,17 @@ + + KwShell Internet Services + http://www.kwshell.com + + KwShell Internet Services is an Arabic based company, which + provides hosting solutions like shared and dedicated Servers. + KwShell Internet Services is also able to provide management and + support for a variety of BSD and Linux systems. + + + RootBSD http://www.rootbsd.net ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#13 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.202 2008/10/12 09:36:46 blackend Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.203 2008/10/23 08:48:05 danger Exp $ @@ -36,6 +36,18 @@ 10 + 19 + + &os; 7.1-BETA2 Available + +

      The second beta release of &os; 7.1 is now available. + ISO images for Tier-1 architectures can be found on most of the &os; mirror sites.

      +       +       + + 12 ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -317,7 +317,7 @@ moeten staan. Als dit niet het geval is, draai dan als root het volgende commando: - &prompt.root; ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \ + &prompt.root; ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \ /usr/local/lib/browser_plugins/ Start daarna de browser opnieuw. @@ -409,7 +409,7 @@ gids om ondersteuning voor &flash; in Konqueror te krijgen is beschikbaar op . + url="http://freebsd.kde.org/howtos/konqueror-flash.php">. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#6 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.29 2006/08/12 22:53:16 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml - %SRCID% 1.283 + %SRCID% 1.284 --> From owner-p4-projects@FreeBSD.ORG Sat Oct 25 21:27:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 508AC1065671; Sat, 25 Oct 2008 21:27: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 14D48106566C for ; Sat, 25 Oct 2008 21:27:57 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 024B38FC1D for ; Sat, 25 Oct 2008 21:27:57 +0000 (UTC) (envelope-from andrew@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 m9PLRuQ1031043 for ; Sat, 25 Oct 2008 21:27:56 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PLRuDK031041 for perforce@freebsd.org; Sat, 25 Oct 2008 21:27:56 GMT (envelope-from andrew@freebsd.org) Date: Sat, 25 Oct 2008 21:27:56 GMT Message-Id: <200810252127.m9PLRuDK031041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 151919 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, 25 Oct 2008 21:27:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=151919 Change 151919 by andrew@andrew_bender on 2008/10/25 21:27:29 Add the start of a (read-only) MMC/SD driver. While here fix a typo Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#9 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#17 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_mci.c#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#4 (text+ko) ==== @@ -4,6 +4,7 @@ arm/s3c2xx0/s3c2410.c standard arm/s3c2xx0/s3c2xx0_space.c standard arm/s3c2xx0/s3c24x0_clk.c standard +arm/s3c2xx0/s3c24x0_mci.c standard arm/s3c2xx0/s3c24x0_nand.c optional nand arm/s3c2xx0/uart_bus_s3c2410.c optional uart arm/s3c2xx0/uart_cpu_s3c2410.c optional uart ==== //depot/projects/arm/src/sys/arm/s3c2xx0/neo1973_machdep.c#9 (text+ko) ==== @@ -164,6 +164,16 @@ PTE_NOCACHE, }, { + /* + * Map the MMC/SD to VA == PA + */ + _A(S3C2410_SDI_BASE), + _A(S3C2410_SDI_BASE), + _S(S3C2410_SDI_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { 0, 0, 0, ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410.c#17 (text+ko) ==== @@ -307,6 +307,10 @@ if (bus_space_map(iot, S3C2410_CLKMAN_BASE, S3C24X0_CLKMAN_SIZE, 0, &sc->sc_sx.sc_clkman_ioh)) panic("cannot map clock"); + /* MMC/SD */ + if (bus_space_map(iot, S3C2410_SDI_BASE, + S3C2410_SDI_SIZE, 0, &sc->sc_sx.sc_mci_ioh)) + panic("cannot map MMC/SD"); #if 0 /* Real time clock */ @@ -339,7 +343,7 @@ rman_manage_region(&s3c2xx0_softc->s3c2xx0_irq_rman, 0, S3C2410_SUBIRQ_MAX - 1) != 0) panic("s3c2410_attach: failed to set up IRQ rman"); - /* Manage the registor memoty space */ + /* Manage the registor memory space */ if (rman_init(&s3c2xx0_softc->s3c2xx0_mem_rman) != 0 || rman_manage_region(&s3c2xx0_softc->s3c2xx0_mem_rman, S3C2410_REG_BASE, S3C2410_REG_BASE + S3C2410_REG_SIZE) != 0) @@ -348,6 +352,12 @@ s3c2410_add_child(dev, 0, "nand", 0); s3c2410_add_child(dev, 0, "timer", 0); + /* Add the MMC/SD and set it's irq/registers */ + child = s3c2410_add_child(dev, 0, "s3c24x0_mci", 0); + bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_SDI, 1); + bus_set_resource(child, SYS_RES_IOPORT, 0, S3C2410_SDI_BASE, + S3C2410_SDI_SIZE); + /* Add the uart and set it's irq and registers */ child = s3c2410_add_child(dev, 0, "uart", 0); bus_set_resource(child, SYS_RES_IRQ, 0, S3C2410_INT_UART0, 1); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2xx0var.h#7 (text+ko) ==== @@ -48,6 +48,7 @@ bus_space_handle_t sc_clkman_ioh; /* Clock manager */ bus_space_handle_t sc_gpio_ioh; /* GPIO */ bus_space_handle_t sc_rtc_ioh; /* real time clock */ + bus_space_handle_t sc_mci_ioh; /* MMC/SD */ bus_dma_tag_t sc_dmat; From owner-p4-projects@FreeBSD.ORG Sat Oct 25 21:59:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B46C106569B; Sat, 25 Oct 2008 21:59: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 2EDBF1065685 for ; Sat, 25 Oct 2008 21:59:29 +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 1B2E78FC12 for ; Sat, 25 Oct 2008 21:59:29 +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 m9PLxSgF033528 for ; Sat, 25 Oct 2008 21:59:28 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PLxSTN033526 for perforce@freebsd.org; Sat, 25 Oct 2008 21:59:28 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 25 Oct 2008 21:59:28 GMT Message-Id: <200810252159.m9PLxSTN033526@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 151920 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, 25 Oct 2008 21:59:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=151920 Change 151920 by rene@rene_self on 2008/10/25 21:58:29 Translated section 2 of explaining-bsd. Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#4 (text+ko) ==== @@ -121,74 +121,80 @@ - What, a real &unix;? + Wat, een echte &unix;? - The BSD operating systems are not clones, but open source - derivatives of AT&T's Research &unix; operating system, which is also - the ancestor of the modern &unix; System V. This may surprise you. How - could that happen when AT&T has never released its code as open - source? + De BSD-besturingssystemen zijn geen klonen, maar open-source + afgeleiden van AT&T's Research &unix; besturingssysteem, wat + ook de voorouder is van het moderne &unix; System V. Dit kan als + een verassing komen. Hoe kon dit gebeuren als AT&T nooit zijn + code als open-source heeft uitgegeven? - It is true that AT&T &unix; is not open source, and in a copyright - sense BSD is very definitely not &unix;, but on the - other hand, AT&T has imported sources from other projects, - noticeably the Computer Sciences Research Group of the University of - California in Berkeley, CA. Starting in 1976, the CSRG started - releasing tapes of their software, calling them Berkeley - Software Distribution or BSD. + Het is waar dat AT&T &unix; niet open-source is, en wat + betreft copyright is BSD zeer zeker niet + &unix;, maar van de andere kant heeft AT&T bronnen + geïmporteerd van andere projecten, nota bene de Computer + Science Research Group van de University of California in + Berkeley, CA. In 1976 is de CSRG begonnen met het uitgeven van + tapes van hun software, die ze Berkeley Software + Distribution of BSD noemden. - Initial BSD releases consisted mainly of user programs, but that - changed dramatically when the CSRG landed a contract with the Defense - Advanced Projects Research Agency (DARPA) to upgrade the communications - protocols on their network, ARPANET. The new protocols were known as - the Internet Protocols, later - TCP/IP after the most important protocols. The - first widely distributed implementation was part of 4.2BSD, in - 1982. + Initiële BSD-uitgaven bestonden grotendeels uit + gebruikersprogramma's, maar dat veranderede enorm toen CSRG in een + contract belandde met het Defense Advanced Projects Research + Agency (DARPA) om de communicatieprotocollen in hun netwerk, + ARPANET, te vernieuwen. De nieuwe protocollen stonden bekend als + Internet Protocols, later + TCP/IP na de belangrijkste protocollen. De + eerste wijdverspreide implementatie die gedistribueerd werd was + deel van 4.2BSD, in 1982. - In the course of the 1980s, a number of new workstation companies - sprang up. Many preferred to license &unix; rather than developing - operating systems for themselves. In particular, Sun Microsystems - licensed &unix; and implemented a version of 4.2BSD, which they called - &sunos;. When AT&T themselves were allowed to sell &unix; commercially, - they started with a somewhat bare-bones implementation called System - III, to be quickly followed by System V. The System V code base did not - include networking, so all implementations included additional software - from the BSD, including the TCP/IP software, but also utilities such as - the csh shell and the vi - editor. Collectively, these enhancements were known as the - Berkeley Extensions. + In de loop van de jaren 80 ontsproten er een aantal nieuwe + werkstationbedrijven. Vele verkozen het om &unix; te licenseren + boven het ontwikkelen van hun eigen besturingssystemen. In het + bijzonder licenseerde Sun Microsystems &unix; en implementeerde + het een versie van 4.2BSD, wat ze &sunos; noemden. Toen AT&T + zelf &unix; commercieel mocht verkopen, begonnen ze met een ietwat + kale basisimplementatie genaamd System III, die snel gevolgd werd + door System V. De codebase van System V bevatte geen netwerkcode, + dus bevatten alle implementaties aanvullende software van de BSD, + waaronder de TCP/IP-software, maar ook gereedschappen zoals de + csh-shell en de tekstverwerker + vi. Deze uitbreidingen stonden gezamenlijk + bekend als de Berkeley Extensions. - The BSD tapes contained AT&T source code and thus required a - &unix; source license. By 1990, the CSRG's funding was running out, and - it faced closure. Some members of the group decided to release the BSD - code, which was Open Source, without the AT&T proprietary code. - This finally happened with the Networking Tape 2, - usually known as Net/2. Net/2 was not a complete - operating system: about 20% of the kernel code was missing. One of the - CSRG members, William F. Jolitz, wrote the remaining code and released - it in early 1992 as 386BSD. At the same time, - another group of ex-CSRG members formed a commercial company called - Berkeley Software Design Inc. - and released a beta version of an operating system called - BSD/386, which was based on - the same sources. The name of the operating system was later changed - to BSD/OS. + De BSD-tapes bevatten de broncode van AT&T en hadden dus + een &unix; bronlicentie nodig. Tegen 1990 raakten de fondsen van + de CSRG uitgeput, en er dreigde sluiting. Sommige leden van de + groep besloten om de BSD-code uit te geven, welke Open Source was, + zonder de propriëtaire code van AT&T. Dit gebeurde + eindelijk met de Networking Tape 2, + gewoonlijk bekend als Net/2. Net/2 was geen + compleet besturingssysteem: ongeveer 20% van de kernelcode + ontbrak. Een van de leden van de CSRG, William F. Jolitz, schreef + de overblijvende code en gaf het in het begin van 1992 uit als + 386BSD. In diezelfde tijd begon een andere + groep van ex-CSRG-leden een commercieel bedrijf genaamd Berkeley Software Design Inc. + en gaf een betaversie van een besturingssysteem genaamd BSD/386 uit, welke op + dezelfde bronnen was gebaseerd. De naam van he besturingssysteem + werd later veranderd in BSD/OS. - 386BSD never became a stable operating system. Instead, two other - projects split off from it in 1993: - NetBSD and - FreeBSD. The two projects - originally diverged due to differences in patience waiting for - improvements to 386BSD: the NetBSD people started early in the year, - and the first version of FreeBSD was not ready until the end of the - year. In the meantime, the code base had diverged sufficiently to - make it difficult to merge. In addition, the projects had different - aims, as we will see below. In 1996, - OpenBSD split off from - NetBSD, and in 2003, - DragonFlyBSD split - off from FreeBSD. + 386BSD werd nooit een stabiel besturingssysteem. In plaats + daarvan splitsten er twee andere projecten van af in 1993: NetBSD en &os;. De twee projecten + groeiden oorspronkelijk uit elkaar wegens verschillen in de + hoeveelheid geduld om op verbeteringen aan 386BSD te wachten: de + mensen van NetBSD begonnen in het begin van het jaar, en de eerste + versie van &os; was niet klaar voor het einde van het jaar. In de + tussentijd waren de codebases genoeg uit elkaar gegroeid om + samenvoegen ervan moeilijk te maken. Tevens hadden de projecten + verschillende doelen, wat we hieronder zullen zien. In 1996 + splitste OpenBSD zich + af van NetBSD, en in 2003 splitste DragonFlyBSD zich af + van FreeBSD. From owner-p4-projects@FreeBSD.ORG Sat Oct 25 23:43:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D2D61065671; Sat, 25 Oct 2008 23:43: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 1FEFB106566B for ; Sat, 25 Oct 2008 23:43:22 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CDA48FC16 for ; Sat, 25 Oct 2008 23:43:22 +0000 (UTC) (envelope-from marcel@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 m9PNhLvw044096 for ; Sat, 25 Oct 2008 23:43:21 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PNhFDS044074 for perforce@freebsd.org; Sat, 25 Oct 2008 23:43:15 GMT (envelope-from marcel@freebsd.org) Date: Sat, 25 Oct 2008 23:43:15 GMT Message-Id: <200810252343.m9PNhFDS044074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151926 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, 25 Oct 2008 23:43:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=151926 Change 151926 by marcel@marcel_xcllnt on 2008/10/25 23:43:12 IFC @151923 Affected files ... .. //depot/projects/e500/Makefile.inc1#13 integrate .. //depot/projects/e500/etc/periodic/security/200.chkmounts#2 integrate .. //depot/projects/e500/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/e500/lib/libfetch/http.c#6 integrate .. //depot/projects/e500/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/e500/share/man/man9/Makefile#10 integrate .. //depot/projects/e500/share/man/man9/malloc.9#3 integrate .. //depot/projects/e500/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/e500/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/e500/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/e500/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/e500/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/e500/sys/conf/NOTES#20 integrate .. //depot/projects/e500/sys/conf/files#22 integrate .. //depot/projects/e500/sys/conf/files.powerpc#26 integrate .. //depot/projects/e500/sys/conf/options#16 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_cdnr.c#2 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_rmclass.c#2 integrate .. //depot/projects/e500/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/e500/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/e500/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/e500/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#4 integrate .. //depot/projects/e500/sys/dev/cfi/cfi_core.c#3 integrate .. //depot/projects/e500/sys/dev/cfi/cfi_dev.c#3 integrate .. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#3 integrate .. //depot/projects/e500/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/e500/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/e500/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/e500/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/e500/sys/dev/drm/i915_dma.c#5 integrate .. //depot/projects/e500/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/e500/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/e500/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/e500/sys/dev/hwpmc/hwpmc_piv.c#4 integrate .. //depot/projects/e500/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate .. //depot/projects/e500/sys/dev/hwpmc/hwpmc_x86.c#4 integrate .. //depot/projects/e500/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/e500/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/e500/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/e500/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/e500/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/e500/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/e500/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/e500/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/e500/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/e500/sys/dev/ray/if_rayvar.h#2 integrate .. //depot/projects/e500/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/e500/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/e500/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/e500/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/e500/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/e500/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/e500/sys/dev/usb/ufoma.c#6 integrate .. //depot/projects/e500/sys/fs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/e500/sys/fs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/e500/sys/fs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/e500/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/e500/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/e500/sys/fs/fifofs/fifo_vnops.c#7 integrate .. //depot/projects/e500/sys/fs/hpfs/hpfs_subr.c#2 integrate .. //depot/projects/e500/sys/fs/hpfs/hpfs_vfsops.c#6 integrate .. //depot/projects/e500/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/e500/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/e500/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/e500/sys/fs/ntfs/ntfs_subr.c#5 integrate .. //depot/projects/e500/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/e500/sys/fs/ntfs/ntfs_vnops.c#4 integrate .. //depot/projects/e500/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/e500/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/e500/sys/fs/nwfs/nwfs_node.c#6 integrate .. //depot/projects/e500/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/e500/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/e500/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/e500/sys/fs/pseudofs/pseudofs.c#3 integrate .. //depot/projects/e500/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate .. //depot/projects/e500/sys/fs/smbfs/smbfs_node.c#8 integrate .. //depot/projects/e500/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/e500/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/e500/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/e500/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/e500/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/e500/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/e500/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/e500/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/e500/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate .. //depot/projects/e500/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#5 integrate .. //depot/projects/e500/sys/i386/conf/NOTES#10 integrate .. //depot/projects/e500/sys/i386/i386/sys_machdep.c#7 integrate .. //depot/projects/e500/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/e500/sys/i386/include/smp.h#6 integrate .. //depot/projects/e500/sys/i386/xen/clock.c#2 integrate .. //depot/projects/e500/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/e500/sys/i386/xen/xen_machdep.c#2 integrate .. //depot/projects/e500/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/e500/sys/kern/kern_descrip.c#12 integrate .. //depot/projects/e500/sys/kern/kern_event.c#8 integrate .. //depot/projects/e500/sys/kern/kern_jail.c#8 integrate .. //depot/projects/e500/sys/kern/kern_linker.c#8 integrate .. //depot/projects/e500/sys/kern/kern_lockf.c#6 integrate .. //depot/projects/e500/sys/kern/kern_mtxpool.c#3 integrate .. //depot/projects/e500/sys/kern/kern_proc.c#10 integrate .. //depot/projects/e500/sys/kern/kern_prot.c#6 integrate .. //depot/projects/e500/sys/kern/kern_resource.c#11 integrate .. //depot/projects/e500/sys/kern/subr_blist.c#3 integrate .. //depot/projects/e500/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/e500/sys/kern/subr_witness.c#14 integrate .. //depot/projects/e500/sys/kern/uipc_accf.c#2 integrate .. //depot/projects/e500/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/e500/sys/kern/uipc_syscalls.c#12 integrate .. //depot/projects/e500/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/e500/sys/kern/vfs_export.c#3 integrate .. //depot/projects/e500/sys/kern/vfs_syscalls.c#11 integrate .. //depot/projects/e500/sys/modules/u3g/Makefile#2 integrate .. //depot/projects/e500/sys/net/bpf.c#10 integrate .. //depot/projects/e500/sys/net/bsd_comp.c#3 integrate .. //depot/projects/e500/sys/net/if.c#8 integrate .. //depot/projects/e500/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/e500/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/e500/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/e500/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/e500/sys/net/if_ppp.c#5 integrate .. //depot/projects/e500/sys/net/if_sl.c#3 integrate .. //depot/projects/e500/sys/net/if_tap.c#4 integrate .. //depot/projects/e500/sys/net/if_tun.c#4 integrate .. //depot/projects/e500/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/e500/sys/net/rtsock.c#5 integrate .. //depot/projects/e500/sys/net80211/_ieee80211.h#6 integrate .. //depot/projects/e500/sys/net80211/ieee80211_acl.c#5 integrate .. //depot/projects/e500/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/e500/sys/net80211/ieee80211_crypto.c#6 integrate .. //depot/projects/e500/sys/net80211/ieee80211_crypto_ccmp.c#6 integrate .. //depot/projects/e500/sys/net80211/ieee80211_crypto_tkip.c#6 integrate .. //depot/projects/e500/sys/net80211/ieee80211_crypto_wep.c#6 integrate .. //depot/projects/e500/sys/net80211/ieee80211_freebsd.c#7 integrate .. //depot/projects/e500/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/e500/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/e500/sys/net80211/ieee80211_ioctl.c#8 integrate .. //depot/projects/e500/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/e500/sys/net80211/ieee80211_output.c#8 integrate .. //depot/projects/e500/sys/net80211/ieee80211_power.c#4 integrate .. //depot/projects/e500/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/e500/sys/net80211/ieee80211_regdomain.c#4 integrate .. //depot/projects/e500/sys/net80211/ieee80211_scan.c#5 integrate .. //depot/projects/e500/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/e500/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/e500/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/e500/sys/netgraph/atm/sscfu/ng_sscfu_cust.h#2 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#6 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/e500/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/e500/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/e500/sys/netgraph/netflow/ng_netflow.c#5 integrate .. //depot/projects/e500/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/e500/sys/netgraph/ng_UI.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_async.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_atmllc.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/e500/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/e500/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/e500/sys/netgraph/ng_etf.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_gif_demux.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/e500/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_l2tp.c#7 integrate .. //depot/projects/e500/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/e500/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_nat.c#5 integrate .. //depot/projects/e500/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_parse.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_pipe.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/e500/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_rfc1490.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_split.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_tag.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_tee.c#4 integrate .. //depot/projects/e500/sys/netgraph/ng_tty.c#3 integrate .. //depot/projects/e500/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/e500/sys/netgraph/ng_vlan.c#3 integrate .. //depot/projects/e500/sys/netinet/igmp.c#5 integrate .. //depot/projects/e500/sys/netinet/in_mcast.c#4 integrate .. //depot/projects/e500/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/e500/sys/netinet/ip_carp.c#7 integrate .. //depot/projects/e500/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/e500/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/e500/sys/netinet6/in6.c#9 integrate .. //depot/projects/e500/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/e500/sys/netinet6/in6_src.c#8 integrate .. //depot/projects/e500/sys/netinet6/raw_ip6.c#9 integrate .. //depot/projects/e500/sys/netipsec/keysock.c#5 integrate .. //depot/projects/e500/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/e500/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/e500/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/e500/sys/netnatm/natm.c#2 integrate .. //depot/projects/e500/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/e500/sys/netncp/ncp_conn.c#7 integrate .. //depot/projects/e500/sys/netncp/ncp_rq.c#3 integrate .. //depot/projects/e500/sys/netncp/ncp_sock.c#5 integrate .. //depot/projects/e500/sys/netncp/ncp_subr.c#2 integrate .. //depot/projects/e500/sys/netsmb/smb_rq.c#3 integrate .. //depot/projects/e500/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_dev.c#2 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_idmap.c#4 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_socket.c#3 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_vn_subs.c#2 integrate .. //depot/projects/e500/sys/nfs4client/nfs4_vnops.c#7 integrate .. //depot/projects/e500/sys/nfsclient/krpc_subr.c#4 integrate .. //depot/projects/e500/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/e500/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/e500/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/e500/sys/nfsclient/nfs_subs.c#8 integrate .. //depot/projects/e500/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/e500/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/e500/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/e500/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/e500/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/e500/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/e500/sys/opencrypto/cryptodev.c#5 integrate .. //depot/projects/e500/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/e500/sys/opencrypto/deflate.c#2 integrate .. //depot/projects/e500/sys/opencrypto/xform.c#3 integrate .. //depot/projects/e500/sys/pci/if_rl.c#7 integrate .. //depot/projects/e500/sys/pci/if_rlreg.h#8 integrate .. //depot/projects/e500/sys/powerpc/booke/pmap.c#17 integrate .. //depot/projects/e500/sys/powerpc/conf/MPC85XX#9 integrate .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc.c#3 integrate .. //depot/projects/e500/sys/powerpc/mpc85xx/lbc.h#3 integrate .. //depot/projects/e500/sys/powerpc/mpc85xx/ocpbus.c#13 integrate .. //depot/projects/e500/sys/rpc/rpcclnt.c#7 integrate .. //depot/projects/e500/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/e500/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/e500/sys/sys/cfictl.h#2 integrate .. //depot/projects/e500/sys/sys/malloc.h#4 integrate .. //depot/projects/e500/sys/sys/param.h#16 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_snapshot.c#8 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_softdep.c#10 integrate .. //depot/projects/e500/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/e500/sys/ufs/ufs/ufs_dirhash.c#4 integrate .. //depot/projects/e500/sys/ufs/ufs/ufs_extattr.c#8 integrate .. //depot/projects/e500/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/e500/sys/xen/evtchn/evtchn.c#2 integrate Differences ... ==== //depot/projects/e500/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.613 2008/10/23 16:06:49 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/e500/etc/periodic/security/200.chkmounts#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.6 2008/10/25 18:45:40 ed Exp $ # # Show changes in the way filesystems are mounted @@ -50,7 +50,7 @@ ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - mount -p | ${cmd} | + mount -p | sort | ${cmd} | check_diff mount - "${host} changes in mounted filesystems:" rc=$?;; *) rc=0;; ==== //depot/projects/e500/lib/libc/sys/mmap.2#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.56 2007/01/09 00:28:15 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.57 2008/10/24 14:40:13 alc Exp $ .\" -.Dd April 21, 2006 +.Dd October 24, 2008 .Dt MMAP 2 .Os .Sh NAME @@ -252,6 +252,11 @@ in which the file descriptor argument specifies a file or device to which swapping should be done. +.Sh NOTES +Although this implementation does not impose any alignment restrictions on +the +.Fa offset +argument, a portable program must only use page-aligned values. .Sh RETURN VALUES Upon successful completion, .Fn mmap @@ -307,13 +312,6 @@ was specified and the .Fa fd argument was not -1. -The -.Fa offset -argument -was not page-aligned. -(See -.Sx BUGS -below.) .It Bq Er ENODEV .Dv MAP_ANON has not been specified and ==== //depot/projects/e500/lib/libfetch/http.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.84 2008/02/08 09:48:48 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.85 2008/10/24 07:56:01 ru Exp $"); /* * The following copyright applies to the base64 code: @@ -1064,6 +1064,7 @@ if (url->offset == size && url->length == 0) { /* asked for 0 bytes; fake it */ offset = url->offset; + clength = -1; conn->err = HTTP_OK; break; } else { ==== //depot/projects/e500/share/man/man4/snd_hda.4#5 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.21 2008/10/03 09:19:07 mav Exp $ +.\" $FreeBSD: src/share/man/man4/snd_hda.4,v 1.23 2008/10/24 18:57:11 mav Exp $ .\" -.Dd Sep 17, 2008 +.Dd October 24, 2008 .Dt SND_HDA 4 .Os .Sh NAME @@ -129,6 +129,8 @@ GPIO combination required for your system. ivrefX/ovrefX options controls voltage used to power external microphones and so on. +.It Va hint.hdac.%d.msi +Controls MSI (Message Signaled Interrupts) support. .It Va hint.hdac.%d.cad%d.nid%d.config Overrides codec pin configuration set by BIOS. May be specified as a 32bit HEX value with a leading "0x" or as a set of ==== //depot/projects/e500/share/man/man9/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.342 2008/09/28 20:15:45 ed Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.343 2008/10/23 15:53:51 des Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -741,9 +741,7 @@ MLINKS+=make_dev.9 destroy_dev.9 \ make_dev.9 dev_depends.9 \ make_dev.9 make_dev_alias.9 -MLINKS+=malloc.9 FREE.9 \ - malloc.9 free.9 \ - malloc.9 MALLOC.9 \ +MLINKS+=malloc.9 free.9 \ malloc.9 MALLOC_DECLARE.9 \ malloc.9 MALLOC_DEFINE.9 \ malloc.9 realloc.9 \ ==== //depot/projects/e500/share/man/man9/malloc.9#3 (text+ko) ==== @@ -34,16 +34,14 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ -.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.43 2008/03/25 15:44:49 ru Exp $ +.\" $FreeBSD: src/share/man/man9/malloc.9,v 1.44 2008/10/23 15:53:51 des Exp $ .\" -.Dd June 12, 2003 +.Dd October 23, 2008 .Dt MALLOC 9 .Os .Sh NAME .Nm malloc , -.Nm MALLOC , .Nm free , -.Nm FREE , .Nm realloc , .Nm reallocf , .Nm MALLOC_DEFINE , @@ -54,10 +52,8 @@ .In sys/malloc.h .Ft void * .Fn malloc "unsigned long size" "struct malloc_type *type" "int flags" -.Fn MALLOC space cast "unsigned long size" "struct malloc_type *type" "int flags" .Ft void .Fn free "void *addr" "struct malloc_type *type" -.Fn FREE "void *addr" "struct malloc_type *type" .Ft void * .Fn realloc "void *addr" "unsigned long size" "struct malloc_type *type" "int flags" .Ft void * @@ -123,20 +119,6 @@ except that it will free the passed pointer when the requested memory cannot be allocated. .Pp -The -.Fn MALLOC -macro variant is functionally equivalent to -.Bd -literal -offset indent -(space) = (cast)malloc((u_long)(size), type, flags) -.Ed -.Pp -and the -.Fn FREE -macro variant is equivalent to -.Bd -literal -offset indent -free((addr), type) -.Ed -.Pp Unlike its standard C library counterpart .Pq Xr malloc 3 , the kernel version takes two more arguments. @@ -219,7 +201,7 @@ /* sys/something/foo_subr.c */ \&... -MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT); +buf = malloc(sizeof *buf, M_FOOBUF, M_NOWAIT); .Ed .Pp ==== //depot/projects/e500/sys/arm/arm/undefined.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.15 2007/06/04 21:38:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/undefined.c,v 1.16 2008/10/23 15:53:51 des Exp $"); #include #include @@ -106,7 +106,7 @@ KASSERT(handler != NULL, ("handler is NULL")); /* Used to be legal. */ /* XXX: M_TEMP??? */ - MALLOC(uh, struct undefined_handler *, sizeof(*uh), M_TEMP, M_WAITOK); + uh = malloc(sizeof(*uh), M_TEMP, M_WAITOK); uh->uh_handler = handler; install_coproc_handler_static(coproc, uh); return uh; @@ -125,7 +125,7 @@ struct undefined_handler *uh = cookie; LIST_REMOVE(uh, uh_link); - FREE(uh, M_TEMP); + free(uh, M_TEMP); } ==== //depot/projects/e500/sys/cam/scsi/scsi_target.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.75 2008/09/27 08:51:18 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.76 2008/10/23 15:53:51 des Exp $"); #include @@ -183,7 +183,7 @@ make_dev(&targ_cdevsw, dev2unit(dev), UID_ROOT, GID_WHEEL, 0600, "targ%d", dev2unit(dev)); } - MALLOC(softc, struct targ_softc *, sizeof(*softc), M_TARG, + softc = malloc(sizeof(*softc), M_TARG, M_WAITOK | M_ZERO); dev->si_drv1 = softc; softc->state = TARG_STATE_OPENED; @@ -211,7 +211,7 @@ if ((softc->periph == NULL) || (softc->state & TARG_STATE_LUN_ENABLED) == 0) { destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); return (0); } @@ -230,7 +230,7 @@ softc->periph = NULL; } destroy_dev(dev); - FREE(softc, M_TARG); + free(softc, M_TARG); } cam_periph_unlock(periph); cam_periph_release(periph); @@ -531,7 +531,7 @@ } while ((descr = TAILQ_FIRST(&softc->abort_queue)) != NULL) { TAILQ_REMOVE(&softc->abort_queue, descr, tqe); - FREE(descr, M_TARG); + free(descr, M_TARG); } softc->periph = NULL; @@ -966,7 +966,7 @@ int ccb_len; ccb_len = targccblen(type); - MALLOC(ccb, union ccb *, ccb_len, M_TARG, M_WAITOK); + ccb = malloc(ccb_len, M_TARG, M_WAITOK); CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("getccb %p\n", ccb)); xpt_setup_ccb(&ccb->ccb_h, softc->path, priority); @@ -981,13 +981,13 @@ { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("targfreeccb descr %p and\n", ccb->ccb_h.targ_descr)); - FREE(ccb->ccb_h.targ_descr, M_TARG); + free(ccb->ccb_h.targ_descr, M_TARG); switch (ccb->ccb_h.func_code) { case XPT_ACCEPT_TARGET_IO: case XPT_IMMED_NOTIFY: CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); break; default: /* Send back CCB if we got it from the periph */ @@ -998,7 +998,7 @@ } else { CAM_DEBUG_PRINT(CAM_DEBUG_PERIPH, ("freeing ccb %p\n", ccb)); - FREE(ccb, M_TARG); + free(ccb, M_TARG); } break; } @@ -1009,7 +1009,7 @@ { struct targ_cmd_descr *descr; - MALLOC(descr, struct targ_cmd_descr *, sizeof(*descr), M_TARG, + descr = malloc(sizeof(*descr), M_TARG, M_WAITOK); descr->mapinfo.num_bufs_used = 0; return (descr); ==== //depot/projects/e500/sys/compat/linux/linux_ioctl.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.144 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.145 2008/10/23 15:53:51 des Exp $"); #include #include @@ -2673,7 +2673,7 @@ break; } if (he == NULL) { - MALLOC(he, struct handler_element *, sizeof(*he), + he = malloc(sizeof(*he), M_LINUX, M_WAITOK); he->func = h->func; } else @@ -2711,7 +2711,7 @@ if (he->func == h->func) { TAILQ_REMOVE(&handlers, he, list); sx_xunlock(&linux_ioctl_sx); - FREE(he, M_LINUX); + free(he, M_LINUX); return (0); } } ==== //depot/projects/e500/sys/compat/linux/linux_socket.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.77 2008/10/02 15:37:58 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.78 2008/10/23 15:53:51 des Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -120,7 +120,7 @@ } #endif - MALLOC(kosa, struct osockaddr *, alloclen, mtype, M_WAITOK); + kosa = malloc(alloclen, mtype, M_WAITOK); if ((error = copyin(osa, kosa, *osalen))) goto out; @@ -168,7 +168,7 @@ return (0); out: - FREE(kosa, mtype); + free(kosa, mtype); return (error); } @@ -458,7 +458,7 @@ bad: if (to) - FREE(to, M_SONAME); + free(to, M_SONAME); return (error); } ==== //depot/projects/e500/sys/compat/linux/linux_util.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.35 2008/06/02 08:40:06 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.36 2008/10/23 15:53:51 des Exp $"); #include "opt_compat.h" @@ -165,7 +165,7 @@ char formated[256]; int current_size = 0, string_size = 1024; - MALLOC(string, char *, string_size, M_LINUX, M_WAITOK); + string = malloc(string_size, M_LINUX, M_WAITOK); string[0] = '\000'; last = ""; TAILQ_FOREACH(de, &devices, list) { @@ -181,10 +181,10 @@ if (strlen(formated) + current_size >= string_size) { string_size *= 2; - MALLOC(string, char *, string_size, + string = malloc(string_size, M_LINUX, M_WAITOK); bcopy(temp, string, current_size); - FREE(temp, M_LINUX); + free(temp, M_LINUX); } strcat(string, formated); current_size = strlen(string); @@ -197,7 +197,7 @@ void linux_free_get_char_devices(char *string) { - FREE(string, M_LINUX); + free(string, M_LINUX); } static int linux_major_starting = 200; @@ -210,7 +210,7 @@ if (d == NULL) return (EINVAL); - MALLOC(de, struct device_element *, sizeof(*de), + de = malloc(sizeof(*de), M_LINUX, M_WAITOK); if (d->linux_major < 0) { d->linux_major = linux_major_starting++; @@ -234,7 +234,7 @@ TAILQ_FOREACH(de, &devices, list) { if (bcmp(d, &de->entry, sizeof(*d)) == 0) { TAILQ_REMOVE(&devices, de, list); - FREE(de, M_LINUX); + free(de, M_LINUX); return (0); } } ==== //depot/projects/e500/sys/conf/NOTES#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1510 2008/10/22 17:50:45 obrien Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1511 2008/10/24 07:16:13 n_hibma Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -2419,7 +2419,7 @@ # # USB serial support device ucom -# USB support for 3G modem cards by Option, Huawei and Sierra +# USB support for 3G modem cards by Option, Novatel, Huawei and Sierra device u3g # USB support for Technologies ARK3116 based serial adapters device uark @@ -2486,6 +2486,7 @@ # debugging options for the USB subsystem # options USB_DEBUG +options U3G_DEBUG # options for ukbd: options UKBD_DFLT_KEYMAP # specify the built-in keymap ==== //depot/projects/e500/sys/conf/files#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1339 2008/10/21 20:33:40 mav Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1340 2008/10/25 06:18:12 marcel 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/e500/sys/conf/files.powerpc#26 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.82 2008/10/14 14:54:14 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.84 2008/10/25 06:18:12 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -28,7 +28,7 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/bm/if_bm.c optional bm powermac -dev/cfi/cfi_bus_lbc optional cfi +dev/cfi/cfi_bus_lbc.c optional cfi dev/fb/fb.c optional sc dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc @@ -102,6 +102,7 @@ powerpc/fpu/fpu_subr.c optional fpu_emu powerpc/mpc85xx/atpic.c optional mpc85xx isa powerpc/mpc85xx/isa.c optional mpc85xx isa +powerpc/mpc85xx/lbc.c optional mpc85xx powerpc/mpc85xx/mpc85xx.c optional mpc85xx powerpc/mpc85xx/nexus.c optional mpc85xx powerpc/mpc85xx/ocpbus.c optional mpc85xx ==== //depot/projects/e500/sys/conf/options#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.642 2008/10/01 19:24:16 jhb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.643 2008/10/24 07:16:13 n_hibma Exp $ # # On the handling of kernel options # @@ -618,6 +618,7 @@ # options for USB support USB_DEBUG opt_usb.h USBVERBOSE opt_usb.h +U3G_DEBUG opt_u3g.h UKBD_DFLT_KEYMAP opt_ukbd.h UPLCOM_INTR_INTERVAL opt_uplcom.h UVSCOM_DEFAULT_OPKTSIZE opt_uvscom.h ==== //depot/projects/e500/sys/contrib/altq/altq/altq_cbq.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.5 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cbq.c,v 1.6 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cbq.c,v 1.19 2003/09/17 14:23:25 kjc Exp $ */ /* @@ -273,7 +273,7 @@ return (ENODEV); /* allocate and initialize cbq_state_t */ - MALLOC(cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (cbqp == NULL) return (ENOMEM); bzero(cbqp, sizeof(cbq_state_t)); @@ -304,7 +304,7 @@ cbq_class_destroy(cbqp, cbqp->ifnp.root_); /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } @@ -927,7 +927,7 @@ return (ENXIO); /* allocate and initialize cbq_state_t */ - MALLOC(new_cbqp, cbq_state_t *, sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); + new_cbqp = malloc(sizeof(cbq_state_t), M_DEVBUF, M_WAITOK); if (new_cbqp == NULL) return (ENOMEM); bzero(new_cbqp, sizeof(cbq_state_t)); @@ -943,7 +943,7 @@ cbq_enqueue, cbq_dequeue, cbq_request, &new_cbqp->cbq_classifier, acc_classify); if (error) { - FREE(new_cbqp, M_DEVBUF); + free(new_cbqp, M_DEVBUF); return (error); } @@ -987,7 +987,7 @@ } /* deallocate cbq_state_t */ - FREE(cbqp, M_DEVBUF); + free(cbqp, M_DEVBUF); return (0); } ==== //depot/projects/e500/sys/contrib/altq/altq/altq_cdnr.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.3 2006/11/06 13:41:50 rwatson Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_cdnr.c,v 1.4 2008/10/23 15:53:51 des Exp $ */ /* $KAME: altq_cdnr.c,v 1.14 2003/09/05 22:40:36 itojun Exp $ */ /* @@ -274,7 +274,7 @@ return (NULL); } - MALLOC(cb, struct cdnr_block *, size, M_DEVBUF, M_WAITOK); + cb = malloc(size, M_DEVBUF, M_WAITOK); if (cb == NULL) return (NULL); bzero(cb, size); @@ -319,7 +319,7 @@ if (cb->cb_top != cblock) LIST_REMOVE(cb, cb_next); - FREE(cb, M_DEVBUF); + free(cb, M_DEVBUF); } /* ==== //depot/projects/e500/sys/contrib/altq/altq/altq_hfsc.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.4 2007/07/03 12:46:05 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/altq/altq/altq_hfsc.c,v 1.6 2008/10/23 20:26:15 des Exp $ */ /* $KAME: altq_hfsc.c,v 1.24 2003/12/05 05:40:46 kjc Exp $ */ /* @@ -202,15 +202,14 @@ if (!ALTQ_IS_READY(&ifp->if_snd)) return (ENODEV); - MALLOC(hif, struct hfsc_if *, sizeof(struct hfsc_if), - M_DEVBUF, M_WAITOK); + hif = malloc(sizeof(struct hfsc_if), M_DEVBUF, M_WAITOK); if (hif == NULL) return (ENOMEM); bzero(hif, sizeof(struct hfsc_if)); hif->hif_eligible = ellist_alloc(); if (hif->hif_eligible == NULL) { - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (ENOMEM); } @@ -236,7 +235,7 @@ ellist_destroy(hif->hif_eligible); - FREE(hif, M_DEVBUF); + free(hif, M_DEVBUF); return (0); } @@ -404,14 +403,12 @@ } #endif - MALLOC(cl, struct hfsc_class *, sizeof(struct hfsc_class), - M_DEVBUF, M_WAITOK); + cl = malloc(sizeof(struct hfsc_class), M_DEVBUF, M_WAITOK); if (cl == NULL) return (NULL); bzero(cl, sizeof(struct hfsc_class)); - MALLOC(cl->cl_q, class_queue_t *, sizeof(class_queue_t), - M_DEVBUF, M_WAITOK); + cl->cl_q = malloc(sizeof(class_queue_t), M_DEVBUF, M_WAITOK); if (cl->cl_q == NULL) goto err_ret; bzero(cl->cl_q, sizeof(class_queue_t)); @@ -471,8 +468,8 @@ #endif /* ALTQ_RED */ if (rsc != NULL && (rsc->m1 != 0 || rsc->m2 != 0)) { - MALLOC(cl->cl_rsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_rsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_rsc == NULL) goto err_ret; sc2isc(rsc, cl->cl_rsc); @@ -480,16 +477,16 @@ rtsc_init(&cl->cl_eligible, cl->cl_rsc, 0, 0); } if (fsc != NULL && (fsc->m1 != 0 || fsc->m2 != 0)) { - MALLOC(cl->cl_fsc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_fsc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_fsc == NULL) goto err_ret; sc2isc(fsc, cl->cl_fsc); rtsc_init(&cl->cl_virtual, cl->cl_fsc, 0, 0); } if (usc != NULL && (usc->m1 != 0 || usc->m2 != 0)) { - MALLOC(cl->cl_usc, struct internal_sc *, - sizeof(struct internal_sc), M_DEVBUF, M_WAITOK); + cl->cl_usc = malloc(sizeof(struct internal_sc), + M_DEVBUF, M_WAITOK); if (cl->cl_usc == NULL) goto err_ret; sc2isc(usc, cl->cl_usc); @@ -565,14 +562,14 @@ #endif } if (cl->cl_fsc != NULL) - FREE(cl->cl_fsc, M_DEVBUF); + free(cl->cl_fsc, M_DEVBUF); if (cl->cl_rsc != NULL) - FREE(cl->cl_rsc, M_DEVBUF); + free(cl->cl_rsc, M_DEVBUF); if (cl->cl_usc != NULL) - FREE(cl->cl_usc, M_DEVBUF); + free(cl->cl_usc, M_DEVBUF); if (cl->cl_q != NULL) - FREE(cl->cl_q, M_DEVBUF); - FREE(cl, M_DEVBUF); + free(cl->cl_q, M_DEVBUF); + free(cl, M_DEVBUF); return (NULL); } @@ -649,13 +646,13 @@ IFQ_UNLOCK(cl->cl_hif->hif_ifq); if (cl->cl_usc != NULL) - FREE(cl->cl_usc, M_DEVBUF); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Oct 25 23:51:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19C4610656A1; Sat, 25 Oct 2008 23:51:31 +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 CFBEE1065682 for ; Sat, 25 Oct 2008 23:51:30 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BDA8A8FC18 for ; Sat, 25 Oct 2008 23:51:30 +0000 (UTC) (envelope-from marcel@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 m9PNpUfe044781 for ; Sat, 25 Oct 2008 23:51:30 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PNpUYG044779 for perforce@freebsd.org; Sat, 25 Oct 2008 23:51:30 GMT (envelope-from marcel@freebsd.org) Date: Sat, 25 Oct 2008 23:51:30 GMT Message-Id: <200810252351.m9PNpUYG044779@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151928 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, 25 Oct 2008 23:51:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=151928 Change 151928 by marcel@marcel_xcllnt on 2008/10/25 23:50:34 Merge fodder. Affected files ... .. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#5 edit .. //depot/projects/e500/sys/dev/cfi/cfi_core.c#4 edit .. //depot/projects/e500/sys/dev/cfi/cfi_dev.c#4 edit .. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#4 edit .. //depot/projects/e500/sys/dev/cfi/cfi_var.h#4 edit Differences ... ==== //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#5 (text+ko) ==== @@ -27,6 +27,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_bus_lbc.c 184251 2008-10-25 06:18:12Z marcel $"); + #include #include #include @@ -73,7 +76,7 @@ if (error) return (error); - if (devtype != LBC_DEVTYPE_BFLASH) + if (devtype != LBC_DEVTYPE_CFI) return (EINVAL); return (cfi_probe(dev)); ==== //depot/projects/e500/sys/dev/cfi/cfi_core.c#4 (text+ko) ==== @@ -27,6 +27,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_core.c 184251 2008-10-25 06:18:12Z marcel $"); + #include #include #include ==== //depot/projects/e500/sys/dev/cfi/cfi_dev.c#4 (text+ko) ==== @@ -27,6 +27,9 @@ * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_dev.c 184251 2008-10-25 06:18:12Z marcel $"); + #include #include #include ==== //depot/projects/e500/sys/dev/cfi/cfi_reg.h#4 (text+ko) ==== @@ -25,6 +25,8 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: head/sys/dev/cfi/cfi_reg.h 184251 2008-10-25 06:18:12Z marcel $ */ #ifndef _DEV_CFI_REG_H_ ==== //depot/projects/e500/sys/dev/cfi/cfi_var.h#4 (text+ko) ==== @@ -25,6 +25,8 @@ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: head/sys/dev/cfi/cfi_var.h 184251 2008-10-25 06:18:12Z marcel $ */ #ifndef _DEV_CFI_VAR_H_ From owner-p4-projects@FreeBSD.ORG Sat Oct 25 23:59:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 840E0106569E; Sat, 25 Oct 2008 23:59:39 +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 46AE31065680 for ; Sat, 25 Oct 2008 23:59:39 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 357AC8FC1F for ; Sat, 25 Oct 2008 23:59:39 +0000 (UTC) (envelope-from marcel@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 m9PNxdF9045351 for ; Sat, 25 Oct 2008 23:59:39 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9PNxdHm045347 for perforce@freebsd.org; Sat, 25 Oct 2008 23:59:39 GMT (envelope-from marcel@freebsd.org) Date: Sat, 25 Oct 2008 23:59:39 GMT Message-Id: <200810252359.m9PNxdHm045347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 151929 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, 25 Oct 2008 23:59:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=151929 Change 151929 by marcel@marcel_xcllnt on 2008/10/25 23:59:15 Diff reduction: use $FreeBSD$ from CVS, not SVN. Affected files ... .. //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#6 edit .. //depot/projects/e500/sys/dev/cfi/cfi_core.c#5 edit .. //depot/projects/e500/sys/dev/cfi/cfi_dev.c#5 edit .. //depot/projects/e500/sys/dev/cfi/cfi_reg.h#5 edit .. //depot/projects/e500/sys/dev/cfi/cfi_var.h#5 edit Differences ... ==== //depot/projects/e500/sys/dev/cfi/cfi_bus_lbc.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_bus_lbc.c 184251 2008-10-25 06:18:12Z marcel $"); +__FBSDID("$FreeBSD: src/sys/dev/cfi/cfi_bus_lbc.c,v 1.1 2008/10/25 06:18:12 marcel Exp $"); #include #include ==== //depot/projects/e500/sys/dev/cfi/cfi_core.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_core.c 184251 2008-10-25 06:18:12Z marcel $"); +__FBSDID("$FreeBSD: src/sys/dev/cfi/cfi_core.c,v 1.1 2008/10/25 06:18:12 marcel Exp $"); #include #include ==== //depot/projects/e500/sys/dev/cfi/cfi_dev.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_dev.c 184251 2008-10-25 06:18:12Z marcel $"); +__FBSDID("$FreeBSD: src/sys/dev/cfi/cfi_dev.c,v 1.1 2008/10/25 06:18:12 marcel Exp $"); #include #include ==== //depot/projects/e500/sys/dev/cfi/cfi_reg.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/dev/cfi/cfi_reg.h 184251 2008-10-25 06:18:12Z marcel $ + * $FreeBSD: head/sys/dev/cfi/cfi_reg.h,v 1.1 2008/10/25 06:18:12 marcel Exp $ */ #ifndef _DEV_CFI_REG_H_ ==== //depot/projects/e500/sys/dev/cfi/cfi_var.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/dev/cfi/cfi_var.h 184251 2008-10-25 06:18:12Z marcel $ + * $FreeBSD: head/sys/dev/cfi/cfi_var.h,v 1.1 2008/10/25 06:18:12 marcel Exp $ */ #ifndef _DEV_CFI_VAR_H_