From owner-p4-projects@FreeBSD.ORG Sun Jul 25 08:41:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D5D61065678; Sun, 25 Jul 2010 08:41: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 9FE061065673 for ; Sun, 25 Jul 2010 08:41:29 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 917F88FC27 for ; Sun, 25 Jul 2010 08:41:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6P8fTuH001210 for ; Sun, 25 Jul 2010 08:41:29 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6P8fSio001208 for perforce@freebsd.org; Sun, 25 Jul 2010 08:41:28 GMT (envelope-from gabor@freebsd.org) Date: Sun, 25 Jul 2010 08:41:28 GMT Message-Id: <201007250841.o6P8fSio001208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181452 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2010 08:41:30 -0000 http://p4web.freebsd.org/@@181452?ac=10 Change 181452 by gabor@gabor_aspire on 2010/07/25 08:39:08 - Add more test cases to the testsuite and refactor a bit - Some code changes, which are necessary for more complicated resource checks - Add support for JLIMIT_NOFILE Affected files ... .. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/fdescfs/fdesc_vfsops.c#2 edit .. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_fork.c#4 edit .. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_jobs.c#5 edit .. //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/jobs.h#3 edit .. //depot/projects/soc2010/gabor_jobs/irix_jobs/tools/test/irix_jobs/jobtest.c#3 edit Differences ... ==== //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/fs/fdescfs/fdesc_vfsops.c#2 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -183,6 +184,7 @@ struct thread *td; struct filedesc *fdp; int lim; + int jlim_cur_avail; int i; int last; int freefd; @@ -198,9 +200,10 @@ PROC_LOCK(td->td_proc); lim = lim_cur(td->td_proc, RLIMIT_NOFILE); PROC_UNLOCK(td->td_proc); + jlim_cur_avail = irix_jobs_cur_avail(td->td_proc->p_ucred->cr_jid, JLIMIT_NOFILE); fdp = td->td_proc->p_fd; FILEDESC_SLOCK(fdp); - last = min(fdp->fd_nfiles, lim); + last = min(min(fdp->fd_nfiles, lim), (jlim_cur_avail + fdp->fd_nfiles)); freefd = 0; for (i = fdp->fd_freefile; i < last; i++) if (fdp->fd_ofiles[i] == NULL) ==== //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_fork.c#4 (text+ko) ==== @@ -114,7 +114,7 @@ td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; if (td->td_proc->p_ucred->cr_jid != 0) - irix_jobs_add_proc(td->td_proc->p_ucred->cr_jid, p2->p_pid); + irix_jobs_add_proc(td->td_proc->p_ucred->cr_jid, p2); } return (error); } ==== //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/kern/kern_jobs.c#5 (text+ko) ==== @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD"); #include +#include #include #include #include @@ -52,7 +53,7 @@ static jid_t min_free_jid = 1; struct procentry { - pid_t pid; + struct proc *td_proc; LIST_ENTRY(procentry) entries; }; @@ -124,15 +125,12 @@ } */ - - p = td->td_proc; - /* * per-job accounting */ jp = jobentry_alloc(uap->rjid); pp = malloc(sizeof(struct procentry), M_IRIX_JOBS, M_NOWAIT | M_ZERO); - pp->pid = p->p_pid; + pp->td_proc = td->td_proc; LIST_INIT(&jp->proclist); LIST_INSERT_HEAD(&jp->proclist, pp, entries); JOBLIST_WLOCK; @@ -142,8 +140,8 @@ /* * per-process accounting */ - PROC_LOCK(p); - p->p_ucred->cr_jid = uap->rjid; + PROC_LOCK(td->td_proc); + td->td_proc->p_ucred->cr_jid = uap->rjid; PROC_UNLOCK(p); /* success, if we have reached here */ @@ -161,20 +159,24 @@ LIST_FOREACH_SAFE(jp, &irix_joblist, entries, jtmp) { if (jp->jid == (jid_t)uap->jid) { LIST_FOREACH_SAFE(pp, &jp->proclist, entries, ptmp) { - struct kill_args args; + struct kill_args kuap; + + printf("killjob traversed pid %d\n", pp->td_proc->p_pid); - args.pid = pp->pid; - args.signum = uap->signal; - if (kill((struct thread *)0, &args) == -1) { + kuap.pid = pp->td_proc->p_pid; + kuap.signum = uap->signal; + if (kill(td, &kuap) == -1) { td->td_retval[0] = -1; JOBLIST_WUNLOCK; return (EPERM); } LIST_REMOVE(pp, entries); + free(pp, M_IRIX_JOBS); } - td->td_retval[0] = 0; LIST_REMOVE(jp, entries); JOBLIST_WUNLOCK; + jobentry_free(jp); + td->td_retval[0] = 0; return (0); } } @@ -272,6 +274,92 @@ return (ENOJOB); } +#define SUM_UP(jid, res, expr) do { \ + struct procentry *pp; \ + \ + JOBLIST_RLOCK; \ + LIST_FOREACH(jp, &irix_joblist, entries) { \ + if (jp->jid == jid) { \ + LIST_FOREACH(pp, &jp->proclist, \ + entries) { \ + res += expr; \ + } \ + JOBLIST_RUNLOCK; \ + return (res); \ + } \ + } \ + } \ + while (0) + +rlim_t +irix_jobs_getjusage(jid_t jid, int resource) +{ + struct jobentry *jp; + rlim_t usage; + + usage = 0; + + if ((jid == 0) || (resource >= JLIMIT_NLIMITS)) + return ((rlim_t)-1); + + switch(resource) { + case JLIMIT_DATA: +// SUM_UP(jid, usage, (round_page((vm_offset_t)pp->td_proc-> +// p_vmspace->vm->vmdaddr) + ctob(pp->td_proc->p_vmspace-> +// vm_dsize)); + break; + case JLIMIT_NOFILE: + SUM_UP(jid, usage, pp->td_proc->p_fd->fd_nfiles); + break; + default: + JOBLIST_RLOCK; + LIST_FOREACH(jp, &irix_joblist, entries) { + if (jp->jid == jid) { + JOBLIST_RUNLOCK; + return (jp->usage[resource]); + } + } + JOBLIST_RUNLOCK; + /* no job entry for existing job, cannot happen */ + return ((rlim_t)-1); + } + +} + +rlim_t +irix_jobs_get_cur_avail(jid_t jid, int resource) +{ + struct jobentry *jp; + + LIST_FOREACH(jp, &irix_joblist, entries) { + if (jp->jid == jid) { + if (jp->limits[resource].rlim_cur != RLIM_INFINITY) + return (jp->limits[resource].rlim_cur - + irix_jobs_getjusage(jid, resource)); + else + return (RLIM_INFINITY); + } + } + return (RLIM_INFINITY); +} + +rlim_t +irix_jobs_get_max_avail(jid_t jid, int resource) +{ + struct jobentry *jp; + + LIST_FOREACH(jp, &irix_joblist, entries) { + if (jp->jid == jid) { + if (jp->limits[resource].rlim_max != RLIM_INFINITY) + return (jp->limits[resource].rlim_max - + irix_jobs_getjusage(jid, resource)); + else + return (RLIM_INFINITY); + } + } + return (RLIM_INFINITY); +} + int irix_jobs_alloc(struct proc *p, int resource, rlim_t amount) { @@ -349,7 +437,7 @@ LIST_FOREACH_SAFE(jp, &irix_joblist, entries, jtmp) { if (jp->jid == jid) { LIST_FOREACH_SAFE(pp, &jp->proclist, entries, ptmp) { - if (pp->pid == pid) { + if (pp->td_proc->p_pid == pid) { LIST_REMOVE(pp, entries); free(pp, M_IRIX_JOBS); } @@ -366,7 +454,7 @@ } void -irix_jobs_add_proc(jid_t jid, pid_t pid) +irix_jobs_add_proc(jid_t jid, struct proc *p) { struct jobentry *jp, *jtmp; struct procentry *pp; @@ -375,7 +463,7 @@ LIST_FOREACH_SAFE(jp, &irix_joblist, entries, jtmp) { if (jp->jid == jid) { pp = malloc(sizeof(struct procentry), M_IRIX_JOBS, M_NOWAIT); - pp->pid = pid; + pp->td_proc = p; LIST_INSERT_HEAD(&jp->proclist, pp, entries); } } ==== //depot/projects/soc2010/gabor_jobs/irix_jobs/sys/sys/jobs.h#3 (text+ko) ==== @@ -34,10 +34,13 @@ __BEGIN_DECLS jid_t getjid_by_pid(pid_t pid); -void irix_jobs_add_proc(jid_t jid, pid_t pid); +void irix_jobs_add_proc(jid_t jid, struct proc *p); void irix_jobs_remove_proc(jid_t jid, pid_t pid); int irix_jobs_alloc(struct proc *p, int resource, rlim_t amount); void irix_jobs_free(struct proc *p, int resource, rlim_t amount); +rlim_t irix_jobs_cur_avail(jid_t jid, int resource); +rlim_t irix_jobs_max_avail(jid_t jid, int resource); +rlim_t irix_jobs_getjusage(jid_t jid, int resource); __END_DECLS #endif /* _KERNEL */ ==== //depot/projects/soc2010/gabor_jobs/irix_jobs/tools/test/irix_jobs/jobtest.c#3 (text+ko) ==== @@ -38,26 +38,97 @@ #include #include +#define PARSE_ARG(var, cfunc, mval) errno = 0; \ + var = cfunc(optarg, &ep, 10); \ + if (((errno == ERANGE) && \ + (var == mval)) || \ + ((errno == EINVAL) && \ + (var == 0))) \ + err(2, NULL); \ + else if (ep[0] != '\0') { \ + errno = EINVAL; \ + err(2, NULL); \ + } + +#define SET_LIMIT(var, lim) int ret; \ + struct rlimit rlp; \ + \ + rlp.rlim_cur = (rlim_t)var; \ + rlp.rlim_max = (rlim_t)var; \ + \ + ret = setjlimit(jid, lim, &rlp);\ + if (ret == -1) { \ + diag_print("setjlimit()"\ + "of " #lim \ + " failed:" \ + " %s.\n", \ + strerror(errno)); \ + return (1); \ + } else \ + diag_print(#lim " limit"\ + " set to %lld.\n", \ + var); \ + \ + ret = getjlimit(jid, lim, &rlp);\ + if (ret == -1) { \ + diag_print("getjlimit()"\ + "of " #lim \ + " failed:" \ + " %s.\n", \ + strerror(errno)); \ + return (1); \ + } else \ + diag_print("getjlimit()"\ + " for " #lim \ + " returns " \ + "%lld/%lld.\n", \ + rlp.rlim_cur, \ + rlp.rlim_max); + struct option long_options[] = { - {"diag", no_argument, NULL, 'd'}, + {"cpu", required_argument, NULL, 'c'}, + {"jlimit-cpu", required_argument, NULL, 'C'}, + {"data", required_argument, NULL, 'd'}, + {"jlimit-data", required_argument, NULL, 'D'}, {"exec", required_argument, NULL, 'e'}, - {"fork", optional_argument, NULL, 'f'}, - {"jlimit_numproc", required_argument, NULL, 'n'}, + {"stat", required_argument, NULL, 'f'}, + {"jlimit-fileno", required_argument, NULL, 'F'}, {"job", no_argument, NULL, 'j'}, {"killjob", no_argument, NULL, 'k'}, + {"mem", required_argument, NULL, 'm'}, + {"jlimit-pmem", required_argument, NULL, 'M'}, + {"proc", optional_argument, NULL, 'p'}, + {"jlimit-numproc", required_argument, NULL, 'P'}, + {"resident", required_argument, NULL, 'r'}, + {"jlimit-rss", required_argument, NULL, 'R'}, {"shell", no_argument, NULL, 's'}, + {"vmem", required_argument, NULL, 'v'}, + {"jlimit-vmem", required_argument, NULL, 'V'}, + {"verbose", no_argument, NULL, 'x'}, {NULL, no_argument, NULL, 0} }; -static const char *optstr = "de:f:jkn:s"; +static const char *optstr = "c:C:d:D:e:f:F:jkm:M:p:P:r:R:sv:V:x"; +static unsigned long long cflag; +static long long Cflag; +static unsigned long long dflag; +static long long Dflag; static char *eflag; static unsigned long long fflag; +static long long Fflag; static bool jflag; static bool kflag; -static long long nflag; +static unsigned long long mflag; +static long long Mflag; +static unsigned long long pflag; +static long long Pflag; +static unsigned long long rflag; +static long long Rflag; static bool sflag; +static unsigned long long vflag; +static long long Vflag; static int null_print(const char * restrict, ...); static int (*diag_print)(const char * restrict format, ...) = null_print; @@ -89,22 +160,26 @@ while (((c = getopt_long(argc, argv, optstr, long_options, NULL)) != -1)) { switch (c) { + case 'c': + PARSE_ARG(cflag, strtoull, ULLONG_MAX); + break; + case 'C': + PARSE_ARG(Cflag, strtoll, LLONG_MAX); + break; case 'd': - diag_print = printf; + PARSE_ARG(dflag, strtoull, ULLONG_MAX); + break; + case 'D': + PARSE_ARG(Dflag, strtoll, LLONG_MAX); break; case 'e': eflag = strdup(optarg); break; case 'f': - errno = 0; - fflag = strtoull(optarg, &ep, 10); - if (((errno == ERANGE) && (fflag == ULLONG_MAX)) || - ((errno == EINVAL) && (fflag == 0))) - err(2, NULL); - else if (ep[0] != '\0') { - errno = EINVAL; - err(2, NULL); - } + PARSE_ARG(fflag, strtoull, ULLONG_MAX); + break; + case 'F': + PARSE_ARG(Fflag, strtoll, LLONG_MAX); break; case 'j': jflag = true; @@ -112,26 +187,42 @@ case 'k': kflag = true; break; - case 'n': - errno = 0; - nflag = strtoll(optarg, &ep, 10); - if (((errno == ERANGE) && (nflag == LLONG_MAX)) || - ((errno == EINVAL) && (nflag == 0))) - err(2, NULL); - else if (ep[0] != '\0') { - errno = EINVAL; - err(2, NULL); - } + case 'm': + PARSE_ARG(mflag, strtoull, ULLONG_MAX); + break; + case 'M': + PARSE_ARG(Mflag, strtoll, LLONG_MAX); + break; + case 'p': + PARSE_ARG(pflag, strtoull, ULLONG_MAX); + break; + case 'P': + PARSE_ARG(Pflag, strtoll, LLONG_MAX); + break; + case 'r': + PARSE_ARG(rflag, strtoull, ULLONG_MAX); + break; + case 'R': + PARSE_ARG(Pflag, strtoll, LLONG_MAX); break; case 's': sflag = true; break; + case 'v': + PARSE_ARG(vflag, strtoull, ULLONG_MAX); + break; + case 'V': + PARSE_ARG(Vflag, strtoll, LLONG_MAX); + break; + case 'x': + diag_print = printf; + break; default: usage(); } } - if (sflag && fflag) + if (sflag && pflag) usage(); if (jflag) { @@ -152,40 +243,64 @@ return (1); } - if (nflag > 0) { - int ret; - struct rlimit rlp; + /* + * Setting resource limits on creaated job. + */ + + if (Cflag > 0) { + SET_LIMIT(Cflag, JLIMIT_CPU); + } + + if (Dflag > 0) { + SET_LIMIT(Fflag, JLIMIT_DATA); + } + + if (Fflag > 0) { + SET_LIMIT(Fflag, JLIMIT_NOFILE); + } + + if (Mflag > 0) { + SET_LIMIT(Mflag, JLIMIT_PMEM); + } + + if (Pflag > 0) { + SET_LIMIT(Pflag, JLIMIT_NUMPROC); + } - rlp.rlim_cur = (rlim_t)nflag; - rlp.rlim_max = (rlim_t)nflag; + if (Rflag > 0) { + SET_LIMIT(Fflag, JLIMIT_RSS); + } - ret = setjlimit(jid, JLIMIT_NUMPROC, &rlp); + if (Vflag > 0) { + SET_LIMIT(Fflag, JLIMIT_VMEM); + } - if (ret == -1) { - diag_print("setjlimit() failed: %s.\n", - strerror(errno)); - return (1); - } else - diag_print("JLIMIT_NUMPROC limit set to %lld.\n", - nflag); + /* + * Start resource consumption. + */ - ret = getjlimit(jid, JLIMIT_NUMPROC, &rlp); + if (cflag > 0) { + /* XXX */ + } - if (ret == -1) { - diag_print("getjlimit() failed: %s.\n", - strerror(errno)); - return (1); - } else - diag_print("getjlimit() says JLIMIT_NUMPROC limit is" - "set to %lld/%lld.\n", rlp.rlim_cur, rlp.rlim_max); + if (dflag > 0) { + /* XXX */ } if (fflag > 0) { - for (unsigned long long i = 0; i < fflag; i++) { + /* XXX */ + } + + if (mflag > 0) { + /* XXX */ + } + + if (pflag > 0) { + for (unsigned long long i = 0; i < pflag; i++) { pid = fork(); if (pid == 0) { - diag_print("Forked process' getjid() returns: %d.\n", - (int)getjid()); + diag_print("Forked process' getjid()" + " returns: %d.\n", (int)getjid()); sleep(5); exit(EXIT_SUCCESS); } else if (pid == -1) { @@ -197,6 +312,18 @@ } } + if (rflag > 0) { + /* XXX */ + } + + if (vflag > 0) { + /* XXX */ + } + + /* + * Misc debug and testing features. + */ + if (sflag) { char *eargv[2]; @@ -210,8 +337,9 @@ if (kflag && (pid != 0)) { int ret; - diag_print("Let's suicide, sending SIGINT to processes of jid %lld...\n", getjid()); - ret = killjob(getjid(), SIGINT); + diag_print("Let's suicide, sending SIGINT to processes of" + " jid %lld...\n", jid); + ret = killjob(jid, SIGINT); if (ret == -1) { diag_print("killjob() failed: %s.\n", strerror(errno)); From owner-p4-projects@FreeBSD.ORG Sun Jul 25 11:09:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E43E1065677; Sun, 25 Jul 2010 11:09: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 BBEF81065670; Sun, 25 Jul 2010 11:09:37 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id 9CB228FC14; Sun, 25 Jul 2010 11:09:37 +0000 (UTC) Received: by iwn35 with SMTP id 35so2310770iwn.13 for ; Sun, 25 Jul 2010 04:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=3XYflpy0U4o2rLbbO/3wqPNTlkoPQQ63q7dJvIy9kss=; b=W1yZIv6GXWKIYdBZu+lPDGICwmNwM6/pUK8QAB1ixw5cFCnnBD0gKXf9CNivdQyMZ/ VpMxFpotzQcOaYMRt1Q/SNUra7y0GbKz1/5+3d6HsBy5FfsCquA77v3BvS53VV/PY3ZN CszpmqcephN+vKVoOzQWvFOybFUxEsdOGyilI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=V8HAHrIPVcfDaaDxAuir+o/1I+ytOMYd54Q2wvJ16FGJcJ1oNkQU17oP8A2T2UmIY4 GcNZUczVAk2tb0sb0pwCWKpmENnwaKnCr7lj57CH6hz8kpkuCrYobVWScRcCD2d5x0XF y3jH1P8g1QKaJvJN08GDmqj+SXtAg5BARzA/I= MIME-Version: 1.0 Received: by 10.231.146.134 with SMTP id h6mr6652622ibv.170.1280056173854; Sun, 25 Jul 2010 04:09:33 -0700 (PDT) Sender: yanegomi@gmail.com Received: by 10.231.169.18 with HTTP; Sun, 25 Jul 2010 04:09:33 -0700 (PDT) In-Reply-To: <201007242051.o6OKpF5t030159@repoman.freebsd.org> References: <201007242051.o6OKpF5t030159@repoman.freebsd.org> Date: Sun, 25 Jul 2010 04:09:33 -0700 X-Google-Sender-Auth: bG2pKz7MTymryrOAHMS2GaeimLw Message-ID: From: Garrett Cooper To: Julien Laffaye Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 181439 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, 25 Jul 2010 11:09:38 -0000 On Sat, Jul 24, 2010 at 1:51 PM, Julien Laffaye wrot= e: > http://p4web.freebsd.org/@@181439?ac=3D10 > > Change 181439 by jlaffaye@jlaffaye-chulak on 2010/07/24 20:51:13 > > =A0 =A0 =A0 =A0Add support for fetching packages. Read them on the fly th= anks > =A0 =A0 =A0 =A0to libarchive(3) callbacks. > =A0 =A0 =A0 =A0Fix segfault by not plist_free'ing an unitialised plist. Was this perhaps a problem with the structure not being NULL'ed out after it was free'd? > Affected files ... > > .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#7 edit > .. //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#3 edit > .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract= .c#6 edit > .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform= .c#6 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#7 (te= xt+ko) =3D=3D=3D=3D > > @@ -33,6 +33,7 @@ > =A0#include > =A0#include > =A0#include > +#include This should be moved down below all of the standard system headers (libarchive might require some of the headers above.. fetch.h has similar requirements)... > =A0#include > =A0#include > =A0#include > @@ -144,6 +145,12 @@ > =A0}; > =A0STAILQ_HEAD(reqr_by_head, reqr_by_entry); > > +struct fetch_data { > + =A0 =A0 =A0 FILE *ftp; > + =A0 =A0 =A0 int pkgfd; > + =A0 =A0 =A0 char buf[8192]; > +}; Using BUFSIZ might be a better idea. > + > =A0/* Prototypes */ > =A0/* Misc */ > =A0int =A0 =A0 =A0 =A0 =A0 =A0vsystem(const char *, ...); > @@ -173,6 +180,8 @@ > =A0Boolean =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0issymlink(const char *); > =A0Boolean =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0isURL(const char *); > =A0const char =A0 =A0 *fileGetURL(const char *, const char *, int); > +int =A0 =A0 =A0 =A0 =A0 =A0fetch_archive(struct archive *, const char *,= const char *, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 Boolean); > =A0char =A0 =A0 =A0 =A0 =A0 *fileFindByPath(const char *, const char *); > =A0char =A0 =A0 =A0 =A0 =A0 *fileGetContents(const char *); > =A0ssize_t =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0write_file(const char *, const = char *); > > =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#3 (te= xt+ko) =3D=3D=3D=3D > > @@ -23,15 +23,23 @@ > > =A0#include > =A0#include > +#include > =A0#include > +#include > =A0#include > =A0#include > =A0#include =A0 =A0 /* NOTE: stdio must come before fetch. */ > =A0#include "pkg.h" > > +static ssize_t archive_read_cb(struct archive *, void *, const void **); > +static int archive_open_cb(struct archive *a, void *); > +static int archive_close_cb(struct archive *, void *); > + > =A0/* > =A0* Try and fetch a file by URL, returning the directory name for where > =A0* it's unpacked, if successful. > + * XXX (jlaffaye): to be removed when all call to fileGetURL() are conve= rted to > + * fetch_archive() > =A0*/ > =A0const char * > =A0fileGetURL(const char *base, const char *spec, int keep_package) > @@ -113,11 +121,11 @@ > =A0 =A0 =A0 =A0fetchDebug =3D (Verbose > 0); > =A0 =A0 =A0 =A0if ((ftp =3D fetchGetURL(fname, Verbose ? "v" : NULL)) =3D= =3D NULL) { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0warnx("Error: Unable to get %s: %s\n", fna= me, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 fetchLastErrString); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 fetchLastErrString); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* If the fetch fails, yank the package. *= / > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (keep_package && unlink(pkg) < 0) { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0warnx("failed to remove pa= rtially fetched package: %s", > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pkg); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pkg); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return (NULL); > =A0 =A0 =A0 =A0} > @@ -182,3 +190,170 @@ > =A0 =A0 =A0 =A0return (rp); > > =A0} > + > +/* > + * Setup the archive `a' callbacks to read data from an URL `spec' via f= etch(3). > + * If `spec' is not an URL, the function try to find the location of the= file > + * via `base' or via the environment variable `PKG_ADD_BASE'. > + * Returns 0 on success, 1 otherwise. > + */ > +int > +fetch_archive(struct archive *a, const char *base, const char *spec, > + =A0 =A0 =A0 =A0 =A0 =A0 Boolean keep_package) > +{ > + =A0 =A0 =A0 struct fetch_data *data =3D NULL; > + =A0 =A0 =A0 char *cp, *hint, *tmp; > + =A0 =A0 =A0 char fname[FILENAME_MAX]; > + =A0 =A0 =A0 char pkg[FILENAME_MAX]; > + =A0 =A0 =A0 int retcode =3D 0; > + > + =A0 =A0 =A0 if ((data =3D malloc(sizeof(struct fetch_data))) =3D=3D NUL= L) > + =A0 =A0 =A0 =A0 =A0 err(EXIT_FAILURE, "malloc()"); > + > + =A0 =A0 =A0 if (!isURL(spec)) { > + =A0 =A0 =A0 =A0 =A0 /* > + =A0 =A0 =A0 =A0 =A0 =A0* We've been given an existing URL (that's known= -good) and now > + =A0 =A0 =A0 =A0 =A0 =A0* we need to construct a composite one out of th= at and the > + =A0 =A0 =A0 =A0 =A0 =A0* basename we were handed as a dependency. > + =A0 =A0 =A0 =A0 =A0 =A0*/ > + =A0 =A0 =A0 =A0 =A0 if (base !=3D NULL) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcpy(fname, base); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* Advance back two slashes to get to the= root of the > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* package hierarchy > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*/ > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 cp =3D strrchr(fname, '/'); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (cp) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 *cp =3D '\0'; /* chop name */ > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 cp =3D strrchr(fname, '/'); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (cp !=3D NULL) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 *(cp + 1) =3D '\0'; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(cp, "All/"); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(cp, spec); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(cp, ".tbz"); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } > + =A0 =A0 =A0 =A0 =A0 } > + =A0 =A0 =A0 =A0 =A0 /* Special tip that sysinstall left for us */ > + =A0 =A0 =A0 =A0 =A0 else if ((hint =3D getenv("PKG_ADD_BASE")) !=3D NUL= L) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* Otherwise, we've been given an environ= ment variable > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* hinting at the right location from sys= install > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*/ > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcpy(fname, hint); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(fname, spec); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(fname, ".tbz"); > + =A0 =A0 =A0 =A0 =A0 } > + =A0 =A0 =A0 =A0 =A0 /* We dont have an url and are unable to guess one = */ > + =A0 =A0 =A0 =A0 =A0 else { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; > + =A0 =A0 =A0 =A0 =A0 } > + =A0 =A0 =A0 } > + =A0 =A0 =A0 else > + =A0 =A0 =A0 =A0 =A0 strcpy(fname, spec); > + > + =A0 =A0 =A0 if (keep_package) { > + =A0 =A0 =A0 =A0 =A0 tmp =3D getenv("PKGDIR"); > + =A0 =A0 =A0 =A0 =A0 strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg)); > + =A0 =A0 =A0 =A0 =A0 tmp =3D basename(fname); > + =A0 =A0 =A0 =A0 =A0 strlcat(pkg, "/", sizeof(pkg)); > + =A0 =A0 =A0 =A0 =A0 strlcat(pkg, tmp, sizeof(pkg)); > + > + =A0 =A0 =A0 =A0 =A0 data->pkgfd =3D open(pkg, O_WRONLY|O_CREAT|O_TRUNC,= 0644); > + =A0 =A0 =A0 =A0 =A0 if (data->pkgfd =3D=3D -1) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 warn("Error: Unable to open %s", pkg); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; > + =A0 =A0 =A0 =A0 =A0 } > + =A0 =A0 =A0 } else > + =A0 =A0 =A0 =A0 =A0 data->pkgfd =3D 0; > + > + =A0 =A0 =A0 fetchDebug =3D (Verbose > 0); > + =A0 =A0 =A0 if ((data->ftp =3D fetchGetURL(fname, Verbose ? "v" : NULL)= ) =3D=3D NULL) { > + =A0 =A0 =A0 =A0 =A0 warnx("Error: Unable to get %s: %s\n", fname, fetch= LastErrString); > + =A0 =A0 =A0 =A0 =A0 /* If the fetch fails, yank the package. */ > + =A0 =A0 =A0 =A0 =A0 if (keep_package && unlink(pkg) < 0) > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 warnx("failed to remove partially fetched p= ackage: %s", pkg); > + =A0 =A0 =A0 =A0 =A0 retcode =3D 1; > + =A0 =A0 =A0 =A0 =A0 goto cleanup; > + =A0 =A0 =A0 } > + > + =A0 =A0 =A0 if (isatty(0) || Verbose) { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 printf("Fetching %s...", fname); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 fflush(stdout); > + =A0 =A0 =A0 } > + > + =A0 =A0 =A0 if (archive_read_open(a, data, archive_open_cb, archive_rea= d_cb, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 archive_close_c= b) !=3D ARCHIVE_OK) { > + =A0 =A0 =A0 =A0 =A0 warnx("Can not open '%s': %s", pkg, archive_error_s= tring(a)); > + =A0 =A0 =A0 =A0 =A0 retcode =3D 1; > + =A0 =A0 =A0 =A0 =A0 goto cleanup; > + =A0 =A0 =A0 } > + > + =A0 =A0 =A0 cleanup: > + =A0 =A0 =A0 if (retcode =3D=3D 1 && data !=3D NULL) > + =A0 =A0 =A0 =A0 =A0 free(data); > + > + =A0 =A0 =A0 return (retcode); > +} > + > +/* > + * Libarchive callback called when more data is needed. > + * Read the data from the fetch(3) file descriptor and store it into buf= From owner-p4-projects@FreeBSD.ORG Sun Jul 25 12:52:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 211551065687; Sun, 25 Jul 2010 12:52: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 D80C7106567C; Sun, 25 Jul 2010 12:52:20 +0000 (UTC) (envelope-from julien.laffaye@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 43CDF8FC25; Sun, 25 Jul 2010 12:52:19 +0000 (UTC) Received: by bwz12 with SMTP id 12so2748328bwz.13 for ; Sun, 25 Jul 2010 05:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=Leql3CYuzJNM7yuqvJbj8k8VElvX0KuTMH6QN0wC4fs=; b=Lt4BA2hcGRlqQxryARd/104rUQGkBgMUcleWbRs9nixErgnCU6qXEhyL/7Cq04YvND 0A1/ZlkSOfV07jf6uCSQGi87dwYAedTAUZvs+nK6Tk4TdveuXwap/IuTMpU+cSyqhhSO t6l9bowqrj3qDRtmEGuB+KgA1YP0bLL1tQzJ4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=bRPp3lIefWKrf7+0H15Wwx5m+WQVqGrO/YMugYlfn7V4IHOSKmMc6f6nJ58n/EWBqS eIgZKoy6hGd8HXeM6QKQHOtkW23K31P+opJHPXxbT3r1/Ib5vKwUQ7CZq8mdK3n9D5nL nXCgRPD7OUY2xXZPEBa8ydfmgcU5formxn7RI= MIME-Version: 1.0 Received: by 10.204.126.205 with SMTP id d13mr4547031bks.126.1280062338874; Sun, 25 Jul 2010 05:52:18 -0700 (PDT) Sender: julien.laffaye@gmail.com Received: by 10.204.48.27 with HTTP; Sun, 25 Jul 2010 05:52:18 -0700 (PDT) In-Reply-To: References: <201007242051.o6OKpF5t030159@repoman.freebsd.org> Date: Sun, 25 Jul 2010 14:52:18 +0200 X-Google-Sender-Auth: SAxJRFmKuk0MGSoCdyy8DulSXFM Message-ID: From: Julien LAFFAYE To: Garrett Cooper Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Perforce Change Reviews Subject: Re: PERFORCE change 181439 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, 25 Jul 2010 12:52:21 -0000 On Sun, Jul 25, 2010 at 1:09 PM, Garrett Cooper wrote= : > On Sat, Jul 24, 2010 at 1:51 PM, Julien Laffaye wr= ote: >> http://p4web.freebsd.org/@@181439?ac=3D10 >> >> Change 181439 by jlaffaye@jlaffaye-chulak on 2010/07/24 20:51:13 >> >> =A0 =A0 =A0 =A0Add support for fetching packages. Read them on the fly t= hanks >> =A0 =A0 =A0 =A0to libarchive(3) callbacks. >> =A0 =A0 =A0 =A0Fix segfault by not plist_free'ing an unitialised plist. > > Was this perhaps a problem with the structure not being NULL'ed out > after it was free'd? Actually, on a particular error I was trying to cleanup the plist, but it was not initialized yet. So pkg.head contained an arbitrary value (but not NULL), so plist_free() started to follow this memory address... which was indeed garbage. > >> Affected files ... >> >> .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#7 edit >> .. //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#3 edit >> .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extrac= t.c#6 edit >> .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perfor= m.c#6 edit >> >> Differences ... >> >> =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#7 (t= ext+ko) =3D=3D=3D=3D >> >> @@ -33,6 +33,7 @@ >> =A0#include >> =A0#include >> =A0#include >> +#include > > This should be moved down below all of the standard system headers > (libarchive might require some of the headers above.. fetch.h has > similar requirements)... >From style(9), I can read: "Leave a blank line before the next group, the /usr/include files, which should be sorted alphabetically by name". But that's right, fetch(3) uses FILE which is defined in So I guess the point here is 'standard' as in C standard or as in "shipped with base". Anyway, I must admit that the advised blank line is missing here ;p > >> =A0#include >> =A0#include >> =A0#include >> @@ -144,6 +145,12 @@ >> =A0}; >> =A0STAILQ_HEAD(reqr_by_head, reqr_by_entry); >> >> +struct fetch_data { >> + =A0 =A0 =A0 FILE *ftp; >> + =A0 =A0 =A0 int pkgfd; >> + =A0 =A0 =A0 char buf[8192]; >> +}; > > Using BUFSIZ might be a better idea. I am not sure that BUFSIZ is meant to be used in this case. On my system, its value is 1024 which is pretty low for net I/O IMHO. Furthermore, I've experienced something "strange" (I might ask Tim): on open, libarchive called ~50 times the read callback. Which means that libarchive stored ~409Kb somewhere in a buffer, while I did not called next_header() nor read_data()... Likewise, libarchive called like 10times the read callback, then extracted ~6files, and so on. I am confused cause it's advertised that it's a no-copy architecture. Anyway, it works and that's all that matters. > >> + >> =A0/* Prototypes */ >> =A0/* Misc */ >> =A0int =A0 =A0 =A0 =A0 =A0 =A0vsystem(const char *, ...); >> @@ -173,6 +180,8 @@ >> =A0Boolean =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0issymlink(const char *); >> =A0Boolean =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0isURL(const char *); >> =A0const char =A0 =A0 *fileGetURL(const char *, const char *, int); >> +int =A0 =A0 =A0 =A0 =A0 =A0fetch_archive(struct archive *, const char *= , const char *, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 Boolean); >> =A0char =A0 =A0 =A0 =A0 =A0 *fileFindByPath(const char *, const char *); >> =A0char =A0 =A0 =A0 =A0 =A0 *fileGetContents(const char *); >> =A0ssize_t =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0write_file(const char *, const= char *); >> >> =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#3 (t= ext+ko) =3D=3D=3D=3D >> >> @@ -23,15 +23,23 @@ >> >> =A0#include >> =A0#include >> +#include >> =A0#include >> +#include >> =A0#include >> =A0#include >> =A0#include =A0 =A0 /* NOTE: stdio must come before fetch. */ >> =A0#include "pkg.h" >> >> +static ssize_t archive_read_cb(struct archive *, void *, const void **)= ; >> +static int archive_open_cb(struct archive *a, void *); >> +static int archive_close_cb(struct archive *, void *); >> + >> =A0/* >> =A0* Try and fetch a file by URL, returning the directory name for where >> =A0* it's unpacked, if successful. >> + * XXX (jlaffaye): to be removed when all call to fileGetURL() are conv= erted to >> + * fetch_archive() >> =A0*/ >> =A0const char * >> =A0fileGetURL(const char *base, const char *spec, int keep_package) >> @@ -113,11 +121,11 @@ >> =A0 =A0 =A0 =A0fetchDebug =3D (Verbose > 0); >> =A0 =A0 =A0 =A0if ((ftp =3D fetchGetURL(fname, Verbose ? "v" : NULL)) = =3D=3D NULL) { >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0warnx("Error: Unable to get %s: %s\n", fn= ame, >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 fetchLastErrString); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 fetchLastErrString); >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* If the fetch fails, yank the package. = */ >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (keep_package && unlink(pkg) < 0) { >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0warnx("failed to remove p= artially fetched package: %s", >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pkg); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pkg); >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return (NULL); >> =A0 =A0 =A0 =A0} >> @@ -182,3 +190,170 @@ >> =A0 =A0 =A0 =A0return (rp); >> >> =A0} >> + >> +/* >> + * Setup the archive `a' callbacks to read data from an URL `spec' via = fetch(3). >> + * If `spec' is not an URL, the function try to find the location of th= e file >> + * via `base' or via the environment variable `PKG_ADD_BASE'. >> + * Returns 0 on success, 1 otherwise. >> + */ >> +int >> +fetch_archive(struct archive *a, const char *base, const char *spec, >> + =A0 =A0 =A0 =A0 =A0 =A0 Boolean keep_package) >> +{ >> + =A0 =A0 =A0 struct fetch_data *data =3D NULL; >> + =A0 =A0 =A0 char *cp, *hint, *tmp; >> + =A0 =A0 =A0 char fname[FILENAME_MAX]; >> + =A0 =A0 =A0 char pkg[FILENAME_MAX]; >> + =A0 =A0 =A0 int retcode =3D 0; >> + >> + =A0 =A0 =A0 if ((data =3D malloc(sizeof(struct fetch_data))) =3D=3D NU= LL) >> + =A0 =A0 =A0 =A0 =A0 err(EXIT_FAILURE, "malloc()"); >> + >> + =A0 =A0 =A0 if (!isURL(spec)) { >> + =A0 =A0 =A0 =A0 =A0 /* >> + =A0 =A0 =A0 =A0 =A0 =A0* We've been given an existing URL (that's know= n-good) and now >> + =A0 =A0 =A0 =A0 =A0 =A0* we need to construct a composite one out of t= hat and the >> + =A0 =A0 =A0 =A0 =A0 =A0* basename we were handed as a dependency. >> + =A0 =A0 =A0 =A0 =A0 =A0*/ >> + =A0 =A0 =A0 =A0 =A0 if (base !=3D NULL) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcpy(fname, base); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* Advance back two slashes to get to th= e root of the >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* package hierarchy >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*/ >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 cp =3D strrchr(fname, '/'); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (cp) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 *cp =3D '\0'; /* chop name */ >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 cp =3D strrchr(fname, '/'); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (cp !=3D NULL) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 *(cp + 1) =3D '\0'; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(cp, "All/"); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(cp, spec); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(cp, ".tbz"); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 } >> + =A0 =A0 =A0 =A0 =A0 } >> + =A0 =A0 =A0 =A0 =A0 /* Special tip that sysinstall left for us */ >> + =A0 =A0 =A0 =A0 =A0 else if ((hint =3D getenv("PKG_ADD_BASE")) !=3D NU= LL) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* Otherwise, we've been given an enviro= nment variable >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* hinting at the right location from sy= sinstall >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*/ >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcpy(fname, hint); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(fname, spec); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 strcat(fname, ".tbz"); >> + =A0 =A0 =A0 =A0 =A0 } >> + =A0 =A0 =A0 =A0 =A0 /* We dont have an url and are unable to guess one= */ >> + =A0 =A0 =A0 =A0 =A0 else { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; >> + =A0 =A0 =A0 =A0 =A0 } >> + =A0 =A0 =A0 } >> + =A0 =A0 =A0 else >> + =A0 =A0 =A0 =A0 =A0 strcpy(fname, spec); >> + >> + =A0 =A0 =A0 if (keep_package) { >> + =A0 =A0 =A0 =A0 =A0 tmp =3D getenv("PKGDIR"); >> + =A0 =A0 =A0 =A0 =A0 strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg)); >> + =A0 =A0 =A0 =A0 =A0 tmp =3D basename(fname); >> + =A0 =A0 =A0 =A0 =A0 strlcat(pkg, "/", sizeof(pkg)); >> + =A0 =A0 =A0 =A0 =A0 strlcat(pkg, tmp, sizeof(pkg)); >> + >> + =A0 =A0 =A0 =A0 =A0 data->pkgfd =3D open(pkg, O_WRONLY|O_CREAT|O_TRUNC= , 0644); >> + =A0 =A0 =A0 =A0 =A0 if (data->pkgfd =3D=3D -1) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 warn("Error: Unable to open %s", pkg); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; >> + =A0 =A0 =A0 =A0 =A0 } >> + =A0 =A0 =A0 } else >> + =A0 =A0 =A0 =A0 =A0 data->pkgfd =3D 0; >> + >> + =A0 =A0 =A0 fetchDebug =3D (Verbose > 0); >> + =A0 =A0 =A0 if ((data->ftp =3D fetchGetURL(fname, Verbose ? "v" : NULL= )) =3D=3D NULL) { >> + =A0 =A0 =A0 =A0 =A0 warnx("Error: Unable to get %s: %s\n", fname, fetc= hLastErrString); >> + =A0 =A0 =A0 =A0 =A0 /* If the fetch fails, yank the package. */ >> + =A0 =A0 =A0 =A0 =A0 if (keep_package && unlink(pkg) < 0) >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 warnx("failed to remove partially fetched = package: %s", pkg); >> + =A0 =A0 =A0 =A0 =A0 retcode =3D 1; >> + =A0 =A0 =A0 =A0 =A0 goto cleanup; >> + =A0 =A0 =A0 } >> + >> + =A0 =A0 =A0 if (isatty(0) || Verbose) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 printf("Fetching %s...", fname); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 fflush(stdout); >> + =A0 =A0 =A0 } >> + >> + =A0 =A0 =A0 if (archive_read_open(a, data, archive_open_cb, archive_re= ad_cb, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 archive_close_= cb) !=3D ARCHIVE_OK) { >> + =A0 =A0 =A0 =A0 =A0 warnx("Can not open '%s': %s", pkg, archive_error_= string(a)); >> + =A0 =A0 =A0 =A0 =A0 retcode =3D 1; >> + =A0 =A0 =A0 =A0 =A0 goto cleanup; >> + =A0 =A0 =A0 } >> + >> + =A0 =A0 =A0 cleanup: >> + =A0 =A0 =A0 if (retcode =3D=3D 1 && data !=3D NULL) >> + =A0 =A0 =A0 =A0 =A0 free(data); >> + >> + =A0 =A0 =A0 return (retcode); >> +} >> + >> +/* >> + * Libarchive callback called when more data is needed. >> + * Read the data from the fetch(3) file descriptor and store it into bu= f. >> + * If `pkgfd' is a valid file descriptor, also write the data on disk. >> + * Returns the read size, 0 on EOF, -1 on error. >> + */ >> +static ssize_t >> +archive_read_cb(struct archive *a, void *client_data, const void **buf) >> +{ >> + =A0 =A0 =A0 ssize_t r; >> + =A0 =A0 =A0 struct fetch_data *data =3D client_data; >> + >> + =A0 =A0 =A0 *buf =3D data->buf; >> + =A0 =A0 =A0 if ((r =3D fread(data->buf, 1, sizeof(data->buf), data->ft= p)) < 1) >> + =A0 =A0 =A0 =A0 =A0 if (ferror(data->ftp)) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 archive_set_error(a, 0, "error while fetch= ing : %s", >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 fetchL= astErrString); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (-1); >> + =A0 =A0 =A0 =A0 =A0 } >> + >> + =A0 =A0 =A0 if (data->pkgfd > 0 && r > 0) > > What if the pkgfd is <=3D 0 and r is > 0? If pkgfd is <=3D 0 then we did not open the file on disk cause KeepPackage was set to FALSE. So we do nothing. > >> + =A0 =A0 =A0 =A0 =A0 if (write(data->pkgfd, buf, r) !=3D r) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 archive_set_error(a, 0, "can not write to = package file: %s", >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strerr= or(errno)); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (-1); >> + =A0 =A0 =A0 =A0 =A0 } >> + >> + =A0 =A0 =A0 return (r); >> +} >> + >> +/* >> + * Libarchive callback called by archive_open() >> + * Since all the job is done in fetch_archive(), always return success. >> + */ >> +static int >> +archive_open_cb(struct archive *a, void *client_data) >> +{ >> + =A0 =A0 =A0 return (ARCHIVE_OK); >> +} >> + >> +/* >> + * Libarchive callback called by archive_close(). >> + * Release the file descriptors and free the structure. >> + */ >> +static int >> +archive_close_cb(struct archive *a, void *client_data) >> +{ >> + =A0 =A0 =A0 struct fetch_data *data =3D client_data; >> + >> + =A0 =A0 =A0 fclose(data->ftp); >> + =A0 =A0 =A0 if (data->pkgfd > 0) >> + =A0 =A0 =A0 =A0 =A0 close(data->pkgfd); >> + =A0 =A0 =A0 free(data); >> + >> + =A0 =A0 =A0 return (ARCHIVE_OK); >> +} >> >> =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/= add/extract.c#6 (text+ko) =3D=3D=3D=3D >> >> @@ -43,7 +43,8 @@ >> =A0 =A0 =A0 =A0if ((plist_buf =3D malloc(s+1)) =3D=3D NULL) >> =A0 =A0 =A0 =A0 =A0 =A0err(EXIT_FAILURE, "malloc()"); >> =A0 =A0 =A0 =A0if (archive_read_data(a, plist_buf, s) !=3D s) { >> - =A0 =A0 =A0 =A0 =A0 warnx("Can not extract plist: %s", archive_error_s= tring(a)); >> + =A0 =A0 =A0 =A0 =A0 warnx("Can not extract %s: %s", CONTENTS_FNAME, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 archive_error_string(a)); >> =A0 =A0 =A0 =A0 =A0 =A0return (1); >> =A0 =A0 =A0 =A0} >> =A0 =A0 =A0 =A0plist_buf[s] =3D '\0'; >> @@ -52,7 +53,7 @@ >> =A0 =A0 =A0 =A0retcode =3D read_plist_from_buffer(pkg, plist_buf, s); >> =A0 =A0 =A0 =A0free(plist_buf); >> =A0 =A0 =A0 =A0if (retcode !=3D 0) { >> - =A0 =A0 =A0 =A0 =A0 warnx("Unable to parse plist!"); >> + =A0 =A0 =A0 =A0 =A0 warnx("Unable to parse %s!", CONTENTS_FNAME); >> =A0 =A0 =A0 =A0 =A0 =A0return (1); >> =A0 =A0 =A0 =A0} >> >> >> =3D=3D=3D=3D //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/= add/perform.c#6 (text+ko) =3D=3D=3D=3D >> >> @@ -73,20 +73,23 @@ >> >> =A0 =A0 =A0 =A0/* >> =A0 =A0 =A0 =A0 * TODO: >> - =A0 =A0 =A0 =A0* =A0 =A0 =A0dowload the package if it is an URL, read = from stdin if "-" >> =A0 =A0 =A0 =A0 * =A0 =A0 =A0Deal with master/slave modes. >> =A0 =A0 =A0 =A0 * =A0 =A0 =A0add support for complete packages >> =A0 =A0 =A0 =A0 */ >> =A0 =A0 =A0 =A0if (isURL(fname)) { >> - =A0 =A0 =A0 =A0 =A0 /* TODO: add support */ >> - =A0 =A0 =A0 =A0 =A0 return (1); >> + =A0 =A0 =A0 =A0 =A0 if (fetch_archive(a, NULL, fname, KeepPackage) != =3D 0) { >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 warnx("Can not fetch '%s' - aborting", fna= me); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; >> + =A0 =A0 =A0 =A0 =A0 } >> =A0 =A0 =A0 =A0} else { >> =A0 =A0 =A0 =A0 =A0 =A0if (strcmp(fname, "-") =3D=3D 0) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0fd =3D fileno(stdin); >> =A0 =A0 =A0 =A0 =A0 =A0else { >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if ((fd =3D open(fname, O_RDONLY)) =3D=3D= -1) { >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 warn("open(%s)", fname); >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return (1); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 warn("Can not open '%s' for readin= g", fname); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D 1; >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 goto cleanup; >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} >> =A0 =A0 =A0 =A0 =A0 =A0} >> >> @@ -102,11 +105,12 @@ >> =A0 =A0 =A0 =A0 =A0 =A0pathname =3D archive_entry_pathname(entry); >> =A0 =A0 =A0 =A0 =A0 =A0if (strcmp(pathname, CONTENTS_FNAME) =3D=3D 0) { >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (extract_plist(a, entry, &pkg) !=3D 0)= { >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 warnx("Can not extract & parse " C= ONTENTS_FNAME); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 warnx("Can not proceed without pac= king list - aborting"); >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0retcode =3D 1; >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto cleanup; >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 extract_package(a, &pkg); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 retcode =3D extract_package(a, &pkg); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 free_plist(&pkg); >> =A0 =A0 =A0 =A0 =A0 =A0} else if (strcmp(pathname, "+PKG_COMPLETE") =3D= =3D 0) { >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (Verbose) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0printf("'%s' is a complete packag= e...\n", fname); >> @@ -126,8 +130,6 @@ >> =A0 =A0 =A0 =A0cleanup: >> =A0 =A0 =A0 =A0if (a !=3D NULL) >> =A0 =A0 =A0 =A0 =A0 =A0archive_read_finish(a); >> - =A0 =A0 =A0 if (pkg.head !=3D NULL) >> - =A0 =A0 =A0 =A0 =A0 free_plist(&pkg); >> =A0 =A0 =A0 =A0return (retcode); >> >> =A0# if 0 >> > From owner-p4-projects@FreeBSD.ORG Sun Jul 25 21:06:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3C821065679; Sun, 25 Jul 2010 21:06: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 6AB821065675; Sun, 25 Jul 2010 21:06:31 +0000 (UTC) (envelope-from tim@kientzle.com) Received: from monday.kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id B734F8FC0C; Sun, 25 Jul 2010 21:06:30 +0000 (UTC) Received: (from root@localhost) by monday.kientzle.com (8.14.3/8.14.3) id o6PKceuu066093; Sun, 25 Jul 2010 20:38:40 GMT (envelope-from tim@kientzle.com) Received: from [10.123.2.173] (fw2.kientzle.com [10.123.1.2]) by kientzle.com with SMTP id dfgepyntsd53asee9hxsdftjwa; Sun, 25 Jul 2010 20:38:39 +0000 (UTC) (envelope-from tim@kientzle.com) Mime-Version: 1.0 (Apple Message framework v1081) Content-Type: text/plain; charset=us-ascii From: Tim Kientzle In-Reply-To: Date: Sun, 25 Jul 2010 13:38:26 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: <153F352E-BA08-4102-822D-C82FE17FA705@kientzle.com> References: <201007242051.o6OKpF5t030159@repoman.freebsd.org> To: Garrett Cooper X-Mailer: Apple Mail (2.1081) Cc: Perforce Change Reviews , Julien Laffaye Subject: Re: PERFORCE change 181439 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, 25 Jul 2010 21:06:32 -0000 On Jul 25, 2010, at 4:09 AM, Garrett Cooper wrote: > On Sat, Jul 24, 2010 at 1:51 PM, Julien Laffaye = wrote: >>=20 >> #include >> #include >> +#include >=20 > This should be moved down below all of the standard system headers > (libarchive might require some of the headers above.. fetch.h has > similar requirements)... archive.h includes the system headers it needs and can be ordered according to style(9). Tim= From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2303F1065675; Wed, 28 Jul 2010 08: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 CB35F106564A for ; Wed, 28 Jul 2010 08:21: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 B89D98FC1A for ; Wed, 28 Jul 2010 08:21:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LQaQ009074 for ; Wed, 28 Jul 2010 08:21:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LQUp009072 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:26 GMT Message-Id: <201007280821.o6S8LQUp009072@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 Precedence: bulk Cc: Subject: PERFORCE change 181453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:27 -0000 X-List-Received-Date: Wed, 28 Jul 2010 08:21:27 -0000 http://p4web.freebsd.org/@@181453?ac=10 Change 181453 by hselasky@hselasky_laptop001 on 2010/07/25 10:39:45 USB controller: - add XHCI DMA descriptor definitions. - patch by: hselasky @  Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#2 (text+ko) ==== @@ -22,3 +22,152 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#ifndef _XHCI_H_ +#define _XHCI_H_ + +#define XHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128) +#define XHCI_MAX_ENDPOINTS 32 + +#define XHCI_DEV_CTX_ADDR_ALIGN 64 /* bytes */ +#define XHCI_DEV_CTX_ALIGN 64 /* bytes */ +#define XHCI_INPUT_CTX_ALIGN 64 /* bytes */ +#define XHCI_SLOT_CTX_ALIGN 32 /* bytes */ +#define XHCI_ENDP_CTX_ALIGN 32 /* bytes */ +#define XHCI_STREAM_CTX_ALIGN 16 /* bytes */ +#define XHCI_TRANS_RING_SEG_ALIGN 16 /* bytes */ +#define XHCI_CMD_RING_SEG_ALIGN 64 /* bytes */ +#define XHCI_EVENT_RING_SEG_ALIGN 64 /* bytes */ +#define XHCI_EVENT_RING_SEG_TAB_ALIGN 64 /* bytes */ +#define XHCI_SCRATCH_BUF_ARRAY_ALIGN 64 /* bytes */ +#define XHCI_SCRATCH_BUFFER_ALIGN USB_PAGE_SIZE +#define XHCI_TRB_ALIGN 16 /* bytes */ + +struct xhci_dev_ctx_addr { + volatile uint64_t qwBaaDevCtxAddr; + volatile uint64_t qwBaaScratchAddr; +#define XHCI_BAA_MASK 0xFFFFFFFFFFFFFFE0ULL +} __aligned(XHCI_DEV_CTX_ADDR_ALIGN); + +struct xhci_slot_ctx { + volatile uint32_t dwSctx0; +#define XHCI_SCTX_0_ROUTE_SET(x) ((x) & 0xFFFFF) +#define XHCI_SCTX_0_ROUTE_GET(x) ((x) & 0xFFFFF) +#define XHCI_SCTX_0_SPEED_SET(x) (((x) & 0xF) << 20) +#define XHCI_SCTX_0_SPEED_GET(x) (((x) >> 20) & 0xF) +#define XHCI_SCTX_0_MTT_SET(x) (((x) & 0x1) << 25) +#define XHCI_SCTX_0_MTT_GET(x) (((x) >> 25) & 0x1) +#define XHCI_SCTX_0_HUB_SET(x) (((x) & 0x1) << 26) +#define XHCI_SCTX_0_HUB_GET(x) (((x) >> 26) & 0x1) +#define XHCI_SCTX_0_CTX_NUM_SET(x) (((x) & 0x1F) << 27) +#define XHCI_SCTX_0_CTX_NUM_GET(x) (((x) >> 27) & 0x1F) + volatile uint32_t dwSctx1; +#define XHCI_SCTX_1_MAX_EL_SET(x) ((x) & 0xFFFF) +#define XHCI_SCTX_1_MAX_EL_GET(x) ((x) & 0xFFFF) +#define XHCI_SCTX_1_RH_PORT_SET(x) (((x) & 0xFF) << 16) +#define XHCI_SCTX_1_RH_PORT_GET(x) (((x) >> 16) & 0xFF) +#define XHCI_SCTX_1_NUM_PORTS_SET(x) (((x) & 0xFF) << 24) +#define XHCI_SCTX_1_NUM_PORTS_GET(x) (((x) >> 24) & 0xFF) + volatile uint32_t dwSctx2; +#define XHCI_SCTX_2_TT_HUB_SID_SET(x) ((x) & 0xFF) +#define XHCI_SCTX_2_TT_HUB_SID_GET(x) ((x) & 0xFF) +#define XHCI_SCTX_2_TT_PORT_NUM_SET(x) (((x) & 0xFF) << 8) +#define XHCI_SCTX_2_TT_PORT_NUM_GET(x) (((x) >> 8) & 0xFF) +#define XHCI_SCTX_2_TT_THINK_TIME_SET(x) (((x) & 0x3) << 16) +#define XHCI_SCTX_2_TT_THINK_TIME_GET(x) (((x) >> 16) & 0x3) +#define XHCI_SCTX_2_IRQ_TARGET_SET(x) (((x) & 0x3FF) << 22) +#define XHCI_SCTX_2_IRQ_TARGET_GET(x) (((x) >> 22) & 0x3FF) + volatile uint32_t dwSctx3; +#define XHCI_SCTX_3_DEV_ADDR_SET(x) ((x) & 0xFF) +#define XHCI_SCTX_3_DEV_ADDR_GET(x) ((x) & 0xFF) +#define XHCI_SCTX_3_SLOT_STATE_SET(x) (((x) & 0x1F) << 27) +#define XHCI_SCTX_3_SLOT_STATE_GET(x) (((x) >> 27) & 0x1F) + volatile uint32_t dwSctx4; + volatile uint32_t dwSctx5; + volatile uint32_t dwSctx6; + volatile uint32_t dwSctx7; +} __aligned(XHCI_SLOT_CTX_ALIGN); + +struct xhci_endp_ctx { + volatile uint32_t dwEpCtx0; +#define XHCI_EPCTX_0_EPSTATE_SET(x) ((x) & 0x7) +#define XHCI_EPCTX_0_EPSTATE_GET(x) ((x) & 0x7) +#define XHCI_EPCTX_0_MULT_SET(x) (((x) & 0x3) << 8) +#define XHCI_EPCTX_0_MULT_GET(x) (((x) >> 8) & 0x3) +#define XHCI_EPCTX_0_MAXP_STREAMS_SET(x) (((x) & 0x1F) << 10) +#define XHCI_EPCTX_0_MAXP_STREAMS_GET(x) (((x) >> 10) & 0x1F) +#define XHCI_EPCTX_0_LSA_SET(x) (((x) & 0x1) << 15) +#define XHCI_EPCTX_0_LSA_GET(x) (((x) >> 15) & 0x1) +#define XHCI_EPCTX_0_IVAL_SET(x) (((x) & 0xFF) << 16) +#define XHCI_EPCTX_0_IVAL_GET(x) (((x) >> 16) & 0xFF) + volatile uint32_t dwEpCtx1; +#define XHCI_EPCTX_1_CERR_SET(x) (((x) & 0x3) << 1) +#define XHCI_EPCTX_1_CERR_GET(x) (((x) >> 1) & 0x3) +#define XHCI_EPCTX_1_EPTYPE_SET(x) (((x) & 0x7) << 3) +#define XHCI_EPCTX_1_EPTYPE_GET(x) (((x) >> 3) & 0x7) +#define XHCI_EPCTX_1_HID_SET(x) (((x) & 0x1) << 7) +#define XHCI_EPCTX_1_HID_GET(x) (((x) >> 7) & 0x1) +#define XHCI_EPCTX_1_MAXB_SET(x) (((x) & 0xFF) << 8) +#define XHCI_EPCTX_1_MAXB_GET(x) (((x) >> 8) & 0xFF) +#define XHCI_EPCTX_1_MAXP_SIZE_SET(x) (((x) & 0xFFFF) << 16) +#define XHCI_EPCTX_1_MAXP_SIZE_GET(x) (((x) >> 16) & 0xFFFF) + volatile uint64_t qwEpCtx2; +#define XHCI_EPCTX_2_DCS_SET(x) ((x) & 0x1) +#define XHCI_EPCTX_2_DCS_GET(x) ((x) & 0x1) +#define XHCI_EPCTX_2_TR_DQ_PTR_MASK 0xFFFFFFFFFFFFFFF0U + volatile uint32_t dwEpCtx4; +#define XHCI_EPCTX_4_AVG_TRB_LEN_SET(x) ((x) & 0xFFFF) +#define XHCI_EPCTX_4_AVG_TRB_LEN_GET(x) ((x) & 0xFFFF) +#define XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(x) (((x) & 0xFFFF) << 16) +#define XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_GET(x) (((x) >> 16) & 0xFFFF) + volatile uint32_t dwEpCtx5; + volatile uint32_t dwEpCtx6; + volatile uint32_t dwEpCtx7; +} __aligned(XHCI_ENDP_CTX_ALIGN); + +struct xhci_input_ctx { + volatile uint32_t dwInCtx0; +#define XHCI_INCTX_0_DROP_MASK(n) (1U << (n)) + volatile uint32_t dwInCtx1; +#define XHCI_INCTX_1_ADD_MASK(n) (1U << (n)) + volatile uint32_t dwInCtx2; + volatile uint32_t dwInCtx3; + volatile uint32_t dwInCtx4; + volatile uint32_t dwInCtx5; + volatile uint32_t dwInCtx6; + volatile uint32_t dwInCtx7; +} __aligned(XHCI_INPUT_CTX_ALIGN); + +struct xhci_dev_ctx { + struct xhci_slot_ctx ctx_input; + struct xhci_slot_ctx ctx_slot; + struct xhci_endp_ctx ctx_ep0; + struct xhci_endp_ctx ctx_epN[XHCI_MAX_ENDPOINTS - 2]; +} __aligned(XHCI_DEV_CTX_ALIGN); + +struct xhci_stream_ctx { + volatile uint64_t qwSctx0; +#define XHCI_SCTX_0_DCS_GET(x) ((x) & 0x1) +#define XHCI_SCTX_0_DCS_SET(x) ((x) & 0x1) +#define XHCI_SCTX_0_SCT_SET(x) (((x) & 0x7) << 1) +#define XHCI_SCTX_0_SCT_GET(x) (((x) >> 1) & 0x7) +#define XHCI_SCTX_0_SCT_SEC_TR_RING 0x0 +#define XHCI_SCTX_0_SCT_PRIM_TR_RING 0x1 +#define XHCI_SCTX_0_SCT_PRIM_SSA_8 0x2 +#define XHCI_SCTX_0_SCT_PRIM_SSA_16 0x3 +#define XHCI_SCTX_0_SCT_PRIM_SSA_32 0x4 +#define XHCI_SCTX_0_SCT_PRIM_SSA_64 0x5 +#define XHCI_SCTX_0_SCT_PRIM_SSA_128 0x6 +#define XHCI_SCTX_0_SCT_PRIM_SSA_256 0x7 +#define XHCI_SCTX_0_TR_DQ_PTR_MASK 0xFFFFFFFFFFFFFFF0U + volatile uint32_t dwSctx2; + volatile uint32_t dwSctx3; +} __aligned(XHCI_STREAM_CTX_ALIGN); + +struct xhci_trb { + volatile uint64_t qwTrb0; + volatile uint32_t dwTrb2; + volatile uint32_t dwTrb3; +} __aligned(XHCI_TRB_ALIGN); + +#endif /* _XHCI_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDCB6106574D; Wed, 28 Jul 2010 08: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 EE29D106566C for ; Wed, 28 Jul 2010 08:21: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 DC30D8FC22 for ; Wed, 28 Jul 2010 08:21:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LQlk009079 for ; Wed, 28 Jul 2010 08:21:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LQnA009077 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:26 GMT Message-Id: <201007280821.o6S8LQnA009077@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 Precedence: bulk Cc: Subject: PERFORCE change 181454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:28 -0000 http://p4web.freebsd.org/@@181454?ac=10 Change 181454 by hselasky@hselasky_laptop001 on 2010/07/25 11:50:38 New USB device ID's PR: usb/143186 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#129 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#129 (text+ko) ==== @@ -634,6 +634,7 @@ vendor SWEEX2 0x177f Sweex vendor METAGEEK 0x1781 MetaGeek vendor AMIT 0x18c5 AMIT +vendor GOOGLE 0x18d1 Google vendor QCOM 0x18e8 Qcom vendor LINKSYS3 0x1915 Linksys vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated @@ -1586,6 +1587,9 @@ product GOODWAY GWUSB2E 0x6200 GWUSB2E product GOODWAY RT2573 0xc019 RT2573 +/* Google products */ +product GOOGLE NEXUSONE 0x4e11 Nexus One + /* Gravis products */ product GRAVIS GAMEPADPRO 0x4001 GamePad Pro @@ -2568,6 +2572,7 @@ /* ReakTek products */ /* Green House and CompUSA OEM this part */ +product REALTEK USB20CRW 0x0158 USB20CRW Card Reader product REALTEK USBKR100 0x8150 USBKR100 USB Ethernet product REALTEK RTL8187 0x8187 RTL8187 Wireless Adapter product REALTEK RTL8187B_0 0x8189 RTL8187B Wireless Adapter From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E177106577B; Wed, 28 Jul 2010 08: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 1B4D61065670 for ; Wed, 28 Jul 2010 08:21:27 +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 094268FC23 for ; Wed, 28 Jul 2010 08:21:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LQdN009084 for ; Wed, 28 Jul 2010 08:21:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LQ01009082 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:26 GMT Message-Id: <201007280821.o6S8LQ01009082@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 Precedence: bulk Cc: Subject: PERFORCE change 181455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:28 -0000 http://p4web.freebsd.org/@@181455?ac=10 Change 181455 by hselasky@hselasky_laptop001 on 2010/07/25 12:01:56 USB mass storage quirk PR: usb/143045 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#33 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#33 (text+ko) ==== @@ -188,7 +188,7 @@ USB_QUIRK(FREECOM, DVD, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(FREECOM, HDD, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(FUJIPHOTO, MASS0100, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_CBI_I, - UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA), + UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(GENESYS, GL641USB2IDE, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE), From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:30 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACCFD10658E4; Wed, 28 Jul 2010 08:21: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 D444B106573E for ; Wed, 28 Jul 2010 08:21:27 +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 2B2228FC0A for ; Wed, 28 Jul 2010 08:21:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LRDI009089 for ; Wed, 28 Jul 2010 08:21:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LRDx009087 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:27 GMT Message-Id: <201007280821.o6S8LRDx009087@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 Precedence: bulk Cc: Subject: PERFORCE change 181456 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:31 -0000 http://p4web.freebsd.org/@@181456?ac=10 Change 181456 by hselasky@hselasky_laptop001 on 2010/07/25 12:21:33 USB input: - silence error printout by default PR: usb/141212 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#50 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#50 (text+ko) ==== @@ -720,7 +720,7 @@ break; default: /* Error */ - DPRINTFN(0, "error=%s\n", usbd_errstr(error)); + DPRINTFN(1, "error=%s\n", usbd_errstr(error)); break; } } From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D901E10659DF; Wed, 28 Jul 2010 08:21: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 C95AB10657DE for ; Wed, 28 Jul 2010 08:21:28 +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 095658FC12 for ; Wed, 28 Jul 2010 08:21:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LRhp009094 for ; Wed, 28 Jul 2010 08:21:27 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LRED009092 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:27 GMT (envelope-from trasz@freebsd.org) Date: Wed, 28 Jul 2010 08:21:27 GMT Message-Id: <201007280821.o6S8LRED009092@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 Precedence: bulk Cc: Subject: PERFORCE change 181457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:34 -0000 http://p4web.freebsd.org/@@181457?ac=10 Change 181457 by trasz@trasz_victim on 2010/07/25 12:51:47 Disable newly added KASSERT for now. For some weird reason, sometimes CPU time drops by 1usec. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#20 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#20 (text+ko) ==== @@ -383,9 +383,11 @@ KASSERT(amount >= 0, ("rusage_set: invalid amount for resource %d: %ju", resource, amount)); diff = amount - p->p_container.c_resources[resource]; +#ifdef notyet KASSERT(diff >= 0 || container_resource_reclaimable(resource), ("rusage_set: usage of non-reclaimable resource %d dropping", resource)); +#endif #ifdef HRL if (diff > 0) { error = hrl_enforce_proc(p, resource, diff); From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:35 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 760D61065B23; Wed, 28 Jul 2010 08:21: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 371771065B1E for ; Wed, 28 Jul 2010 08:21:35 +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 228F48FC17 for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LZo7009127 for ; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LSwx009119 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:28 GMT (envelope-from trasz@freebsd.org) Date: Wed, 28 Jul 2010 08:21:28 GMT Message-Id: <201007280821.o6S8LSwx009119@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 Precedence: bulk Cc: Subject: PERFORCE change 181462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:35 -0000 http://p4web.freebsd.org/@@181462?ac=10 Change 181462 by trasz@trasz_victim on 2010/07/25 16:36:40 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#13 integrate .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#22 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#25 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/keyword.c#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/ps/ps.1#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#13 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/i386/regs.d.in#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/i386/regs.sed.in#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/sparc/dt_isadep.c#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/sparc/regs.d#1 branch .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#7 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/binutils/ld/emultempl/elf32.em#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.config.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/Makefile.rules#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/configure.ac#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/autoconf/m4/link_options.m4#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/bindings/ada/llvm/llvm.ads#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/configure#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Core.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/Target.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm-c/lto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APFloat.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/APInt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DAGDeltaAlgorithm.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/DenseMap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/FoldingSet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/PostOrderIterator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SetVector.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallPtrSet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/SmallVector.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Statistic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/Triple.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ValueMap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ADT/ilist.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/AbstractTypeUser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/CFGPrinter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/CaptureTracking.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/CodeMetrics.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DebugInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/DominatorInternals.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Dominators.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/InlineCost.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/IntervalIterator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/Loads.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/LoopInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Analysis/ValueTracking.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/FastISel.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/GCMetadata.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/GCMetadataPrinter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/Passes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/PostRAHazardRecognizer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Config/config.h.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/GlobalValue.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/InlineAsm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/InstrTypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Instructions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/IntrinsicInst.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Intrinsics.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/LinkAllPasses.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCAssembler.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCContext.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCDirectives.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCObjectStreamer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCObjectWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSection.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCSectionCOFF.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/MCStreamer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/MC/SectionKind.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Module.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Pass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassAnalysisSupport.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassManagers.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/PassSupport.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CFG.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/COFF.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/CallSite.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Dwarf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/ELF.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/IRBuilder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/IRReader.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/MemoryBuffer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Regex.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/StringPool.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/Timer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Support/raw_ostream.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/SymbolTableListTraits.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/DataTypes.h.cmake#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/System/Path.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/Target.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetAsmParser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetCallingConv.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOpcodes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetOptions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/IPO.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Transforms/Utils/Local.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Type.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Use.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/include/llvm/Value.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/AliasDebugger.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ConstantFolding.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DebugInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/DomPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InlineCost.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Lint.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/Loads.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/LoopInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/PostDominators.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ProfileInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Analysis/ValueTracking.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Archive/ArchiveWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLLexer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLParser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/AsmParser/LLToken.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/BranchFolding.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/BranchFolding.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CallingConvLower.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/GCStrategy.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IfConversion.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/InlineSpiller.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveInterval.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LiveVariables.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineCSE.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineDominators.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineFunction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineInstr.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineLICM.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineSink.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PHIElimination.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Passes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PostRAHazardRecognizer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocLocal.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/CallingConvLower.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleHazardRecognizer.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Spiller.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/Spiller.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StackProtector.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TailDuplication.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/CompilerDriver/Tool.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Linker/LinkItems.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAsmStreamer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCAssembler.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCContext.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCExpr.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCMachOStreamer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCObjectStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCParser/MCAsmParserExtension.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MCSectionCOFF.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/MachObjectWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/MC/WinCOFFStreamer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/APFloat.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/APInt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/DAGDeltaAlgorithm.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/DeltaAlgorithm.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Dwarf.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/FileUtilities.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/FoldingSet.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/MemoryBuffer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/PrettyStackTrace.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Regex.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SmallPtrSet.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/SmallVector.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/StringPool.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Timer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/Triple.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Support/raw_ostream.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Disassembler.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Path.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Path.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Program.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Unix/Signals.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Path.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/System/Win32/Signals.inc#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARM.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARM.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMJITInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMScheduleA8.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMScheduleV6.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMSubtarget.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMInstPrinter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/NEONMoveFix.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/NEONPreAllocPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/README.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaInstrFormats.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinISelDAGToDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CBackend/CBackend.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUCallingConv.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUFrameInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUISelDAGToDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPUNodes.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/AsmPrinter/MBlazeAsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSIL/MSILWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSIL/MSILWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430MCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mangler.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16DebugInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16ISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16ISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16MCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16MemSelOpt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16Passes/PIC16Cloner.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16Passes/PIC16Cloner.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16RegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PIC16/PIC16RegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/README.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZInstrFP.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/TargetInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/TargetMachine.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/TargetRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmParser/X86AsmLexer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/Disassembler/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/README-SSE.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/README-X86-64.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/README.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86AsmBackend.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86COFF.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86CallingConv.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86FastISel.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86FixupKinds.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86FloatingPointRegKill.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86ISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86Instr64bit.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrBuilder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrFPStack.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrFormats.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrMMX.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86InstrSSE.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86MCCodeEmitter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86RegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86RegisterInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86Subtarget.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86Subtarget.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreMCAsmInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Hello/Hello.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Hello/Hello.exports#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Hello/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/Inliner.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/LowerSetJmp.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/PartialInlining.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/PartialSpecialization.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/IPO/StructRetPromotion.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/ABCD.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/ADCE.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/GVN.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/LoopDeletion.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/LoopIndexSplit.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/TailDuplication.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/AddrModeMatcher.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/CloneLoop.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/DemoteRegToStack.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/LCSSA.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/Local.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/Transforms/Utils/ValueMapper.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/AsmWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/AutoUpgrade.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/ConstantFold.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Core.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Instruction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Instructions.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/IntrinsicInst.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Metadata.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Module.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Pass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/PassManager.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Value.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/lib/VMCore/Verifier.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/bugpoint/BugDriver.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/bugpoint/CrashDebugger.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/bugpoint/ExtractFunction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/bugpoint/ListReducer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/bugpoint/Miscompilation.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/bugpoint/ToolRunner.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/NOTES.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/README.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang-c/Index.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang-c/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/Attr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/Decl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/DeclVisitor.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/Expr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/Redeclarable.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/Stmt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/StmtIterator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/StmtNodes.td#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/TemplateName.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/Type.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/TypeLocBuilder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/AST/UsuallyTinyPtrVector.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/PrintfFormatString.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Analysis/Support/BumpVector.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/Attr.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/AttrKinds.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsPPC.def#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/PartialDiagnostic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/TargetOptions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/Version.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/Version.inc.in#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/AnalysisConsumer.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/BugReporter/BugReporter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/FrontendActions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathDiagnosticClients.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/Checker.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/CheckerVisitor.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/Environment.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/ExplodedGraph.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRCoreEngine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRExprEngine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRState.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRSubEngine.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRTransferFuncs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/MemRegion.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/SVals.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/SValuator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/Store.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/SymbolManager.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/CodeGen/BackendUtil.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenOptions.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/CodeGen/ModuleBuilder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Action.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Arg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Compilation.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Driver.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/HostInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/OptTable.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Option.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Options.td#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Types.def#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Driver/Types.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/ASTConsumers.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/AnalysisConsumer.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/AnalyzerOptions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenAction.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticOptions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/FixItRewriter.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/FrontendPluginRegistry.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/PCHBitCodes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/PCHDeserializationListener.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/PCHReader.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/PCHWriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/PathDiagnosticClients.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/TypeXML.def#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Index/CallGraph.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Index/Entity.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Index/Indexer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Index/TranslationUnit.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Lex/Pragma.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Lex/Token.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Parse/Action.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Parse/AttributeList.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Parse/DeclSpec.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Parse/Parser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Parse/Template.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Rewrite/ASTConsumers.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Rewrite/FixItRewriter.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Rewrite/FrontendActions.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Rewrite/RewriteRope.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriters.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/AttrImpl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/Decl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/DeclFriend.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/Expr.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/Stmt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/TemplateName.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/Type.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Analysis/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Analysis/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Basic/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Basic/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Basic/Targets.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/AnalysisConsumer.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/AttrNonNullChecker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/BasicConstraintManager.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/BasicObjCFoundationChecks.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/BasicObjCFoundationChecks.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/BasicStore.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/BugReporter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/BuiltinFunctionChecker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/CFRefCount.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/CStringChecker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/CallInliner.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/CastSizeChecker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/CheckSecuritySyntaxOnly.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/Environment.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/FlatStore.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/FrontendActions.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/GRCoreEngine.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/GRExprEngine.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/GRExprEngineExperimentalChecks.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/GRExprEngineExperimentalChecks.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/GRExprEngineInternalChecks.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/GRState.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/HTMLDiagnostics.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/IdempotentOperationChecker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/LLVMConventionsChecker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/MallocChecker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/MemRegion.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/OSAtomicChecker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/PathDiagnostic.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/PlistDiagnostics.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/RangeConstraintManager.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/RegionStore.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/ReturnStackAddressChecker.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/SVals.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/SValuator.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/SimpleConstraintManager.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/SimpleConstraintManager.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/SimpleSValuator.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/StackAddrLeakChecker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/Store.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/StreamChecker.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/SymbolManager.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Checker/VLASizeChecker.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/BackendUtil.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGBlocks.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGBuilder.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGBuiltin.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGCXX.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGCall.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGDecl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGDeclCXX.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGException.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGException.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGExpr.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGExprAgg.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGExprCXX.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGExprComplex.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGExprConstant.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGObjC.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGObjCMac.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGObjCRuntime.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGRTTI.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGStmt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGTemporaries.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CodeGenAction.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/GlobalDecl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/Mangle.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/Mangle.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/ModuleBuilder.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Action.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Arg.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/ArgList.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Compilation.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Driver.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/HostInfo.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/OptTable.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Option.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/ToolChains.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Tools.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Tools.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Driver/Types.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/ASTConsumers.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/ASTUnit.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/AnalysisConsumer.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/BoostConAction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/CodeGenAction.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/CompilerInstance.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/FixItRewriter.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/FrontendAction.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/FrontendActions.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/FrontendOptions.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/GeneratePCH.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/HTMLDiagnostics.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/HTMLPrint.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/InitPreprocessor.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PCHReader.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PCHReaderDecl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PCHReaderStmt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PCHWriter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PCHWriterDecl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PCHWriterStmt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PlistDiagnostics.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PrintParserCallbacks.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/PrintPreprocessedOutput.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/RewriteMacros.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/RewriteObjC.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/RewriteTest.cpp#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/TextDiagnosticPrinter.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Frontend/Warnings.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/altivec.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/arm_neon.td#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/emmintrin.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/smmintrin.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/stddef.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/stdint.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Headers/xmmintrin.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Index/CallGraph.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Index/Entity.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Index/EntityImpl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Index/Indexer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Index/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Lex/Lexer.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Lex/LiteralSupport.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Lex/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Lex/PPCaching.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Lex/PPMacroExpansion.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Lex/Pragma.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/AttributeList.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/CMakeLists.txt#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/DeclSpec.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseCXXInlineMethods.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseDecl.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseDeclCXX.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseExpr.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseInit.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseObjc.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParsePragma.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParsePragma.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/ParseTemplate.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/Parser.cpp#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/llvm/tools/clang/lib/Parse/RAIIObjectsForParser.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CAEA1065BF7; Wed, 28 Jul 2010 08:21: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 903D61065B45 for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B03B8FC18 for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LZZ8009132 for ; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LZWj009130 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from afiveg@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:35 GMT Message-Id: <201007280821.o6S8LZWj009130@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:36 -0000 http://p4web.freebsd.org/@@181463?ac=10 Change 181463 by afiveg@ringmap-2 on 2010/07/25 17:02:26 ringmap is ported to 10GbE (integrated with ixgbe driver). Restrictions: 1. only one predefined queue is used (DEFAULT_QUEUE ringmap.h) - all incoming traffic on the adapter is posted into this predefined queue. 2. Currently no packet filtering - whole traffic will be captured. I am not sure if it is good idea to filter the packets in the user-space. If we want later write the packets into the disk from kernel, then filtering should be done using kernel-BPF. Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#22 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#7 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#6 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#5 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#6 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#36 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#36 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#6 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#17 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#18 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#12 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#5 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#5 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#7 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#7 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#7 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#5 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#22 (text+ko) ==== @@ -60,7 +60,7 @@ } /* - * Open mem device for mmaping of kernel memory regions in space of our + * Open mem device for mmaping of kernel memory regions into space of our * process */ if ((devmem_fd = open("/dev/mem", O_RDWR)) == -1){ @@ -78,6 +78,7 @@ RINGMAP_ERROR(Can not read phys addr of ring from kernel); return (-1); } + #if (__RINGMAP_DEB) printf("[%s] Phys addr of ring 0x%X\n", __func__, ring); #endif @@ -116,10 +117,7 @@ #endif /* - * Mapping mbufs from kern to userspace. - * mbufs internal pointers contain kernel space addresses - - * it means, we schould notice kernel space addresses of mbufs - * to be able to get correct mbufs from mbufs chain + * Mapping mbufs and packet buffers from kern into userspace. */ for (i = 0; i < SLOTS_NUMBER; i++){ @@ -128,7 +126,7 @@ tmp_addr = mmap ( 0, /* System will choose the addrress */ - sizeof(struct mbuf), /* Size of mapped region = mbuf */ + sizeof(struct mbuf), /* Size of mapped region (mbuf) */ PROT_WRITE|PROT_READ, /* protection: write & read */ MAP_SHARED, /* shared maping */ devmem_fd, /* device is /dev/mem */ @@ -183,11 +181,17 @@ RINGMAP_FUNC_DEBUG(start); - if ( (p == NULL) || (p->ring == NULL) ){ - RINGMAP_FUNC_DEBUG(NULL pointer. Debugging is needed!); + if (p == NULL) { + RINGMAP_FUNC_DEBUG(NULL pointer to pcap structure); + goto out; + } + + if (p->ring == NULL) { + RINGMAP_FUNC_DEBUG(NULL pointer to ringstructure); goto out; } + /* Unmap slots */ for (i = 0; i < SLOTS_NUMBER; i++){ tmp_res = munmap((void *)p->ring->slot[i].mbuf.user, sizeof(struct mbuf)); @@ -202,6 +206,7 @@ __func__, i); } + /* Unmap ring */ tmp_res = munmap(p->ring, sizeof(struct ring)); if (tmp_res == -1) { RINGMAP_ERROR(Unmaping the ring pointer); @@ -245,8 +250,11 @@ again: if ( RING_IS_EMPTY(ring) ) { + +#if (__RINGMAP_DEB) RINGMAP_FUNC_DEBUG(Ring is empty. Sleep...); PRINT_RING_PTRS(ring); +#endif /* Sleep and wait for new incoming packets */ ioctl(ringmap_cdev_fd, IOCTL_SLEEP_WAIT); goto again; @@ -292,6 +300,7 @@ SW_INCR_TAIL(ring); ring->slot[curr_slot].filtered = 0; + ring->slot[curr_slot].is_ok = 0; } RINGMAP_FUNC_DEBUG(end); ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#7 (text+ko) ==== @@ -160,6 +160,8 @@ #ifndef RINGMAP static void ixgbe_refresh_mbufs(struct rx_ring *, int); +#else +void ixgbe_refresh_mbufs(struct rx_ring *, int); #endif static int ixgbe_xmit(struct tx_ring *, struct mbuf **); @@ -657,6 +659,9 @@ #ifdef RINGMAP +#if (__RINGMAP_DEB) + printf(RINGMAP_PREFIX" Descriptors Number: %d\n", adapter->num_rx_desc); +#endif ringmap_attach(dev, &ringmap_8259_f); #endif @@ -1319,6 +1324,8 @@ #ifdef RINGMAP struct capt_object *co = NULL; + + adapter->rm->funcs->delayed_isr(que); #endif if (ifp->if_drv_flags & IFF_DRV_RUNNING) { @@ -1336,14 +1343,14 @@ IXGBE_TX_UNLOCK(txr); #ifdef RINGMAP - adapter->rm->funcs->sync_head(que); + adapter->rm->funcs->sync_head(que); - /* Wakeup threads with not empty rings */ - SLIST_FOREACH(co, &adapter->rm->object_list, objects) { - if (RING_NOT_EMPTY(co->ring)){ - wakeup(co->ring); - } + /* TODO: don't wake up the all threads, only our thread! */ + SLIST_FOREACH(co, &adapter->rm->object_list, objects) { + if (RING_NOT_EMPTY(co->ring)){ + wakeup(co->ring); } + } #endif if (more) { @@ -1426,11 +1433,12 @@ bool more_tx, more_rx; u32 newitr = 0; + ++que->irqs; + #ifdef RINGMAP struct capt_object *co = NULL; adapter->rm->funcs->delayed_isr(que); #endif - ++que->irqs; more_rx = ixgbe_rxeof(que, adapter->rx_process_limit); @@ -1443,7 +1451,7 @@ #ifdef RINGMAP adapter->rm->funcs->sync_head(que); - /* Wakeup threads with not empty rings */ + /* TODO: Only our co not all */ SLIST_FOREACH(co, &adapter->rm->object_list, objects) { if (RING_NOT_EMPTY(co->ring)){ wakeup(co->ring); @@ -3432,20 +3440,31 @@ * **********************************************************************/ #ifndef RINGMAP -static void +static +#else +void +#endif ixgbe_refresh_mbufs(struct rx_ring *rxr, int limit) { struct adapter *adapter = rxr->adapter; +#ifndef RINGMAP bus_dma_segment_t hseg[1]; +#endif bus_dma_segment_t pseg[1]; struct ixgbe_rx_buf *rxbuf; +#ifndef RINGMAP struct mbuf *mh, *mp; +#else + struct mbuf *mp; +#endif + int i, nsegs, error, cleaned; i = rxr->next_to_refresh; cleaned = -1; /* Signify no completions */ while (i != limit) { rxbuf = &rxr->rx_buffers[i]; +#ifndef RINGMAP if ((rxbuf->m_head == NULL) && (rxr->hdr_split)) { mh = m_gethdr(M_DONTWAIT, MT_DATA); if (mh == NULL) @@ -3470,9 +3489,13 @@ htole64(hseg[0].ds_addr); } + /* RINGMAP: Don't allocate new buffers! */ if (rxbuf->m_pack == NULL) { mp = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, adapter->rx_mbuf_sz); +#else + mp = rxbuf->m_pack; +#endif if (mp == NULL) goto update; mp->m_pkthdr.len = mp->m_len = adapter->rx_mbuf_sz; @@ -3490,7 +3513,9 @@ BUS_DMASYNC_PREREAD); rxr->rx_base[i].read.pkt_addr = htole64(pseg[0].ds_addr); +#ifndef RINGMAP } +#endif cleaned = i; /* Calculate next index */ @@ -3500,12 +3525,14 @@ rxr->next_to_refresh = i; } update: + +#ifndef RINGMAP if (cleaned != -1) /* If we refreshed some, bump tail */ IXGBE_WRITE_REG(&adapter->hw, IXGBE_RDT(rxr->me), cleaned); +#endif return; } -#endif /* !RINGMAP */ /********************************************************************* * @@ -3927,6 +3954,7 @@ /* Set up the redirection table */ for (i = 0, j = 0; i < 128; i++, j++) { if (j == adapter->num_queues) j = 0; + /* TODO: do it more beautiful */ #ifndef RINGMAP reta = (reta << 8) | (j * 0x11); #else @@ -4288,8 +4316,9 @@ ** that determines what we are */ sendmp = rbuf->fmp; +#ifndef RINGMAP rbuf->m_pack = rbuf->fmp = NULL; - +#endif if (sendmp != NULL) /* secondary frag */ sendmp->m_pkthdr.len += mp->m_len; else { @@ -4335,7 +4364,7 @@ #ifndef RINGMAP -/* RINGMAP: Do not send packet to the IP-stack. Andd do not refresh */ +/* RINGMAP: Do not send packet to the IP-stack. And do not refresh */ /* Now send to the stack or do LRO */ if (sendmp != NULL) ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#6 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#5 (text+ko) ==== @@ -27,17 +27,20 @@ #define HW_WRITE_REG(que, reg, val) \ RINGMAP_HW_WRITE_REG(HW_STRUCT(que), (reg), (val)) -#define RINGMAP_HW_READ_HEAD(que) \ + +#define HW_READ_HEAD(que) \ HW_READ_REG((que), HW_RDH(que)) -#define RINGMAP_HW_SYNC_HEAD(que, ring) \ - SW_HEAD(ring) = RINGMAP_HW_READ_HEAD(que); +#define HW_READ_TAIL(que) \ + HW_READ_REG((que), HW_RDT(que)) -#define RINGMAP_HW_WRITE_TAIL(que, val) \ +#define HW_WRITE_TAIL(que, val) \ HW_WRITE_REG((que), HW_RDT(que), (val)) + +#define RINGMAP_HW_SYNC_HEAD(que, ring) \ + SW_HEAD(ring) = HW_READ_HEAD(que); + #define RINGMAP_HW_SYNC_TAIL(que, ring) \ - RINGMAP_HW_WRITE_TAIL((que), SW_TAIL(ring)) + HW_WRITE_TAIL((que), SW_TAIL(ring)) -#define RINGMAP_HW_READ_TAIL(que) \ - HW_READ_REG((que), HW_RDT(que)) ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#6 (text+ko) ==== @@ -18,6 +18,19 @@ #include "ixgbe.h" #include "ringmap_8259.h" + +/* External things */ +extern devclass_t ixgbe_devclass; + +extern void ixgbe_enable_intr(struct adapter *); +extern void ixgbe_disable_intr(struct adapter *); +extern void ixgbe_refresh_mbufs(struct rx_ring *, int); + +extern void ringmap_print_slot(struct ring *, unsigned int); +extern void print_capt_obj(struct capt_object *); +/*******************/ + + int rm_8259_set_ringmap_to_adapter(device_t, struct ringmap *); struct ringmap * rm_8259_get_ringmap_p(device_t); device_t rm_8259_get_device_p(struct cdev *); @@ -28,7 +41,6 @@ void rm_8259_interrupt(void *); void rm_8259_delayed_interrupt(void *); int rm_8259_print_ring_pointers(void *); -void rm_8259_sync_head_tail(void *); void rm_8259_sync_tail(void *); void rm_8259_sync_head(void *); void rm_8259_delayed_interrupt_per_packet(void *, int); @@ -37,12 +49,6 @@ struct ix_queue * rm_8259_get_free_queue(device_t); struct capt_object * get_capt_obj(void *context); -extern devclass_t ixgbe_devclass; -extern void ixgbe_enable_intr(struct adapter *); -extern void ixgbe_disable_intr(struct adapter *); -extern void ringmap_print_slot(struct ring *, unsigned int); -extern void print_capt_obj(struct capt_object *); - struct ringmap_functions ringmap_8259_f = { rm_8259_set_ringmap_to_adapter, @@ -51,7 +57,6 @@ rm_8259_interrupt, rm_8259_delayed_interrupt, rm_8259_delayed_interrupt_per_packet, - rm_8259_sync_head_tail, rm_8259_sync_tail, rm_8259_sync_head, rm_8259_set_slot, @@ -61,6 +66,7 @@ }; + /* * Set pointer to ringmap in the adapter structure. */ @@ -80,36 +86,18 @@ } -/* - * This function synchronize the tail and head hardware registers - * with head and tail software varibles, that are visible from - * software process. - * - * Synchronisation rules: - * 1. SYNC_HEAD: ring->kernrp = RDH - * 2. SYNC_TAIL: RDT = ring->userrp - */ void -rm_8259_sync_head_tail(void *context) -{ - rm_8259_sync_tail(context); - rm_8259_sync_head(context); -} - - -void rm_8259_sync_tail(void *context) { struct ix_queue *que = (struct ix_queue *)context; struct adapter *adapter = que->adapter; struct capt_object *co = NULL; - + RINGMAP_LOCK(adapter->rm); - if (adapter->rm->open_cnt) { - co = get_capt_obj(que); - if (co != NULL) { - RINGMAP_HW_SYNC_TAIL(que, co->ring); - } + co = get_capt_obj(que); + if (co != NULL) { + ixgbe_refresh_mbufs(que->rxr, SW_TAIL(co->ring)); + RINGMAP_HW_SYNC_TAIL(que, co->ring); } RINGMAP_UNLOCK(adapter->rm); } @@ -123,35 +111,14 @@ struct capt_object *co = NULL; RINGMAP_LOCK(adapter->rm); - if (adapter->rm->open_cnt) { - co = get_capt_obj(que); - if (co != NULL) { - RINGMAP_HW_SYNC_HEAD(que, co->ring); - } else { - RINGMAP_ERROR(There is no capturing object associated with queue); - } - } + co = get_capt_obj(que); + if (co != NULL) { + RINGMAP_HW_SYNC_HEAD(que, co->ring); + } RINGMAP_UNLOCK(adapter->rm); } -struct capt_object * -get_capt_obj(void *queue) -{ - struct ix_queue *que = (struct ix_queue *)queue; - struct adapter *adapter = que->adapter; - struct ringmap *rm = adapter->rm; - struct capt_object *co = NULL; - - SLIST_FOREACH(co, &rm->object_list, objects) { - if (co->que == que) - return (co); - } - - return (co); -} - - /* * This should be called from ISR. Other interrupts are disallowed! * It means the functions must be as small as possible @@ -172,19 +139,18 @@ { struct ix_queue *que = (struct ix_queue *)context; struct adapter *adapter = (struct adapter *)que->adapter; - struct timeval last_ts; struct capt_object *co = NULL; RINGMAP_LOCK(adapter->rm); + + adapter->rm->interrupts_counter++; + if ( adapter->rm->open_cnt > 0 ) { co = get_capt_obj(que); if (co != NULL) { - adapter->rm->interrupts_counter++; - getmicrotime(&last_ts); - co->ring->last_ts = last_ts; + co->ring->intr_num = que->irqs; + getmicrotime(&co->ring->last_ts); rm_8259_sync_tail(context); - } else { - RINGMAP_ERROR(There is no capturing object associated with queue); } } RINGMAP_UNLOCK(adapter->rm); @@ -203,19 +169,28 @@ RINGMAP_LOCK(rm); -#if (RINGMAP_INTR_DEB) - rm_8259_print_ring_pointers(que); -#endif + if (slot_num >= SLOTS_NUMBER){ + RINGMAP_ERROR(STOP! ERROR! Unallowed slot Number!); + goto out; + } + if (adapter->rm->open_cnt) { co = get_capt_obj(que); if (co != NULL) { - co->ring->slot[slot_num].intr_num = que->irqs; + +#if (RINGMAP_INTR_DEB) + printf(RINGMAP_PREFIX"[%s] Slot = %d\n", __func__, slot_num); + rm_8259_print_ring_pointers(que); + PRINT_RING_PTRS(co->ring); +#endif + co->ring->slot[slot_num].intr_num = co->ring->intr_num; co->ring->slot[slot_num].ts = co->ring->last_ts; - } else { - RINGMAP_ERROR(There is no capturing object associated with queue); + co->ring->slot[slot_num].is_ok = 1; } } +out: + RINGMAP_UNLOCK(rm); RINGMAP_INTR(end); @@ -231,12 +206,11 @@ printf("[%s] Set slot: %d\n", __func__, slot_num); #endif + /* First check the pointers */ if (que == NULL) { RINGMAP_ERROR(Null pointer to the queue); goto fail; } - /* First check pointers */ -//TODO; if (GET_MBUF_P(que, slot_num) == NULL){ RINGMAP_ERROR(Pointer to mbuf is NULL); goto fail; @@ -246,7 +220,7 @@ goto fail; } - /* Now if everything is Ok, we can initialize ring pointers */ + /* Now if everything is Ok, we can initialize slots variables */ ring->slot[slot_num].mbuf.kern = (vm_offset_t)GET_MBUF_P(que, slot_num); ring->slot[slot_num].mbuf.phys = @@ -316,8 +290,6 @@ } - - /* * Returns pointer to ringmap structure */ @@ -361,6 +333,7 @@ } +/* Return a queue that is not associate with any capturing objects */ struct ix_queue * rm_8259_get_free_queue(device_t dev) { @@ -374,9 +347,6 @@ que = adapter->queues; rm = adapter->rm; - /* - * Look for the queue that is not used by any capturing object (co) - */ for (i = 0; (i < adapter->num_queues); i++, que++) { j = 0; SLIST_FOREACH(co, &rm->object_list, objects) { @@ -390,6 +360,7 @@ } +/* Associate the capturing object with the queue */ int rm_8259_set_queue(struct capt_object *co, unsigned int queue_num) { @@ -397,12 +368,18 @@ struct adapter *adapter; int err = -1; + RINGMAP_FUNC_DEBUG(start); + if (co->rm != NULL) { dev = co->rm->dev; adapter = (struct adapter *)device_get_softc(dev); +#if (__RINGMAP_DEB) + printf("[%s] Before initialization\n", __func__); + print_capt_obj(co); +#endif if (queue_num < adapter->num_queues) { - co->que = &adapter->queues[queue_num]; + co->que = &(adapter->queues[queue_num]); err = 0; } else { RINGMAP_ERROR(Wrong queue number); @@ -411,24 +388,48 @@ RINGMAP_ERROR(Capturing object is not associated with ringmap); } +#if (__RINGMAP_DEB) + printf("[%s] After initialization\n", __func__); + print_capt_obj(co); +#endif + + RINGMAP_FUNC_DEBUG(end); + return (err); } - + +struct capt_object * +get_capt_obj(void *queue) +{ + struct ix_queue *que = (struct ix_queue *)queue; + struct adapter *adapter = que->adapter; + struct ringmap *rm = adapter->rm; + struct capt_object *co = NULL; + + SLIST_FOREACH(co, &rm->object_list, objects) { + if (co->que == queue) + return (co); + } + + return (co); +} + + int rm_8259_print_ring_pointers(void *context) { struct ix_queue *que = (struct ix_queue *)context; unsigned int rdt, rdh; - rdh = RINGMAP_HW_READ_HEAD(que); - rdt = RINGMAP_HW_READ_TAIL(que); + rdt = HW_READ_TAIL(que); + rdh = HW_READ_HEAD(que); printf("\n== +++++++++ RING POINTERS ++++++++++++ \n"); - printf("== + Queue Number: %d\n", que->rxr->me); + printf("== + Queue Number: %d\n", que->rxr->me); printf("== + \n"); + printf("== + HW TAIL = %d (USER POINTER)\n", rdt); printf("== + HW HEAD = %d (KERN POINTER)\n", rdh); - printf("== + HW TAIL = %d (USER POINTER)\n", rdt); printf("== ++++++++++++++++++++++++++++++++++++++ \n\n"); return (0); ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#36 (text+ko) ==== @@ -177,7 +177,7 @@ RINGMAP_LOCK(rm); /* TODO: set max number of threads in the ringmap struct as a variable */ - if (rm->open_cnt == RINGMAP_MAX_THREADS){ + if (rm->open_cnt == RINGMAP_MAX_THREADS) { RINGMAP_ERROR(Can not open device!); err = EIO; goto out; @@ -227,7 +227,15 @@ /* The next should be probably done in the ioctl() */ #ifdef DEFAULT_QUEUE - rm->funcs->set_queue(co, DEFAULT_QUEUE); + /* Associate the capturing object with a queue */ + if (rm->funcs->set_queue(co, DEFAULT_QUEUE) == -1) { + RINGMAP_ERROR(Can not associate que with the capturing object!); + contigfree(ring, sizeof(struct ring), M_DEVBUF); + + err = EIO; goto out; + } + + /* Init ring-slots with mbufs and packets adrresses */ for (i = 0 ; i < SLOTS_NUMBER ; i++){ if (rm->funcs->set_slot(ring, co->que, i) == -1){ RINGMAP_ERROR(Ring initialization failed!); @@ -241,6 +249,10 @@ } #endif + /* + * Insert the capturing object in the single linked list + * the head of the list is in the ringmap structure + */ SLIST_INSERT_HEAD(&rm->object_list, co, objects); /* @@ -255,7 +267,7 @@ err = EIO; goto out; } - rm->funcs->sync_head_tail(co->que); + rm->funcs->sync_tail(co->que); rm->open_cnt++; #if (__RINGMAP_DEB) @@ -272,7 +284,6 @@ } - int ringmap_close(struct cdev *cdev, int flag, int otyp, struct thread *td) { @@ -289,6 +300,42 @@ } +void +clear_capt_object(void * data) +{ + struct capt_object *co = NULL; + struct ringmap *rm = NULL; + + RINGMAP_FUNC_DEBUG(start); + + if (data != NULL) { + co = (struct capt_object *)data; + rm = co->rm; + + RINGMAP_LOCK(rm); +#if (__RINGMAP_DEB) + printf("[%s] Object to delete:\n", __func__); + print_capt_obj(co); +#endif + if (co->ring != NULL) + contigfree(co->ring, sizeof(struct ring), M_DEVBUF); + + SLIST_REMOVE(&rm->object_list, co, capt_object, objects); + FREE(co, M_DEVBUF); + data = NULL; + } else { + RINGMAP_FUNC_DEBUG(NULL pointer to the capturing object!); + } + + if (rm->open_cnt) + rm->open_cnt--; + + RINGMAP_UNLOCK(rm); + + RINGMAP_FUNC_DEBUG(end); +} + + int ringmap_mmap_single(struct cdev *cdev, vm_ooffset_t *offset, vm_size_t size, struct vm_object **object, int nprot) @@ -349,29 +396,31 @@ { struct ringmap *rm = NULL; struct capt_object *co = NULL; - vm_paddr_t phys_ring; + vm_paddr_t phys_ring_addr; - RINGMAP_FUNC_DEBUG(end); + RINGMAP_FUNC_DEBUG(start); /* Get pointer to the ringmap structure */ rm = get_ringmap_p(get_device_p(cdev)); if (devfs_get_cdevpriv((void **)&co)) { - RINGMAP_ERROR(Wrong capturing object!); + RINGMAP_ERROR(Can not get capturing object); return(EIO); } + if (co->td != curthread ){ RINGMAP_ERROR(Wrong capturing object!); return(EIO); } - phys_ring = vtophys(co->ring); + phys_ring_addr = vtophys(co->ring); + #if (__RINGMAP_DEB) print_capt_obj(co); PRINT_RING_PTRS(co->ring); #endif - uiomove(&phys_ring, sizeof(phys_ring), uio); + uiomove(&phys_ring_addr, sizeof(phys_ring_addr), uio); RINGMAP_FUNC_DEBUG(end); @@ -393,9 +442,9 @@ printf("[%s] pid = %d\n", __func__, td->td_proc->p_pid); #endif - /* Eliminate it */ + /* Eliminate it. Use devfs_* funcs */ rm = get_ringmap_p(get_device_p(cdev)); - if ( rm == NULL ){ + if (rm == NULL) { RINGMAP_ERROR(NULL pointer. ioctl can not be accomplished); /* TODO: look whether ENODEV is a correctly for this case */ @@ -431,12 +480,15 @@ rm->funcs->disable_intr(rm->dev); RINGMAP_IOCTL(interrupts schould be disabled); break; - + /* Sleep and wait for new packets */ case IOCTL_SLEEP_WAIT: + /* Count how many times we should wait for new packets */ co->ring->user_wait_kern++; - rm->funcs->sync_head_tail(co->que); + + /* Set adapter TAIL register */ + rm->funcs->sync_tail(co->que); #if (__RINGMAP_DEB) print_capt_obj(co); @@ -450,14 +502,10 @@ if (RING_IS_EMPTY(co->ring)) { RINGMAP_IOCTL(Sleep and wait for new packets); - err_sleep = tsleep(co->ring, (PRI_MIN) | PCATCH, "ioctl", 0); + err_sleep = tsleep(co->ring, (PRI_MAX_ITHD) | PCATCH, "ioctl", 0); } break; - case IOCTL_SYNC_HEAD_TAIL: - rm->funcs->sync_head_tail(co->que); - break; - /* Synchronize sowftware ring-tail with hardware-ring-tail (RDT) */ case IOCTL_SYNC_TAIL: rm->funcs->sync_tail(co->que); @@ -467,59 +515,24 @@ RINGMAP_ERROR("Undefined command!"); return (ENODEV); } - + RINGMAP_IOCTL(end); - + return (err); } void -clear_capt_object(void * data) -{ - struct capt_object *co = NULL; - struct ringmap *rm = NULL; - - RINGMAP_FUNC_DEBUG(start); - - if (data != NULL) { - co = (struct capt_object *)data; - rm = co->rm; - - RINGMAP_LOCK(rm); -#if (__RINGMAP_DEB) - print_capt_obj(co); -#endif - if (co->ring != NULL) - contigfree(co->ring, sizeof(struct ring), M_DEVBUF); - - SLIST_REMOVE(&rm->object_list, co, capt_object, objects); - FREE(co, M_DEVBUF); - data = NULL; - } else { - RINGMAP_FUNC_DEBUG(NULL pointer to the capturing instance!); - } - - if (rm->open_cnt) - rm->open_cnt--; - - RINGMAP_UNLOCK(rm); - - RINGMAP_FUNC_DEBUG(end); -} - - -void print_capt_obj(struct capt_object *co) { if (co != NULL) { - printf("=== co->td->proc->pid: %d\n", + printf("\n=== co->td->proc->pid: %d\n", co->td->td_proc->p_pid); printf("=== Ring Kernel Addr:0x%X\n", (unsigned int)co->ring); - printf("=== Queue Kernel Addr:0x%X\n", + printf("=== Queue Kernel Addr:0x%X\n\n", (unsigned int)co->que); } } ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#36 (text+ko) ==== @@ -1,7 +1,7 @@ /* * value for number of descriptors (a.k.a. slots in the ringbuffer) */ -#define SLOTS_NUMBER 16 +#define SLOTS_NUMBER 64 /* * Prefix for name of device (for example /dev/ringmap0 will full name) @@ -246,19 +246,19 @@ * DEBUG OUTPUT */ #ifndef RINGMAP_IOCTL_DEB -#define RINGMAP_IOCTL_DEB 1 +#define RINGMAP_IOCTL_DEB 0 #else #define RINGMAP_IOCTL_DEB 1 #endif #ifndef RINGMAP_INTR_DEB -#define RINGMAP_INTR_DEB 1 +#define RINGMAP_INTR_DEB 0 #else #define RINGMAP_INTR_DEB 1 #endif #ifndef __RINGMAP_DEB -#define __RINGMAP_DEB 1 +#define __RINGMAP_DEB 0 #endif #define RINGMAP_PREFIX "--> RINGMAP: " @@ -304,14 +304,6 @@ (unsigned int)ring->slot[i].mbuf.kern); \ } while (0); -#define PRINT_DECRIPTOR_ADDR(ring, i) \ - do { \ - printf("=+= descr.user=0x%X, descr.phys=0x%X, descr.kern=0x%X\n", \ - (unsigned int)ring->slot[i].descriptor.user, \ - (unsigned int)ring->slot[i].descriptor.phys, \ - (unsigned int)ring->slot[i].descriptor.kern); \ - } while (0); - #define PRINT_SLOT(ring, i) \ if (((ring) != NULL) && ((i) < SLOTS_NUMBER)){ \ printf("\n=+= ==================================\n"); \ @@ -322,7 +314,6 @@ (ring)->slot[(i)].ts.tv_usec))); \ printf("=+= Accepted: %d\n", (ring)->slot[(i)].is_ok); \ printf("=+= -------------------------\n"); \ - PRINT_DECRIPTOR_ADDR(ring, i); \ PRINT_MBUF_ADDR(ring, i); \ PRINT_PACKET_ADDR(ring, i); \ printf("=+= -------------------------\n"); \ @@ -339,13 +330,13 @@ #define PRINT_RING_PTRS(ring) \ do { \ - printf("=+= [%s] pid = %d\n", __func__, ring->pid); \ + printf("\n=+= [%s] pid = %d\n", __func__, ring->pid); \ PRINT_TAIL(ring) \ PRINT_HEAD(ring) \ + printf("\n"); \ } while (0); - #ifdef _KERNEL #include #endif ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#6 (text+ko) ==== @@ -100,7 +100,6 @@ * the value of ring->userrp. Kernel will check this value and set it * into the hardware TAIL-register. */ - void (*sync_head_tail)(void *); void (*sync_tail)(void *); void (*sync_head)(void *); ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#17 (text+ko) ==== @@ -3,18 +3,6 @@ RINGMAP_BUILD_DIR=../current/sys/modules/ringmap/ LIBPCAP_BUILD_DIR=../current/lib/libpcap/ -check_make_vars() { - cat /etc/make.conf | grep "RINGMAP" >/dev/null - if [ $? -eq 1 ] >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:36 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7880A1065C66; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BAA41065BF5 for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A463A8FC19 for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LZmj009137 for ; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LZSI009135 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:35 GMT Message-Id: <201007280821.o6S8LZSI009135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:36 -0000 http://p4web.freebsd.org/@@181464?ac=10 Change 181464 by jlaffaye@jlaffaye-chulak on 2010/07/25 20:32:27 Cleanup the directory in LOG_DIR when a signal is received. Remove the temporary directory when it is a fake install or if the user doesn't want to register the package. Affected files ... .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#7 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#7 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#7 (text+ko) ==== @@ -31,6 +31,11 @@ #include "add.h" +/* Globals used by cleanup() */ +int extract_state; +char db_dir_tmp[FILENAME_MAX]; +char db_dir[FILENAME_MAX]; + int extract_plist(struct archive *a, struct archive_entry *entry, Package *pkg) { char *plist_buf; @@ -71,8 +76,6 @@ int code = 0; int errcode = 0; char cmd[FILENAME_MAX]; - char db_dir_tmp[FILENAME_MAX]; - char db_dir[FILENAME_MAX]; char pre_script[FILENAME_MAX] = INSTALL_FNAME; char post_script[FILENAME_MAX]; char pre_arg[FILENAME_MAX]; @@ -83,6 +86,9 @@ int fd; struct stat sb; + /* Nothing to cleanup yet */ + extract_state = 0; + /* * If we have a prefix, delete the first one we see and add this * one in place of it. @@ -304,6 +310,8 @@ warnx("Can not create '%s' directory - aborting", db_dir_tmp); return (1); } + /* Tell cleanup that we have a temporary dir in LOG_DIR */ + extract_state = 1; if (chdir(db_dir_tmp) == -1) { warn("chdir(%s) - aborting", db_dir_tmp); vsystem("%s -rf %s", REMOVE_CMD, db_dir_tmp); @@ -601,9 +609,17 @@ /* Atomically register the package */ if (rename(db_dir_tmp, db_dir) == -1) warn("Can not rename '%s' to '%s'", db_dir_tmp, db_dir); - else if (Verbose) - printf("Package %s registered in %s\n", pkg->name, db_dir); - } + else { + extract_state = 2; + if (Verbose) + printf("Package %s registered in %s\n", pkg->name, db_dir); + } + } else /* !NoRecord && !Fake */ + /* + * It was a fake or the user doesn't want to register the package, + * so we remove our temporary directory + */ + vsystem("%s -rf %s", REMOVE_CMD, db_dir_tmp); if ((p = find_plist(pkg, PLIST_DISPLAY)) != NULL) { FILE *fp; ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#7 (text+ko) ==== @@ -35,6 +35,10 @@ void cleanup(void); static int pkg_do(char *); +extern int extract_state; +extern char db_dir_tmp[FILENAME_MAX]; +extern char db_dir[FILENAME_MAX]; + int pkg_perform(char **pkgs) { @@ -216,5 +220,8 @@ void cleanup(void) { - /* TODO */ + if (extract_state == 1) + vsystem("%s -rf %s", REMOVE_CMD, db_dir_tmp); + else if (extract_state == 2) + vsystem("%s -rf %s", REMOVE_CMD, db_dir); } From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFF891065740; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C4711065BF6 for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C57988FC1A for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LZlq009142 for ; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LZPZ009140 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:35 GMT Message-Id: <201007280821.o6S8LZPZ009140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:38 -0000 http://p4web.freebsd.org/@@181466?ac=10 Change 181466 by ligregni@ligPhenom on 2010/07/26 04:22:40 Modifications made because of MidTerm Eval Affected files ... .. //depot/projects/soc2010/disaudit/Makefile#3 edit .. //depot/projects/soc2010/disaudit/msocket_work.h#5 edit .. //depot/projects/soc2010/disaudit/utils.c#1 add .. //depot/projects/soc2010/disaudit/utils.h#1 add Differences ... ==== //depot/projects/soc2010/disaudit/Makefile#3 (text+ko) ==== @@ -1,13 +1,22 @@ -all: shipd.c ssocket_work.c damasterd.c msocket_work.c - make shipd - make damasterd +# + +CC = cc +CFLAGS = -Wall -O2 -g +TARGETS = shipd damasterd +DOBJ = damasterd.o msocket_work.o utils.o +SOBJ = shipd.o ssocket_work.o utils.o +LIBS = -lmd + +all: $(TARGETS) + +.c.o: + $(CC) $(CFLAGS) -c $< + +damasterd: $(DOBJ) + $(CC) $(CFLAGS) -o $@ $(DOBJ) $(LIBS) -damasterd: damasterd.c msocket_work.c - cc -lmd -o damasterd damasterd.c msocket_work.c +shipd: $(SOBJ) + $(CC) $(CFLAGS) -o $@ $(SOBJ) $(LIBS) -shipd: shipd.c ssocket_work.c - cc -lmd -o shipd shipd.c ssocket_work.c - -debug: shipd.c ssocket_work.c - cc -g -lmd -o shipd shipd.c ssocket_work.c - cc -g -lmd -o damasterd damasterd.c msocket_work.c +clean: + rm -f $(TARGETS) *.o *.core ==== //depot/projects/soc2010/disaudit/msocket_work.h#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:38 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFE9C106574A; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 357391065B10 for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F24518FC1E for ; Wed, 28 Jul 2010 08:21:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LZke009147 for ; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LZaf009145 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:35 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:35 GMT Message-Id: <201007280821.o6S8LZaf009145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:38 -0000 http://p4web.freebsd.org/@@181467?ac=10 Change 181467 by ligregni@ligPhenom on 2010/07/26 04:37:28 Modifications made because of MidTerm Affected files ... .. //depot/projects/soc2010/disaudit/damasterd.c#5 edit .. //depot/projects/soc2010/disaudit/damasterd.h#5 delete .. //depot/projects/soc2010/disaudit/msocket_work.c#5 edit .. //depot/projects/soc2010/disaudit/shipd.c#8 edit .. //depot/projects/soc2010/disaudit/shipd.h#8 delete .. //depot/projects/soc2010/disaudit/ssocket_work.c#6 edit .. //depot/projects/soc2010/disaudit/ssocket_work.h#6 edit Differences ... ==== //depot/projects/soc2010/disaudit/damasterd.c#5 (text+ko) ==== @@ -27,22 +27,43 @@ /*** INCLUDES ***/ -#include "damasterd.h" +#include "msocket_work.h" +#include "utils.h" + +#include +#include #include -#include "msocket_work.h" +#include #include #include #include -#include #include -#include +#include +#include + #include -#include +#include +#include #include -#include + +#include +#include + +#include + +#define AUDIT_DAMASTERD_FILE "/etc/security/damasterd_control" /*** DECLARATIONS ***/ +/* local prototypes */ +static int check_files_equal(char *pathslave, char *md5slave, char *hostname, + char *path, char *fullpath); +static int do_master_daemon(); +static int get_parameters(); +static int process_request(int sfd, struct sockaddr *clientinfo); +static int receive_trail(int sfd, struct sockaddr *clientinfo); +static int search_trail(int sfd, struct sockaddr *clientinfo); + /* Directory settings took from audit_control */ char slave_trails_dir[MAX_DIR_SIZE + 1]; char *ptr_std; @@ -54,9 +75,6 @@ /* Port number */ int port_number; -/* The destination of the messages are controlled by this variable */ -int debug; - /* * The searching for a trail by it's name, * or by it's name & origin host, this is for example, @@ -71,20 +89,24 @@ */ int lookup_host; -/* Socket buffer management */ -char buffer[MAX_BUF_SIZE + 1]; -int brecv; - +/* + * DAMasterD + * Distributed Audit Master Daemon + * + * This program runs on a master system, in order + * to receive the trails (and perform the appropiate naming + * and pathing) from the slave systems, when not runs with + * debug option, it daemonize itself + */ +int main(int argc, char *argv[]) { char cl_opt; - int last = 0; debug = 0; while ((cl_opt = getopt(argc, argv, "dl")) != -1) - switch (cl_opt) - { + switch (cl_opt) { case 'd': /* Debug option */ debug = 1; @@ -92,24 +114,24 @@ } /* If not debugging, daemonize the program */ - if (debug == 0 && daemon(0,0) != 0) - { + if (debug == 0 && daemon(0,0) != 0) { perror("Can't daemonize, exiting!"); exit(1); } /* Set the directory path, the host address, the panic level */ - if (get_parameters() == -1) - { + if (get_parameters() == -1) { to_log("Can't get the parameters to work!"); exit(1); } ptr_std = slave_trails_dir + strlen(slave_trails_dir); - /* There is no shipd enabled and it wasn't called by AUDIT (normally the unique way to get 'last' on) */ - if (panic_level == 0) - { + /* + * There is no shipd enabled and it wasn't called by AUDIT (normally + * the unique way to get 'last' on). + */ + if (panic_level == 0) { to_log("DAMasterd disabled"); exit(0); } @@ -117,57 +139,40 @@ if (do_master_daemon() == -1) exit(1); - return 0; + return (0); } -void -to_log(char *message) -{ -return; - if (debug) - perror(message); - else - syslog(LOG_ERR, "%s", message); -} - - +static int do_master_daemon() { int socketfd, newsockfd, childpid; char message[256]; - char client_host[256]; struct sockaddr clientinfo; - if ((socketfd = init_socket(port_number)) < 0) - { - sprintf(message, "Error initializing socket on port %d", port_number); + if ((socketfd = init_socket(port_number)) < 0) { + sprintf(message, "Error initializing socket on port %d", + port_number); to_log(message); - return -1; + return (-1); } - while (1) - { + while (1) { newsockfd = accept_connection(socketfd, &clientinfo); - if (newsockfd < 0) - { + if (newsockfd < 0) { sprintf(message, "Error accepting client connections"); to_log(message); - return -1; + return (-1); } - if (!debug && (childpid = fork()) < 0) - { + if (!debug && (childpid = fork()) < 0) { to_log("Error forking the process"); - return -1; - } - else if (debug || childpid == 0) - { - if (process_request(newsockfd, &clientinfo) == -1) - { + return (-1); + } else if (debug || childpid == 0) { + if (process_request(newsockfd, &clientinfo) == -1) { to_log("Error processing client's request"); - return -1; + return (-1); } if (!debug) close(socketfd); @@ -178,22 +183,26 @@ usleep(1000); } - return 0; + return (0); } +static int get_parameters() { - /* GSoC: using an special file, intended to include this values at audit_control */ - FILE *fpars = fopen("/etc/security/damasterd_control", "r"); + /* + * GSoC: using an special file, intended to include this values at + * audit_control + */ + FILE *fpars = fopen(AUDIT_DAMASTERD_FILE, "r"); char sslave_dirs[10]; char lkup_host[10]; if (!fpars) - return -1; + return (-1); if (feof(fpars)) - return -1; + return (-1); fscanf(fpars, "%s", slave_trails_dir); fscanf(fpars, "%s", sslave_dirs); @@ -211,114 +220,128 @@ else lookup_host = 0; - return 0; + return (0); } +static int process_request(int sfd, struct sockaddr *clientinfo) { int res = 0; char opt[2]; - get_from_socket(sfd, opt); + get_from_socket(sfd, opt, sizeof (opt)); while (res != -1) { switch(opt[0]) { - case '0': /* The process is finished */ + case '0': + /* The process is finished */ return 0; break; - case '1': /* The request is about searching for a file */ + case '1': + /* The request is about searching for a file */ res = search_trail(sfd, clientinfo); break; - case '2': /* The request is about receiving a trail */ + case '2': + /* The request is about receiving a trail */ res = receive_trail(sfd, clientinfo); break; default: to_log("Can't understand user's request!"); } - get_from_socket(sfd, opt); + get_from_socket(sfd, opt, sizeof (opt)); } close(sfd); - return res; + return (res); } +static int search_trail(int sfd, struct sockaddr *clientinfo) { DIR *dp; struct dirent *dirp; struct stat statbuf; - char fullpath[MAX_PATH_SIZE + 1]; char *ptr; char hbuf[NI_MAXHOST+1]; - char message[MAX_PATH_SIZE + 50]; + char message[MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; char hostname[NI_MAXHOST+1]; - char pathslave[MAX_TRAILPATH_SIZE+1], md5slave[33]; + char pathslave[MAX_TRAILPATH_SIZE+1], sha256slave[SHA256_SIZE]; char dirpath[MAX_DIR_SIZE+1]; char found_trail[] = "n"; - get_from_socket(sfd, pathslave); - get_from_socket(sfd, md5slave); + get_from_socket(sfd, pathslave, sizeof (pathslave)); + get_from_socket(sfd, sha256slave, sizeof (sha256slave)); - strcpy(hostname, inet_ntoa(((struct sockaddr_in *) clientinfo)->sin_addr)); + strlcpy(hostname, + inet_ntoa(((struct sockaddr_in *) clientinfo)->sin_addr), + sizeof (hostname)); - if (getnameinfo(clientinfo, clientinfo->sa_len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD)) + if (getnameinfo(clientinfo, clientinfo->sa_len, hbuf, sizeof(hbuf), + NULL, 0, NI_NAMEREQD)) to_log("Couldn't resolve hostname, using IP address"); else - strcpy(hostname, hbuf); + strlcpy(hostname, hbuf, sizeof (hostname)); - sprintf(message, "Looking for \"%s\" from \"%s\" with MD5: \"%s\"", pathslave, hostname, md5slave); + snprintf(message, sizeof(message), + "Looking for \"%s\" from \"%s\" with SHA256: \"%s\"", pathslave, + hostname, sha256slave); to_log(message); - strcpy(dirpath, slave_trails_dir); + strlcpy(dirpath, slave_trails_dir, sizeof (dirpath)); - if (slave_dirs) - { - strcat(dirpath, "/"); - strcat(dirpath, hostname); + if (slave_dirs) { + strlcat(dirpath, "/", sizeof (dirpath)); + strlcat(dirpath, hostname, sizeof (dirpath)); } - /* Setting the fullpath to search */ - /* Fancy way to use the fullpath */ - strcpy(fullpath, dirpath); - ptr = fullpath + strlen(fullpath); - *ptr = '/'; - *(++ptr) = 0; - - if ( !(dp = opendir(dirpath)) ) - { + if ( !(dp = opendir(dirpath)) ) { to_log("Can't open slave trails' directory"); send_to_socket(sfd, "n"); - return 1; + return (1); } - /* We must count the elements (just the valid ones, this is: the trails) of the directory */ - while (strcmp(found_trail, "y") && (dirp = readdir(dp)) != NULL ) - if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) /* We have other than . or .. */ - { - strcpy(ptr, dirp->d_name); + /* + * We must count the elements (just the valid ones, this is: the + * trails) of the directory. + */ + while ('n' == found_trail[0] && (dirp = readdir(dp)) != NULL ) + if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) { + /* We have other than . or .. */ + + asprintf(&ptr, "%s/%s", dirpath, dirp->d_name); - if ( stat(fullpath, &statbuf) < 0 ) + if ( stat(ptr, &statbuf) < 0 ) { to_log("Stat error!"); return -1; } - if (S_ISDIR(statbuf.st_mode) == 0) /* It's not a directory */ - if ( check_files_equal(pathslave, md5slave, hostname, dirp->d_name, fullpath) ) /* Check that the trails are the same name + MD5 */ - strcpy(found_trail, "y"); + if (S_ISDIR(statbuf.st_mode) == 0) { + /* It's not a directory */ + if ( check_files_equal(pathslave, sha256slave, + hostname, dirp->d_name, ptr) ) { + /* + * Check that the trails are the same + * name + SHA256 + */ + found_trail[0] = 'y'; + } + } + free(ptr); } closedir(dp); - sprintf(message, "The search for %s resulted: %s\n", pathslave, found_trail[0] == 'y' ? "YES" : "NO"); + snprintf(message, sizeof (message), "The search for %s resulted: %s\n", + pathslave, ('y' == found_trail[0]) ? "YES" : "NO"); send_to_socket(sfd, found_trail); - return 1; + return (1); } /* @@ -329,103 +352,82 @@ * of the trails name */ -check_files_equal(char *pathslave, char *md5slave, char *hostname, char *path, char *fullpath) +static int +check_files_equal(char *pathslave, char *sha256slave, char *hostname, char *path, + char *fullpath) { char path_to_find[strlen(pathslave) + strlen(hostname) + 2]; - strcpy(path_to_find, pathslave); + strlcpy(path_to_find, pathslave, sizeof (path_to_find)); if (lookup_host) { - strcat(path_to_find, "."); - strcat(path_to_find, hostname); + strlcat(path_to_find, ".", sizeof (path_to_find)); + strlcat(path_to_find, hostname, sizeof (path_to_find)); } if (!strncmp(path, path_to_find, strlen(path_to_find))) { - char *md5 = (char *) malloc (sizeof(char) * 33); - md5 = MD5File(fullpath, md5); + char *sha256 = (char *) malloc (sizeof(char) * SHA256_SIZE); + sha256 = SHA256_File(fullpath, sha256); - if (!strcmp(md5, md5slave)) - return 1; + if (!strcmp(sha256, sha256slave)) + return (1); - free(md5); + free(sha256); } - return 0; + return (0); } -void -send_to_socket(int sfd, char *data) -{ - int len = strlen(data); - - send(sfd, &len, sizeof(int), 0); - send(sfd, data, len, 0); -} - -void -get_from_socket(int sfd, char *dest) -{ - int len, left; - char *ptr; - brecv = recv(sfd, buffer, sizeof(int), 0); - strncpy((char *) &len, buffer, sizeof(int)); - - left = len; - ptr = dest; - - while (left > 0) - { - brecv = recv(sfd, buffer, min(MAX_BUF_SIZE, left), 0); - buffer[brecv] = 0; - strcpy(ptr, buffer); - ptr += brecv; - left -= brecv; - } -} - +static int receive_trail(int sfd, struct sockaddr *clientinfo) { DIR *dp; char fullpath[MAX_PATH_SIZE + 1]; char hbuf[NI_MAXHOST+1]; - char message[MAX_PATH_SIZE + 50]; + char message[MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; char hostname[NI_MAXHOST+1]; char pathslave[MAX_TRAILPATH_SIZE+1]; char dirpath[MAX_DIR_SIZE+1]; + char buffer[MAX_BUF_SIZE + 1]; + int brecv; time_t mtime; struct tm *ltime; unsigned file_size; int fd, bwrtn, bread; - get_from_socket(sfd, pathslave); + get_from_socket(sfd, pathslave, sizeof (pathslave)); - strcpy(hostname, inet_ntoa(((struct sockaddr_in *) clientinfo)->sin_addr)); + strlcpy(hostname, + inet_ntoa(((struct sockaddr_in *) clientinfo)->sin_addr), + sizeof (hostname)); - if (getnameinfo(clientinfo, clientinfo->sa_len, hbuf, sizeof(hbuf), NULL, 0, NI_NAMEREQD)) + if (getnameinfo(clientinfo, clientinfo->sa_len, hbuf, sizeof(hbuf), + NULL, 0, NI_NAMEREQD)) to_log("Couldn't resolve hostname, using IP address"); else - strcpy(hostname, hbuf); + strlcpy(hostname, hbuf, sizeof (hostname)); - sprintf(message, "Receiving \"%s\" from \"%s\"", pathslave, hostname); + snprintf(message, sizeof (message), "Receiving \"%s\" from \"%s\"", + pathslave, hostname); to_log(message); - strcpy(dirpath, slave_trails_dir); + strlcpy(dirpath, slave_trails_dir, sizeof (dirpath)); - if ( !(dp = opendir(dirpath)) ) - { - to_log("Can't open Slave trails dir, please create it or change the value at config files!"); - return -1; + if ( !(dp = opendir(dirpath)) ) { + to_log("Can't open Slave trails dir, please create it or" + " change the value at config files!"); + return (-1); } closedir(dp); if (slave_dirs) { - strcat(dirpath, "/"); - strcat(dirpath, hostname); + strlcat(dirpath, "/", sizeof (dirpath)); + strlcat(dirpath, hostname, sizeof (dirpath)); } if ( !(dp = opendir(dirpath)) ) @@ -440,75 +442,64 @@ else closedir(dp); - strcat(dirpath, "/"); + strlcat(dirpath, "/", sizeof (dirpath)); mtime = time(NULL); ltime = gmtime(&mtime); - sprintf(fullpath, "%s%s.%s.%04d%02d%02d%02d%02d%02d", - dirpath, - pathslave, - hostname, - ltime->tm_year + 1900, - ltime->tm_mon + 1, - ltime->tm_mday, - ltime->tm_hour, - ltime->tm_min, - ltime->tm_sec); - sprintf(message, "Create: %s", fullpath); + snprintf(fullpath, sizeof(fullpath), "%s%s.%s.%04d%02d%02d%02d%02d%02d", + dirpath, pathslave, hostname, ltime->tm_year + 1900, + ltime->tm_mon + 1, ltime->tm_mday, ltime->tm_hour, ltime->tm_min, + ltime->tm_sec); + snprintf(message, sizeof (message), "Create: %s", fullpath); to_log(message); /* We get the trail size */ recv(sfd, &file_size, sizeof(file_size), 0); fd = open(fullpath, O_CREAT | O_WRONLY); - if (fd < 0) - { + if (fd < 0) { to_log("Can't create the trail at master system"); - return -1; + return (-1); } - while (file_size) - { + while (file_size) { brecv = recv(sfd, &bread, sizeof(bread), 0); - if (brecv < 0) - { + if (brecv < 0) { to_log("Error receiving the file"); - return -1; + return (-1); } brecv = recv(sfd, buffer, bread, 0); - if (brecv < 0) - { + if (brecv < 0) { to_log("Error receiving the file"); - return -1; + return (-1); } else if (brecv == 0) break; bwrtn = write(fd, buffer, brecv); - if (bwrtn < 0 || bwrtn != brecv) - { + if (bwrtn < 0 || bwrtn != brecv) { to_log("Error writting the file"); - return -1; + return (-1); } file_size -= brecv; } - sprintf(message, "Master got: %s", fullpath); + snprintf(message, sizeof (message), "Master got: %s", fullpath); + to_log(message); close(fd); /* Change the permissions to be the same than the local trails */ - if (chmod(fullpath, S_IRUSR | S_IRGRP) < 0) - { + if (chmod(fullpath, S_IRUSR | S_IRGRP) < 0) { to_log("Error changing permissions"); - return -1; + return (-1); } - return 0; + return (0); } ==== //depot/projects/soc2010/disaudit/msocket_work.c#5 (text+ko) ==== @@ -25,16 +25,22 @@ * */ -#include -#include -#include -#include +#include "utils.h" + #include #include #include #include #include +#include +#include + +#include + +#include + +int init_socket(int port) { struct sockaddr_in sockaddr; @@ -45,7 +51,7 @@ if (sockfd < 0) { to_log("Cannot create socket!"); - return -1; + return (-1); } bzero(&sockaddr, sizeof(sockaddr)); @@ -57,18 +63,19 @@ if (bind(sockfd, (struct sockaddr *) &sockaddr, sizeof(sockaddr)) < 0) { to_log("Cannot bind to port"); - return -1; + return (-1); } listen(sockfd, 500); - return sockfd; + return (sockfd); } +int accept_connection(int sfd, struct sockaddr *clientinfo) { struct sockaddr_in clientaddr; - int clientlen = sizeof(clientaddr); + socklen_t clientlen = sizeof(clientaddr); int retval = 0; retval = accept(sfd, (struct sockaddr *) &clientaddr, &clientlen); @@ -76,6 +83,6 @@ if (retval >= 0) memcpy(clientinfo, &clientaddr, sizeof(struct sockaddr)); - return retval; + return (retval); } ==== //depot/projects/soc2010/disaudit/shipd.c#8 (text+ko) ==== @@ -27,36 +27,79 @@ /*** INCLUDES ***/ -#include "shipd.h" #include "ssocket_work.h" +#include "utils.h" + +#include #include #include #include #include #include #include +#include + #include -#include +#include #include +#define PANIC_DATE 2 +#define PANIC_ALL 3 + +#define DEL_FIRST 1 +#define DEL_LAST 2 +#define DEL_ALL 3 + +#define AUDIT_SHIPD_FILE "/etc/security/shipd_control" + + /*** DECLARATIONS ***/ +/* Trail Entries */ +typedef struct s_trail_entry +{ + char name[MAX_TRAILPATH_SIZE + 1]; + int found; + struct s_trail_entry *next; +} trail_entry; + /* Directory settings took from audit_control */ char audit_trails_dir[MAX_DIR_SIZE + 1]; char master_host[MAX_HOST_SIZE + 1]; +/*** local prototypes ***/ +static int add_trail_entry(trail_entry **root, char *name); +static int cmp_trails (const void *A, const void *B); +static void delete_trail_entry(trail_entry **root, int criteria, int number); +static void do_daemon(); +static void do_daemon_date(); +static void do_daemon_all(); +static void do_last(); +static int get_last_trail(char *path, size_t path_size); +static int get_parameters(); +static int is_audit_trail(char *path); +static int is_in_master(trail_entry *cur, int *first_found); +static void pll(trail_entry *root); +static int send_trail(trail_entry *cur); + /* The level of trust the shipping process will have (0 means disabled) */ int panic_level; /* The frequency the daemon will be checking the master's trail list */ int msec_freq; -/* Two main things to be set by this variable, if daemonize or not, and the destination of the messages */ -int debug; - /* Port number */ int port_number; +/* + * ShipD + * Shipping Daemon + * + * This program is checking, according to the panic_level variable + * the audit trail directories and send the trails to a master + * system, when no runs with debug option, it daemonize itself + */ +int main (int argc, char *argv[]) { char cl_opt; @@ -65,53 +108,67 @@ debug = 0; while ((cl_opt = getopt(argc, argv, "dl")) != -1) - switch (cl_opt) - { + switch (cl_opt) { case 'd': /* Debug option */ debug = 1; break; case 'l': - /* Last trail (when called by AUDIT when it closes the trail) */ + /* + * Last trail (when called by AUDIT when it + * closes the trail). + */ last = 1; break; } /* If not debugging, daemonize the program */ - if (debug == 0 && daemon(0,0) != 0) - { + if (debug == 0 && daemon(0,0) != 0) { perror("Can't daemonize, exiting!"); exit(1); } /* Set the directory path, the host address, the panic level */ - if (get_parameters() == -1) - { + if (get_parameters() == -1) { to_log("Can't get the parameters to work!"); exit(1); } - /* There is no shipd enabled and it wasn't called by AUDIT (normally the unique way to get 'last' on) */ - if (panic_level < 2 && last == 0) - { + /* + * There is no shipd enabled and it wasn't called by AUDIT (normally + * the unique way to get 'last' on). + */ + if (panic_level < 2 && last == 0) { to_log("Shipd disabled"); exit(0); } - /* This means that the daemon will only search for the last closed trail and send to the master system */ - if (last == 1) + /* + * This means that the daemon will only search for the last closed + * trail and send to the master system. + */ + if (last == 1) { do_last(); - else /* Otherwise, we will perform a permanent listing checking and sync them */ + } else { + /* + * Otherwise, we will perform a permanent listing checking and + * sync them. + */ do_daemon(); + } - return 0; + return (0); } +static int get_parameters() { - /* GSoC: using an special file, intended to include this values at audit_control */ - FILE *fpars = fopen("/etc/security/shipd_control", "r"); + /* + * GSoC: using an special file, intended to include this values at + * audit_control. + */ + FILE *fpars = fopen(AUDIT_SHIPD_FILE, "r"); if (!fpars) return -1; @@ -119,6 +176,10 @@ if (feof(fpars)) return -1; + /* + * XXX This parsing of the shipd_control file might need to be + * reworked a bit. -sson. + */ fscanf(fpars, "%s", audit_trails_dir); fscanf(fpars, "%s", master_host); fscanf(fpars, "%d", &panic_level); @@ -127,43 +188,34 @@ fclose(fpars); - return 0; -} - -void -to_log(char *message) -{ -return; - if (debug) - perror(message); - else - syslog(LOG_ERR, "%s", message); + return (0); } /* * Look for the last closed trail and - * send it + * send it. */ -void +static void do_last() { char last_trail[MAX_TRAILPATH_SIZE + 1]; - char message[MAX_PATH_SIZE + 30]; + char message[MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; trail_entry *root = NULL; - if (get_last_trail(last_trail) == -1) + if (get_last_trail(last_trail, sizeof (last_trail)) == -1) to_log("Nothing to send!"); - sprintf(message, "Will send \"%s\" to %s", last_trail, master_host); + snprintf(message, sizeof (message), "Will send \"%s\" to %s", + last_trail, master_host); to_log(message); add_trail_entry(&root, last_trail); - if (send_trail(root) == -1) + if (send_trail(root) == -1) { to_log("Error sending the last trail"); - else - { - sprintf(message, "Successfully sent \"%s\" to %s", last_trail, master_host); + } else { + snprintf(message, sizeof (message), + "Successfully sent \"%s\" to %s", last_trail, master_host); to_log(message); } @@ -175,64 +227,76 @@ * closed trail in meaning of lexicographic * order (that is also a chronological one) */ -get_last_trail(char *path) +static int +get_last_trail(char *path, size_t path_size) { DIR *dp; struct dirent *dirp; struct stat statbuf; - char fullpath[MAX_PATH_SIZE + 1]; char *ptr; *path = 0; - if ( !(dp = opendir(audit_trails_dir)) ) - { + if ( !(dp = opendir(audit_trails_dir)) ) { to_log("Can't open directory"); return -1; } - strcpy(fullpath, audit_trails_dir); - ptr = fullpath + strlen(fullpath); - *ptr = '/'; - *(++ptr) = 0; + /* + * Here we will pass through the entire directory and get the path of + * the latest closed trail. + */ + while ( (dirp = readdir(dp)) != NULL ) + if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) { + /* We have other than . or .. */ - /* Here we will pass through the entire directory and get the path of the latest closed trail */ + asprintf(&ptr, "%s/%s", audit_trails_dir, dirp->d_name); - while ( (dirp = readdir(dp)) != NULL ) - if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) /* We have other than . or .. */ - { - strcpy(ptr, dirp->d_name); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EEC41065DA4; Wed, 28 Jul 2010 08:21: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 54C721065C2C for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3807C8FC20 for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LaSK009152 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LZjr009150 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from gk@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8LZjr009150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:39 -0000 http://p4web.freebsd.org/@@181468?ac=10 Change 181468 by gk@gk_h1 on 2010/07/26 16:48:09 Move children list head to dircache_ref to simplify forthcoming weak-only cache. Replace inode numbers with 64 bit ids (until ino_t remains 32 bit) Affected files ... .. //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_subr.c#6 edit .. //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_vfsops.c#4 edit .. //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_vnops.c#6 edit .. //depot/projects/soc2010/gk_namecache/sys/kern/vfs_dircache.c#8 edit .. //depot/projects/soc2010/gk_namecache/sys/modules/tmpfs/Makefile#4 edit .. //depot/projects/soc2010/gk_namecache/sys/sys/dircache.h#8 edit Differences ... ==== //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_subr.c#6 (text+ko) ==== @@ -401,7 +401,7 @@ error = insmntque(vp, mp); if (error) vp = NULL; -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) else dircache_allocvnode(vp, node->tn_id); #endif @@ -524,7 +524,7 @@ * insert the new node into the directory, an operation that * cannot fail. */ tmpfs_dir_attach(dvp, de); -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) dircache_add(dvp, *vpp, cnp, DT_STRONG); #endif ==== //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_vfsops.c#4 (text+ko) ==== @@ -247,6 +247,9 @@ MNT_ILOCK(mp); mp->mnt_flag |= MNT_LOCAL; mp->mnt_kern_flag |= MNTK_MPSAFE; +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) + mp->mnt_kern_flag |= MNTK_DIRCACHE; +#endif MNT_IUNLOCK(mp); mp->mnt_data = tmp; @@ -254,8 +257,10 @@ vfs_getnewfsid(mp); vfs_mountedfrom(mp, "tmpfs"); -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) dircache_init(mp, root->tn_id); +#elif defined(DIRCACHE_WEAK) + dircache_init(mp, 0); #endif return 0; @@ -327,7 +332,7 @@ mp->mnt_flag &= ~MNT_LOCAL; MNT_IUNLOCK(mp); -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) dircache_uninit(mp); #endif ==== //depot/projects/soc2010/gk_namecache/sys/fs/tmpfs/tmpfs_vnops.c#6 (text+ko) ==== @@ -185,7 +185,10 @@ * request was for creation, as it does not improve timings on * emprical tests. */ if ((cnp->cn_flags & MAKEENTRY) && cnp->cn_nameiop != CREATE) { -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) + dircache_add(dvp, *vpp, cnp, + *vpp == NULL ? DT_NEGATIVE : DT_STRONG); +#elif defined(DIRCACHE_WEAK) dircache_enter(dvp, *vpp, cnp); #else cache_enter(dvp, *vpp, cnp); @@ -844,7 +847,7 @@ /* Remove the entry from the directory; as it is a file, we do not * have to change the number of hard links of the directory. */ tmpfs_dir_detach(dvp, de); -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) dircache_remove(dvp, vp, v->a_cnp); #endif @@ -918,7 +921,7 @@ /* Insert the new directory entry into the appropriate directory. */ tmpfs_dir_attach(dvp, de); -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) dircache_add(dvp, vp, cnp, DT_STRONG); #endif @@ -1145,7 +1148,7 @@ tmpfs_free_dirent(VFS_TO_TMPFS(tvp->v_mount), de, TRUE); } -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) dircache_rename(fdvp, fcnp, tdvp, tcnp); #endif @@ -1243,7 +1246,7 @@ /* Detach the directory entry from the directory (dnode). */ tmpfs_dir_detach(dvp, de); -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) && !defined(DIRCACHE_WEAK) dircache_remove(dvp, vp, v->a_cnp); #endif @@ -1264,8 +1267,13 @@ TMPFS_NODE_CHANGED | TMPFS_NODE_MODIFIED; TMPFS_NODE_UNLOCK(dnode); +#if defined(DIRCACHE_WEAK) + dircache_purge(dvp); + dircache_purge(vp); +#elif defined(NO_DIRCACHE) cache_purge(dvp); cache_purge(vp); +#endif /* Free the directory entry we just deleted. Note that the node * referred by it will not be removed until the vnode is really @@ -1449,7 +1457,11 @@ tmp = VFS_TO_TMPFS(vp->v_mount); vnode_destroy_vobject(vp); +#if defined(DIRCACHE_WEAK) + dircache_purge(vp); +#elif defined(NO_DIRCACHE) cache_purge(vp); +#endif TMPFS_NODE_LOCK(node); TMPFS_ASSERT_ELOCKED(node); @@ -1468,7 +1480,7 @@ MPASS(vp->v_data == NULL); -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) dircache_reclaimvnode(vp); #endif @@ -1576,7 +1588,7 @@ */ struct vop_vector tmpfs_vnodeop_entries = { .vop_default = &default_vnodeops, -#ifndef NO_DIRCACHE +#if !defined(NO_DIRCACHE) .vop_lookup = vfs_dircache_lookup, #else .vop_lookup = vfs_cache_lookup, ==== //depot/projects/soc2010/gk_namecache/sys/kern/vfs_dircache.c#8 (text+ko) ==== @@ -53,7 +53,7 @@ #define DC_NAMEROUND 32 /* power of 2 */ -#define DC_OP_VLOCK 0x00000001 +#define DC_OP_LOCKPREF 0x00000001 #define DP_UNUSED_MIN 512 #define DP_THRESHOLD_DFLT 256 @@ -64,6 +64,11 @@ printf(format ,## args); \ } while (0) +#define DC_ISTRONG(v) \ + ((v)->v_mount->mnt_kern_flag & MNTK_DIRCACHE) +#define DC_ASSERT_STRONG(v) MPASS(DC_ISTRONG(v) != 0) +#define DC_ASSERT_WEAK(v) MPASS(DC_ISTRONG(v) == 0) + struct dircache_pool { struct mtx dp_mtx; TAILQ_HEAD(, dircache) dp_unused; @@ -80,10 +85,10 @@ struct dircache_mount { struct mtx dm_mtx; - struct dircache_inotree dm_inohead; + struct dircache_idtree dm_idhead; struct dircache_ref *dm_rootref; struct dircache_ref *dm_negativeref; - u_long dm_inocnt; + u_long dm_idcnt; }; static struct dircache * dc_use(struct dircache *dc); @@ -125,7 +130,7 @@ SYSCTL_PROC(_vfs_dircache_stats, OID_AUTO, inoderefs, CTLFLAG_RD | CTLTYPE_ULONG | CTLFLAG_MPSAFE, NULL, - __offsetof(struct dircache_mount, dm_inocnt), ds_mountstats, "LU", ""); + __offsetof(struct dircache_mount, dm_idcnt), ds_mountstats, "LU", ""); enum { ds_hit, @@ -199,6 +204,7 @@ #define dr_assertlock(dr, w) mtx_assert(&(dr)->dr_mtx, (w)) #define dr_lock(dr) mtx_lock(&(dr)->dr_mtx) +#define dr_trylock(dr) mtx_trylock(&(dr)->dr_mtx) #define dr_unlock(dr) mtx_unlock(&(dr)->dr_mtx) #define dc_lock(dc) mtx_lock(&(dc)->dc_mtx) @@ -280,32 +286,32 @@ static __inline int dr_cmp(struct dircache_ref *a, struct dircache_ref *b) { - if (a->dr_ino > b->dr_ino) + if (a->dr_id > b->dr_id) return (1); - else if (a->dr_ino < b->dr_ino) + else if (a->dr_id < b->dr_id) return (-1); return (0); } -RB_GENERATE_STATIC(dircache_inotree, dircache_ref, dr_inotree, dr_cmp); +RB_GENERATE_STATIC(dircache_idtree, dircache_ref, dr_idtree, dr_cmp); static struct dircache_ref * -dr_alloc(struct dircache_mount *dm, struct vnode *vp, ino_t ino) +dr_alloc(struct dircache_mount *dm, struct vnode *vp, uint64_t id) { struct dircache_ref *dr, *col; dr = uma_zalloc(dircache_ref_zone, M_WAITOK | M_ZERO); - mtx_init(&dr->dr_mtx, "dircache ref", NULL, MTX_DEF); + mtx_init(&dr->dr_mtx, "dircache ref", NULL, MTX_DEF | MTX_DUPOK); LIST_INIT(&dr->dr_entries); - dr->dr_ino = ino; + dr->dr_id = id; dr->dr_mount = dm; dr->dr_vnode = vp; if (vp != NULL) MPASS(dm_get(vp) == dr->dr_mount); - if (ino != 0) { + if (id != 0) { dm_lock(dm); - col = RB_INSERT(dircache_inotree, &dm->dm_inohead, dr); - dm->dm_inocnt++; + col = RB_INSERT(dircache_idtree, &dm->dm_idhead, dr); + dm->dm_idcnt++; MPASS(col == NULL); dm_unlock(dm); } @@ -322,10 +328,11 @@ if (dr->dr_vnode == NULL && LIST_EMPTY(&dr->dr_entries) && dr != dm->dm_rootref && dr != dm->dm_negativeref) { + MPASS(RB_EMPTY(&dr->dr_children)); dr_unlock(dr); dm_lock(dm); - RB_REMOVE(dircache_inotree, &dm->dm_inohead, dr); - dm->dm_inocnt--; + RB_REMOVE(dircache_idtree, &dm->dm_idhead, dr); + dm->dm_idcnt--; dm_unlock(dm); uma_zfree(dircache_ref_zone, dr); } else @@ -338,17 +345,29 @@ { struct dircache_ref *dr; -restart: dr = vp->v_dircache; - if (dr == NULL) - return (NULL); + MPASS(dr != NULL); dr_lock(dr); - if (vp->v_dircache != dr) { - dr_unlock(dr); - goto restart; - } + MPASS(vp->v_dircache == dr); + return (dr); +} + +static __inline struct dircache * +dr_singleentry(struct dircache_ref *dr) +{ + struct dircache *dc; + + dc = LIST_FIRST(&dr->dr_entries); + MPASS(dc != NULL); + MPASS(LIST_NEXT(dc, dc_reflist) == NULL); + + return (dc); +} - return (dr); +static __inline struct dircache_ref * +dr_parentref(struct dircache_ref *dr) +{ + return (dr_singleentry(dr)->dc_parentref); } static void @@ -356,8 +375,8 @@ { dr_assertlock(dr, MA_OWNED); - MPASS(dc->dc_ref == NULL); - dc->dc_ref = dr; + MPASS(dc->dc_selfref == NULL); + dc->dc_selfref = dr; DCDEBUG("add ref: vp=%p dc=%p dr=%p\n", dr->dr_vnode, dc, dr); if (dr->dr_vnode != NULL && dr->dr_vnode->v_type == VDIR) @@ -372,7 +391,7 @@ static void dr_remove(struct dircache_ref *dr, struct dircache *dc) { - MPASS(dc->dc_ref == NULL); + MPASS(dc->dc_selfref == NULL); LIST_REMOVE(dc, dc_reflist); if (dr->dr_vnode != NULL) { @@ -461,14 +480,13 @@ } static __inline void -dc_updategen(struct dircache *dc) +dr_updategen(struct dircache_ref *dr) { static u_long gen = 1; - dc_assertlock(dc, MA_OWNED); do { - dc->dc_gen = atomic_fetchadd_long(&gen, 1); - } while (__predict_false(dc->dc_gen == 0)); + dr->dr_gen = atomic_fetchadd_long(&gen, 1); + } while (__predict_false(dr->dr_gen == 0)); } static struct dircache * @@ -493,9 +511,8 @@ static void dc_free(struct dircache *dc) { - MPASS(RB_EMPTY(&dc->dc_children)); - MPASS(dc->dc_parent == NULL); - MPASS(dc->dc_ref == NULL); + MPASS(dc->dc_parentref == NULL); + MPASS(dc->dc_selfref == NULL); DCDEBUG("free: %p %s\n", dc, dc->dc_name); if (dc->dc_name != NULL) @@ -527,10 +544,10 @@ } else { dc_assertlock(dc, MA_NOTOWNED); } - dr = dc->dc_ref; + dr = dc->dc_selfref; if (dr != NULL) { dr_lock(dr); - dc->dc_ref = NULL; + dc->dc_selfref = NULL; dr_remove(dr, dc); } dc_free(dc); @@ -575,8 +592,20 @@ return (dc); } -static __inline int -dc_rele_int(struct dircache *dc, int unlock) +static void +dc_use_byref(struct dircache_ref *dr) +{ + struct dircache *dc; + + dr_assertlock(dr, MA_OWNED); + dc = dr_singleentry(dr); + dc_lock(dc); + dc_use(dc); + dc_unlock(dc); +} + +static int +dc_rele(struct dircache *dc) { int dropped; @@ -584,11 +613,11 @@ MPASS(dc->dc_usecnt > 0); dc->dc_usecnt--; - DCDEBUG("rele: %p usecnt=%d holdcnt=%d-1 unlock=%d\n", - dc, dc->dc_usecnt, dc->dc_holdcnt, unlock); + DCDEBUG("rele: %p usecnt=%d holdcnt=%d-1\n", + dc, dc->dc_usecnt, dc->dc_holdcnt); if (dc->dc_usecnt > 0) { - dropped = dc_drop_int(dc, 1, unlock); + dropped = dc_droplocked(dc); MPASS(dropped == 0); return (dropped); } @@ -600,18 +629,14 @@ } static int -dc_rele(struct dircache *dc) +dc_rele_byref(struct dircache_ref *dr) { - return (dc_rele_int(dc, 1)); -} + struct dircache *dc; -#if 0 -static int -dc_relesafe(struct dircache *dc) -{ - return (dc_rele_int(dc, 0)); + dc = dr_singleentry(dr); + dc_lock(dc); + return (dc_rele(dc)); } -#endif static __inline void dc_invalidate(struct dircache *dc) @@ -635,15 +660,12 @@ } static struct dircache * -dc_getentry(struct vnode *vp, struct componentname *cnp, struct vnode *dvp) +dc_getentry(struct vnode *vp, struct componentname *cnp, struct dircache_ref *parentref) { struct dircache_ref *dr; struct dircache *dc; dr = dr_get(vp); - if (dr == NULL) - panic("dircache: reference to vnode disappeared: %.*s", - (int)cnp->cn_namelen, cnp->cn_nameptr); dc = LIST_FIRST(&dr->dr_entries); if (dc == NULL) { dr_unlock(dr); @@ -656,7 +678,7 @@ return (NULL); } else { if (LIST_NEXT(dc, dc_reflist) != NULL) { - MPASS(cnp != NULL && dvp != NULL); + MPASS(cnp != NULL && parentref != NULL); MPASS(vp->v_type != VDIR); MPASS(!(cnp->cn_nameptr[0] == '.' && (cnp->cn_namelen == 1 || (cnp->cn_namelen == 2 && @@ -664,21 +686,17 @@ for(; dc != NULL; dc = LIST_NEXT(dc, dc_reflist)) { dc_lock(dc); - if (dc->dc_ref == NULL) { + if (dc->dc_selfref == NULL) { dc_unlock(dc); continue; } - dr_unlock(dr); - dc_lock(dc->dc_parent); if (dc_cmpname(dc, cnp->cn_nameptr, cnp->cn_namelen) == 0 && - dvp->v_dircache == dc->dc_parent->dc_ref) { - dc_unlock(dc->dc_parent); + parentref == dc->dc_parentref) { + dr_unlock(dr); break; } - dc_unlock(dc->dc_parent); dc_unlock(dc); - dr_lock(dr); } if (dc == NULL) { dr_unlock(dr); @@ -696,71 +714,28 @@ } dc_assertlock(dc, MA_OWNED); - MPASS(dc->dc_ref->dr_vnode == vp); + MPASS(dc->dc_selfref->dr_vnode == vp); return (dc); } -static int -dc_parentinterlock(struct dircache *pdc, struct dircache *dc, int *pdcholdp) -{ - dc_assertlock(pdc, MA_OWNED); - - if (dc_trylock(dc) != 0) - return (0); - - if (pdcholdp != NULL && *pdcholdp == 0) { - dc_hold(pdc); - *pdcholdp += 1; - } - - dc_hold(dc); - dc_unlock(pdc); - dc_lock(dc); - if (dc->dc_parent != pdc) { - dc_droplocked(dc); - dc_lock(pdc); - return (1); - } - if (dc_dropsafe(dc) != 0) { - dc_lock(pdc); - return (1); - } - dc_lock(pdc); - return (0); -} - static struct dircache * -dc_find(struct vnode *dvp, struct componentname *cnp) +dc_find(struct vnode *dvp, struct componentname *cnp, int flags) { struct dircache key; - struct dircache *pdc, *dc; - int pdchold; + struct dircache_ref *parentref; + struct dircache *dc; - pdc = dc_getentry(dvp, NULL, NULL); - if (pdc == NULL) - return (NULL); - dc_assertlock(pdc, MA_OWNED); - - pdchold = 0; + parentref = dr_get(dvp); dc_initname(&key, cnp->cn_nameptr, cnp->cn_namelen); -restart: - dc = RB_FIND(dircache_tree, &pdc->dc_children, &key); - if (dc == NULL) { - dc_unlock(pdc); - goto out; - } - - if (dc_parentinterlock(pdc, dc, &pdchold) != 0) { - DC_STAT_INC(ds_lookup_restart); - goto restart; - } - dc_assertlock(dc, MA_OWNED); - dc_unlock(pdc); + dc = RB_FIND(dircache_tree, &parentref->dr_children, &key); + if (dc != NULL) { + dc_lock(dc); + if ((flags & DC_OP_LOCKPREF) == 0) + dr_unlock(parentref); + } else + dr_unlock(parentref); -out: - if (pdchold != 0) - dc_drop(pdc); return (dc); } @@ -769,43 +744,43 @@ { struct dircache *child; - RB_FOREACH(child, dircache_tree, &dc->dc_children) { + RB_FOREACH(child, dircache_tree, &dc->dc_selfref->dr_children) { MPASS(child->dc_type == DT_NEGATIVE); } } -static void dc_removechildren(struct dircache *dc); +static void dr_removechildren(struct dircache_ref *ref); static void -dc_removeentry(struct dircache *dc) +dc_removeentry(struct dircache *dc, int flags) { - struct dircache *parent; - struct dircache_ref *dr; + struct dircache_ref *parentref; + struct dircache_ref *selfref; - MPASS(dc->dc_parent != NULL); + MPASS(dc->dc_parentref != NULL); dc_assertlock(dc, MA_OWNED); - dc_assertlock(dc->dc_parent, MA_OWNED); + dr_assertlock(dc->dc_parentref, MA_OWNED); dc_assertempty(dc); DCDEBUG("remove entry: %p %s\n", dc, dc->dc_name); - parent = dc->dc_parent; - dc->dc_parent = NULL; - RB_REMOVE(dircache_tree, &parent->dc_children, dc); + parentref = dc->dc_parentref; + dc->dc_parentref = NULL; + RB_REMOVE(dircache_tree, &parentref->dr_children, dc); if (dc->dc_type != DT_INVALID); dc_invalidate(dc); - dr = dc->dc_ref; - dc->dc_ref = NULL; + selfref = dc->dc_selfref; + dc->dc_selfref = NULL; - dc_rele(parent); + dc_unlock(dc); + dr_lock(selfref); - if (!RB_EMPTY(&dc->dc_children)) { - dc_removechildren(dc); - } else - dc_unlock(dc); - - dr_lock(dr); - dr_remove(dr, dc); + if (!RB_EMPTY(&selfref->dr_children)) + dr_removechildren(selfref); + dr_remove(selfref, dc); + dc_rele_byref(parentref); + if ((flags & DC_OP_LOCKPREF) == 0) + dr_unlock(parentref); dc_drop(dc); } @@ -813,120 +788,104 @@ static void dc_marknegative(struct dircache *dc) { - struct dircache_mount *dm; - struct dircache_ref *dr; + struct dircache_ref *selfref, *negativeref; - MPASS(dc->dc_parent != NULL); + MPASS(dc->dc_parentref != NULL); dc_assertlock(dc, MA_OWNED); - dc_assertlock(dc->dc_parent, MA_OWNED); + dr_assertlock(dc->dc_parentref, MA_OWNED); dc_assertempty(dc); DCDEBUG("mark negative: %p %s; vp=%p\n", - dc, dc->dc_name, dc->dc_ref->dr_vnode); - dc_updategen(dc->dc_parent); + dc, dc->dc_name, dc->dc_selfref->dr_vnode); + dr_updategen(dc->dc_parentref); dc->dc_type = DT_NEGATIVE; - dc_unlock(dc->dc_parent); - dr = dc->dc_ref; - dm = dr->dr_mount; - dc->dc_ref = NULL; + selfref = dc->dc_selfref; + negativeref = selfref->dr_mount->dm_negativeref; + dc->dc_selfref = NULL; dc_hold(dc); + dc_unlock(dc); + dr_lock(selfref); - if (!RB_EMPTY(&dc->dc_children)) - dc_removechildren(dc); - else - dc_unlock(dc); + dr_removechildren(selfref); + dr_remove(selfref, dc); - dr_lock(dr); - dr_remove(dr, dc); - - dr = dm->dm_negativeref; - dr_lock(dr); + dr_lock(negativeref); + dr_unlock(dc->dc_parentref); dc_lock(dc); - dr_add(dr, dc); + dr_add(negativeref, dc); dc_unlock(dc); - dr_unlock(dr); + dr_unlock(negativeref); dc_drop(dc); } static void -dc_removechildren(struct dircache *dc) +dr_removechildren(struct dircache_ref *ref) { struct dircache *child; - dc_assertlock(dc, MA_OWNED); + dr_assertlock(ref, MA_OWNED); - DCDEBUG("remove children: %p %s\n", dc, dc->dc_name); - while(!RB_EMPTY(&dc->dc_children)) { - child = RB_MIN(dircache_tree, &dc->dc_children); - if (dc_parentinterlock(dc, child, NULL) != 0) - continue; - MPASS(RB_EMPTY(&child->dc_children)); - dc_removeentry(child); - dc_lock(dc); + DCDEBUG("remove children: ref=%p\n", ref); + while(!RB_EMPTY(&ref->dr_children)) { + child = RB_MIN(dircache_tree, &ref->dr_children); + dc_lock(child); + MPASS(RB_EMPTY(&child->dc_selfref->dr_children)); + dc_removeentry(child, DC_OP_LOCKPREF); } - dc_unlock(dc); + + dr_assertlock(ref, MA_OWNED); } static struct dircache * -dc_insertentry(struct dircache *pdc, struct dircache *dc) +dc_insertentry(struct dircache_ref *parentref, struct dircache *dc) { struct dircache *col; - DCDEBUG("insert: parent=%p name=%s dc=%p\n", - pdc, pdc->dc_name, dc); + DCDEBUG("insert: parent=%p dc=%p\n", + parentref, dc); restart: + dr_assertlock(parentref, MA_OWNED); dc_assertlock(dc, MA_OWNED); - dc_assertlock(pdc, MA_OWNED); - col = RB_INSERT(dircache_tree, &pdc->dc_children, dc); + col = RB_INSERT(dircache_tree, &parentref->dr_children, dc); if (col != NULL) { if (dc->dc_type == col->dc_type) { DCDEBUG("insert: warn: same entry added: %s\n", dc->dc_name); - /* TODO - KASSERT(col->dc_ref == dr, - ("dircache: entry already exists: %s %p %p\n", - dc->dc_name, col->dc_ref, dc->dc_ref)); - */ - dc_unlock(pdc); + dr_unlock(parentref); dc_unlock(dc); dc_drop(dc); - return (NULL); + return (col); } else if (col->dc_type == DT_NEGATIVE) { DCDEBUG("insert: replace negative entry: %p %s\n", dc, dc->dc_name); dc_unlock(dc); - if (dc_trylock(col) == 0) { - dc_unlock(pdc); - dc_lock(col); - if (col->dc_parent != pdc) { - dc_unlock(col); - dc_lock(dc); - dc_lock(pdc); - DC_STAT_INC(ds_insert_restart); - goto restart; - } - dc_lock(pdc); + dc_lock(col); + if (col->dc_parentref != parentref) { + dc_unlock(col); + dc_lock(dc); + dr_assertlock(parentref, MA_OWNED); + DC_STAT_INC(ds_insert_restart); + goto restart; } - dc_removeentry(col); + dc_removeentry(col, DC_OP_LOCKPREF); dc_lock(dc); - dc_lock(pdc); + dr_assertlock(parentref, MA_OWNED); goto restart; } else panic("dircache: insert: ivalid entry: %d %s\n", dc->dc_type, dc->dc_name); } else { - dc->dc_parent = pdc; + dc->dc_parentref = parentref; dp_unused_insert(dc); - dc_use(pdc); + dc_use_byref(parentref); dc_hold(dc); - dc_unlock(pdc); - dc_updategen(dc); dc_unlock(dc); + dr_unlock(parentref); } return (dc); } @@ -981,8 +940,8 @@ DC_STAT_INC(ds_clearunused_restart); continue; } - if (dc->dc_parent != NULL) { - if (dc_trylock(dc->dc_parent) == 0) { + if (dc->dc_parentref != NULL) { + if (dr_trylock(dc->dc_parentref) == 0) { dc_unlock(dc); dc = TAILQ_NEXT(dc, dc_list); shift++; @@ -993,8 +952,8 @@ } } mtx_unlock(&pool.dp_mtx); - MPASS(RB_EMPTY(&dc->dc_children)); - dc_removeentry(dc); + MPASS(RB_EMPTY(&dc->dc_selfref->dr_children)); + dc_removeentry(dc, 0); mtx_lock(&pool.dp_mtx); dc = TAILQ_FIRST(&pool.dp_unused); shift = 0; @@ -1015,6 +974,7 @@ dp_invalid_clear(void) { struct dircache *dc; + struct dircache_ref *parentref; mtx_assert(&pool.dp_mtx, MA_OWNED); @@ -1027,15 +987,23 @@ dc_lock(dc); if (dc_dropsafe(dc) == 0) { dc_assertlock(dc, MA_OWNED); - dc_hold(dc); - MPASS(dc->dc_ref == NULL); - if (dc->dc_parent != NULL) { - dc_lock(dc->dc_parent); - dc_removeentry(dc); + MPASS(dc->dc_selfref == NULL); + parentref = dc->dc_parentref; + if (parentref != NULL) { + dc_hold(dc); + dc_unlock(dc); + dr_lock(parentref); dc_lock(dc); + if (dc->dc_parentref != parentref) { + dr_unlock(parentref); + dc_unlock(dc); + mtx_lock(&pool.dp_mtx); + continue; + } + dc_removeentry(dc, 0); + dc_drop(dc); } else - dc_removechildren(dc); - dc_drop(dc); + dc_unlock(dc); } mtx_lock(&pool.dp_mtx); } @@ -1064,7 +1032,7 @@ } void -dircache_init(struct mount *mp, ino_t inode) +dircache_init(struct mount *mp, uint64_t id) { struct dircache_mount *dm; struct dircache *dc; @@ -1072,34 +1040,40 @@ dm = malloc(sizeof(struct dircache_mount), M_DIRCACHE, M_WAITOK | M_ZERO); mtx_init(&dm->dm_mtx, "dircache mount", NULL, MTX_DEF); - RB_INIT(&dm->dm_inohead); + RB_INIT(&dm->dm_idhead); dm->dm_negativeref = dr_alloc(dm, NULL, 0); - dm->dm_rootref = dr_alloc(dm, NULL, inode); + if (id != 0) { + MPASS((mp->mnt_kern_flag & MNTK_DIRCACHE) != 0); + dm->dm_rootref = dr_alloc(dm, NULL, id); - MPASS(mp->mnt_dircache == NULL); - dc = dc_alloc(DT_ROOT, NULL, 0); + MPASS(mp->mnt_dircache == NULL); + dc = dc_alloc(DT_ROOT, NULL, 0); - dr_lock(dm->dm_rootref); - dc_lock(dc); - dp_unused_insert(dc); - dr_add(dm->dm_rootref, dc); - dc_use(dc); - dc_unlock(dc); - dr_unlock(dm->dm_rootref); + dr_lock(dm->dm_rootref); + dc_lock(dc); + dp_unused_insert(dc); + dr_add(dm->dm_rootref, dc); + dc_use(dc); + dc_unlock(dc); + dr_unlock(dm->dm_rootref); + DCDEBUG("init: root=%p %jd\n", dc, (intmax_t)id); + } else { + MPASS((mp->mnt_kern_flag & MNTK_DIRCACHE) == 0); + DCDEBUG("init: weak\n"); + } MNT_ILOCK(mp); mp->mnt_dircache = dm; MNT_IUNLOCK(mp); - - DCDEBUG("init: root=%p %d\n", dc, inode); } void dircache_uninit(struct mount *mp) { + struct dircache_ref *dr, *childref; struct dircache *dc, *child; struct dircache_mount *dm; - int dropped, dchold; + int dropped; MPASS(mp->mnt_dircache != NULL); @@ -1113,54 +1087,49 @@ MNT_IUNLOCK(mp); restart: - dc = LIST_FIRST(&dm->dm_rootref->dr_entries); - MPASS(LIST_NEXT(dc, dc_reflist) == NULL); - DCDEBUG("uninit: root=%p\n", dc); - dc_lock(dc); + dr = dm->dm_rootref; + dr_lock(dr); + DCDEBUG("uninit: rootref=%p\n", dr); - while (dc != NULL && !RB_EMPTY(&dc->dc_children)) { + while (dr != NULL && !RB_EMPTY(&dr->dr_children)) { nested: - dc_assertlock(dc, MA_OWNED); - RB_FOREACH(child, dircache_tree, &dc->dc_children) { - if (!RB_EMPTY(&child->dc_children)) { - dchold = 0; - dropped = dc_parentinterlock(dc, child, - &dchold); - if (dchold != 0) - dc_droplocked(dc); - else - dc_unlock(dc); - if (dropped != 0) - goto restart; - dc = child; - DCDEBUG("uninit: go down: %p %s\n", - dc, dc->dc_name); + dr_assertlock(dr, MA_OWNED); + RB_FOREACH(child, dircache_tree, &dr->dr_children) { + childref = child->dc_selfref; + dr_lock(childref); + if (!RB_EMPTY(&childref->dr_children)) { + dr_unlock(dr); + dr = childref; + DCDEBUG("uninit: go down: ref=%p %s\n", + childref, child->dc_name); goto nested; } + dr_unlock(childref); } - child = dc; - dc = dc->dc_parent; - if (dc != NULL) - dc_hold(dc); - dc_hold(child); - dc_removechildren(child); - dc_drop(child); - if (dc != NULL) { - dc_lock(dc); - if (dc_dropsafe(dc) != 0) + childref = dr; + dr = dr_parentref(dr); + dr_removechildren(childref); + if (dr != NULL) { + if (dr_trylock(dr) == 0) { + dr_unlock(childref); goto restart; - DCDEBUG("uninit: go up: %p %s\n", dc, dc->dc_name); - } + } + dr_unlock(childref); + DCDEBUG("uninit: go up: ref=%p\n", dr); + } else + dr_unlock(childref); } - if (dc == NULL) { - dc = LIST_FIRST(&dm->dm_rootref->dr_entries); - MPASS(LIST_NEXT(dc, dc_reflist) == NULL); - dc_lock(dc); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:39 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 682A81065DAC; Wed, 28 Jul 2010 08:21: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 3847B1065D14 for ; Wed, 28 Jul 2010 08:21:36 +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 5EDFA8FC21 for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LaSg009157 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LaSo009155 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from trasz@freebsd.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8LaSo009155@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 Precedence: bulk Cc: Subject: PERFORCE change 181469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:39 -0000 http://p4web.freebsd.org/@@181469?ac=10 Change 181469 by trasz@trasz_victim on 2010/07/26 17:24:54 Implement RUSAGE_CORE. Affected files ... .. //depot/projects/soc2009/trasz_limits/TODO#18 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#14 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#21 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#15 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/TODO#18 (text+ko) ==== @@ -5,6 +5,7 @@ - maximum file size (RUSAGE_FSIZE), in megabytes - number of processes (RUSAGE_NPROC) - virtual memory usage (address space limit) (RUSAGE_VMEM), in megabytes + - maximum core size (RUSAGE_CORE), in megabytes (core, as in ELF program state dump) Limits to do: @@ -16,7 +17,6 @@ - swap usage (RUSAGE_SWAP), in megabytes - number of file descriptors (RUSAGE_NOFILE) - amount of memory consumed by socket buffers (RUSAGE_SBSIZE), in megabytes - - maximum core size (RUSAGE_CORE), in megabytes (core, as in ELF program state dump) Milestone 2: ==== //depot/projects/soc2009/trasz_limits/sys/kern/imgact_elf.c#14 (text+ko) ==== @@ -35,6 +35,7 @@ #include "opt_core.h" #include +#include #include #include #include @@ -1103,6 +1104,12 @@ hdrsize = 0; __elfN(puthdr)(td, (void *)NULL, &hdrsize, seginfo.count); +#ifdef CONTAINERS + if (rusage_add(td->td_proc, RUSAGE_CORE, hdrsize + seginfo.size)) { + error = EFAULT; + goto done; + } +#endif if (hdrsize + seginfo.size >= limit) { error = EFAULT; goto done; ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#21 (text+ko) ==== @@ -62,6 +62,7 @@ switch (resource) { case RUSAGE_CPU: + case RUSAGE_CORE: return (0); default: return (1); @@ -74,6 +75,7 @@ switch (resource) { case RUSAGE_CPU: + case RUSAGE_CORE: case RUSAGE_NPROC: return (0); default: @@ -391,10 +393,8 @@ #ifdef HRL if (diff > 0) { error = hrl_enforce_proc(p, resource, diff); - if (error) { - mtx_unlock(&container_lock); + if (error) return (error); - } } #endif container_alloc_resource(&p->p_container, resource, diff); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#15 (text+ko) ==== @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -3209,7 +3210,12 @@ */ limit = (off_t)lim_cur(p, RLIMIT_CORE); PROC_UNLOCK(p); +#ifdef CONTAINERS + if (limit == 0 && rusage_add(td->td_proc, RUSAGE_CORE, 1) == 0) { + rusage_sub(td->td_proc, RUSAGE_CORE, 1); +#else if (limit == 0) { +#endif #ifdef AUDIT audit_proc_coredump(td, name, EFBIG); #endif From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A80F1065F16; Wed, 28 Jul 2010 08:21: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 E0CD81065741 for ; Wed, 28 Jul 2010 08:21:37 +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 A1F5B8FC23 for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LaIn009167 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8La5s009165 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8La5s009165@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 Precedence: bulk Cc: Subject: PERFORCE change 181471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:41 -0000 http://p4web.freebsd.org/@@181471?ac=10 Change 181471 by hselasky@hselasky_laptop001 on 2010/07/26 23:07:10 USB devices: - correct some device names - patch by: Dmitry Luhtionov Reviewed by: hselasky @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#130 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#34 (text+ko) ==== @@ -449,8 +449,9 @@ USB_QUIRK(ACTIONS, MP4, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ASUS, GMSC, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(UNKNOWN4, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(UNKNOWN5, USB2IDEBRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(CHIPSBANK, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(CHIPSBANK, USBMEMSTICK1, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), + USB_QUIRK(NEWLINK, USB2IDEBRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), }; #undef USB_QUIRK_VP #undef USB_QUIRK ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#130 (text+ko) ==== @@ -58,7 +58,7 @@ vendor UNKNOWN1 0x0053 Unknown vendor vendor UNKNOWN2 0x0105 Unknown vendor vendor EGALAX2 0x0123 eGalax, Inc. -vendor UNKNOWN4 0x0204 Unknown vendor +vendor CHIPSBANK 0x0204 Chipsbank Microelectronics Co. vendor HUMAX 0x02ad HUMAX vendor LTS 0x0386 LTS vendor BWCT 0x03da Bernd Walter Computer Technology @@ -400,7 +400,7 @@ vendor ALLIEDCABLE 0x07e6 Allied Cable vendor STSN 0x07ef STSN vendor CENTURY 0x07f7 Century Corp -vendor UNKNOWN5 0x07ff Unknown +vendor NEWLINK 0x07ff NEWlink vendor ZOOM 0x0803 Zoom Telephonics vendor PCS 0x0810 Personal Communication Systems vendor ALPHASMART 0x081e AlphaSmart, Inc. @@ -1241,6 +1241,10 @@ product CSR BT_DONGLE 0x0001 Bluetooth USB dongle product CSR CSRDFU 0xffff USB Bluetooth Device in DFU State +/* Chipsbank Microelectronics Co., Ltd */ +product CHIPSBANK USBMEMSTICK 0x6025 CBM2080 Flash drive controller +product CHIPSBANK USBMEMSTICK1 0x6026 CBM1180 Flash drive controller + /* CTX products */ product CTX EX1300 0x9999 Ex1300 hub @@ -2198,6 +2202,9 @@ product NETGEAR3 WPN111_NF 0x5f01 WPN111 (no firmware) product NETGEAR3 WPN111_2 0x5f02 WPN111 +/* NEWlink */ +product NEWLINK USB2IDEBRIDGE 0x00ff USB 2.0 Hard Drive Enclosure + /* Nikon products */ product NIKON E990 0x0102 Digital Camera E990 product NIKON LS40 0x4000 CoolScan LS40 ED @@ -3049,12 +3056,6 @@ /* Universal Access products */ product UNIACCESS PANACHE 0x0101 Panache Surf USB ISDN Adapter -/* Unknown vendors */ -product UNKNOWN4 USBMEMSTICK 0x6025 Flash Disk CBM - -/* Unknown vendors */ -product UNKNOWN5 USB2IDEBRIDGE 0x00ff USB 2.0 ATA/SATA Bridge - /* U.S. Robotics products */ product USR USR5422 0x0118 USR5422 WLAN product USR USR5423 0x0121 USR5423 WLAN From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 373B21065F24; Wed, 28 Jul 2010 08:21: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 2E86910657AA for ; Wed, 28 Jul 2010 08:21: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 D6A548FC16 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8Lb3F009207 for ; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8Lbgb009205 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:37 GMT Message-Id: <201007280821.o6S8Lbgb009205@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 Precedence: bulk Cc: Subject: PERFORCE change 181479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:41 -0000 http://p4web.freebsd.org/@@181479?ac=10 Change 181479 by hselasky@hselasky_laptop001 on 2010/07/27 16:00:11 Add new USB device entries. Fix spelling on an old one. - patch by: Dmitry Luhtionov Reviewed by: hselasky @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#131 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#131 (text+ko) ==== @@ -1544,7 +1544,8 @@ /* Genesys Logic products */ product GENESYS GL620USB 0x0501 GL620USB Host-Host interface -product GENESYS GL650 0x0604 GL650 Hub +product GENESYS GL650 0x0604 GL650 HUB +product GENESYS GL606 0x0606 USB 2.0 HUB product GENESYS GL641USB 0x0700 GL641USB CompactFlash Card Reader product GENESYS GL641USB2IDE_2 0x0701 GL641USB USB-IDE Bridge No 2 product GENESYS GL641USB2IDE 0x0702 GL641USB USB-IDE Bridge @@ -2159,6 +2160,7 @@ /* Myson products */ product MYSON HEDEN_8813 0x8813 USB-IDE product MYSON HEDEN 0x8818 USB-IDE +product MYSON HUBREADER 0x8819 COMBO Card reader with USB HUB product MYSON STARREADER 0x9920 USB flash card adapter /* National Semiconductor */ From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 772221065F64; Wed, 28 Jul 2010 08:21: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 67BEB1065DAB for ; Wed, 28 Jul 2010 08:21:39 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 77FD18FC29 for ; Wed, 28 Jul 2010 08:21:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LcGh009222 for ; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LcDP009220 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from bfiedler@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:38 GMT Message-Id: <201007280821.o6S8LcDP009220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:41 -0000 http://p4web.freebsd.org/@@181482?ac=10 Change 181482 by bfiedler@freebsd-7803 on 2010/07/27 20:48:20 Add diff3 base from OpenBSD Affected files ... .. //depot/projects/soc2010/bsdtextproc/diff3/Makefile#1 add .. //depot/projects/soc2010/bsdtextproc/diff3/diff3.1#1 add .. //depot/projects/soc2010/bsdtextproc/diff3/diff3.ksh#1 add .. //depot/projects/soc2010/bsdtextproc/diff3/diff3prog.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:44 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 951AB10660F3; Wed, 28 Jul 2010 08:21: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 65C131065DA6 for ; Wed, 28 Jul 2010 08:21:39 +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 5928D8FC28 for ; Wed, 28 Jul 2010 08:21:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LcVO009217 for ; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LcLW009215 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from trasz@freebsd.org) Date: Wed, 28 Jul 2010 08:21:38 GMT Message-Id: <201007280821.o6S8LcLW009215@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 Precedence: bulk Cc: Subject: PERFORCE change 181481 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:44 -0000 http://p4web.freebsd.org/@@181481?ac=10 Change 181481 by trasz@trasz_victim on 2010/07/27 20:03:12 Enforce RLIMIT_MEMLOCK. Doesn't support MCL_FUTURE. This will be redone after the resource limit gets moved into vm_map_wire(). Affected files ... .. //depot/projects/soc2009/trasz_limits/TODO#19 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#22 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#7 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#12 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/TODO#19 (text+ko) ==== @@ -6,6 +6,7 @@ - number of processes (RUSAGE_NPROC) - virtual memory usage (address space limit) (RUSAGE_VMEM), in megabytes - maximum core size (RUSAGE_CORE), in megabytes (core, as in ELF program state dump) + - locked memory usage (RUSAGE_MEMLOCK), in megabytes Limits to do: @@ -13,7 +14,6 @@ - stack size (RUSAGE_STACK), in megabytes, - resident set size (physical memory usage) (RUSAGE_RSS), in megabytes - - locked memory usage (RUSAGE_MEMLOCK), in megabytes - swap usage (RUSAGE_SWAP), in megabytes - number of file descriptors (RUSAGE_NOFILE) - amount of memory consumed by socket buffers (RUSAGE_SBSIZE), in megabytes ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#22 (text+ko) ==== @@ -76,6 +76,7 @@ switch (resource) { case RUSAGE_CPU: case RUSAGE_CORE: + case RUSAGE_MEMLOCK: case RUSAGE_NPROC: return (0); default: ==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_glue.c#7 (text+ko) ==== @@ -65,6 +65,7 @@ #include #include +#include #include #include #include @@ -184,6 +185,7 @@ vslock(void *addr, size_t len) { vm_offset_t end, last, start; + unsigned long nsize; vm_size_t npages; int error; @@ -196,13 +198,17 @@ if (npages > vm_page_max_wired) return (ENOMEM); PROC_LOCK(curproc); - if (ptoa(npages + - pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))) > - lim_cur(curproc, RLIMIT_MEMLOCK)) { + nsize = ptoa(npages + + pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map))); + if (nsize > lim_cur(curproc, RLIMIT_MEMLOCK)) { PROC_UNLOCK(curproc); return (ENOMEM); } PROC_UNLOCK(curproc); +#ifdef CONTAINERS + if (rusage_set(curproc, RUSAGE_MEMLOCK, nsize)) + return (ENOMEM); +#endif #if 0 /* * XXX - not yet @@ -218,6 +224,11 @@ #endif error = vm_map_wire(&curproc->p_vmspace->vm_map, start, end, VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES); +#ifdef CONTAINERS + if (error != KERN_SUCCESS) + rusage_sub(curproc, RUSAGE_MEMLOCK, + ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map)))); +#endif /* * Return EFAULT on error to match copy{in,out}() behaviour * rather than returning ENOMEM like mlock() would. @@ -233,6 +244,11 @@ (void)vm_map_unwire(&curproc->p_vmspace->vm_map, trunc_page((vm_offset_t)addr), round_page((vm_offset_t)addr + len), VM_MAP_WIRE_SYSTEM | VM_MAP_WIRE_NOHOLES); + +#ifdef CONTAINERS + rusage_set(curproc, RUSAGE_MEMLOCK, + ptoa(pmap_wired_count(vm_map_pmap(&curproc->p_vmspace->vm_map)))); +#endif } /* ==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#12 (text+ko) ==== @@ -46,6 +46,7 @@ #include "opt_compat.h" #include "opt_hwpmc_hooks.h" +#include #include #include #include @@ -1022,6 +1023,7 @@ struct proc *proc; vm_offset_t addr, end, last, start; vm_size_t npages, size; + unsigned long nsize; int error; error = priv_check(td, PRIV_VM_MLOCK); @@ -1039,17 +1041,26 @@ return (ENOMEM); proc = td->td_proc; PROC_LOCK(proc); - if (ptoa(npages + - pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map))) > - lim_cur(proc, RLIMIT_MEMLOCK)) { + nsize = ptoa(npages + + pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map))); + if (nsize > lim_cur(proc, RLIMIT_MEMLOCK)) { PROC_UNLOCK(proc); return (ENOMEM); } PROC_UNLOCK(proc); if (npages + cnt.v_wire_count > vm_page_max_wired) return (EAGAIN); +#ifdef CONTAINERS + if (rusage_set(proc, RUSAGE_MEMLOCK, nsize)) + return (ENOMEM); +#endif error = vm_map_wire(&proc->p_vmspace->vm_map, start, end, VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES); +#ifdef CONTAINERS + if (error != KERN_SUCCESS) + rusage_set(proc, RUSAGE_MEMLOCK, + ptoa(pmap_wired_count(vm_map_pmap(&proc->p_vmspace->vm_map)))); +#endif return (error == KERN_SUCCESS ? 0 : ENOMEM); } @@ -1082,8 +1093,7 @@ * a hard resource limit, return ENOMEM. */ PROC_LOCK(td->td_proc); - if (map->size - ptoa(pmap_wired_count(vm_map_pmap(map)) > - lim_cur(td->td_proc, RLIMIT_MEMLOCK))) { + if (map->size > lim_cur(td->td_proc, RLIMIT_MEMLOCK)) { PROC_UNLOCK(td->td_proc); return (ENOMEM); } @@ -1093,6 +1103,10 @@ if (error) return (error); #endif +#ifdef CONTAINERS + if (rusage_set(td->td_proc, RUSAGE_MEMLOCK, map->size)) + return (ENOMEM); +#endif if (uap->how & MCL_FUTURE) { vm_map_lock(map); @@ -1112,6 +1126,11 @@ VM_MAP_WIRE_USER|VM_MAP_WIRE_HOLESOK); error = (error == KERN_SUCCESS ? 0 : EAGAIN); } +#ifdef CONTAINERS + if (error != KERN_SUCCESS) + rusage_set(td->td_proc, RUSAGE_MEMLOCK, + ptoa(pmap_wired_count(vm_map_pmap(&td->td_proc->p_vmspace->vm_map)))); +#endif return (error); } @@ -1146,6 +1165,10 @@ /* Forcibly unwire all pages. */ error = vm_map_unwire(map, vm_map_min(map), vm_map_max(map), VM_MAP_WIRE_USER|VM_MAP_WIRE_HOLESOK); +#ifdef CONTAINERS + if (error == KERN_SUCCESS) + rusage_set(td->td_proc, RUSAGE_MEMLOCK, 0); +#endif return (error); } @@ -1180,6 +1203,10 @@ return (EINVAL); error = vm_map_unwire(&td->td_proc->p_vmspace->vm_map, start, end, VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES); +#ifdef CONTAINERS + if (error == KERN_SUCCESS) + rusage_sub(td->td_proc, RUSAGE_MEMLOCK, ptoa(end - start)); +#endif return (error == KERN_SUCCESS ? 0 : ENOMEM); } From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AD9F106624F; Wed, 28 Jul 2010 08:21: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 353C51065F21 for ; Wed, 28 Jul 2010 08:21:41 +0000 (UTC) (envelope-from kibab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1E228FC18 for ; Wed, 28 Jul 2010 08:21:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LdoX009262 for ; Wed, 28 Jul 2010 08:21:39 GMT (envelope-from kibab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LdPa009260 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:39 GMT (envelope-from kibab@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:39 GMT Message-Id: <201007280821.o6S8LdPa009260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kibab@FreeBSD.org using -f From: Ilya Bakulin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:46 -0000 http://p4web.freebsd.org/@@181489?ac=10 Change 181489 by kibab@kibab_kibab-nb on 2010/07/28 06:08:40 A set of debugging-related features. Affected files ... .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_dtrace.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ktr.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ktrace.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_lock.c#2 edit .. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_prot.c#2 edit Differences ... ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_dtrace.c#2 (text+ko) ==== @@ -37,12 +37,15 @@ #include #include #include +#include #define KDTRACE_PROC_SIZE 64 #define KDTRACE_PROC_ZERO 8 #define KDTRACE_THREAD_SIZE 256 #define KDTRACE_THREAD_ZERO 64 +FEATURE(kdtrace_hooks, "Kernel DTrace hooks which are required to load DTrace kernel modules"); + MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks"); /* Return the DTrace process data size compiled in the kernel hooks. */ ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ktr.c#2 (text+ko) ==== @@ -80,6 +80,8 @@ #define KTR_CPU PCPU_GET(cpuid) #endif +FEATURE(ktr, "Kernel support for KTR kernel tracing facility"); + SYSCTL_NODE(_debug, OID_AUTO, ktr, CTLFLAG_RD, 0, "KTR options"); int ktr_cpumask = KTR_CPUMASK; ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ktrace.c#2 (text+ko) ==== @@ -83,6 +83,8 @@ #ifdef KTRACE +FEATURE(ktrace, "Kernel support for system-call tracing"); + #ifndef KTRACE_REQUEST_POOL #define KTRACE_REQUEST_POOL 100 #endif ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_lock.c#2 (text+ko) ==== @@ -1272,6 +1272,8 @@ } #ifdef INVARIANT_SUPPORT +FEATURE(invariant_support, "Support for modules compiled with INVARIANTS option"); + #ifndef INVARIANTS #undef _lockmgr_assert #endif ==== //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_prot.c#2 (text+ko) ==== @@ -69,6 +69,10 @@ #include #include +#ifdef REGRESSION +FEATURE(regression, "Kernel support for interfaces nessesary for regression testing (SECURITY RISK!)"); +#endif + #if defined(INET) || defined(INET6) #include #include From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF87B106632C; Wed, 28 Jul 2010 08:21: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 E26E21065742 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D48458FC14 for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LavF009172 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LaJX009170 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from bfiedler@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8LaJX009170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:47 -0000 http://p4web.freebsd.org/@@181472?ac=10 Change 181472 by bfiedler@freebsd-home on 2010/07/27 01:54:13 IFC Affected files ... .. //depot/projects/soc2010/bsdtextproc/src/bin/ps/keyword.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/bin/ps/ps.1#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/arm/s3c2xx0/s3c24x0.c#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/arm/s3c2xx0/s3c24x0reg.h#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/conf/files#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_cllock.c#2 delete .. //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clnfsiod.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clsubs.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clvnops.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_lock.h#2 delete .. //depot/projects/soc2010/bsdtextproc/src/sys/mips/include/vmparam.h#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/modules/Makefile#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/modules/nfscl/Makefile#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/modules/nfslock/Makefile#1 branch .. //depot/projects/soc2010/bsdtextproc/src/sys/nfs/nfs_lock.c#1 branch .. //depot/projects/soc2010/bsdtextproc/src/sys/nfs/nfs_lock.h#1 branch .. //depot/projects/soc2010/bsdtextproc/src/sys/nfsclient/nfs_lock.c#2 delete .. //depot/projects/soc2010/bsdtextproc/src/sys/nfsclient/nfs_lock.h#2 delete .. //depot/projects/soc2010/bsdtextproc/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/sys/imgact.h#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/sys/ktr.h#3 integrate .. //depot/projects/soc2010/bsdtextproc/src/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#2 integrate .. //depot/projects/soc2010/bsdtextproc/src/usr.sbin/rpc.lockd/kern.c#2 integrate Differences ... ==== //depot/projects/soc2010/bsdtextproc/src/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.82 2010/03/17 22:57:58 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.83 2010/07/24 15:37:36 trasz Exp $"); #include #include @@ -90,7 +90,7 @@ NULL, 0}, {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0}, {"etimes", "ELAPSED", NULL, USER, elapseds, NULL, 12, 0, CHAR, NULL, 0}, - {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, + {"f", "F", NULL, 0, kvar, NULL, 8, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"inblk", "INBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG, @@ -187,7 +187,7 @@ UINT, UIDFMT, 0}, {"svuid", "SVUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_svuid), UINT, UIDFMT, 0}, - {"tdev", "TDEV", NULL, 0, tdev, NULL, 4, 0, CHAR, NULL, 0}, + {"tdev", "TDEV", NULL, 0, tdev, NULL, 5, 0, CHAR, NULL, 0}, {"tdnam", "TDNAM", NULL, LJUST, tdnam, NULL, COMMLEN, 0, CHAR, NULL, 0}, {"time", "TIME", NULL, USER, cputime, NULL, 9, 0, CHAR, NULL, 0}, {"tpgid", "TPGID", NULL, 0, kvar, NULL, 4, KOFF(ki_tpgid), UINT, ==== //depot/projects/soc2010/bsdtextproc/src/bin/ps/ps.1#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.95 2010/04/13 08:54:53 kib Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.96 2010/07/24 15:24:12 trasz Exp $ .\" -.Dd April 13, 2010 +.Dd July 24, 2010 .Dt PS 1 .Os .Sh NAME @@ -291,6 +291,7 @@ .It Dv "P_PPWAIT" Ta No "0x00010 Parent is waiting for child to exec/exit" .It Dv "P_PROFIL" Ta No "0x00020 Has started profiling" .It Dv "P_STOPPROF" Ta No "0x00040 Has thread in requesting to stop prof" +.It Dv "P_HASTHREADS" Ta No "0x00080 Has had threads (no cleanup shortcuts)" .It Dv "P_SUGID" Ta No "0x00100 Had set id privileges since last exec" .It Dv "P_SYSTEM" Ta No "0x00200 System proc: no sigs, stats or swapping" .It Dv "P_SINGLE_EXIT" Ta No "0x00400 Threads suspending should exit, not wait" ==== //depot/projects/soc2010/bsdtextproc/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#2 (text+ko) ==== @@ -644,7 +644,7 @@ } #if !defined(sun) - if (ddata->d_buf == NULL) { + if (ddata->d_buf == NULL && sdata->d_buf != NULL) { ddata->d_buf = xmalloc(shdr.sh_size); bcopy(sdata->d_buf, ddata->d_buf, shdr.sh_size); } ==== //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.56 2010/07/23 18:58:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.57 2010/07/23 21:30:33 kib Exp $"); #include #include @@ -64,6 +64,7 @@ #include #include +#include #include #include #include @@ -107,103 +108,6 @@ return (lsa); } -/* - * Custom version of exec_copyin_args() so that we can translate - * the pointers. - */ -static int -linux_exec_copyin_args(struct image_args *args, char *fname, - enum uio_seg segflg, char **argv, char **envv) -{ - char *argp, *envp; - u_int32_t *p32, arg; - size_t length; - int error; - - bzero(args, sizeof(*args)); - if (argv == NULL) - return (EFAULT); - - /* - * Allocate temporary demand zeroed space for argument and - * environment strings - */ - args->buf = (char *)kmem_alloc_wait(exec_map, - PATH_MAX + ARG_MAX + MAXSHELLCMDLEN); - if (args->buf == NULL) - return (ENOMEM); - args->begin_argv = args->buf; - args->endp = args->begin_argv; - args->stringspace = ARG_MAX; - - args->fname = args->buf + ARG_MAX; - - /* - * Copy the file name. - */ - error = (segflg == UIO_SYSSPACE) ? - copystr(fname, args->fname, PATH_MAX, &length) : - copyinstr(fname, args->fname, PATH_MAX, &length); - if (error != 0) - goto err_exit; - - /* - * extract arguments first - */ - p32 = (u_int32_t *)argv; - for (;;) { - error = copyin(p32++, &arg, sizeof(arg)); - if (error) - goto err_exit; - if (arg == 0) - break; - argp = PTRIN(arg); - error = copyinstr(argp, args->endp, args->stringspace, &length); - if (error) { - if (error == ENAMETOOLONG) - error = E2BIG; - - goto err_exit; - } - args->stringspace -= length; - args->endp += length; - args->argc++; - } - - args->begin_envv = args->endp; - - /* - * extract environment strings - */ - if (envv) { - p32 = (u_int32_t *)envv; - for (;;) { - error = copyin(p32++, &arg, sizeof(arg)); - if (error) - goto err_exit; - if (arg == 0) - break; - envp = PTRIN(arg); - error = copyinstr(envp, args->endp, args->stringspace, - &length); - if (error) { - if (error == ENAMETOOLONG) - error = E2BIG; - goto err_exit; - } - args->stringspace -= length; - args->endp += length; - args->envc++; - } - } - - return (0); - -err_exit: - exec_free_args(args); - return (error); -} - int linux_execve(struct thread *td, struct linux_execve_args *args) { @@ -218,8 +122,8 @@ printf(ARGS(execve, "%s"), path); #endif - error = linux_exec_copyin_args(&eargs, path, UIO_SYSSPACE, args->argp, - args->envp); + error = freebsd32_exec_copyin_args(&eargs, path, UIO_SYSSPACE, + args->argp, args->envp); free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); ==== //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.41 2010/07/23 21:31:03 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib */ #ifndef _LINUX_SYSPROTO_H_ @@ -59,8 +59,8 @@ }; struct linux_execve_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)]; - char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)]; + char argp_l_[PADL_(u_int32_t *)]; u_int32_t * argp; char argp_r_[PADR_(u_int32_t *)]; + char envp_l_[PADL_(u_int32_t *)]; u_int32_t * envp; char envp_r_[PADR_(u_int32_t *)]; }; struct linux_chdir_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; ==== //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.39 2008/11/29 14:57:58 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.40 2010/07/23 21:31:03 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.41 2010/06/28 18:17:21 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.42 2010/07/23 21:31:03 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib */ #include "opt_compat.h" ==== //depot/projects/soc2010/bsdtextproc/src/sys/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.37 2010/07/23 21:30:33 kib Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -54,8 +54,8 @@ l_int mode); } 9 AUE_LINK STD { int linux_link(char *path, char *to); } 10 AUE_UNLINK STD { int linux_unlink(char *path); } -11 AUE_EXECVE STD { int linux_execve(char *path, char **argp, \ - char **envp); } +11 AUE_EXECVE STD { int linux_execve(char *path, u_int32_t *argp, \ + u_int32_t *envp); } 12 AUE_CHDIR STD { int linux_chdir(char *path); } 13 AUE_NULL STD { int linux_time(l_time_t *tm); } 14 AUE_MKNOD STD { int linux_mknod(char *path, l_int mode, \ ==== //depot/projects/soc2010/bsdtextproc/src/sys/arm/s3c2xx0/s3c24x0.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/s3c2xx0/s3c24x0.c,v 1.3 2010/07/22 23:23:39 andrew Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/s3c2xx0/s3c24x0.c,v 1.4 2010/07/24 23:41:09 andrew Exp $"); #include #include @@ -118,6 +118,8 @@ driver_filter_t *, driver_intr_t *, void *, void **); static int s3c24x0_teardown_intr(device_t, device_t, struct resource *, void *); +static int s3c24x0_config_intr(device_t, int, enum intr_trigger, + enum intr_polarity); static struct resource *s3c24x0_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); static int s3c24x0_activate_resource(device_t, device_t, int, int, @@ -134,6 +136,7 @@ DEVMETHOD(device_identify, s3c24x0_identify), DEVMETHOD(bus_setup_intr, s3c24x0_setup_intr), DEVMETHOD(bus_teardown_intr, s3c24x0_teardown_intr), + DEVMETHOD(bus_config_intr, s3c24x0_config_intr), DEVMETHOD(bus_alloc_resource, s3c24x0_alloc_resource), DEVMETHOD(bus_activate_resource, s3c24x0_activate_resource), DEVMETHOD(bus_release_resource, s3c24x0_release_resource), @@ -176,6 +179,30 @@ return (child); } +static void +s3c24x0_enable_ext_intr(unsigned int irq) +{ + uint32_t reg, value; + int offset; + + if (irq <= 7) { + reg = GPIO_PFCON; + offset = irq * 2; + } else if (irq <= 23) { + reg = GPIO_PGCON; + offset = (irq - 8) * 2; + } else + return; + + /* Make the pin an interrupt source */ + value = bus_space_read_4(s3c2xx0_softc->sc_iot, + s3c2xx0_softc->sc_gpio_ioh, reg); + value &= ~(3 << offset); + value |= 2 << offset; + bus_space_write_4(s3c2xx0_softc->sc_iot, s3c2xx0_softc->sc_gpio_ioh, + reg, value); +} + static int s3c24x0_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_filter_t *filt, @@ -189,6 +216,10 @@ return (error); for (irq = rman_get_start(ires); irq <= rman_get_end(ires); irq++) { + if (irq >= S3C24X0_EXTIRQ_MIN && irq <= S3C24X0_EXTIRQ_MAX) { + /* Enable the external interrupt pin */ + s3c24x0_enable_ext_intr(irq - S3C24X0_EXTIRQ_MIN); + } arm_unmask_irq(irq); } return (0); @@ -201,6 +232,59 @@ return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } +static int +s3c24x0_config_intr(device_t dev, int irq, enum intr_trigger trig, + enum intr_polarity pol) +{ + uint32_t mask, reg, value; + int offset; + + /* Only external interrupts can be configured */ + if (irq < S3C24X0_EXTIRQ_MIN || irq > S3C24X0_EXTIRQ_MAX) + return (EINVAL); + + /* There is no standard trigger or polarity for the bus */ + if (trig == INTR_TRIGGER_CONFORM || pol == INTR_POLARITY_CONFORM) + return (EINVAL); + + irq -= S3C24X0_EXTIRQ_MIN; + + /* Get the bits to set */ + mask = 0; + if (pol == INTR_POLARITY_LOW) { + mask = 2; + } else if (pol == INTR_POLARITY_HIGH) { + mask = 4; + } + if (trig == INTR_TRIGGER_LEVEL) { + mask >>= 2; + } + + /* Get the register to set */ + if (irq <= 7) { + reg = GPIO_EXTINT(0); + offset = irq * 4; + } else if (irq <= 15) { + reg = GPIO_EXTINT(1); + offset = (irq - 8) * 4; + } else if (irq <= 23) { + reg = GPIO_EXTINT(2); + offset = (irq - 16) * 4; + } else { + return (EINVAL); + } + + /* Set the new signaling method */ + value = bus_space_read_4(s3c2xx0_softc->sc_iot, + s3c2xx0_softc->sc_gpio_ioh, reg); + value &= ~(7 << offset); + value |= mask << offset; + bus_space_write_4(s3c2xx0_softc->sc_iot, + s3c2xx0_softc->sc_gpio_ioh, reg, value); + + return (0); +} + static struct resource * s3c24x0_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -356,6 +440,7 @@ bus_space_tag_t iot; device_t child; unsigned int i, j; + u_long irqmax; s3c2xx0_softc = &(sc->sc_sx); sc->sc_sx.sc_iot = iot = &s3c2xx0_bs_tag; @@ -363,10 +448,6 @@ s3c2xx0_softc->s3c2xx0_irq_rman.rm_descr = "S3C24X0 IRQs"; s3c2xx0_softc->s3c2xx0_mem_rman.rm_type = RMAN_ARRAY; s3c2xx0_softc->s3c2xx0_mem_rman.rm_descr = "S3C24X0 Device Registers"; - if (rman_init(&s3c2xx0_softc->s3c2xx0_irq_rman) != 0 || - rman_manage_region(&s3c2xx0_softc->s3c2xx0_irq_rman, 0, - S3C2410_SUBIRQ_MAX) != 0) /* XXX Change S3C2440_SUBIRQ_MAX depending on micro */ - panic("s3c24x0_attach: failed to set up IRQ rman"); /* Manage the registor memory space */ if ((rman_init(&s3c2xx0_softc->s3c2xx0_mem_rman) != 0) || (rman_manage_region(&s3c2xx0_softc->s3c2xx0_mem_rman, @@ -388,6 +469,22 @@ */ s3c24x0_identify_cpu(dev); + /* + * Manage the interrupt space. + * We need to put this after s3c24x0_identify_cpu as the avaliable + * interrupts change depending on which CPU we have. + */ + if (sc->sc_sx.sc_cpu == CPU_S3C2410) + irqmax = S3C2410_SUBIRQ_MAX; + else + irqmax = S3C2440_SUBIRQ_MAX; + if (rman_init(&s3c2xx0_softc->s3c2xx0_irq_rman) != 0 || + rman_manage_region(&s3c2xx0_softc->s3c2xx0_irq_rman, 0, + irqmax) != 0 || + rman_manage_region(&s3c2xx0_softc->s3c2xx0_irq_rman, + S3C24X0_EXTIRQ_MIN, S3C24X0_EXTIRQ_MAX)) + panic("s3c24x0_attach: failed to set up IRQ rman"); + /* calculate current clock frequency */ s3c24x0_clock_freq(&sc->sc_sx); device_printf(dev, "fclk %d MHz hclk %d MHz pclk %d MHz\n", @@ -607,6 +704,33 @@ return (irq); return (S3C24X0_SUBIRQ_MIN + subirq); + + case S3C24X0_INT_0: + case S3C24X0_INT_1: + case S3C24X0_INT_2: + case S3C24X0_INT_3: + /* There is a 1:1 mapping to the IRQ we are handling */ + return S3C24X0_INT_EXT(irq); + + case S3C24X0_INT_4_7: + case S3C24X0_INT_8_23: + /* Find the external interrupt being called */ + subirq = 0x7fffff; + subirq &= bus_space_read_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTPEND); + subirq &= ~bus_space_read_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK); + if (subirq == 0) + return (irq); + + subirq = ffs(subirq) - 1; + + /* Clear the external irq pending bit */ + bus_space_write_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTPEND, + (1 << subirq)); + + return S3C24X0_INT_EXT(subirq); } return (irq); @@ -619,18 +743,28 @@ { u_int32_t mask; + if (irq >= S3C24X0_INT_EXT(0) && irq <= S3C24X0_INT_EXT(3)) { + /* External interrupt 0..3 are directly mapped to irq 0..3 */ + irq -= S3C24X0_EXTIRQ_MIN; + } if (irq < S3C24X0_SUBIRQ_MIN) { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK); mask |= (1 << irq); bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK, mask); - } else { + } else if (irq < S3C24X0_EXTIRQ_MIN) { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK); mask |= (1 << (irq - S3C24X0_SUBIRQ_MIN)); bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK, mask); + } else { + mask = bus_space_read_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK); + mask |= (1 << (irq - S3C24X0_EXTIRQ_MIN)); + bus_space_write_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_intctl_ioh, GPIO_EINTMASK, mask); } } @@ -639,17 +773,27 @@ { u_int32_t mask; + if (irq >= S3C24X0_INT_EXT(0) && irq <= S3C24X0_INT_EXT(3)) { + /* External interrupt 0..3 are directly mapped to irq 0..3 */ + irq -= S3C24X0_EXTIRQ_MIN; + } if (irq < S3C24X0_SUBIRQ_MIN) { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK); mask &= ~(1 << irq); bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK, mask); - } else { + } else if (irq < S3C24X0_EXTIRQ_MIN) { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK); mask &= ~(1 << (irq - S3C24X0_SUBIRQ_MIN)); bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK, mask); + } else { + mask = bus_space_read_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_gpio_ioh, GPIO_EINTMASK); + mask &= ~(1 << (irq - S3C24X0_EXTIRQ_MIN)); + bus_space_write_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_intctl_ioh, GPIO_EINTMASK, mask); } } ==== //depot/projects/soc2010/bsdtextproc/src/sys/arm/s3c2xx0/s3c24x0reg.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/s3c2xx0/s3c24x0reg.h,v 1.3 2010/07/22 23:23:39 andrew Exp $ + * $FreeBSD: src/sys/arm/s3c2xx0/s3c24x0reg.h,v 1.4 2010/07/24 23:41:09 andrew Exp $ */ @@ -207,7 +207,10 @@ #define S3C24X0_INT_BFLT 7 /* Battery fault */ #define S3C24X0_INT_8_23 5 /* Ext int 8..23 */ #define S3C24X0_INT_4_7 4 /* Ext int 4..7 */ -#define S3C24X0_INT_EXT(n) (n) /* External interrupt [3:0] for 24{1,4}0 */ +#define S3C24X0_INT_3 3 +#define S3C24X0_INT_2 2 +#define S3C24X0_INT_1 1 +#define S3C24X0_INT_0 0 /* 24{1,4}0 has more than 32 interrupt sources. These are sub-sources * that are OR-ed into main interrupt sources, and controlled via @@ -230,6 +233,15 @@ #define S3C24X0_INT_TXD0 (S3C24X0_SUBIRQ_MIN+1) /* UART0 Tx */ #define S3C24X0_INT_RXD0 (S3C24X0_SUBIRQ_MIN+0) /* UART0 Rx */ +/* + * Support for external interrupts. We use values from 48 + * to allow new CPU's to allocate new subirq's. + */ +#define S3C24X0_EXTIRQ_MIN 48 +#define S3C24X0_EXTIRQ_COUNT 24 +#define S3C24X0_EXTIRQ_MAX (S3C24X0_EXTIRQ_MIN + S3C24X0_EXTIRQ_COUNT - 1) +#define S3C24X0_INT_EXT(n) (S3C24X0_EXTIRQ_MIN + (n)) + /* DMA controller */ /* XXX */ ==== //depot/projects/soc2010/bsdtextproc/src/sys/boot/pc98/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.44 2009/03/19 13:53:42 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.45 2010/07/25 02:22:32 nyan Exp $ .include MK_SSP= no @@ -94,6 +94,6 @@ OBJS= ${BTXCRT} DPADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBPC98} -lstand +LDADD= ${LIBFICL} ${LIBPC98} ${LIBSTAND} .include ==== //depot/projects/soc2010/bsdtextproc/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -66,8 +66,6 @@ * The ZAP OBJ is referred to as the jump object. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -540,7 +538,7 @@ dsl_pool_t *dp; void *cookie; int error; - char checkflag = ZFS_DELEG_LOCAL; + char checkflag; objset_t *mos; avl_tree_t permsets; perm_set_t *setnode; @@ -563,6 +561,16 @@ return (EPERM); } + if (dsl_dataset_is_snapshot(ds)) { + /* + * Snapshots are treated as descendents only, + * local permissions do not apply. + */ + checkflag = ZFS_DELEG_DESCENDENT; + } else { + checkflag = ZFS_DELEG_LOCAL; + } + avl_create(&permsets, perm_set_compare, sizeof (perm_set_t), offsetof(perm_set_t, p_node)); ==== //depot/projects/soc2010/bsdtextproc/src/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.107 2010/07/23 18:58:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.108 2010/07/23 21:30:33 kib Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -265,7 +265,7 @@ * Custom version of exec_copyin_args() so that we can translate * the pointers. */ -static int +int freebsd32_exec_copyin_args(struct image_args *args, char *fname, enum uio_seg segflg, u_int32_t *argv, u_int32_t *envv) { ==== //depot/projects/soc2010/bsdtextproc/src/sys/compat/freebsd32/freebsd32_util.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.17 2010/04/21 19:28:01 kib Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_util.h,v 1.18 2010/07/23 21:30:33 kib Exp $ */ #ifndef _COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ @@ -101,5 +101,9 @@ struct iovec **iov, int error); void freebsd32_rusage_out(const struct rusage *s, struct rusage32 *s32); +enum uio_seg; +struct image_args; +int freebsd32_exec_copyin_args(struct image_args *args, char *fname, + enum uio_seg segflg, u_int32_t *argv, u_int32_t *envv); #endif /* !_COMPAT_FREEBSD32_FREEBSD32_UTIL_H_ */ ==== //depot/projects/soc2010/bsdtextproc/src/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1524 2010/07/15 11:26:07 bschmidt Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1525 2010/07/24 22:11:11 rmacklem Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1914,7 +1914,6 @@ fs/nfsclient/nfs_clvnops.c optional nfscl fs/nfsclient/nfs_clnode.c optional nfscl fs/nfsclient/nfs_clvfsops.c optional nfscl -fs/nfsclient/nfs_cllock.c optional nfscl fs/nfsclient/nfs_clport.c optional nfscl fs/nfsclient/nfs_clbio.c optional nfscl fs/nfsclient/nfs_clnfsiod.c optional nfscl @@ -2680,6 +2679,7 @@ netsmb/smb_trantcp.c optional netsmb netsmb/smb_usr.c optional netsmb nfs/nfs_common.c optional nfsclient | nfsserver +nfs/nfs_lock.c optional nfsclient | nfscl nfsclient/bootp_subr.c optional bootp nfsclient nfsclient/krpc_subr.c optional bootp nfsclient nfsclient/nfs_bio.c optional nfsclient @@ -2690,7 +2690,6 @@ nfsclient/nfs_nfsiod.c optional nfsclient nfsclient/nfs_vfsops.c optional nfsclient nfsclient/nfs_vnops.c optional nfsclient -nfsclient/nfs_lock.c optional nfsclient nfsserver/nfs_fha.c optional nfsserver nfsserver/nfs_serv.c optional nfsserver nfsserver/nfs_srvkrpc.c optional nfsserver ==== //depot/projects/soc2010/bsdtextproc/src/sys/dev/e1000/if_igb.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.52 2010/07/23 17:53:39 gnn Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_igb.c,v 1.53 2010/07/24 18:53:46 gnn Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -4930,7 +4930,8 @@ /** igb_sysctl_tdh_handler - Handler function * Retrieves the TDH value from the hardware */ -static int igb_sysctl_tdh_handler(SYSCTL_HANDLER_ARGS) +static int +igb_sysctl_tdh_handler(SYSCTL_HANDLER_ARGS) { int error; @@ -4947,7 +4948,8 @@ /** igb_sysctl_tdt_handler - Handler function * Retrieves the TDT value from the hardware */ -static int igb_sysctl_tdt_handler(SYSCTL_HANDLER_ARGS) +static int +igb_sysctl_tdt_handler(SYSCTL_HANDLER_ARGS) { int error; @@ -4964,7 +4966,8 @@ /** igb_sysctl_rdh_handler - Handler function * Retrieves the RDH value from the hardware */ -static int igb_sysctl_rdh_handler(SYSCTL_HANDLER_ARGS) +static int +igb_sysctl_rdh_handler(SYSCTL_HANDLER_ARGS) { int error; @@ -4981,7 +4984,8 @@ /** igb_sysctl_rdt_handler - Handler function * Retrieves the RDT value from the hardware */ -static int igb_sysctl_rdt_handler(SYSCTL_HANDLER_ARGS) +static int +igb_sysctl_rdt_handler(SYSCTL_HANDLER_ARGS) { int error; ==== //depot/projects/soc2010/bsdtextproc/src/sys/dev/ichwd/ichwd.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.21 2010/01/24 10:50:20 remko Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ichwd/ichwd.c,v 1.22 2010/07/24 19:40:16 avg Exp $"); #include #include @@ -256,8 +256,8 @@ uint8_t tmr_val8 = ichwd_read_tco_1(sc, TCO_TMR1); tmr_val8 &= 0xc0; - if (timeout > 0xbf) - timeout = 0xbf; + if (timeout > 0x3f) + timeout = 0x3f; tmr_val8 |= timeout; ichwd_write_tco_1(sc, TCO_TMR1, tmr_val8); } else { ==== //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clnfsiod.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clnfsiod.c,v 1.3 2010/04/22 23:51:01 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clnfsiod.c,v 1.4 2010/07/24 22:11:11 rmacklem Exp $"); #include #include @@ -67,7 +67,6 @@ #include #include #include -#include extern struct mtx ncl_iod_mutex; ==== //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clport.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clport.c,v 1.11 2010/07/15 19:40:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clport.c,v 1.12 2010/07/24 22:11:11 rmacklem Exp $"); /* * generally, I don't like #includes inside .h files, but it seems to @@ -1268,4 +1268,5 @@ MODULE_DEPEND(nfscl, nfscommon, 1, 1, 1); MODULE_DEPEND(nfscl, krpc, 1, 1, 1); MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1); +MODULE_DEPEND(nfscl, nfslock, 1, 1, 1); ==== //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clsubs.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clsubs.c,v 1.8 2010/07/18 00:24:01 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clsubs.c,v 1.9 2010/07/24 22:11:11 rmacklem Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -67,7 +67,6 @@ #include #include #include -#include #include ==== //depot/projects/soc2010/bsdtextproc/src/sys/fs/nfsclient/nfs_clvnops.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvnops.c,v 1.23 2010/07/18 22:35:46 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfsclient/nfs_clvnops.c,v 1.24 2010/07/24 22:11:11 rmacklem Exp $"); /* * vnode op calls for Sun NFS version 2, 3 and 4 @@ -67,24 +67,24 @@ #include #include - #include #include #include #include -#include #include #include #include +#include + /* Defs */ #define TRUE 1 #define FALSE 0 extern struct nfsstats newnfsstats; MALLOC_DECLARE(M_NEWNFSREQ); -vop_advlock_t *ncl_advlock_p = ncl_dolock; +vop_advlock_t *ncl_advlock_p = nfs_dolock; /* * Ifdef for FreeBSD-current merged buffer cache. It is unfortunate that these ==== //depot/projects/soc2010/bsdtextproc/src/sys/mips/include/vmparam.h#3 (text+ko) ==== @@ -37,7 +37,7 @@ * from: Utah Hdr: vmparam.h 1.16 91/01/18 * @(#)vmparam.h 8.2 (Berkeley) 4/22/94 * JNPR: vmparam.h,v 1.3.2.1 2007/09/10 06:01:28 girish - * $FreeBSD: src/sys/mips/include/vmparam.h,v 1.6 2010/07/21 09:27:00 jchandra Exp $ + * $FreeBSD: src/sys/mips/include/vmparam.h,v 1.7 2010/07/25 04:19:05 imp Exp $ */ #ifndef _MACHINE_VMPARAM_H_ @@ -184,6 +184,7 @@ #ifdef __mips_n64 #define VM_NFREELIST 1 #define VM_FREELIST_DEFAULT 0 +#define VM_FREELIST_DIRECT VM_FREELIST_DEFAULT #else #define VM_NFREELIST 2 #define VM_FREELIST_DEFAULT 1 ==== //depot/projects/soc2010/bsdtextproc/src/sys/modules/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.657 2010/07/23 11:00:46 kib Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.658 2010/07/24 22:11:11 rmacklem Exp $ .include @@ -205,6 +205,7 @@ nfsclient \ nfscommon \ nfsd \ + nfslock \ nfslockd \ nfsserver \ nfssvc \ ==== //depot/projects/soc2010/bsdtextproc/src/sys/modules/nfscl/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/nfscl/Makefile,v 1.1 2009/05/28 19:45:11 rmacklem Exp $ +# $FreeBSD: src/sys/modules/nfscl/Makefile,v 1.2 2010/07/24 22:11:11 rmacklem Exp $ .PATH: ${.CURDIR}/../../fs/nfsclient KMOD= nfscl @@ -9,7 +9,6 @@ nfs_clcomsubs.c \ nfs_clport.c \ nfs_clbio.c \ - nfs_cllock.c \ nfs_clnfsiod.c \ nfs_clnode.c \ nfs_clsubs.c \ ==== //depot/projects/soc2010/bsdtextproc/src/sys/modules/nfsclient/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/modules/nfsclient/Makefile,v 1.42 2010/02/16 20:00:21 marius Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01784106632E; Wed, 28 Jul 2010 08:21: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 E82F71065746 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7580F8FC25 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8Lbap009192 for ; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LbmA009190 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from bfiedler@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:37 GMT Message-Id: <201007280821.o6S8LbmA009190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:47 -0000 http://p4web.freebsd.org/@@181476?ac=10 Change 181476 by bfiedler@freebsd-home on 2010/07/27 14:45:11 Set man and groff to conditional builds; use Gordon's man replacement Affected files ... .. //depot/projects/soc2010/bsdtextproc/src/gnu/usr.bin/Makefile#3 edit .. //depot/projects/soc2010/bsdtextproc/src/usr.bin/Makefile#5 edit .. //depot/projects/soc2010/bsdtextproc/src/usr.bin/man/Makefile#1 add .. //depot/projects/soc2010/bsdtextproc/src/usr.bin/man/man.sh#1 add Differences ... ==== //depot/projects/soc2010/bsdtextproc/src/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -45,8 +45,10 @@ .endif .if ${MK_MAN_UTILS} != "no" +.if !defined(WITH_MANDOC) _man= man .endif +.endif .if ${MK_RCS} != "no" _rcs= rcs ==== //depot/projects/soc2010/bsdtextproc/src/usr.bin/Makefile#5 (text+ko) ==== @@ -122,6 +122,8 @@ ${_mail} \ ${_make} \ ${_makewhatis} \ + ${_man} \ + ${_mandoc} \ mesg \ minigzip \ ministat \ @@ -243,10 +245,6 @@ ${_ypmatch} \ ${_ypwhich} -.if defined(WITH_MANDOC) -SUBDIR+= mdocml -.endif - .if ${MACHINE_ARCH} != "arm" _truss= truss .endif @@ -263,6 +261,11 @@ .if ${MK_MAN_UTILS} != "no" _catman= catman +.if defined(WITH_MANDOC) +_mandoc= mandoc +_man= man +.endif + .endif .if ${MK_BIND_UTILS} != "no" From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A4341066337; Wed, 28 Jul 2010 08:21: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 E40431065743 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02BB28FC1D for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LaqQ009177 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LaAL009175 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8LaAL009175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:47 -0000 http://p4web.freebsd.org/@@181473?ac=10 Change 181473 by ligregni@ligPhenom on 2010/07/27 02:45:53 Many trail directories Affected files ... .. //depot/projects/soc2010/disaudit/damasterd.c#6 edit .. //depot/projects/soc2010/disaudit/msocket_work.c#6 edit .. //depot/projects/soc2010/disaudit/msocket_work.h#6 edit .. //depot/projects/soc2010/disaudit/shipd.c#9 edit .. //depot/projects/soc2010/disaudit/ssocket_work.c#7 edit .. //depot/projects/soc2010/disaudit/ssocket_work.h#7 edit .. //depot/projects/soc2010/disaudit/utils.c#2 edit .. //depot/projects/soc2010/disaudit/utils.h#2 edit Differences ... ==== //depot/projects/soc2010/disaudit/damasterd.c#6 (text+ko) ==== @@ -56,8 +56,8 @@ /*** DECLARATIONS ***/ /* local prototypes */ -static int check_files_equal(char *pathslave, char *md5slave, char *hostname, - char *path, char *fullpath); +static int check_files_equal(char *pathslave, char *sha256slave, + char *hostname, char *path, char *fullpath); static int do_master_daemon(); static int get_parameters(); static int process_request(int sfd, struct sockaddr *clientinfo); ==== //depot/projects/soc2010/disaudit/msocket_work.c#6 (text+ko) ==== @@ -40,6 +40,12 @@ #include +/*** DECLARATIONS ***/ + +/* local prototypes */ +int init_socket(int); +int accept_connection(int, struct sockaddr *); + int init_socket(int port) { ==== //depot/projects/soc2010/disaudit/msocket_work.h#6 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/shipd.c#9 (text+ko) ==== @@ -63,6 +63,12 @@ struct s_trail_entry *next; } trail_entry; +/* Directory entries */ +typedef struct s_audit_dir_entry +{ + char path[MAX_DIR_SIZE+1]; +} audit_dir_entry; + /* Directory settings took from audit_control */ char audit_trails_dir[MAX_DIR_SIZE + 1]; char master_host[MAX_HOST_SIZE + 1]; ==== //depot/projects/soc2010/disaudit/ssocket_work.c#7 (text+ko) ==== @@ -44,6 +44,14 @@ #include +/* DECLARATIONS */ + +/* local prototypes */ +int do_socket_check_file(int sockfd, char *path, char *sha256); +int do_socket_send_file(int sockfd, char *path, char *fullpath); +int is_ipv4(char *address); + + int do_socket_check_file(int sockfd, char *path, char *sha256) { ==== //depot/projects/soc2010/disaudit/ssocket_work.h#7 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/utils.c#2 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/utils.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14B6A1066340; Wed, 28 Jul 2010 08:21: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 EAEE31065748 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B75B08FC27 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LboM009202 for ; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8Lbko009200 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from afiveg@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:37 GMT Message-Id: <201007280821.o6S8Lbko009200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:47 -0000 http://p4web.freebsd.org/@@181478?ac=10 Change 181478 by afiveg@ringmap-2 on 2010/07/27 15:58:15 Bugfixing. The problem with dirty data in the ring doesn't solved yet Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#24 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#9 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#8 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#7 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#8 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#38 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#38 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#8 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#19 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#20 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#14 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#7 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#7 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#9 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#9 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#9 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#7 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#24 (text+ko) ==== @@ -252,14 +252,19 @@ if ( RING_IS_EMPTY(ring) ) { #if (__RINGMAP_DEB) + PRINT_RING_PTRS(ring); RINGMAP_FUNC_DEBUG(Ring is empty. Sleep...); - PRINT_RING_PTRS(ring); #endif /* Sleep and wait for new incoming packets */ ioctl(ringmap_cdev_fd, IOCTL_SLEEP_WAIT); goto again; } +#if (__RINGMAP_DEB) + RINGMAP_FUNC_DEBUG(Ring is NOT empty:); + PRINT_RING_PTRS(ring); +#endif + if ( (cnt == -1) || (cnt == 0) ) cnt = SW_TAIL_TO_HEAD_DIST(p->ring); @@ -274,11 +279,10 @@ } curr_slot = R_MODULO( SW_TAIL(ring) + 1 ); - if (!(ring->slot[curr_slot].is_ok)) { + if (ring->slot[curr_slot].is_ok == 0) { #if (__RINGMAP_DEB) printf("Slot %d was not accepted by driver!\n", curr_slot); #endif - printf("Slot %d was not accepted by driver!\n", curr_slot); goto out; } ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#9 (text+ko) ==== @@ -1455,7 +1455,6 @@ #ifdef RINGMAP IXGBE_RX_LOCK(que->rxr); adapter->rm->funcs->sync_head(que); - IXGBE_RX_UNLOCK(que->rxr); /* TODO: Only our co not all */ SLIST_FOREACH(co, &adapter->rm->object_list, objects) { @@ -1463,6 +1462,7 @@ wakeup(co->ring); } } + IXGBE_RX_UNLOCK(que->rxr); #endif /* Do AIM now? */ @@ -3506,6 +3506,7 @@ goto update; mp->m_pkthdr.len = mp->m_len = adapter->rx_mbuf_sz; /* Get the memory mapping */ + error = bus_dmamap_load_mbuf_sg(rxr->ptag, rxbuf->pmap, mp, pseg, &nsegs, BUS_DMA_NOWAIT); if (error != 0) { ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#8 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#7 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#8 (text+ko) ==== @@ -161,6 +161,7 @@ { struct ix_queue *que = (struct ix_queue *)context; struct adapter *adapter = (struct adapter *)que->adapter; + struct ixgbe_rx_buf *rxbuf; struct ringmap *rm = adapter->rm;; struct capt_object *co = NULL; @@ -177,14 +178,20 @@ co = get_capt_obj(que); if (co != NULL) { + co->ring->slot[slot_num].intr_num = co->ring->intr_num; + co->ring->slot[slot_num].ts = co->ring->last_ts; + co->ring->slot[slot_num].is_ok = 1; + + rxbuf = &que->rxr->rx_buffers[slot_num]; + bus_dmamap_sync(que->rxr->htag, rxbuf->hmap, + BUS_DMASYNC_POSTREAD); + #if (RINGMAP_INTR_DEB) printf(RINGMAP_PREFIX"[%s] Slot = %d\n", __func__, slot_num); - rm_8259_print_ring_pointers(que); + PRINT_SLOT(co->ring, slot_num); PRINT_RING_PTRS(co->ring); #endif - co->ring->slot[slot_num].intr_num = co->ring->intr_num; - co->ring->slot[slot_num].ts = co->ring->last_ts; - co->ring->slot[slot_num].is_ok = 1; + } } ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#38 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#38 (text+ko) ==== @@ -246,19 +246,19 @@ * DEBUG OUTPUT */ #ifndef RINGMAP_IOCTL_DEB -#define RINGMAP_IOCTL_DEB 0 +#define RINGMAP_IOCTL_DEB 1 #else #define RINGMAP_IOCTL_DEB 1 #endif #ifndef RINGMAP_INTR_DEB -#define RINGMAP_INTR_DEB 0 +#define RINGMAP_INTR_DEB 1 #else #define RINGMAP_INTR_DEB 1 #endif #ifndef __RINGMAP_DEB -#define __RINGMAP_DEB 0 +#define __RINGMAP_DEB 1 #endif #define RINGMAP_PREFIX "--> RINGMAP: " ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#8 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#19 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#20 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#14 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#7 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#7 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3249E1066378; Wed, 28 Jul 2010 08:21: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 E56251065744 for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21B668FC1F for ; Wed, 28 Jul 2010 08:21:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LbZI009182 for ; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LbUw009180 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:37 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:37 GMT Message-Id: <201007280821.o6S8LbUw009180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:48 -0000 http://p4web.freebsd.org/@@181474?ac=10 Change 181474 by ligregni@ligPhenom on 2010/07/27 02:46:25 Deleting unnecesary files Affected files ... .. //depot/projects/soc2010/disaudit/msocket_work.h#7 delete .. //depot/projects/soc2010/disaudit/ssocket_work.h#8 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4612F106639A; Wed, 28 Jul 2010 08:21: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 729B01065DAD for ; Wed, 28 Jul 2010 08:21:39 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B1F7C8FC2A for ; Wed, 28 Jul 2010 08:21:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LclB009229 for ; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8Lcan009227 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from bz@freebsd.org) Date: Wed, 28 Jul 2010 08:21:38 GMT Message-Id: <201007280821.o6S8Lcan009227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:48 -0000 http://p4web.freebsd.org/@@181483?ac=10 Change 181483 by bz@bz_whit on 2010/07/27 21:16:02 Add FreeBSD tag to the module Makefile. Remove trailing sapces or tabs from lines. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#16 edit .. //depot/projects/soc2009/anchie_send/src/sys/modules/send/Makefile#2 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.h#8 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#45 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_proto.c#8 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#35 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#21 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#14 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#47 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#23 edit .. //depot/projects/soc2009/anchie_send/src/sys/sys/mbuf.h#9 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#16 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/modules/send/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ -.PATH: ${.CURDIR}/../../netinet6 +# $FreeBSD$ +.PATH: ${.CURDIR}/../../netinet6 KMOD= send -SRCS= send.c +SRCS= send.c .include ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/in.h#8 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#45 (text+ko) ==== @@ -772,7 +772,7 @@ /* Send incoming SeND packet to user space. */ if (send_sendso_input_hook != NULL) { - IP6_EXTHDR_CHECK(m, off, + IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE); error = send_sendso_input_hook(m, SND_IN, ip6len); @@ -786,7 +786,7 @@ goto freeit; } if (send_sendso_input_hook != NULL) { - IP6_EXTHDR_CHECK(m, off, + IP6_EXTHDR_CHECK(m, off, icmp6len, IPPROTO_DONE); error = send_sendso_input_hook(n, SND_IN, ip6len); @@ -812,7 +812,7 @@ /* Send incoming SeND-protected/ND packet to user space. */ if (send_sendso_input_hook != NULL) { error = send_sendso_input_hook(m, - SND_IN, ip6len); + SND_IN, ip6len); if (error == 0) return (IPPROTO_DONE); nd6_ra_input(m, off, icmp6len); @@ -824,7 +824,7 @@ } if (send_sendso_input_hook != NULL) { error = send_sendso_input_hook(n, - SND_IN, ip6len); + SND_IN, ip6len); if (error == 0) return (IPPROTO_DONE); nd6_ra_input(n, off, icmp6len); @@ -842,11 +842,10 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { if (send_sendso_input_hook != NULL) { error = send_sendso_input_hook(m, - SND_IN, ip6len); + SND_IN, ip6len); if (error == 0) return (IPPROTO_DONE); nd6_ns_input(m, off, icmp6len); - } else nd6_ns_input(m, off, icmp6len); m_freem(n); @@ -905,7 +904,7 @@ if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { if (send_sendso_input_hook != NULL) { error = send_sendso_input_hook(m, - SND_IN, ip6len); + SND_IN, ip6len); if (error == 0) return (IPPROTO_DONE); icmp6_redirect_input(m, off); ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_proto.c#8 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#35 (text+ko) ==== @@ -1775,7 +1775,7 @@ unsigned short *nd_type; ip6 = mtod(m, struct ip6_hdr *); - ip6len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen); + ip6len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen); #ifdef INVARIANTS if (lle != NULL) { @@ -1958,7 +1958,7 @@ nd_type = (unsigned short *)(mtag + 1); /* Use the SEND socket */ error = send_sendso_input_hook(m, SND_OUT, - ip6len); + ip6len); /* -1 == no app on SEND socket */ if (error == 0 || error != -1) return (error); @@ -1973,8 +1973,9 @@ * after the lock is dropped */ - /* XXX-AK: In case of SeND loaded, this should be added to - * the input hook. + /* + * XXX-AK: In case of SeND loaded, this should be added to + * the input hook. */ if (lle != NULL) { if (*chain == NULL) @@ -1992,14 +1993,14 @@ return (error); } - /* - * In case of NS, NA and Redirect, we end-up here after calling - * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output(). - * RS and RA do not have such output - * routines. They are handled instead by rtadvd and rtsol daemons. + /* + * In case of NS, NA and Redirect, we end-up here after calling + * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output(). + * RS and RA do not have such output routines. They are handled + * instead by rtadvd and rtsol daemons. * - * if_output() routines together with previous chaining will be called - * from input hook. + * if_output() routines together with previous chaining will be called + * from input hook. */ if ((ifp->if_flags & IFF_LOOPBACK) != 0) { ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#21 (text+ko) ==== @@ -623,7 +623,7 @@ struct llentry *ln = NULL; union nd_opts ndopts; struct mbuf *chain = NULL; - struct m_tag *mtag; + struct m_tag *mtag; struct sockaddr_in6 sin6; char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN]; ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#14 (text+ko) ==== @@ -531,8 +531,8 @@ *p = in6_cksum(m, ip6->ip6_nxt, sizeof(*ip6), plen); } - /* - * Send RA/RS messages to user land for protection, before sending + /* + * Send RA/RS messages to user land for protection, before sending * them to rtadvd/rtsol. */ if ((send_sendso_input_hook != NULL) && ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#47 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#23 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef _NETINET6_SEND_H_ #define _NETINET6_SEND_H_ -#define SND_OUT 0 /* Outgoing traffic */ +#define SND_OUT 0 /* Outgoing traffic */ #define SND_IN 1 /* Incoming traffic. */ struct sockaddr_send { ==== //depot/projects/soc2009/anchie_send/src/sys/sys/mbuf.h#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E2DA10663BA; Wed, 28 Jul 2010 08:21: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 489721065871 for ; Wed, 28 Jul 2010 08:21:39 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D15988FC2B for ; Wed, 28 Jul 2010 08:21:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8Lc6W009234 for ; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8Lcfg009232 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from bfiedler@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:38 GMT Message-Id: <201007280821.o6S8Lcfg009232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:48 -0000 http://p4web.freebsd.org/@@181484?ac=10 Change 181484 by bfiedler@freebsd-7803 on 2010/07/27 21:23:36 Branch from Gabor's new sort Affected files ... .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/Makefile#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/coll.c#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/file.c#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/mem.c#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/nls/C.msg#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/nls/hu_HU.ISO8859-2.msg#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/Makefile#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/cmp.sh#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test01#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test02#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test03#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test04#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test05#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test06#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test07#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test08#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test09#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test10#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test11#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test12#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test13#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test14#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test15#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test16#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/data/test17#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test01r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test02r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test03r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test04r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test05r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test06r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test07r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test08r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test09r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test10r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test11r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test12r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test13r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test14r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test15r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test16r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17M#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17Mr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17b#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17bd#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17f#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17fr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17g#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17gr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17i#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17ir#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17n#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17nr#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/regression/ref/test17r#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/sort.1#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/sort.c#1 branch .. //depot/projects/soc2010/bsdtextproc/gabor_newsort/sort.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB122106652B; Wed, 28 Jul 2010 08:21: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 E3A631065E7A for ; Wed, 28 Jul 2010 08:21:40 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F045B8FC0C for ; Wed, 28 Jul 2010 08:21:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8Lcr9009239 for ; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8Lc0q009237 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from anchie@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:38 GMT Message-Id: <201007280821.o6S8Lc0q009237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181485 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:49 -0000 http://p4web.freebsd.org/@@181485?ac=10 Change 181485 by anchie@anchie_malimis on 2010/07/27 22:00:48 Removed old comment. The comment's functionality have already been implemented. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#36 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#36 (text+ko) ==== @@ -1973,10 +1973,6 @@ * after the lock is dropped */ - /* - * XXX-AK: In case of SeND loaded, this should be added to - * the input hook. - */ if (lle != NULL) { if (*chain == NULL) *chain = m; From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0298E106682D; Wed, 28 Jul 2010 08:21: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 2AF1F1065F18 for ; Wed, 28 Jul 2010 08:21:40 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21C338FC12 for ; Wed, 28 Jul 2010 08:21:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LdKn009244 for ; Wed, 28 Jul 2010 08:21:39 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LcR2009242 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:38 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:38 GMT Message-Id: <201007280821.o6S8LcR2009242@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:54 -0000 http://p4web.freebsd.org/@@181486?ac=10 Change 181486 by jlaffaye@jlaffaye-chulak on 2010/07/27 22:04:27 - Re-implemented the automatic installation of packages dependencies. - While I'm here, do not call pkg_add recursively but use pkg_do() - Moved the 'URL guess' logic from fetch_archive() to find_package_url(). - While I'm here, do not use a hard-coded value of '.tbz' for the archive extension but find it dynamically. Affected files ... .. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#8 edit .. //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#4 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#4 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#8 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#8 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#8 (text+ko) ==== @@ -180,8 +180,8 @@ Boolean issymlink(const char *); Boolean isURL(const char *); const char *fileGetURL(const char *, const char *, int); -int fetch_archive(struct archive *, const char *, const char *, - Boolean); +int find_package_url(char * restrict, const char *, const char *); +int fetch_archive(struct archive *, const char *, Boolean); char *fileFindByPath(const char *, const char *); char *fileGetContents(const char *); ssize_t write_file(const char *, const char *); ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#4 (text+ko) ==== @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -192,70 +193,76 @@ } /* - * Setup the archive `a' callbacks to read data from an URL `spec' via fetch(3). - * If `spec' is not an URL, the function try to find the location of the file - * via `base' or via the environment variable `PKG_ADD_BASE'. + * Given a know-good URL `base', construct the URL to fetch `pkgname'. + * If the environment variable `PKG_ADD_BASE' (setted by sysinstall) exist, + * it is used to construct the URL ($PKG_ADD_BASE concatened with pkgname), + * and `base' is only used to find the file extension. + * The resulting URL string is stored at the memory of size FILENAME_MAX + * pointed by `p'. + * Returns 0 on success, 1 otherwise. + */ +int +find_package_url(char * restrict p, const char *base, const char *pkgname) +{ + char *cp; + char *ext; + + assert(p != NULL); + assert(base != NULL); + assert(pkgname != NULL); + + if ((ext = strrchr(base, '.')) == NULL) + ext = ".tbz"; + + /* Special tip that sysinstall left for us */ + if ((cp = getenv("PKG_ADD_BASE")) != NULL) { + strlcpy(p, cp, FILENAME_MAX); + strlcat(p, pkgname, FILENAME_MAX); + strlcat(p, ext, FILENAME_MAX); + } else { + strlcpy(p, base, FILENAME_MAX); + /* + * Advance back two slashes to get to the root of the + * package hierarchy, then append pkgname. + */ + cp = strrchr(p, '/'); + if (cp != NULL) { + *cp = '\0'; /* chop name */ + cp = strrchr(p, '/'); + } + if (cp != NULL) { + *(cp + 1) = '\0'; + strlcat(p, "All/", FILENAME_MAX); + strlcat(p, pkgname, FILENAME_MAX); + strlcat(p, ext, FILENAME_MAX); + } else + return (1); + } + + return (0); +} + +/* + * Setup the archive `a' callbacks to read data from an URL `url' via fetch(3). * Returns 0 on success, 1 otherwise. */ int -fetch_archive(struct archive *a, const char *base, const char *spec, - Boolean keep_package) +fetch_archive(struct archive *a, const char *url, Boolean keep_package) { struct fetch_data *data = NULL; - char *cp, *hint, *tmp; + char *tmp; char fname[FILENAME_MAX]; char pkg[FILENAME_MAX]; int retcode = 0; + if (!isURL(url)) { + warnx("fetch_archive(): '%s' is not an URL!", url); + return (1); + } + if ((data = malloc(sizeof(struct fetch_data))) == NULL) err(EXIT_FAILURE, "malloc()"); - if (!isURL(spec)) { - /* - * 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 != NULL) { - 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 != NULL) { - *(cp + 1) = '\0'; - strcat(cp, "All/"); - strcat(cp, spec); - strcat(cp, ".tbz"); - } else { - retcode = 1; - goto cleanup; - } - } - /* Special tip that sysinstall left for us */ - else if ((hint = getenv("PKG_ADD_BASE")) != NULL) { - /* - * Otherwise, we've been given an environment variable - * hinting at the right location from sysinstall - */ - strcpy(fname, hint); - strcat(fname, spec); - strcat(fname, ".tbz"); - } - /* We dont have an url and are unable to guess one */ - else { - retcode = 1; - goto cleanup; - } - } - else - strcpy(fname, spec); - if (keep_package) { tmp = getenv("PKGDIR"); strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg)); ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#4 (text+ko) ==== @@ -42,7 +42,8 @@ int make_hierarchy(char *); void apply_perms(const char *, const char *); -int extract_package(struct archive *, Package *); +int extract_package(struct archive *, Package *, const char *); int extract_plist(struct archive *, struct archive_entry *, Package *); +int pkg_do(const char *); #endif /* _INST_ADD_H_INCLUDE */ ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#8 (text+ko) ==== @@ -66,7 +66,7 @@ } int -extract_package(struct archive *a, Package *pkg) +extract_package(struct archive *a, Package *pkg, const char *fname) { PackingList p; struct archive_entry *entry; @@ -188,113 +188,108 @@ } #endif - /* Now check the packing list for dependencies */ - for (p = pkg->head; p ; p = p->next) { - char *deporigin; + /* Now check the packing list for dependencies */ + for (p = pkg->head; p ; p = p->next) { + char *deporigin; - if (p->type != PLIST_PKGDEP) - continue; - deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL; - if (Verbose) { - printf("Package '%s' depends on '%s'", pkg->name, p->name); - if (deporigin != NULL) - printf(" with '%s' origin", deporigin); - printf(".\n"); - } -#if 0 - if (isinstalledpkg(p->name) <= 0 && - !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) { - char path[FILENAME_MAX]; - const char *cp = NULL; + if (p->type != PLIST_PKGDEP) + continue; - if (!Fake) { - char prefixArg[2 + MAXPATHLEN]; /* "-P" + Prefix */ - if (PrefixRecursive) { - strlcpy(prefixArg, "-P", sizeof(prefixArg)); - strlcat(prefixArg, Prefix, sizeof(prefixArg)); + if (p->next->type == PLIST_DEPORIGIN) + deporigin = p->next->name; + else + deporigin = NULL; + if (Verbose) { + printf("Package '%s' depends on '%s'", pkg->name, p->name); + if (deporigin != NULL) + printf(" with '%s' origin", deporigin); + printf(".\n"); } - if (!isURL(pkg) && !getenv("PKG_ADD_BASE")) { - const char *ext; + + if (isinstalledpkg(p->name) <= 0 && + !(deporigin != NULL && matchbyorigin(deporigin, NULL) != + NULL)) { + char path[FILENAME_MAX]; + const char *cp = NULL; + + if (!Fake) { + /* + * Since we are calling pkg_do() recursively, + * set the global variable `Prefix' to NULL. + * It is safe to do so because we are already done + * with it at this level. + */ + if (PrefixRecursive == FALSE) + Prefix = NULL; + + if (!isURL(fname) && !getenv("PKG_ADD_BASE")) { + const char *ext; + + ext = strrchr(fname, '.'); + if (ext == NULL) + ext = ".tbz"; + snprintf(path, FILENAME_MAX, "%s/%s%s", + getenv("_TOP"), p->name, ext); + if (fexists(path)) + cp = path; + else + cp = fileFindByPath(fname, p->name); + + if (cp) { + if (Verbose) + printf("Loading it from %s.\n", cp); + if (pkg_do(cp) != 0) { + warnx("autoload of dependency '%s' " + "failed%s", cp, + Force ? " (proceeding anyway)" : "!"); + if (!Force) + ++code; + } + } + else { + warnx("could not find package %s %s", p->name, + Force ? "(proceeding anyway)" : "!"); + if (!Force) + ++code; + } + } + else { + char dep_url[FILENAME_MAX]; + if (find_package_url(dep_url, fname, p->name) != 1) + errx(1, "Can not make an URL to get %s", + p->name); - ext = strrchr(pkg, '.'); - if (ext == NULL) - ext = ".tbz"; - snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"), - p->name, ext); - if (fexists(path)) - cp = path; - else - cp = fileFindByPath(pkg, p->name); - if (cp) { - if (Verbose) - printf("Loading it from %s.\n", cp); - if (vsystem("%s %s %s '%s'", PkgAddCmd, Verbose ? "-v " -: "", PrefixRecursive ? prefixArg : "", cp)) { - warnx("autoload of dependency '%s' failed%s", - cp, Force ? " (proceeding anyway)" : "!"); - if (!Force) - ++code; + if (pkg_do(dep_url) != 0) { + warnx("pkg_add of dependency %s failed%s", + p->name, + Force ? " (proceeding anyway)" : "!"); + if (!Force) + ++code; + } else + if (Verbose) + printf("%s added successfully\n", p->name); } + /* pkg_do() modified this global, so reset it */ + extract_state = 0; } + /* XXX: WTF is this logic ? */ else { - warnx("could not find package %s %s", - p->name, Force ? " (proceeding anyway)" : "!"); + if (Verbose) + printf("and was not found%s.\n", + Force ? " (proceeding anyway)" : ""); + else + printf("Package dependency %s for %s not found%s\n", + p->name, pkg->name, + Force ? " (proceeding anyway)" : "!"); if (!Force) ++code; } } - else { - - if ((cp = fileGetURL(pkg, p->name, KeepPackage)) == NULL) { - cleanup(); - warnx("Getting pkg '%s' by URL failed", pkg); - goto bomb; - } else { - - if (Verbose) - printf("Finished loading %s via a URL\n", p->name); - if (!fexists(CONTENTS_FNAME)) { - warnx("autoloaded package %s has no %s file?", - p->name, CONTENTS_FNAME); - if (!Force) - ++code; - } - else if (vsystem("(pwd; /bin/cat " CONTENTS_FNAME - ") | %s %s %s %s -S", PkgAddCmd, - Verbose ? "-v" : "", - PrefixRecursive ? prefixArg : "", - KeepPackage ? "-K" : "")) { - warnx("pkg_add of dependency '%s' failed%s", - p->name, Force ? " (proceeding anyway)" : "!"); - if (!Force) - ++code; - } - else if (Verbose) - printf("\t'%s' loaded successfully.\n", p->name); - /* Nuke the temporary playpen */ - leave_playpen(); - - } - - } + else if (Verbose) + printf(" - already installed.\n"); } - else { - if (Verbose) - printf("and was not found%s.\n", - Force ? " (proceeding anyway)" : ""); - else - printf("Package dependency %s for %s not found%s\n", - p->name, pkg, Force ? " (proceeding anyway)" : "!"); - if (!Force) - ++code; - } - } - else if (Verbose) - printf(" - already installed.\n"); -#endif - } - } /* if (!IgnoreDeps) */ + } /* if (!IgnoreDeps) */ if (code != 0) return (1); ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#8 (text+ko) ==== @@ -33,7 +33,6 @@ #include "cleanup.h" void cleanup(void); -static int pkg_do(char *); extern int extract_state; extern char db_dir_tmp[FILENAME_MAX]; @@ -61,8 +60,8 @@ * as first parameter and install it. * Returns 0 on success, 1 otherwise. */ -static int -pkg_do(char *fname) +int +pkg_do(const char *fname) { Package pkg; struct archive *a = NULL; @@ -81,7 +80,7 @@ * add support for complete packages */ if (isURL(fname)) { - if (fetch_archive(a, NULL, fname, KeepPackage) != 0) { + if (fetch_archive(a, fname, KeepPackage) != 0) { warnx("Can not fetch '%s' - aborting", fname); retcode = 1; goto cleanup; @@ -113,7 +112,7 @@ retcode = 1; goto cleanup; } - retcode = extract_package(a, &pkg); + retcode = extract_package(a, &pkg, fname); free_plist(&pkg); } else if (strcmp(pathname, "+PKG_COMPLETE") == 0) { if (Verbose) From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E2E610669FF; Wed, 28 Jul 2010 08:21: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 30A8C1065F1B for ; Wed, 28 Jul 2010 08:21:41 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 405198FC15 for ; Wed, 28 Jul 2010 08:21:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8Ldjt009252 for ; Wed, 28 Jul 2010 08:21:39 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LdVY009250 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:39 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:39 GMT Message-Id: <201007280821.o6S8LdVY009250@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:56 -0000 http://p4web.freebsd.org/@@181487?ac=10 Change 181487 by ligregni@ligPhenom on 2010/07/28 02:28:35 Some specs about managing files Affected files ... .. //depot/projects/soc2010/disaudit/msocket_work.c#7 edit .. //depot/projects/soc2010/disaudit/msocket_work.h#8 add .. //depot/projects/soc2010/disaudit/ssocket_work.h#9 add Differences ... ==== //depot/projects/soc2010/disaudit/msocket_work.c#7 (text+ko) ==== @@ -43,35 +43,31 @@ /*** DECLARATIONS ***/ /* local prototypes */ -int init_socket(int); -int accept_connection(int, struct sockaddr *); +int init_socket(int); +int accept_connection(int, struct sockaddr *); int init_socket(int port) { struct sockaddr_in sockaddr; - int sockfd; + int sockfd; sockfd = socket(PF_INET, SOCK_STREAM, 0); - if (sockfd < 0) - { + if (sockfd < 0) { to_log("Cannot create socket!"); return (-1); } - bzero(&sockaddr, sizeof(sockaddr)); sockaddr.sin_family = AF_INET; sockaddr.sin_addr.s_addr = htonl(INADDR_ANY); sockaddr.sin_port = htons(port); - if (bind(sockfd, (struct sockaddr *) &sockaddr, sizeof(sockaddr)) < 0) - { + if (bind(sockfd, (struct sockaddr *)&sockaddr, sizeof(sockaddr)) < 0) { to_log("Cannot bind to port"); return (-1); } - listen(sockfd, 500); return (sockfd); @@ -81,14 +77,14 @@ accept_connection(int sfd, struct sockaddr *clientinfo) { struct sockaddr_in clientaddr; - socklen_t clientlen = sizeof(clientaddr); - int retval = 0; + socklen_t clientlen = sizeof(clientaddr); + int retval = 0; - retval = accept(sfd, (struct sockaddr *) &clientaddr, &clientlen); + retval = accept(sfd, (struct sockaddr *)&clientaddr, &clientlen); if (retval >= 0) memcpy(clientinfo, &clientaddr, sizeof(struct sockaddr)); - return (retval); + return (retval); } From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8483F1066A03; Wed, 28 Jul 2010 08:21: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 3304F1065F1F for ; Wed, 28 Jul 2010 08:21:41 +0000 (UTC) (envelope-from ligregni@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6275B8FC17 for ; Wed, 28 Jul 2010 08:21:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LdqJ009257 for ; Wed, 28 Jul 2010 08:21:39 GMT (envelope-from ligregni@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8Ldug009255 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:39 GMT (envelope-from ligregni@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:39 GMT Message-Id: <201007280821.o6S8Ldug009255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ligregni@FreeBSD.org using -f From: Sergio Ligregni To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:56 -0000 http://p4web.freebsd.org/@@181488?ac=10 Change 181488 by ligregni@ligPhenom on 2010/07/28 05:51:39 It is now allowed to have multiple audit trail directories at the slave system, the daemon syncs all of them (only those explicitly specified) Affected files ... .. //depot/projects/soc2010/disaudit/damasterd.c#7 edit .. //depot/projects/soc2010/disaudit/msocket_work.c#8 edit .. //depot/projects/soc2010/disaudit/msocket_work.h#9 edit .. //depot/projects/soc2010/disaudit/shipd.c#10 edit .. //depot/projects/soc2010/disaudit/ssocket_work.c#8 edit .. //depot/projects/soc2010/disaudit/ssocket_work.h#10 edit .. //depot/projects/soc2010/disaudit/utils.c#3 edit .. //depot/projects/soc2010/disaudit/utils.h#3 edit Differences ... ==== //depot/projects/soc2010/disaudit/damasterd.c#7 (text+ko) ==== @@ -56,75 +56,69 @@ /*** DECLARATIONS ***/ /* local prototypes */ -static int check_files_equal(char *pathslave, char *sha256slave, - char *hostname, char *path, char *fullpath); -static int do_master_daemon(); -static int get_parameters(); -static int process_request(int sfd, struct sockaddr *clientinfo); -static int receive_trail(int sfd, struct sockaddr *clientinfo); -static int search_trail(int sfd, struct sockaddr *clientinfo); +static int +check_files_equal(char *pathslave, char *sha256slave, + char *hostname, char *path, char *fullpath); +static int do_master_daemon(); +static int get_parameters(); +static int process_request(int sfd, struct sockaddr *clientinfo); +static int receive_trail(int sfd, struct sockaddr *clientinfo); +static int search_trail(int sfd, struct sockaddr *clientinfo); /* Directory settings took from audit_control */ -char slave_trails_dir[MAX_DIR_SIZE + 1]; -char *ptr_std; -int slave_dirs; +char slave_trails_dir[MAX_DIR_SIZE + 1]; +char *ptr_std; +int slave_dirs; /* The level of trust the shipping process will have (0 means disabled) */ -int panic_level; +int panic_level; /* Port number */ -int port_number; +int port_number; -/* - * The searching for a trail by it's name, - * or by it's name & origin host, this is for example, - * if we change a host name and this flag is on, - * all it's trails will be sync again since the entire path - * will be different, this is: - * 2010xxxxx.HOST_ONE.201006date_recvd - * then we change HOST_ONE to HOST_OTHER - * with the flag on, there must be a trail: - * 2010xxxxx.HOST_OTHER.201006date_recvd - * but, there is not such trail so we sync again. +/* + * The searching for a trail by it's name, or by it's name & origin host, + * this is for example, if we change a host name and this flag is on, all + * it's trails will be sync again since the entire path will be different, + * this is: 2010xxxxx.HOST_ONE.201006date_recvd then we change HOST_ONE to + * HOST_OTHER with the flag on, there must be a trail: + * 2010xxxxx.HOST_OTHER.201006date_recvd but, there is not such trail so we + * sync again. */ -int lookup_host; +int lookup_host; /* - * DAMasterD - * Distributed Audit Master Daemon - * - * This program runs on a master system, in order - * to receive the trails (and perform the appropiate naming - * and pathing) from the slave systems, when not runs with - * debug option, it daemonize itself + * DAMasterD Distributed Audit Master Daemon + * + * This program runs on a master system, in order to receive the trails (and + * perform the appropiate naming and pathing) from the slave systems, when + * not runs with debug option, it daemonize itself */ int main(int argc, char *argv[]) { - char cl_opt; + char cl_opt; debug = 0; while ((cl_opt = getopt(argc, argv, "dl")) != -1) switch (cl_opt) { - case 'd': - /* Debug option */ - debug = 1; - break; + case 'd': + /* Debug option */ + debug = 1; + break; } /* If not debugging, daemonize the program */ - if (debug == 0 && daemon(0,0) != 0) { + if (debug == 0 && daemon(0, 0) != 0) { perror("Can't daemonize, exiting!"); exit(1); } - /* Set the directory path, the host address, the panic level */ if (get_parameters() == -1) { to_log("Can't get the parameters to work!"); exit(1); } - ptr_std = slave_trails_dir + strlen(slave_trails_dir); /* @@ -135,7 +129,6 @@ to_log("DAMasterd disabled"); exit(0); } - if (do_master_daemon() == -1) exit(1); @@ -145,17 +138,16 @@ static int do_master_daemon() { - int socketfd, newsockfd, childpid; - char message[256]; - struct sockaddr clientinfo; + int socketfd , newsockfd, childpid; + char message [256]; + struct sockaddr clientinfo; if ((socketfd = init_socket(port_number)) < 0) { sprintf(message, "Error initializing socket on port %d", - port_number); + port_number); to_log(message); return (-1); } - while (1) { newsockfd = accept_connection(socketfd, &clientinfo); @@ -164,8 +156,6 @@ to_log(message); return (-1); } - - if (!debug && (childpid = fork()) < 0) { to_log("Error forking the process"); return (-1); @@ -177,7 +167,6 @@ if (!debug) close(socketfd); } - close(newsockfd); usleep(1000); @@ -189,14 +178,14 @@ static int get_parameters() { - /* + /* * GSoC: using an special file, intended to include this values at * audit_control */ - FILE *fpars = fopen(AUDIT_DAMASTERD_FILE, "r"); + FILE *fpars = fopen(AUDIT_DAMASTERD_FILE, "r"); - char sslave_dirs[10]; - char lkup_host[10]; + char sslave_dirs[10]; + char lkup_host [10]; if (!fpars) return (-1); @@ -226,32 +215,30 @@ static int process_request(int sfd, struct sockaddr *clientinfo) { - int res = 0; + int res = 0; - char opt[2]; + char opt [2]; - get_from_socket(sfd, opt, sizeof (opt)); + get_from_socket(sfd, opt, sizeof(opt)); - while (res != -1) - { - switch(opt[0]) - { - case '0': - /* The process is finished */ - return 0; - break; - case '1': - /* The request is about searching for a file */ - res = search_trail(sfd, clientinfo); - break; - case '2': - /* The request is about receiving a trail */ - res = receive_trail(sfd, clientinfo); - break; - default: - to_log("Can't understand user's request!"); + while (res != -1) { + switch (opt[0]) { + case '0': + /* The process is finished */ + return 0; + break; + case '1': + /* The request is about searching for a file */ + res = search_trail(sfd, clientinfo); + break; + case '2': + /* The request is about receiving a trail */ + res = receive_trail(sfd, clientinfo); + break; + default: + to_log("Can't understand user's request!"); } - get_from_socket(sfd, opt, sizeof (opt)); + get_from_socket(sfd, opt, sizeof(opt)); } close(sfd); @@ -262,69 +249,65 @@ static int search_trail(int sfd, struct sockaddr *clientinfo) { - DIR *dp; - struct dirent *dirp; - struct stat statbuf; + DIR *dp; + struct dirent *dirp; + struct stat statbuf; - char *ptr; - char hbuf[NI_MAXHOST+1]; - char message[MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; - char hostname[NI_MAXHOST+1]; - char pathslave[MAX_TRAILPATH_SIZE+1], sha256slave[SHA256_SIZE]; - char dirpath[MAX_DIR_SIZE+1]; - char found_trail[] = "n"; + char *ptr; + char hbuf [NI_MAXHOST + 1]; + char message [MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; + char hostname [NI_MAXHOST + 1]; + char pathslave [MAX_TRAILPATH_SIZE + 1], sha256slave[SHA256_SIZE]; + char dirpath [MAX_DIR_SIZE + 1]; + char found_trail[] = "n"; - get_from_socket(sfd, pathslave, sizeof (pathslave)); - get_from_socket(sfd, sha256slave, sizeof (sha256slave)); + get_from_socket(sfd, pathslave, sizeof(pathslave)); + get_from_socket(sfd, sha256slave, sizeof(sha256slave)); strlcpy(hostname, - inet_ntoa(((struct sockaddr_in *) clientinfo)->sin_addr), - sizeof (hostname)); + inet_ntoa(((struct sockaddr_in *)clientinfo)->sin_addr), + sizeof(hostname)); if (getnameinfo(clientinfo, clientinfo->sa_len, hbuf, sizeof(hbuf), - NULL, 0, NI_NAMEREQD)) + NULL, 0, NI_NAMEREQD)) to_log("Couldn't resolve hostname, using IP address"); else - strlcpy(hostname, hbuf, sizeof (hostname)); + strlcpy(hostname, hbuf, sizeof(hostname)); snprintf(message, sizeof(message), "Looking for \"%s\" from \"%s\" with SHA256: \"%s\"", pathslave, - hostname, sha256slave); + hostname, sha256slave); to_log(message); - strlcpy(dirpath, slave_trails_dir, sizeof (dirpath)); + strlcpy(dirpath, slave_trails_dir, sizeof(dirpath)); if (slave_dirs) { - strlcat(dirpath, "/", sizeof (dirpath)); - strlcat(dirpath, hostname, sizeof (dirpath)); + strlcat(dirpath, "/", sizeof(dirpath)); + strlcat(dirpath, hostname, sizeof(dirpath)); } - - if ( !(dp = opendir(dirpath)) ) { + if (!(dp = opendir(dirpath))) { to_log("Can't open slave trails' directory"); send_to_socket(sfd, "n"); return (1); } - /* * We must count the elements (just the valid ones, this is: the * trails) of the directory. */ - while ('n' == found_trail[0] && (dirp = readdir(dp)) != NULL ) + while ('n' == found_trail[0] && (dirp = readdir(dp)) != NULL) if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) { /* We have other than . or .. */ asprintf(&ptr, "%s/%s", dirpath, dirp->d_name); - if ( stat(ptr, &statbuf) < 0 ) - { + if (stat(ptr, &statbuf) < 0) { to_log("Stat error!"); return -1; } - if (S_ISDIR(statbuf.st_mode) == 0) { /* It's not a directory */ - if ( check_files_equal(pathslave, sha256slave, - hostname, dirp->d_name, ptr) ) { + if (check_files_equal(pathslave, sha256slave, + hostname, dirp->d_name, ptr)) { /* * Check that the trails are the same * name + SHA256 @@ -334,41 +317,36 @@ } free(ptr); } - closedir(dp); - snprintf(message, sizeof (message), "The search for %s resulted: %s\n", - pathslave, ('y' == found_trail[0]) ? "YES" : "NO"); + snprintf(message, sizeof(message), "The search for %s resulted: %s\n", + pathslave, ('y' == found_trail[0]) ? "YES" : "NO"); send_to_socket(sfd, found_trail); return (1); } /* - * This function receives the name and MD5 checksum of the slave trail - * and the path and fullpath (to get MD5) of the master trail - * and checks if they are the same, also checks the lookup_host - * variable to determine if the hostname must be searched as part - * of the trails name + * This function receives the name and MD5 checksum of the slave trail and + * the path and fullpath (to get MD5) of the master trail and checks if they + * are the same, also checks the lookup_host variable to determine if the + * hostname must be searched as part of the trails name */ static int check_files_equal(char *pathslave, char *sha256slave, char *hostname, char *path, - char *fullpath) + char *fullpath) { - char path_to_find[strlen(pathslave) + strlen(hostname) + 2]; + char path_to_find[strlen(pathslave) + strlen(hostname) + 2]; - strlcpy(path_to_find, pathslave, sizeof (path_to_find)); + strlcpy(path_to_find, pathslave, sizeof(path_to_find)); - if (lookup_host) - { - strlcat(path_to_find, ".", sizeof (path_to_find)); - strlcat(path_to_find, hostname, sizeof (path_to_find)); + if (lookup_host) { + strlcat(path_to_find, ".", sizeof(path_to_find)); + strlcat(path_to_find, hostname, sizeof(path_to_find)); } - - if (!strncmp(path, path_to_find, strlen(path_to_find))) - { - char *sha256 = (char *) malloc (sizeof(char) * SHA256_SIZE); + if (!strncmp(path, path_to_find, strlen(path_to_find))) { + char *sha256 = (char *)malloc(sizeof(char) * SHA256_SIZE); sha256 = SHA256_File(fullpath, sha256); if (!strcmp(sha256, sha256slave)) @@ -376,82 +354,75 @@ free(sha256); } - return (0); } static int receive_trail(int sfd, struct sockaddr *clientinfo) { - DIR *dp; + DIR *dp; - char fullpath[MAX_PATH_SIZE + 1]; - char hbuf[NI_MAXHOST+1]; - char message[MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; - char hostname[NI_MAXHOST+1]; - char pathslave[MAX_TRAILPATH_SIZE+1]; - char dirpath[MAX_DIR_SIZE+1]; - char buffer[MAX_BUF_SIZE + 1]; - int brecv; - time_t mtime; - struct tm *ltime; - unsigned file_size; - int fd, bwrtn, bread; + char fullpath [MAX_PATH_SIZE + 1]; + char hbuf [NI_MAXHOST + 1]; + char message [MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; + char hostname [NI_MAXHOST + 1]; + char pathslave [MAX_TRAILPATH_SIZE + 1]; + char dirpath [MAX_DIR_SIZE + 1]; + char buffer [MAX_BUF_SIZE + 1]; + int brecv; + time_t mtime; + struct tm *ltime; + unsigned file_size; + int fd , bwrtn, bread; - get_from_socket(sfd, pathslave, sizeof (pathslave)); + get_from_socket(sfd, pathslave, sizeof(pathslave)); strlcpy(hostname, - inet_ntoa(((struct sockaddr_in *) clientinfo)->sin_addr), - sizeof (hostname)); + inet_ntoa(((struct sockaddr_in *)clientinfo)->sin_addr), + sizeof(hostname)); if (getnameinfo(clientinfo, clientinfo->sa_len, hbuf, sizeof(hbuf), - NULL, 0, NI_NAMEREQD)) + NULL, 0, NI_NAMEREQD)) to_log("Couldn't resolve hostname, using IP address"); else - strlcpy(hostname, hbuf, sizeof (hostname)); + strlcpy(hostname, hbuf, sizeof(hostname)); - snprintf(message, sizeof (message), "Receiving \"%s\" from \"%s\"", - pathslave, hostname); + snprintf(message, sizeof(message), "Receiving \"%s\" from \"%s\"", + pathslave, hostname); to_log(message); - strlcpy(dirpath, slave_trails_dir, sizeof (dirpath)); + strlcpy(dirpath, slave_trails_dir, sizeof(dirpath)); - if ( !(dp = opendir(dirpath)) ) { + if (!(dp = opendir(dirpath))) { to_log("Can't open Slave trails dir, please create it or" - " change the value at config files!"); + " change the value at config files!"); return (-1); } - closedir(dp); - if (slave_dirs) - { - strlcat(dirpath, "/", sizeof (dirpath)); - strlcat(dirpath, hostname, sizeof (dirpath)); + if (slave_dirs) { + strlcat(dirpath, "/", sizeof(dirpath)); + strlcat(dirpath, hostname, sizeof(dirpath)); } - - if ( !(dp = opendir(dirpath)) ) - { + if (!(dp = opendir(dirpath))) { to_log("Creating slave dir for this host"); - if ( mkdir(dirpath, S_IRWXU | S_IRGRP | S_IXGRP) < 0 ) - { + if (mkdir(dirpath, S_IRWXU | S_IRGRP | S_IXGRP) < 0) { to_log("Cant't create host's directory!"); return -1; } - } - else + } else closedir(dp); - strlcat(dirpath, "/", sizeof (dirpath)); + strlcat(dirpath, "/", sizeof(dirpath)); mtime = time(NULL); ltime = gmtime(&mtime); snprintf(fullpath, sizeof(fullpath), "%s%s.%s.%04d%02d%02d%02d%02d%02d", - dirpath, pathslave, hostname, ltime->tm_year + 1900, - ltime->tm_mon + 1, ltime->tm_mday, ltime->tm_hour, ltime->tm_min, - ltime->tm_sec); - snprintf(message, sizeof (message), "Create: %s", fullpath); + dirpath, pathslave, hostname, ltime->tm_year + 1900, + ltime->tm_mon + 1, ltime->tm_mday, ltime->tm_hour, ltime->tm_min, + ltime->tm_sec); + snprintf(message, sizeof(message), "Create: %s", fullpath); to_log(message); /* We get the trail size */ @@ -462,21 +433,18 @@ to_log("Can't create the trail at master system"); return (-1); } - while (file_size) { brecv = recv(sfd, &bread, sizeof(bread), 0); if (brecv < 0) { to_log("Error receiving the file"); return (-1); } - brecv = recv(sfd, buffer, bread, 0); if (brecv < 0) { to_log("Error receiving the file"); return (-1); - } - else if (brecv == 0) + } else if (brecv == 0) break; bwrtn = write(fd, buffer, brecv); @@ -485,11 +453,10 @@ to_log("Error writting the file"); return (-1); } - file_size -= brecv; } - snprintf(message, sizeof (message), "Master got: %s", fullpath); + snprintf(message, sizeof(message), "Master got: %s", fullpath); to_log(message); close(fd); @@ -499,7 +466,5 @@ to_log("Error changing permissions"); return (-1); } - return (0); } - ==== //depot/projects/soc2010/disaudit/msocket_work.c#8 (text+ko) ==== @@ -40,12 +40,6 @@ #include -/*** DECLARATIONS ***/ - -/* local prototypes */ -int init_socket(int); -int accept_connection(int, struct sockaddr *); - int init_socket(int port) { @@ -87,4 +81,3 @@ return (retval); } - ==== //depot/projects/soc2010/disaudit/msocket_work.h#9 (text+ko) ==== ==== //depot/projects/soc2010/disaudit/shipd.c#10 (text+ko) ==== @@ -56,91 +56,97 @@ /*** DECLARATIONS ***/ /* Trail Entries */ -typedef struct s_trail_entry -{ - char name[MAX_TRAILPATH_SIZE + 1]; - int found; +typedef struct s_trail_entry { + char name [MAX_TRAILPATH_SIZE + 1]; + unsigned dir_id; + int found; struct s_trail_entry *next; -} trail_entry; +} trail_entry; /* Directory entries */ -typedef struct s_audit_dir_entry -{ - char path[MAX_DIR_SIZE+1]; -} audit_dir_entry; +/* + * This implementation replaces char audit_trails_dir[MAX_DIR_SIZE + 1]; in + * order to support multiple audit trail directories + */ +typedef struct s_audit_dir_entry { + unsigned id; + char name [MAX_DIR_SIZE + 1]; + struct s_audit_dir_entry *next; +} audit_dir_entry; + +/*** local prototypes ***/ +static int add_trail_entry(trail_entry ** root, char *name, unsigned dir_id); +static int cmp_trails(const void *A, const void *B); +static void delete_trail_entry(trail_entry ** root, int criteria, int number); +static void do_daemon(); +static void do_daemon_date(); +static void do_daemon_all(); +static void do_last(); +static int get_last_trail(char *path, size_t path_size, unsigned *dir_id); +static int get_parameters(); +static int is_audit_trail(char *path); +static int is_in_master(trail_entry * cur, int *first_found); +static void pll (trail_entry * root); +static int send_trail(trail_entry * cur); +static int add_audit_dir_entry(audit_dir_entry ** root, char *path, unsigned id); +static void delete_audit_dir_entry(audit_dir_entry ** root); +static void set_dir_id(audit_dir_entry ** temp, unsigned id); /* Directory settings took from audit_control */ -char audit_trails_dir[MAX_DIR_SIZE + 1]; -char master_host[MAX_HOST_SIZE + 1]; - -/*** local prototypes ***/ -static int add_trail_entry(trail_entry **root, char *name); -static int cmp_trails (const void *A, const void *B); -static void delete_trail_entry(trail_entry **root, int criteria, int number); -static void do_daemon(); -static void do_daemon_date(); -static void do_daemon_all(); -static void do_last(); -static int get_last_trail(char *path, size_t path_size); -static int get_parameters(); -static int is_audit_trail(char *path); -static int is_in_master(trail_entry *cur, int *first_found); -static void pll(trail_entry *root); -static int send_trail(trail_entry *cur); +char master_host[MAX_HOST_SIZE + 1]; +audit_dir_entry *audit_dir_root; /* The level of trust the shipping process will have (0 means disabled) */ -int panic_level; +int panic_level; /* The frequency the daemon will be checking the master's trail list */ -int msec_freq; +int msec_freq; /* Port number */ -int port_number; +int port_number; /* - * ShipD - * Shipping Daemon - * - * This program is checking, according to the panic_level variable - * the audit trail directories and send the trails to a master - * system, when no runs with debug option, it daemonize itself + * ShipD Shipping Daemon + * + * This program is checking, according to the panic_level variable the audit + * trail directories and send the trails to a master system, when no runs + * with debug option, it daemonize itself */ int -main (int argc, char *argv[]) +main(int argc, char *argv[]) { - char cl_opt; - int last = 0; + char cl_opt; + int last = 0; debug = 0; + audit_dir_root = NULL; while ((cl_opt = getopt(argc, argv, "dl")) != -1) switch (cl_opt) { - case 'd': - /* Debug option */ - debug = 1; - break; - case 'l': - /* - * Last trail (when called by AUDIT when it - * closes the trail). - */ - last = 1; - break; + case 'd': + /* Debug option */ + debug = 1; + break; + case 'l': + /* + * Last trail (when called by AUDIT when it closes + * the trail). + */ + last = 1; + break; } /* If not debugging, daemonize the program */ - if (debug == 0 && daemon(0,0) != 0) { + if (debug == 0 && daemon(0, 0) != 0) { perror("Can't daemonize, exiting!"); exit(1); } - /* Set the directory path, the host address, the panic level */ if (get_parameters() == -1) { to_log("Can't get the parameters to work!"); exit(1); } - - /* + /* * There is no shipd enabled and it wasn't called by AUDIT (normally * the unique way to get 'last' on). */ @@ -148,7 +154,6 @@ to_log("Shipd disabled"); exit(0); } - /* * This means that the daemon will only search for the last closed * trail and send to the master system. @@ -157,12 +162,14 @@ do_last(); } else { /* - * Otherwise, we will perform a permanent listing checking and - * sync them. + * Otherwise, we will perform a permanent listing checking + * and sync them. */ do_daemon(); } + delete_audit_dir_entry(&audit_dir_root); + return (0); } @@ -170,11 +177,15 @@ static int get_parameters() { - /* + /* * GSoC: using an special file, intended to include this values at * audit_control. */ - FILE *fpars = fopen(AUDIT_SHIPD_FILE, "r"); + FILE *fpars = fopen(AUDIT_SHIPD_FILE, "r"); + + char audit_trails_dir[MAX_DIR_SIZE + 1]; + + unsigned dir_id = 0; if (!fpars) return -1; @@ -183,10 +194,15 @@ return -1; /* - * XXX This parsing of the shipd_control file might need to be + * XXX This parsing of the shipd_control file might need to be * reworked a bit. -sson. */ fscanf(fpars, "%s", audit_trails_dir); + add_audit_dir_entry(&audit_dir_root, audit_trails_dir, ++dir_id); + fscanf(fpars, "%s", audit_trails_dir); + add_audit_dir_entry(&audit_dir_root, audit_trails_dir, ++dir_id); + fscanf(fpars, "%s", audit_trails_dir); + add_audit_dir_entry(&audit_dir_root, audit_trails_dir, ++dir_id); fscanf(fpars, "%s", master_host); fscanf(fpars, "%d", &panic_level); fscanf(fpars, "%d", &msec_freq); @@ -198,30 +214,30 @@ } /* - * Look for the last closed trail and - * send it. + * Look for the last closed trail and send it. */ static void do_last() { - char last_trail[MAX_TRAILPATH_SIZE + 1]; - char message[MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; - trail_entry *root = NULL; + char last_trail[MAX_TRAILPATH_SIZE + 1]; + char message [MAX_PATH_SIZE + MESSAGE_DESC_SIZE]; + unsigned dir_id = 0; + trail_entry *root = NULL; - if (get_last_trail(last_trail, sizeof (last_trail)) == -1) + if (get_last_trail(last_trail, sizeof(last_trail), &dir_id) == -1) to_log("Nothing to send!"); - snprintf(message, sizeof (message), "Will send \"%s\" to %s", - last_trail, master_host); + snprintf(message, sizeof(message), "Will send \"%s\" to %s", + last_trail, master_host); to_log(message); - add_trail_entry(&root, last_trail); + add_trail_entry(&root, last_trail, dir_id); if (send_trail(root) == -1) { to_log("Error sending the last trail"); } else { - snprintf(message, sizeof (message), - "Successfully sent \"%s\" to %s", last_trail, master_host); + snprintf(message, sizeof(message), + "Successfully sent \"%s\" to %s", last_trail, master_host); to_log(message); } @@ -229,77 +245,84 @@ } /* - * Used by do_last() function, this get the last - * closed trail in meaning of lexicographic - * order (that is also a chronological one) + * Used by do_last() function, this get the last closed trail in meaning of + * lexicographic order (that is also a chronological one) */ static int -get_last_trail(char *path, size_t path_size) +get_last_trail(char *path, size_t path_size, unsigned *dir_id) { - DIR *dp; - struct dirent *dirp; - struct stat statbuf; + DIR *dp; + struct dirent *dirp; + struct stat statbuf; + + audit_dir_entry *trail_directory = audit_dir_root; - char *ptr; + char *ptr; *path = 0; - if ( !(dp = opendir(audit_trails_dir)) ) { - to_log("Can't open directory"); - return -1; - } + while (trail_directory) { + if (!(dp = opendir(trail_directory->name))) { + to_log("Can't open directory"); + return -1; + } + /* + * Here we will pass through the entire directory and get the + * path of the latest closed trail. + */ + while ((dirp = readdir(dp)) != NULL) + if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) { + /* We have other than . or .. */ - /* - * Here we will pass through the entire directory and get the path of - * the latest closed trail. - */ - while ( (dirp = readdir(dp)) != NULL ) - if (strcmp(dirp->d_name, ".") && strcmp(dirp->d_name, "..")) { - /* We have other than . or .. */ + asprintf(&ptr, "%s/%s", trail_directory->name, dirp->d_name); - asprintf(&ptr, "%s/%s", audit_trails_dir, dirp->d_name); - - if ( stat(ptr, &statbuf) < 0 ) { - to_log("Stat error!"); - return -1; - } - - if (S_ISDIR(statbuf.st_mode) == 0) { - /* It's not a directory */ - if ( is_audit_trail(dirp->d_name) ) { - /* It's not other file */ - if (*path == 0) { - /* - * This is our first trail, so - * assumme is the last. - */ - strlcpy(path, dirp->d_name, - path_size); - } else { - /* - * Fortunately, the older a - * trail is, the lower - * lexocographic value it has. - */ - if (strcmp (path, ptr) < 0) - strlcpy(path, - dirp->d_name, - path_size); + if (stat(ptr, &statbuf) < 0) { + to_log("Stat error!"); + return -1; + } + if (S_ISDIR(statbuf.st_mode) == 0) { + /* It's not a directory */ + if (is_audit_trail(dirp->d_name)) { + /* It's not other file */ + if (*path == 0) { + /* + * This is our first + * trail, so assumme + * is the last. + */ + strlcpy(path, dirp->d_name, + path_size); + *dir_id = trail_directory->id; + } else { + /* + * Fortunately, the + * older a trail is, + * the lower + * lexicographic + * value it has. + */ + if (strcmp(path, dirp->d_name) < 0) { + strlcpy(path, + dirp->d_name, + path_size); + *dir_id = trail_directory->id; + } + } } } + free(ptr); } - free(ptr); - } + closedir(dp); - closedir(dp); + trail_directory = trail_directory->next; + } return (0); } /* - * When exploring /var/audit/ (or the directory - * where the trails are), not all files are trails - * so we must ensure we will only deal with the ones + * When exploring /var/audit/ (or the directory where the trails are), not + * all files are trails so we must ensure we will only deal with the ones * that are trails. */ static int @@ -307,8 +330,7 @@ { /* * We have these posibilities, only the first one is allowed - * 20100619223115.20100619223131 - * 20100619223131.not_terminated + * 20100619223115.20100619223131 20100619223131.not_terminated * current */ @@ -322,19 +344,17 @@ static void do_daemon() { - while (1) - { - switch (panic_level) - { + while (1) { + switch (panic_level) { case PANIC_DATE: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 08:21:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CF511066A11; Wed, 28 Jul 2010 08:21: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 EEC6A106632A for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81E188FC22 for ; Wed, 28 Jul 2010 08:21:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8LaN6009162 for ; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LaUW009160 for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:36 GMT (envelope-from afiveg@FreeBSD.org) Date: Wed, 28 Jul 2010 08:21:36 GMT Message-Id: <201007280821.o6S8LaUW009160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 08:21:56 -0000 http://p4web.freebsd.org/@@181470?ac=10 Change 181470 by afiveg@ringmap-2 on 2010/07/26 23:06:14 debugging: The userspace-process reads sometimes the old cached date from ring :( The problem is not solved yet Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#23 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#8 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#7 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#6 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#7 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#37 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#37 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#7 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#18 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#19 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#13 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#6 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#6 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#8 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#8 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#8 edit .. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#6 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#23 (text+ko) ==== @@ -278,6 +278,7 @@ #if (__RINGMAP_DEB) printf("Slot %d was not accepted by driver!\n", curr_slot); #endif + printf("Slot %d was not accepted by driver!\n", curr_slot); goto out; } ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#8 (text+ko) ==== @@ -1343,7 +1343,9 @@ IXGBE_TX_UNLOCK(txr); #ifdef RINGMAP + IXGBE_RX_LOCK(que->rxr); adapter->rm->funcs->sync_head(que); + IXGBE_RX_UNLOCK(que->rxr); /* TODO: don't wake up the all threads, only our thread! */ SLIST_FOREACH(co, &adapter->rm->object_list, objects) { @@ -1437,7 +1439,9 @@ #ifdef RINGMAP struct capt_object *co = NULL; + IXGBE_RX_LOCK(que->rxr); adapter->rm->funcs->delayed_isr(que); + IXGBE_RX_UNLOCK(que->rxr); #endif more_rx = ixgbe_rxeof(que, adapter->rx_process_limit); @@ -1449,7 +1453,9 @@ more_rx = ixgbe_rxeof(que, adapter->rx_process_limit); #ifdef RINGMAP + IXGBE_RX_LOCK(que->rxr); adapter->rm->funcs->sync_head(que); + IXGBE_RX_UNLOCK(que->rxr); /* TODO: Only our co not all */ SLIST_FOREACH(co, &adapter->rm->object_list, objects) { @@ -3517,6 +3523,8 @@ } #endif + /* To delete */ + printf("[%s] Refreshed slot %d\n", __func__, i); cleaned = i; /* Calculate next index */ if (++i == adapter->num_rx_desc) @@ -4318,7 +4326,7 @@ sendmp = rbuf->fmp; #ifndef RINGMAP rbuf->m_pack = rbuf->fmp = NULL; -#endif +#endif if (sendmp != NULL) /* secondary frag */ sendmp->m_pkthdr.len += mp->m_len; else { @@ -4354,6 +4362,12 @@ sendmp->m_flags |= M_FLOWID; #endif } + +#ifdef RINGMAP + if (adapter->rm != NULL) + adapter->rm->funcs->delayed_isr_per_packet(que, i); +#endif + next_desc: bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); @@ -4364,31 +4378,25 @@ #ifndef RINGMAP -/* RINGMAP: Do not send packet to the IP-stack. And do not refresh */ +/* RINGMAP: Do not send packet to the IP-stack. */ /* Now send to the stack or do LRO */ if (sendmp != NULL) ixgbe_rx_input(rxr, ifp, sendmp, ptype); +#endif /* Every 8 descriptors we go to refresh mbufs */ if (processed == 8) { ixgbe_refresh_mbufs(rxr, i); processed = 0; } -#else - if (adapter->rm != NULL) - adapter->rm->funcs->delayed_isr_per_packet(que, - R_MODULO(i-1)); -#endif } -#ifndef RINGMAP /* Refresh any remaining buf structs */ if (processed != 0) { ixgbe_refresh_mbufs(rxr, i); processed = 0; } -#endif rxr->next_to_check = i; ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#7 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#6 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#7 (text+ko) ==== @@ -96,7 +96,6 @@ RINGMAP_LOCK(adapter->rm); co = get_capt_obj(que); if (co != NULL) { - ixgbe_refresh_mbufs(que->rxr, SW_TAIL(co->ring)); RINGMAP_HW_SYNC_TAIL(que, co->ring); } RINGMAP_UNLOCK(adapter->rm); ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#37 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#37 (text+ko) ==== @@ -32,9 +32,9 @@ #define RINGMAP_MAX_THREADS 8 struct address { - vm_paddr_t phys; - vm_offset_t kern; - vm_offset_t user; + vm_paddr_t volatile phys; + vm_offset_t volatile kern; + vm_offset_t volatile user; }; /* @@ -136,7 +136,7 @@ unsigned int pid; /* Array of slots */ - struct ring_slot slot[SLOTS_NUMBER]; + struct ring_slot volatile slot[SLOTS_NUMBER]; }; ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#7 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#18 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#19 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#13 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#6 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#6 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#8 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#8 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#8 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#6 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 28 13:34:29 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81CEB106566C; Wed, 28 Jul 2010 13:34: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 44EAC106564A for ; Wed, 28 Jul 2010 13:34:29 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 16B258FC1F for ; Wed, 28 Jul 2010 13:34:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SDYSjl060490 for ; Wed, 28 Jul 2010 13:34:28 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SDYSZ0060488 for perforce@freebsd.org; Wed, 28 Jul 2010 13:34:28 GMT (envelope-from bz@freebsd.org) Date: Wed, 28 Jul 2010 13:34:28 GMT Message-Id: <201007281334.o6SDYSZ0060488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 13:34:29 -0000 http://p4web.freebsd.org/@@181508?ac=10 Change 181508 by bz@bz_dumpster on 2010/07/28 13:33:40 IFC @181506 Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_switch.S#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/identcpu.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/files.mv#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/timer.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/files.s3c2xx0#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0_rtc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c24x0reg.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2xx0_space.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/arm/s3c2xx0/s3c2xx0var.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/ata/ata_da.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/cam_ccb.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_misc.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/compat/freebsd32/freebsd32_util.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files#13 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.amd64#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.i386#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/files.mips#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.mk#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/kmod.mk#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/conf/options.mips#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/README.txt#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmip.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-abi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-access-native.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-access.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-address.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-app-init-linux.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-app-init.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-app-init.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-asm.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-asx.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-atomic.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-bootloader.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-bootmem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-bootmem.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-ciu.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-cmd-queue.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-cmd-queue.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-compactflash.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-compactflash.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-core.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-core.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-coremask.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-coremask.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-csr-addresses.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-csr-db-support.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-csr-db.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-csr-db.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-csr-enums.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-csr-typedefs.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-csr.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-cvmmem.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-dfa.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-dfa.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-dma-engine.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-dma-engine.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-ebt3000.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-ebt3000.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-fau.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-flash.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-flash.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-fpa.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-fpa.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-gmx.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-gpio.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-board.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-board.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-check-defines.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-errata.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-errata.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-fpa.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-fpa.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-loop.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-loop.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-npi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-npi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-rgmii.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-sgmii.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-spi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-spi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-util.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-util.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-xaui.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper-xaui.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-helper.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-higig.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-interrupt-decodes.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-interrupt-rsl.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-interrupt.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-interrupt.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-iob.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-ipd.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-key.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-l2c.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-l2c.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-llm.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-llm.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-lmc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-log-arc.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-log.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-log.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-malloc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-malloc/README-malloc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-malloc/arena.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-malloc/malloc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-malloc/malloc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-malloc/thread-m.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-mdio.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-mgmt-port.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-mio.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-nand.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-nand.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-npi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-packet.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pci.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pcie.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pcie.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pip.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pko.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pko.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-platform.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pow.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-pow.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-raid.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-raid.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-resources.config#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-rng.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-rtc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-rwlock.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-scratch.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-shared-linux.ld#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-spi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-spi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-spi4000.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-spinlock.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-swap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-sysinfo.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-sysinfo.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-thunder.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-thunder.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-tim.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-tim.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-tra.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-tra.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-twsi-raw.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-twsi-raw.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-twsi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-twsi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-uart.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-usb.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-usb.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-utils.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-version.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-warn.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-warn.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-wqe.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-zip.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-zip.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx-zone.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/cvmx.mk#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/executive-config.h.template#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/octeon-feature.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/octeon-model.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/octeon-model.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/octeon-pci-console.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/contrib/octeon-sdk/octeon-pci-console.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/crypto/aesni/aesencdec_amd64.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/crypto/aesni/aesencdec_i386.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/crypto/aesni/aeskeys_amd64.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/crypto/aesni/aeskeys_i386.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/crypto/aesni/aesni.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/crypto/aesni/aesni.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/crypto/aesni/aesni_wrap.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpi_support/acpi_aiboost.c#4 delete .. //depot/projects/soc2009/anchie_send/src/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/arcmsr/arcmsr.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-all.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/bwn/if_bwn.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cas/if_cas.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/if_igb.c#11 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/md/md.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/mvs/mvs.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/siis/siis.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/net/uhso.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/quirk/usb_quirk.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/u3g.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uftdi.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uipaq.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uslcom.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfs/nfs_commonport.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_cllock.c#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clnfsiod.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clport.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clsubs.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_clvnops.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/fs/nfsclient/nfs_lock.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/geom_disk.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/segments.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/isa/npx.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/param.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/init_main.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_clocksource.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_et.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_exec.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_ktr.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/link_elf_obj.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/ciu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/cryptocteon/cavium_crypto.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/cryptocteon/cryptocteon.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/cryptocteon/cryptocteonvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/cvmx_config.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_fau.h#3 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_fpa.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_ipd.c#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_ipd.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_pip.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_pko.c#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_pko.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.c#4 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/dev/rgmii/octeon_rgmx.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/driveid.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/files.octeon1#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/obio.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/cavium-ethernet.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-common.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-common.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-defines.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-headers.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-mdio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-mdio.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-mem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-mem.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-rgmii.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-rx.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-rx.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-sgmii.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-spi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-tx.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-tx.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-util.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet-xaui.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/ethernet.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/octe.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/octebus.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/octebusvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octe/wrapper-cvmx-includes.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_ds1337.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_ebt3000_cf.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_ebt3000_cf.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_mp.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_pcmap_regs.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_rnd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octeon_rtc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octopci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octopci_bus_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octopcireg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/octopcivar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/std.octeon1#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/uart_bus_octeonusart.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/uart_dev_oct16550.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/usb/octusb.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/usb/octusb.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/cavium/usb/octusb_octeon.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/OCTEON1#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/OCTEON1-32#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/conf/OCTEON1.hints#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/_bus.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cache_mipsNN.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpufunc.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/cpuregs.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/smp.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/include/vmparam.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/bus_space_generic.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/cache.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/cache_mipsNN.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/cpu.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/exception.S#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/locore.S#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mainbus.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mp_machdep.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/mpboot.S#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pm_machdep.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pmap.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/support.S#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/tick.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/tlb.S#5 delete .. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/vm_machdep.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/files.xlr#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/intr_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/tick.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/xlr_machdep.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#17 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/acpi/acpi_aiboost/Makefile#3 delete .. //depot/projects/soc2009/anchie_send/src/sys/modules/aesni/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/modules/nfscl/Makefile#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/nfsclient/Makefile#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/modules/nfslock/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/net/if.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/net/if_llatbl.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/ipfw/ip_fw2.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_pcb.c#8 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/nfs/nfs_lock.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/nfs/nfs_lock.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_lock.c#3 delete .. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_lock.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/param.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/vmparam.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/bus.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/_task.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/disk.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/imgact.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/imgact_elf.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/kthread.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/ktr.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/param.h#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/pcpu.h#7 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/priv.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/signal.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/taskqueue.h#5 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/timeet.h#2 integrate .. //depot/projects/soc2009/anchie_send/src/sys/sys/types.h#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_init.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.c#10 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_page.h#6 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_phys.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/vm/vm_phys.h#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/x86/acpica/srat.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/atrtc.c#3 integrate .. //depot/projects/soc2009/anchie_send/src/sys/x86/isa/clock.c#4 integrate .. //depot/projects/soc2009/anchie_send/src/sys/x86/x86/local_apic.c#2 integrate Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_switch.S#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.5 2009/12/08 22:38:42 jkim Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.6 2010/07/26 19:53:09 jkim Exp $ */ #include @@ -102,9 +102,12 @@ movl WAKEUP_CTX(sfmask), %eax wrmsr - /* Restore CR0, CR2 and CR4. */ + /* Restore CR0 except for FPU mode. */ movq WAKEUP_XPCB(CR0), %rax + andq $~(CR0_EM | CR0_TS), %rax movq %rax, %cr0 + + /* Restore CR2 and CR4. */ movq WAKEUP_XPCB(CR2), %rax movq %rax, %cr2 movq WAKEUP_XPCB(CR4), %rax @@ -149,6 +152,17 @@ movq WAKEUP_PCB(DR7), %rax movq %rax, %dr7 + /* Restore FPU state. */ + movq PCPU(FPCURTHREAD), %rax + testq %rax, %rax + je 1f + fxrstor WAKEUP_PCB(USER_FPU) +1: + + /* Restore CR0 with FPU mode. */ + movq WAKEUP_XPCB(CR0), %rax + movq %rax, %cr0 + /* Restore return address. */ movq WAKEUP_PCB(RIP), %rax movq %rax, (%rsp) ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_wakeup.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.31 2010/06/15 18:51:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.32 2010/07/26 19:53:09 jkim Exp $"); #include #include @@ -216,7 +216,6 @@ int acpi_sleep_machdep(struct acpi_softc *sc, int state) { - struct savefpu *stopfpu; #ifdef SMP cpumask_t wakeup_cpus; #endif @@ -246,10 +245,7 @@ cr3 = rcr3(); load_cr3(KPML4phys); - stopfpu = &stopxpcbs[0]->xpcb_pcb.pcb_user_save; if (acpi_savecpu(stopxpcbs[0])) { - fpugetregs(curthread, stopfpu); - #ifdef SMP if (wakeup_cpus != 0 && suspend_cpus(wakeup_cpus) == 0) { device_printf(sc->acpi_dev, @@ -285,7 +281,6 @@ for (;;) ia32_pause(); } else { - fpusetregs(curthread, stopfpu); #ifdef SMP if (wakeup_cpus != 0) acpi_wakeup_cpus(sc, wakeup_cpus); ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/cpu_switch.S#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.172 2010/07/12 19:59:15 kib Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.173 2010/07/26 19:53:09 jkim Exp $ */ #include @@ -417,6 +417,13 @@ leaq (%rax,%rdx),%rax movq %rax,XPCB_KGSBASE(%r8) + movq PCPU(FPCURTHREAD),%rax + testq %rax,%rax + je 1f + clts + fxsave PCB_USER_FPU(%r8) +1: + movl $1, %eax ret END(savectx2) ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.169 2010/06/15 14:59:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.173 2010/07/26 23:20:55 jkim Exp $"); #include #include @@ -65,27 +65,29 @@ #if defined(__GNUCLIKE_ASM) && !defined(lint) -#define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) -#define fnclex() __asm("fnclex") -#define fninit() __asm("fninit") +#define fldcw(cw) __asm __volatile("fldcw %0" : : "m" (cw)) +#define fnclex() __asm __volatile("fnclex") +#define fninit() __asm __volatile("fninit") #define fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) -#define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) -#define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) +#define fnstsw(addr) __asm __volatile("fnstsw %0" : "=am" (*(addr))) +#define fxrstor(addr) __asm __volatile("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) -#define ldmxcsr(r) __asm __volatile("ldmxcsr %0" : : "m" (r)) -#define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ - : : "n" (CR0_TS) : "ax") -#define stop_emulating() __asm("clts") +#define ldmxcsr(csr) __asm __volatile("ldmxcsr %0" : : "m" (csr)) +#define start_emulating() __asm __volatile( \ + "smsw %%ax; orb %0,%%al; lmsw %%ax" \ + : : "n" (CR0_TS) : "ax") +#define stop_emulating() __asm __volatile("clts") #else /* !(__GNUCLIKE_ASM && !lint) */ -void fldcw(caddr_t addr); +void fldcw(u_short cw); void fnclex(void); void fninit(void); void fnstcw(caddr_t addr); void fnstsw(caddr_t addr); void fxsave(caddr_t addr); void fxrstor(caddr_t addr); +void ldmxcsr(u_int csr); void start_emulating(void); void stop_emulating(void); @@ -122,7 +124,7 @@ stop_emulating(); fninit(); control = __INITIAL_FPUCW__; - fldcw(&control); + fldcw(control); mxcsr = __INITIAL_MXCSR__; ldmxcsr(mxcsr); if (PCPU_GET(cpuid) == 0) { @@ -423,7 +425,7 @@ */ fxrstor(&fpu_initialstate); if (pcb->pcb_initial_fpucw != __INITIAL_FPUCW__) - fldcw(&pcb->pcb_initial_fpucw); + fldcw(pcb->pcb_initial_fpucw); pcb->pcb_flags |= PCB_FPUINITDONE; if (PCB_USER_FPU(pcb)) pcb->pcb_flags |= PCB_USERFPUINITDONE; ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.177 2009/07/09 09:34:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.178 2010/07/26 19:53:09 jkim Exp $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -140,6 +140,7 @@ ASSYM(PCB_DR3, offsetof(struct pcb, pcb_dr3)); ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6)); ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7)); +ASSYM(PCB_USER_FPU, offsetof(struct pcb, pcb_user_save)); ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp)); ASSYM(PCB_FULL_IRET, offsetof(struct pcb, pcb_full_iret)); ASSYM(PCB_DBREGS, PCB_DBREGS); ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/identcpu.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.181 2010/05/05 21:07:47 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.182 2010/07/22 09:13:49 kib Exp $"); #include "opt_cpu.h" @@ -76,8 +76,30 @@ int cpu_class; char machine[] = "amd64"; -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, - machine, 0, "Machine class"); + +#ifdef SCTL_MASK32 +extern int adaptive_machine_arch; +#endif + +static int +sysctl_hw_machine(SYSCTL_HANDLER_ARGS) +{ +#ifdef SCTL_MASK32 + static const char machine32[] = "i386"; +#endif + int error; + +#ifdef SCTL_MASK32 + if ((req->flags & SCTL_MASK32) != 0 && adaptive_machine_arch) + error = SYSCTL_OUT(req, machine32, sizeof(machine32)); + else +#endif + error = SYSCTL_OUT(req, machine, sizeof(machine)); + return (error); + +} +SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD, + NULL, 0, sysctl_hw_machine, "A", "Machine class"); static char cpu_model[128]; SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.319 2010/06/22 16:20:10 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.320 2010/07/26 19:53:09 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1329,20 +1329,17 @@ void cpususpend_handler(void) { - struct savefpu *stopfpu; register_t cr3, rf; int cpu = PCPU_GET(cpuid); int cpumask = PCPU_GET(cpumask); rf = intr_disable(); cr3 = rcr3(); - stopfpu = &stopxpcbs[cpu]->xpcb_pcb.pcb_user_save; + if (savectx2(stopxpcbs[cpu])) { - fpugetregs(curthread, stopfpu); wbinvd(); atomic_set_int(&stopped_cpus, cpumask); - } else - fpusetregs(curthread, stopfpu); + } /* Wait for resume */ while (!(started_cpus & cpumask)) ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.34 2009/11/16 10:53:04 phk Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.35 2010/07/22 09:13:49 kib Exp $ */ @@ -59,6 +59,9 @@ #ifndef MACHINE_ARCH #define MACHINE_ARCH "amd64" #endif +#ifndef MACHINE_ARCH32 +#define MACHINE_ARCH32 "i386" +#endif #if defined(SMP) || defined(KLD_MODULE) #define MAXCPU 32 ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/vmparam.h#3 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.60 2010/04/30 00:46:43 kmacy Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.61 2010/07/27 20:33:50 jhb Exp $ */ @@ -132,6 +132,13 @@ #define VM_NFREEORDER 13 /* + * Only one memory domain. + */ +#ifndef VM_NDOMAIN +#define VM_NDOMAIN 1 +#endif + +/* * Enable superpage reservations: 1 level. */ #ifndef VM_NRESERVLEVEL ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.55 2010/06/10 17:59:47 kan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.58 2010/07/26 14:38:51 kib Exp $"); #include #include @@ -60,10 +60,9 @@ #include #include -#include -#include #include +#include #include #include #include @@ -107,105 +106,6 @@ return (lsa); } -/* - * Custom version of exec_copyin_args() so that we can translate - * the pointers. - */ -static int -linux_exec_copyin_args(struct image_args *args, char *fname, - enum uio_seg segflg, char **argv, char **envv) -{ - char *argp, *envp; - u_int32_t *p32, arg; - size_t length; - int error; - - bzero(args, sizeof(*args)); - if (argv == NULL) - return (EFAULT); - - /* - * Allocate temporary demand zeroed space for argument and - * environment strings - */ - args->buf = (char *)kmem_alloc_wait(exec_map, - PATH_MAX + ARG_MAX + MAXSHELLCMDLEN); - if (args->buf == NULL) - return (ENOMEM); - args->begin_argv = args->buf; - args->endp = args->begin_argv; - args->stringspace = ARG_MAX; - - args->fname = args->buf + ARG_MAX; - - /* - * Copy the file name. - */ - error = (segflg == UIO_SYSSPACE) ? - copystr(fname, args->fname, PATH_MAX, &length) : - copyinstr(fname, args->fname, PATH_MAX, &length); - if (error != 0) - goto err_exit; - - /* - * extract arguments first - */ - p32 = (u_int32_t *)argv; - for (;;) { - error = copyin(p32++, &arg, sizeof(arg)); - if (error) - goto err_exit; - if (arg == 0) - break; - argp = PTRIN(arg); - error = copyinstr(argp, args->endp, args->stringspace, &length); - if (error) { - if (error == ENAMETOOLONG) - error = E2BIG; - - goto err_exit; - } - args->stringspace -= length; - args->endp += length; - args->argc++; - } - - args->begin_envv = args->endp; - - /* - * extract environment strings - */ - if (envv) { - p32 = (u_int32_t *)envv; - for (;;) { - error = copyin(p32++, &arg, sizeof(arg)); - if (error) - goto err_exit; - if (arg == 0) - break; - envp = PTRIN(arg); - error = copyinstr(envp, args->endp, args->stringspace, - &length); - if (error) { - if (error == ENAMETOOLONG) - error = E2BIG; - goto err_exit; - } - args->stringspace -= length; - args->endp += length; - args->envc++; - } - } - - return (0); - -err_exit: - kmem_free_wakeup(exec_map, (vm_offset_t)args->buf, - PATH_MAX + ARG_MAX + MAXSHELLCMDLEN); - args->buf = NULL; - return (error); -} - int linux_execve(struct thread *td, struct linux_execve_args *args) { @@ -220,8 +120,8 @@ printf(ARGS(execve, "%s"), path); #endif - error = linux_exec_copyin_args(&eargs, path, UIO_SYSSPACE, args->argp, - args->envp); + error = freebsd32_exec_copyin_args(&eargs, path, UIO_SYSSPACE, + args->argp, args->envp); free(path, M_TEMP); if (error == 0) error = kern_execve(td, &eargs, NULL); ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.41 2010/07/23 21:31:03 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib */ #ifndef _LINUX_SYSPROTO_H_ @@ -59,8 +59,8 @@ }; struct linux_execve_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)]; - char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)]; + char argp_l_[PADL_(u_int32_t *)]; u_int32_t * argp; char argp_r_[PADR_(u_int32_t *)]; + char envp_l_[PADL_(u_int32_t *)]; u_int32_t * envp; char envp_r_[PADR_(u_int32_t *)]; }; struct linux_chdir_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.39 2008/11/29 14:57:58 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.40 2010/07/23 21:31:03 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.41 2010/06/28 18:17:21 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.42 2010/07/23 21:31:03 kib Exp $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib */ #include "opt_compat.h" ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysvec.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.57 2010/05/23 18:32:02 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.58 2010/07/28 04:47:40 alc Exp $"); #include "opt_compat.h" #ifndef COMPAT_FREEBSD32 @@ -804,7 +804,7 @@ { const char *head = (const char *)imgp->image_header; char *rpath; - int error = -1, len; + int error = -1; /* * The interpreter for shell scripts run from a linux binary needs @@ -821,18 +821,12 @@ linux_emul_convpath(FIRST_THREAD_IN_PROC(imgp->proc), imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0, AT_FDCWD); - if (rpath != NULL) { - len = strlen(rpath) + 1; - - if (len <= MAXSHELLCMDLEN) { - memcpy(imgp->interpreter_name, rpath, - len); - } - free(rpath, M_TEMP); - } + if (rpath != NULL) + imgp->args->fname_buf = + imgp->interpreter_name = rpath; } } - return(error); + return (error); } /* ==== //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.37 2010/07/23 21:30:33 kib Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -54,8 +54,8 @@ l_int mode); } 9 AUE_LINK STD { int linux_link(char *path, char *to); } 10 AUE_UNLINK STD { int linux_unlink(char *path); } -11 AUE_EXECVE STD { int linux_execve(char *path, char **argp, \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 13:36:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0DF91065679; Wed, 28 Jul 2010 13:36: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 954C0106567B for ; Wed, 28 Jul 2010 13:36:31 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6948B8FC16 for ; Wed, 28 Jul 2010 13:36:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SDaVVx060696 for ; Wed, 28 Jul 2010 13:36:31 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SDaV19060694 for perforce@freebsd.org; Wed, 28 Jul 2010 13:36:31 GMT (envelope-from bz@freebsd.org) Date: Wed, 28 Jul 2010 13:36:31 GMT Message-Id: <201007281336.o6SDaV19060694@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 13:36:32 -0000 http://p4web.freebsd.org/@@181509?ac=10 Change 181509 by bz@bz_dumpster on 2010/07/28 13:35:49 IFC @181506 -d for two special files. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/bootinfo.h#2 delete .. //depot/projects/soc2009/anchie_send/src/sys/cddl/compat/opensolaris/sys/taskq.h#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 28 13:51:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE5B21065678; Wed, 28 Jul 2010 13:51: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 727A91065677 for ; Wed, 28 Jul 2010 13:51:48 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 461168FC25 for ; Wed, 28 Jul 2010 13:51:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SDpmup062010 for ; Wed, 28 Jul 2010 13:51:48 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SDpm59062008 for perforce@freebsd.org; Wed, 28 Jul 2010 13:51:48 GMT (envelope-from bz@freebsd.org) Date: Wed, 28 Jul 2010 13:51:48 GMT Message-Id: <201007281351.o6SDpm59062008@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 13:51:49 -0000 http://p4web.freebsd.org/@@181510?ac=10 Change 181510 by bz@bz_dumpster on 2010/07/28 13:51:29 Minimize diffs to HEAD avoiding unneeded (changes in) initialization. Change some whitespace. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#46 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#37 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#48 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#46 (text+ko) ==== @@ -415,7 +415,7 @@ int icmp6len = m->m_pkthdr.len - *offp; int code, sum, noff; char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN]; - int ip6len, error = -1; + int ip6len, error; ifp = m->m_pkthdr.rcvif; ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#37 (text+ko) ==== @@ -1769,14 +1769,10 @@ struct m_tag *mtag; struct llentry *ln = lle; struct ip6_hdr *ip6; - int error = -1; + int error = 0; int flags = 0; int ip6len; - unsigned short *nd_type; - ip6 = mtod(m, struct ip6_hdr *); - ip6len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen); - #ifdef INVARIANTS if (lle != NULL) { @@ -1951,11 +1947,12 @@ mac_netinet6_nd6_send(ifp, m); #endif - /* send outgoing NS/NA/REDIRECT packet to sendd. */ + /* Send outgoing NS/NA/REDIRECT packet to sendd. */ if (send_sendso_input_hook != NULL) { mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL); if (mtag != NULL) { - nd_type = (unsigned short *)(mtag + 1); + ip6 = mtod(m, struct ip6_hdr *); + ip6len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen); /* Use the SEND socket */ error = send_sendso_input_hook(m, SND_OUT, ip6len); @@ -1972,7 +1969,6 @@ * a list of mbufs to send and transmit them in the caller * after the lock is dropped */ - if (lle != NULL) { if (*chain == NULL) *chain = m; @@ -2019,7 +2015,6 @@ } if (m) m_freem(m); - return (error); } #undef senderr ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#48 (text+ko) ==== @@ -282,8 +282,10 @@ static int send_modevent(module_t mod, int type, void *unused) { +#ifdef __notyet__ VNET_ITERATOR_DECL(vnet_iter); - int error = 0; +#endif + int error; switch (type) { case MOD_LOAD: @@ -297,8 +299,8 @@ break; case MOD_UNLOAD: /* Do not allow unloading w/o locking. */ - return(EBUSY); -#ifdef 0 + return (EBUSY); +#ifdef __notyet__ VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); if (V_send_so != NULL) { @@ -312,6 +314,7 @@ send_sendso_input_hook = NULL; break; default: + error = 0; break; } From owner-p4-projects@FreeBSD.ORG Wed Jul 28 14:14:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA0CA1065679; Wed, 28 Jul 2010 14:14: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 524271065674 for ; Wed, 28 Jul 2010 14:14:15 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DD158FC13 for ; Wed, 28 Jul 2010 14:14:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SEEF9U065023 for ; Wed, 28 Jul 2010 14:14:15 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SEECXm065020 for perforce@freebsd.org; Wed, 28 Jul 2010 14:14:12 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Wed, 28 Jul 2010 14:14:12 GMT Message-Id: <201007281414.o6SEECXm065020@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 14:14:15 -0000 http://p4web.freebsd.org/@@181511?ac=10 Change 181511 by jlaffaye@jlaffaye-chulak on 2010/07/28 14:13:31 Integrate from gcooper's branch (Mostly IFC + Makefile fixes). Affected files ... .. //depot/projects/soc2010/pkg_complete/Makefile#2 integrate .. //depot/projects/soc2010/pkg_complete/Makefile.inc1#2 integrate .. //depot/projects/soc2010/pkg_complete/Makefile.mips#1 branch .. //depot/projects/soc2010/pkg_complete/ObsoleteFiles.inc#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/cp/cp.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/date/date.1#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/pkill/pkill.1#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/pkill/pkill.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/expand.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/histedit.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/jobs.c#3 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/jobs.h#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/myhistedit.h#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/parser.c#3 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/sh.1#3 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/var.c#2 integrate .. //depot/projects/soc2010/pkg_complete/bin/sh/var.h#2 integrate .. //depot/projects/soc2010/pkg_complete/cddl/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/soc2010/pkg_complete/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/soc2010/pkg_complete/contrib/llvm/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/CREDITS.TXT#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/LICENSE.TXT#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/Makefile.common#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/Makefile.config.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/Makefile.rules#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/ModuleInfo.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/README.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/AutoRegen.sh#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/ExportMap.map#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/LICENSE.TXT#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/README.TXT#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/config.guess#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/config.sub#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/configure.ac#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/depcomp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/install-sh#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/ltmain.sh#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/bison.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/build_exeext.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/c_printf_a.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/check_gnu_make.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/config_makefile.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/config_project.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/cxx_bidi_iterator.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/cxx_flag_check.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/cxx_fwd_iterator.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/cxx_namespaces.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/cxx_std_iterator.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/find_std_program.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/flex.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/func_isinf.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/func_isnan.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/func_mmap_file.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/header_mmap_anonymous.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/huge_val.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/libtool.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/link_options.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/linux_mixed_64_32.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/ltdl.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/need_dev_zero_for_mmap.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/path_perl.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/path_tclsh.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/rand48.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/sanity_check.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/single_cxx_check.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/m4/visibility_inlines_hidden.m4#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/missing#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/autoconf/mkinstalldirs#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/README.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/analysis/llvm_analysis-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/analysis/llvm_analysis.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/analysis/llvm_analysis_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/bitreader/llvm_bit_reader.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/bitreader/llvm_bitreader_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/bitwriter/llvm_bit_writer.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/bitwriter/llvm_bitwriter_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/executionengine/llvm_execution_engine.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/executionengine/llvm_executionengine_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/llvm.gpr#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/llvm/llvm-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/llvm/llvm.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/llvm/llvm_link_time_optimizer.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/llvm/llvm_linktimeoptimizer_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/llvm/llvm_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/target/llvm_target-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/target/llvm_target.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/target/llvm_target_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/transforms/llvm_transforms-binding.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/transforms/llvm_transforms.ads#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ada/transforms/llvm_transforms_wrap.cxx#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/Makefile.ocaml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/analysis/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/analysis/analysis_ocaml.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.ml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/analysis/llvm_analysis.mli#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitreader/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitreader/bitreader_ocaml.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.ml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitreader/llvm_bitreader.mli#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitwriter/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitwriter/bitwriter_ocaml.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.ml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/bitwriter/llvm_bitwriter.mli#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/executionengine/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/executionengine/executionengine_ocaml.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.ml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/executionengine/llvm_executionengine.mli#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/llvm/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/llvm/llvm.ml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/llvm/llvm.mli#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/llvm/llvm_ocaml.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/target/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/target/llvm_target.ml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/target/llvm_target.mli#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/target/target_ocaml.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/transforms/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/transforms/scalar/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.ml#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/transforms/scalar/llvm_scalar_opts.mli#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/bindings/ocaml/transforms/scalar/scalar_opts_ocaml.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/build-for-llvm-top.sh#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/configure#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/Analysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/BitReader.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/BitWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/Core.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/EnhancedDisassembly.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/ExecutionEngine.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/LinkTimeOptimizer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/Target.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/Transforms/IPO.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/Transforms/Scalar.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm-c/lto.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/APFloat.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/APInt.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/APSInt.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/BitVector.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/DeltaAlgorithm.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/DenseMap.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/DenseMapInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/DenseSet.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/DepthFirstIterator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/FoldingSet.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/GraphTraits.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ImmutableList.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ImmutableMap.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ImmutableSet.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/IndexedMap.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/Optional.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/OwningPtr.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/PointerIntPair.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/PointerUnion.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/PostOrderIterator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/PriorityQueue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SCCIterator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/STLExtras.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ScopedHashTable.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SetOperations.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SetVector.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SmallBitVector.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SmallPtrSet.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SmallSet.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SmallString.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SmallVector.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/SparseBitVector.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/Statistic.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/StringExtras.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/StringMap.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/StringRef.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/StringSet.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/StringSwitch.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/Trie.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/Triple.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/Twine.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/UniqueVector.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ValueMap.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/VectorExtras.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ilist.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/ilist_node.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/iterator.cmake#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ADT/iterator.h.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/AbstractTypeUser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/CFGPrinter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/CallGraph.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/CaptureTracking.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ConstantFolding.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ConstantsScanner.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/DOTGraphTraitsPass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/DebugInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/DomPrinter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/DominatorInternals.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/Dominators.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/FindUsedTypes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/IVUsers.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/InlineCost.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/InstructionSimplify.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/Interval.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/IntervalIterator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/IntervalPartition.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/LazyValueInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/LibCallAliasAnalysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/LibCallSemantics.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/Lint.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/LiveValues.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/LoopDependenceAnalysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/LoopInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/LoopPass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/MemoryDependenceAnalysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/PHITransAddr.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/Passes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/PointerTracking.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/PostDominators.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ProfileInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ProfileInfoLoader.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ProfileInfoTypes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ScalarEvolutionNormalization.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/SparsePropagation.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/Trace.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/ValueTracking.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Analysis/Verifier.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Argument.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Assembly/AsmAnnotationWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Assembly/Parser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Assembly/PrintModulePass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Assembly/Writer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Attributes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/AutoUpgrade.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/BasicBlock.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Bitcode/Archive.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Bitcode/BitCodes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Bitcode/BitstreamReader.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Bitcode/BitstreamWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CallGraphSCCPass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CallingConv.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/Analysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/BinaryObject.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/CalcSpillWeights.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/FastISel.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/GCMetadata.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/GCMetadataPrinter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/GCStrategy.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/GCs.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/IntrinsicLowering.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/JITCodeEmitter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/LatencyPriorityQueue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/LinkAllAsmWriterComponents.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/LiveStackAnalysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/LiveVariables.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachORelocation.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineCodeEmitter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineCodeInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineConstantPool.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineDominators.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineFunction.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineFunctionAnalysis.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineInstrBuilder.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineLocation.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineMemOperand.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineModuleInfoImpls.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachinePassRegistry.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineRelocation.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/MachineSSAUpdater.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/ObjectCodeEmitter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/Passes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/PseudoSourceValue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/RegAllocRegistry.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/ScheduleDAG.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/ScheduleHazardRecognizer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/SchedulerRegistry.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/ValueTypes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CodeGen/ValueTypes.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/Action.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/BuiltinOptions.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/Common.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/CompilationGraph.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/Error.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/ForceLinkage.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/ForceLinkageMacros.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/Main.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/Plugin.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/CompilerDriver/Tool.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Config/AsmParsers.def.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Config/AsmPrinters.def.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Config/Disassemblers.def.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Config/Targets.def.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Config/config.h.cmake#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Config/config.h.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Constant.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Constants.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/DerivedTypes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ExecutionEngine/GenericValue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ExecutionEngine/Interpreter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ExecutionEngine/JIT.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ExecutionEngine/JITEventListener.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ExecutionEngine/JITMemoryManager.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Function.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/GVMaterializer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/GlobalAlias.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/GlobalValue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/GlobalVariable.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/InlineAsm.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/InstrTypes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Instruction.def#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Instruction.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Instructions.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/IntrinsicInst.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Intrinsics.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Intrinsics.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/IntrinsicsARM.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/IntrinsicsAlpha.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/IntrinsicsCellSPU.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/IntrinsicsPowerPC.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/IntrinsicsX86.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/IntrinsicsXCore.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/LLVMContext.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/LinkAllPasses.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/LinkAllVMCore.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Linker.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/EDInstInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCAsmInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCAsmInfoCOFF.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCAsmInfoDarwin.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCAsmLayout.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCAssembler.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCCodeEmitter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCContext.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCDirectives.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCDisassembler.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCExpr.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCFixup.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCInst.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCInstPrinter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCLabel.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCMachOSymbolFlags.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCObjectWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCParser/AsmCond.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCParser/MCParsedAsmOperand.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCSection.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCSectionCOFF.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCSectionELF.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCSectionMachO.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCStreamer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCSymbol.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MCValue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/MachObjectWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/MC/SectionKind.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Metadata.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Module.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/OperandTraits.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Operator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Pass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/PassAnalysisSupport.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/PassManager.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/PassManagers.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/PassSupport.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/AlignOf.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Allocator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/CFG.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/CallSite.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Casting.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/CommandLine.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Compiler.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/ConstantFolder.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/ConstantRange.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/DOTGraphTraits.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/DataFlow.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/DataTypes.h.cmake#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/DataTypes.h.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Debug.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/DebugLoc.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Dwarf.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/DynamicLinker.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/ELF.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/ErrorHandling.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/FileUtilities.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Format.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/FormattedStream.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/GetElementPtrTypeIterator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/GraphWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/IRBuilder.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/IRReader.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/InstIterator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/InstVisitor.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/LeakDetector.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/MachO.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/ManagedStatic.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/MathExtras.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/MemoryBuffer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/MemoryObject.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/MutexGuard.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/NoFolder.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/OutputBuffer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/PassNameParser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/PatternMatch.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/PluginLoader.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/PointerLikeTypeTraits.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/PredIteratorCache.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/PrettyStackTrace.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Recycler.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/RecyclingAllocator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Regex.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Registry.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/RegistryParser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/SMLoc.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/SlowOperationInformer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/SourceMgr.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/StableBasicBlockNumbering.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/StandardPasses.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/StringPool.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/SystemUtils.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/TargetFolder.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/Timer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/TypeBuilder.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/ValueHandle.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/circular_raw_ostream.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/raw_os_ostream.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/raw_ostream.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Support/type_traits.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/SymbolTableListTraits.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/AIXDataTypesFix.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Alarm.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Atomic.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/DataTypes.h.cmake#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/DataTypes.h.in#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Disassembler.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/DynamicLibrary.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Errno.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Host.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/IncludeFile.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/LICENSE.TXT#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Memory.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Mutex.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Path.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Process.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Program.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/RWMutex.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Signals.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Solaris.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/ThreadLocal.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Threading.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/TimeValue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/System/Valgrind.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/Mangler.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/SubtargetFeature.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/Target.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetAsmBackend.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetAsmLexer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetAsmParser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetCallingConv.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetData.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetELFWriterInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetFrameInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetIntrinsicInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetJITInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetLowering.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetLoweringObjectFile.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetMachine.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetOpcodes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetOptions.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetRegistry.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetSchedule.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetSelect.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetSelectionDAG.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetSelectionDAGInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Target/TargetSubtarget.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/IPO.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/IPO/InlinerPass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Instrumentation.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/RSProfiling.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Scalar.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/AddrModeMatcher.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/BasicInliner.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/FunctionUtils.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/Local.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/PromoteMemToReg.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdater.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/SSAUpdaterImpl.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/SSI.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Transforms/Utils/UnrollLoop.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Type.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/TypeSymbolTable.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Use.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/User.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/Value.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/include/llvm/ValueSymbolTable.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/AliasAnalysisCounter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/AliasDebugger.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/AliasSetTracker.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/Analysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/CFGPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/CaptureTracking.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ConstantFolding.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/DbgInfoPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/DebugInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/DomPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IPA/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IPA/FindUsedTypes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IPA/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IVUsers.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/InlineCost.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/InstCount.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/Interval.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/IntervalPartition.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/LazyValueInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/LibCallAliasAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/LibCallSemantics.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/Lint.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/LiveValues.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/LoopDependenceAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/LoopInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/LoopPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ModuleDebugInfoPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/PHITransAddr.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/PointerTracking.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/PostDominators.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ProfileEstimatorPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ProfileInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ProfileInfoLoader.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ProfileVerifierPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/README.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/SparsePropagation.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/Trace.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Analysis/ValueTracking.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Archive/Archive.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Archive/ArchiveInternals.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Archive/ArchiveReader.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Archive/ArchiveWriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Archive/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Archive/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/LLLexer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/LLLexer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/LLParser.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/LLParser.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/LLToken.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/AsmParser/Parser.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Reader/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Reader/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Writer/BitWriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Writer/BitcodeWriterPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Writer/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Writer/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/Analysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AntiDepBreaker.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterDwarf.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfException.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/BranchFolding.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/BranchFolding.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/DeadMachineInstructionElim.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ELF.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ELFCodeEmitter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ELFWriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ELFWriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/GCMetadata.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/GCMetadataPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/GCStrategy.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/IfConversion.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/LiveInterval.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/LiveVariables.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineCSE.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineDominators.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineFunction.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineFunctionAnalysis.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineFunctionPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineFunctionPrinterPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineInstr.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineLICM.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineLoopInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineModuleInfoImpls.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachinePassRegistry.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineSSAUpdater.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineSink.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ObjectCodeEmitter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/OcamlGC.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PBQP/Graph.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PBQP/HeuristicBase.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PBQP/Math.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PBQP/Solution.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PHIElimination.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PHIElimination.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/Passes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PrologEpilogInserter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/PseudoSourceValue.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/README.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/RegAllocLocal.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ScheduleDAGPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/CallingConvLower.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/SDNodeOrdering.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SelectionDAG/TargetSelectionDAGInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/ShrinkWrapping.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SimpleHazardRecognizer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/Spiller.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/Spiller.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/StackProtector.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/TailDuplication.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/UnreachableBlockElim.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/VirtRegMap.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/VirtRegMap.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CodeGen/VirtRegRewriter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/Action.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/BuiltinOptions.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/CompilationGraph.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/Main.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/Plugin.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/CompilerDriver/Tool.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/ExecutionEngine.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/Interpreter/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/Interpreter/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/Intercept.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JITDwarfEmitter.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/JITMemoryManager.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/OProfileJITEventListener.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/ExecutionEngine/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Linker/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Linker/LinkArchives.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Linker/LinkItems.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Linker/LinkModules.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Linker/Linker.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Linker/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCAsmInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCAsmInfoCOFF.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCAsmStreamer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCAssembler.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCCodeEmitter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCContext.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCDisassembler.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCExpr.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCInst.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCInstPrinter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCLabel.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCLoggingStreamer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCMachOStreamer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCNullStreamer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCObjectWriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCParser/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCParser/TargetAsmParser.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCSection.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCSectionCOFF.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCSectionELF.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCSectionMachO.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCStreamer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCSymbol.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MCValue.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/MachObjectWriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/MC/TargetAsmBackend.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/APFloat.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/APInt.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/APSInt.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Allocator.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/COPYRIGHT.regex#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/CommandLine.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/ConstantRange.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Debug.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/DeltaAlgorithm.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Dwarf.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/ErrorHandling.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/FileUtilities.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/FoldingSet.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/FormattedStream.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/GraphWriter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/IsInf.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/IsNAN.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/ManagedStatic.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/MemoryBuffer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/MemoryObject.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/PluginLoader.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/PrettyStackTrace.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Regex.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/SlowOperationInformer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/SmallPtrSet.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/SmallVector.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/SourceMgr.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Statistic.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/StringExtras.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/StringMap.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/StringPool.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/StringRef.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/SystemUtils.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/TargetRegistry.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Timer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Triple.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/Twine.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/circular_raw_ostream.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/raw_os_ostream.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/raw_ostream.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regcclass.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regcname.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regcomp.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regengine.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regerror.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regex2.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regex_impl.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regexec.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regfree.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regstrlcpy.c#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Support/regutils.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Alarm.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Atomic.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/CMakeLists.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Disassembler.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/DynamicLibrary.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Errno.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Host.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/IncludeFile.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Makefile#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Memory.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Mutex.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Path.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Process.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Program.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/README.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/RWMutex.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/SearchForAddressOfSpecialSymbol.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Signals.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/ThreadLocal.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Threading.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/TimeValue.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Alarm.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Host.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Memory.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Mutex.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Path.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Process.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Program.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/README.txt#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/RWMutex.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Signals.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/ThreadLocal.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/TimeValue.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Unix/Unix.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Valgrind.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Alarm.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/DynamicLibrary.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Host.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Memory.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Mutex.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Path.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Process.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Program.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/RWMutex.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Signals.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/ThreadLocal.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/TimeValue.inc#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/System/Win32/Win32.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARM.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARM.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMBuildAttrs.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMCallingConv.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMFrameInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMISelLowering.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMJITInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMJITInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMMCAsmInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMMCAsmInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMPerfectShuffle.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMRelocations.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMSchedule.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMScheduleA8.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMScheduleV6.td#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMSelectionDAGInfo.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMSubtarget.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMSubtarget.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMTargetMachine.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/ARMTargetObjectFile.h#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmLexer.cpp#1 branch .. //depot/projects/soc2010/pkg_complete/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 28 17:14:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45599106567E; Wed, 28 Jul 2010 17:14: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 09E5C106567A for ; Wed, 28 Jul 2010 17:14:07 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBFAA8FC18 for ; Wed, 28 Jul 2010 17:14:06 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SHE6Ks004293 for ; Wed, 28 Jul 2010 17:14:06 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SHE6hB004291 for perforce@freebsd.org; Wed, 28 Jul 2010 17:14:06 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Wed, 28 Jul 2010 17:14:06 GMT Message-Id: <201007281714.o6SHE6hB004291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 17:14:07 -0000 http://p4web.freebsd.org/@@181523?ac=10 Change 181523 by jlaffaye@jlaffaye-chulak on 2010/07/28 17:13:28 Fix bugs here and there. Affected files ... .. //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#5 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#9 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#9 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#5 (text+ko) ==== @@ -251,7 +251,6 @@ { struct fetch_data *data = NULL; char *tmp; - char fname[FILENAME_MAX]; char pkg[FILENAME_MAX]; int retcode = 0; @@ -266,7 +265,7 @@ if (keep_package) { tmp = getenv("PKGDIR"); strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg)); - tmp = basename(fname); + tmp = basename(url); strlcat(pkg, "/", sizeof(pkg)); strlcat(pkg, tmp, sizeof(pkg)); @@ -280,8 +279,8 @@ data->pkgfd = 0; fetchDebug = (Verbose > 0); - if ((data->ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) { - warnx("Error: Unable to get %s: %s\n", fname, fetchLastErrString); + if ((data->ftp = fetchGetURL(url, Verbose ? "v" : NULL)) == NULL) { + warnx("Error: Unable to get %s: %s\n", url, fetchLastErrString); /* If the fetch fails, yank the package. */ if (keep_package && unlink(pkg) < 0) warnx("failed to remove partially fetched package: %s", pkg); @@ -290,7 +289,7 @@ } if (isatty(0) || Verbose) { - printf("Fetching %s...", fname); + printf("Fetching %s...", url); fflush(stdout); } @@ -324,7 +323,7 @@ if ((r = fread(data->buf, 1, sizeof(data->buf), data->ftp)) < 1) if (ferror(data->ftp)) { archive_set_error(a, 0, "error while fetching : %s", - fetchLastErrString); + strerror(errno)); return (-1); } ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#9 (text+ko) ==== @@ -255,7 +255,7 @@ } else { char dep_url[FILENAME_MAX]; - if (find_package_url(dep_url, fname, p->name) != 1) + if (find_package_url(dep_url, fname, p->name) != 0) errx(1, "Can not make an URL to get %s", p->name); @@ -605,7 +605,7 @@ if (rename(db_dir_tmp, db_dir) == -1) warn("Can not rename '%s' to '%s'", db_dir_tmp, db_dir); else { - extract_state = 2; + extract_state = 0; if (Verbose) printf("Package %s registered in %s\n", pkg->name, db_dir); } ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jul 28 17:25:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2F171065674; Wed, 28 Jul 2010 17:25: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 A77DD106566C for ; Wed, 28 Jul 2010 17:25:19 +0000 (UTC) (envelope-from jlaffaye@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95A008FC1F for ; Wed, 28 Jul 2010 17:25:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SHPJdK005219 for ; Wed, 28 Jul 2010 17:25:19 GMT (envelope-from jlaffaye@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SHPJA1005217 for perforce@freebsd.org; Wed, 28 Jul 2010 17:25:19 GMT (envelope-from jlaffaye@FreeBSD.org) Date: Wed, 28 Jul 2010 17:25:19 GMT Message-Id: <201007281725.o6SHPJA1005217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jlaffaye@FreeBSD.org using -f From: Julien Laffaye To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 17:25:20 -0000 http://p4web.freebsd.org/@@181526?ac=10 Change 181526 by jlaffaye@jlaffaye-chulak on 2010/07/28 17:24:40 Let libarchive restore more infos about the extracted files. Remove some dead code. Affected files ... .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#10 edit .. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#10 edit Differences ... ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#10 (text+ko) ==== @@ -387,7 +387,12 @@ if (archive_read_next_header(a, &entry) == ARCHIVE_OK) { assert(strcmp(p->name, archive_entry_pathname(entry)) == 0); if (!Fake && - archive_read_extract(a, entry, ARCHIVE_EXTRACT_PERM) != + archive_read_extract(a, entry, ARCHIVE_EXTRACT_OWNER | + ARCHIVE_EXTRACT_PERM | + ARCHIVE_EXTRACT_TIME | + ARCHIVE_EXTRACT_ACL | + ARCHIVE_EXTRACT_FFLAGS | + ARCHIVE_EXTRACT_XATTR) != ARCHIVE_OK) { warnx("Can not extract '%s': %s", archive_entry_pathname(entry), ==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#10 (text+ko) ==== @@ -221,6 +221,4 @@ { if (extract_state == 1) vsystem("%s -rf %s", REMOVE_CMD, db_dir_tmp); - else if (extract_state == 2) - vsystem("%s -rf %s", REMOVE_CMD, db_dir); } From owner-p4-projects@FreeBSD.ORG Wed Jul 28 17:57:56 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8AAC1065670; Wed, 28 Jul 2010 17:57: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 AD488106566B for ; Wed, 28 Jul 2010 17:57:55 +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 9B3858FC14 for ; Wed, 28 Jul 2010 17:57:55 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SHvt4t008235 for ; Wed, 28 Jul 2010 17:57:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SHvtUY008233 for perforce@freebsd.org; Wed, 28 Jul 2010 17:57:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 28 Jul 2010 17:57:55 GMT Message-Id: <201007281757.o6SHvtUY008233@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 Precedence: bulk Cc: Subject: PERFORCE change 181530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 17:57:56 -0000 http://p4web.freebsd.org/@@181530?ac=10 Change 181530 by hselasky@hselasky_laptop001 on 2010/07/28 17:57:45 Add new USB quirk: - patch by: Dmitry Luhtionov Reviewed by: hselasky @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#132 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#35 (text+ko) ==== @@ -118,6 +118,7 @@ USB_QUIRK(MGE, UPS2, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(APPLE, IPHONE, 0x0000, 0xffff, UQ_HID_IGNORE), USB_QUIRK(APPLE, IPHONE_3G, 0x0000, 0xffff, UQ_HID_IGNORE), + USB_QUIRK(MEGATEC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE), /* Devices which should be ignored by both ukbd and uhid */ USB_QUIRK(CYPRESS, WISPY1A, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE), USB_QUIRK(METAGEEK, WISPY1B, 0x0000, 0xffff, UQ_KBD_IGNORE, UQ_HID_IGNORE), ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#132 (text+ko) ==== @@ -2375,7 +2375,7 @@ product PHILIPSSEMI HUB1122 0x1122 HUB /* Megatec */ -product MEGATEC UPS 0x5161 Protocol based UPS +product MEGATEC UPS 0x5161 UPS, based on Phoenixtec protocol /* P.I. Engineering products */ product PIENGINEERING PS2USB 0x020b PS2 to Mac USB Adapter From owner-p4-projects@FreeBSD.ORG Wed Jul 28 21:58:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34DE11065678; Wed, 28 Jul 2010 21:58: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 ED6501065674 for ; Wed, 28 Jul 2010 21:58:18 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DAD8D8FC1D for ; Wed, 28 Jul 2010 21:58:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SLwI05041796 for ; Wed, 28 Jul 2010 21:58:18 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SLwIgB041794 for perforce@freebsd.org; Wed, 28 Jul 2010 21:58:18 GMT (envelope-from bz@freebsd.org) Date: Wed, 28 Jul 2010 21:58:18 GMT Message-Id: <201007282158.o6SLwIgB041794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 21:58:19 -0000 http://p4web.freebsd.org/@@181537?ac=10 Change 181537 by bz@bz_dumpster on 2010/07/28 21:57:43 Move a standalone comment further up to SeND related code and adjust the wording. Reviewed by: anchie Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#38 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#38 (text+ko) ==== @@ -1947,7 +1947,13 @@ mac_netinet6_nd6_send(ifp, m); #endif - /* Send outgoing NS/NA/REDIRECT packet to sendd. */ + /* + * If called from nd6_ns_output() (NS), nd6_na_output() (NA), + * icmp6_redirect_output() (REDIRECT) or from rip6_output() (RS, RA + * as handled by rtsol and rtadvd), mbufs will be tagged for SeND + * to be diverted to user space. When re-injected into the kernel, + * send_output() will directly dispatch them to the outgoing interface. + */ if (send_sendso_input_hook != NULL) { mtag = m_tag_find(m, PACKET_TAG_ND_OUTGOING, NULL); if (mtag != NULL) { @@ -1985,16 +1991,6 @@ return (error); } - /* - * In case of NS, NA and Redirect, we end-up here after calling - * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output(). - * RS and RA do not have such output routines. They are handled - * instead by rtadvd and rtsol daemons. - * - * if_output() routines together with previous chaining will be called - * from input hook. - */ - if ((ifp->if_flags & IFF_LOOPBACK) != 0) { return ((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, NULL)); From owner-p4-projects@FreeBSD.ORG Thu Jul 29 10:33:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 666171065675; Thu, 29 Jul 2010 10:33: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 26798106564A for ; Thu, 29 Jul 2010 10:33:05 +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 EC44C8FC13 for ; Thu, 29 Jul 2010 10:33:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TAX4SS045533 for ; Thu, 29 Jul 2010 10:33:04 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TAX44p045531 for perforce@freebsd.org; Thu, 29 Jul 2010 10:33:04 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 29 Jul 2010 10:33:04 GMT Message-Id: <201007291033.o6TAX44p045531@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 Precedence: bulk Cc: Subject: PERFORCE change 181545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2010 10:33:05 -0000 http://p4web.freebsd.org/@@181545?ac=10 Change 181545 by pgj@Binturong on 2010/07/29 10:32:35 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#51 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#29 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#20 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#36 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#32 integrate .. //depot/projects/docproj_hu/doc/share/images/articles/releng/branches-releng8.pic#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/config-country.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/dist-set.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/dist-set2.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/docmenu1.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-doc.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-keymap.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-options.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-std.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main1.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/media.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/options.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/images/books/handbook/install/sysinstall-exit.scr#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/bapt.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#44 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#42 integrate .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#16 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#28 integrate .. //depot/projects/docproj_hu/www/en/cgi/man.cgi#20 integrate .. //depot/projects/docproj_hu/www/en/cgi/ports.cgi#4 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#47 integrate .. //depot/projects/docproj_hu/www/en/news/status/Makefile#10 integrate .. //depot/projects/docproj_hu/www/en/news/status/report-2010-04-2010-06.xml#2 integrate .. //depot/projects/docproj_hu/www/en/news/status/status.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/releases/8.1R/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/releases/8.1R/announce.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/8.1R/errata.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/8.1R/relnotes-detailed.html#1 branch .. //depot/projects/docproj_hu/www/en/releases/8.1R/relnotes.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/index.sgml#9 integrate .. //depot/projects/docproj_hu/www/en/search/web.atoz#4 integrate .. //depot/projects/docproj_hu/www/hu/search/web.atoz#16 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#103 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#27 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#98 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#25 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#51 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.515 2010/07/21 21:05:51 andrew Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.516 2010/07/28 09:05:35 bapt Exp $ --> aaron@FreeBSD.org"> @@ -116,6 +116,8 @@ bakul@FreeBSD.org"> +bapt@FreeBSD.org"> + barner@FreeBSD.org"> bbraun@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#29 (text+ko) ==== @@ -1,13 +1,13 @@ @@ -927,8 +927,11 @@ A fejlesztési fából 2009 augusztusában ismét levált egy ág, amely ezúttal a RELENG_8 volt. A 8.0-RELEASE, a 8.X - ág elsõ kiadása &rel.current.date; - hónapban jelent meg. + ág elsõ kiadása 2009 novemberében + jelent meg. A legfrissebb &rel.current;-RELEASE + &rel.current.date; hónapban jött ki. A RELENG_8 + ágból várhatóak további + kiadások. Jelen pillanatban a hosszabb távú fejlesztések a 9.X-CURRENT (törzs) ágban ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2328,22 +2328,20 @@ Ez a két sor gondoskodik róla, hogy az alárendelt szerverek ne felejtsék el egyeztetni a táblázataikat a központi - szerver táblázataival. Habár ezek a + szerver táblázataival. Ezek a bejegyzések nem nélkülözhetetlenek a megfelelõ mûködéshez, mivel a - központi szerver mindig igyekszik az alárendelt - szervereknek elküldeni a NIS - táblázataiban létrejött + központi szerver automatikusan feltölti az + alárendelt szerverekre a létrejött változásokat. Mivel azonban a jelszavak létfontosságúak a szervertõl függõ rendszerek számára, - ezért jó ötlet lehet explicit - módon is elõírni a - frissítést. Ez a forgalmasabb - hálózatokon nagyobb jelentõséggel - bír, mivel ott a táblázatok - frissítése nem mindig fejezõdik be - rendesen. + ezért ajánlott explicit módon is + elõírni a frissítést. Ez a + forgalmasabb hálózatokon nagyobb + jelentõséggel bír, mivel ott a + táblázatok frissítése nem mindig + fejezõdik be rendesen. Most pedig futassuk le a /etc/netstart parancsot az ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#32 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + ==== //depot/projects/docproj_hu/doc/share/images/articles/releng/branches-releng8.pic#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.\" $FreeBSD: doc/share/images/articles/releng/branches-releng8.pic,v 1.1 2009/11/28 19:55:51 hrs Exp $ +.\" $FreeBSD: doc/share/images/articles/releng/branches-releng8.pic,v 1.2 2010/07/23 23:53:10 hrs Exp $ .PS 6 @@ -14,6 +14,14 @@ box width .9 "\s-3RELENG_8_0\s+3" dashed line -> right from RELENG_8_0_0_RELEASE.e +RELENG_8_1_0_RELEASE: + ellipse width .9 "\s-28.1-RELEASE\s+2" + + line -> down from RELENG_8_1_0_RELEASE.s +RELENG_8_1: + box width .9 "\s-3RELENG_8_1\s+3" dashed + + line -> right from RELENG_8_1_0_RELEASE.e RELENG_8:box "\s-28-STABLE\s+2" .PE ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/config-country.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                           ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~C~o~u~n~t~r~y~ ~S~e~l~e~c~t~i~o~n~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p                       ³ pPplpepapspep pcphpopopspep pap pcpopupnptprpyp,p prpepgpipopnp,p poprp pgprpopuppp.p p p p p p p p p p p p p³p                       ³ pSpeplpepcptp papnp piptpepmp pupspipnpgp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p p p p p p p p p p p p p p³p                       ³ pÚpÄpz(z-z)zÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p                       ³ p³p p230 p pUnited States p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~1~ p pUpnpiptpepdp pSptpaptpepsp pMpipnpoprp pOpuptplpypipnpgp pIpsplpapnpdpsp p p p p p p p p p³ p³p                       ³ p³p p2|3~2~ p pUprpupgpupapyp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~3~ p pUpzpbpepkpipsptpapnp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~4~ p pVpapnpupaptpup p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~5~ p pVpaptpipcpapnp pCpiptpyp pSptpaptpep p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~6~ p pVpepnpepzpupeplpap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~7~ p pVpipep tp pNpapmp p p p p p p p p p p p p p p p p p p p p p p p p p! p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~8~ p pVpiprpgpipnp pIpsplpapnpdpsp p(pBprpiptpipsphp)p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~9~ p pVpiprpgpipnp pIpsplpapnpdpsp p(pUp.pSp.p)p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~0~ p pWpaplplpipsp papnpdp pFpuptpupnpap pIpsplpapnpdpsp p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~1~ p pWpepsptpeprpnp pSpaphpaprpap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~2~ p pYpepmpepnp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~3~ p pZpapmpbpipap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³ p                       ³ pÀpÄz(z+z)zÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p                       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p                       ³ p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p³p                       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                             \ No newline at end of file +SCRSHOT_P                                                                                           ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~C~o~u~n~t~r~y~ ~S~e~l~e~c~t~i~o~n~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p                       ³ pPplpepapspep pcphpopopspep pap pcpopupnptprpyp,p prpepgpipopnp,p poprp pgprpopuppp.p p p p p p p p p p p p p³p                       ³ pSpeplpepcptp papnp piptpepmp pupspipnpgp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p p p p p p p p p p p p p p³p                       ³ pÚpÄpz(z-z)zÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p                       ³ p³p p232 p pUnited States p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~3~ p pUpnpiptpepdp pSptpaptpepsp pMpipnpoprp pOpuptplpypipnpgp pIpsplpapnpdpsp p p p p p p p p p³ p³p                       ³ p³p p2|3~4~ p pUprpupgpupapyp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~5~ p pUpzpbpepkpipsptpapnp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~6~ p pVpapnpupaptpup p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~7~ p pHpoplpyp pSpepep p(pVpaptpipcpapnp pCpiptpyp pSptpaptpep)p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~8~ p pVpepnpepzpupeplpap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|3~9~ p pVpipep tp pNpapmp p p p p p p p p p p p p p p p p p p p p p p p p p! p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~0~ p pVpiprpgpipnp pIpsplpapnpdpsp,p pBprpiptpipsphp p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~1~ p pVpiprpgpipnp pIpsplpapnpdpsp,p pUp.pSp.p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~2~ p pWpaplplpipsp papnpdp pFpuptpupnpap p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~3~ p pWpepsptpeprpnp pSpaphpaprpap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~4~ p pYpepmpepnp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p                       ³ p³p p2|4~5~ p pZpapmpbpipap p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³ p                       ³ pÀpÄz(z+z)zÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p                       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p                       ³ p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p³p                       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                             \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/dist-set.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~C~h~o~o~s~e~ ~D~i~s~t~r~i~b~u~t~i~o~n~s~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p³ pApsp pap pcpopnpvpepnpipepnpcpep,p pwpep ppprpopvpipdpep pspepvpeprpaplp p"pcpapnpnpepdp"p pdpipsptprpipbpuptpipopnp pspeptpsp.p p p p p p p p p p p p p p³p³ pTphpepspep pspeplpepcptp pwphpaptp pwpep pcpopnpspipdpeprp ptpop pbpep ptphpep pmpopsptp prpepapspopnpapbplpep pdpepfpapuplptpsp pfpoprp ptphpep p p p p p³p³ ptpypppep popfp pspypsptpepmp pipnp pqpupepsptpipopnp.p p pIpfp pypopup pwpopuplpdp ppprpepfpeprp ptpop pppipcpkp papnpdp pcphpopopspep ptphpep p p p p p p³p³ plpipsptp popfp pdpipsptprpipbpuptpipopnpsp pypopuprpspeplpfp,p pspipmppplpyp pspeplpepcptp p"pCpupsptpopmp"p.p p pYpopup pcpapnp paplpspop p p p p p p p p³p³ pppipcpkp pap pcpapnpnpepdp pdpipsptprpipbpuptpipopnp pspeptp papnpdp ptphpepnp pfpipnpep-ptpupnpep piptp pwpiptphp ptphpep pCpupsptpopmp piptpepmp.p p p p³p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p³ pCphpopopspep papnp piptpepmp pbpyp ppprpepspspipnpgp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pWphpepnp pfpipnpipsphpepdp,p pcphpopopspep ptphpep p p p p³p³ pEpxpiptp piptpepmp poprp pmpopvpep ptpop ptphpep pOpKp pbpuptptpopnp pwpiptphp p[pTpApBp]p.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p³ p³pp p>p pB| ~C~u~s~t~o~m~ p p p p p p p p p pSpppepcpipfpyp pypopuprp popwpnp pdpipsptprpipbpuptpipopnp pspeptp p p p p p p p p p p p p p p³ p³p  ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p  ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p  ³ p p p p p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p  ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~m~o~r~e~ ~i~n~f~o~r~m~a~t~i~o~n~ ~o~n~ ~t~h~e~s~e~ ~o~p~t~i~o~n~s~.~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                  \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/dist-set2.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~C~h~o~o~s~e~ ~D~i~s~t~r~i~b~u~t~i~o~n~s~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p³ pApsp pap pcpopnpvpepnpipepnpcpep,p pwpep ppprpopvpipdpep pspepvpeprpaplp p"pcpapnpnpepdp"p pdpipsptprpipbpuptpipopnp pspeptpsp.p p p p p p p p p p p p p p³p³ pTphpepspep pspeplpepcptp pwphpaptp pwpep pcpopnpspipdpeprp ptpop pbpep ptphpep pmpopsptp prpepapspopnpapbplpep pdpepfpapuplptpsp pfpoprp ptphpep p p p p p³p³ ptpypppep popfp pspypsptpepmp pipnp pqpupepsptpipopnp.p p pIpfp pypopup pwpopuplpdp ppprpepfpeprp ptpop pppipcpkp papnpdp pcphpopopspep ptphpep p p p p p p³p³ plpipsptp popfp pdpipsptprpipbpuptpipopnpsp pypopuprpspeplpfp,p pspipmppplpyp pspeplpepcptp p"pCpupsptpopmp"p.p p pYpopup pcpapnp paplpspop p p p p p p p p³p³ pppipcpkp pap pcpapnpnpepdp pdpipsptprpipbpuptpipopnp pspeptp papnpdp ptphpepnp pfpipnpep-ptpupnpep piptp pwpiptphp ptphpep pCpupsptpopmp piptpepmp.p p p p³p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p³ pCphpopopspep papnp piptpepmp pbpyp ppprpepspspipnpgp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pWphpepnp pfpipnpipsphpepdp,p pcphpopopspep ptphpep p p p p³p³ pEpxpiptp piptpepmp poprp pmpopvpep ptpop ptphpep pOpKp pbpuptptpopnp pwpiptphp p[pTpApBp]p.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p³ p³p<<< pX Exit p p p p p p p p p p p p p pExit this menu (returning to previous) p p p p p p p p p p p p³ p³p³ p³p p p p pA|l~l~ p p p p p p p p p p p p p p p p pAplplp pspypsptpepmp pspopuprpcpepsp,p pbpipnpaprpip! epsp papnpdp pXp pWpipnpdpopwp pSpypsptpepmp)p p³ p³p³ p³p p p p pR|e~s~e~t~ p p p p p p p p p p p p p p pRpepspeptp pspeplpepcptpepdp pdpipsptprpipbpuptpipopnp plpipsptp ptpop pnpoptphpipnpgp p p p p p p p³ p³p³ p³p[pXp]p p4| ~D~e~v~e~l~o~p~e~r~ p p p p p p p p pFpuplplp pspopuprpcpepsp,p pbpipnpaprpipepsp papnpdp pdpopcp pbpuptp pnpop pgpapmpepsp p p p p p p p³ p³p³ p³p[pXp]p p5| ~X~-~D~e~v~e~l~o~p~e~r~ p p p p p p pSpapmpep papsp papbpopvpep p+p pXp pWpipnpdpopwp pSpypsptpepmp p p p p p p p p p p p p p p p p p p p³ p³p³ p³p[pXp]p p6| ~K~e~r~n~-~D~e~v~e~l~o~p~e~r~ p p p pFpuplplp pbpipnpaprpipepsp papnpdp pdpopcp,p pkpeprpnpeplp pspopuprpcpepsp popnplpyp p p p p p p p p³ p³p³ p³p[pXp]p p7| ~X~-~K~e~r~n~-~D~e~v~e~l~o~p~e~r~ p pSpapmpep papsp papbpopvpep p+p pXp pWpipnpdpopwp pSpypsptpepmp p p p p p p p p p p p p p p p p p p p³ p³p³ p³p[pXp]p p8| ~U~s~e~r~ p p p p p p p p p p p p p pApvpeprpapgpep pupspeprp p-p pbpipnpaprpipepsp papnpdp pdpopcp popnplpyp p p p p p p p p p p p p p p³ p³p³ pÀpÄÄÄÄz(z+z)zÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³pÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~m~o~r~e~ ~i~n~f~o~r~m~a~t~i~o~n~ ~o~n~ ~t~h~e~s~e~ ~o~p~t~i~o~n~s~.~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                 \ No newline at end of file +SCRSHOT_P                                                                                 ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~C~h~o~o~s~e~ ~D~i~s~t~r~i~b~u~t~i~o~n~s~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p  ³ pApsp pap pcpopnpvpepnpipepnpcpep,p pwpep ppprpopvpipdpep pspepvpeprpaplp p"pcpapnpnpepdp"p pdpipsptprpipbpuptpipopnp pspeptpsp.p p p p p p p p p p p p³p  ³ pTphpepspep pspeplpepcptp pwphpaptp pwpep pcpopnpspipdpeprp ptpop pbpep ptphpep pmpopsptp prpepapspopnpapbplpep pdpepfpapuplptpsp pfpoprp ptphpep p p p³p  ³ ptpypppep popfp pspypsptpepmp pipnp pqpupepsptpipopnp.p p pIpfp pypopup pwpopuplpdp ppprpepfpeprp ptpop pppipcpkp papnpdp pcphpopopspep ptphpep p p p p³p  ³ plpipsptp popfp pdpipsptprpipbpuptpipopnpsp pypopuprpspeplpfp,p pspipmppplpyp pspeplpepcptp p"pCpupsptpopmp"p.p p pYpopup pcpapnp paplpspop p p p p p p³p  ³ pppipcpkp pa p pcpapnpnpepdp pdpipsptprpipbpuptpipopnp pspeptp papnpdp ptphpepnp pfpipnpep-ptpupnpep piptp pwpiptphp ptphpep pCpupsptpopmp piptpepmp.p p³p  ³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p  ³ pCphpopopspep papnp piptpepmp pbpyp ppprpepspspipnpgp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pWphpepnp pfpipnpipsphpepdp,p pcphpopopspep ptphpep p p³p  ³ pEpxpiptp piptpepmp poprp pmpopvpep ptpop ptphpep pOpKp pbpuptptpopnp pwpiptphp p[pTpApBp]p.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p  ³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p  ³ p³p p p p<<< pX Exit p p p p p p p p p p p pExit this menu (returning to previous) p p p p p p p p p³ p³p  ³ p³p p p p p p p pA|l~l~ p p p p p p p p p p p p p p pAplplp pspypsptpepmp pspopuprpcpepsp papnpdp pbp! ipnpaprpipepsp p p p p p p p p p p p p p p p p³ p³p  ³ p³p p p p p p p pR|e~s~e~t~ p p p p p p p p p p p p pRpepspeptp pspeplpepcptpepdp pdpipsptprpipbpuptpipopnp plpipsptp ptpop pnpoptphpipnpgp p p p p³ p³p  ³ p³p p p p[pXp]p p4| ~D~e~v~e~l~o~p~e~r~ p p p p p p pFpuplplp pspopuprpcpepsp,p pbpipnpaprpipepsp papnpdp pdpopcp pbpuptp pnpop pgpapmpepsp p p p p³ p³p  ³ p³p p p p[pXp]p p5| ~K~e~r~n~-~D~e~v~e~l~o~p~e~r~ p pFpuplplp pbpipnpaprpipepsp papnpdp pdpopcp,p pkpeprpnpeplp pspopuprpcpepsp popnplpyp p p p p p³ p³p  ³ p³p p p p[pXp]p p6| ~U~s~e~r~ p p p p p p p p p p p pApvpeprpapgpep pupspeprp p-p pbpipnpaprpipepsp papnpdp pdpopcp popnplpyp p p p p p p p p p p p³ p³p  ³ p³p p p p[p p]p pA| ~M~i~n~i~m~a~l~ p p p p p p p p pTphpep pspmpaplplpepsptp pcpopnpfpipgpuprpaptpipopnp pppopspspipbplpep p p p p p p p p p p p p³ p³p  ³ p³p p p p>p p>p pB| ~C~u~s~t~o~m~ p p p p p p p p p pSpppepcpipfpyp pypopuprp popwpnp pdpipsptprpipbpuptpipopnp pspeptp p p p p p p p p p p p p p p³ p³p  ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p  ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p  ³ p p p p p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p  ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~m~o~r~e~ ~i~n~f~o~r~m~a~t~i~o~n~ ~o~n~ ~t~h~e~s~e~ ~o~p~t~i~o~n~s~.~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                  \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/docmenu1.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                                                                                                                                                                                  ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~ ~D~o~c~u~m~e~n~t~a~t~i~o~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p    ³ pIpfp pypopup paprpep paptp paplplp pupnpspuprpep papbpopuptp ptphpep pcpopnpfpipgpuprpaptpipopnp popfp pypopuprp phpaprpdpwpaprpep p p p p p p p p³p    ³ poprp paprpep plpopopkpipnpgp ptpop pbpupiplpdp pap pspypsptpepmp pspppepcpipfpipcpaplplpyp pfpoprp pFprpepepBpSpDp,p prpepapdp ptphpep p p p p p p³p    ³ pHpaprpdpw paprpep pgpupipdpep!p p pNpepwp pupspeprpsp psphpopuplpdp paplpspop prpepapdp ptphpep pIpnpsptpaplplp pdpopcpupmpepnptp pfpoprp p p p p p³p    ³ pap psptpeppp-pbpyp-psptpeppp ptpuptpoprpipaplp popnp pipnpsptpaplplpipnpgp pFprpepepBpSpDp.p p pFpoprp pgpepnpeprpaplp pipnpfpoprpmpaptpipopnp,p p³p    ³ pcpopnpspuplptp ptphpep pRpEpApDpMpEp pfpiplpep.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p    ³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p    ³ p³p p p p pX Exit p p p p p p pExit this menu (returning to previous) p p p p p p p p p p p p p p p³ p³p    ³ p³p p p p p2| ~R~E~A~D~M~E~ p p p p pAp pgpepnpeprpaplp pdpepspcprpippptpipopnp popfp pFprpepepBpSpDp.p p pRpepapdp ptphpipsp!p p p p p p p p p³ p³p    ³ p³p p p p p3| ~H~a~r~d~w~a~r~e~ p p pTp hpep pFprpepepBpSpDp pspuprpvpipvpaplp pgpupipdpep pfpoprp p! PpCp phpaprpdpwpaprpep.p p p p p p p p p p p³ p³p    ³ p³p p p p p4| ~I~n~s~t~a~l~l~ p p p pAp psptpeppp-pbpyp-psptpeppp pgpupipdpep ptpop pipnpsptpaplplpipnpgp pFprpepepBpSpDp.p p p p p p p p p p p³ p³p    ³ p³p p p p p5| ~C~o~p~y~r~i~g~h~t~ p pTphpep pFprpepepBpSpDp pCpopppyprpipgphptp pnpoptpipcpepsp.p p p p p p p p p p p p p p p p p p p p p p p p³ p³p    ³ p³p p p p p6| ~R~e~l~e~a~s~e~ p p p pTphpep prpeplpepapspep pnpoptpepsp pfpoprp ptphpipsp pvpeprpspipopnp popfp pFprpepepBpSpDp.p p p p p p p p³ p³p    ³ p³p p p p p7| ~S~h~o~r~t~c~u~t~s~ p pCprpepaptpipnpgp psphpoprptpcpuptpsp ptpop pspypspipnpsptpaplplp.p p p p p p p p p p p p p p p p p p p p p³ p³p    ³ p³p p p p p8| ~H~T~M~L~ ~D~o~c~s~ p pGpop ptpop ptphpep pHpTpMpLp pdpopcpupmpepnptpaptpipopnp pmpepnpup p(pppopsptp-pipnpsptpaplplp)p.p p p p p³ p³p    ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ÄÄÄÄÄÄÄÙ p³p    ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p    ³ p p p p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p p p³p    ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~C~o~n~f~u~s~e~d~?~ ~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~h~e~l~p~.~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                                                                                                   \ No newline at end of file +SCRSHOT_P                                                                                                                                                                                                                                                  ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~ ~D~o~c~u~m~e~n~t~a~t~i~o~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p    ³ pIpfp pypopup paprpep paptp paplplp pupnpspuprpep papbpopuptp ptphpep pcpopnpfpipgpuprpaptpipopnp popfp pypopuprp phpaprpdpwpaprpep p p p p p p p p³p    ³ poprp paprpep plpopopkpipnpgp ptpop pbpupiplpdp pap pspypsptpepmp pspppepcpipfpipcpaplplpyp pfpoprp pFprpepepBpSpDp,p prpepapdp ptphpep p p p p p p³p    ³ pHpaprpdpw paprpep pgpupipdpep!p p pNpepwp pupspeprpsp psphpopuplpdp paplpspop prpepapdp ptphpep pIpnpsptpaplplp pdpopcpupmpepnptp pfpoprp p p p p p³p    ³ pap psptpeppp-pbpyp-psptpeppp ptpuptpoprpipaplp popnp pipnpsptpaplplpipnpgp pFprpepepBpSpDp.p p pFpoprp pgpepnpeprpaplp pipnpfpoprpmpaptpipopnp,p p³p    ³ pcpopnpspuplptp ptphpep pRpEpApDpMpEp pfpiplpep.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p    ³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p    ³ p³p p p p pX Exit p p p p p p pExit this menu (returning to previous) p p p p p p p p p p p p p p p³ p³p    ³ p³p p p p p1| ~R~E~A~D~M~E~ p p p p pAp pgpepnpeprpaplp pdpepspcprpippptpipopnp popfp pFprpepepBpSpDp.p p pRpepapdp ptphpipsp!p p p p p p p p p³ p³p    ³ p³p p p p p2| ~E~r~r~a~t~a~ p p p p pLp aptpep-pbprpepapkpipnpgp,p pppopsptp-prpeplpepapspep pnpepwp! sp.p p p p p p p p p p p p p p p p p p p p p³ p³p    ³ p³p p p p p3| ~H~a~r~d~w~a~r~e~ p p pTphpep pFprpepepBpSpDp pspuprpvpipvpaplp pgpupipdpep pfpoprp pPpCp phpaprpdpwpaprpep.p p p p p p p p p p p³ p³p    ³ p³p p p p p4| ~C~o~p~y~r~i~g~h~t~ p pTphpep pFprpepepBpSpDp pCpopppyprpipgphptp pnpoptpipcpepsp.p p p p p p p p p p p p p p p p p p p p p p p p³ p³p    ³ p³p p p p p5| ~R~e~l~e~a~s~e~ p p p pTphpep prpeplpepapspep pnpoptpepsp pfpoprp ptphpipsp pvpeprpspipopnp popfp pFprpepepBpSpDp.p p p p p p p p³ p³p    ³ p³p p p p p6| ~S~h~o~r~t~c~u~t~s~ p pCprpepaptpipnpgp psphpoprptpcpuptpsp ptpop pspypspipnpsptpaplplp.p p p p p p p p p p p p p p p p p p p p p³ p³p    ³ p³p p p p p7| ~H~T~M~L~ ~D~o~c~s~ p pGpop ptpop ptphpep pHpTpMpLp pdpopcpupmpepnptpaptpipopnp pmpepnpup p(pppopsptp-pipnpsptpaplplp)p.p p p p p³ p³p    ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ÄÄÄÄÄÄÄÙ p³p    ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p    ³ p p p p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p p p³p    ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~C~o~n~f~u~s~e~d~?~ ~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~h~e~l~p~.~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                                                                                                   \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-doc.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~6~.~2~-~S~T~A~B~L~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p p |U~s~a~g~e~ p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p p³ p³p       ³ p³p p p pS|t~a~n~d~a~r~d~ p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p p³ p³p       ³ p³p p p pE|x~p~r~e~s~s~ p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p p³ p³p       ³ p³p p p p |C~u~s~t~o~m~ p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p pC|o~n~f~i~g~u~r~e~ p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p p³ p³p       ³ p³p p p pDoc p p p p p p p p p pI nstallation instructions, READ! ME, etc. p p p p p p p p p p p p³ p³p       ³ p³p p p pK|e~y~m~a~p~ p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pO|p~t~i~o~n~s~ p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p p³ p³p       ³ p³p p p pF|i~x~i~t~ p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p p³ p³p       ³ p³p p p pU|p~g~r~a~d~e~ p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pL|o~a~d~ ~C~o~n~f~i~g~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pI|n~d~e~x~ p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~G~u~i~d~e~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file +SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~8~.~1~-~R~E~L~E~A~S~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p |U~s~a~g~e~ p p p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p³ p³p       ³ p³p p pS|t~a~n~d~a~r~d~ p p p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p³ p³p       ³ p³p p pE|x~p~r~e~s~s~ p p p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p |C~u~s~t~o~m~ p p p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p³ p³p       ³ p³p p pC|o~n~f~i~g~u~r~e~ p p p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p³ p³p       ³ p³p p pDoc p p p p p p p p p p p p Installation instructions, REA! DME, etc. p p p p p p p p p p p³ p³p       ³ p³p p pK|e~y~m~a~p~ p p p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pO|p~t~i~o~n~s~ p p p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p³ p³p       ³ p³p p pF|i~x~i~t~ p p p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p³ p³p       ³ p³p p pU|p~g~r~a~d~e~ p p p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pL|o~a~d~ ~C~o~n~f~i~g~.~.~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pI|n~d~e~x~ p p p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-keymap.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~6~.~2~-~S~T~A~B~L~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p p |U~s~a~g~e~ p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p p³ p³p       ³ p³p p p pS|t~a~n~d~a~r~d~ p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p p³ p³p       ³ p³p p p pE|x~p~r~e~s~s~ p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p p³ p³p       ³ p³p p p p |C~u~s~t~o~m~ p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p pC|o~n~f~i~g~u~r~e~ p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p p³ p³p       ³ p³p p p pD|o~c~ p p p p p p p p p pIp npsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpApDp! MpEp,p peptpcp.p p p p p p p p p p p p p³ p³p       ³ p³p p p pKeymap p p p p p p pSelect keyboard type p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pO|p~t~i~o~n~s~ p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p p³ p³p       ³ p³p p p pF|i~x~i~t~ p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p p³ p³p       ³ p³p p p pU|p~g~r~a~d~e~ p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pL|o~a~d~ ~C~o~n~f~i~g~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pI|n~d~e~x~ p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~G~u~i~d~e~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file +SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~8~.~1~-~R~E~L~E~A~S~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p |U~s~a~g~e~ p p p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p³ p³p       ³ p³p p pS|t~a~n~d~a~r~d~ p p p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p³ p³p       ³ p³p p pE|x~p~r~e~s~s~ p p p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p |C~u~s~t~o~m~ p p p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p³ p³p       ³ p³p p pC|o~n~f~i~g~u~r~e~ p p p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p³ p³p       ³ p³p p pD|o~c~ p p p p p p p p p p p p Ipnpsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpAp! DpMpEp,p peptpcp.p p p p p p p p p p p p³ p³p       ³ p³p p pKeymap p p p p p p p p pSelect keyboard type p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pO|p~t~i~o~n~s~ p p p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p³ p³p       ³ p³p p pF|i~x~i~t~ p p p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p³ p³p       ³ p³p p pU|p~g~r~a~d~e~ p p p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pL|o~a~d~ ~C~o~n~f~i~g~.~.~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pI|n~d~e~x~ p p p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-options.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~6~.~2~-~S~T~A~B~L~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p p |U~s~a~g~e~ p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p p³ p³p       ³ p³p p p pS|t~a~n~d~a~r~d~ p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p p³ p³p       ³ p³p p p pE|x~p~r~e~s~s~ p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p p³ p³p       ³ p³p p p p |C~u~s~t~o~m~ p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p pC|o~n~f~i~g~u~r~e~ p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p p³ p³p       ³ p³p p p pD|o~c~ p p p p p p p p p pIp npsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpApDp! MpEp,p peptpcp.p p p p p p p p p p p p p³ p³p       ³ p³p p p pK|e~y~m~a~p~ p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pOptions p p p p p pView/Set various installation options p p p p p p p p p p p p p p³ p³p       ³ p³p p p pF|i~x~i~t~ p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p p³ p³p       ³ p³p p p pU|p~g~r~a~d~e~ p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pL|o~a~d~ ~C~o~n~f~i~g~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pI|n~d~e~x~ p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~G~u~i~d~e~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file +SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~8~.~1~-~R~E~L~E~A~S~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p |U~s~a~g~e~ p p p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p³ p³p       ³ p³p p pS|t~a~n~d~a~r~d~ p p p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p³ p³p       ³ p³p p pE|x~p~r~e~s~s~ p p p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p |C~u~s~t~o~m~ p p p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p³ p³p       ³ p³p p pC|o~n~f~i~g~u~r~e~ p p p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p³ p³p       ³ p³p p pD|o~c~ p p p p p p p p p p p p Ipnpsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpAp! DpMpEp,p peptpcp.p p p p p p p p p p p p³ p³p       ³ p³p p pK|e~y~m~a~p~ p p p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pOptions p p p p p p p pView/Set various installation options p p p p p p p p p p p p p³ p³p       ³ p³p p pF|i~x~i~t~ p p p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p³ p³p       ³ p³p p pU|p~g~r~a~d~e~ p p p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pL|o~a~d~ ~C~o~n~f~i~g~.~.~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pI|n~d~e~x~ p p p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main-std.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~6~.~2~-~S~T~A~B~L~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p p |U~s~a~g~e~ p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p p³ p³p       ³ p³p p p pStandard p p p p pBegin a standard installation (recommended) p p p p p p p p³ p³p       ³ p³p p p pE|x~p~r~e~s~s~ p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p p³ p³p       ³ p³p p p p |C~u~s~t~o~m~ p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p pC|o~n~f~i~g~u~r~e~ p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p p³ p³p       ³ p³p p p pD|o~c~ p p p p p p p p p pIp npsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpApDp! MpEp,p peptpcp.p p p p p p p p p p p p p³ p³p       ³ p³p p p pK|e~y~m~a~p~ p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pO|p~t~i~o~n~s~ p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p p³ p³p       ³ p³p p p pF|i~x~i~t~ p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p p³ p³p       ³ p³p p p pU|p~g~r~a~d~e~ p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pL|o~a~d~ ~C~o~n~f~i~g~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pI|n~d~e~x~ p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~G~u~i~d~e~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file +SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~8~.~1~-~R~E~L~E~A~S~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p |U~s~a~g~e~ p p p p p p p p pQpupipcpkp psptpaprptp p-p pHpopwp ptpop pupspep ptphpipsp pmpepnpup pspypsptpepmp p p p p p p p p p³ p³p       ³ p³p p pStandard p p p p p p pBegin a standard installation (recommended) p p p p p p p³ p³p       ³ p³p p pE|x~p~r~e~s~s~ p p p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p |C~u~s~t~o~m~ p p p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p³ p³p       ³ p³p p pC|o~n~f~i~g~u~r~e~ p p p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p³ p³p       ³ p³p p pD|o~c~ p p p p p p p p p p p p Ipnpsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpAp! DpMpEp,p peptpcp.p p p p p p p p p p p p³ p³p       ³ p³p p pK|e~y~m~a~p~ p p p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pO|p~t~i~o~n~s~ p p p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p³ p³p       ³ p³p p pF|i~x~i~t~ p p p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p³ p³p       ³ p³p p pU|p~g~r~a~d~e~ p p p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pL|o~a~d~ ~C~o~n~f~i~g~.~.~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pI|n~d~e~x~ p p p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/main1.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~6~.~2~-~S~T~A~B~L~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p p Usage p p p p p p pQuick start - How to use this menu system p p p p p p p p p p³ p³p       ³ p³p p p pS|t~a~n~d~a~r~d~ p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p p³ p³p       ³ p³p p p pE|x~p~r~e~s~s~ p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p p³ p³p       ³ p³p p p p |C~u~s~t~o~m~ p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p pC|o~n~f~i~g~u~r~e~ p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p p³ p³p       ³ p³p p p pD|o~c~ p p p p p p p p p pIp npsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpApDp! MpEp,p peptpcp.p p p p p p p p p p p p p³ p³p       ³ p³p p p pK|e~y~m~a~p~ p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pO|p~t~i~o~n~s~ p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p p³ p³p       ³ p³p p p pF|i~x~i~t~ p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p p³ p³p       ³ p³p p p pU|p~g~r~a~d~e~ p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pL|o~a~d~ ~C~o~n~f~i~g~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pI|n~d~e~x~ p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~G~u~i~d~e~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file +SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~8~.~1~-~R~E~L~E~A~S~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p Usage p p p p p p p p pQuick start - How to use this menu system p p p p p p p p p³ p³p       ³ p³p p pS|t~a~n~d~a~r~d~ p p p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p³ p³p       ³ p³p p pE|x~p~r~e~s~s~ p p p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p |C~u~s~t~o~m~ p p p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p³ p³p       ³ p³p p pC|o~n~f~i~g~u~r~e~ p p p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p³ p³p       ³ p³p p pD|o~c~ p p p p p p p p p p p p Ipnpsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpAp! DpMpEp,p peptpcp.p p p p p p p p p p p p³ p³p       ³ p³p p pK|e~y~m~a~p~ p p p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pO|p~t~i~o~n~s~ p p p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p³ p³p       ³ p³p p pF|i~x~i~t~ p p p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p³ p³p       ³ p³p p pU|p~g~r~a~d~e~ p p p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pL|o~a~d~ ~C~o~n~f~i~g~.~.~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pI|n~d~e~x~ p p p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p[ Select ] p p p pXt pEpxpiptp pIpnpsptpaplplp p p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/media.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                                                                                                  ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~C~h~o~o~s~e~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~M~e~d~i~a~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p     ³ pFprpepepBpSpDp pcpapnp pbpep pipnpsptpaplplpepdp pfprpopmp pap pvpaprpipeptpyp popfp pdpipfpfpeprpepnptp pipnpsptpaplplpaptpipopnp p p p p p p p³p     ³ pmpepdpipap,p prpapnpgpipnpgp pfprpopmp pfplpopppppipepsp ptpop papnp pIpnptpeprpnpeptp pFpTpPp pspeprpvpeprp.p p pIpfp pypopup'prpep p p p p p p³p     ³ pipnpsptpaplplpipnpgp pFprpepepBpSpDp pfprpopmp pap pspupppppoprptpepdp pCpDp/pDpVpDp pdprpipvpep ptphpepnp ptphpipsp pipsp pgpepnpeprpaplplpyp p³p     ³ ptphpep pb pepsptp pmpepdpipap ptpop pupspep pipfp pypopup phpapvpep pnpop popvpeprprpipdpipnpgp prpepapspopnp pfpoprp pupspipnpgp poptphpeprp p p³p     ³ pmpepdpipap.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p     ³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p     ³ p³p p p p1 CD/DVD p p p p p p pInstall from a FreeBSD CD/DVD p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p2| ~F~T~P~ p p p p p p p p p pIpnpsptpaplplp pfprpopmp papnp pFpTpPp pspeprpvpeprp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p3| ~F~T~P~ ~P~a~s~s~i~v~e~ p pIpnpsptpaplplp pfprpopmp papnp pFpTpPp pspeprpvpeprp ptphprpopupgphp pap pfpiprpepwpaplplp p p p p p p³ p³p     ³ p³p p p p4| ~H~T~T~P~ p p p p p p p p p Ipnpsptpaplplp pfprpopmp papnp pFpTpPp pspeprpvpeprp ptphprp! opupgphp pap phptptppp ppprpopxpyp p p p p³ p³p     ³ p³p p p p5| ~D~O~S~ p p p p p p p p p pIpnpsptpaplplp pfprpopmp pap pDpOpSp pppaprptpiptpipopnp p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p6| ~N~F~S~ p p p p p p p p p pIpnpsptpaplplp popvpeprp pNpFpSp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p7| ~F~i~l~e~ ~S~y~s~t~e~m~ p pIpnpsptpaplplp pfprpopmp papnp pepxpipsptpipnpgp pfpiplpepspypsptpepmp p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p8| ~F~l~o~p~p~y~ p p p p p p pIpnpsptpaplplp pfprpopmp pap pfplpopppppyp pdpipspkp pspeptp p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p9| ~T~a~p~e~ p p p p p p p p pIpnpsptpaplplp pfprpopmp pSpCpSpIp poprp pQpIpCp ptpapppep p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p pX| ~O~p~t~i~o~n~s~ p p p p p pGpop ptpop ptphpep pOppptpipopnpsp pspcprpepepnp p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p     ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p     ³ p p p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p p p³p     ÀÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~m~o~r~e~ ~i~n~f~o~r~m~a~t~i~o~n~ ~o~n~ ~t~h~e~ ~v~a~r~i~o~u~s~ ~m~e~d~i~a~ ~t~y~p~e~s~ ~]~ÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                    \ No newline at end of file +SCRSHOT_P                                                                                                                                                                  ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~C~h~o~o~s~e~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~M~e~d~i~a~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p     ³ pFprpepepBpSpDp pcpapnp pbpep pipnpsptpaplplpepdp pfprpopmp pap pvpaprpipeptpyp popfp pdpipfpfpeprpepnptp pipnpsptpaplplpaptpipopnp p p p p p p p³p     ³ pmpepdpipap,p prpapnpgpipnpgp pfprpopmp pfplpopppppipepsp ptpop papnp pIpnptpeprpnpeptp pFpTpPp pspeprpvpeprp.p p pIpfp pypopup'prpep p p p p p p³p     ³ pipnpsptpaplplpipnpgp pFprpepepBpSpDp pfprpopmp pap pspupppppoprptpepdp pCpDp/pDpVpDp pdprpipvpep ptphpepnp ptphpipsp pipsp pgpepnpeprpaplplpyp p³p     ³ ptphpep pb pepsptp pmpepdpipap ptpop pupspep pipfp pypopup phpapvpep pnpop popvpeprprpipdpipnpgp prpepapspopnp pfpoprp pupspipnpgp poptphpeprp p p³p     ³ pmpepdpipap.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p     ³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p     ³ p³p p p p1 CD/DVD p p p p p p pInstall from a FreeBSD CD/DVD p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p2| ~F~T~P~ p p p p p p p p p pIpnpsptpaplplp pfprpopmp papnp pFpTpPp pspeprpvpeprp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p3| ~F~T~P~ ~P~a~s~s~i~v~e~ p pIpnpsptpaplplp pfprpopmp papnp pFpTpPp pspeprpvpeprp ptphprpopupgphp pap pfpiprpepwpaplplp p p p p p p³ p³p     ³ p³p p p p4| ~H~T~T~P~ p p p p p p p p p Ipnpsptpaplplp pfprpopmp papnp pFpTpPp pspeprpvpeprp ptphprp! opupgphp pap phptptppp ppprpopxpyp p p p p³ p³p     ³ p³p p p p5| ~D~O~S~ p p p p p p p p p pIpnpsptpaplplp pfprpopmp pap pDpOpSp pppaprptpiptpipopnp p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p6| ~N~F~S~ p p p p p p p p p pIpnpsptpaplplp popvpeprp pNpFpSp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p7| ~F~i~l~e~ ~S~y~s~t~e~m~ p pIpnpsptpaplplp pfprpopmp papnp pepxpipsptpipnpgp pfpiplpepspypsptpepmp p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p8| ~F~l~o~p~p~y~ p p p p p p pIpnpsptpaplplp pfprpopmp pap pfplpopppppyp pdpipspkp pspeptp p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p p9| ~U~S~B~ p p p p p p p p p pIpnpsptpaplplp pfprpopmp pap pUpSpBp pdprpipvpep p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ p³p p p pX| ~O~p~t~i~o~n~s~ p p p p p pGpop ptpop ptphpep pOppptpipopnpsp pspcprpepepnp p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p     ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p     ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p     ³ p p p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p p p³p     ÀÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~m~o~r~e~ ~i~n~f~o~r~m~a~t~i~o~n~ ~o~n~ ~t~h~e~ ~v~a~r~i~o~u~s~ ~m~e~d~i~a~ ~t~y~p~e~s~ ~]~ÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                    \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/options.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_POppptpipopnpsp pEpdpiptpoprp                                                                                                                                                  Name            Value                   Name            Value                   ----            -----                   ----            -----                   NFS Secure      YES                     Install Root    /                       NFS Slow        NO                      Browser package links                   NFS TCP         NO                      Browser Exec    /usr/local/bin/links    NFS version 3   YES                     Media Type      <not yet set>           Debugging       NO                      Media Timeout   300                     No Warnings     NO                      Package Temp    /var/tmp                Yes to All      NO                      Newfs Args      -b 16384 -f 2048        DHCP            NO                      Fixit Console   serial                  IPv6            NO                      Re-scan Devic! es <*>                     Skip PCCARD     NO                      Use Defaults    [RESET!]                FTP username    ftp                                                             Editor          /usr/bin/ee                                                     Tape Blocksize  20                                                              Extract Detail  high                                                            Release Name    6.2-RELEASE                                                                                                                                     Use SPACE to select/toggle an option, arrow keys to move,                       ? or F1 for more help.  When you're done, type Q to Quit.                                                                                                       NFS server talks only on a secure port                                                                                                                           \ No newline at end of file +SCRSHOT_POppptpipopnpsp pEpdpiptpoprp                                                                                                                                                  Name            Value                   Name            Value                   ----            -----                   ----            -----                   NFS Secure      NpOp                      Browser Exec    /usr/local/bin/links    NFS Slow        NO                      Media Type      <not yet set>           NFS TCP         NO                      Media Timeout   300                     NFS version 3   YES                     Package Temp    /var/tmp                Debugging       NO                      Newfs Args      -b 16384 -f 2048        No Warnings     NO                      Fixit Console   serial                  Yes to All      NO                      Re-scan Devices <*>                     DHCP            NO                      Use Defaults    [RESET!]                IPv6            NO                                   !                           FTP username    ftp                                                             Editor          /usr/bin/ee                                                     Extract Detail  high                                                            Release Name    8.1-RELEASE                                                     Install Root    /                                                               Browser package links                                                                                                                                           Use SPACE to select/toggle an option, arrow keys to move,                       ? or F1 for more help.  When you're done, type Q to Quit.                                                                                                       NFS server talks only on a secure port                                                                                                                           \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/images/books/handbook/install/sysinstall-exit.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~6~.~2~-~S~T~A~B~L~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p p Usage p p p p p p pQuick start - How to use this menu system p p p p p p p p p p³ p³p       ³ p³p p p pS|t~a~n~d~a~r~d~ p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p p³ p³p       ³ p³p p p pE|x~p~r~e~s~s~ p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p p³ p³p       ³ p³p p p p |C~u~s~t~o~m~ p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p pC|o~n~f~i~g~u~r~e~ p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p p³ p³p       ³ p³p p p pD|o~c~ p p p p p p p p p pIp npsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpApDp! MpEp,p peptpcp.p p p p p p p p p p p p p³ p³p       ³ p³p p p pK|e~y~m~a~p~ p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pO|p~t~i~o~n~s~ p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p p³ p³p       ³ p³p p p pF|i~x~i~t~ p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p p³ p³p       ³ p³p p p pU|p~g~r~a~d~e~ p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pL|o~a~d~ ~C~o~n~f~i~g~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p p pI|n~d~e~x~ p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p p pSteplpepcptp p p p p p[X Exit Install] p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~f~o~r~ ~I~n~s~t~a~l~l~a~t~i~o~n~ ~G~u~i~d~e~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file +SCRSHOT_P                                                                                   ÚÄÄÄÄÄÄÄÄÄÄÄ ~F~r~e~e~B~S~D~/~i~3~8~6~ ~8~.~1~-~R~E~L~E~A~S~E~ ~-~ ~s~y~s~i~n~s~t~a~l~l~ ~M~a~i~n~ ~M~e~n~u~ ~ÄÄÄÄÄÄÄÄÄÄÄ¿p       ³ pWpeplpcpopmpep ptpop ptphpep pFprpepepBpSpDp pipnpsptpaplplpaptpipopnp papnpdp pcpopnpfpipgpuprpaptpipopnp ptpopoplp.p p pPplpepapspep p p p³p       ³ pspeplpepcptp popnpep popfp ptphpep poppptpipopnpsp pbpeplpopwp pbpyp pupspipnpgp ptphpep paprprpopwp pkpepypsp poprp ptpypppipnpgp ptphpep p³p       ³ pfpiprpsptp pcphpaprpapcptpeprp popfp ptphpep poppptpipopnp pnpapmpep pypopup'prpep pipnptpeprpepsptpepdp pipnp.p p pIpnpvpopkpep papnp p p p³p       ³ poppptpipopnp pwpiptphp p[pSpPpApCpEp]p poprp p[pEpNpTpEpRp]p.p p pTpop pepxpiptp,p pupspep p[pTpApBp]p ptpop pmpopvpep ptpop pEpxpiptp.p p p³p       ³ pÚpÄpÄpÄ pÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p       ³ p³p p p Usage p p p p p p p p pQuick start - How to use this menu system p p p p p p p p p³ p³p       ³ p³p p pS|t~a~n~d~a~r~d~ p p p p p p pBpepgpipnp pap psptpapnpdpaprpdp pipnpsptpaplplpaptpipopnp p(prpepcpopmpmpepnpdpepdp)p p p p p p p p³ p³p       ³ p³p p pE|x~p~r~e~s~s~ p p p p p p p pBpepgpipnp pap pqpupipcpkp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p p³ p³p       ³ p³p p p |C~u~s~t~o~m~ p p p p p p p pBpepgpipnp pap pcpupsptpopmp pipnpsptpaplplpaptpipopnp p(pfpoprp pepxpppeprptpsp)p p p p p p p p p p³ p³p       ³ p³p p pC|o~n~f~i~g~u~r~e~ p p p p p pDpop pppopsptp-pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp popfp pFprpepepBpSpDp p p p p p p p p p p³ p³p       ³ p³p p pD|o~c~ p p p p p p p p p p p p Ipnpsptpaplplpaptpipopnp pipnpsptprpupcptpipopnpsp,p pRpEpAp! DpMpEp,p peptpcp.p p p p p p p p p p p p³ p³p       ³ p³p p pK|e~y~m~a~p~ p p p p p p p p pSpeplpepcptp pkpepypbpopaprpdp ptpypppep p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pO|p~t~i~o~n~s~ p p p p p p p pVpipepwp/pSpeptp pvpaprpipopupsp pipnpsptpaplplpaptpipopnp poppptpipopnpsp p p p p p p p p p p p p p³ p³p       ³ p³p p pF|i~x~i~t~ p p p p p p p p p pRpepppapiprp pmpopdpep pwpiptphp pCpDpRpOpMp/pDpVpDp/pfplpopppppyp poprp psptpaprptp psphpeplplp p p³ p³p       ³ p³p p pU|p~g~r~a~d~e~ p p p p p p p pUpppgprpapdpep papnp pepxpipsptpipnpgp pspypsptpepmp p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pL|o~a~d~ ~C~o~n~f~i~g~.~.~ p pLpopapdp pdpepfpapuplptp pipnpsptpaplplp pcpopnpfpipgpuprpaptpipopnp p p p p p p p p p p p p p p p p³ p³p       ³ p³p p pI|n~d~e~x~ p p p p p p p p p pGplpopspspaprpyp popfp pfpupnpcptpipopnpsp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³ p³p       ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p       ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p       ³ p p p p p p p p p p p p p p p p p p p p p p p p p pSteplpepcptp p p p p p[X Exit Install] p p p p p p p p p p p p p p p p p p³p       ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                     \ No newline at end of file ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#44 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -286,6 +286,11 @@ &pgpkey.aaron; + + &a.bapt; + &pgpkey.bapt; + + &a.ceri; &pgpkey.ceri; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#42 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -30,6 +30,7 @@ + ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#16 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#28 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.505 2010/07/22 04:03:24 hrs Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.507 2010/07/23 21:30:57 hrs Exp $ --> @@ -3338,6 +3338,7 @@ + @@ -3556,6 +3557,7 @@ + @@ -3808,6 +3810,7 @@ + @@ -3944,6 +3947,7 @@ + @@ -4292,6 +4296,7 @@ + @@ -4299,6 +4304,8 @@ + + @@ -4599,6 +4606,7 @@ + ==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#20 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.248 2010/07/16 22:41:29 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.250 2010/07/23 23:44:33 hrs Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -192,9 +192,11 @@ ); $manLocalDir = '/usr/local/www/bsddoc/man'; -$manPathDefault = 'FreeBSD 8.0-RELEASE'; +$manPathDefault = 'FreeBSD 8.1-RELEASE'; %manPath = ( + 'FreeBSD 8.1-RELEASE and Ports', +"$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 8.0-RELEASE and Ports', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 7.3-RELEASE and Ports', @@ -205,6 +207,8 @@ 'FreeBSD Ports', "$manLocalDir/FreeBSD-ports", 'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", + 'FreeBSD 8.1-RELEASE', "$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-8.1-RELEASE/openssl/man", + 'FreeBSD 8.1-stable', "$manLocalDir/FreeBSD-8.1-stable/man:$manLocalDir/FreeBSD-8.1-stable/openssl/man", 'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", 'FreeBSD 8.0-stable', "$manLocalDir/FreeBSD-8.0-stable/man:$manLocalDir/FreeBSD-8.0-stable/openssl/man", 'FreeBSD Ports 8.0-RELEASE', "$manLocalDir/FreeBSD-ports-8.0-RELEASE", @@ -1438,7 +1442,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.248 2010/07/16 22:41:29 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.250 2010/07/23 23:44:33 hrs Exp $'; return qq{\ 
 Copyright (c) 1996-2010 Wolfram Schneider

==== //depot/projects/docproj_hu/www/en/cgi/ports.cgi#4 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/ports.cgi,v 1.98 2009/12/31 16:37:18 wosch Exp $
+# $FreeBSD: www/en/cgi/ports.cgi,v 1.99 2010/07/26 10:30:51 wosch Exp $
 #
 # ports.cgi - search engine for FreeBSD ports
 #             	o search for a port by name or description
@@ -518,7 +518,7 @@
 © 1996-2010 by Wolfram Schneider. All rights reserved.

 };
 
-#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.98 2009/12/31 16:37:18 wosch Exp $} . "
\n";
+#print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.99 2010/07/26 10:30:51 wosch Exp $} . "
\n";
     print qq{Please direct questions about this service to
 $mailto
\n};
     print qq{General questions about FreeBSD ports should be sent to }
@@ -637,10 +637,11 @@
 
 # automatically read collections, need only 0.2 sec on a pentium
 @sec = &readcoll;
-&forms;
 
+$query =~ s/"/ /g;
 $query =~ s/^\s+//;
 $query =~ s/\s+$//;
+&forms;
 
 if ( $query_string eq "" || !$query ) {
     &footer;

==== //depot/projects/docproj_hu/www/en/developers.sgml#47 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.258 2010/07/21 21:09:12 andrew Exp $
+$FreeBSD: www/en/developers.sgml,v 1.259 2010/07/28 14:51:15 bapt Exp $
 
 -->
 
@@ -61,6 +61,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_hu/www/en/news/status/Makefile#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.50 2010/04/22 15:44:53 danger Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.51 2010/07/22 14:20:20 danger Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -47,6 +47,7 @@
 XMLDOCS+=	report-2009-04-2009-09
 XMLDOCS+=	report-2009-10-2009-12
 XMLDOCS+=	report-2010-01-2010-03
+XMLDOCS+=	report-2010-04-2010-06
 
 XSLT.DEFAULT=	report.xsl
 

==== //depot/projects/docproj_hu/www/en/news/status/report-2010-04-2010-06.xml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
-
+
 
   
     April-June
@@ -13,7 +13,7 @@
 
     
This report covers &os;-related projects between April and June
       2010.  It is the second of the four reports planned for 2010, and
-      contains 45 entries.  During this period, a lot of work has
+      contains 47 entries.  During this period, a lot of work has
       gone into the development of new minor version of &os;, 8.1-RELEASE,
       which should be released within days.

 
@@ -1434,7 +1434,7 @@
     
   
 
-  
+  
     Chromium Web Browser
 
     
@@ -1456,18 +1456,15 @@
 
     
       
Chromium is a Webkit-based web browser that is largely
-	BSD-licensed.  It works very well on &os; and supports new features like
-	HTML 5 video.  I have been offering subscriptions to fund the
-	porting effort to &os;: we are up to 20+ paying subscribers after 3
-	months, I would like to get that up to 100.  This effort uses a new
+	BSD-licensed.  It works very well on &os; and supports new features
+	like HTML 5 video.  This effort uses a new
 	hybrid-source model, where the &os; patches are largely kept closed
-	for a limited time.  I have submitted the stable release of Chromium
-	to ports, it is ready to be committed pending final legal approval
-	by the &os; Foundation.  I would like to use this new hybrid model
-	detailed at hybridsource.org for more
-	&os;-related projects: contact me if you have an idea or
-	project that you would like to try with this hybrid model.

+	for a limited time.  I submitted Chromium to ports a couple of
+	months ago and recently updated the submission to the stable 5.0.375
+	branch.  The port is ready to be committed pending final legal
+	approval by the &os; Foundation.  Further work remains to port
+	Chromium to &os; completely, such as porting the task manager fully
+	and making sure extensions work properly.

     
   
 
@@ -1865,7 +1862,7 @@
       
 	  Initial commit message
       
-          BSDCan slides
+	  BSDCan slides
     
 
     
@@ -2263,6 +2260,85 @@
     
   
 
+  
+    Release Engineering Team
+
+    
+      
+	
+	  Release Engineering Team
+	
+

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 14:28:24 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 082461065674; Thu, 29 Jul 2010 14:28: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 C05AC106566B
	for ; Thu, 29 Jul 2010 14:28:23 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A3ABC8FC0A
	for ; Thu, 29 Jul 2010 14:28:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TESNiI078448
	for ; Thu, 29 Jul 2010 14:28:23 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TESN0n078446
	for perforce@freebsd.org; Thu, 29 Jul 2010 14:28:23 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Thu, 29 Jul 2010 14:28:23 GMT
Message-Id: <201007291428.o6TESN0n078446@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181556 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 29 Jul 2010 14:28:24 -0000

http://p4web.freebsd.org/@@181556?ac=10

Change 181556 by afiveg@ringmap-2 on 2010/07/29 14:27:34

	The RINGMAP hooks are removed from ixgbe_handle_que() ixgbe_msix_que() to the *_rxeof function. The same will be done for if_lem. The *_rxeof is the best place for interrupt ringmap-code because this function will called always independent of th interrupt-modell (legacy , msi, etc...)

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#25 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#10 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#9 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#8 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#9 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#39 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#39 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#9 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#20 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#21 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#15 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#8 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#8 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#10 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#10 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#10 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#8 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#25 (text+ko) ====

@@ -248,7 +248,8 @@
 	}
 
 again: 
-	
+
+
 	if ( RING_IS_EMPTY(ring) ) {
 
 #if (__RINGMAP_DEB)
@@ -295,6 +296,7 @@
 		ring->pkt_counter++;
 		--ws;
 
+		PRINT_PKT_BYTES(datap, curr_slot);	
 		(*callback)(user, &pkthdr, datap);
 
 #if (__RINGMAP_DEB)

==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#10 (text+ko) ====

@@ -1322,12 +1322,6 @@
 	struct ifnet    *ifp = adapter->ifp;
 	bool		more;
 
-#ifdef RINGMAP
-	struct capt_object *co = NULL;
-
-	adapter->rm->funcs->delayed_isr(que);
-#endif
-
 	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 		more = ixgbe_rxeof(que, adapter->rx_process_limit);
 
@@ -1342,19 +1336,6 @@
 #endif
 		IXGBE_TX_UNLOCK(txr);
 
-#ifdef RINGMAP
-		IXGBE_RX_LOCK(que->rxr);
-		adapter->rm->funcs->sync_head(que);
-		IXGBE_RX_UNLOCK(que->rxr);
-			
-		/* TODO: don't wake up the all threads, only our thread! */
-		SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
-			if (RING_NOT_EMPTY(co->ring)){
-				wakeup(co->ring);
-			}
-		}
-#endif 
-
 		if (more) {
 			taskqueue_enqueue(que->tq, &que->que_task);
 			return;
@@ -3447,9 +3428,8 @@
  **********************************************************************/
 #ifndef RINGMAP
 static 
-#else
+#endif
 void
-#endif
 ixgbe_refresh_mbufs(struct rx_ring *rxr, int limit)
 {
 	struct adapter		*adapter = rxr->adapter;
@@ -3460,11 +3440,11 @@
 	struct ixgbe_rx_buf	*rxbuf;
 #ifndef RINGMAP
 	struct mbuf		*mh, *mp;
+	int			i, nsegs, error, cleaned;
 #else 
-	struct mbuf		*mp;
+	int			i, nsegs, cleaned;
 #endif
 
-	int			i, nsegs, error, cleaned;
 
 	i = rxr->next_to_refresh;
 	cleaned = -1; /* Signify no completions */
@@ -3499,9 +3479,6 @@
 		if (rxbuf->m_pack == NULL) {
 			mp = m_getjcl(M_DONTWAIT, MT_DATA,
 			    M_PKTHDR, adapter->rx_mbuf_sz);
-#else
-			mp = rxbuf->m_pack;
-#endif
 			if (mp == NULL)
 				goto update;
 			mp->m_pkthdr.len = mp->m_len = adapter->rx_mbuf_sz;
@@ -3516,10 +3493,24 @@
 				goto update;
 			}
 			rxbuf->m_pack = mp;
+#endif
 			bus_dmamap_sync(rxr->ptag, rxbuf->pmap,
 			    BUS_DMASYNC_PREREAD);
+#ifndef RINGMAP
 			rxr->rx_base[i].read.pkt_addr =
 			    htole64(pseg[0].ds_addr);
+#else 
+			bus_dmamap_load_mbuf_sg(rxr->ptag,
+			    rxbuf->pmap, rxbuf->m_pack, pseg, &nsegs, BUS_DMA_NOWAIT);
+
+			rxr->rx_base[i].read.pkt_addr =
+			    htole64(pseg[0].ds_addr);
+
+			printf("[%s] rxbuf->m_pack [%d] : 0x%X\n", 
+					__func__, i, (unsigned int)rxbuf->m_pack);
+			printf("[%s] pckt phys addr [%d] : 0x%llX\n", 
+					__func__, i, rxr->rx_base[i].read.pkt_addr);
+#endif 
 #ifndef RINGMAP
 		}
 #endif 
@@ -3533,9 +3524,9 @@
 		/* This is the work marker for refresh */
 		rxr->next_to_refresh = i;
 	}
+#ifndef RINGMAP
 update:
 
-#ifndef RINGMAP
 	if (cleaned != -1) /* If we refreshed some, bump tail */
 		IXGBE_WRITE_REG(&adapter->hw,
 		    IXGBE_RDT(rxr->me), cleaned);
@@ -3796,6 +3787,13 @@
 		    rxbuf->pmap, BUS_DMASYNC_PREREAD);
 		/* Update descriptor */
 		rxr->rx_base[j].read.pkt_addr = htole64(pseg[0].ds_addr);
+
+//#ifdef RINGMAP
+//#if (__RINGMAP_DEB)
+//		printf("[%s] pkt phys addr [%d] : 0x%llX\n",
+//				__func__, j, htole64(pseg[0].ds_addr));
+//#endif 
+//#endif 
 	}
 
 
@@ -4174,6 +4172,11 @@
 
 	IXGBE_RX_LOCK(rxr);
 
+#ifdef RINGMAP
+	struct capt_object *co = NULL; 
+	adapter->rm->funcs->delayed_isr(que);
+#endif 
+
 	for (i = rxr->next_to_check; count != 0;) {
 		struct mbuf	*sendmp, *mh, *mp;
 		u32		rsc, ptype;
@@ -4201,6 +4204,20 @@
 		mh = rbuf->m_head;
 		mp = rbuf->m_pack;
 
+#ifdef RINGMAP
+		bus_dmamap_sync(rxr->ptag, rbuf->pmap, 
+				BUS_DMASYNC_POSTREAD);
+
+		bus_dmamap_unload(rxr->ptag, rbuf->pmap);
+
+#if (__RINGMAP_DEB)
+		printf("[%s] mp = 0x%X\n", __func__, (unsigned int)mp);
+		printf("[%s] mp->m_data = 0x%X\n", __func__, (unsigned int)mp->m_data);
+		printf("[%s] pckt phys addr [%d] : 0x%llX\n", 
+					__func__, i, rxr->rx_base[i].read.pkt_addr);
+		PRINT_PKT_BYTES(mp->m_data, i);	
+#endif
+#endif
 		plen = le16toh(cur->wb.upper.length);
 		ptype = le32toh(cur->wb.lower.lo_dword.data) &
 		    IXGBE_RXDADV_PKTTYPE_MASK;
@@ -4339,7 +4356,7 @@
 					sendmp->m_pkthdr.ether_vtag = vtag;
 					sendmp->m_flags |= M_VLANTAG;
 				}
-                        }
+            }
 			/* Pass the head pointer on */
 			if (eop == 0) {
 				nbuf->fmp = sendmp;
@@ -4393,6 +4410,17 @@
 		}
 	}
 
+#ifdef RINGMAP
+	adapter->rm->funcs->sync_head(que);
+	
+	/* TODO: Only our co not all */
+	SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
+		if (RING_NOT_EMPTY(co->ring)){
+			wakeup(co->ring);
+		}
+	}
+#endif
+
 	/* Refresh any remaining buf structs */
 	if (processed != 0) {
 		ixgbe_refresh_mbufs(rxr, i);

==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#8 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#9 (text+ko) ====

@@ -4,8 +4,10 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -109,6 +111,7 @@
 	struct adapter *adapter	= que->adapter;
 	struct capt_object *co 	= NULL;
 
+
 	RINGMAP_LOCK(adapter->rm);
 	co = get_capt_obj(que);
 	if (co != NULL) {
@@ -164,6 +167,7 @@
 	struct ixgbe_rx_buf	*rxbuf;
 	struct ringmap *rm = adapter->rm;;
 	struct capt_object *co = NULL;
+	char c;
 
 	RINGMAP_INTR(start);
 
@@ -178,20 +182,34 @@
 		co = get_capt_obj(que);
 		if (co != NULL) {
 
+
 			co->ring->slot[slot_num].intr_num = co->ring->intr_num;
 			co->ring->slot[slot_num].ts = co->ring->last_ts;
 			co->ring->slot[slot_num].is_ok = 1;
 
 			rxbuf = &que->rxr->rx_buffers[slot_num];
-			bus_dmamap_sync(que->rxr->htag, rxbuf->hmap,
-			    BUS_DMASYNC_POSTREAD);
+
 
 #if (RINGMAP_INTR_DEB)
+			rxbuf->m_pack = (struct mbuf *)K_MBUF(co->ring, slot_num);
+			rxbuf->m_pack->m_data = (void *)K_PACKET(co->ring, slot_num);
+			que->rxr->rx_base[slot_num].read.pkt_addr = 
+				htole64(vtophys(K_PACKET(co->ring, slot_num)));
+			printf("---------------------------------------------------- \n");
 			printf(RINGMAP_PREFIX"[%s] Slot = %d\n", __func__, slot_num);
 			PRINT_SLOT(co->ring, slot_num);	
 			PRINT_RING_PTRS(co->ring);
+
+			printf("[%s] rxbuf->m_pack [%d] : 0x%X\n", 
+					__func__, slot_num, (unsigned int)rxbuf->m_pack);
+			printf("[%s] pckt phys addr [%d] : 0x%llX\n", 
+					__func__, slot_num, 
+					que->rxr->rx_base[slot_num].read.pkt_addr);
+			printf("---------------------------------------------------- \n");
 #endif
-
+			/* touch the packet buffer */
+			c = rxbuf->m_pack->m_data[30]; 
+			rxbuf->m_pack->m_data[30] = rxbuf->m_pack->m_data[30];
 		}
 	}
 

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#39 (text+ko) ====

@@ -109,6 +109,10 @@
 	/* set the pointer to ringmap into the adapters structure */
 	rm->funcs->set_ringmap_to_adapter(dev, rm);
 
+#if (__RINGMAP_DEB)
+	printf("Page Size: %d \n", PAGE_SIZE);
+#endif 
+
 	RINGMAP_FUNC_DEBUG(end); 
 
 	return (0);	

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#39 (text+ko) ====

@@ -285,8 +285,8 @@
 
 
 #define PRINT_PKT_BYTES(pktp, i)										\
-   printf("=+= [%s] SOME BYTES FROM PKT: %hhX %hhX %hhX %hhX %hhX\n", 	\
-	   __func__, pktp[0], pktp[1], pktp[16], pktp[32], pktp[59]);
+   printf("=+= [%s] SOME BYTES FROM PKT: %hhd %hhd %hhd %hhd %hhd %hhd %hhd\n", 	\
+	   __func__, pktp[0], pktp[1], pktp[2], pktp[30], pktp[31], pktp[32], pktp[33]);
 
 #define PRINT_PACKET_ADDR(ring, i)	\
 	do {							\
@@ -298,9 +298,9 @@
 
 #define PRINT_MBUF_ADDR(ring, i)	\
 	do {							\
-		printf("=+= mbuf.user=0x%X, mbuf.phys=0x%X, mbuf.kern=0x%X\n",  \
+		printf("=+= mbuf.user=0x%X, mbuf.phys=0x%llX, mbuf.kern=0x%X\n",  \
 		(unsigned int)ring->slot[i].mbuf.user, 	\
-		(unsigned int)ring->slot[i].mbuf.phys, 	\
+		(long long unsigned int)ring->slot[i].mbuf.phys, 	\
 		(unsigned int)ring->slot[i].mbuf.kern);	\
 	} while (0);
 

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#20 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#21 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#15 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#8 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#8 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#8 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 14:43:41 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 262A1106576E; Thu, 29 Jul 2010 14:43: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 7B63B106574D
	for ; Thu, 29 Jul 2010 14:43:40 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 68A928FC21
	for ; Thu, 29 Jul 2010 14:43:40 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TEhe0T079599
	for ; Thu, 29 Jul 2010 14:43:40 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TEhe23079597
	for perforce@freebsd.org; Thu, 29 Jul 2010 14:43:40 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Thu, 29 Jul 2010 14:43:40 GMT
Message-Id: <201007291443.o6TEhe23079597@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181557 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 29 Jul 2010 14:43:41 -0000

http://p4web.freebsd.org/@@181557?ac=10

Change 181557 by afiveg@ringmap-2 on 2010/07/29 14:43:22

	Related to the previously submit

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#26 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#11 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#10 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#9 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#10 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#40 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#40 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#10 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#21 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#22 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#16 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#9 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#9 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#9 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#26 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#11 (text+ko) ====

@@ -1418,13 +1418,6 @@
 
 	++que->irqs;
 
-#ifdef RINGMAP
-	struct capt_object *co = NULL; 
-	IXGBE_RX_LOCK(que->rxr);
-	adapter->rm->funcs->delayed_isr(que);
-	IXGBE_RX_UNLOCK(que->rxr);
-#endif
-
 	more_rx = ixgbe_rxeof(que, adapter->rx_process_limit);
 
 	IXGBE_TX_LOCK(txr);
@@ -1433,19 +1426,6 @@
 
 	more_rx = ixgbe_rxeof(que, adapter->rx_process_limit);
 
-#ifdef RINGMAP
-	IXGBE_RX_LOCK(que->rxr);
-	adapter->rm->funcs->sync_head(que);
-	
-	/* TODO: Only our co not all */
-	SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
-		if (RING_NOT_EMPTY(co->ring)){
-			wakeup(co->ring);
-		}
-	}
-	IXGBE_RX_UNLOCK(que->rxr);
-#endif 
-
 	/* Do AIM now? */
 
 	if (ixgbe_enable_aim == FALSE)
@@ -3788,12 +3768,6 @@
 		/* Update descriptor */
 		rxr->rx_base[j].read.pkt_addr = htole64(pseg[0].ds_addr);
 
-//#ifdef RINGMAP
-//#if (__RINGMAP_DEB)
-//		printf("[%s] pkt phys addr [%d] : 0x%llX\n",
-//				__func__, j, htole64(pseg[0].ds_addr));
-//#endif 
-//#endif 
 	}
 
 
@@ -3966,6 +3940,7 @@
 			reta = (reta << 8) | (j * 0x11);
 #else 
 #ifdef DEFAULT_QUEUE
+			/* Here we will set default queue for all incomming pckts */
 			reta = (reta << 8) | (DEFAULT_QUEUE * 0x11);
 #else 
 			reta = (reta << 8) | (j * 0x11);

==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#40 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#40 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#21 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#22 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#16 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#9 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 17:59:16 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0294F1065676; Thu, 29 Jul 2010 17:59: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 BAB6C1065677
	for ; Thu, 29 Jul 2010 17:59:15 +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 A85798FC18
	for ; Thu, 29 Jul 2010 17:59:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6THxFEA008708
	for ; Thu, 29 Jul 2010 17:59:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6THxFhp008706
	for perforce@freebsd.org; Thu, 29 Jul 2010 17:59:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 29 Jul 2010 17:59:15 GMT
Message-Id: <201007291759.o6THxFhp008706@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181570 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 29 Jul 2010 17:59:16 -0000

http://p4web.freebsd.org/@@181570?ac=10

Change 181570 by hselasky@hselasky_laptop001 on 2010/07/29 17:58:57

	USB controller:
		- add XHCI register access wrappers

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#2 (text+ko) ====

@@ -180,4 +180,24 @@
 #define	XHCI_DB_SID_GET(x)	(((x) >> 16) & 0xFFFF)	/* RW - doorbell stream ID */
 #define	XHCI_DB_SID_SET(x)	(((x) & 0xFFFF) << 16)	/* RW - doorbell stream ID */
 
+/* XHCI register R/W wrappers */
+#define	XREAD1(sc, what, a) \
+	bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \
+		(a) + (sc)->sc_##what##_off)
+#define	XREAD2(sc, what, a) \
+	bus_space_read_2((sc)->sc_io_tag, (sc)->sc_io_hdl, \
+		(a) + (sc)->sc_##what##_off)
+#define	XREAD4(sc, what, a) \
+	bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, \
+		(a) + (sc)->sc_##what##_off)
+#define	XWRITE1(sc, what, a, x) \
+	bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \
+		(a) + (sc)->sc_##what##_off, (x))
+#define	XWRITE2(sc, what, a, x) \
+	bus_space_write_2((sc)->sc_io_tag, (sc)->sc_io_hdl, \
+		(a) + (sc)->sc_##what##_off, (x))
+#define	XWRITE4(sc, what, a, x) \
+	bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, \
+		(a) + (sc)->sc_##what##_off, (x))
+
 #endif	/* _XHCIREG_H_ */

From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 18:14:33 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E72031065676; Thu, 29 Jul 2010 18:14: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 93180106566C
	for ; Thu, 29 Jul 2010 18:14:32 +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 785118FC1B
	for ; Thu, 29 Jul 2010 18:14:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TIEWgV011028
	for ; Thu, 29 Jul 2010 18:14:32 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TIEWLV011026
	for perforce@freebsd.org; Thu, 29 Jul 2010 18:14:32 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 29 Jul 2010 18:14:32 GMT
Message-Id: <201007291814.o6TIEWLV011026@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181571 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 29 Jul 2010 18:14:33 -0000

http://p4web.freebsd.org/@@181571?ac=10

Change 181571 by hselasky@hselasky_laptop001 on 2010/07/29 18:13:36

	USB controller:
		- add more XHCI header file definitions

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#3 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#3 (text+ko) ====

@@ -28,6 +28,9 @@
 
 #define	XHCI_MAX_DEVICES	MIN(USB_MAX_DEVICES, 128)
 #define	XHCI_MAX_ENDPOINTS	32
+#define	XHCI_MAX_SCRATCHPADS	32
+#define	XHCI_MAX_EVENTS		(16 * 7)
+#define	XHCI_MAX_COMMANDS	(16 * 7)
 
 #define	XHCI_DEV_CTX_ADDR_ALIGN		64	/* bytes */
 #define	XHCI_DEV_CTX_ALIGN		64	/* bytes */
@@ -38,7 +41,6 @@
 #define	XHCI_TRANS_RING_SEG_ALIGN	16	/* bytes */
 #define	XHCI_CMD_RING_SEG_ALIGN		64	/* bytes */
 #define	XHCI_EVENT_RING_SEG_ALIGN	64	/* bytes */
-#define	XHCI_EVENT_RING_SEG_TAB_ALIGN	64	/* bytes */
 #define	XHCI_SCRATCH_BUF_ARRAY_ALIGN	64	/* bytes */
 #define	XHCI_SCRATCH_BUFFER_ALIGN	USB_PAGE_SIZE
 #define	XHCI_TRB_ALIGN			16	/* bytes */
@@ -47,7 +49,7 @@
 	volatile uint64_t	qwBaaDevCtxAddr;
 	volatile uint64_t	qwBaaScratchAddr;
 #define	XHCI_BAA_MASK	0xFFFFFFFFFFFFFFE0ULL
-} __aligned(XHCI_DEV_CTX_ADDR_ALIGN);
+};
 
 struct xhci_slot_ctx {
 	volatile uint32_t	dwSctx0;
@@ -86,7 +88,7 @@
 	volatile uint32_t	dwSctx5;
 	volatile uint32_t	dwSctx6;
 	volatile uint32_t	dwSctx7;
-} __aligned(XHCI_SLOT_CTX_ALIGN);
+};
 
 struct xhci_endp_ctx {
 	volatile uint32_t	dwEpCtx0;
@@ -123,7 +125,7 @@
 	volatile uint32_t	dwEpCtx5;
 	volatile uint32_t	dwEpCtx6;
 	volatile uint32_t	dwEpCtx7;
-} __aligned(XHCI_ENDP_CTX_ALIGN);
+};
 
 struct xhci_input_ctx {
 	volatile uint32_t	dwInCtx0;
@@ -136,13 +138,14 @@
 	volatile uint32_t	dwInCtx5;
 	volatile uint32_t	dwInCtx6;
 	volatile uint32_t	dwInCtx7;
-} __aligned(XHCI_INPUT_CTX_ALIGN);
+};
 
 struct xhci_dev_ctx {
-	struct xhci_slot_ctx ctx_input;
-	struct xhci_slot_ctx ctx_slot;
-	struct xhci_endp_ctx ctx_ep0;
-	struct xhci_endp_ctx ctx_epN[XHCI_MAX_ENDPOINTS - 2];
+	struct xhci_slot_ctx	ctx_input;
+	struct xhci_slot_ctx	ctx_slot;
+	struct xhci_endp_ctx	ctx_ep0;
+	struct xhci_endp_ctx	ctx_epN[XHCI_MAX_ENDPOINTS - 2];
+	volatile uint64_t	ctx_sp_buf_ptr[XHCI_MAX_SCRATCHPADS];
 } __aligned(XHCI_DEV_CTX_ALIGN);
 
 struct xhci_stream_ctx {
@@ -162,12 +165,210 @@
 #define	XHCI_SCTX_0_TR_DQ_PTR_MASK	0xFFFFFFFFFFFFFFF0U
 	volatile uint32_t	dwSctx2;
 	volatile uint32_t	dwSctx3;
-} __aligned(XHCI_STREAM_CTX_ALIGN);
+};
 
 struct xhci_trb {
 	volatile uint64_t	qwTrb0;
 	volatile uint32_t	dwTrb2;
+#define	XHCI_TRB_2_ERROR_GET(x)		(((x) >> 24) & 0xFF)
+#define	XHCI_TRB_2_ERROR_SET(x)		(((x) & 0xFF) << 24)
+#define	XHCI_TRB_2_TDSZ_GET(x)		(((x) >> 17) & 0x1F)
+#define	XHCI_TRB_2_TDSZ_SET(x)		(((x) & 0x1F) << 17)
+#define	XHCI_TRB_2_BYTES_GET(x)		((x) & 0xFFFF)
+#define	XHCI_TRB_2_BYTES_SET(x)		((x) & 0xFFFF)
+#define	XHCI_TRB_2_IRQ_GET(x)		(((x) >> 22) & 0x3FF)
+#define	XHCI_TRB_2_IRQ_SET(x)		(((x) & 0x3FF) << 22)
+
 	volatile uint32_t	dwTrb3;
+#define	XHCI_TRB_3_TYPE_GET(x)		(((x) >> 10) & 0x3F)
+#define	XHCI_TRB_3_TYPE_SET(x)		(((x) & 0x3F) << 10)
+#define	XHCI_TRB_3_CYCLE_BIT		(1U << 0)
+#define	XHCI_TRB_3_ENT_BIT		(1U << 1)
+#define	XHCI_TRB_3_ISP_BIT		(1U << 2)
+#define	XHCI_TRB_3_NSNOOP_BIT		(1U << 3)
+#define	XHCI_TRB_3_CHAIN_BIT		(1U << 4)
+#define	XHCI_TRB_3_IOC_BIT		(1U << 5)
+#define	XHCI_TRB_3_IDT_BIT		(1U << 6)
+#define	XHCI_TRB_3_BEI_BIT		(1U << 9)
+#define	XHCI_TRB_3_TRT_MASK		(3U << 16)
+#define	XHCI_TRB_3_TRT_NONE		(0U << 16)
+#define	XHCI_TRB_3_TRT_OUT		(2U << 16)
+#define	XHCI_TRB_3_TRT_IN		(3U << 16)
+#define	XHCI_TRB_3_DIR_IN		(1U << 16)
+#define	XHCI_TRB_3_TLBPC_GET(x)		(((x) >> 16) & 0xF)
+#define	XHCI_TRB_3_TLBPC_SET(x)		(((x) & 0xF) << 16)
+#define	XHCI_TRB_3_FRID_GET(x)		(((x) >> 20) & 0x7FF)
+#define	XHCI_TRB_3_FRID_SET(x)		(((x) & 0x7FF) << 20)
+#define	XHCI_TRB_3_ISO_SIA_BIT		(1U << 31)
+
+/* Commands */
+#define	XHCI_TRB_TYPE_RESERVED		0x00
+#define	XHCI_TRB_TYPE_NORMAL		0x01
+#define	XHCI_TRB_TYPE_SETUP_STAGE	0x02
+#define	XHCI_TRB_TYPE_DATA_STAGE	0x03
+#define	XHCI_TRB_TYPE_STATUS_STAGE	0x04
+#define	XHCI_TRB_TYPE_ISOCH		0x05
+#define	XHCI_TRB_TYPE_LINK		0x06
+#define	XHCI_TRB_TYPE_EVENT_DATA	0x07
+#define	XHCI_TRB_TYPE_NOOP		0x08
+#define	XHCI_TRB_TYPE_ENABLE_SLOT	0x09
+#define	XHCI_TRB_TYPE_DISABLE_SLOT	0x0A
+#define	XHCI_TRB_TYPE_ADDRESS_DEVICE	0x0B
+#define	XHCI_TRB_TYPE_CONFIGURE_EP	0x0C
+#define	XHCI_TRB_TYPE_EVALUATE_CTX	0x0D
+#define	XHCI_TRB_TYPE_RESET_EP		0x0E
+#define	XHCI_TRB_TYPE_STOP_EP		0x0F
+#define	XHCI_TRB_TYPE_SET_TR_DEQUEUE	0x10
+#define	XHCI_TRB_TYPE_RESET_DEVICE	0x11
+#define	XHCI_TRB_TYPE_FORCE_EVENT	0x12
+#define	XHCI_TRB_TYPE_NEGOTIATE_BW	0x13
+#define	XHCI_TRB_TYPE_SET_LATENCY_TOL  	0x14
+#define	XHCI_TRB_TYPE_GET_PORT_BW	0x15
+#define	XHCI_TRB_TYPE_FORCE_HEADER	0x16
+#define	XHCI_TRB_TYPE_NOOP_CMD		0x17
+
+/* Events */
+#define	XHCI_TRB_EVENT_TRANSFER		0x20
+#define	XHCI_TRB_EVENT_CMD_COMPLETE	0x21
+#define	XHCI_TRB_EVENT_PORT_STS_CHANGE  0x22
+#define	XHCI_TRB_EVENT_BW_REQUEST      	0x23
+#define	XHCI_TRB_EVENT_DOORBELL		0x24
+#define	XHCI_TRB_EVENT_HOST_CTRL	0x25
+#define	XHCI_TRB_EVENT_DEVICE_NOTIFY	0x26
+#define	XHCI_TRB_EVENT_MFINDEX_WRAP	0x27
+
+/* Error codes */
+#define	XHCI_TRB_ERROR_INVALID		0x00
+#define	XHCI_TRB_ERROR_SUCCESS		0x01
+#define	XHCI_TRB_ERROR_DATA_BUF		0x02
+#define	XHCI_TRB_ERROR_BABBLE		0x03
+#define	XHCI_TRB_ERROR_XACT		0x04
+#define	XHCI_TRB_ERROR_TRB		0x05
+#define	XHCI_TRB_ERROR_STALL		0x06
+#define	XHCI_TRB_ERROR_RESOURCE		0x07
+#define	XHCI_TRB_ERROR_BANDWIDTH	0x08
+#define	XHCI_TRB_ERROR_NO_SLOTS		0x09
+#define	XHCI_TRB_ERROR_STREAM_TYPE	0x0A
+#define	XHCI_TRB_ERROR_SLOT_NOT_ON	0x0B
+#define	XHCI_TRB_ERROR_ENDP_NOT_ON	0x0C
+#define	XHCI_TRB_ERROR_SHORT_PKT	0x0D
+#define	XHCI_TRB_ERROR_RING_UNDERRUN	0x0E
+#define	XHCI_TRB_ERROR_RING_OVERRUN	0x0F
+#define	XHCI_TRB_ERROR_VF_RING_FULL	0x10
+#define	XHCI_TRB_ERROR_PARAMETER	0x11
+#define	XHCI_TRB_ERROR_BW_OVERRUN	0x12
+#define	XHCI_TRB_ERROR_CONTEXT_STATE	0x13
+#define	XHCI_TRB_ERROR_NO_PING_RESP	0x14
+#define	XHCI_TRB_ERROR_EV_RING_FULL	0x15
+#define	XHCI_TRB_ERROR_INCOMPAT_DEV	0x16
+#define	XHCI_TRB_ERROR_MISSED_SERVICE	0x17
+#define	XHCI_TRB_ERROR_CMD_RING_STOP	0x18
+#define	XHCI_TRB_ERROR_CMD_ABORTED	0x19
+#define	XHCI_TRB_ERROR_STOPPED		0x1A
+#define	XHCI_TRB_ERROR_LENGTH		0x1B
+#define	XHCI_TRB_ERROR_BAD_MELAT	0x1D
+#define	XHCI_TRB_ERROR_ISOC_OVERRUN	0x1F
+#define	XHCI_TRB_ERROR_EVENT_LOST	0x20
+#define	XHCI_TRB_ERROR_UNDEFINED	0x21
+#define	XHCI_TRB_ERROR_INVALID_SID	0x22
+#define	XHCI_TRB_ERROR_SEC_BW		0x23
+#define	XHCI_TRB_ERROR_SPLIT_XACT	0x24
+};
+
+#define	XHCI_TD_PAGE_NBUF	5	/* units */
+#define	XHCI_TD_PAGE_SIZE	4096	/* bytes */
+#define	XHCI_TD_PAYLOAD_MAX	(XHCI_TD_PAGE_SIZE * (XHCI_TD_PAGE_NBUF - 1))
+
+struct xhci_td {
+	struct xhci_trb	td_trb[XHCI_TD_PAGE_NBUF + 1];
+
+/*
+ * Extra information needed:
+ */
+	uint64_t td_self;
+	struct xhci_td *next;
+	struct xhci_td *alt_next;
+	struct xhci_td *obj_next;
+	struct usb_page_cache *page_cache;
+	uint16_t len;
+	uint8_t ntrb;
+
 } __aligned(XHCI_TRB_ALIGN);
 
+struct xhci_event_ring_seg {
+	volatile uint64_t	qwEvrsTablePtr;
+	volatile uint32_t	dwEvrsTableSize;
+	volatile uint32_t	dwEvrsReserved;
+};
+
+struct xhci_hw_root {
+	struct xhci_event_ring_seg	hwr_ring_seg[4];
+	struct xhci_trb			hwr_events[XHCI_MAX_EVENTS];
+	struct xhci_trb			hwr_commands[XHCI_MAX_COMMANDS];
+};
+
+struct xhci_hw_softc {
+	struct usb_page_cache root_pc;
+	struct usb_page_cache device_pc[XHCI_MAX_DEVICES];
+	struct usb_page_cache device_input_pc[XHCI_MAX_DEVICES];
+	struct usb_page_cache device_sp_pc[XHCI_MAX_DEVICES][XHCI_MAX_SCRATCHPAD];
+
+	struct usb_page root_pg;
+	struct usb_page device_pg[XHCI_MAX_DEVICES];
+	struct usb_page device_input_pg[XHCI_MAX_DEVICES];
+	struct usb_page device_sp_pg[XHCI_MAX_DEVICES][XHCI_MAX_SCRATCHPAD];
+};
+
+struct xhci_config_desc {
+	struct usb_config_descriptor confd;
+	struct usb_interface_descriptor ifcd;
+	struct usb_endpoint_descriptor endpd;
+	struct usb_endpoint_ss_comp_descriptor endpcd;
+} __packed;
+
+union xhci_hub_desc {
+	struct usb_status stat;
+	struct usb_port_status ps;
+	struct usb_hub_ss_descriptor hubd;
+	uint8_t	temp[128];
+};
+
+struct xhci_softc {
+	struct xhci_hw_softc sc_hw;
+	struct usb_bus sc_bus;		/* base device */
+
+	union xhci_hub_desc sc_hub_desc;
+
+	struct usb_device *sc_devices[XHCI_MAX_DEVICES];
+	struct resource *sc_io_res;
+	struct resource *sc_irq_res;
+
+	void   *sc_intr_hdl;
+	bus_size_t sc_io_size;
+	bus_space_tag_t sc_io_tag;
+	bus_space_handle_t sc_io_hdl;
+
+	uint32_t sc_eintrs;
+	uint32_t sc_cmd;		/* shadow of cmd register during
+					 * suspend */
+
+	uint16_t sc_flags;		/* chip specific flags */
+
+	uint16_t sc_pcib_off;		/* offset to PCI registers */
+	uint16_t sc_oper_off;		/* offset to operational registers */
+	uint16_t sc_capa_off;		/* offset to capability registers */
+	uint16_t sc_port_off;		/* offset to port status registers */
+	uint16_t sc_runt_off;		/* offset to runtime registers */
+	uint16_t sc_door_off;		/* offset to doorbell registers */
+
+	uint8_t	sc_noport;		/* number of ports on root HUB */
+	uint8_t	sc_addr;		/* root HUB device address */
+	uint8_t	sc_conf;		/* root HUB device configuration */
+	uint8_t	sc_isreset;
+	uint8_t	sc_hub_idata[2];
+
+	char	sc_vendor[16];		/* vendor string for root hub */
+
+};
+
 #endif					/* _XHCI_H_ */

From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 21:23:04 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FE82106567A; Thu, 29 Jul 2010 21:23: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 12C7D1065677
	for ; Thu, 29 Jul 2010 21:23:04 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F34C28FC14
	for ; Thu, 29 Jul 2010 21:23:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TLN3w4039518
	for ; Thu, 29 Jul 2010 21:23:03 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TLN3Td039516
	for perforce@freebsd.org; Thu, 29 Jul 2010 21:23:03 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Thu, 29 Jul 2010 21:23:03 GMT
Message-Id: <201007292123.o6TLN3Td039516@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181582 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 29 Jul 2010 21:23:04 -0000

http://p4web.freebsd.org/@@181582?ac=10

Change 181582 by jlaffaye@jlaffaye-chulak on 2010/07/29 21:23:01

	- Rework the fetch_archive() function to return a file descriptor of the
	downloaded archive.
	Reading on-the-fly doesn't work if we fetch dependencies: the remote
	server close the connection because we are inactive (in fact we are
	busy downloading the dependency). Reading on-the-fly could work if we
	knew the dependencies, in the proper order, of the package before
	downloading it (thus, download and install the dependencies first).
	- While I'm here, print the progress (percentage) of the dowload.

Affected files ...

.. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#9 edit
.. //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#6 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#11 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#9 (text+ko) ====

@@ -145,12 +145,6 @@
 };
 STAILQ_HEAD(reqr_by_head, reqr_by_entry);
 
-struct fetch_data {
-	FILE *ftp;
-	int pkgfd;
-	char buf[8192];
-};
-
 /* Prototypes */
 /* Misc */
 int		vsystem(const char *, ...);
@@ -181,7 +175,7 @@
 Boolean		isURL(const char *);
 const char	*fileGetURL(const char *, const char *, int);
 int		find_package_url(char * restrict, const char *, const char *);
-int		fetch_archive(struct archive *, const char *, Boolean);
+int		fetch_archive(const char *, Boolean);
 char		*fileFindByPath(const char *, const char *);
 char		*fileGetContents(const char *);
 ssize_t		write_file(const char *, const char *);

==== //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#6 (text+ko) ====

@@ -23,19 +23,13 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 	/* NOTE: stdio must come before fetch. */
 #include "pkg.h"
 
-static ssize_t archive_read_cb(struct archive *, void *, const void **);
-static int archive_open_cb(struct archive *a, void *);
-static int archive_close_cb(struct archive *, void *);
-
 /*
  * Try and fetch a file by URL, returning the directory name for where
  * it's unpacked, if successful.
@@ -243,123 +237,92 @@
 }
 
 /*
- * Setup the archive `a' callbacks to read data from an URL `url' via fetch(3).
- * Returns 0 on success, 1 otherwise.
+ * Fetch a package archive at `url'.
+ * Returns a file descriptor of the fetched file, ready to be read.
+ * On error, returns -1.
  */
 int
-fetch_archive(struct archive *a, const char *url, Boolean keep_package)
+fetch_archive(const char *url, Boolean keep_package)
 {
-	struct fetch_data *data = NULL;
-	char *tmp;
-	char pkg[FILENAME_MAX];
-	int retcode = 0;
+	struct url_stat us;
+	FILE *ftp;
+	int fd;
+	int errcode = 0;
+	char fname[FILENAME_MAX];
+	char buf[8192];
+	ssize_t r;
+	off_t done = 0;
+	int percent;
 
 	if (!isURL(url)) {
 	    warnx("fetch_archive(): '%s' is not an URL!", url);
-	    return (1);
+	    return (-1);
 	}
 
-	if ((data = malloc(sizeof(struct fetch_data))) == NULL)
-	    err(EXIT_FAILURE, "malloc()");
-
-	if (keep_package) {
-	    tmp = getenv("PKGDIR");
-	    strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg));
-	    tmp = basename(url);
-	    strlcat(pkg, "/", sizeof(pkg));
-	    strlcat(pkg, tmp, sizeof(pkg));
-
-	    data->pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644);
-	    if (data->pkgfd == -1) {
-		warn("Error: Unable to open %s", pkg);
-		retcode = 1;
-		goto cleanup;
-	    }
+	if (keep_package == TRUE) {
+	    char *base;
+	    if ((base = getenv("PKGDIR")) == NULL)
+		base = ".";
+	    snprintf(fname, sizeof(fname), "%s/%s", base, basename(url));
 	} else
-	    data->pkgfd = 0;
+	    snprintf(fname, sizeof(fname), "/var/tmp/%s", basename(url));
 
+	if (isatty(0) || Verbose) {
+	    printf("Fetching %s...", url);
+	    fflush(stdout);
+	}
+	
 	fetchDebug = (Verbose > 0);
-	if ((data->ftp = fetchGetURL(url, Verbose ? "v" : NULL)) == NULL) {
+	if ((ftp = fetchXGetURL(url, &us, Verbose ? "v" : NULL)) == NULL) {
 	    warnx("Error: Unable to get %s: %s\n", url, fetchLastErrString);
-	    /* If the fetch fails, yank the package. */
-	    if (keep_package && unlink(pkg) < 0)
-		warnx("failed to remove partially fetched package: %s", pkg);
-	    retcode = 1;
+	    return (-1);
+	}
+
+	fd = open(fname, O_RDWR|O_CREAT|O_TRUNC, 0644);
+	if (fd == -1) {
+	    warn("Error: Unable to open %s", fname);
 	    goto cleanup;
 	}
 
-	if (isatty(0) || Verbose) {
-		printf("Fetching %s...", url);
+	while ((r = fread(buf, 1, sizeof(buf), ftp)) > 0) {
+	    if (write(fd, buf, r) != r) {
+		warn("write()");
+		errcode = -1;
+		goto cleanup;
+	    }
+	    if (isatty(0)) {
+		done += r;
+		percent = ((float)done/us.size) * 100;
+		printf("\rFetching %s... %d%%", url, percent);
 		fflush(stdout);
+	    }
 	}
-
-	if (archive_read_open(a, data, archive_open_cb, archive_read_cb, 
-			      archive_close_cb) != ARCHIVE_OK) {
-	    warnx("Can not open '%s': %s", pkg, archive_error_string(a));
-	    retcode = 1;
+	if (ferror(ftp)) {
+	    warn("fread()");
+	    errcode = -1;
 	    goto cleanup;
 	}
+	printf("\rFetching %s... Done.\n", url);
 
-	cleanup:
-	if (retcode == 1 && data != NULL)
-	    free(data);
+	/* Reset fd to the beginning of the file */
+	lseek(fd, 0, SEEK_SET);
 
-	return (retcode);
-}
+	/*
+	 * If we don't want to keep the package, unlink the file now
+	 * so the operating system will delete it for us when we close(2) it.
+	 */
+	if (keep_package == FALSE)
+	    unlink(fname);
 
-/*
- * Libarchive callback called when more data is needed.
- * Read the data from the fetch(3) file descriptor and store it into buf.
- * If `pkgfd' is a valid file descriptor, also write the data on disk.
- * Returns the read size, 0 on EOF, -1 on error.
- */
-static ssize_t
-archive_read_cb(struct archive *a, void *client_data, const void **buf)
-{
-	ssize_t r;
-	struct fetch_data *data = client_data;
-
-	*buf = data->buf;
-	if ((r = fread(data->buf, 1, sizeof(data->buf), data->ftp)) < 1)
-	    if (ferror(data->ftp)) {
-		archive_set_error(a, 0, "error while fetching : %s",
-				  strerror(errno));
-		return (-1);
+	cleanup:
+	if (ftp != NULL)
+	    fclose(ftp);
+	if (errcode != 0) {
+	    if (fd > 0) {
+		close(fd);
+		unlink(fname);
 	    }
-
-	if (data->pkgfd > 0 && r > 0)
-	    if (write(data->pkgfd, buf, r) != r) {
-		archive_set_error(a, 0, "can not write to package file: %s",
-				  strerror(errno));
-		return (-1);
-	    }
-
-	return (r);
-}
-
-/*
- * Libarchive callback called by archive_open()
- * Since all the job is done in fetch_archive(), always return success.
- */
-static int
-archive_open_cb(struct archive *a, void *client_data)
-{
-	return (ARCHIVE_OK);
-}
-
-/*
- * Libarchive callback called by archive_close().
- * Release the file descriptors and free the structure.
- */
-static int
-archive_close_cb(struct archive *a, void *client_data)
-{
-	struct fetch_data *data = client_data;
-
-	fclose(data->ftp);
-	if (data->pkgfd > 0)
-	    close(data->pkgfd);
-	free(data);
-
-	return (ARCHIVE_OK);
+	    fd = -1;
+	}
+	return (fd);
 }

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#11 (text+ko) ====

@@ -80,7 +80,7 @@
 	 *	add support for complete packages
 	 */
 	if (isURL(fname)) {
-	    if (fetch_archive(a, fname, KeepPackage) != 0) {
+	    if ((fd = fetch_archive(fname, KeepPackage)) == -1) {
 		warnx("Can not fetch '%s' - aborting", fname);
 		retcode = 1;
 		goto cleanup;
@@ -95,13 +95,12 @@
 		    goto cleanup;
 		}
 	    }
+	}
 
-	    if (archive_read_open_fd(a, fd, 10240) != ARCHIVE_OK) {
-		warnx("Can not open '%s' archive: %s", fname,
-		      archive_error_string(a));
-		retcode = 1;
-		goto cleanup;
-	    }
+	if (archive_read_open_fd(a, fd, 10240) != ARCHIVE_OK) {
+	    warnx("archive_read_open_fd(): %s", archive_error_string(a));
+	    retcode = 1;
+	    goto cleanup;
 	}
 
 	if (archive_read_next_header(a, &entry) == ARCHIVE_OK) {

From owner-p4-projects@FreeBSD.ORG  Thu Jul 29 22:29:16 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8397106567A; Thu, 29 Jul 2010 22:29: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 8C4AE106566C
	for ; Thu, 29 Jul 2010 22:29:16 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F1F48FC13
	for ; Thu, 29 Jul 2010 22:29:16 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6TMTGOr045681
	for ; Thu, 29 Jul 2010 22:29:16 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6TMTGwd045679
	for perforce@freebsd.org; Thu, 29 Jul 2010 22:29:16 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Thu, 29 Jul 2010 22:29:16 GMT
Message-Id: <201007292229.o6TMTGwd045679@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181583 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 29 Jul 2010 22:29:17 -0000

http://p4web.freebsd.org/@@181583?ac=10

Change 181583 by bfiedler@freebsd-7803 on 2010/07/29 22:28:55

	Copy from original to usr.bin makefile

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.h#2 edit
.. //depot/projects/soc2010/bsdtextproc/src/usr.bin/mandoc/Makefile#2 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/src/contrib/mdocml/mdoc.h#2 (text+ko) ====

@@ -17,6 +17,8 @@
 #ifndef MDOC_H
 #define MDOC_H
 
+#include 
+
 /*
  * This library implements a validating scanner/parser for ``mdoc'' roff
  * macro documents, a.k.a. BSD manual page documents.  The mdoc.c file

==== //depot/projects/soc2010/bsdtextproc/src/usr.bin/mandoc/Makefile#2 (text+ko) ====

@@ -3,6 +3,37 @@
 MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
 .PATH: ${MDOCMLDIR}
 
+
+PREFIX          = 
+BINDIR          = $(PREFIX)/bin
+INCLUDEDIR      = $(PREFIX)/include
+#LIBDIR          = $(PREFIX)/lib
+MANDIR          = /usr/share/man
+EXAMPLEDIR      = /usr/share/examples/mandoc
+INSTALL         = install
+INSTALL_PROGRAM = $(INSTALL) -m 0755
+INSTALL_DATA    = $(INSTALL) -m 0444
+INSTALL_LIB     = $(INSTALL) -m 0644
+INSTALL_MAN     = $(INSTALL_DATA)
+
+VERSION    = 1.10.1
+VDATE      = 07 June 2010
+
+VFLAGS     = -DVERSION="\"$(VERSION)\""
+WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS    += $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H -DUGLY
+
+install:
+      ( mkdir -p $(DESTDIR)$(BINDIR) ; \
+        mkdir -p $(DESTDIR)$(EXAMPLEDIR) ; \
+        mkdir -p $(DESTDIR)$(MANDIR)/man1 ; \
+        mkdir -p $(DESTDIR)$(MANDIR)/man7 ; \
+        $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR) ; \
+        $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1 ; \
+        $(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 ; \
+        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) \
+      ) 
+
 PROG=	mandoc
 LINKS=	mdocml
 MAN=	mandoc.1 man.7 mandoc_char.7 mdoc.7 roff.7
@@ -13,7 +44,14 @@
 	mdoc_html.c mdoc_macro.c mdoc_strings.c mdoc_term.c mdoc_validate.c \
 	msec.c out.c roff.c st.c term.c tree.c vol.c
 
+config.h: config.h.pre config.h.post
+        ( cat ${.ALLSRCS} 
+        ) > ${.TARGET}
+
+GENSRCS+=       config.h
+CLEANFILES=     config.h config.log
+
+
 WARNS?=	3
-CFLAGS+= -DVERSION=\"1.10.1\" -DHAVE_CONFIG_H -DUGLY
 
 .include 

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 12:13:37 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C99A7106567A; Fri, 30 Jul 2010 12:13:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CF981065689
	for ; Fri, 30 Jul 2010 12:13:36 +0000 (UTC)
	(envelope-from lz@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 79EF88FC12
	for ; Fri, 30 Jul 2010 12:13:36 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UCDaCd055982
	for ; Fri, 30 Jul 2010 12:13:36 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UCDaJ9055980
	for perforce@freebsd.org; Fri, 30 Jul 2010 12:13:36 GMT
	(envelope-from lz@FreeBSD.org)
Date: Fri, 30 Jul 2010 12:13:36 GMT
Message-Id: <201007301213.o6UCDaJ9055980@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181592 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 12:13:37 -0000

http://p4web.freebsd.org/@@181592?ac=10

Change 181592 by lz@gnehzuil-freebsd on 2010/07/30 12:13:08

	       Add some data structures for hash directory index and split ext2_lookup
	       function into two functions, ext2_link_lookup() and ext2_index_lookup().

Affected files ...

.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_lookup.c#3 edit
.. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#6 edit

Differences ...

==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_lookup.c#3 (text+ko) ====

@@ -71,6 +71,60 @@
 SYSCTL_INT(_vfs_e2fs, OID_AUTO, dircheck, CTLFLAG_RW, &dirchk, 0, "");
 
 /*
+ * Define hash directory index data structure.
+ */
+struct fake_dirent {
+        u_int32_t inode;
+        u_int16_t reclen;
+        u_int8_t  namlen;
+        u_int8_t  filetype;
+};
+
+struct di_countlimit {
+        u_int16_t limit;
+        u_int16_t count;
+};
+
+struct di_entry {
+        u_int32_t hash;
+        u_int32_t blk;
+};
+
+struct di_root {
+        struct fake_dirent dot;
+        char dotname[4];
+        struct fake_dirent dotdot;
+        char dotdotname[4];
+        struct di_root_info {
+                u_int32_t reserved;
+                u_int8_t hash_version;
+                u_int8_t ind_levels;
+                u_int8_t unused_flags;
+        } info;
+        struct di_entry ent[0];
+};
+
+struct di_node {
+        struct fake_dirent fake;
+        struct di_entry ent[0];
+};
+
+struct di_frame {
+        struct buf *bp;
+        struct di_entry *ep;
+        struct di_entry *at;
+};
+
+struct di_map_entry {
+        u_int32_t hash;
+        u_int16_t offset;
+        u_int16_t size;
+};
+
+static int ext2_index_lookup(struct vop_cachedlookup_args *ap);
+static int ext2_link_lookup(struct vop_cachedlookup_args *ap);
+
+/*
    DIRBLKSIZE in ffs is DEV_BSIZE (in most cases 512)
    while it is the native blocksize in ext2fs - thus, a #define
    is no longer appropriate
@@ -253,42 +307,19 @@
 }
 
 /*
- * Convert a component of a pathname into a pointer to a locked inode.
- * This is a very central and rather complicated routine.
- * If the file system is not maintained in a strict tree hierarchy,
- * this can result in a deadlock situation (see comments in code below).
- *
- * The cnp->cn_nameiop argument is LOOKUP, CREATE, RENAME, or DELETE depending
- * on whether the name is to be looked up, created, renamed, or deleted.
- * When CREATE, RENAME, or DELETE is specified, information usable in
- * creating, renaming, or deleting a directory entry may be calculated.
- * If flag has LOCKPARENT or'ed into it and the target of the pathname
- * exists, lookup returns both the target and its parent directory locked.
- * When creating or renaming and LOCKPARENT is specified, the target may
- * not be ".".  When deleting and LOCKPARENT is specified, the target may
- * be "."., but the caller must check to ensure it does an vrele and vput
- * instead of two vputs.
- *
- * Overall outline of ext2_lookup:
- *
- *	search for name in directory, to found or notfound
- * notfound:
- *	if creating, return locked directory, leaving info on available slots
- *	else return error
- * found:
- *	if at end of path and deleting, return information to allow delete
- *	if at end of path and rewriting (RENAME and LOCKPARENT), lock target
- *	  inode and return info to allow rewrite
- *	if not at end, add name to cache; if at end and neither creating
- *	  nor deleting, add name to cache
+ * lookup function with hash directory index.
+ */
+static int
+ext2_index_lookup(struct vop_cachedlookup_args *ap)
+{
+        return (EIO);
+}
+
+/*
+ * Traditional lookup function.
  */
-int
-ext2_lookup(ap)
-	struct vop_cachedlookup_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-	} */ *ap;
+static int
+ext2_link_lookup(struct vop_cachedlookup_args *ap)
 {
 	struct vnode *vdp;		/* vnode for directory being searched */
 	struct inode *dp;		/* inode for directory being searched */
@@ -691,6 +722,56 @@
 	return (0);
 }
 
+/*
+ * Convert a component of a pathname into a pointer to a locked inode.
+ * This is a very central and rather complicated routine.
+ * If the file system is not maintained in a strict tree hierarchy,
+ * this can result in a deadlock situation (see comments in code below).
+ *
+ * The cnp->cn_nameiop argument is LOOKUP, CREATE, RENAME, or DELETE depending
+ * on whether the name is to be looked up, created, renamed, or deleted.
+ * When CREATE, RENAME, or DELETE is specified, information usable in
+ * creating, renaming, or deleting a directory entry may be calculated.
+ * If flag has LOCKPARENT or'ed into it and the target of the pathname
+ * exists, lookup returns both the target and its parent directory locked.
+ * When creating or renaming and LOCKPARENT is specified, the target may
+ * not be ".".  When deleting and LOCKPARENT is specified, the target may
+ * be "."., but the caller must check to ensure it does an vrele and vput
+ * instead of two vputs.
+ *
+ * Overall outline of ext2_lookup:
+ *
+ *	search for name in directory, to found or notfound
+ * notfound:
+ *	if creating, return locked directory, leaving info on available slots
+ *	else return error
+ * found:
+ *	if at end of path and deleting, return information to allow delete
+ *	if at end of path and rewriting (RENAME and LOCKPARENT), lock target
+ *	  inode and return info to allow rewrite
+ *	if not at end, add name to cache; if at end and neither creating
+ *	  nor deleting, add name to cache
+ */
+int
+ext2_lookup(ap)
+	struct vop_cachedlookup_args /* {
+		struct vnode *a_dvp;
+		struct vnode **a_vpp;
+		struct componentname *a_cnp;
+	} */ *ap;
+{
+        struct vnode *vp;
+        struct ext2fs *fs;
+
+        vp = ap->a_dvp;
+        fs = VFSTOEXT2(vp->v_mount)->um_e2fs->e2fs;
+
+        if (fs->e2fs_features_compat & EXT4F_COMPAT_DIR_INDEX)
+                return ext2_index_lookup(ap);
+        else
+                return ext2_link_lookup(ap);
+}
+
 void
 ext2_dirbad(ip, offset, how)
 	struct inode *ip;

==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#6 (text+ko) ====

@@ -248,6 +248,10 @@
  */
 #define EXT2F_COMPAT_PREALLOC		0x0001
 #define EXT2F_COMPAT_RESIZE		0x0010
+#define EXT4F_COMPAT_IMAGIC_INODES      0x0002
+#define EXT4F_COMPAT_HAS_JOURNAL        0x0004
+#define EXT4F_COMPAT_EXT_ATTR           0x0008
+#define EXT4F_COMPAT_DIR_INDEX          0x0020
 
 #define EXT2F_ROCOMPAT_SPARSESUPER	0x0001
 #define EXT2F_ROCOMPAT_LARGEFILE	0x0002

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 13:04:33 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 062FF1065677; Fri, 30 Jul 2010 13:04: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 BDDAB1065673
	for ; Fri, 30 Jul 2010 13:04:32 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AA8EB8FC24
	for ; Fri, 30 Jul 2010 13:04:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UD4Wgb071578
	for ; Fri, 30 Jul 2010 13:04:32 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UD4Whg071576
	for perforce@freebsd.org; Fri, 30 Jul 2010 13:04:32 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Fri, 30 Jul 2010 13:04:32 GMT
Message-Id: <201007301304.o6UD4Whg071576@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181596 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 13:04:33 -0000

http://p4web.freebsd.org/@@181596?ac=10

Change 181596 by afiveg@ringmap-2 on 2010/07/30 13:04:11

	The coherence problem is not solved. I will start from the begining with ixgbe.

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#27 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#12 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#11 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#10 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#11 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#41 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#41 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#11 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#22 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#23 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#17 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#10 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#10 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#12 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#12 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#12 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#10 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#27 (text+ko) ====

@@ -247,18 +247,14 @@
 		return (-2);
 	}
 
-again: 
-
+	while ( RING_IS_EMPTY(ring) ) {
 
-	if ( RING_IS_EMPTY(ring) ) {
-
 #if (__RINGMAP_DEB)
 		PRINT_RING_PTRS(ring);
 		RINGMAP_FUNC_DEBUG(Ring is empty. Sleep...);
 #endif 
 		/* Sleep and wait for new incoming packets */
 		ioctl(ringmap_cdev_fd, IOCTL_SLEEP_WAIT);
-		goto again;
 	}
 
 #if (__RINGMAP_DEB)

==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.c#12 (text+ko) ====

@@ -3474,12 +3474,16 @@
 			}
 			rxbuf->m_pack = mp;
 #endif
-			bus_dmamap_sync(rxr->ptag, rxbuf->pmap,
-			    BUS_DMASYNC_PREREAD);
 #ifndef RINGMAP
 			rxr->rx_base[i].read.pkt_addr =
 			    htole64(pseg[0].ds_addr);
 #else 
+
+			rxbuf->m_pack->m_pkthdr.len = rxbuf->m_pack->m_len = 
+				adapter->rx_mbuf_sz;
+
+			rxbuf->m_pack->m_flags |= M_PKTHDR;
+
 			bus_dmamap_load_mbuf_sg(rxr->ptag,
 			    rxbuf->pmap, rxbuf->m_pack, pseg, &nsegs, BUS_DMA_NOWAIT);
 
@@ -3490,7 +3494,13 @@
 					__func__, i, (unsigned int)rxbuf->m_pack);
 			printf("[%s] pckt phys addr [%d] : 0x%llX\n", 
 					__func__, i, rxr->rx_base[i].read.pkt_addr);
-#endif 
+
+#endif 		
+
+			bus_dmamap_sync(rxr->ptag, rxbuf->pmap,
+			    BUS_DMASYNC_PREREAD);
+
+
 #ifndef RINGMAP
 		}
 #endif 
@@ -4180,6 +4190,15 @@
 		mp = rbuf->m_pack;
 
 #ifdef RINGMAP
+		if (pmap_change_attr((vm_offset_t)mp, 
+				PAGE_SIZE, PAT_UNCACHEABLE) != 0) {
+			RINGMAP_ERROR(Can not change page attributes);
+		}
+		if (pmap_change_attr((vm_offset_t)mp->m_data, 
+				PAGE_SIZE, PAT_UNCACHEABLE) != 0) {
+			RINGMAP_ERROR(Can not change page attributes);
+		}
+
 		bus_dmamap_sync(rxr->ptag, rbuf->pmap, 
 				BUS_DMASYNC_POSTREAD);
 

==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#11 (text+ko) ====

@@ -167,7 +167,6 @@
 	struct ixgbe_rx_buf	*rxbuf;
 	struct ringmap *rm = adapter->rm;;
 	struct capt_object *co = NULL;
-	char c;
 
 	RINGMAP_INTR(start);
 
@@ -207,9 +206,6 @@
 					que->rxr->rx_base[slot_num].read.pkt_addr);
 			printf("---------------------------------------------------- \n");
 #endif
-			/* touch the packet buffer */
-			c = rxbuf->m_pack->m_data[30]; 
-			rxbuf->m_pack->m_data[30] = rxbuf->m_pack->m_data[30];
 		}
 	}
 

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#41 (text+ko) ====

@@ -503,10 +503,11 @@
 			 * come the new packets. It means, before we are going to sleep
 			 * it makes a sence to check if we really must do it :)
 			 */
-			if (RING_IS_EMPTY(co->ring)) {
+			while (RING_IS_EMPTY(co->ring)) {
 				RINGMAP_IOCTL(Sleep and wait for new packets);
 
-				err_sleep = tsleep(co->ring, (PRI_MAX_ITHD) | PCATCH, "ioctl", 0);
+				err_sleep = tsleep(co->ring, 
+						(PRI_MAX_ITHD) | PCATCH, "ioctl", 0);
 			}
 		break;
 

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#41 (text+ko) ====

@@ -1,3 +1,5 @@
+#define RING_SAFTY_MARGIN	2
+
 /* 
  * value for number of descriptors (a.k.a. slots in the ringbuffer)
  */
@@ -213,10 +215,10 @@
 	(SW_TAIL(ringp)) = R_MODULO(SW_TAIL(ringp) + 1);
 
 #define RING_IS_EMPTY(ringp)				\
-	((SW_TAIL_TO_HEAD_DIST(ringp)) == 1)
+	((SW_TAIL_TO_HEAD_DIST(ringp)) <= RING_SAFTY_MARGIN)
 
 #define RING_NOT_EMPTY(ringp)				\
-	((SW_TAIL_TO_HEAD_DIST(ringp)) != 1)
+	((SW_TAIL_TO_HEAD_DIST(ringp)) > RING_SAFTY_MARGIN)
 
 #define RING_IS_FULL(ringp)					\
 	((SW_HEAD_TO_TAIL_DIST(ringp)) == 0)
@@ -285,7 +287,7 @@
 
 
 #define PRINT_PKT_BYTES(pktp, i)										\
-   printf("=+= [%s] SOME BYTES FROM PKT: %hhd %hhd %hhd %hhd %hhd %hhd %hhd\n", 	\
+   printf("=+= [%s] SOME BYTES FROM PKT: %hhu %hhu %hhu %hhu %hhu %hhu %hhu\n", 	\
 	   __func__, pktp[0], pktp[1], pktp[2], pktp[30], pktp[31], pktp[32], pktp[33]);
 
 #define PRINT_PACKET_ADDR(ring, i)	\

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#22 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#23 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#17 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#10 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#12 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#12 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#12 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#10 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 16:29:18 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EAF431065688; Fri, 30 Jul 2010 16:29: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 84AE91065674
	for ; Fri, 30 Jul 2010 16:29:17 +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 714DC8FC22
	for ; Fri, 30 Jul 2010 16:29:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UGTHfx090670
	for ; Fri, 30 Jul 2010 16:29:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UGTHuP090668
	for perforce@freebsd.org; Fri, 30 Jul 2010 16:29:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Jul 2010 16:29:17 GMT
Message-Id: <201007301629.o6UGTHuP090668@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181604 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 16:29:18 -0000

http://p4web.freebsd.org/@@181604?ac=10

Change 181604 by hselasky@hselasky_laptop001 on 2010/07/30 16:29:00

	USB core:
		- add missing Super Speed (USB 3.0) definitions

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.h#49 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb.h#49 (text+ko) ====

@@ -208,6 +208,7 @@
 #define	UDESC_CS_INTERFACE	0x24
 #define	UDESC_CS_ENDPOINT	0x25
 #define	UDESC_HUB		0x29
+#define	UDESC_SS_HUB		0x2A	/* super speed */
 #define	UDESC_ENDPOINT_SS_COMP	0x30	/* super speed */
 #define	UR_SET_DESCRIPTOR	0x07
 #define	UR_GET_CONFIG		0x08
@@ -343,7 +344,7 @@
 	uByte	bDescriptorType;
 	uByte	bDevCapabilityType;
 	uByte	bReserved;
-	uByte	ContainerID;
+	uByte	bContainerID;
 } __packed;
 typedef struct usb_devcap_container_id_descriptor
 		usb_devcap_container_id_descriptor_t;
@@ -356,6 +357,7 @@
 #define	UDPROTO_FSHUB		0x00
 #define	UDPROTO_HSHUBSTT	0x01
 #define	UDPROTO_HSHUBMTT	0x02
+#define	UDPROTO_SSHUB		0x03
 #define	UDCLASS_DIAGNOSTIC	0xdc
 #define	UDCLASS_WIRELESS	0xe0
 #define	UDSUBCLASS_RF		0x01

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 19:16:21 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E7E291065679; Fri, 30 Jul 2010 19:16: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 908341065676
	for ; Fri, 30 Jul 2010 19:16:20 +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 7DD078FC08
	for ; Fri, 30 Jul 2010 19:16:20 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UJGKT0016439
	for ; Fri, 30 Jul 2010 19:16:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UJGK4m016437
	for perforce@freebsd.org; Fri, 30 Jul 2010 19:16:20 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Jul 2010 19:16:20 GMT
Message-Id: <201007301916.o6UJGK4m016437@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181608 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 19:16:21 -0000

http://p4web.freebsd.org/@@181608?ac=10

Change 181608 by hselasky@hselasky_laptop001 on 2010/07/30 19:15:41

	
	USB controller (EHCI):
		- fix reading EHCI_HCSPARAMS from wrong register offset.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#55 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#55 (text+ko) ====

@@ -3114,7 +3114,6 @@
 	uint16_t i;
 	uint16_t value;
 	uint16_t index;
-	uint8_t l;
 	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
@@ -3318,20 +3317,23 @@
 			err = USB_ERR_IOERROR;
 			goto done;
 		}
-		v = EOREAD4(sc, EHCI_HCSPARAMS);
+		v = EREAD4(sc, EHCI_HCSPARAMS);
 
 		sc->sc_hub_desc.hubd = ehci_hubd;
 		sc->sc_hub_desc.hubd.bNbrPorts = sc->sc_noport;
-		USETW(sc->sc_hub_desc.hubd.wHubCharacteristics,
-		    (EHCI_HCS_PPC(v) ? UHD_PWR_INDIVIDUAL : UHD_PWR_NO_SWITCH) |
-		    (EHCI_HCS_P_INDICATOR(EREAD4(sc, EHCI_HCSPARAMS)) ?
-		    UHD_PORT_IND : 0));
+
+		if (EHCI_HCS_PPC(v))
+			i = UHD_PWR_INDIVIDUAL;
+		else
+			i = UHD_PWR_NO_SWITCH;
+
+		if (EHCI_HCS_P_INDICATOR(v))
+			i |= UHD_PORT_IND;
+
+		USETW(sc->sc_hub_desc.hubd.wHubCharacteristics, i);
 		/* XXX can't find out? */
 		sc->sc_hub_desc.hubd.bPwrOn2PwrGood = 200;
-		for (l = 0; l < sc->sc_noport; l++) {
-			/* XXX can't find out? */
-			sc->sc_hub_desc.hubd.DeviceRemovable[l / 8] &= ~(1 << (l % 8));
-		}
+		/* XXX don't know if ports are removable or not */
 		sc->sc_hub_desc.hubd.bDescLength =
 		    8 + ((sc->sc_noport + 7) / 8);
 		len = sc->sc_hub_desc.hubd.bDescLength;

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 21:51:13 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 718D81065675; Fri, 30 Jul 2010 21:51: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 338841065670
	for ; Fri, 30 Jul 2010 21:51:13 +0000 (UTC)
	(envelope-from kibab@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0540A8FC15
	for ; Fri, 30 Jul 2010 21:51:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6ULpCKr040853
	for ; Fri, 30 Jul 2010 21:51:12 GMT
	(envelope-from kibab@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6ULpBaZ040851
	for perforce@freebsd.org; Fri, 30 Jul 2010 21:51:11 GMT
	(envelope-from kibab@FreeBSD.org)
Date: Fri, 30 Jul 2010 21:51:11 GMT
Message-Id: <201007302151.o6ULpBaZ040851@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kibab@FreeBSD.org using -f
From: Ilya Bakulin 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181615 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 21:51:13 -0000

http://p4web.freebsd.org/@@181615?ac=10

Change 181615 by kibab@kibab_kibab-nb on 2010/07/30 21:50:27

	IFC.

Affected files ...

.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/compat-43/sigcompat.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/gen/Makefile.inc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/gen/_thread_init.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/gmon/gmon.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/locale/tolower.3#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/locale/toupper.3#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/net/sctp_sys_calls.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/posix1e/acl_from_text.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/posix1e/acl_from_text_nfs4.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/posix1e/acl_support.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/Makefile.inc#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/SYS.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/Symbol.map#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/_fpmath.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/arith.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gd_qnan.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/Makefile.inc#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/_ctx_start.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/_set_tp.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/_setjmp.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/fabs.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/flt_rounds.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/fpgetmask.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/fpgetround.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/fpgetsticky.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/fpsetmask.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/fpsetround.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/infinity.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/makecontext.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/modf.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/setjmp.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/signalcontext.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/sigsetjmp.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/gen/syncicache.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/softfloat/milieu.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/softfloat/powerpc-gcc.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/softfloat/softfloat.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/Makefile.inc#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/brk.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/cerror.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/exect.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/pipe.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/ptrace.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/sbrk.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/powerpc64/sys/setlogin.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/stdlib/malloc.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/sys/mlock.2#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/sys/mlockall.2#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/sys/ptrace.2#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_lib_libc/sys/sctp_peeloff.2#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/acpica/Makefile#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/acpica/acpi_switch.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/acpica/genwakecode.sh#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/acpica/genwakedata.sh#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/cpu_switch.S#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/fpu.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/pmap.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/amd64/trap.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/clock.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/cpu.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/param.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/pcpu.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/segments.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/specialreg.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91_aicreg.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91_pio_sam9.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91_pit.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91_pitreg.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91_pmcreg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91sam9.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91sam9_machdep.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/at91sam9g20reg.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/board_hl201.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/files.at91sam9#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/if_macb.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/if_macbreg.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/if_macbvar.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/std.at91sam9#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/at91/std.hl201#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/conf/HL201#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/conf/HL201.hints#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/include/bootinfo.h#3 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/include/fdt.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/include/metadata.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/common.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/discovery/std.db78xxx#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/files.mv#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/kirkwood/std.db88f6xxx#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/kirkwood/std.sheevaplug#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/mv_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/orion/std.db88f5xxx#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/mv/timer.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/s3c2xx0/files.s3c2xx0#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/s3c2xx0/s3c24x0.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/s3c2xx0/s3c24x0_machdep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/s3c2xx0/s3c24x0_rtc.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/s3c2xx0/s3c24x0reg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/s3c2xx0/s3c2xx0_space.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/arm/s3c2xx0/s3c2xx0var.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/Makefile#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/common/load_elf_obj.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/fdt/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/fdt/dts/mpc8555cds.dts#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/i386/loader/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/ia64/efi/version#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/ofw/Makefile.inc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/ofw/libofw/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/ofw/libofw/libofw.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/ofw/libofw/ppc64_elf_freebsd.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/pc98/loader/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/Makefile.inc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/boot1.chrp/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/ofw/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/ofw/conf.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/ofw/ldscript.powerpc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/ofw/metadata.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/uboot/Makefile#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/powerpc/uboot/ldscript.powerpc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/uboot/Makefile.inc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/uboot/common/metadata.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/boot/zfs/zfstest.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cam/ata/ata_da.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cam/ata/ata_xpt.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cam/scsi/scsi_cd.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/boot/zfs/zfsimpl.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/compat/opensolaris/kern/opensolaris_uio.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/compat/opensolaris/sys/misc.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/compat/opensolaris/sys/policy.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/compat/opensolaris/sys/sid.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/compat/opensolaris/sys/uio.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/compat/freebsd32/freebsd32_util.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/compat/svr4/svr4_filio.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/NOTES#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.amd64#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.arm#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.i386#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.mips#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.pc98#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.powerpc#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.sparc64#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/files.sun4v#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/kern.mk#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/kern.post.mk#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/kmod.mk#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/ldscript.mips.64#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/ldscript.powerpc64#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/options#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/options.arm#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/options.mips#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/conf/options.powerpc#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/acpica_prep.sh#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/common/adisasm.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/common/adwalk.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/common/dmextern.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/common/dmrestag.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/common/dmtable.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslpredef.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslstartup.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/asltree.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dtcompile.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dtcompiler.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dtfield.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dtio.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dtsubtable.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dttable.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dttemplate.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dttemplate.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/compiler/dtutils.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/debugger/dbfileio.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/debugger/dbhistry.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/debugger/dbutils.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/disassembler/dmobject.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/disassembler/dmopcode.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/disassembler/dmresrc.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/dispatcher/dsopcode.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/dispatcher/dsutils.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/events/evgpe.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/events/evgpeinit.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/events/evgpeutil.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/events/evrgnini.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/events/evxface.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/events/evxfevnt.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/executer/exdump.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/executer/exfldio.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/executer/exprep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/executer/exregion.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/executer/exsystem.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/hardware/hwvalid.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acdisasm.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acevents.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acexcep.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acglobal.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/achware.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/aclocal.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acobject.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acoutput.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acpredef.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acstruct.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/actbl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/actbl2.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/actypes.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsaccess.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsnames.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsparse.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nssearch.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsutils.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/namespace/nsxfobj.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/osunixxf.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/acpica/utilities/uttrack.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/README.txt#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmip.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-abi.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-access-native.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-access.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-address.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-app-init-linux.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-app-init.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-app-init.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-asm.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-asx.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-atomic.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-bootloader.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-bootmem.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-bootmem.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-ciu.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-cmd-queue.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-cmd-queue.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-compactflash.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-compactflash.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-core.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-core.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-coremask.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-coremask.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-csr-addresses.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-csr-db-support.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-csr-db.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-csr-db.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-csr-enums.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-csr-typedefs.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-csr.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-cvmmem.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-dfa.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-dfa.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-dma-engine.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-dma-engine.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-ebt3000.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-ebt3000.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-fau.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-flash.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-flash.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-fpa.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-fpa.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-gmx.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-gpio.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-board.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-board.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-check-defines.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-errata.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-errata.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-fpa.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-fpa.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-loop.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-loop.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-npi.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-npi.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-rgmii.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-rgmii.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-sgmii.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-sgmii.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-spi.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-spi.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-util.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-util.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-xaui.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper-xaui.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-helper.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-higig.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-interrupt-decodes.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-interrupt-handler.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-interrupt-rsl.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-interrupt.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-interrupt.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-iob.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-ipd.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-key.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-l2c.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-l2c.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-llm.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-llm.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-lmc.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-log-arc.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-log.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-log.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-malloc.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-malloc/README-malloc#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-malloc/arena.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-malloc/malloc.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-malloc/malloc.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-malloc/thread-m.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-mdio.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-mgmt-port.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-mgmt-port.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-mio.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-nand.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-nand.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-npi.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-packet.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pci.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pcie.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pcie.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pip.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pko.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pko.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-platform.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pow.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-pow.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-raid.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-raid.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-resources.config#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-rng.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-rtc.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-rwlock.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-scratch.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-shared-linux.ld#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-spi.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-spi.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-spi4000.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-spinlock.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-swap.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-sysinfo.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-sysinfo.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-thunder.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-thunder.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-tim.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-tim.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-tra.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-tra.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-twsi-raw.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-twsi-raw.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-twsi.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-twsi.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-uart.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-usb.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-usb.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-utils.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-version.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-warn.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-warn.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-wqe.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-zip.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-zip.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx-zone.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/cvmx.mk#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/executive-config.h.template#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/octeon-feature.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/octeon-model.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/octeon-model.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/octeon-pci-console.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/contrib/octeon-sdk/octeon-pci-console.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/crypto/aesni/aesencdec_amd64.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/crypto/aesni/aesencdec_i386.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/crypto/aesni/aeskeys_amd64.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/crypto/aesni/aeskeys_i386.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/crypto/aesni/aesni.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/crypto/aesni/aesni.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/crypto/aesni/aesni_wrap.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ddb/db_command.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpi_support/acpi_aiboost.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpica/Osd/OsdHardware.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpica/Osd/OsdMemory.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpica/acpi_button.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpica/acpi_ec.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/acpica/acpi_lid.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/agp/agp.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/aic7xxx/aic79xx.reg#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/aic7xxx/aic7xxx.reg#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/arcmsr/arcmsr.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-amd.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-highpoint.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-intel.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-ite.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-jmicron.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-marvell.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-nvidia.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-promise.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-sis.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ata/chipsets/ata-via.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bktr/bktr_core.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bwi/if_bwi_pci.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/bwn/if_bwn.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cas/if_cas.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cfi/cfi_bus_fdt.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cfi/cfi_bus_lbc.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/coretemp/coretemp.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/e1000/e1000_osdep.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/e1000/if_em.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/e1000/if_igb.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/e1000/if_lem.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/et/if_et.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/et/if_etreg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/et/if_etvar.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fb/vesa.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fdt/fdt_arm.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fdt/fdt_common.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fdt/fdt_common.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fdt/fdt_pci.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fdt/fdt_powerpc.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/fdt/simplebus.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/flash/mx25l.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/flash/mx25lreg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/hwpmc/hwpmc_core.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/hwpmc/hwpmc_core.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/iicbus/iicbus.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ipmi/ipmi_smbios.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/iwn/if_iwn.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/iwn/if_iwnreg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/iwn/if_iwnvar.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/md/md.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/mvs/mvs.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ofw/ofw_if.m#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ofw/ofw_standard.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ofw/openfirm.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/ofw/openfirm.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/pci/pci.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/quicc/quicc_bfe_fdt.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/quicc/quicc_bfe_ocp.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/sec/sec.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/sge/if_sge.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/sge/if_sgereg.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/siis/siis.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/syscons/scvgarndr.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/tsec/if_tsec.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/tsec/if_tsec.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/tsec/if_tsec_fdt.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/tsec/if_tsec_ocp.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/twa/tw_cl.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/twa/tw_cl_share.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/uart/uart_bus_fdt.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/uart/uart_bus_ocp.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/uart/uart_cpu_powerpc.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/net/uhso.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/quirk/usb_quirk.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/serial/u3g.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/serial/uftdi.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/serial/uipaq.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/serial/uplcom.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/serial/uslcom.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/dev/usb/wlan/if_run.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfs/nfs_commonport.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfs/nfs_var.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_cllock.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_clnfsiod.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_clport.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_clrpcops.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_clstate.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_clsubs.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_clvnops.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfs_lock.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/cache/g_cache.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_disk.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/geom_disk.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/geom/part/g_part.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/conf/GENERIC.hints#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/conf/NOTES#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/i386/swtch.s#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/include/clock.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/include/cpu.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/include/pcpu.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/include/pmap.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/include/segments.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/include/specialreg.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/isa/npx.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/ia64/autoconf.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/ia64/mca.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/include/md_var.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/include/param.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/include/pcpu.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/ia64/include/vmparam.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/isa/syscons_isa.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/imgact_shell.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/init_main.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_clock.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_clocksource.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_cpu.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_et.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_exec.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ktr.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_malloc.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_mib.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_prot.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_resource.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_sig.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_tc.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/kern_thread.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/sched_ule.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_disk.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_prf.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_prof.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_trap.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_unit.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/subr_witness.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/tty.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/vfs_bio.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/atheros/ar71xxreg.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/atheros/if_arge.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/atheros/if_argevar.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/ciu.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/cryptocteon/cavium_crypto.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/cryptocteon/cryptocteon.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/cryptocteon/cryptocteonvar.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/cvmx_config.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_fau.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_fpa.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_fpa.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_ipd.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_ipd.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_pip.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_pko.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_pko.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_rgmx.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/dev/rgmii/octeon_rgmx.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/driveid.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/files.octeon1#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/obio.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/cavium-ethernet.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-common.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-common.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-defines.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-headers.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-mdio.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-mdio.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-mem.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-mem.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-rgmii.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-rx.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-rx.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-sgmii.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-spi.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-tx.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-tx.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-util.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet-xaui.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/ethernet.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/octe.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/octebus.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/octebusvar.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octe/wrapper-cvmx-includes.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_ds1337.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_ebt3000_cf.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_ebt3000_cf.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_machdep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_mp.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_pcmap_regs.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_rnd.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octeon_rtc.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octopci.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octopci_bus_space.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octopcireg.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/octopcivar.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/std.octeon1#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/uart_bus_octeonusart.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/uart_cpu_octeonusart.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/uart_dev_oct16550.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/usb/octusb.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/usb/octusb.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/cavium/usb/octusb_octeon.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/conf/OCTEON1#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/conf/OCTEON1-32#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/conf/OCTEON1.hints#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/conf/XLR64#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/conf/XLRN32#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/_bus.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/_bus_octeon.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/_stdint.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/asm.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/asmacros.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/cache_mipsNN.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/clock.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/cpu.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/cpufunc.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/cpuregs.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/db_machdep.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/md_var.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/param.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/pmap.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/profile.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/pte.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/runq.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/smp.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/tlb.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/include/vmparam.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/bus_space_generic.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/cache.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/cache_mipsNN.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/cpu.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/db_interface.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/db_trace.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/exception.S#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/fp.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/genassym.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/locore.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/mainbus.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/mp_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/mpboot.S#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/pmap.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/psraccess.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/support.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/swtch.S#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/tick.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/tlb.S#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/trap.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/mips/vm_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/dev/xlr/rge.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/files.xlr#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/intr_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/iodi.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/on_chip.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/tick.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/xlr_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/rmi/xlr_pci.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/mips/sibyte/sb_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/Makefile#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/acpi/Makefile#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/acpi/acpi_aiboost/Makefile#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/aesni/Makefile#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/cas/Makefile#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/hwpmc/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/iwnfw/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/iwnfw/iwn6000/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/iwnfw/iwn6050/Makefile#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/nfscl/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/nfslock/Makefile#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/opensolaris/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/net/if.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/net/if_llatbl.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/net/pfil.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/net/radix.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/ng_ipfw.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/ng_pipe.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netgraph/ng_source.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ipfw/dn_heap.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ipfw/ip_fw2.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/ipfw/ip_fw_log.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/libalias/alias_sctp.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet/siftr.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfs/nfs_lock.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfs/nfs_lock.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfs_lock.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfs_lock.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/pc98/cbus/clock.c#3 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/pc98/pc98/machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/pci/if_rl.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/copyinout.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/locore.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/locore32.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/locore64.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/mmu_oea.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/mmu_oea64.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/mp_cpudep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/nexus.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/ofw_machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/platform_chrp.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/slb.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/swtch.S#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/swtch32.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/swtch64.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/trap.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/trap_subr32.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/trap_subr64.S#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/booke/locore.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/booke/platform_bare.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/booke/pmap.c#4 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/booke/swtch.S#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/booke/vm_machdep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/conf/DEFAULTS#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/conf/GENERIC64#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/cpufreq/pcr.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/_align.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/_bus.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/_inttypes.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/_limits.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/_stdint.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/_types.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/asm.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/atomic.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/bootinfo.h#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/bus.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/db_machdep.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/fdt.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/frame.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/hid.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/md_var.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/metadata.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/ocpbus.h#3 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/param.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/pcb.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/pmap.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/proc.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/profile.h#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/psl.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/pte.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/reg.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/runq.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/slb.h#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/smp.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/spr.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/sr.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/trap_aim.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/ucontext.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/atpic.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/ds1553_bus_fdt.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/ds1553_bus_lbc.c#2 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/i2c.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/lbc.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/lbc.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/mpc85xx.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/mpc85xx.h#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/nexus.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/ocpbus.c#3 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/ocpbus.h#3 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/openpic_fdt.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/opic.c#3 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/pci_fdt.c#1 branch
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/mpc85xx/pci_ocp.c#3 delete
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/ofw/ofw_real.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/ofw/ofw_syscons.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/powermac/grackle.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/powerpc/bcopy.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/powerpc/bus_machdep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/powerpc/busdma_machdep.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/soc2010/kibab_sysctlreg/src_sys/powerpc/powerpc/db_interface.c#2 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 22:00:23 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7719E1065672; Fri, 30 Jul 2010 22:00: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 37AF110656F1
	for ; Fri, 30 Jul 2010 22:00:23 +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 2598D8FC0C
	for ; Fri, 30 Jul 2010 22:00:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UM0Ndb041500
	for ; Fri, 30 Jul 2010 22:00:23 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UM0NN9041498
	for perforce@freebsd.org; Fri, 30 Jul 2010 22:00:23 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Jul 2010 22:00:23 GMT
Message-Id: <201007302200.o6UM0NN9041498@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181616 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 22:00:23 -0000

http://p4web.freebsd.org/@@181616?ac=10

Change 181616 by hselasky@hselasky_laptop001 on 2010/07/30 22:00:22

	USB core:
		- add more Super Speed USB definitions.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.h#50 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb.h#50 (text+ko) ====

@@ -670,9 +670,25 @@
 #define	UPS_SUSPEND			0x0004
 #define	UPS_OVERCURRENT_INDICATOR	0x0008
 #define	UPS_RESET			0x0010
+/* The link-state bits are valid for Super-Speed USB HUBs */
+#define	UPS_PORT_LINK_STATE_GET(x)	(((x) >> 5) & 0xF)
+#define	UPS_PORT_LINK_STATE_SET(x)	(((x) & 0xF) << 5)
+#define	UPS_PORT_LS_U0		0x00
+#define	UPS_PORT_LS_U1		0x01
+#define	UPS_PORT_LS_U2		0x02
+#define	UPS_PORT_LS_U3		0x03
+#define	UPS_PORT_LS_SS_DIS	0x04
+#define	UPS_PORT_LS_RX_DET	0x05
+#define	UPS_PORT_LS_SS_INA	0x06
+#define	UPS_PORT_LS_POLL	0x07
+#define	UPS_PORT_LS_RECOVER	0x08
+#define	UPS_PORT_LS_HOT_RST	0x09
+#define	UPS_PORT_LS_COMP_MODE	0x0A
+#define	UPS_PORT_LS_LOOPBACK	0x0B
 #define	UPS_PORT_POWER			0x0100
 #define	UPS_LOW_SPEED			0x0200
 #define	UPS_HIGH_SPEED			0x0400
+#define	UPS_OTHER_SPEED			0x0600	/* currently FreeBSD specific */
 #define	UPS_PORT_TEST			0x0800
 #define	UPS_PORT_INDICATOR		0x1000
 #define	UPS_PORT_MODE_DEVICE		0x8000	/* currently FreeBSD specific */
@@ -682,6 +698,9 @@
 #define	UPS_C_SUSPEND			0x0004
 #define	UPS_C_OVERCURRENT_INDICATOR	0x0008
 #define	UPS_C_PORT_RESET		0x0010
+#define	UPS_C_BH_PORT_RESET		0x0020
+#define	UPS_C_PORT_LINK_STATE		0x0040
+#define	UPS_C_PORT_CONFIG_ERROR		0x0080
 } __packed;
 typedef struct usb_port_status usb_port_status_t;
 

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 22:03:27 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DFB4E1065675; Fri, 30 Jul 2010 22:03: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 A435B1065673
	for ; Fri, 30 Jul 2010 22:03: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 9241F8FC1F
	for ; Fri, 30 Jul 2010 22:03:26 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UM3Q6E042731
	for ; Fri, 30 Jul 2010 22:03:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UM3QY4042729
	for perforce@freebsd.org; Fri, 30 Jul 2010 22:03:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Jul 2010 22:03:26 GMT
Message-Id: <201007302203.o6UM3QY4042729@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181617 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 22:03:27 -0000

http://p4web.freebsd.org/@@181617?ac=10

Change 181617 by hselasky@hselasky_laptop001 on 2010/07/30 22:02:40

	USB modules:
		- remove superfluous header file sources from Makefiles

Affected files ...

.. //depot/projects/usb/src/sys/modules/usb/ehci/Makefile#2 edit
.. //depot/projects/usb/src/sys/modules/usb/ohci/Makefile#2 edit
.. //depot/projects/usb/src/sys/modules/usb/uhci/Makefile#2 edit

Differences ...

==== //depot/projects/usb/src/sys/modules/usb/ehci/Makefile#2 (text+ko) ====

@@ -32,7 +32,7 @@
 KMOD=	ehci
 SRCS=	bus_if.h device_if.h usb_if.h \
 	opt_bus.h opt_usb.h \
-	ehci_pci.c ehci.c ehci.h \
+	ehci_pci.c ehci.c \
 	pci_if.h
 
 .include 

==== //depot/projects/usb/src/sys/modules/usb/ohci/Makefile#2 (text+ko) ====

@@ -32,7 +32,7 @@
 KMOD=	ohci
 SRCS=	bus_if.h device_if.h usb_if.h \
 	opt_bus.h opt_usb.h \
-	ohci_pci.c ohci.c ohci.h \
+	ohci_pci.c ohci.c \
 	pci_if.h
 
 .include 

==== //depot/projects/usb/src/sys/modules/usb/uhci/Makefile#2 (text+ko) ====

@@ -32,7 +32,7 @@
 KMOD=	uhci
 SRCS=	bus_if.h device_if.h usb_if.h \
 	opt_bus.h opt_usb.h \
-	uhci_pci.c uhci.c uhci.h \
+	uhci_pci.c uhci.c \
 	pci_if.h
 
 .include 

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 22:04:28 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 39C811065672; Fri, 30 Jul 2010 22:04: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 F1DFB106566B
	for ; Fri, 30 Jul 2010 22:04:27 +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 C5E538FC18
	for ; Fri, 30 Jul 2010 22:04:27 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UM4R9Z042792
	for ; Fri, 30 Jul 2010 22:04:27 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UM4R0X042790
	for perforce@freebsd.org; Fri, 30 Jul 2010 22:04:27 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Jul 2010 22:04:27 GMT
Message-Id: <201007302204.o6UM4R0X042790@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181618 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 22:04:28 -0000

http://p4web.freebsd.org/@@181618?ac=10

Change 181618 by hselasky@hselasky_laptop001 on 2010/07/30 22:03:44

	USB controller (XHCI):
		- add initial Makefile

Affected files ...

.. //depot/projects/usb/src/sys/modules/usb/xhci/Makefile#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 22:07:31 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFEE61065678; Fri, 30 Jul 2010 22:07: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 6C43F1065676
	for ; Fri, 30 Jul 2010 22:07: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 5A70A8FC25
	for ; Fri, 30 Jul 2010 22:07:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UM7Van043065
	for ; Fri, 30 Jul 2010 22:07:31 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UM7VQM043063
	for perforce@freebsd.org; Fri, 30 Jul 2010 22:07:31 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Jul 2010 22:07:31 GMT
Message-Id: <201007302207.o6UM7VQM043063@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181620 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 22:07:32 -0000

http://p4web.freebsd.org/@@181620?ac=10

Change 181620 by hselasky@hselasky_laptop001 on 2010/07/30 22:06:34

	USB controller (XHCI):
		- correct some register definitions

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#3 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#3 (text+ko) ====

@@ -38,7 +38,7 @@
 #define	XHCI_CAPLENGTH		0x00	/* RO capability */
 #define	XHCI_RESERVED		0x01	/* Reserved */
 #define	XHCI_HCIVERSION		0x02	/* RO Interface version number */
-#define	XHCI_HCIVERSION_1_0	0x0090	/* xHCI version 0.9 */
+#define	XHCI_HCIVERSION_0_9	0x0090	/* xHCI version 0.9 */
 #define	XHCI_HCIVERSION_1_0	0x0100	/* xHCI version 1.0 */
 #define	XHCI_HCSPARAMS1		0x04	/* RO structual parameters 1 */
 #define	XHCI_HCS1_DEVSLOT_MAX(x)((x) & 0xFF)
@@ -110,7 +110,7 @@
 #define	XHCI_CONFIG_SLOTS_MASK	0x000000FF	/* RW - number of device slot enabled */
 
 /* XHCI port status registers */
-#define	XHCI_PORTSC(n)		(0x400 + (0x10 * (n)))	/* XHCI port status */
+#define	XHCI_PORTSC(n)		(0x3F0 + (0x10 * (n)))	/* XHCI port status */
 #define	XHCI_PS_CCS		0x00000001	/* RO - current connect status */
 #define	XHCI_PS_PED		0x00000002	/* RW - port enabled / disabled */
 #define	XHCI_PS_OCA		0x00000008	/* RO - over current active */
@@ -118,7 +118,7 @@
 #define	XHCI_PS_PLS_GET(x)	(((x) >> 5) & 0xF)	/* RW - port link state */
 #define	XHCI_PS_PLS_SET(x)	(((x) & 0xF) << 5)	/* RW - port link state */
 #define	XHCI_PS_PP		0x00000100	/* RW - port power */
-#define	XHCI_PS_PORT_SPEED(x)	(((x) >> 9) & 0xF)	/* RO - port speed */
+#define	XHCI_PS_SPEED_GET(x)	(((x) >> 9) & 0xF)	/* RO - port speed */
 #define	XHCI_PS_PIC_GET(x)	(((x) >> 14) & 0x3)	/* RW - port indicator */
 #define	XHCI_PS_PIC_SET(x)	(((x) & 0x3) << 14)	/* RW - port indicator */
 #define	XHCI_PS_LWS		0x00010000	/* RW - port link state write strobe */
@@ -134,8 +134,10 @@
 #define	XHCI_PS_WDE		0x04000000	/* RW - wake on disconnect enable */
 #define	XHCI_PS_WOE		0x08000000	/* RW - wake on over-current enable */
 #define	XHCI_PS_DR		0x40000000	/* RO - device removable */
-#define	XHCI_PS_WPR		0x80000000	/* RW - warm port reset */
-#define	XHCI_PORTPMSC(n)	(0x404 + (0x10 * (n)))	/* XHCI status and control */
+#define	XHCI_PS_WPR		0x80000000U	/* RW - warm port reset */
+#define	XHCI_PS_CLEAR		0x80FF00F7U	/* command bits */
+
+#define	XHCI_PORTPMSC(n)	(0x3F4 + (0x10 * (n)))	/* XHCI status and control */
 #define	XHCI_PM3_U1TO_GET(x)	(((x) >> 0) & 0xFF)	/* RW - U1 timeout */
 #define	XHCI_PM3_U1TO_SET(x)	(((x) & 0xFF) << 0)	/* RW - U1 timeout */
 #define	XHCI_PM3_U2TO_GET(x)	(((x) >> 8) & 0xFF)	/* RW - U2 timeout */
@@ -148,9 +150,9 @@
 #define	XHCI_PM2_L1SLOT_GET(x)	(((x) >> 8) & 0xFF)	/* RW - L1 device slot */
 #define	XHCI_PM2_L1SLOT_SET(x)	(((x) & 0xFF) << 8)	/* RW - L1 device slot */
 #define	XHCI_PM2_HLE		0x00010000		/* RW - hardware LPM enable */
-#define	XHCI_PORTLI(n)		(0x408 + (0x10 * (n)))	/* XHCI port link info */
+#define	XHCI_PORTLI(n)		(0x3F8 + (0x10 * (n)))	/* XHCI port link info */
 #define	XHCI_PLI3_ERR_GET(x)	(((x) >> 0) & 0xFFFF)	/* RO - port link errors */
-#define	XHCI_PORTRSV(n)		(0x40C + (0x10 * (n)))	/* XHCI port reserved */
+#define	XHCI_PORTRSV(n)		(0x3FC + (0x10 * (n)))	/* XHCI port reserved */
 
 /* XHCI runtime registers.  Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */
 #define	XHCI_MFINDEX		0x0000		/* RO - microframe index */

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 22:12:37 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8A459106567A; Fri, 30 Jul 2010 22:12: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 3694F1065670
	for ; Fri, 30 Jul 2010 22:12:37 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 241798FC13
	for ; Fri, 30 Jul 2010 22:12:37 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UMCbgK043469
	for ; Fri, 30 Jul 2010 22:12:37 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UMCbX8043467
	for perforce@freebsd.org; Fri, 30 Jul 2010 22:12:37 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Fri, 30 Jul 2010 22:12:37 GMT
Message-Id: <201007302212.o6UMCbX8043467@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181622 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 22:12:37 -0000

http://p4web.freebsd.org/@@181622?ac=10

Change 181622 by jlaffaye@jlaffaye-chulak on 2010/07/30 22:12:23

	       - Add support for complete package in pkg_add(1).
	       - Use a const for the complete package file identifier.
	       - Fix a bug if a pkg-message file exists.

Affected files ...

.. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#10 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/Makefile#3 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#5 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/complete.c#1 add
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#11 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#12 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/complete/perform.c#7 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#10 (text+ko) ====

@@ -89,6 +89,7 @@
 #define REQUIRED_BY_FNAME	"+REQUIRED_BY"
 #define DISPLAY_FNAME		"+DISPLAY"
 #define MTREE_FNAME		"+MTREE_DIRS"
+#define PKG_COMPLETE_FNAME	"+PKG_COMPLETE"
 
 #define CMD_CHAR		'@'	/* prefix for extended PLIST cmd */
 

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/Makefile#3 (text+ko) ====

@@ -8,6 +8,7 @@
 	perform.c		\
 	futil.c			\
 	extract.c		\
+	complete.c
 
 WARNS?=				3
 WFORMAT?=			1

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#5 (text+ko) ====

@@ -23,8 +23,16 @@
 #ifndef _INST_ADD_H_INCLUDE
 #define _INST_ADD_H_INCLUDE
 
+#include 
+
 typedef enum { NORMAL, MASTER, SLAVE } add_mode_t;
 
+struct complete_data {
+	char buf[8192];
+	struct archive *src;
+	const char *fname;
+};
+
 extern char	*Prefix;
 extern Boolean	PrefixRecursive;
 extern Boolean	NoInstall;
@@ -45,5 +53,6 @@
 int	extract_package(struct archive *, Package *, const char *);
 int	extract_plist(struct archive *, struct archive_entry *, Package *);
 int	pkg_do(const char *);
+int	pkg_do_complete(struct archive *);
 
 #endif	/* _INST_ADD_H_INCLUDE */

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#11 (text+ko) ====

@@ -625,7 +625,7 @@
 	    FILE *fp;
 	    char buf[BUFSIZ];
 
-	    snprintf(buf, sizeof buf, "%s/%s", db_dir_tmp, p->name);
+	    snprintf(buf, sizeof buf, "%s/%s", db_dir, p->name);
 	    fp = fopen(buf, "r");
 	    if (fp) {
 		putc('\n', stdout);

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#12 (text+ko) ====

@@ -77,7 +77,6 @@
 	/*
 	 * TODO:
 	 *	Deal with master/slave modes.
-	 *	add support for complete packages
 	 */
 	if (isURL(fname)) {
 	    if ((fd = fetch_archive(fname, KeepPackage)) == -1) {
@@ -113,10 +112,10 @@
 		}
 		retcode = extract_package(a, &pkg, fname);
 		free_plist(&pkg);
-	    } else if (strcmp(pathname, "+PKG_COMPLETE") == 0) {
+	    } else if (strcmp(pathname, PKG_COMPLETE_FNAME) == 0) {
 		if (Verbose)
-		    printf("'%s' is a complete package...\n", fname);
-		/* TODO: add support */
+		    printf("The file '%s' is a complete package...\n", fname);
+		retcode = pkg_do_complete(a);
 	    } else {
 		warnx("Unknown package type!");
 		retcode = 1;

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/complete/perform.c#7 (text+ko) ====

@@ -59,7 +59,7 @@
 	 * The existence of this file in the package archive can be tested
 	 * to determine if the package is a complete or regular package.
 	 */
-	archive_entry_set_pathname(entry, "+PKG_COMPLETE");
+	archive_entry_set_pathname(entry, PKG_COMPLETE_FNAME);
 	archive_entry_set_filetype(entry, AE_IFREG);
 	archive_entry_set_size(entry, 0);
 	archive_write_header(a, entry);

From owner-p4-projects@FreeBSD.ORG  Fri Jul 30 23:54:29 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7132C1065677; Fri, 30 Jul 2010 23:54: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 35C571065675
	for ; Fri, 30 Jul 2010 23:54:29 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0996D8FC08
	for ; Fri, 30 Jul 2010 23:54:29 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6UNsSd0052234
	for ; Fri, 30 Jul 2010 23:54:28 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6UNsS6E052232
	for perforce@freebsd.org; Fri, 30 Jul 2010 23:54:28 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Fri, 30 Jul 2010 23:54:28 GMT
Message-Id: <201007302354.o6UNsS6E052232@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181625 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 30 Jul 2010 23:54:29 -0000

http://p4web.freebsd.org/@@181625?ac=10

Change 181625 by bfiedler@freebsd-7803 on 2010/07/30 23:53:45

	Diff3 now compiles warning-free; iflag implemented

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/diff3/diff3prog.c#2 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/diff3/diff3prog.c#2 (text+ko) ====

@@ -64,11 +64,18 @@
  *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
  */
 
+#ifdef __FreeBSD__
+#define __dead
+#endif
+
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 /* diff3 - 3-way differential file comparison */
 
@@ -116,8 +123,9 @@
  * is stored in last[1-3];
  */
 int last[4];
-int eflag;
+int eflag, iflag;
 int oflag;		/* indicates whether to mark overlaps (-E or -X)*/
+int strip_cr;
 int debug  = 0;
 char f1mark[40], f3mark[40];	/* markers for -E and -X */
 
@@ -139,6 +147,32 @@
 void increase(void);
 __dead void usage(void);
 
+enum {  
+        HELP_OPT = CHAR_MAX + 1,
+        STRIPCR_OPT,
+	DIFFPROG_OPT,
+};
+
+#define OPTIONS "3aAeEiL:mTvxX"
+static struct option longopts[] = {
+        { "ed",    		no_argument,		NULL,   'e' },
+	{ "show-overlap", 	no_argument,		NULL,	'E' },
+	{ "overlap-only",	no_argument,		NULL,	'x' },
+
+	/* features to implement */
+	{ "show-all",		no_argument,		NULL,	'A' },
+	{ "easy-only", 		no_argument,		NULL,	'3' },
+	{ "merge",		no_argument,		NULL,	'm' },
+	{ "label",		required_argument,	NULL,	'L' },
+	{ "text",		no_argument,		NULL,	'a' },
+	{ "strip-trailing-cr",	no_argument,		NULL,	STRIPCR_OPT },
+	{ "initial-tab",	no_argument,		NULL,	'T' },
+	{ "diff-program",	required_argument,	NULL,	DIFFPROG_OPT },
+	{ "version",		no_argument,		NULL,	'v' },
+	{ "help",		no_argument,		NULL,	HELP_OPT }
+};
+
+
 int
 main(int argc, char **argv)
 {
@@ -146,7 +180,7 @@
 
 	eflag = 0;
 	oflag = 0;
-	while ((ch = getopt(argc, argv, "EeXx3")) != -1) {
+	while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) {
 		switch (ch) {
 		case 'E':
 			eflag = 3;
@@ -155,6 +189,9 @@
 		case 'e':
 			eflag = 3;
 			break;
+		case 'i':
+			iflag = 1;
+			break;
 		case 'X':
 			oflag = eflag = 1;
 			break;
@@ -164,6 +201,10 @@
 		case '3':
 			eflag = 2;
 			break;
+		case STRIPCR_OPT:
+			strip_cr = 1;
+			break;
+			
 		}
 	}
 	argc -= optind;
@@ -558,6 +599,10 @@
 			printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark);
 		}
 	}
+
+	if( iflag )
+		printf("w\nq\n");
+
 	exit(overlapcnt);
 }
 

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 09:15:46 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D21F1065676; Sat, 31 Jul 2010 09:15:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 16250106566C
	for ; Sat, 31 Jul 2010 09:15:46 +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 03D958FC17
	for ; Sat, 31 Jul 2010 09:15:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6V9Fjbf037115
	for ; Sat, 31 Jul 2010 09:15:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6V9FjO7037113
	for perforce@freebsd.org; Sat, 31 Jul 2010 09:15:45 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 09:15:45 GMT
Message-Id: <201007310915.o6V9FjO7037113@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181630 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 09:15:46 -0000

http://p4web.freebsd.org/@@181630?ac=10

Change 181630 by hselasky@hselasky_laptop001 on 2010/07/31 09:15:23

	USB core:
		- correct some SuperSpeed USB descriptors.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.h#51 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb.h#51 (text+ko) ====

@@ -333,7 +333,7 @@
 	uByte	bDevCapabilityType;
 	uByte	bmAttributes;
 	uWord	wSpeedsSupported;
-	uByte	bFunctionaltySupport;
+	uByte	bFunctionalitySupport;
 	uByte	bU1DevExitLat;
 	uByte	bU2DevExitLat;
 } __packed;
@@ -535,7 +535,7 @@
 struct usb_endpoint_ss_comp_descriptor {
 	uByte	bLength;
 	uByte	bDescriptorType;
-	uWord	bMaxBurst;
+	uByte	bMaxBurst;
 	uByte	bmAttributes;
 	uWord	wBytesPerInterval;
 } __packed;

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 09:20:52 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 188E01065688; Sat, 31 Jul 2010 09:20: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 BD34C1065673
	for ; Sat, 31 Jul 2010 09:20:51 +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 A9AFC8FC2A
	for ; Sat, 31 Jul 2010 09:20:51 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6V9Kp7Q037503
	for ; Sat, 31 Jul 2010 09:20:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6V9Kpsj037501
	for perforce@freebsd.org; Sat, 31 Jul 2010 09:20:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 09:20:51 GMT
Message-Id: <201007310920.o6V9Kpsj037501@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181631 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 09:20:52 -0000

http://p4web.freebsd.org/@@181631?ac=10

Change 181631 by hselasky@hselasky_laptop001 on 2010/07/31 09:20:10

	USB controller (XHCI):
		- import current work in progress

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#4 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#2 (text+ko) ====

@@ -31,3 +31,1734 @@
  * and the USB 3.0 spec at
  * http://www.usb.org/developers/docs/usb_30_spec_060910.zip
  */
+
+#include 
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/xhci.c $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#define	USB_DEBUG_VAR xhcidebug
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#define	XHCI_BUS2SC(bus) \
+   ((struct xhci_softc *)(((uint8_t *)(bus)) - \
+    ((uint8_t *)&(((struct xhci_softc *)0)->sc_bus))))
+
+#ifdef USB_DEBUG
+static int xhcidebug = 0;
+
+SYSCTL_NODE(_hw_usb, OID_AUTO, xhci, CTLFLAG_RW, 0, "USB XHCI");
+SYSCTL_INT(_hw_usb_xhci, OID_AUTO, debug, CTLFLAG_RW,
+    &xhcidebug, 0, "Debug level");
+
+TUNABLE_INT("hw.usb.xhci.debug", &xhcidebug);
+
+#endif
+
+#define	XHCI_INTR_ENDPT 1
+
+struct xhci_std_temp {
+	struct xhci_softc *sc;
+	struct usb_page_cache *pc;
+	struct xhci_td *td;
+	struct xhci_td *td_next;
+	uint32_t len;
+	uint32_t offset;
+	uint32_t max_packet_size;
+	uint32_t average;
+	uint16_t isoc_delta;
+	uint16_t isoc_frame;
+	uint8_t	shortpkt;
+	uint8_t multishort;
+	uint8_t last_frame;
+	uint8_t trb_type;
+	uint8_t direction;
+};
+
+void
+xhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
+{
+
+
+}
+
+usb_error_t
+xhci_reset(struct xhci_softc *sc)
+{
+
+
+}
+
+static usb_error_t
+xhci_hcreset(struct xhci_softc *sc)
+{
+
+
+}
+
+usb_error_t
+xhci_init(struct xhci_softc *sc)
+{
+
+
+}
+
+void
+xhci_detach(struct xhci_softc *sc)
+{
+
+
+}
+
+void
+xhci_suspend(struct xhci_softc *sc)
+{
+
+
+}
+
+void
+xhci_resume(struct xhci_softc *sc)
+{
+
+
+}
+
+void
+xhci_shutdown(struct xhci_softc *sc)
+{
+
+
+}
+
+static void
+xhci_transfer_intr_enqueue(struct usb_xfer *xfer)
+{
+	/* check for early completion */
+	if (xhci_check_transfer(xfer))
+		return;
+
+	/* put transfer on interrupt queue */
+	usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
+}
+
+static usb_error_t
+xhci_generic_done_sub(struct usb_xfer *xfer)
+{
+	struct xhci_td *td;
+	struct xhci_td *td_alt_next;
+	uint32_t len;
+	uint8_t status;
+
+	td = xfer->td_transfer_cache;
+	td_alt_next = td->alt_next;
+
+	if (xfer->aframes != xfer->nframes)
+		usbd_xfer_set_frame_len(xfer, xfer->aframes, 0);
+
+	while (1) {
+
+		usb_pc_cpu_invalidate(td->page_cache);
+
+		status = td->status;
+		len = td->remainder;
+
+		DPRINTFN(4, "xfer=%p[%u/%u] len=%u/%u status=%u\n",
+		    xfer, (unsigned int)xfer->aframes,
+		    (unsigned int)xfer->nframes,
+		    (unsigned int)len, (unsigned int)td->len,
+		    (unsigned int)status);
+
+		/*
+	         * Verify the status length and
+		 * add the length to "frlengths[]":
+	         */
+		if (len > td->len) {
+			/* should not happen */
+			DPRINTF("Invalid status length, "
+			    "0x%04x/0x%04x bytes\n", len, td->len);
+			status = XHCI_TRB_ERROR_LENGTH;
+		} else if (xfer->aframes != xfer->nframes) {
+			xfer->frlengths[xfer->aframes] += td->len - len;
+		}
+		/* Check for last transfer */
+		if (((void *)td) == xfer->td_transfer_last) {
+			td = NULL;
+			break;
+		}
+		/* Check for transfer error */
+		if ((status != XHCI_TRB_ERROR_SHORT_PKT) &&
+		    (status != XHCI_TRB_ERROR_SUCCESS)) {
+			/* the transfer is finished */
+			td = NULL;
+			break;
+		}
+		/* Check for short transfer */
+		if (len > 0) {
+			if (xfer->flags_int.short_frames_ok || 
+			    xfer->flags_int.isochronous_xfr) {
+				/* follow alt next */
+				td = td->alt_next;
+			} else {
+				/* the transfer is finished */
+				td = NULL;
+			}
+			break;
+		}
+		td = td->obj_next;
+
+		if (td->alt_next != td_alt_next) {
+			/* this USB frame is complete */
+			break;
+		}
+	}
+
+	/* update transfer cache */
+
+	xfer->td_transfer_cache = td;
+
+	return ((status == XHCI_TRB_ERROR_STALL) ? USB_ERR_STALLED : 
+	    ((status != XHCI_TRB_ERROR_SHORT_PKT) && 
+	    (status != XHCI_TRB_ERROR_SUCCESS)) ? USB_ERR_IOERROR :
+	    USB_ERR_NORMAL_COMPLETION);
+}
+
+static void
+xhci_generic_done(struct usb_xfer *xfer)
+{
+	usb_error_t err = 0;
+
+	DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n",
+	    xfer, xfer->endpoint);
+
+	/* reset scanner */
+
+	xfer->td_transfer_cache = xfer->td_transfer_first;
+
+	if (xfer->flags_int.control_xfr) {
+
+		if (xfer->flags_int.control_hdr)
+			err = xhci_generic_done_sub(xfer);
+
+		xfer->aframes = 1;
+
+		if (xfer->td_transfer_cache == NULL)
+			goto done;
+	}
+
+	while (xfer->aframes != xfer->nframes) {
+
+		err = xhci_generic_done_sub(xfer);
+		xfer->aframes++;
+
+		if (xfer->td_transfer_cache == NULL)
+			goto done;
+	}
+
+	if (xfer->flags_int.control_xfr &&
+	    !xfer->flags_int.control_act)
+		err = xhci_generic_done_sub(xfer);
+
+done:
+	xhci_device_done(xfer, err);
+}
+
+/*------------------------------------------------------------------------*
+ *	xhci_check_transfer
+ *------------------------------------------------------------------------*/
+static void
+xhci_check_transfer(struct xhci_softc *sc, struct xhci_trb *trb)
+{
+	struct usb_xfer *xfer;
+	struct xhci_td *td;
+	uint64_t td_event;
+	uint32_t temp;
+	uint32_t actlen;
+	uint8_t status;
+
+	/* decode TRB */
+	td_event = trb->qwTrb0;
+	temp = le32toh(trb->dwTrb2);
+
+	/* try to find the USB transfer that generated the event */
+	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
+
+		td = xfer->td_transfer_cache;
+
+		if (td_event == td->td_event) {
+
+			actlen = XHCI_TRB_2_ACTLEN_GET(temp);
+			status = XHCI_TRB_2_ERROR_GET(temp);
+
+			usb_pc_cpu_invalidate(td->page_cache);
+
+			/* "td->remainder" is verified later */
+			td->remainder -= actlen;
+			td->status = status;
+
+			usb_pc_cpu_flush(td->page_cache);
+
+			/*
+			 * 1) Last transfer descriptor makes the
+			 * transfer done
+			 */
+			if (((void *)td) == xfer->td_transfer_last) {
+				xhci_generic_done(xfer);
+				break;
+			}
+
+			/*
+			 * 2) Any kind of error makes the transfer
+			 * done
+			 */
+			if ((status != XHCI_TRB_ERROR_SHORT_PKT) &&
+			    (status != XHCI_TRB_ERROR_SUCCESS)) {
+				xhci_generic_done(xfer);
+				break;
+			}
+
+			/*
+			 * 3) If there is no alternate next transfer,
+			 * a short packet also makes the transfer done
+			 */
+			if (td->remainder > 0) {
+				if (xfer->flags_int.short_frames_ok) {
+					/* follow alt next */
+					if (td->alt_next != NULL) {
+						xfer->td_transfer_cache = td->alt_next;
+						break;
+					}
+				}
+				xhci_generic_done(xfer);
+				break;
+			}
+
+			/*
+			 * 4) Transfer complete - go to next TD
+			 */
+			xfer->td_transfer_cache = td->obj_next;
+			break;		/* there should only be one match */
+		}
+	}
+}
+
+static void
+xhci_pcd_enable(struct xhci_softc *sc)
+{
+
+}
+
+static void
+xhci_interrupt_poll(struct xhci_softc *sc)
+{
+	struct usb_xfer *xfer;
+
+repeat:
+	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
+		/*
+		 * check if transfer is transferred
+		 */
+		if (xhci_check_transfer(xfer)) {
+			/* queue has been modified */
+			goto repeat;
+		}
+	}
+}
+
+/*------------------------------------------------------------------------*
+ *	xhci_interrupt - XHCI interrupt handler
+ *------------------------------------------------------------------------*/
+void
+xhci_interrupt(struct xhci_softc *sc)
+{
+
+
+}
+
+/*------------------------------------------------------------------------*
+ *	xhci_timeout - XHCI timeout handler
+ *------------------------------------------------------------------------*/
+static void
+xhci_timeout(void *arg)
+{
+	struct usb_xfer *xfer = arg;
+
+	DPRINTF("xfer=%p\n", xfer);
+
+	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
+
+	/* transfer is transferred */
+	xhci_device_done(xfer, USB_ERR_TIMEOUT);
+}
+
+static void
+xhci_do_poll(struct usb_bus *bus)
+{
+	struct xhci_softc *sc = XHCI_BUS2SC(bus);
+
+	USB_BUS_LOCK(&sc->sc_bus);
+	xhci_interrupt_poll(sc);
+	USB_BUS_UNLOCK(&sc->sc_bus);
+}
+
+static void
+xhci_setup_generic_chain_sub(struct xhci_std_temp *temp)
+{
+	struct usb_page_search buf_res;
+	struct xhci_td *td;
+	struct xhci_td *td_next;
+	struct xhci_td *td_alt_next;
+	uint32_t buf_offset;
+	uint32_t average;
+	uint32_t len_old;
+	uint32_t dword;
+	uint8_t shortpkt_old;
+	uint8_t precompute;
+	uint8_t x;
+
+	td_alt_next = NULL;
+	buf_offset = 0;
+	shortpkt_old = temp->shortpkt;
+	len_old = temp->len;
+	precompute = 1;
+
+restart:
+
+	td = temp->td;
+	td_next = temp->td_next;
+
+	while (1) {
+
+		if (temp->len == 0) {
+
+			if (temp->shortpkt)
+				break;
+
+			/* send a Zero Length Packet, ZLP, last */
+
+			temp->shortpkt = 1;
+			average = 0;
+
+		} else {
+
+			average = temp->average;
+
+			if (temp->len < average) {
+				if (temp->len % temp->max_packet_size) {
+					temp->shortpkt = 1;
+				}
+				average = temp->len;
+			}
+		}
+
+		if (td_next == NULL)
+			panic("%s: out of XHCI transfer descriptors!", __FUNCTION__);
+
+		/* get next TD */
+
+		td = td_next;
+		td_next = td->obj_next;
+
+		/* check if we are pre-computing */
+
+		if (precompute) {
+
+			/* update remaining length */
+
+			temp->len -= average;
+
+			continue;
+		}
+		/* fill out current TD */
+
+		td->len = average;
+		td->remainder = average;
+		td->status = 0;
+
+		/* update remaining length */
+
+		temp->len -= average;
+
+		/* reset TRB index */
+
+		x = 0;
+
+		if (temp->trb_type == XHCI_TRB_TYPE_SETUP_STAGE) {
+			/* immediate data */
+
+			if (average > 8)
+				average = 8;
+
+			td->td_trb[0].qwTrb0 = 0;
+
+			usbd_copy_out(temp->pc, temp->offset + buf_offset, 
+			   (uint8_t *)(uintptr_t)&td->td_trb[0].qwTrb0, average);
+
+			dword = XHCI_TRB_2_BYTES_SET(8) |
+			    XHCI_TRB_2_TDSZ_SET(0) |
+			    XHCI_TRB_2_IRQ_SET(0);
+
+			td->td_trb[0].dwTrb2 = htole32(dword);
+
+			dword = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_SETUP_STAGE) |
+			  XHCI_TRB_3_IDT_BIT;
+
+			/* check wLength */
+			if (td->td_trb[0].qwTrb0 & htole64(0xFFFF00000000ULL)) {
+				if (td->td_trb[0].qwTrb0 & htole64(1))
+					dword |= XHCI_TRB_3_TRT_IN;
+				else
+					dword |= XHCI_TRB_3_TRT_OUT;
+			}
+
+			td->td_trb[0].dwTrb3 = htole32(dword);
+
+			x++;
+
+		} else do {
+
+			uint32_t npkt;
+
+			/* fill out buffer pointers */
+
+			if (average == 0) {
+				npkt = 1;
+				memset(&buf_res, 0, sizeof(buf_res));
+			} else {
+				usbd_get_page(temp->pc, temp->offset + buf_offset, &buf_res);
+
+				/* get length to end of page */
+				if (buf_res.length > average)
+					buf_res.length = average;
+
+				/* check for maximum length */
+				if (buf_res.length > XHCI_TD_PAGE_SIZE)
+					buf_res.length = XHCI_TD_PAGE_SIZE;
+
+				/* setup npkt */
+				npkt = (average + temp->max_packet_size - 1) / temp->max_packet_size;
+				if (npkt > 31)
+					npkt = 31;
+			}
+
+			/* fill out TRB's */
+			td->td_trb[x].qwTrb0 =
+			    htole64((uint64_t)buf_res.physaddr);
+
+			dword =
+			  XHCI_TRB_2_BYTES_SET(buf_res.length) |
+			  XHCI_TRB_2_TDSZ_SET(npkt) | 
+			  XHCI_TRB_2_IRQ_SET(0);
+
+			td->td_trb[x].dwTrb2 = htole32(dword);
+
+			dword = XHCI_TRB_3_CHAIN_BIT |
+			  XHCI_TRB_3_TYPE_SET(temp->trb_type) | 
+			  XHCI_TRB_3_FRID_SET(temp->isoc_frame);
+
+			if (temp->direction == UE_DIR_IN)
+				dword |= XHCI_TRB_3_DIR_IN;
+
+			td->td_trb[x].dwTrb3 = htole32(dword);
+
+			average -= buf_res.length;
+			buf_offset += buf_res.length;
+			x++;
+
+		} while (average != 0);
+
+		/* store number of data TRB's */
+
+		td->ntrb = x;
+
+		/* compute event pointer */
+
+		if (1) {
+			uint64_t td_event;
+
+			td_event = le64toh(td->td_self);
+			td_event += x * sizeof(td->td_trb[0]);
+			td->td_event = htole64(td_event);
+		}
+
+		/* fill out link TRB */
+
+		if (td_next != NULL) {
+			/* link the current TD with the next one */
+			td->td_trb[x].qwTrb0 = td_next->td_self;
+		} else {
+			/* this field will get updated later */
+		}
+
+		dword = XHCI_TRB_2_IRQ_SET(0);
+
+		td->td_trb[x].dwTrb2 = htole32(dword);
+
+		dword = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_LINK) |
+		    XHCI_TRB_3_IOC_BIT | XHCI_TRB_3_CHAIN_BIT;
+
+		td->td_trb[x].dwTrb3 = htole32(dword);
+
+		td->alt_next = td_alt_next;
+
+		usb_pc_cpu_flush(td->page_cache);
+	}
+
+	if (precompute) {
+		precompute = 0;
+
+		/* setup alt next pointer, if any */
+		if (temp->last_frame) {
+			td_alt_next = NULL;
+		} else {
+			/* we use this field internally */
+			td_alt_next = td_next;
+		}
+
+		/* restore */
+		temp->shortpkt = shortpkt_old;
+		temp->len = len_old;
+		goto restart;
+	} else {
+		if (temp->multishort == 0) {
+			/* remove chain bit and clear TD SIZE - end of frame */
+			td->td_trb[td->ntrb - 1].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15));
+			td->td_trb[td->ntrb - 1].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT);
+			td->td_trb[td->ntrb].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15));
+			td->td_trb[td->ntrb].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT);
+			usb_pc_cpu_flush(td->page_cache);
+		}
+	}
+	temp->td = td;
+	temp->td_next = td_next;
+}
+
+static void
+xhci_setup_generic_chain(struct usb_xfer *xfer)
+{
+	struct xhci_std_temp temp;
+	struct xhci_td *td;
+	uint32_t x;
+	uint32_t y;
+
+	temp.average = xfer->max_hc_frame_size;
+	temp.max_packet_size = xfer->max_packet_size;
+	temp.sc = XHCI_BUS2SC(xfer->xroot->bus);
+	temp.pc = NULL;
+	temp.last_frame = 0;
+	temp.offset = 0;
+	temp.multishort = xfer->flags_int.isochronous_xfr ||
+	    xfer->flags_int.short_frames_ok;
+
+	/* toggle the DMA set we are using */
+	xfer->flags_int.curr_dma_set ^= 1;
+
+	/* get next DMA set */
+	td = xfer->td_start[xfer->flags_int.curr_dma_set];
+
+	temp.td = NULL;
+	temp.td_next = td;
+
+	xfer->td_transfer_first = td;
+	xfer->td_transfer_cache = td;
+
+	if (xfer->flags_int.isochronous_xfr) {
+
+		uint8_t shift;
+
+		x = XREAD4(temp.sc, runt, XHCI_MFINDEX);
+
+		switch (usbd_get_speed(xfer->xroot->udev)) {
+		case USB_SPEED_FULL:
+			shift = 3;
+			temp.isoc_delta = 8;	/* 1ms */
+			break;
+		default:
+			shift = usbd_xfer_get_fps_shift(xfer);
+			temp.isoc_delta = 1U << shift;
+			break;
+		}
+
+		x += temp.isoc_delta - 1;
+		x &= ~(temp.isoc_delta - 1);
+		x += xfer->endpoint->usb_uframe;
+
+		y = XHCI_MFINDEX_GET(x - xfer->endpoint->isoc_next);
+
+		if ((xfer->endpoint->is_synced == 0) ||
+		    (y < (xfer->nframes << shift))) {
+			/*
+			 * If there is data underflow or the pipe
+			 * queue is empty we schedule the transfer a
+			 * few frames ahead of the current frame
+			 * position. Else two isochronous transfers
+			 * might overlap.
+			 */
+			xfer->endpoint->isoc_next = XHCI_MFINDEX_GET(x + (3 * 8));
+			xfer->endpoint->is_synced = 1;
+			DPRINTFN(3, "start next=%d\n", xfer->endpoint->isoc_next);
+		}
+
+		x = 0;
+		temp.isoc_frame = xfer->endpoint->isoc_next;
+		temp.trb_type = XHCI_TRB_TYPE_ISOCH;
+
+		xfer->endpoint->isoc_next += xfer->nframes << shift;
+
+	} else if (xfer->flags_int.control_xfr) {
+
+		/* check if we should prepend a setup message */
+
+		if (xfer->flags_int.control_hdr) {
+
+			temp.len = xfer->frlengths[0];
+			temp.pc = xfer->frbuffers + 0;
+			temp.shortpkt = temp.len ? 1 : 0;
+			temp.trb_type = XHCI_TRB_TYPE_SETUP_STAGE;
+			temp.direction = 0;
+
+			/* check for last frame */
+			if (xfer->nframes == 1) {
+				/* no STATUS stage yet, SETUP is last */
+				if (xfer->flags_int.control_act)
+					temp.last_frame = 1;
+			}
+
+			xhci_setup_generic_chain_sub(&temp);
+		}
+		x = 1;
+		temp.isoc_delta = 0;
+		temp.isoc_frame = 0;
+		temp.trb_type = XHCI_TRB_TYPE_DATA_STAGE;
+	} else {
+		x = 0;
+		temp.isoc_delta = 0;
+		temp.isoc_frame = 0;
+		temp.trb_type = XHCI_TRB_TYPE_NORMAL;
+	}
+
+	if (x != xfer->nframes) {
+                /* setup page_cache pointer */
+                temp.pc = xfer->frbuffers + x;
+		/* set endpoint direction */
+		temp.direction = UE_GET_DIR(xfer->endpointno);
+	}
+
+	while (x != xfer->nframes) {
+
+		/* DATA0 / DATA1 message */
+
+		temp.len = xfer->frlengths[x];
+
+		x++;
+
+		if (x == xfer->nframes) {
+			if (xfer->flags_int.control_xfr) {
+				/* no STATUS stage yet, DATA is last */
+				if (xfer->flags_int.control_act)
+					temp.last_frame = 1;
+			} else {
+				temp.last_frame = 1;
+			}
+		}
+		if (temp.len == 0) {
+
+			/* make sure that we send an USB packet */
+
+			temp.shortpkt = 0;
+
+		} else if (xfer->flags_int.isochronous_xfr) {
+
+			/* isochronous transfers don't have short packet termination */
+
+			temp.shortpkt = 1;
+
+			/* isochronous transfers have a transfer limit */
+
+			if (temp.len > xfer->max_frame_size)
+				temp.len = xfer->max_frame_size;
+		} else {
+
+			/* regular data transfer */
+
+			temp.shortpkt = xfer->flags.force_short_xfer ? 0 : 1;
+		}
+
+		xhci_setup_generic_chain_sub(&temp);
+
+		if (xfer->flags_int.isochronous_xfr) {
+			temp.offset += xfer->frlengths[x - 1];
+			temp.isoc_frame += temp.isoc_delta;
+		} else {
+			/* get next Page Cache pointer */
+			temp.pc = xfer->frbuffers + x;
+		}
+	}
+
+	/* check if we should append a status stage */
+
+	if (xfer->flags_int.control_xfr &&
+	    !xfer->flags_int.control_act) {
+
+		/*
+		 * Send a DATA1 message and invert the current
+		 * endpoint direction.
+		 */
+		temp.direction = UE_GET_DIR(xfer->endpointno) ^ UE_DIR_IN;
+		temp.len = 0;
+		temp.pc = NULL;
+		temp.shortpkt = 0;
+		temp.last_frame = 1;
+		temp.trb_type = XHCI_TRB_TYPE_STATUS_STAGE;
+
+		xhci_setup_generic_chain_sub(&temp);
+	}
+
+	td = temp.td;
+
+	/* remove chain bit and clear TD SIZE - end of frame */
+	td->td_trb[td->ntrb - 1].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15));
+	td->td_trb[td->ntrb - 1].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT);
+	td->td_trb[td->ntrb].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15));
+	td->td_trb[td->ntrb].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT);
+
+	/* link the current TD with the next one */
+	td->td_trb[td->ntrb].qwTrb0 = XXX;
+
+	usb_pc_cpu_flush(td->page_cache);
+
+	/* must have at least one frame! */
+
+	xfer->td_transfer_last = td;
+
+	if (xfer->xroot->udev->flags.self_suspended == 0) {
+		EHCI_APPEND_QH(qh, *qh_last); XXX;
+	}
+}
+
+static void
+xhci_root_intr(struct xhci_softc *sc)
+{
+
+}
+
+/*------------------------------------------------------------------------*
+ *	xhci_device_done - XHCI done handler
+ *
+ * NOTE: This function can be called two times in a row on
+ * the same USB transfer. From close and from interrupt.
+ *------------------------------------------------------------------------*/
+static void
+xhci_device_done(struct usb_xfer *xfer, usb_error_t error)
+{
+	DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n",
+	    xfer, xfer->endpoint, error);
+
+	/* dequeue transfer and start next transfer */
+	usbd_transfer_done(xfer, error);
+}
+
+/*------------------------------------------------------------------------*
+ * XHCI data transfer support (generic type)
+ *------------------------------------------------------------------------*/
+static void
+xhci_device_generic_open(struct usb_xfer *xfer)
+{
+	if (xfer->flags_int.isochronous_xfr)
+		usb_hs_bandwidth_alloc(xfer);
+}
+
+static void
+xhci_device_generic_close(struct usb_xfer *xfer)
+{
+	xhci_device_done(xfer, USB_ERR_CANCELLED);
+
+	if (xfer->flags_int.isochronous_xfr)
+		usb_hs_bandwidth_free(xfer);
+}
+
+static void
+xhci_device_generic_enter(struct usb_xfer *xfer)
+{
+	/* setup TD's and QH */
+	xhci_setup_generic_chain(xfer);
+
+	/* put transfer on interrupt queue */
+	xhci_transfer_intr_enqueue(xfer);
+}
+
+static void
+xhci_device_generic_start(struct usb_xfer *xfer)
+{
+	/* start timeout, if any */
+	if (xfer->timeout != 0)
+		usbd_transfer_timeout_ms(xfer, &xhci_timeout, xfer->timeout);
+}
+
+struct usb_pipe_methods xhci_device_generic_methods =
+{
+	.open = xhci_device_generic_open,
+	.close = xhci_device_generic_close,
+	.enter = xhci_device_generic_enter,
+	.start = xhci_device_generic_start,
+};
+
+
+/*------------------------------------------------------------------------*
+ * xhci root HUB support
+ *------------------------------------------------------------------------*
+ * Simulate a hardware HUB by handling all the necessary requests.
+ *------------------------------------------------------------------------*/
+
+#define	HSETW(ptr, val) ptr[0] = (uint8_t)(val), ptr[1] = (uint8_t)((val) >> 8)
+
+static const
+struct usb_device_descriptor xhci_devd =
+{
+	.bLength = sizeof(xhci_devd),
+	.bDescriptorType = UDESC_DEVICE,	/* type */
+	HSETW(.bcdUSB, 0x0300),			/* USB version */
+	.bDeviceClass = UDCLASS_HUB,		/* class */
+	.bDeviceSubClass = UDSUBCLASS_HUB,	/* subclass */
+	.bDeviceProtocol = UDPROTO_SSHUB,	/* protocol */
+	.bMaxPacketSize = 9,			/* max packet size */
+	HSETW(.idVendor, 0x0000),		/* vendor */
+	HSETW(.idProduct, 0x0000),		/* product */
+	HSETW(.bcdDevice, 0x0100),		/* device version */
+	.iManufacturer = 1,
+	.iProduct = 2,
+	.iSerialNumber = 0,
+	.bNumConfigurations = 1,		/* # of configurations */
+};
+
+static const
+struct xhci_bos_desc xhci_bosd = {
+	.bosd = {
+		.bLength = sizeof(xhci_bosd.bosd),
+		.bDescriptorType = UDESC_BOS,
+		HSETW(.wTotalLength, sizeof(xhci_bosd)),
+		.bNumDeviceCaps = 3,
+	},
+	.usb2extd = {
+		.bLength = sizeof(xhci_bosd.usb2extd),
+		.bDescriptorType = 1,
+		.bDevCapabilityType = 2,
+		.bmAttributes = 2,
+	},
+	.usbdcd = {
+		.bLength = sizeof(xhci_bosd.usbdcd),
+		.bDescriptorType = UDESC_DEVICE_CAPABILITY,
+		.bDevCapabilityType = 3,
+		.bmAttributes = XXX,
+		HSETW(.wSpeedsSupported, 0x000C),
+		.bFunctionalitySupport = 8,
+		.bU1DevExitLat = 128,	/* dummy - not used */
+		.bU2DevExitLat = 128,	/* dummy - not used */
+	},
+	.cidd = {
+		.bLength = sizeof(xhci_bosd.cidd),
+		.bDescriptorType = 1,
+		.bDevCapabilityType = 4,
+		.bReserved = 0,
+		.bContainerID = XXX,
+	},
+};
+
+static const
+struct xhci_config_desc xhci_confd = {
+	.confd = {
+		.bLength = sizeof(xhci_confd.confd),
+		.bDescriptorType = UDESC_CONFIG,
+		.wTotalLength[0] = sizeof(xhci_confd),
+		.bNumInterface = 1,
+		.bConfigurationValue = 1,
+		.iConfiguration = 0,
+		.bmAttributes = UC_SELF_POWERED,
+		.bMaxPower = 0		/* max power */
+	},
+	.ifcd = {
+		.bLength = sizeof(xhci_confd.ifcd),

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 12:17:05 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B4F831065676; Sat, 31 Jul 2010 12:17: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 792F2106566C
	for ; Sat, 31 Jul 2010 12:17:05 +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 4D2BA8FC08
	for ; Sat, 31 Jul 2010 12:17:05 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VCH5Nv053934
	for ; Sat, 31 Jul 2010 12:17:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VCH5Ue053932
	for perforce@freebsd.org; Sat, 31 Jul 2010 12:17:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 12:17:05 GMT
Message-Id: <201007311217.o6VCH5Ue053932@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181637 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 12:17:06 -0000

http://p4web.freebsd.org/@@181637?ac=10

Change 181637 by hselasky@hselasky_laptop001 on 2010/07/31 12:16:45

	
	USB controller (XHCI):
		- add more register definitions

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#5 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#5 (text+ko) ====

@@ -107,7 +107,7 @@
 #define	XHCI_DCBAAP_LO		0x30	/* XHCI dev context BA pointer */
 #define	XHCI_DCBAAP_HI		0x34	/* XHCI dev context BA pointer */
 #define	XHCI_CONFIG		0x38
-#define	XHCI_CONFIG_SLOTS_MASK	0x000000FF	/* RW - number of device slot enabled */
+#define	XHCI_CONFIG_SLOTS_MASK	0x000000FF	/* RW - number of device slots enabled */
 
 /* XHCI port status registers */
 #define	XHCI_PORTSC(n)		(0x3F0 + (0x10 * (n)))	/* XHCI port status */
@@ -175,13 +175,25 @@
 #define	XHCI_ERSTDP_LO_BUSY	0x00000008	/* RW - event handler busy */
 #define	XHCI_ERSTDP_HI(n)	(0x003C + (0x20 * (n))	/* XHCI event ring dequeue pointer */
 
-/* XHCI doorbell registers.  Offset given by XHCI_CAPLENGTH + XHCI_DBOFF registers */
+/* XHCI doorbell registers. Offset given by XHCI_CAPLENGTH + XHCI_DBOFF registers */
 #define	XHCI_DOORBELL		0x0000
 #define	XHCI_DB_TARGET_GET(x)	((x) & 0xFF)		/* RW - doorbell target */
 #define	XHCI_DB_TARGET_SET(x)	((x) & 0xFF)		/* RW - doorbell target */
 #define	XHCI_DB_SID_GET(x)	(((x) >> 16) & 0xFFFF)	/* RW - doorbell stream ID */
 #define	XHCI_DB_SID_SET(x)	(((x) & 0xFFFF) << 16)	/* RW - doorbell stream ID */
 
+/* XHCI interrupter registers. Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */
+#define	XHCI_IMAN(i)		(0x0020 + (0x20 * (i)))		/* RW - interrupt management */
+#define	XHCI_IMAN_IP_BIT	(1U << 0)	/* interrupt pending */
+#define	XHCI_IMAN_IE_BIT	(1U << 1)	/* interrupt enable */
+#define	XHCI_IMOD(i)		(0x0024	+ (0x20 * (i)))	/* RW - interrupt moderation */
+#define	XHCI_IMOD_DEFAULT	0x000001F4U	/* 8000 IRQ/second */
+#define	XHCI_ERSTSZ(i)		(0x0028	+ (0x20 * (i)))	/* RW - segment table size */
+#define	XHCI_ERSTBA_LO(i)	(0x0030	+ (0x20 * (i)))	/* RW - segment base address */
+#define	XHCI_ERSTBA_HI(i)	(0x0034	+ (0x20 * (i)))	/* RW - segment base address */
+#define	XHCI_ERDP_LO(i)		(0x0038	+ (0x20 * (i)))	/* RW - dequeue pointer */
+#define	XHCI_ERDP_HI(i)		(0x003C	+ (0x20 * (i)))	/* RW - dequeue pointer */
+
 /* XHCI register R/W wrappers */
 #define	XREAD1(sc, what, a) \
 	bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, \

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 13:27:24 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5C021065676; Sat, 31 Jul 2010 13:27: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 7A0861065670
	for ; Sat, 31 Jul 2010 13:27:23 +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 6876F8FC0A
	for ; Sat, 31 Jul 2010 13:27:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VDRN0u070930
	for ; Sat, 31 Jul 2010 13:27:23 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VDRNAX070928
	for perforce@freebsd.org; Sat, 31 Jul 2010 13:27:23 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 13:27:23 GMT
Message-Id: <201007311327.o6VDRNAX070928@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181640 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 13:27:24 -0000

http://p4web.freebsd.org/@@181640?ac=10

Change 181640 by hselasky@hselasky_laptop001 on 2010/07/31 13:27:07

	USB network (UHSO):
		- Correct interface flags.
		- Patch from: Fredrik Lindberg
	
	PR:		usb/149039
	Reviewed by:	hselasky @

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#7 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/net/uhso.c#7 (text+ko) ====

@@ -1469,7 +1469,7 @@
 	ifp->if_init = uhso_if_init;
 	ifp->if_start = uhso_if_start;
 	ifp->if_output = uhso_if_output;
-	ifp->if_flags = 0;
+	ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_NOARP;
 	ifp->if_softc = sc;
 	IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
 	ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 14:55:00 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 547B41065675; Sat, 31 Jul 2010 14:55: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 16DF91065670
	for ; Sat, 31 Jul 2010 14:55:00 +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 D53108FC16
	for ; Sat, 31 Jul 2010 14:54:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VEsxuF078513
	for ; Sat, 31 Jul 2010 14:54:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VEsxL3078511
	for perforce@freebsd.org; Sat, 31 Jul 2010 14:54:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 14:54:59 GMT
Message-Id: <201007311454.o6VEsxL3078511@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181646 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 14:55:00 -0000

http://p4web.freebsd.org/@@181646?ac=10

Change 181646 by hselasky@hselasky_laptop001 on 2010/07/31 14:53:59

	USB controller (XHCI):
		- add more initialisation logic and register definitions

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#3 (text+ko) ====

@@ -112,29 +112,187 @@
 void
 xhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
+        struct xhci_softc *sc = XHCI_BUS2SC(bus);
 
+        cb(bus, &sc->sc_hw.root_pc, &sc->sc_hw.root_pg,
+	   sizeof(struct xhci_hw_root), XHCI_PAGE_SIZE);
 
+        cb(bus, &sc->sc_ctx.root_pc, &sc->sc_ctx.root_pg,
+	   sizeof(struct xhci_ctx_root), XHCI_PAGE_SIZE);
 }
 
-usb_error_t
-xhci_reset(struct xhci_softc *sc)
+static usb_error_t
+xhci_start_controller(struct xhci_softc *sc)
 {
+	struct usb_page_search buf_res;
+	struct xhci_hw_root *phwr;
+	struct xhci_ctx_root *pctxr;
+	uint64_t addr;
+	uint32_t temp;
+	uint16_t i;
+
+	DPRINTF("\n");
+
+	sc->sc_capa_off = 0;
+	sc->sc_oper_off = XREAD4(sc, capa, XHCI_CAPLENGTH);
+	sc->sc_runt_off = XREAD4(sc, capa, XHCI_RTSOFF) & ~0xF;
+	sc->sc_door_off = XREAD4(sc, capa, XHCI_DBOFF) & ~0x3;
+
+	DPRINTF("xHCI version = 0x%04x\n", XREAD2(sc, capa, XHCI_HCIVERSION));
+
+	/* Reset controller */
+	XWRITE4(sc, oper, XHCI_USBCMD, XHCI_CMD_HCRST);
+
+	for (i = 0; i != 100; i++) {
+		usb_pause_mtx(NULL, hz / 1000);
+		temp = XREAD4(sc, XHCI_USBCMD) & XHCI_CMD_HCRST;
+		if (!temp)
+			break;
+	}
+
+	if (temp) {
+		device_printf(sc->sc_bus.bdev, "Controller reset timeout.\n");
+		return (USB_ERR_IOERROR);
+	}
+
+	if (!(XREAD4(sc, oper, XHCI_PAGESIZE) & XHCI_PAGESIZE_4K)) {
+		device_printf(sc->sc_bus.bdev, "Controller does not support 4K page size.\n");
+		return (USB_ERR_IOERROR);
+	}
+
+	temp = XREAD4(sc, oper, XHCI_USBSTS);
+
+	/* clear interrupts */
+	XWRITE4(sc, oper, XHCI_USBSTS, status);
+
+	/* disable all device notifications */
+	XWRITE4(sc, oper, XHCI_DNCTRL, 0);
+
+	/* setup device context base address */
+
+	usbd_get_page(&sc->sc_hw.ctx_pc, 0, &buf_res);
+
+	addr = buf_res.physaddr;
+	pctxr = buf_res.ptr;
+
+	memset(pctxr, 0, sizeof(*pctxr));
+
+	XWRITE4(sc, oper, XHCI_DCBAAP_LO, (uint32_t)addr);
+	XWRITE4(sc, oper, XHCI_DCBAAP_HI, (uint32_t)(addr >> 32));
+
+	/* setup number of device slots */
+
+	XWRITE4(sc, oper, XHCI_CONFIG, XHCI_MAX_DEVICES);
+
+	/* Setup interrupter registers */
+
+	temp = XREAD4(sc, runt, XHCI_IMAN(0));
+	temp |= XHCI_IMAN_IE_BIT | XHCI_IMAN_IP_BIT;
+	XWRITE4(sc, runt, XHCI_IMAN(0));
+
+	/* Setup interrupt rate */
+
+	XWRITE4(sc, runt, XHCI_IMOD, XHCI_IMOD_DEFAULT);
+
+	usbd_get_page(&sc->sc_hw.root_pc, 0, &buf_res);
+
+	phwr = buf_res.ptr;
+	addr = (uint64_t)buf_res.physaddr + (uintptr_t)&((struct xhci_hw_root *)0)->hwr_events[0];
+
+	/* reset hardware root structure */
+
+	memset(phwr, 0, sizeof(*phwr));
+
+	phwr->hwr_ring_seg[0].qwEvrsTablePtr = htole64(addr);
+	phwr->hwr_ring_seg[0].dwEvrsTableSize = htole32(XHCI_MAX_EVENTS);
+
+	/* Setup event table size */
+
+	temp = XREAD4(sc, capa, XHCI_HCSPARAMS2);
+
+	DPRINTF("hcsparams2=0x%08x\n", temp);
+
+	temp = XHCI_HCS2_ERST_MAX(temp);
+	temp = 1U << temp;
+	if (temp > XHCI_MAX_RSEG)
+		temp = XHCI_MAX_RSEG;
+
+	sc->sc_erst_max = temp;
+
+	XWRITE4(sc, runt, XHCI_ERSTSZ(0), temp);
+
+	XWRITE4(sc, oper, XHCI_ERDP_LO(0), (uint32_t)addr);
+	XWRITE4(sc, oper, XHCI_ERDP_HI(0), (uint32_t)(addr >> 32));
+
+	addr = (uint64_t)buf_res.physaddr;
+
+	XWRITE4(sc, oper, XHCI_ERSTBA_LO(0), (uint32_t)addr);
+	XWRITE4(sc, oper, XHCI_ERSTBA_HI(0), (uint32_t)(addr >> 32));
+
+	/* setup command ring control base address */
+
+	addr = (uint64_t)buf_res.physaddr + (uintptr_t)&((struct xhci_hw_root *)0)->hwr_commands[0];
+
+	XWRITE4(sc, oper, XHCI_CRCR_LO, (uint32_t)addr);
+	XWRITE4(sc, oper, XHCI_CRCR_HI, (uint32_t)(addr >> 32));
+
+	usb_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc);
+
+	/* Go! */
+	XWRITE4(sc, oper, XHCI_USBCMD, XHCI_CMD_RS | XHCI_CMD_INTE | XHCI_CMD_HSEE);
+
+	for (i = 0; i != 100; i++) {
+		usb_pause_mtx(NULL, hz / 1000);
+		temp = XREAD4(sc, oper, XHCI_USBSTS) & XHCI_STS_HCH;
+		if (!temp)
+			break;
+	}
+	if (temp) {
+		device_printf(sc->sc_bus.bdev, "Run timeout.\n");
+		return (USB_ERR_IOERROR);
+	}
 
+	/* catch any lost interrupts */
+	xhci_do_poll(&sc->sc_bus);
 
+	return (0);
 }
 
 static usb_error_t
-xhci_hcreset(struct xhci_softc *sc)
+xhci_halt_controller(struct xhci_softc *sc)
 {
+	uint32_t temp;
+	uint16_t i;
+
+	DPRINTF("\n");
 
+	/* Halt controller */
+	XWRITE4(sc, oper, XHCI_USBCMD, 0);
+
+	for (i = 0; i != 100; i++) {
+		usb_pause_mtx(NULL, hz / 1000);
+		temp = XREAD4(sc, oper, XHCI_USBSTS) & XHCI_STS_HCH;
+		if (temp)
+			break;
+	}
 
+	if (!temp) {
+		device_printf(sc->sc_bus.bdev, "Controller halt timeout.\n");
+		return (USB_ERR_IOERROR);
+	}
+	return (0);
 }
 
 usb_error_t
 xhci_init(struct xhci_softc *sc)
 {
+	/* set the bus revision */
+	sc->sc_bus.usbrev = USB_REV_3_0;
 
+        /* set up the bus struct */
+        sc->sc_bus.methods = &ehci_bus_methods;
 
+	return (0);
 }
 
 void
@@ -165,17 +323,6 @@
 
 }
 
-static void
-xhci_transfer_intr_enqueue(struct usb_xfer *xfer)
-{
-	/* check for early completion */
-	if (xhci_check_transfer(xfer))
-		return;
-
-	/* put transfer on interrupt queue */
-	usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
-}
-
 static usb_error_t
 xhci_generic_done_sub(struct usb_xfer *xfer)
 {
@@ -377,12 +524,6 @@
 }
 
 static void
-xhci_pcd_enable(struct xhci_softc *sc)
-{
-
-}
-
-static void
 xhci_interrupt_poll(struct xhci_softc *sc)
 {
 	struct usb_xfer *xfer;
@@ -405,8 +546,40 @@
 void
 xhci_interrupt(struct xhci_softc *sc)
 {
+	uint32_t status;
+
+	USB_BUS_LOCK(&sc->sc_bus);
+
+	DPRINTFN(16, "real interrupt\n");
+
+	status = XREAD4(sc, oper, XHCI_USBSTS);
+
+	if (status & XHCI_STS_PCD) {
+		xhci_root_intr(sc);
+	}
+
+	if (status & XHCI_STS_HCH) {
+		printf("%s: host controller halted\n",
+		    __FUNCTION__);
+	}
 
+	if (status & XHCI_STS_HSE) {
+		printf("%s: host system error\n",
+		    __FUNCTION__);
+	}
 
+	if (status & XHCI_STS_HCE) {
+		printf("%s: host controller error\n",
+		    __FUNCTION__);
+	}
+
+	/* acknowledge interrupts */
+
+	XWRITE4(sc, oper, XHCI_USBSTS, status);
+
+	xhci_interrupt_poll(sc);
+
+	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
 /*------------------------------------------------------------------------*
@@ -873,7 +1046,26 @@
 static void
 xhci_root_intr(struct xhci_softc *sc)
 {
+	uint16_t i;
+
+	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
+	/* clear any old interrupt data */
+	memset(sc->sc_hub_idata, 0, sizeof(sc->sc_hub_idata));
+
+	for (i = 1; i <= sc->sc_noport; i++) {
+		/* pick out CHANGE bits from the status register */
+		if (XREAD4(sc, oper, XHCI_PORTSC(i)) & (
+		    XHCI_PS_CSC | XHCI_PS_PEC |
+		    XHCI_PS_OCC | XHCI_PS_WRC |
+		    XHCI_PS_PRC | XHCI_PS_PLC |
+		    XHCI_PS_CEC)) {
+			sc->sc_hub_idata[i / 8] |= 1 << (i % 8);
+			DPRINTF("port %d changed\n", i);
+		}
+	}
+	uhub_root_intr(&sc->sc_bus, sc->sc_hub_idata,
+	    sizeof(sc->sc_hub_idata));
 }
 
 /*------------------------------------------------------------------------*
@@ -918,7 +1110,7 @@
 	xhci_setup_generic_chain(xfer);
 
 	/* put transfer on interrupt queue */
-	xhci_transfer_intr_enqueue(xfer);
+	usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
 }
 
 static void
@@ -986,8 +1178,8 @@
 		.bmAttributes = XXX,
 		HSETW(.wSpeedsSupported, 0x000C),
 		.bFunctionalitySupport = 8,
-		.bU1DevExitLat = 128,	/* dummy - not used */
-		.bU2DevExitLat = 128,	/* dummy - not used */
+		.bU1DevExitLat = 255,	/* dummy - not used */
+		.bU2DevExitLat = 255,	/* dummy - not used */
 	},
 	.cidd = {
 		.bLength = sizeof(xhci_bosd.cidd),

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#5 (text+ko) ====

@@ -31,6 +31,7 @@
 #define	XHCI_MAX_SCRATCHPADS	32
 #define	XHCI_MAX_EVENTS		(16 * 7)
 #define	XHCI_MAX_COMMANDS	(16 * 7)
+#define	XHCI_MAX_RSEG		1
 
 #define	XHCI_DEV_CTX_ADDR_ALIGN		64	/* bytes */
 #define	XHCI_DEV_CTX_ALIGN		64	/* bytes */
@@ -46,6 +47,7 @@
 #define	XHCI_TRB_ALIGN			16	/* bytes */
 #define	XHCI_QH_ALIGN			16	/* bytes */
 #define	XHCI_TD_ALIGN			16	/* bytes */
+#define	XHCI_PAGE_SIZE			4096	/* bytes */
 
 struct xhci_dev_ctx_addr {
 	volatile uint64_t	qwBaaDevCtxAddr;
@@ -318,11 +320,16 @@
 };
 
 struct xhci_hw_root {
-	struct xhci_event_ring_seg	hwr_ring_seg[4];
+	struct xhci_event_ring_seg	hwr_ring_seg[XHCI_MAX_RSEG];
+	volatile uint64_t		hwr_padding[2];
 	struct xhci_trb			hwr_events[XHCI_MAX_EVENTS];
 	struct xhci_trb			hwr_commands[XHCI_MAX_COMMANDS];
 };
 
+struct xhci_ctx_root {
+	volatile uint64_t		ctxr_ptr[XHCI_MAX_DEVICES];
+};
+
 struct xhci_endpoint_ext {
 	TAILQ_HEAD(, xhci_qh) head;
 
@@ -335,16 +342,24 @@
 	uint8_t pstreams;
 };
 
+struct xhci_hw_dev {
+	struct usb_page_cache device_pc;
+	struct usb_page_cache input_pc;
+	struct usb_page_cache scratch_pc[XHCI_MAX_SCRATCHPADS];
+
+	struct usb_page device_pg;
+	struct usb_page input_pg;
+	struct usb_page scratch_pg[XHCI_MAX_SCRATCHPADS];
+};
+
 struct xhci_hw_softc {
 	struct usb_page_cache root_pc;
-	struct usb_page_cache device_pc[XHCI_MAX_DEVICES];
-	struct usb_page_cache device_input_pc[XHCI_MAX_DEVICES];
-	struct usb_page_cache device_sp_pc[XHCI_MAX_DEVICES][XHCI_MAX_SCRATCHPADS];
+	struct usb_page_cache ctx_pc;
 
 	struct usb_page root_pg;
-	struct usb_page device_pg[XHCI_MAX_DEVICES];
-	struct usb_page device_input_pg[XHCI_MAX_DEVICES];
-	struct usb_page device_sp_pg[XHCI_MAX_DEVICES][XHCI_MAX_SCRATCHPADS];
+	sturct usb_page ctx_pg;
+
+	struct xhci_hw_dev devs[XHCI_MAX_DEVICES];
 };
 
 struct xhci_config_desc {
@@ -383,17 +398,15 @@
 	bus_space_tag_t sc_io_tag;
 	bus_space_handle_t sc_io_hdl;
 
-	uint32_t sc_eintrs;
-	uint32_t sc_cmd;		/* shadow of cmd register during
-					 * suspend */
+	uint32_t sc_cmd;		/* copy of cmd register */
+
+	uint32_t sc_oper_off;		/* offset to operational registers */
+	uint32_t sc_capa_off;		/* offset to capability registers */
+	uint32_t sc_runt_off;		/* offset to runtime registers */
+	uint32_t sc_door_off;		/* offset to doorbell registers */
 
 	uint16_t sc_flags;		/* chip specific flags */
-
-	uint16_t sc_pcib_off;		/* offset to PCI registers */
-	uint16_t sc_oper_off;		/* offset to operational registers */
-	uint16_t sc_capa_off;		/* offset to capability registers */
-	uint16_t sc_runt_off;		/* offset to runtime registers */
-	uint16_t sc_door_off;		/* offset to doorbell registers */
+	uint16_t sc_erst_max;
 
 	uint8_t	sc_noport;		/* number of ports on root HUB */
 	uint8_t	sc_addr;		/* root HUB device address */

==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#6 (text+ko) ====

@@ -64,9 +64,7 @@
 #define	XHCI_HCS0_PSA_SZ_MAX(x)	(((x) >> 12) & 0xF)	/* max pri. stream array size */
 #define	XHCI_HCS0_XECP(x)	(((x) >> 16) & 0xFFFF)	/* extended capabilities pointer */
 #define	XHCI_DBOFF		0x14	/* RO doorbell offset */
-#define	XHCI_DBOFF_GET(x)	(((x) >> 2) & 0x3FFFFFFF)
 #define	XHCI_RTSOFF		0x18	/* RO runtime register space offset */
-#define	XHCI_RTSOFF_GET(x)	(((x) >> 5) & 0x7FFFFFF)
 
 /* XHCI operational registers.  Offset given by XHCI_CAPLENGTH register */
 #define	XHCI_USBCMD		0x00	/* XHCI command */

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 15:39:49 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7912A1065673; Sat, 31 Jul 2010 15:39:49 +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 3D61D106566B
	for ; Sat, 31 Jul 2010 15:39:49 +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 2C10F8FC12
	for ; Sat, 31 Jul 2010 15:39:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VFdnXg083740
	for ; Sat, 31 Jul 2010 15:39:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VFdnT5083738
	for perforce@freebsd.org; Sat, 31 Jul 2010 15:39:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 15:39:49 GMT
Message-Id: <201007311539.o6VFdnT5083738@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181649 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 15:39:49 -0000

http://p4web.freebsd.org/@@181649?ac=10

Change 181649 by hselasky@hselasky_laptop001 on 2010/07/31 15:39:06

	USB controller (EHCI-PCI):
		- remove unused definition

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#29 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#29 (text+ko) ====

@@ -93,8 +93,6 @@
 #define	PCI_EHCI_VENDORID_NVIDIA2	0x10DE
 #define	PCI_EHCI_VENDORID_VIA		0x1106
 
-#define	PCI_EHCI_BASE_REG	0x10
-
 static void ehci_pci_takecontroller(device_t self);
 
 static device_probe_t ehci_pci_probe;

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 15:40:51 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1114F1065678; Sat, 31 Jul 2010 15:40: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 B0CB7106566B
	for ; Sat, 31 Jul 2010 15:40:50 +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 7B1788FC12
	for ; Sat, 31 Jul 2010 15:40:50 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VFeoVj083895
	for ; Sat, 31 Jul 2010 15:40:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VFeoQt083892
	for perforce@freebsd.org; Sat, 31 Jul 2010 15:40:50 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 15:40:50 GMT
Message-Id: <201007311540.o6VFeoQt083892@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181650 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 15:40:51 -0000

http://p4web.freebsd.org/@@181650?ac=10

Change 181650 by hselasky@hselasky_laptop001 on 2010/07/31 15:40:35

	USB controller (XHCI):
		- commit the XHCI PCI interface file and update some header file definitions.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci_pci.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#7 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#6 (text+ko) ====

@@ -357,7 +357,7 @@
 	struct usb_page_cache ctx_pc;
 
 	struct usb_page root_pg;
-	sturct usb_page ctx_pg;
+	struct usb_page ctx_pg;
 
 	struct xhci_hw_dev devs[XHCI_MAX_DEVICES];
 };
@@ -417,4 +417,15 @@
 
 };
 
+/* prototypes */
+
+void xhci_suspend(struct xhci_softc *);
+void xhci_resume(struct xhci_softc *);
+void xhci_shutdown(struct xhci_softc *);
+usb_error_t xhci_init(struct xhci_softc *);
+usb_error_t xhci_start_controller(struct xhci_softc *);
+void xhci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_sub_cb_t *);
+usb_error_t xhci_halt_controller(struct xhci_softc *);
+void xhci_interrupt(struct xhci_softc *);
+
 #endif					/* _XHCI_H_ */

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci_pci.c#2 (text+ko) ====

@@ -22,3 +22,296 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
+#include 
+__FBSDID("$FreeBSD: src/sys/dev/usb/controller/xhci_pci.c $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+static device_probe_t xhci_pci_probe;
+static device_attach_t xhci_pci_attach;
+static device_detach_t xhci_pci_detach;
+static device_suspend_t xhci_pci_suspend;
+static device_resume_t xhci_pci_resume;
+static device_shutdown_t xhci_pci_shutdown;
+static void xhci_pci_takecontroller(device_t);
+
+static device_method_t xhci_device_methods[] = {
+	/* device interface */
+	DEVMETHOD(device_probe, xhci_pci_probe),
+	DEVMETHOD(device_attach, xhci_pci_attach),
+	DEVMETHOD(device_detach, xhci_pci_detach),
+	DEVMETHOD(device_suspend, xhci_pci_suspend),
+	DEVMETHOD(device_resume, xhci_pci_resume),
+	DEVMETHOD(device_shutdown, xhci_pci_shutdown),
+	/* bus interface */
+	DEVMETHOD(bus_print_child, bus_generic_print_child),
+
+	{0, 0}
+};
+
+static driver_t xhci_driver = {
+	.name = "xhci",
+	.methods = xhci_device_methods,
+	.size = sizeof(struct xhci_softc),
+};
+
+static devclass_t xhci_devclass;
+
+DRIVER_MODULE(xhci, pci, xhci_driver, xhci_devclass, 0, 0);
+MODULE_DEPEND(xhci, usb, 1, 1, 1);
+
+static int
+xhci_pci_suspend(device_t self)
+{
+	struct xhci_softc *sc = device_get_softc(self);
+	int err;
+
+	err = bus_generic_suspend(self);
+	if (err)
+		return (err);
+	xhci_suspend(sc);
+	return (0);
+}
+
+static int
+xhci_pci_resume(device_t self)
+{
+	struct xhci_softc *sc = device_get_softc(self);
+
+	xhci_pci_takecontroller(self);
+	xhci_resume(sc);
+
+	bus_generic_resume(self);
+
+	return (0);
+}
+
+static int
+xhci_pci_shutdown(device_t self)
+{
+	struct xhci_softc *sc = device_get_softc(self);
+	int err;
+
+	err = bus_generic_shutdown(self);
+	if (err)
+		return (err);
+	xhci_shutdown(sc);
+
+	return (0);
+}
+
+static const char *
+xhci_pci_match(device_t self)
+{
+	if ((pci_get_class(self) == PCIC_SERIALBUS)
+	    && (pci_get_subclass(self) == PCIS_SERIALBUS_USB)
+	    && (pci_get_progif(self) == PCI_INTERFACE_XHCI)) {
+		return ("XHCI (generic) USB 3.0 controller");
+	}
+	return (NULL);			/* dunno */
+}
+
+static int
+xhci_pci_probe(device_t self)
+{
+	const char *desc = xhci_pci_match(self);
+
+	if (desc) {
+		device_set_desc(self, desc);
+		return (0);
+	} else {
+		return (ENXIO);
+	}
+}
+
+static int
+xhci_pci_attach(device_t self)
+{
+	struct xhci_softc *sc = device_get_softc(self);
+	int err;
+	int rid;
+
+	/* initialise some bus fields */
+	sc->sc_bus.parent = self;
+
+	/* XXX check for 64-bit capability */
+
+	if (xhci_init(sc)) {
+		device_printf(self, "Could not initialize softc\n");
+		goto error;
+	}
+
+	pci_enable_busmaster(self);
+
+	rid = PCI_XHCI_CBMEM;
+	sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_io_res) {
+		device_printf(self, "Could not map memory\n");
+		goto error;
+	}
+	sc->sc_io_tag = rman_get_bustag(sc->sc_io_res);
+	sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res);
+	sc->sc_io_size = rman_get_size(sc->sc_io_res);
+
+	rid = 0;
+	sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid,
+	    RF_SHAREABLE | RF_ACTIVE);
+	if (sc->sc_irq_res == NULL) {
+		device_printf(self, "Could not allocate IRQ\n");
+		goto error;
+	}
+	sc->sc_bus.bdev = device_add_child(self, "usbus", -1);
+	if (!sc->sc_bus.bdev) {
+		device_printf(self, "Could not add USB device\n");
+		goto error;
+	}
+	device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
+
+	sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
+
+#if (__FreeBSD_version >= 700031)
+	err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, (driver_intr_t *)xhci_interrupt, sc, &sc->sc_intr_hdl);
+#else
+	err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
+	    (driver_intr_t *)xhci_interrupt, sc, &sc->sc_intr_hdl);
+#endif
+	if (err) {
+		device_printf(self, "Could not setup IRQ, err=%d\n", err);
+		sc->sc_intr_hdl = NULL;
+		goto error;
+	}
+	xhci_pci_takecontroller(self);
+
+	err = xhci_halt_controller(sc);
+
+	if (!err)
+		err = xhci_start_controller(sc);
+
+	if (!err) {
+		err = device_probe_and_attach(sc->sc_bus.bdev);
+	}
+	if (err) {
+		device_printf(self, "XHCI start failed err=%d\n", err);
+		goto error;
+	}
+	return (0);
+
+error:
+	xhci_pci_detach(self);
+	return (ENXIO);
+}
+
+static int
+xhci_pci_detach(device_t self)
+{
+	struct xhci_softc *sc = device_get_softc(self);
+	device_t bdev;
+
+	if (sc->sc_bus.bdev != NULL) {
+		bdev = sc->sc_bus.bdev;
+		device_detach(bdev);
+		device_delete_child(self, bdev);
+	}
+	/* during module unload there are lots of children leftover */
+	device_delete_all_children(self);
+
+	pci_disable_busmaster(self);
+
+	if (sc->sc_irq_res && sc->sc_intr_hdl) {
+
+		xhci_halt_controller(sc);
+
+		bus_teardown_intr(self, sc->sc_irq_res, sc->sc_intr_hdl);
+		sc->sc_intr_hdl = NULL;
+	}
+	if (sc->sc_irq_res) {
+		bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res);
+		sc->sc_irq_res = NULL;
+	}
+	if (sc->sc_io_res) {
+		bus_release_resource(self, SYS_RES_MEMORY, PCI_XHCI_CBMEM,
+		    sc->sc_io_res);
+		sc->sc_io_res = NULL;
+	}
+	usb_bus_mem_free_all(&sc->sc_bus, &xhci_iterate_hw_softc);
+
+	return (0);
+}
+
+static void
+xhci_pci_takecontroller(device_t self)
+{
+	struct xhci_softc *sc = device_get_softc(self);
+	uint32_t cparams;
+	uint32_t eec;
+	uint16_t to;
+	uint8_t eecp;
+	uint8_t bios_sem;
+
+	cparams = XREAD4(sc, capa, XHCI_HCSPARAMS0);
+
+	/* Synchronise with the BIOS if it owns the controller. */
+	for (eecp = XHCI_HCS0_XECP(cparams); eecp != 0;
+	    eecp = XHCI_XECP_NEXT(eec)) {
+		eec = pci_read_config(self, eecp, 4);
+		if (XHCI_XECP_ID(eec) != XHCI_ID_USB_LEGACY)
+			continue;
+		bios_sem = pci_read_config(self, eecp +
+		    XHCI_XECP_BIOS_SEM, 1);
+		if (bios_sem == 0)
+			continue;
+		device_printf(sc->sc_bus.bdev, "waiting for BIOS "
+		    "to give up control\n");
+		pci_write_config(self, eecp +
+		    XHCI_XECP_OS_SEM, 1, 1);
+		to = 500;
+		while (1) {
+			bios_sem = pci_read_config(self, eecp +
+			    XHCI_XECP_BIOS_SEM, 1);
+			if (bios_sem == 0)
+				break;
+
+			if (--to == 0) {
+				device_printf(sc->sc_bus.bdev,
+				    "timed out waiting for BIOS\n");
+				break;
+			}
+			usb_pause_mtx(NULL, hz / 100);	/* wait 10ms */
+		}
+	}
+}

==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#7 (text+ko) ====

@@ -33,6 +33,7 @@
 #define	PCI_XHCI_USBREV		0x60	/* RO USB protocol revision */
 #define	PCI_USB_REV_3_0		0x30	/* USB 3.0 */
 #define	PCI_XHCI_FLADJ		0x61	/* RW frame length adjust */
+#define	PCI_INTERFACE_XHCI	0x30	/* USB 3.0 - XHCI */
 
 /* XHCI capability registers */
 #define	XHCI_CAPLENGTH		0x00	/* RO capability */
@@ -163,6 +164,7 @@
 #define	XHCI_IMOD_IVAL_SET(x)	(((x) & 0xFFFF) << 0)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_GET(x)	(((x) >> 16) & 0xFFFF)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_SET(x)	(((x) & 0xFFFF) << 16)	/* 250ns unit */
+#define	XHCI_IMOD_DEFAULT	0x000001F4U	/* 8000 IRQ/second */
 #define	XHCI_ERSTSZ(n)		(0x0028 + (0x20 * (n))	/* XHCI event ring segment table size */
 #define	XHCI_ERSTS_GET(x)	((x) & 0xFFFF)
 #define	XHCI_ERSTS_SET(x)	((x) & 0xFFFF)
@@ -180,17 +182,19 @@
 #define	XHCI_DB_SID_GET(x)	(((x) >> 16) & 0xFFFF)	/* RW - doorbell stream ID */
 #define	XHCI_DB_SID_SET(x)	(((x) & 0xFFFF) << 16)	/* RW - doorbell stream ID */
 
-/* XHCI interrupter registers. Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */
-#define	XHCI_IMAN(i)		(0x0020 + (0x20 * (i)))		/* RW - interrupt management */
-#define	XHCI_IMAN_IP_BIT	(1U << 0)	/* interrupt pending */
-#define	XHCI_IMAN_IE_BIT	(1U << 1)	/* interrupt enable */
-#define	XHCI_IMOD(i)		(0x0024	+ (0x20 * (i)))	/* RW - interrupt moderation */
-#define	XHCI_IMOD_DEFAULT	0x000001F4U	/* 8000 IRQ/second */
-#define	XHCI_ERSTSZ(i)		(0x0028	+ (0x20 * (i)))	/* RW - segment table size */
-#define	XHCI_ERSTBA_LO(i)	(0x0030	+ (0x20 * (i)))	/* RW - segment base address */
-#define	XHCI_ERSTBA_HI(i)	(0x0034	+ (0x20 * (i)))	/* RW - segment base address */
-#define	XHCI_ERDP_LO(i)		(0x0038	+ (0x20 * (i)))	/* RW - dequeue pointer */
-#define	XHCI_ERDP_HI(i)		(0x003C	+ (0x20 * (i)))	/* RW - dequeue pointer */
+/* XHCI legacy support */
+#define	XHCI_XECP_ID(x)		((x) & 0xFF)
+#define	XHCI_XECP_NEXT(x)	(((x) >> 8) & 0xFF)
+#define	XHCI_XECP_BIOS_SEM	0x0002
+#define	XHCI_XECP_OS_SEM	0x0003
+
+/* XHCI capability ID's */
+#define	XHCI_ID_USB_LEGACY	0x0001
+#define	XHCI_ID_PROTOCOLS	0x0002
+#define	XHCI_ID_POWER_MGMT	0x0003
+#define	XHCI_ID_VIRTUALIZATION	0x0004
+#define	XHCI_ID_MSG_IRQ		0x0005
+#define	XHCI_ID_USB_LOCAL_MEM	0x0006
 
 /* XHCI register R/W wrappers */
 #define	XREAD1(sc, what, a) \

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 18:39:07 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 942F11065679; Sat, 31 Jul 2010 18:39: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 4026F106566B
	for ; Sat, 31 Jul 2010 18:39:06 +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 12D608FC1E
	for ; Sat, 31 Jul 2010 18:39:06 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VId5f1015268
	for ; Sat, 31 Jul 2010 18:39:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VId5xL015266
	for perforce@freebsd.org; Sat, 31 Jul 2010 18:39:05 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 31 Jul 2010 18:39:05 GMT
Message-Id: <201007311839.o6VId5xL015266@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 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181655 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 18:39:07 -0000

http://p4web.freebsd.org/@@181655?ac=10

Change 181655 by hselasky@hselasky_laptop001 on 2010/07/31 18:38:39

	USB controller (XHCI):
		- implement event ring decoding
		- compile fixes

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#4 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#7 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci_pci.c#3 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#8 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#52 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#4 (text+ko) ====

@@ -109,6 +109,12 @@
 	uint8_t direction;
 };
 
+static void xhci_do_poll(struct usb_bus *);
+static void xhci_device_done(struct usb_xfer *, usb_error_t);
+static void xhci_root_intr(struct xhci_softc *);
+
+extern struct usb_bus_methods xhci_bus_methods;
+
 void
 xhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
@@ -117,16 +123,16 @@
         cb(bus, &sc->sc_hw.root_pc, &sc->sc_hw.root_pg,
 	   sizeof(struct xhci_hw_root), XHCI_PAGE_SIZE);
 
-        cb(bus, &sc->sc_ctx.root_pc, &sc->sc_ctx.root_pg,
-	   sizeof(struct xhci_ctx_root), XHCI_PAGE_SIZE);
+        cb(bus, &sc->sc_hw.ctx_pc, &sc->sc_hw.ctx_pg,
+	   sizeof(struct xhci_dev_ctx_addr), XHCI_PAGE_SIZE);
 }
 
-static usb_error_t
+usb_error_t
 xhci_start_controller(struct xhci_softc *sc)
 {
 	struct usb_page_search buf_res;
 	struct xhci_hw_root *phwr;
-	struct xhci_ctx_root *pctxr;
+	struct xhci_dev_ctx_addr *pctxa;
 	uint64_t addr;
 	uint32_t temp;
 	uint16_t i;
@@ -138,6 +144,9 @@
 	sc->sc_runt_off = XREAD4(sc, capa, XHCI_RTSOFF) & ~0xF;
 	sc->sc_door_off = XREAD4(sc, capa, XHCI_DBOFF) & ~0x3;
 
+	sc->sc_event_ccs = 1;
+	sc->sc_event_idx = 0;
+
 	DPRINTF("xHCI version = 0x%04x\n", XREAD2(sc, capa, XHCI_HCIVERSION));
 
 	/* Reset controller */
@@ -145,7 +154,7 @@
 
 	for (i = 0; i != 100; i++) {
 		usb_pause_mtx(NULL, hz / 1000);
-		temp = XREAD4(sc, XHCI_USBCMD) & XHCI_CMD_HCRST;
+		temp = XREAD4(sc, oper, XHCI_USBCMD) & XHCI_CMD_HCRST;
 		if (!temp)
 			break;
 	}
@@ -160,10 +169,26 @@
 		return (USB_ERR_IOERROR);
 	}
 
+	temp = XREAD4(sc, capa, XHCI_HCSPARAMS1);
+
+	i = XHCI_HCS1_N_PORTS(temp);
+
+	if ((i < 1) || (i > 15)) {
+		device_printf(sc->sc_bus.bdev, "Invalid number "
+		    "of ports: %u\n", i);
+		if (i < 1)
+			return (USB_ERR_IOERROR);
+		else
+			i = 15;
+	}
+
+	sc->sc_noport = i;
+	sc->sc_nodev = XHCI_HCS1_DEVSLOT_MAX(temp);
+
 	temp = XREAD4(sc, oper, XHCI_USBSTS);
 
 	/* clear interrupts */
-	XWRITE4(sc, oper, XHCI_USBSTS, status);
+	XWRITE4(sc, oper, XHCI_USBSTS, temp);
 
 	/* disable all device notifications */
 	XWRITE4(sc, oper, XHCI_DNCTRL, 0);
@@ -173,9 +198,9 @@
 	usbd_get_page(&sc->sc_hw.ctx_pc, 0, &buf_res);
 
 	addr = buf_res.physaddr;
-	pctxr = buf_res.ptr;
+	pctxa = buf_res.buffer;
 
-	memset(pctxr, 0, sizeof(*pctxr));
+	memset(pctxa, 0, sizeof(*pctxa));
 
 	XWRITE4(sc, oper, XHCI_DCBAAP_LO, (uint32_t)addr);
 	XWRITE4(sc, oper, XHCI_DCBAAP_HI, (uint32_t)(addr >> 32));
@@ -187,16 +212,16 @@
 	/* Setup interrupter registers */
 
 	temp = XREAD4(sc, runt, XHCI_IMAN(0));
-	temp |= XHCI_IMAN_IE_BIT | XHCI_IMAN_IP_BIT;
-	XWRITE4(sc, runt, XHCI_IMAN(0));
+	temp |= XHCI_IMAN_INTR_ENA | XHCI_IMAN_INTR_PEND;
+	XWRITE4(sc, runt, XHCI_IMAN(0), temp);
 
 	/* Setup interrupt rate */
 
-	XWRITE4(sc, runt, XHCI_IMOD, XHCI_IMOD_DEFAULT);
+	XWRITE4(sc, runt, XHCI_IMOD(0), XHCI_IMOD_DEFAULT);
 
 	usbd_get_page(&sc->sc_hw.root_pc, 0, &buf_res);
 
-	phwr = buf_res.ptr;
+	phwr = buf_res.buffer;
 	addr = (uint64_t)buf_res.physaddr + (uintptr_t)&((struct xhci_hw_root *)0)->hwr_events[0];
 
 	/* reset hardware root structure */
@@ -219,10 +244,10 @@
 
 	sc->sc_erst_max = temp;
 
-	XWRITE4(sc, runt, XHCI_ERSTSZ(0), temp);
+	XWRITE4(sc, runt, XHCI_ERSTS_SET(0), temp);
 
-	XWRITE4(sc, oper, XHCI_ERDP_LO(0), (uint32_t)addr);
-	XWRITE4(sc, oper, XHCI_ERDP_HI(0), (uint32_t)(addr >> 32));
+	XWRITE4(sc, oper, XHCI_ERSTDP_LO(0), (uint32_t)addr);
+	XWRITE4(sc, oper, XHCI_ERSTDP_HI(0), (uint32_t)(addr >> 32));
 
 	addr = (uint64_t)buf_res.physaddr;
 
@@ -236,7 +261,7 @@
 	XWRITE4(sc, oper, XHCI_CRCR_LO, (uint32_t)addr);
 	XWRITE4(sc, oper, XHCI_CRCR_HI, (uint32_t)(addr >> 32));
 
-	usb_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc);
+	usb_bus_mem_flush_all(&sc->sc_bus, &xhci_iterate_hw_softc);
 
 	/* Go! */
 	XWRITE4(sc, oper, XHCI_USBCMD, XHCI_CMD_RS | XHCI_CMD_INTE | XHCI_CMD_HSEE);
@@ -248,6 +273,7 @@
 			break;
 	}
 	if (temp) {
+		XWRITE4(sc, oper, XHCI_USBCMD, 0);
 		device_printf(sc->sc_bus.bdev, "Run timeout.\n");
 		return (USB_ERR_IOERROR);
 	}
@@ -258,7 +284,7 @@
 	return (0);
 }
 
-static usb_error_t
+usb_error_t
 xhci_halt_controller(struct xhci_softc *sc)
 {
 	uint32_t temp;
@@ -284,43 +310,45 @@
 }
 
 usb_error_t
-xhci_init(struct xhci_softc *sc)
+xhci_init(struct xhci_softc *sc, device_t self)
 {
 	/* set the bus revision */
 	sc->sc_bus.usbrev = USB_REV_3_0;
 
-        /* set up the bus struct */
-        sc->sc_bus.methods = &ehci_bus_methods;
+	/* set up the bus struct */
+	sc->sc_bus.methods = &xhci_bus_methods;
 
-	return (0);
-}
+	/* setup devices array */
+	sc->sc_bus.devices = sc->sc_devices;
+	sc->sc_bus.devices_max = XHCI_MAX_DEVICES;
 
-void
-xhci_detach(struct xhci_softc *sc)
-{
+	/* get all DMA memory */
+	if (usb_bus_mem_alloc_all(&sc->sc_bus,
+	    USB_GET_DMA_TAG(self), &xhci_iterate_hw_softc)) {
+		return (ENOMEM);
+	}
 
-
+	return (0);
 }
 
 void
 xhci_suspend(struct xhci_softc *sc)
 {
-
-
+	/* XXX TODO */
 }
 
 void
 xhci_resume(struct xhci_softc *sc)
 {
-
-
+	/* XXX TODO */
 }
 
 void
 xhci_shutdown(struct xhci_softc *sc)
 {
+	DPRINTF("Stopping the XHCI\n");
 
-
+	xhci_halt_controller(sc);
 }
 
 static usb_error_t
@@ -526,18 +554,62 @@
 static void
 xhci_interrupt_poll(struct xhci_softc *sc)
 {
-	struct usb_xfer *xfer;
+	struct usb_page_search buf_res;
+	struct xhci_hw_root *phwr;
+	uint32_t temp;
+	uint16_t i;
+	uint8_t j;
+	uint8_t k;
+	uint8_t t;
+
+	usbd_get_page(&sc->sc_hw.root_pc, 0, &buf_res);
+
+	phwr = buf_res.buffer;
+
+	usb_pc_cpu_invalidate(&sc->sc_hw.root_pc);
+
+	i = sc->sc_event_idx;
+	j = sc->sc_event_ccs;
+	t = 2;
+
+	while (1) {
+
+		temp = le32toh(phwr->hwr_events[i].dwTrb3);
+		k = (temp & XHCI_TRB_3_CYCLE_BIT) ? 1 : 0;
+
+		if (j != k)
+			break;
+
+		switch (XHCI_TRB_3_TYPE_GET(temp)) {
+		case XHCI_TRB_EVENT_TRANSFER:
+			xhci_check_transfer(sc, &phwr->hwr_events[i]);
+			break;
+		default:
+			DPRINTF("Received event = 0x%x\n", 
+			    XHCI_TRB_3_TYPE_GET(temp));
+			break;
+		}
+
+		i++;
+
+		if (i == XHCI_MAX_EVENTS) {
+			i = 0;
+			j ^= 1;
 
-repeat:
-	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
-		/*
-		 * check if transfer is transferred
-		 */
-		if (xhci_check_transfer(xfer)) {
-			/* queue has been modified */
-			goto repeat;
+			/* check for timeout */
+			if (!--t)
+				break;
 		}
 	}
+
+	temp = buf_res.physaddr + (uintptr_t)&((struct xhci_hw_root *)0)->hwr_events[i];
+
+	/* we are within a PAGE - no need to update the high bits */
+
+	XWRITE4(sc, oper, XHCI_ERSTDP_LO(0), temp);
+
+	sc->sc_event_idx = i;
+	sc->sc_event_ccs = j;
 }
 
 /*------------------------------------------------------------------------*
@@ -1037,10 +1109,6 @@
 	/* must have at least one frame! */
 
 	xfer->td_transfer_last = td;
-
-	if (xfer->xroot->udev->flags.self_suspended == 0) {
-		EHCI_APPEND_QH(qh, *qh_last); XXX;
-	}
 }
 
 static void
@@ -1227,8 +1295,7 @@
 };
 
 static const
-struct usb_hub_ss_descriptor xhci_hubd =
-{
+struct usb_hub_ss_descriptor xhci_hubd = {
 	.bLength = sizeof(xhci_hubd),
 	.bDescriptorType = UDESC_SS_HUB,
 };
@@ -1473,7 +1540,7 @@
 				    DeviceRemovable[j / 8] |= 1U << (j % 8);
 			}
 		}
-		len = sc->sc_hub_desc.hubd.bDescLength;
+		len = sc->sc_hub_desc.hubd.bLength;
 		break;
 
 	case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE):
@@ -1842,103 +1909,31 @@
 static void
 xhci_device_resume(struct usb_device *udev)
 {
-	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
-	struct usb_xfer *xfer;
-	struct usb_pipe_methods *methods;
-
 	DPRINTF("\n");
 
 	USB_BUS_LOCK(udev->bus);
 
-	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
-
-		if (xfer->xroot->udev == udev) {
-
-			methods = xfer->endpoint->methods;
-
-			if ((methods == &xhci_device_bulk_methods) ||
-			    (methods == &xhci_device_ctrl_methods)) {
-				XHCI_APPEND_QH(xfer->qh_start[xfer->flags_int.curr_dma_set],
-				    sc->sc_async_p_last);
-			}
-			if (methods == &xhci_device_intr_methods) {
-				XHCI_APPEND_QH(xfer->qh_start[xfer->flags_int.curr_dma_set],
-				    sc->sc_intr_p_last[xfer->qh_pos]);
-			}
-		}
-	}
+	/* start endpoint */
 
 	USB_BUS_UNLOCK(udev->bus);
-
-	return;
 }
 
 static void
 xhci_device_suspend(struct usb_device *udev)
 {
-	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
-	struct usb_xfer *xfer;
-	struct usb_pipe_methods *methods;
-
 	DPRINTF("\n");
 
 	USB_BUS_LOCK(udev->bus);
 
-	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
-
-		if (xfer->xroot->udev == udev) {
+	/* stop endpoint */
 
-			methods = xfer->endpoint->methods;
-
-			if ((methods == &xhci_device_bulk_methods) ||
-			    (methods == &xhci_device_ctrl_methods)) {
-				XHCI_REMOVE_QH(xfer->qh_start[xfer->flags_int.curr_dma_set],
-				    sc->sc_async_p_last);
-			}
-			if (methods == &xhci_device_intr_methods) {
-				XHCI_REMOVE_QH(xfer->qh_start[xfer->flags_int.curr_dma_set],
-				    sc->sc_intr_p_last[xfer->qh_pos]);
-			}
-		}
-	}
-
 	USB_BUS_UNLOCK(udev->bus);
-
-	return;
 }
 
 static void
 xhci_set_hw_power(struct usb_bus *bus)
 {
-	struct xhci_softc *sc = XHCI_BUS2SC(bus);
-	uint32_t temp;
-	uint32_t flags;
-
 	DPRINTF("\n");
-
-	USB_BUS_LOCK(bus);
-
-	flags = bus->hw_power_state;
-
-	temp = EOREAD4(sc, XHCI_USBCMD);
-
-	temp &= ~(XHCI_CMD_ASE | XHCI_CMD_PSE);
-
-	if (flags & (USB_HW_POWER_CONTROL |
-	    USB_HW_POWER_BULK)) {
-		DPRINTF("Async is active\n");
-		temp |= XHCI_CMD_ASE;
-	}
-	if (flags & (USB_HW_POWER_INTERRUPT |
-	    USB_HW_POWER_ISOC)) {
-		DPRINTF("Periodic is active\n");
-		temp |= XHCI_CMD_PSE;
-	}
-	EOWRITE4(sc, XHCI_USBCMD, temp);
-
-	USB_BUS_UNLOCK(bus);
-
-	return;
 }
 
 struct usb_bus_methods xhci_bus_methods =

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#7 (text+ko) ====

@@ -326,10 +326,6 @@
 	struct xhci_trb			hwr_commands[XHCI_MAX_COMMANDS];
 };
 
-struct xhci_ctx_root {
-	volatile uint64_t		ctxr_ptr[XHCI_MAX_DEVICES];
-};
-
 struct xhci_endpoint_ext {
 	TAILQ_HEAD(, xhci_qh) head;
 
@@ -407,7 +403,10 @@
 
 	uint16_t sc_flags;		/* chip specific flags */
 	uint16_t sc_erst_max;
+	uint16_t sc_event_idx;
 
+	uint8_t sc_event_ccs;
+	uint8_t	sc_nodev;		/* number of devices on root HUB */
 	uint8_t	sc_noport;		/* number of ports on root HUB */
 	uint8_t	sc_addr;		/* root HUB device address */
 	uint8_t	sc_conf;		/* root HUB device configuration */
@@ -422,7 +421,7 @@
 void xhci_suspend(struct xhci_softc *);
 void xhci_resume(struct xhci_softc *);
 void xhci_shutdown(struct xhci_softc *);
-usb_error_t xhci_init(struct xhci_softc *);
+usb_error_t xhci_init(struct xhci_softc *, device_t);
 usb_error_t xhci_start_controller(struct xhci_softc *);
 void xhci_iterate_hw_softc(struct usb_bus *, usb_bus_mem_sub_cb_t *);
 usb_error_t xhci_halt_controller(struct xhci_softc *);

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci_pci.c#3 (text+ko) ====

@@ -169,7 +169,7 @@
 
 	/* XXX check for 64-bit capability */
 
-	if (xhci_init(sc)) {
+	if (xhci_init(sc, self)) {
 		device_printf(self, "Could not initialize softc\n");
 		goto error;
 	}

==== //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#8 (text+ko) ====

@@ -156,24 +156,24 @@
 /* XHCI runtime registers.  Offset given by XHCI_CAPLENGTH + XHCI_RTSOFF registers */
 #define	XHCI_MFINDEX		0x0000		/* RO - microframe index */
 #define	XHCI_MFINDEX_GET(x)	((x) & 0x1FFF)
-#define	XHCI_IMAN(n)		(0x0020 + (0x20 * (n))	/* XHCI interrupt management */
+#define	XHCI_IMAN(n)		(0x0020 + (0x20 * (n)))	/* XHCI interrupt management */
 #define	XHCI_IMAN_INTR_PEND	0x00000001	/* RW - interrupt pending */
 #define	XHCI_IMAN_INTR_ENA	0x00000002	/* RW - interrupt enable */
-#define	XHCI_IMOD(n)		(0x0024 + (0x20 * (n))	/* XHCI interrupt moderation */
+#define	XHCI_IMOD(n)		(0x0024 + (0x20 * (n)))	/* XHCI interrupt moderation */
 #define	XHCI_IMOD_IVAL_GET(x)	(((x) >> 0) & 0xFFFF)	/* 250ns unit */
 #define	XHCI_IMOD_IVAL_SET(x)	(((x) & 0xFFFF) << 0)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_GET(x)	(((x) >> 16) & 0xFFFF)	/* 250ns unit */
 #define	XHCI_IMOD_ICNT_SET(x)	(((x) & 0xFFFF) << 16)	/* 250ns unit */
 #define	XHCI_IMOD_DEFAULT	0x000001F4U	/* 8000 IRQ/second */
-#define	XHCI_ERSTSZ(n)		(0x0028 + (0x20 * (n))	/* XHCI event ring segment table size */
+#define	XHCI_ERSTSZ(n)		(0x0028 + (0x20 * (n)))	/* XHCI event ring segment table size */
 #define	XHCI_ERSTS_GET(x)	((x) & 0xFFFF)
 #define	XHCI_ERSTS_SET(x)	((x) & 0xFFFF)
-#define	XHCI_ERSTBA_LO(n)	(0x0030 + (0x20 * (n))	/* XHCI event ring segment table BA */
-#define	XHCI_ERSTBA_HI(n)	(0x0034 + (0x20 * (n))	/* XHCI event ring segment table BA */
-#define	XHCI_ERSTDP_LO(n)	(0x0038 + (0x20 * (n))	/* XHCI event ring dequeue pointer */
+#define	XHCI_ERSTBA_LO(n)	(0x0030 + (0x20 * (n)))	/* XHCI event ring segment table BA */
+#define	XHCI_ERSTBA_HI(n)	(0x0034 + (0x20 * (n)))	/* XHCI event ring segment table BA */
+#define	XHCI_ERSTDP_LO(n)	(0x0038 + (0x20 * (n)))	/* XHCI event ring dequeue pointer */
 #define	XHCI_ERSTDP_LO_SIGET(x)	((x) & 0x7)	/* RO - dequeue segment index */
 #define	XHCI_ERSTDP_LO_BUSY	0x00000008	/* RW - event handler busy */
-#define	XHCI_ERSTDP_HI(n)	(0x003C + (0x20 * (n))	/* XHCI event ring dequeue pointer */
+#define	XHCI_ERSTDP_HI(n)	(0x003C + (0x20 * (n)))	/* XHCI event ring dequeue pointer */
 
 /* XHCI doorbell registers. Offset given by XHCI_CAPLENGTH + XHCI_DBOFF registers */
 #define	XHCI_DOORBELL		0x0000

==== //depot/projects/usb/src/sys/dev/usb/usb.h#52 (text+ko) ====

@@ -593,7 +593,7 @@
 typedef struct usb_hub_descriptor usb_hub_descriptor_t;
 
 struct usb_hub_ss_descriptor {
-	uByte	bDescLength;
+	uByte	bLength;
 	uByte	bDescriptorType;
 	uByte	bNbrPorts;		/* max 15 */
 	uWord	wHubCharacteristics;

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 20:28:31 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4A9DF1065677; Sat, 31 Jul 2010 20:28: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 0BB3D1065673;
	Sat, 31 Jul 2010 20:28:31 +0000 (UTC)
	(envelope-from yanegomi@gmail.com)
Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com
	[209.85.214.182])
	by mx1.freebsd.org (Postfix) with ESMTP id B1E218FC0A;
	Sat, 31 Jul 2010 20:28:29 +0000 (UTC)
Received: by iwn35 with SMTP id 35so3373510iwn.13
	for ; Sat, 31 Jul 2010 13:28:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:received:sender:received
	:in-reply-to:references:date:x-google-sender-auth:message-id:subject
	:from:to:cc:content-type:content-transfer-encoding;
	bh=zef6DMALrM72EBa0MfRhcMh7Z1WHrtpDCBMDdebIhYc=;
	b=Fq3CxxKIvPIQO4au089qi9gVBNC2WwJrK7lQqoThs7p6RROexRg0E+mJ9D4HlhjgQO
	hVg16bZFu6L0Xd3LpTdRbSPt2vHxk7HWkMaa2fqUiwMuU0Nh/4C5lG/58ZXcuYYazi14
	jM5fA1QxdD3HJhMTXkNpzFd6BDrqyRNv6q06g=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:sender:in-reply-to:references:date
	:x-google-sender-auth:message-id:subject:from:to:cc:content-type
	:content-transfer-encoding;
	b=cxG1X3BsUaHP3QVZSD69590KpRZkDLpR7ZyvsKa7/10980UfdHM9U9PV5npxqMC8dX
	sIz6xNwJxOO9kWXtNpLcN8jUrjq63hC2D8qKr0oLRNUVIAuVfC4Pp6ttuku5DyfjmbHe
	FeNdoDSuxtn3tueJ/B9F5uUYIJCK2UpSLIQ1A=
MIME-Version: 1.0
Received: by 10.231.191.74 with SMTP id dl10mr4012010ibb.157.1280608109485; 
	Sat, 31 Jul 2010 13:28:29 -0700 (PDT)
Sender: yanegomi@gmail.com
Received: by 10.231.169.18 with HTTP; Sat, 31 Jul 2010 13:28:29 -0700 (PDT)
In-Reply-To: <201007281714.o6SHE6hB004291@repoman.freebsd.org>
References: <201007281714.o6SHE6hB004291@repoman.freebsd.org>
Date: Sat, 31 Jul 2010 13:28:29 -0700
X-Google-Sender-Auth: Gs13fGjlOT2ekinKVmi8WqQeD3k
Message-ID: 
From: Garrett Cooper 
To: Julien Laffaye 
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 181523 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, 31 Jul 2010 20:28:31 -0000

On Wed, Jul 28, 2010 at 10:14 AM, Julien Laffaye  wro=
te:
> http://p4web.freebsd.org/@@181523?ac=3D10
>
> Change 181523 by jlaffaye@jlaffaye-chulak on 2010/07/28 17:13:28
>

...

> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 extract_state =3D 2;
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 extract_state =3D 0;

It would be helpful if these were documented constants, or values in an enu=
m :).

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 20:33:09 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 782B11065675; Sat, 31 Jul 2010 20:33:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24604106564A;
	Sat, 31 Jul 2010 20:33:09 +0000 (UTC)
	(envelope-from yanegomi@gmail.com)
Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com
	[209.85.214.182])
	by mx1.freebsd.org (Postfix) with ESMTP id CF6CE8FC12;
	Sat, 31 Jul 2010 20:33:08 +0000 (UTC)
Received: by iwn35 with SMTP id 35so3376739iwn.13
	for ; Sat, 31 Jul 2010 13:33:08 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:received:sender:received
	:in-reply-to:references:date:x-google-sender-auth:message-id:subject
	:from:to:cc:content-type:content-transfer-encoding;
	bh=07xmp13czXDSg23oMy0caPfuNI/auN93Xhu02RDQEwU=;
	b=n63tEfiBVhRzgy2wHEIJoqXPPa7fnhwt8WVN5rB6EiNqqO5SsRbP21vZIYT6v/zScv
	OlZUFnaAez5ia+Mm6Soygi2XvdtHhYF+BLGfWv542BrEG2e6V559V93lOXZ55GGdQSjW
	sspoOiG05UqEwjqPNMBkP0b3R7/1D9uateJEg=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:sender:in-reply-to:references:date
	:x-google-sender-auth:message-id:subject:from:to:cc:content-type
	:content-transfer-encoding;
	b=xNgg/u8hFpPSTpJlnTCgMtT3qEduTjBPprraIy3ggWGrsSzHt+0+lzEAQpu/J+uQ2V
	VktNK5pOECTrjbRXF5tAJkHcbhFRaTIMy4Rox8wanEkkHF+EeZXDruWw7+gLaDTLm8CX
	SxbhOfgnEmiaP7O2vhdlKZsni8YvPB5P6shQk=
MIME-Version: 1.0
Received: by 10.231.39.201 with SMTP id h9mr4042049ibe.118.1280608385065; Sat, 
	31 Jul 2010 13:33:05 -0700 (PDT)
Sender: yanegomi@gmail.com
Received: by 10.231.169.18 with HTTP; Sat, 31 Jul 2010 13:33:04 -0700 (PDT)
In-Reply-To: <201007292123.o6TLN3Td039516@repoman.freebsd.org>
References: <201007292123.o6TLN3Td039516@repoman.freebsd.org>
Date: Sat, 31 Jul 2010 13:33:04 -0700
X-Google-Sender-Auth: Zw_OAtZ60wRYbK3MbdJBC7l6NHk
Message-ID: 
From: Garrett Cooper 
To: Julien Laffaye 
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 181582 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, 31 Jul 2010 20:33:09 -0000

On Thu, Jul 29, 2010 at 2:23 PM, Julien Laffaye  wrot=
e:
> http://p4web.freebsd.org/@@181582?ac=3D10
>
> Change 181582 by jlaffaye@jlaffaye-chulak on 2010/07/29 21:23:01
>
> =A0 =A0 =A0 =A0- Rework the fetch_archive() function to return a file des=
criptor of the
> =A0 =A0 =A0 =A0downloaded archive.
> =A0 =A0 =A0 =A0Reading on-the-fly doesn't work if we fetch dependencies: =
the remote
> =A0 =A0 =A0 =A0server close the connection because we are inactive (in fa=
ct we are
> =A0 =A0 =A0 =A0busy downloading the dependency). Reading on-the-fly could=
 work if we
> =A0 =A0 =A0 =A0knew the dependencies, in the proper order, of the package=
 before
> =A0 =A0 =A0 =A0downloading it (thus, download and install the dependencie=
s first).
> =A0 =A0 =A0 =A0- While I'm here, print the progress (percentage) of the d=
owload.
>

...

> + =A0 =A0 =A0 if (archive_read_open_fd(a, fd, 10240) !=3D ARCHIVE_OK) {
> + =A0 =A0 =A0 =A0 =A0 warnx("archive_read_open_fd(): %s", archive_error_s=
tring(a));
> + =A0 =A0 =A0 =A0 =A0 retcode =3D 1;
> + =A0 =A0 =A0 =A0 =A0 goto cleanup;

Overall change looks good, but why 10240 :)?
-Garrett

From owner-p4-projects@FreeBSD.ORG  Sat Jul 31 22:33:23 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7FD5E106567B; Sat, 31 Jul 2010 22:33: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 2AAAD1065674
	for ; Sat, 31 Jul 2010 22:33:23 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 162988FC15
	for ; Sat, 31 Jul 2010 22:33:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6VMXMqY052130
	for ; Sat, 31 Jul 2010 22:33:22 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6VMXMMt052128
	for perforce@freebsd.org; Sat, 31 Jul 2010 22:33:22 GMT
	(envelope-from bz@freebsd.org)
Date: Sat, 31 Jul 2010 22:33:22 GMT
Message-Id: <201007312233.o6VMXMMt052128@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bz@freebsd.org using -f
From: "Bjoern A. Zeeb" 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 181661 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 31 Jul 2010 22:33:23 -0000

http://p4web.freebsd.org/@@181661?ac=10

Change 181661 by bz@bz_dumpster on 2010/07/31 22:33:09

	IFC @181660
	
	Could fix a "SRAT: CPU with APIC ID 0 is not known" in Fusion.

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_switch.S#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/cpu_switch.S#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/genassym.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/support.S#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#10 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pcpu.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/specialreg.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/boot/zfs/zfstest.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/conf/NOTES#10 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.powerpc#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.sparc64#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/files.sun4v#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/conf/options.powerpc#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_osdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/et/if_et.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/et/if_etreg.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/et/if_etvar.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/ipmi/ipmi_smbios.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci_user.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/quirk/usb_quirk.c#9 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/serial/uplcom.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/conf/GENERIC#9 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/genassym.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/i386/swtch.s#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/pcpu.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/i386/include/specialreg.h#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/conf/GENERIC#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/ia64/include/pcpu.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/kern_malloc.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/kern/subr_witness.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/_stdint.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/param.h#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/profile.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/runq.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/include/vmparam.h#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/exception.S#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/genassym.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/locore.S#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pm_machdep.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/pmap.c#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/support.S#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/swtch.S#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/trap.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/mips/vm_machdep.c#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/mips/rmi/dev/xlr/rge.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/modules/ata/atacore/Makefile#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/if_ether.c#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in_rmx.c#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_indata.c#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_output.c#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_structs.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#39 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/opencrypto/cryptodev.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/mmu_oea64.c#9 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/aim/slb.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/conf/GENERIC#8 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/conf/GENERIC64#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/conf/NOTES#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/include/slb.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mambo/mambo.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mambo/mambo_console.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mambo/mambo_disk.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mambo/mambo_openpic.c#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mambo/mambocall.S#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/powerpc/mambo/mambocall.h#1 branch
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/intr_machdep.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/pcpu.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/smp.h#5 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/include/tick.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/clock.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sparc64/sparc64/tick.c#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/conf/GENERIC#7 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/clock.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/intr_machdep.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/pcpu.h#4 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/smp.h#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/include/tick.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/clock.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/intr_machdep.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/mp_machdep.c#3 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sun4v/sun4v/tick.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/malloc.h#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/sys/param.h#11 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/x86/acpica/srat.c#2 integrate
.. //depot/projects/soc2009/anchie_send/src/sys/x86/x86/mca.c#2 integrate

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_switch.S#4 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.6 2010/07/26 19:53:09 jkim Exp $
+ * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.7 2010/07/29 16:41:21 jkim Exp $
  */
 
 #include 
@@ -156,7 +156,7 @@
 	movq	PCPU(FPCURTHREAD), %rax
 	testq	%rax, %rax
 	je	1f
-	fxrstor	WAKEUP_PCB(USER_FPU)
+	fxrstor	WAKEUP_PCB(USERFPU)
 1:
 
 	/* Restore CR0 with FPU mode. */

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/cpu_switch.S#5 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.173 2010/07/26 19:53:09 jkim Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.175 2010/07/29 16:49:20 jkim Exp $
  */
 
 #include 
@@ -347,7 +347,7 @@
 	lmsw	%ax
 
 	movq	$PCB_SAVEFPU_SIZE,%rdx	/* arg 3 */
-	movq	PCB_SAVEFPU(%rcx),%rsi	/* arg 2 */
+	leaq	PCB_USERFPU(%rcx),%rsi	/* arg 2 */
 	/* arg 1 (%rdi) already loaded */
 	call	bcopy
 1:
@@ -421,7 +421,7 @@
 	testq	%rax,%rax
 	je	1f
 	clts
-	fxsave	PCB_USER_FPU(%r8)
+	fxsave	PCB_USERFPU(%r8)
 1:
 
 	movl	$1, %eax

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/genassym.c#4 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.178 2010/07/26 19:53:09 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.179 2010/07/29 16:41:21 jkim Exp $");
 
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
@@ -140,7 +140,7 @@
 ASSYM(PCB_DR3, offsetof(struct pcb, pcb_dr3));
 ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6));
 ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7));
-ASSYM(PCB_USER_FPU, offsetof(struct pcb, pcb_user_save));
+ASSYM(PCB_USERFPU, offsetof(struct pcb, pcb_user_save));
 ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp));
 ASSYM(PCB_FULL_IRET, offsetof(struct pcb, pcb_full_iret));
 ASSYM(PCB_DBREGS, PCB_DBREGS);

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/support.S#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.130 2009/06/05 20:23:29 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.131 2010/07/30 21:39:28 delphij Exp $
  */
 
 #include "opt_ddb.h"
@@ -729,7 +729,7 @@
 	rdmsr			/* Read MSR pointed by %ecx. Returns
 				   hi byte in edx, lo in %eax */
 	salq	$32,%rdx	/* sign-shift %rdx left */
-	cltq			/* sign-extend %eax -> %rax */
+	movl	%eax,%eax	/* zero-extend %eax -> %rax */
 	orq	%rdx,%rax
 	movq	%rax,(%rsi)
 	xorq	%rax,%rax

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#10 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.545 2010/07/07 09:23:46 kevlo Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.546 2010/07/28 15:36:12 mdf Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -76,6 +76,7 @@
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pcpu.h#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/sys/amd64/include/pcpu.h,v 1.55 2010/05/24 15:45:05 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.56 2010/07/29 18:44:10 jhb Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
@@ -216,12 +216,12 @@
 #define	PCPU_PTR(member)	__PCPU_PTR(pc_ ## member)
 #define	PCPU_SET(member, val)	__PCPU_SET(pc_ ## member, val)
 
-static __inline struct thread *
+static __inline __pure2 struct thread *
 __curthread(void)
 {
 	struct thread *td;
 
-	__asm __volatile("movq %%gs:0,%0" : "=r" (td));
+	__asm("movq %%gs:0,%0" : "=r" (td));
 	return (td);
 }
 #define	curthread		(__curthread())

==== //depot/projects/soc2009/anchie_send/src/sys/amd64/include/specialreg.h#6 (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.63 2010/05/24 15:45:05 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.65 2010/07/29 19:08:22 delphij Exp $
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
@@ -258,6 +258,7 @@
 #define	MSR_THERM_INTERRUPT	0x19b
 #define	MSR_THERM_STATUS	0x19c
 #define	MSR_IA32_MISC_ENABLE	0x1a0
+#define	MSR_IA32_TEMPERATURE_TARGET	0x1a2
 #define	MSR_DEBUGCTLMSR		0x1d9
 #define	MSR_LASTBRANCHFROMIP	0x1db
 #define	MSR_LASTBRANCHTOIP	0x1dc
@@ -372,10 +373,10 @@
 #define	MC_STATUS_MCA_ERROR	0x000000000000ffff
 #define	MC_STATUS_MODEL_ERROR	0x00000000ffff0000
 #define	MC_STATUS_OTHER_INFO	0x01ffffff00000000
-#define	MC_STATUS_COR_COUNT	0x001fffc000000000	/* If MCG_CAP_TES_P */
+#define	MC_STATUS_COR_COUNT	0x001fffc000000000	/* If MCG_CAP_CMCI_P */
 #define	MC_STATUS_TES_STATUS	0x0060000000000000	/* If MCG_CAP_TES_P */
-#define	MC_STATUS_AR		0x0080000000000000	/* If MCG_CAP_CMCI_P */
-#define	MC_STATUS_S		0x0100000000000000	/* If MCG_CAP_CMCI_P */
+#define	MC_STATUS_AR		0x0080000000000000	/* If MCG_CAP_TES_P */
+#define	MC_STATUS_S		0x0100000000000000	/* If MCG_CAP_TES_P */
 #define	MC_STATUS_PCC		0x0200000000000000
 #define	MC_STATUS_ADDRV		0x0400000000000000
 #define	MC_STATUS_MISCV		0x0800000000000000

==== //depot/projects/soc2009/anchie_send/src/sys/conf/NOTES#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1587 2010/06/18 18:51:09 kib Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1588 2010/07/28 15:36:12 mdf Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -385,6 +385,20 @@
 options		NO_SYSCTL_DESCR
 
 #
+# MALLOC_DEBUG_MAXZONES enables multiple uma zones for malloc(9)
+# allocations that are smaller than a page.  The purpose is to isolate
+# different malloc types into hash classes, so that any buffer
+# overruns or use-after-free will usually only affect memory from
+# malloc types in that hash class.  This is purely a debugging tool;
+# by varying the hash function and tracking which hash class was
+# corrupted, the intersection of the hash classes from each instance
+# will point to a single malloc type that is being misused.  At this
+# point inspection or memguard(9) can be used to catch the offending
+# code.
+#
+options 	MALLOC_DEBUG_MAXZONES=8
+
+#
 # DEBUG_MEMGUARD builds and enables memguard(9), a replacement allocator
 # for the kernel used to detect modify-after-free scenarios.  See the
 # memguard(9) man page for more information on usage.

==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.powerpc#7 (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.113 2010/07/13 05:32:19 nwhitehorn Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.114 2010/07/31 13:22:34 nwhitehorn Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -111,6 +111,11 @@
 powerpc/fpu/fpu_mul.c		optional	fpu_emu
 powerpc/fpu/fpu_sqrt.c		optional	fpu_emu
 powerpc/fpu/fpu_subr.c		optional	fpu_emu
+powerpc/mambo/mambocall.S	optional	mambo
+powerpc/mambo/mambo.c		optional	mambo
+powerpc/mambo/mambo_console.c	optional	mambo
+powerpc/mambo/mambo_disk.c	optional	mambo
+powerpc/mambo/mambo_openpic.c	optional	mambo
 powerpc/mpc85xx/atpic.c		optional	mpc85xx isa
 powerpc/mpc85xx/ds1553_bus_fdt.c	optional	ds1553 fdt
 powerpc/mpc85xx/ds1553_core.c	optional	ds1553

==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.sparc64#8 (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.sparc64,v 1.115 2010/05/20 12:46:19 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.116 2010/07/29 12:08:46 mav Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -59,6 +59,7 @@
 dev/syscons/scvtb.c		optional	sc
 dev/uart/uart_cpu_sparc64.c	optional	uart
 dev/uart/uart_kbd_sun.c		optional	uart sc
+kern/kern_clocksource.c		standard
 kern/syscalls.c			optional	ktr
 libkern/ffs.c			standard
 libkern/ffsl.c			standard

==== //depot/projects/soc2009/anchie_send/src/sys/conf/files.sun4v#4 (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.sun4v,v 1.21 2010/04/24 16:27:43 marius Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.22 2010/07/29 12:08:46 mav Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -29,6 +29,7 @@
 dev/ofw/openfirmio.c		standard
 dev/ofw/openpromio.c		standard
 dev/uart/uart_cpu_sparc64.c	optional	uart
+kern/kern_clocksource.c		standard
 kern/syscalls.c			optional	ktr
 libkern/ffs.c			standard
 libkern/ffsl.c			standard

==== //depot/projects/soc2009/anchie_send/src/sys/conf/options#11 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.705 2010/06/09 12:25:57 ae Exp $
+# $FreeBSD: src/sys/conf/options,v 1.706 2010/07/28 15:36:12 mdf Exp $
 #
 #        On the handling of kernel options
 #
@@ -586,6 +586,7 @@
 NO_SWAPPING		opt_vm.h
 MALLOC_MAKE_FAILURES	opt_vm.h
 MALLOC_PROFILE		opt_vm.h
+MALLOC_DEBUG_MAXZONES	opt_vm.h
 
 # The MemGuard replacement allocator used for tamper-after-free detection
 DEBUG_MEMGUARD		opt_vm.h

==== //depot/projects/soc2009/anchie_send/src/sys/conf/options.powerpc#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.powerpc,v 1.14 2010/07/13 05:32:19 nwhitehorn Exp $
+# $FreeBSD: src/sys/conf/options.powerpc,v 1.15 2010/07/31 13:22:34 nwhitehorn Exp $
 # Options specific to the powerpc platform kernels
 
 AIM			opt_global.h
@@ -17,6 +17,7 @@
 
 MPC85XX			opt_platform.h
 POWERMAC		opt_platform.h
+MAMBO
 PSIM
 
 SC_OFWFB		opt_ofwfb.h

==== //depot/projects/soc2009/anchie_send/src/sys/dev/amr/amrvar.h#2 (text+ko) ====

@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *
- *      $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.36 2008/11/03 00:53:54 scottl Exp $
+ *      $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.37 2010/07/28 16:24:11 mdf Exp $
  */
 
 #include 
@@ -66,8 +66,8 @@
 # define debug(level, fmt, args...)	do {if (level <= AMR_DEBUG) printf("%s: " fmt "\n", __func__ , ##args);} while(0)
 # define debug_called(level)		do {if (level <= AMR_DEBUG) printf("%s: called\n", __func__);} while(0)
 #else
-# define debug(level, fmt, args...)
-# define debug_called(level)
+# define debug(level, fmt, args...)	do {} while (0)
+# define debug_called(level)		do {} while (0)
 #endif
 #define xdebug(fmt, args...)	printf("%s: " fmt "\n", __func__ , ##args)
 

==== //depot/projects/soc2009/anchie_send/src/sys/dev/coretemp/coretemp.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.10 2009/09/06 12:01:29 nork Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.11 2010/07/29 19:08:22 delphij Exp $");
 
 #include 
 #include 
@@ -133,15 +133,13 @@
 	struct coretemp_softc *sc = device_get_softc(dev);
 	device_t pdev;
 	uint64_t msr;
-	int cpu_model;
-	int cpu_mask;
+	int cpu_model, cpu_stepping;
+	int ret, tjtarget;
 
 	sc->sc_dev = dev;
 	pdev = device_get_parent(dev);
-	cpu_model = (cpu_id >> 4) & 15;
-	/* extended model */
-	cpu_model += ((cpu_id >> 16) & 0xf) << 4;
-	cpu_mask = cpu_id & 15;
+	cpu_model = CPUID_TO_MODEL(cpu_id);
+	cpu_stepping = cpu_id & CPUID_STEPPING;
 
 	/*
 	 * Some CPUs, namely the PIII, don't have thermal sensors, but
@@ -164,7 +162,7 @@
 	 *
 	 * Adapted from the Linux coretemp driver.
 	 */
-	if (cpu_model == 0xe && cpu_mask < 0xc) {
+	if (cpu_model == 0xe && cpu_stepping < 0xc) {
 		msr = rdmsr(MSR_BIOS_SIGN);
 		msr = msr >> 32;
 		if (msr < 0x39) {
@@ -174,20 +172,56 @@
 		}
 	}
 #endif
+
 	/*
-	 * On some Core 2 CPUs, there's an undocumented MSR that
-	 * can tell us if Tj(max) is 100 or 85.
+	 * Use 100C as the initial value.
+	 */
+	sc->sc_tjmax = 100;
+
+	/*
+	 * Attempt to get Tj(max) from MSR IA32_TEMPERATURE_TARGET.
 	 *
-	 * The if-clause for CPUs having the MSR_IA32_EXT_CONFIG was adapted
-	 * from the Linux coretemp driver.
+	 * This method is described in Intel white paper
+	 * "CPU Monitoring With DTS/PECI". (#322683)
 	 */
-	sc->sc_tjmax = 100;
-	if ((cpu_model == 0xf && cpu_mask >= 2) || cpu_model == 0xe) {
+	ret = rdmsr_safe(MSR_IA32_TEMPERATURE_TARGET, &msr);
+	if (ret == 0) {
+		tjtarget = (msr >> 16) & 0xff;
+		/*
+		 * On earlier generation of processors, the value obtained
+		 * from IA32_TEMPERATURE_TARGET register is an offset that
+		 * needs to be summed with a model specific base.  It is
+		 * however not clear what these numbers are, with the
+		 * publicly available documents from Intel.
+		 *
+		 * For now, we consider [70, 100]C range, as described in
+		 * #322683, as "reasonable" and accept these values
+		 * whenever the MSR is available for read, regardless the
+		 * CPU model.
+		 */
+		if (tjtarget >= 70 && tjtarget <= 100)
+			sc->sc_tjmax = tjtarget;
+		else
+			device_printf(dev, "Tj(target) value %d does "
+				    "not seem right.\n", tjtarget);
+	}
+
+	if ((cpu_model == 0xf && cpu_stepping >= 2) || cpu_model == 0xe) {
+		/*
+		 * On some Core 2 CPUs, there's an undocumented MSR that
+		 * can tell us if Tj(max) is 100 or 85.
+		 *
+		 * The if-clause for CPUs having the MSR_IA32_EXT_CONFIG was adapted
+		 * from the Linux coretemp driver.
+		 */
 		msr = rdmsr(MSR_IA32_EXT_CONFIG);
 		if (msr & (1 << 30))
 			sc->sc_tjmax = 85;
 	}
 
+	if (bootverbose)
+		device_printf(dev, "Setting TjMax=%d\n", sc->sc_tjmax);
+
 	/*
 	 * Add the "temperature" MIB to dev.cpu.N.
 	 */

==== //depot/projects/soc2009/anchie_send/src/sys/dev/e1000/e1000_osdep.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
   POSSIBILITY OF SUCH DAMAGE.
 
 ******************************************************************************/
-/*$FreeBSD: src/sys/dev/e1000/e1000_osdep.h,v 1.6 2010/01/27 18:00:24 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/e1000/e1000_osdep.h,v 1.7 2010/07/28 16:24:06 mdf Exp $*/
 
 
 #ifndef _FREEBSD_OS_H_
@@ -65,11 +65,11 @@
 
 #define MSGOUT(S, A, B)     printf(S "\n", A, B)
 #define DEBUGFUNC(F)        DEBUGOUT(F);
-	#define DEBUGOUT(S)
-	#define DEBUGOUT1(S,A)
-	#define DEBUGOUT2(S,A,B)
-	#define DEBUGOUT3(S,A,B,C)
-	#define DEBUGOUT7(S,A,B,C,D,E,F,G)
+#define DEBUGOUT(S)			do {} while (0)
+#define DEBUGOUT1(S,A)			do {} while (0)
+#define DEBUGOUT2(S,A,B)		do {} while (0)
+#define DEBUGOUT3(S,A,B,C)		do {} while (0)
+#define DEBUGOUT7(S,A,B,C,D,E,F,G)	do {} while (0)
 
 #define STATIC			static
 #define FALSE			0

==== //depot/projects/soc2009/anchie_send/src/sys/dev/et/if_et.c#4 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
+ * Copyright (c) 2007 Sepherosa Ziehau.  All rights reserved.
  *
  * This code is derived from software contributed to The DragonFly Project
  * by Sepherosa Ziehau 
@@ -35,7 +35,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/et/if_et.c,v 1.17 2009/11/20 20:43:16 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/et/if_et.c,v 1.18 2010/07/30 17:51:22 delphij Exp $");
 
 #include 
 #include 

==== //depot/projects/soc2009/anchie_send/src/sys/dev/et/if_etreg.h#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
+ * Copyright (c) 2007 Sepherosa Ziehau.  All rights reserved.
  *
  * This code is derived from software contributed to The DragonFly Project
  * by Sepherosa Ziehau 
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  * $DragonFly: src/sys/dev/netif/et/if_etreg.h,v 1.3 2007/10/23 14:28:42 sephe Exp $
- * $FreeBSD: src/sys/dev/et/if_etreg.h,v 1.3 2009/11/19 21:46:58 yongari Exp $
+ * $FreeBSD: src/sys/dev/et/if_etreg.h,v 1.4 2010/07/30 17:51:22 delphij Exp $
  */
 /*-
  * Portions of this code is derived from NetBSD which is covered by

==== //depot/projects/soc2009/anchie_send/src/sys/dev/et/if_etvar.h#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
+ * Copyright (c) 2007 Sepherosa Ziehau.  All rights reserved.
  *
  * This code is derived from software contributed to The DragonFly Project
  * by Sepherosa Ziehau 
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  * $DragonFly: src/sys/dev/netif/et/if_etvar.h,v 1.4 2007/10/23 14:28:42 sephe Exp $
- * $FreeBSD: src/sys/dev/et/if_etvar.h,v 1.7 2009/11/20 20:33:59 yongari Exp $
+ * $FreeBSD: src/sys/dev/et/if_etvar.h,v 1.8 2010/07/30 17:51:22 delphij Exp $
  */
 
 #ifndef _IF_ETVAR_H

==== //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.c#7 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_core.c,v 1.11 2010/07/13 19:37:45 gnn Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/hwpmc/hwpmc_core.c,v 1.12 2010/07/29 17:52:23 gnn Exp $");
 
 #include 
 #include 
@@ -168,13 +168,13 @@
 	core_ri = md->pmd_classdep[PMC_MDEP_CLASS_INDEX_IAP].pcd_ri;
 
 	for (n = 0; n < npmc; n++) {
-		msr = rdmsr(IAP_EVSEL0 + n);
-		wrmsr(IAP_EVSEL0 + n, msr & ~IAP_EVSEL_MASK);
+		msr = rdmsr(IAP_EVSEL0 + n) & ~IAP_EVSEL_MASK;
+		wrmsr(IAP_EVSEL0 + n, msr);
 	}
 
 	if (core_cputype != PMC_CPU_INTEL_CORE) {
-		msr = rdmsr(IAF_CTRL);
-		wrmsr(IAF_CTRL, msr & ~IAF_CTRL_MASK);
+		msr = rdmsr(IAF_CTRL) & ~IAF_CTRL_MASK;
+		wrmsr(IAF_CTRL, msr);
 		npmc += md->pmd_classdep[PMC_MDEP_CLASS_INDEX_IAF].pcd_num;
 	}
 
@@ -392,13 +392,13 @@
 
 	iafc->pc_iafctrl |= pm->pm_md.pm_iaf.pm_iaf_ctrl;
 
- 	msr = rdmsr(IAF_CTRL);
+ 	msr = rdmsr(IAF_CTRL) & ~IAF_CTRL_MASK;
  	wrmsr(IAF_CTRL, msr | (iafc->pc_iafctrl & IAF_CTRL_MASK));
 
 	do {
 		iafc->pc_resync = 0;
 		iafc->pc_globalctrl |= (1ULL << (ri + IAF_OFFSET));
- 		msr = rdmsr(IA_GLOBAL_CTRL);
+ 		msr = rdmsr(IA_GLOBAL_CTRL) & ~IAF_GLOBAL_CTRL_MASK;
  		wrmsr(IA_GLOBAL_CTRL, msr | (iafc->pc_globalctrl & 
  					     IAF_GLOBAL_CTRL_MASK));
 	} while (iafc->pc_resync != 0);
@@ -434,13 +434,13 @@
 	iafc->pc_iafctrl &= ~fc;
 
 	PMCDBG(MDP,STO,1,"iaf-stop iafctrl=%x", iafc->pc_iafctrl);
- 	msr = rdmsr(IAF_CTRL);
+ 	msr = rdmsr(IAF_CTRL) & ~IAF_CTRL_MASK;
  	wrmsr(IAF_CTRL, msr | (iafc->pc_iafctrl & IAF_CTRL_MASK));
 
 	do {
 		iafc->pc_resync = 0;
 		iafc->pc_globalctrl &= ~(1ULL << (ri + IAF_OFFSET));
- 		msr = rdmsr(IA_GLOBAL_CTRL);
+ 		msr = rdmsr(IA_GLOBAL_CTRL) & ~IAF_GLOBAL_CTRL_MASK;
  		wrmsr(IA_GLOBAL_CTRL, msr | (iafc->pc_globalctrl &
  					     IAF_GLOBAL_CTRL_MASK));
 	} while (iafc->pc_resync != 0);
@@ -473,10 +473,14 @@
 	if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm)))
 		v = iaf_reload_count_to_perfctr_value(v);
 
-	msr = rdmsr(IAF_CTRL);
-	wrmsr(IAF_CTRL, msr & ~IAF_CTRL_MASK);
+	/* Turn off fixed counters */
+	msr = rdmsr(IAF_CTRL) & ~IAF_CTRL_MASK;
+	wrmsr(IAF_CTRL, msr); 
+
 	wrmsr(IAF_CTR0 + ri, v & ((1ULL << core_iaf_width) - 1));
-	msr = rdmsr(IAF_CTRL);
+
+	/* Turn on fixed counters */
+	msr = rdmsr(IAF_CTRL) & ~IAF_CTRL_MASK;
 	wrmsr(IAF_CTRL, msr | (cc->pc_iafctrl & IAF_CTRL_MASK));
 
 	PMCDBG(MDP,WRI,1, "iaf-write cpu=%d ri=%d msr=0x%x v=%jx iafctrl=%jx "
@@ -1910,15 +1914,17 @@
 
 	PMCDBG(MDP,STO,1, "iap-stop cpu=%d ri=%d", cpu, ri);
 
-	msr = rdmsr(IAP_EVSEL0 + ri);
-	wrmsr(IAP_EVSEL0 + ri, msr & IAP_EVSEL_MASK);	/* stop hw */
+	msr = rdmsr(IAP_EVSEL0 + ri) & ~IAP_EVSEL_MASK;
+	wrmsr(IAP_EVSEL0 + ri, msr);	/* stop hw */
 
 	if (core_cputype == PMC_CPU_INTEL_CORE)
 		return (0);
 
+	msr = 0;
 	do {
 		cc->pc_resync = 0;
 		cc->pc_globalctrl &= ~(1ULL << ri);
+		msr = rdmsr(IA_GLOBAL_CTRL) & ~IA_GLOBAL_CTRL_MASK;
 		wrmsr(IA_GLOBAL_CTRL, cc->pc_globalctrl);
 	} while (cc->pc_resync != 0);
 
@@ -2004,7 +2010,7 @@
 	struct pmc *pm;
 	struct core_cpu *cc;
 	int error, found_interrupt, ri;
-	uint64_t msr = 0;
+	uint64_t msr;
 
 	PMCDBG(MDP,INT, 1, "cpu=%d tf=0x%p um=%d", cpu, (void *) tf,
 	    TRAPF_USERMODE(tf));
@@ -2036,15 +2042,15 @@
 		 * Stop the counter, reload it but only restart it if
 		 * the PMC is not stalled.
 		 */
-		msr = rdmsr(IAP_EVSEL0 + ri);
-		wrmsr(IAP_EVSEL0 + ri, msr & ~IAP_EVSEL_MASK);
+		msr = rdmsr(IAP_EVSEL0 + ri) & ~IAP_EVSEL_MASK;
+		wrmsr(IAP_EVSEL0 + ri, msr);
 		wrmsr(IAP_PMC0 + ri, v);
 
 		if (error)
 			continue;
 
-		wrmsr(IAP_EVSEL0 + ri,
-		    pm->pm_md.pm_iap.pm_iap_evsel | IAP_EN);
+		wrmsr(IAP_EVSEL0 + ri, msr | (pm->pm_md.pm_iap.pm_iap_evsel | 
+					      IAP_EN));
 	}
 
 	if (found_interrupt)
@@ -2060,7 +2066,7 @@
 core2_intr(int cpu, struct trapframe *tf)
 {
 	int error, found_interrupt, n;
-	uint64_t flag, intrstatus, intrenable;
+	uint64_t flag, intrstatus, intrenable, msr;
 	struct pmc *pm;
 	struct core_cpu *cc;
 	pmc_value_t v;
@@ -2091,7 +2097,8 @@
 	/*
 	 * Stop PMCs and clear overflow status bits.
 	 */
-	wrmsr(IA_GLOBAL_CTRL, 0);
+	msr = rdmsr(IA_GLOBAL_CTRL) & ~IA_GLOBAL_CTRL_MASK;
+	wrmsr(IA_GLOBAL_CTRL, msr);
 	wrmsr(IA_GLOBAL_OVF_CTRL, intrenable |
 	    IA_GLOBAL_STATUS_FLAG_OVFBUF |
 	    IA_GLOBAL_STATUS_FLAG_CONDCHG);
@@ -2162,7 +2169,7 @@
 
 	cc->pc_globalctrl |= intrenable;
 
-	wrmsr(IA_GLOBAL_CTRL, cc->pc_globalctrl);
+	wrmsr(IA_GLOBAL_CTRL, cc->pc_globalctrl & IA_GLOBAL_CTRL_MASK);
 
 	PMCDBG(MDP,INT, 1, "cpu=%d fixedctrl=%jx globalctrl=%jx status=%jx "
 	    "ovf=%jx", cpu, (uintmax_t) rdmsr(IAF_CTRL),

==== //depot/projects/soc2009/anchie_send/src/sys/dev/hwpmc/hwpmc_core.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/hwpmc/hwpmc_core.h,v 1.3 2010/07/13 19:37:45 gnn Exp $
+ * $FreeBSD: src/sys/dev/hwpmc/hwpmc_core.h,v 1.4 2010/07/29 17:52:23 gnn Exp $
  */
 
 #ifndef _DEV_HWPMC_CORE_H_
@@ -144,6 +144,12 @@
 /* The mask is only for the fixed porttion of the register. */
 #define	IAF_GLOBAL_CTRL_MASK			0x0000000700000000
 
+/* The mask is only for the programmable porttion of the register. */
+#define IAP_GLOBAL_CTRL_MASK			0x00000000ffffffff
+
+/* The mask is for both the fixed and programmable porttions of the register. */
+#define IA_GLOBAL_CTRL_MASK			0x00000007ffffffff
+
 #define	IA_GLOBAL_OVF_CTRL			0x390
 
 #define	IA_GLOBAL_STATUS_FLAG_CONDCHG		(1ULL << 63)

==== //depot/projects/soc2009/anchie_send/src/sys/dev/ipmi/ipmi_smbios.c#3 (text) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_smbios.c,v 1.6 2010/07/14 18:06:21 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ipmi/ipmi_smbios.c,v 1.7 2010/07/29 13:46:37 jhb Exp $");
 
 #include 
 #include 
@@ -189,7 +189,7 @@
 		 * formatted area of this structure.
 		 */
 		p += s->length;
-		while (p[0] != 0 && p[1] != 0)
+		while (!(p[0] == 0 && p[1] == 0))
 			p++;
 
 		/*

==== //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci.c#7 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.399 2010/06/14 07:10:37 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.400 2010/07/29 20:42:38 yongari Exp $");
 
 #include "opt_bus.h"
 
@@ -450,12 +450,12 @@
 static void
 pci_fixancient(pcicfgregs *cfg)
 {
-	if (cfg->hdrtype != 0)
+	if ((cfg->hdrtype & PCIM_HDRTYPE) != PCIM_HDRTYPE_NORMAL)
 		return;
 
 	/* PCI to PCI bridges use header type 1 */
 	if (cfg->baseclass == PCIC_BRIDGE && cfg->subclass == PCIS_BRIDGE_PCI)
-		cfg->hdrtype = 1;
+		cfg->hdrtype = PCIM_HDRTYPE_BRIDGE;
 }
 
 /* extract header type specific config data */
@@ -464,16 +464,16 @@
 pci_hdrtypedata(device_t pcib, int b, int s, int f, pcicfgregs *cfg)
 {
 #define	REG(n, w)	PCIB_READ_CONFIG(pcib, b, s, f, n, w)
-	switch (cfg->hdrtype) {
-	case 0:
+	switch (cfg->hdrtype & PCIM_HDRTYPE) {
+	case PCIM_HDRTYPE_NORMAL:
 		cfg->subvendor      = REG(PCIR_SUBVEND_0, 2);
 		cfg->subdevice      = REG(PCIR_SUBDEV_0, 2);
 		cfg->nummaps	    = PCI_MAXMAPS_0;
 		break;
-	case 1:
+	case PCIM_HDRTYPE_BRIDGE:
 		cfg->nummaps	    = PCI_MAXMAPS_1;
 		break;
-	case 2:
+	case PCIM_HDRTYPE_CARDBUS:
 		cfg->subvendor      = REG(PCIR_SUBVEND_2, 2);
 		cfg->subdevice      = REG(PCIR_SUBDEV_2, 2);
 		cfg->nummaps	    = PCI_MAXMAPS_2;
@@ -569,11 +569,11 @@
 	int	ptr, nextptr, ptrptr;
 
 	switch (cfg->hdrtype & PCIM_HDRTYPE) {
-	case 0:
-	case 1:
+	case PCIM_HDRTYPE_NORMAL:
+	case PCIM_HDRTYPE_BRIDGE:
 		ptrptr = PCIR_CAP_PTR;
 		break;
-	case 2:
+	case PCIM_HDRTYPE_CARDBUS:
 		ptrptr = PCIR_CAP_PTR_2;	/* cardbus capabilities ptr */
 		break;
 	default:
@@ -660,7 +660,8 @@
 			break;
 		case PCIY_SUBVENDOR:
 			/* Should always be true. */
-			if ((cfg->hdrtype & PCIM_HDRTYPE) == 1) {
+			if ((cfg->hdrtype & PCIM_HDRTYPE) ==
+			    PCIM_HDRTYPE_BRIDGE) {
 				val = REG(ptr + PCIR_SUBVENDCAP_ID, 4);
 				cfg->subvendor = val & 0xffff;
 				cfg->subdevice = val >> 16;
@@ -674,7 +675,8 @@
 			 * PCI-express or HT chipsets might match on
 			 * this check as well.
 			 */
-			if ((cfg->hdrtype & PCIM_HDRTYPE) == 1)
+			if ((cfg->hdrtype & PCIM_HDRTYPE) ==
+			    PCIM_HDRTYPE_BRIDGE)
 				pcix_chipset = 1;
 			break;
 		case PCIY_EXPRESS:	/* PCI-express */
@@ -1117,11 +1119,11 @@
 	 * Determine the start pointer of the capabilities list.
 	 */
 	switch (cfg->hdrtype & PCIM_HDRTYPE) {
-	case 0:
-	case 1:
+	case PCIM_HDRTYPE_NORMAL:
+	case PCIM_HDRTYPE_BRIDGE:
 		ptr = PCIR_CAP_PTR;
 		break;
-	case 2:
+	case PCIM_HDRTYPE_CARDBUS:
 		ptr = PCIR_CAP_PTR_2;
 		break;
 	default:
@@ -2947,7 +2949,9 @@
 	for (i = 0; acpi_dev && i < numdevs; i++) {
 		child = devlist[i];
 		dinfo = (struct pci_devinfo *) device_get_ivars(child);
-		if (device_is_attached(child) && dinfo->cfg.hdrtype == 0) {
+		if (device_is_attached(child) &&
+		    (dinfo->cfg.hdrtype & PCIM_HDRTYPE) ==
+		    PCIM_HDRTYPE_NORMAL) {
 			dstate = PCI_POWERSTATE_D3;
 			ACPI_PWR_FOR_SLEEP(acpi_dev, child, &dstate);
 			pci_set_powerstate(child, dstate);
@@ -2981,7 +2985,8 @@
 		child = devlist[i];
 		dinfo = (struct pci_devinfo *) device_get_ivars(child);
 		if (acpi_dev && device_is_attached(child) &&
-		    dinfo->cfg.hdrtype == 0) {
+		    (dinfo->cfg.hdrtype & PCIM_HDRTYPE) ==
+		    PCIM_HDRTYPE_NORMAL) {
 			ACPI_PWR_FOR_SLEEP(acpi_dev, child, NULL);
 			pci_set_powerstate(child, PCI_POWERSTATE_D0);
 		}
@@ -4014,7 +4019,7 @@
 	 * Other types are unknown, and we err on the side of safety
 	 * by ignoring them.
 	 */
-	if (dinfo->cfg.hdrtype != 0)
+	if ((dinfo->cfg.hdrtype & PCIM_HDRTYPE) != PCIM_HDRTYPE_NORMAL)
 		return;
 
 	/*
@@ -4062,7 +4067,7 @@
 	 * we err on the side of safety by ignoring them.  Powering down
 	 * bridges should not be undertaken lightly.
 	 */
-	if (dinfo->cfg.hdrtype != 0)
+	if ((dinfo->cfg.hdrtype & PCIM_HDRTYPE) != PCIM_HDRTYPE_NORMAL)
 		return;
 	for (i = 0; i < dinfo->cfg.nummaps; i++)
 		dinfo->cfg.bar[i] = pci_read_config(dev, PCIR_BAR(i), 4);

==== //depot/projects/soc2009/anchie_send/src/sys/dev/pci/pci_user.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.28 2009/09/11 18:48:49 avg Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.29 2010/07/29 06:27:41 neel Exp $");
 
 #include "opt_bus.h"	/* XXX trim includes */
 #include "opt_compat.h"
@@ -735,6 +735,16 @@
 			bio->pbi_enabled = (value & PCIM_CMD_PORTEN) != 0;
 		error = 0;
 		break;
+	case PCIOCATTACHED:
+		error = 0;
+		io = (struct pci_io *)data;
+		pcidev = pci_find_dbsf(io->pi_sel.pc_domain, io->pi_sel.pc_bus,
+				       io->pi_sel.pc_dev, io->pi_sel.pc_func);
+		if (pcidev != NULL)
+			io->pi_data = device_is_attached(pcidev);
+		else
+			error = ENODEV;
+		break;
 	default:
 		error = ENOTTY;
 		break;

==== //depot/projects/soc2009/anchie_send/src/sys/dev/usb/quirk/usb_quirk.c#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/quirk/usb_quirk.c,v 1.21 2010/07/27 17:07:16 gavin Exp $ */
+/* $FreeBSD: src/sys/dev/usb/quirk/usb_quirk.c,v 1.22 2010/07/28 18:56:01 tijl Exp $ */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.

>>> TRUNCATED FOR MAIL (1000 lines) <<<