From owner-p4-projects@FreeBSD.ORG Sun Mar 8 02:47:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2D3C1065673; Sun, 8 Mar 2009 02:47: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 7073F106566C for ; Sun, 8 Mar 2009 02:47:42 +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 5D8908FC0C for ; Sun, 8 Mar 2009 02:47:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n282lgur046897 for ; Sun, 8 Mar 2009 02:47:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n282lg8n046895 for perforce@freebsd.org; Sun, 8 Mar 2009 02:47:42 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 8 Mar 2009 02:47:42 GMT Message-Id: <200903080247.n282lg8n046895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 158847 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, 08 Mar 2009 02:47:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=158847 Change 158847 by pgj@petymeg on 2009/03/08 02:46:58 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#7 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#14 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#41 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#7 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.91 2009/03/05 18:51:31 danger Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.93 2009/03/06 04:41:39 brooks Exp $ @@ -739,48 +739,6 @@ screen.

- - Improving the USB stack in FreeBSD - - -

Technical contact: Luigi Rizzo

- -

The USB stack in FreeBSD suffers from a few problems, including - lack of functionality (e.g. isochronous support for USB2 devices), - lack of documentation (most of the code is undocumented and - derives from other BSD implementations), lack of support (there - is not, to our knowledge, active development of the stack), - and the fact that it is still running under the Giant lock.

- -

There is an alternate USB stack under development but it also - suffers from its own share of problems: while it supports - isochronous transfers for USB2 and does not run under Giant, it is - also almost completely undocumented, and it exports a different API - from the current one, which in turn causes portability problems for - device drivers that run on top of USB. Additionally, it is not in - widespread use.

- -

The goal of this project is to improve the FreeBSD stack in one - of the following ways:

- -
    -
  • Add documentation and isochronous USB2 transfers to the existing - driver. Documentation also includes a detailed description of the - locking requirements to ease the move to a different locking - architecture;
    • -
  • Add documentation and a compatibility layer to the 'new' usb - stack, and verify that the basic functionality is preserved for - widely used drivers (umass, mouse, keyboard, etc.). - This work will likely require some debugging of the new code - which we expect to be less tested than the existing one, and so - more prone to undetected bugs.
    • -
- -

The production of suitable documentation in the source is a key - requirement of the project.

- - - PCI-Hotplug support @@ -1410,7 +1368,7 @@ - + Ports license auditing infrastructure @@ -1601,7 +1559,7 @@ - + NFSv4 ACLs @@ -2120,7 +2078,7 @@ - + SNTP

Technical contact: %developers; ]> - + @@ -106,6 +106,7 @@   (Summer of Code) (Summer of Code 2007) + (Summer of Code 2008) @@ -126,6 +127,7 @@

+ Part of Summer of Code 2008 Part of Summer of Code 2007 Suggested Summer of Code 2009 project idea ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#14 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.68 2009/02/22 02:10:57 jkoshy Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.69 2009/03/06 11:58:35 blackend Exp $ @@ -140,6 +140,33 @@ shared with the widest possible audience. + + Solutions Linux 2009 + http://www.solutionslinux.fr/ + + 2009 + 3 + 31 + + + 2009 + 4 + 2 + + + France + Paris + Paris Expo +
Porte de Versailles
+ + A 3 days event to promote GNU/Linux and Open Source + Software to companies. As usual, a French &os; User Group will + be there + to promote &os;. The access to the event is free of + charge. + + FreeBSD Kernel Internals: Intensive Evening Course http://www.mckusick.com/courses/adveveclass.html ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#41 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.230 2009/03/05 21:57:57 dhn Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.231 2009/03/07 16:04:16 jkois Exp $ @@ -44,11 +44,6 @@ - - - - 3 - 1 From owner-p4-projects@FreeBSD.ORG Sun Mar 8 05:06:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2250B1065679; Sun, 8 Mar 2009 05:06:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5615106566C for ; Sun, 8 Mar 2009 05:06:07 +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 A3D348FC14 for ; Sun, 8 Mar 2009 05:06:07 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n285677w070522 for ; Sun, 8 Mar 2009 05:06:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n28567Lj070519 for perforce@freebsd.org; Sun, 8 Mar 2009 05:06:07 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 8 Mar 2009 05:06:07 GMT Message-Id: <200903080506.n28567Lj070519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 158850 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, 08 Mar 2009 05:06:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=158850 Change 158850 by pgj@petymeg on 2009/03/08 05:06:06 MFen (www): 1.230 -> 1.231 hu/share/sgml/news.xml 1.68 -> 1.69 hu/share/sgml/events.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#4 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#2 (text+ko) ==== @@ -10,7 +10,7 @@ @@ -173,6 +173,36 @@ közönségre. + + Solutions Linux 2009 + http://www.solutionslinux.fr + + 2009 + 3 + 31 + + + 2009 + 4 + 2 + + + Franciaország + Párizs + Paris Expo +
Porte de Versailles
+ + A GNU/Linux rendszereket és a nyílt + forráskódot elsõsorban vállalatok + számára hirdetõ háromnapos + rendezvény. A szokásos módon + természetesen a &os; képviseletében jelen + lesz a Francia &os; Felhasználók Csoportja. A + rendezvény ingyenesen + látogatható. + + A &os; rendszermag belülrõl: intenzív estis elõadások ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#4 (text+ko) ==== @@ -5,7 +5,7 @@ From owner-p4-projects@FreeBSD.ORG Sun Mar 8 20:41:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7718A106566C; Sun, 8 Mar 2009 20:41:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 386BD106566B for ; Sun, 8 Mar 2009 20:41:59 +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 258198FC13 for ; Sun, 8 Mar 2009 20:41:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n28Kfxe6009888 for ; Sun, 8 Mar 2009 20:41:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n28KfwFq009886 for perforce@freebsd.org; Sun, 8 Mar 2009 20:41:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Mar 2009 20:41:58 GMT Message-Id: <200903082041.n28KfwFq009886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 158868 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, 08 Mar 2009 20:42:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=158868 Change 158868 by hselasky@hselasky_laptop001 on 2009/03/08 20:41:05 USB CORE: Fix bugs and improve HID parsing. - fix possible memory leak found - fix possible NULL pointer access - fix possible invalid memory read - parsing improvements - reset item data position when a new report ID is detected. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#18 (text+ko) ==== @@ -57,19 +57,25 @@ #include static void hid_clear_local(struct hid_item *); +static uint8_t hid_get_byte(struct hid_data *s, const uint16_t wSize); -#define MAXUSAGE 100 +#define MAXUSAGE 64 +#define MAXPUSH 4 struct hid_data { const uint8_t *start; const uint8_t *end; const uint8_t *p; - struct hid_item cur; - int32_t usages[MAXUSAGE]; - int nu; - int minset; - int multi; - int multimax; + struct hid_item cur[MAXPUSH]; + int32_t usages_min[MAXUSAGE]; + int32_t usages_max[MAXUSAGE]; int kindset; + uint8_t pushlevel; /* current pushlevel */ + uint8_t ncount; /* end usage item count */ + uint8_t icount; /* current usage item count */ + uint8_t nusage; /* end "usages_min/max" index */ + uint8_t iusage; /* current "usages_min/max" index */ + uint8_t ousage; /* current "usages_min/max" offset */ + uint8_t susage; /* usage set flags */ }; /*------------------------------------------------------------------------* @@ -79,6 +85,8 @@ hid_clear_local(struct hid_item *c) { + c->loc.count = 0; + c->loc.size = 0; c->usage = 0; c->usage_minimum = 0; c->usage_maximum = 0; @@ -99,6 +107,12 @@ { struct hid_data *s; + if ((kindset-1) & kindset) { + DPRINTFN(0, "Only one bit can be " + "set in the kindset\n"); + return (NULL); + } + s = malloc(sizeof *s, M_TEMP, M_WAITOK | M_ZERO); s->start = s->p = d; s->end = ((const uint8_t *)d) + len; @@ -112,14 +126,40 @@ void hid_end_parse(struct hid_data *s) { + if (s == NULL) + return; + + free(s, M_TEMP); +} - while (s->cur.next != NULL) { - struct hid_item *hi = s->cur.next->next; +/*------------------------------------------------------------------------* + * get byte from HID descriptor + *------------------------------------------------------------------------*/ +static uint8_t +hid_get_byte(struct hid_data *s, const uint16_t wSize) +{ + const uint8_t *ptr; + uint8_t retval; + + ptr = s->p; + + /* check if end is reached */ + if (ptr == s->end) + return (0); + + /* read out a byte */ + retval = *ptr; + + /* check if data pointer can be advanced by "wSize" bytes */ + if ((s->end - ptr) < wSize) + ptr = s->end; + else + ptr += wSize; + + /* update pointer */ + s->p = ptr; - free(s->cur.next, M_TEMP); - s->cur.next = hi; - } - free(s, M_TEMP); + return (retval); } /*------------------------------------------------------------------------* @@ -128,44 +168,61 @@ int hid_get_item(struct hid_data *s, struct hid_item *h) { - struct hid_item *c = &s->cur; + struct hid_item *c; unsigned int bTag, bType, bSize; uint32_t oldpos; - const uint8_t *data; + int32_t mask; int32_t dval; - const uint8_t *p; - struct hid_item *hi; - int i; + + if (s == NULL) + return (0); + + c = &s->cur[s->pushlevel]; -top: - if (s->multimax != 0) { - if (s->multi < s->multimax) { - c->usage = s->usages[MIN(s->multi, s->nu - 1)]; - s->multi++; + top: + /* check if there is an array of items */ + if ((s->icount != s->ncount) && + (s->iusage != s->nusage)) { + dval = s->usages_min[s->iusage] + s->ousage; + c->usage = dval; + if (dval == s->usages_max[s->iusage]) { + s->iusage ++; + s->ousage = 0; + } else { + s->ousage ++; + } + s->icount ++; + /* + * Only copy HID item, increment position and return + * if correct kindset! + */ + if (s->kindset & (1 << c->kind)) { *h = *c; - c->loc.pos += c->loc.size; - h->next = 0; + DPRINTFN(1, "%u,%u,%u\n", h->loc.pos, + h->loc.size, h->loc.count); + c->loc.pos += c->loc.size * c->loc.count; return (1); - } else { - c->loc.count = s->multimax; - s->multimax = 0; - s->nu = 0; - hid_clear_local(c); } } - for (;;) { - p = s->p; - if ((p >= s->end) || (p < s->start)) - return (0); + + /* reset state variables */ + s->icount = 0; + s->ncount = 0; + s->iusage = 0; + s->nusage = 0; + s->susage = 0; + s->ousage = 0; + hid_clear_local(c); + + /* get next item */ + while (s->p != s->end) { - bSize = *p++; + bSize = hid_get_byte(s, 1); if (bSize == 0xfe) { /* long item */ - bSize = *p++; - bSize |= *p++ << 8; - bTag = *p++; - data = p; - p += bSize; + bSize = hid_get_byte(s, 1); + bSize |= hid_get_byte(s, 1) << 8; + bTag = hid_get_byte(s, 1); bType = 0xff; /* XXX what should it be */ } else { /* short item */ @@ -174,30 +231,33 @@ bSize &= 3; if (bSize == 3) bSize = 4; - data = p; - p += bSize; } - s->p = p; switch (bSize) { case 0: dval = 0; + mask = 0; break; case 1: - dval = (int8_t)*data++; + dval = (int8_t)hid_get_byte(s, 1); + mask = 0xFF; break; case 2: - dval = *data++; - dval |= *data++ << 8; + dval = hid_get_byte(s, 1); + dval |= hid_get_byte(s, 1) << 8; dval = (int16_t)dval; + mask = 0xFFFF; break; case 4: - dval = *data++; - dval |= *data++ << 8; - dval |= *data++ << 16; - dval |= *data++ << 24; + dval = hid_get_byte(s, 1); + dval |= hid_get_byte(s, 1) << 8; + dval |= hid_get_byte(s, 1) << 16; + dval |= hid_get_byte(s, 1) << 24; + mask = 0xFFFFFFFF; break; default: - printf("BAD LENGTH %d\n", bSize); + dval = hid_get_byte(s, bSize); + DPRINTFN(0, "bad length %u (data=0x%02x)\n", + bSize, dval); continue; } @@ -205,44 +265,35 @@ case 0: /* Main */ switch (bTag) { case 8: /* Input */ - if (!(s->kindset & (1 << hid_input))) { - if (s->nu > 0) - s->nu--; - continue; - } c->kind = hid_input; c->flags = dval; ret: if (c->flags & HIO_VARIABLE) { - s->multimax = c->loc.count; - s->multi = 0; + /* range check usage count */ + if (c->loc.count > 255) { + DPRINTFN(0, "Number of " + "items truncated to 255\n"); + s->ncount = 255; + } else + s->ncount = c->loc.count; + + /* + * The "top" loop will return + * one and one item: + */ c->loc.count = 1; - if (s->minset) { - for (i = c->usage_minimum; - i <= c->usage_maximum; - i++) { - s->usages[s->nu] = i; - if (s->nu < MAXUSAGE - 1) - s->nu++; - } - s->minset = 0; + } else { + /* make sure we have a usage */ + if (s->nusage == 0) { + s->usages_min[s->nusage] = 0; + s->usages_max[s->nusage] = 0; + s->nusage = 1; } - goto top; - } else { - *h = *c; - h->next = 0; - c->loc.pos += - c->loc.size * c->loc.count; - hid_clear_local(c); - s->minset = 0; - return (1); + s->ncount = 1; } + goto top; + case 9: /* Output */ - if (!(s->kindset & (1 << hid_output))) { - if (s->nu > 0) - s->nu--; - continue; - } c->kind = hid_output; c->flags = dval; goto ret; @@ -251,27 +302,22 @@ c->collection = dval; c->collevel++; *h = *c; - hid_clear_local(c); - s->nu = 0; return (1); case 11: /* Feature */ - if (!(s->kindset & (1 << hid_feature))) { - if (s->nu > 0) - s->nu--; - continue; - } c->kind = hid_feature; c->flags = dval; goto ret; case 12: /* End collection */ c->kind = hid_endcollection; + if (c->collevel == 0) { + DPRINTFN(0, "invalid end collection\n"); + return (0); + } c->collevel--; *h = *c; - hid_clear_local(c); - s->nu = 0; return (1); default: - printf("Main bTag=%d\n", bTag); + DPRINTFN(0, "Main bTag=%d\n", bTag); break; } break; @@ -303,53 +349,88 @@ break; case 8: c->report_ID = dval; + /* new report - reset position */ + c->loc.pos = 0; break; case 9: c->loc.count = dval; break; case 10: /* Push */ - hi = malloc(sizeof *hi, M_TEMP, M_WAITOK); - *hi = s->cur; - c->next = hi; + s->pushlevel ++; + if (s->pushlevel < MAXPUSH) { + s->cur[s->pushlevel] = *c; + c = &s->cur[s->pushlevel]; + } else { + DPRINTFN(0, "Cannot push " + "item @ %d!\n", s->pushlevel); + } break; case 11: /* Pop */ - hi = c->next; - oldpos = c->loc.pos; - s->cur = *hi; - c->loc.pos = oldpos; - free(hi, M_TEMP); + s->pushlevel --; + if (s->pushlevel < MAXPUSH) { + /* preserve position */ + oldpos = c->loc.pos; + c = &s->cur[s->pushlevel]; + c->loc.pos = oldpos; + } else { + DPRINTFN(0, "Cannot pop " + "item @ %d!\n", s->pushlevel); + } break; default: - printf("Global bTag=%d\n", bTag); + DPRINTFN(0, "Global bTag=%d\n", bTag); break; } break; case 2: /* Local */ switch (bTag) { case 0: - if (bSize == 1) - dval = c->_usage_page | (dval & 0xff); - else if (bSize == 2) - dval = c->_usage_page | (dval & 0xffff); - c->usage = dval; - if (s->nu < MAXUSAGE) - s->usages[s->nu++] = dval; - /* else XXX */ + if (bSize != 4) + dval = (dval & mask) | c->_usage_page; + + if (s->nusage < MAXUSAGE) { + s->usages_min[s->nusage] = dval; + s->usages_max[s->nusage] = dval; + s->nusage ++; + } else { + DPRINTFN(0, "max usage reached!\n"); + } + + /* clear any pending usage sets */ + s->susage = 0; break; case 1: - s->minset = 1; - if (bSize == 1) - dval = c->_usage_page | (dval & 0xff); - else if (bSize == 2) - dval = c->_usage_page | (dval & 0xffff); + s->susage |= 1; + + if (bSize != 4) + dval = (dval & mask) | c->_usage_page; c->usage_minimum = dval; - break; + + goto check_set; case 2: - if (bSize == 1) - dval = c->_usage_page | (dval & 0xff); - else if (bSize == 2) - dval = c->_usage_page | (dval & 0xffff); + s->susage |= 2; + + if (bSize != 4) + dval = (dval & mask) | c->_usage_page; c->usage_maximum = dval; + + check_set: + if (s->susage != 3) + break; + + /* sanity check */ + if ((s->nusage < MAXUSAGE) && + (c->usage_minimum < c->usage_maximum)) { + /* add usage range */ + s->usages_min[s->nusage] = + c->usage_minimum; + s->usages_max[s->nusage] = + c->usage_maximum; + s->nusage ++; + } else { + DPRINTFN(0, "Usage set dropped!\n"); + } + s->susage = 0; break; case 3: c->designator_index = dval; @@ -373,15 +454,16 @@ c->set_delimiter = dval; break; default: - printf("Local bTag=%d\n", bTag); + DPRINTFN(0, "Local bTag=%d\n", bTag); break; } break; default: - printf("default bType=%d\n", bType); + DPRINTFN(0, "default bType=%d\n", bType); break; } } + return (0); } /*------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#13 (text+ko) ==== @@ -70,8 +70,6 @@ uint32_t flags; /* Location */ struct hid_location loc; - /* */ - struct hid_item *next; }; /* prototypes from "usb2_hid.c" */ From owner-p4-projects@FreeBSD.ORG Sun Mar 8 20:55:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0365710656FF; Sun, 8 Mar 2009 20:55: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 B178B10656FE for ; Sun, 8 Mar 2009 20:55:12 +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 9F1AE8FC19 for ; Sun, 8 Mar 2009 20:55:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n28KtC0g020640 for ; Sun, 8 Mar 2009 20:55:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n28KtCJ8020638 for perforce@freebsd.org; Sun, 8 Mar 2009 20:55:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Mar 2009 20:55:12 GMT Message-Id: <200903082055.n28KtCJ8020638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 158869 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, 08 Mar 2009 20:55:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=158869 Change 158869 by hselasky@hselasky_laptop001 on 2009/03/08 20:54:31 USB serial: Fix sael init code. Reported by: Alberto Mijares Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#3 (text+ko) ==== @@ -299,6 +299,7 @@ }; struct usb2_device_request req; + usb2_error_t err; uint16_t len; uint8_t buf[0x300]; uint8_t n; @@ -320,25 +321,28 @@ DPRINTFN(0, "too small buffer\n"); continue; } - if (usb2_do_request(udev, NULL, &req, buf)) { - DPRINTFN(0, "request %u failed\n", - (unsigned int)n); - break; - } + err = usb2_do_request(udev, NULL, &req, buf); } else { if (len > (sizeof(setup[0]) - 8)) { DPRINTFN(0, "too small buffer\n"); continue; } - if (usb2_do_request(udev, NULL, &req, - __DECONST(uint8_t *, &setup[n][8]))) { - DPRINTFN(0, "request %u failed\n", - (unsigned int)n); + err = usb2_do_request(udev, NULL, &req, + __DECONST(uint8_t *, &setup[n][8])); + } + if (err) { + DPRINTFN(1, "request %u failed\n", + (unsigned int)n); + /* + * Some of the requests will fail. Stop doing + * requests when we are getting timeouts so + * that we don't block the explore/attach + * thread forever. + */ + if (err == USB_ERR_TIMEOUT) break; - } } } - return; } static int From owner-p4-projects@FreeBSD.ORG Mon Mar 9 12:53:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 177FB1065670; Mon, 9 Mar 2009 12:53: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 CAFE91065673 for ; Mon, 9 Mar 2009 12:53:45 +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 B73748FC1A for ; Mon, 9 Mar 2009 12:53:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n29Crjsg076262 for ; Mon, 9 Mar 2009 12:53:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n29Crjeo076260 for perforce@freebsd.org; Mon, 9 Mar 2009 12:53:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 9 Mar 2009 12:53:45 GMT Message-Id: <200903091253.n29Crjeo076260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 158916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 12:53:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=158916 Change 158916 by hselasky@hselasky_laptop001 on 2009/03/09 12:53:04 USB input: USB mouse patch to address complicated data reporting descriptors. Reported by: Boris Kotzev Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#4 (text+ko) ==== @@ -117,6 +117,12 @@ uint8_t sc_buttons; uint8_t sc_iid; + uint8_t sc_iid_w; + uint8_t sc_iid_x; + uint8_t sc_iid_y; + uint8_t sc_iid_z; + uint8_t sc_iid_t; + uint8_t sc_iid_btn[UMS_BUTTON_MAX]; uint8_t sc_temp[64]; }; @@ -168,6 +174,7 @@ int32_t dz; int32_t dt; uint8_t i; + uint8_t id; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -190,42 +197,14 @@ (len > 4) ? buf[4] : 0, (len > 5) ? buf[5] : 0, (len > 6) ? buf[6] : 0, (len > 7) ? buf[7] : 0); - /* - * The M$ Wireless Intellimouse 2.0 sends 1 extra - * leading byte of data compared to most USB - * mice. This byte frequently switches from 0x01 - * (usual state) to 0x02. I assume it is to allow - * extra, non-standard, reporting (say battery-life). - * - * However at the same time it generates a left-click - * message on the button byte which causes spurious - * left-click's where there shouldn't be. This should - * sort that. Currently it's the only user of - * UMS_FLAG_T_AXIS so use it as an identifier. - * - * - * UPDATE: This problem affects the M$ Wireless - * Notebook Optical Mouse, too. However, the leading - * byte for this mouse is normally 0x11, and the - * phantom mouse click occurs when its 0x14. - * - * We probably should switch to some more official quirk. - */ if (sc->sc_iid) { - if (sc->sc_flags & UMS_FLAG_T_AXIS) { - if (*buf == 0x02) { - goto tr_setup; - } - } else { - if (*buf != sc->sc_iid) { - goto tr_setup; - } - } + id = *buf; len--; buf++; } else { + id = 0; if (sc->sc_flags & UMS_FLAG_SBU) { if ((*buf == 0x14) || (*buf == 0x15)) { goto tr_setup; @@ -233,25 +212,37 @@ } } - dw = (sc->sc_flags & UMS_FLAG_W_AXIS) ? - hid_get_data(buf, len, &sc->sc_loc_w) : 0; + if ((sc->sc_flags & UMS_FLAG_W_AXIS) && (id == sc->sc_iid_w)) + dw = hid_get_data(buf, len, &sc->sc_loc_w); + else + dw = 0; - dx = (sc->sc_flags & UMS_FLAG_X_AXIS) ? - hid_get_data(buf, len, &sc->sc_loc_x) : 0; + if ((sc->sc_flags & UMS_FLAG_X_AXIS) && (id == sc->sc_iid_x)) + dx = hid_get_data(buf, len, &sc->sc_loc_x); + else + dx = 0; - dy = (sc->sc_flags & UMS_FLAG_Y_AXIS) ? - -hid_get_data(buf, len, &sc->sc_loc_y) : 0; + if ((sc->sc_flags & UMS_FLAG_Y_AXIS) && (id == sc->sc_iid_y)) + dy = -hid_get_data(buf, len, &sc->sc_loc_y); + else + dy = 0; - dz = (sc->sc_flags & UMS_FLAG_Z_AXIS) ? - -hid_get_data(buf, len, &sc->sc_loc_z) : 0; + if ((sc->sc_flags & UMS_FLAG_Z_AXIS) && (id == sc->sc_iid_z)) + dz = -hid_get_data(buf, len, &sc->sc_loc_z); + else + dz = 0; - if (sc->sc_flags & UMS_FLAG_REVZ) { + if (sc->sc_flags & UMS_FLAG_REVZ) dz = -dz; - } - dt = (sc->sc_flags & UMS_FLAG_T_AXIS) ? - -hid_get_data(buf, len, &sc->sc_loc_t): 0; + + if ((sc->sc_flags & UMS_FLAG_T_AXIS) && (id == sc->sc_iid_t)) + dt = -hid_get_data(buf, len, &sc->sc_loc_t); + else + dt = 0; for (i = 0; i < sc->sc_buttons; i++) { + if (id != sc->sc_iid_btn[i]) + continue; if (hid_get_data(buf, len, &sc->sc_loc_btn[i])) { buttons |= (1 << UMS_BUT(i)); } @@ -413,14 +404,14 @@ goto detach; } if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), - hid_input, &sc->sc_loc_x, &flags, &sc->sc_iid)) { + hid_input, &sc->sc_loc_x, &flags, &sc->sc_iid_x)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_X_AXIS; } } if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), - hid_input, &sc->sc_loc_y, &flags, &sc->sc_iid)) { + hid_input, &sc->sc_loc_y, &flags, &sc->sc_iid_y)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Y_AXIS; @@ -428,9 +419,9 @@ } /* Try the wheel first as the Z activator since it's tradition. */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid) || + HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z) || hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_TWHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid)) { + HUG_TWHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Z_AXIS; } @@ -439,14 +430,14 @@ * put the Z on the W coordinate. */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_Z), hid_input, &sc->sc_loc_w, &flags, &sc->sc_iid)) { + HUG_Z), hid_input, &sc->sc_loc_w, &flags, &sc->sc_iid_w)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_W_AXIS; } } } else if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_Z), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid)) { + HUG_Z), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Z_AXIS; @@ -460,7 +451,7 @@ * TWHEEL */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL), - hid_input, &sc->sc_loc_t, &flags, &sc->sc_iid)) { + hid_input, &sc->sc_loc_t, &flags, &sc->sc_iid_t)) { sc->sc_loc_t.pos += 8; @@ -472,14 +463,14 @@ for (i = 0; i < UMS_BUTTON_MAX; i++) { if (!hid_locate(d_ptr, d_len, HID_USAGE2(HUP_BUTTON, (i + 1)), - hid_input, &sc->sc_loc_btn[i], NULL, &sc->sc_iid)) { + hid_input, &sc->sc_loc_btn[i], NULL, &sc->sc_iid_btn[i])) { break; } } sc->sc_buttons = i; - isize = hid_report_size(d_ptr, d_len, hid_input, NULL); + isize = hid_report_size(d_ptr, d_len, hid_input, &sc->sc_iid); /* * The Microsoft Wireless Notebook Optical Mouse seems to be in worse @@ -495,6 +486,12 @@ sc->sc_buttons = 3; isize = 5; sc->sc_iid = 0; + sc->sc_iid_x = 0; + sc->sc_iid_y = 0; + sc->sc_iid_z = 0; + sc->sc_iid_btn[0] = 0; + sc->sc_iid_btn[1] = 0; + sc->sc_iid_btn[2] = 0; /* 1st byte of descriptor report contains garbage */ sc->sc_loc_x.pos = 16; sc->sc_loc_y.pos = 24; @@ -544,15 +541,21 @@ #if USB_DEBUG DPRINTF("sc=%p\n", sc); - DPRINTF("X\t%d/%d\n", sc->sc_loc_x.pos, sc->sc_loc_x.size); - DPRINTF("Y\t%d/%d\n", sc->sc_loc_y.pos, sc->sc_loc_y.size); - DPRINTF("Z\t%d/%d\n", sc->sc_loc_z.pos, sc->sc_loc_z.size); - DPRINTF("T\t%d/%d\n", sc->sc_loc_t.pos, sc->sc_loc_t.size); - DPRINTF("W\t%d/%d\n", sc->sc_loc_w.pos, sc->sc_loc_w.size); + DPRINTF("X\t%d/%d id=%d\n", sc->sc_loc_x.pos, + sc->sc_loc_x.size, sc->sc_iid_x); + DPRINTF("Y\t%d/%d id=%d\n", sc->sc_loc_y.pos, + sc->sc_loc_y.size, sc->sc_iid_y); + DPRINTF("Z\t%d/%d id=%d\n", sc->sc_loc_z.pos, + sc->sc_loc_z.size, sc->sc_iid_z); + DPRINTF("T\t%d/%d id=%d\n", sc->sc_loc_t.pos, + sc->sc_loc_t.size, sc->sc_iid_t); + DPRINTF("W\t%d/%d id=%d\n", sc->sc_loc_w.pos, + sc->sc_loc_w.size, sc->sc_iid_w); for (i = 0; i < sc->sc_buttons; i++) { - DPRINTF("B%d\t%d/%d\n", - i + 1, sc->sc_loc_btn[i].pos, sc->sc_loc_btn[i].size); + DPRINTF("B%d\t%d/%d id=%d\n", + i + 1, sc->sc_loc_btn[i].pos, + sc->sc_loc_btn[i].size, sc->sc_iid_btn[i]); } DPRINTF("size=%d, id=%d\n", isize, sc->sc_iid); #endif From owner-p4-projects@FreeBSD.ORG Mon Mar 9 15:01:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4421F1065676; Mon, 9 Mar 2009 15:01:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 047931065673 for ; Mon, 9 Mar 2009 15:01:57 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E634B8FC25 for ; Mon, 9 Mar 2009 15:01:56 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n29F1uZ0004485 for ; Mon, 9 Mar 2009 15:01:56 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n29F1ui5004483 for perforce@freebsd.org; Mon, 9 Mar 2009 15:01:56 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 9 Mar 2009 15:01:56 GMT Message-Id: <200903091501.n29F1ui5004483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 15:01:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=158925 Change 158925 by lulf@lulf_carrot on 2009/03/09 15:01:26 - Bring atmel_spi into the game. It's intention is to work for at91 as well as avr32. Affected files ... .. //depot/projects/avr32/src/sys/conf/files.avr32#12 edit .. //depot/projects/avr32/src/sys/dev/spibus/atmel_spi.c#1 add .. //depot/projects/avr32/src/sys/dev/spibus/spibus.c#2 edit Differences ... ==== //depot/projects/avr32/src/sys/conf/files.avr32#12 (text+ko) ==== @@ -36,6 +36,7 @@ avr32/avr32/at32_sdramc.c optional at32_sdramc avr32/avr32/at32_smc.c optional at32_smc dev/mmc/atmel_mci.c optional atmel_mci +dev/spibus/atmel_spi.c optional atmel_spi avr32/avr32/busdma_machdep.c optional at32_mci dev/cfi/cfi_bus_at32_smc.c optional at32_smc cfi ==== //depot/projects/avr32/src/sys/dev/spibus/spibus.c#2 (text+ko) ==== @@ -194,5 +194,5 @@ devclass_t spibus_devclass; -DRIVER_MODULE(spibus, at91_spi, spibus_driver, spibus_devclass, 0, 0); +DRIVER_MODULE(spibus, atmel_spi, spibus_driver, spibus_devclass, 0, 0); MODULE_VERSION(spibus, 1); From owner-p4-projects@FreeBSD.ORG Mon Mar 9 15:50:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DED971065689; Mon, 9 Mar 2009 15:50: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 92FAD1065676 for ; Mon, 9 Mar 2009 15:50:47 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F4AF8FC4A for ; Mon, 9 Mar 2009 15:50:47 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n29Fol5v009787 for ; Mon, 9 Mar 2009 15:50:47 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n29Fol9N009785 for perforce@freebsd.org; Mon, 9 Mar 2009 15:50:47 GMT (envelope-from antab@FreeBSD.org) Date: Mon, 9 Mar 2009 15:50:47 GMT Message-Id: <200903091550.n29Fol9N009785@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 15:50:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=158933 Change 158933 by antab@antab_farm on 2009/03/09 15:49:56 Cleanup and bugfix in pmap and related code. PD_MASK and PT_MASK wrongly define causing overlappig in pmap_pte. Add updated version of cfi_disk from Sam Leffler. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#10 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#13 edit .. //depot/projects/avr32/src/sys/avr32/avr32/tlb.c#4 edit .. //depot/projects/avr32/src/sys/avr32/include/atomic.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/pmap.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/pte.h#5 edit .. //depot/projects/avr32/src/sys/avr32/include/tlb.h#4 edit .. //depot/projects/avr32/src/sys/dev/cfi/cfi_disk.c#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#10 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -282,8 +283,7 @@ u_int32_t get_cyclecount(void) { - avr32_impl(); - return (0); + return sysreg_read(COUNT); } int ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#13 (text+ko) ==== @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -31,6 +32,7 @@ #include #include #include +#include #include // antab: What does this stand for? @@ -42,15 +44,14 @@ static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags); static int page_is_managed(vm_offset_t pa); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m, boolean_t wired); -static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); +static void pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va); static void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); static int pmap_remove_pte(struct pmap *pmap, pt_entry_t *ptq, vm_offset_t va); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); -static struct pmap kernel_pmap_store; -pmap_t kernel_pmap; /**< Kernel pmap */ +struct pmap kernel_pmap_store; vm_offset_t kernel_vm_end = 0; vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -61,8 +62,18 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; +static int shpgperproc = PMAP_SHPGPERPROC; +/** + * Sysctl for tuneing + */ +// i386 and amd64 are using _vm_pmap but i cant find the declare for it.. +SYSCTL_INT(_vm, OID_AUTO, pv_entry_max, CTLFLAG_RD, &pv_entry_max, 0, + "Max number of PV entries"); +SYSCTL_INT(_vm, OID_AUTO, shpgperproc, CTLFLAG_RD, &shpgperproc, 0, + "Page share factor per proc"); + pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t va) { @@ -86,7 +97,6 @@ virtual_end = VM_MAX_KERNEL_ADDRESS; /* Setup kernel pmap */ - kernel_pmap = &kernel_pmap_store; PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_active = ~0; kernel_pmap->pm_asid = 0; @@ -137,10 +147,19 @@ void pmap_init(void) { + /* + * Initialize the address space (zone) for the pv entries. Set a + * high water mark so that the system can recover from excessive + * numbers of pv entries. + */ pvzone = uma_zcreate("PV_ENTRY", sizeof(struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - pv_entry_max = PMAP_SHPGPERPROC * maxproc + cnt.v_page_count; + + TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); + TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); + uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } @@ -200,13 +219,16 @@ void pmap_activate(struct thread *td) { - struct proc *p; - pmap_t pmap; + pmap_t pmap, oldpmap; + + pmap = vmspace_pmap(td->td_proc->p_vmspace); + oldpmap = PCPU_GET(curpmap); - p = td->td_proc; - pmap = vmspace_pmap(p->p_vmspace); + oldpmap->pm_active = 0; + pmap->pm_active = 1; - pmap_asid_alloc(pmap); + pmap_asid_alloc(pmap); + /* XXX: Set tlbear here? */ PCPU_SET(curpmap, pmap); } @@ -220,10 +242,28 @@ void pmap_clear_modify(vm_page_t m) { + pv_entry_t pv; + pt_entry_t *pte; + + if (m->flags & PG_FICTITIOUS) { + return; + } + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_flags & PV_TABLE_MOD) { - avr32_impl(); - //pmap_changebit(m, PTE_M, FALSE); TODO + panic("Need to look more into this"); + /* + * Loop over all current mappings + */ + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + PMAP_LOCK(pv->pv_pmap); + + pte = pmap_pte(pv->pv_pmap, pv->pv_va); + KASSERT((pte != NULL || pte != 0), ("Mapped page not found")); + *pte &= ~PTE_DIRTY; + + PMAP_UNLOCK(pv->pv_pmap); + } m->md.pv_flags &= ~PV_TABLE_MOD; } } @@ -291,6 +331,8 @@ return (AVR32_P1_TO_PHYS(va)); else if ((va & AVR32_SEG_MASK) == AVR32_SEG_P2) return (AVR32_P2_TO_PHYS(va)); + else if ((va & AVR32_SEG_MASK) == AVR32_SEG_P4) + return (AVR32_P2_TO_PHYS(va)); return (pmap_extract(kernel_pmap, va)); } @@ -413,6 +455,7 @@ vm_page_lock_queues(); PMAP_LOCK(pmap); + va &= ~PAGE_MASK; mpte = NULL; if (va < VM_MAXUSER_ADDRESS) { mpte = pmap_allocpte(pmap, va, M_WAITOK); @@ -491,13 +534,14 @@ update: newpte = 0; pfn_set(newpte, pa); - if (access & VM_PROT_READ) { + if (prot & VM_PROT_READ) { newpte |= PTE_PERM_READ; } - if (access & VM_PROT_WRITE) { + if (prot & VM_PROT_WRITE) { newpte |= PTE_PERM_WRITE; + vm_page_flag_set(m, PG_WRITEABLE); } - if (access & VM_PROT_EXECUTE) { + if (prot & VM_PROT_EXECUTE) { newpte |= PTE_PERM_EXECUTE; } @@ -530,6 +574,17 @@ } tlb_update_entry(pmap, va, newpte); + /* + * XXX: Sync I & D caches for executable pages. Do this only if the the + * target pmap belongs to the current process. Otherwise, an + * unresolvable TLB miss may occur. + */ + if (pmap == kernel_pmap && (pmap == &curproc->p_vmspace->vm_pmap) && + (prot & VM_PROT_EXECUTE)) { + avr32_icache_sync_range(va, PAGE_SIZE); + avr32_dcache_wbinv_range(va, PAGE_SIZE); + } + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -653,8 +708,9 @@ vm_offset_t va; pt_entry_t *pte; - if ((m->flags & PG_WRITEABLE) == 0) - return; + if ((m->flags & PG_WRITEABLE) == 0) { + return; + } /* * Loop over all current mappings setting/clearing as appropos. @@ -881,11 +937,11 @@ page->wire_count++; } else { page = _pmap_allocpte(pmap, pdindex, flags); - if (!page && flags & M_WAITOK) { + if (page == NULL && flags & M_WAITOK) { goto retry; } } - return page; + return (page); } static int @@ -922,7 +978,7 @@ } static void -pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va) +pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) { pv_entry_t pv; @@ -1005,9 +1061,9 @@ for (p = 0; p < 1024; p++) { ent = base + p; if (*ent) { - printf("0x%x -> 0x%x\n", + printf("0x%08x -> 0x%08x (flags 0x%08x)\n", (i << PD_SHIFT) | (p << PT_SHIFT), - *ent); + *ent & ~PAGE_MASK, *ent & PAGE_MASK); } } } ==== //depot/projects/avr32/src/sys/avr32/avr32/tlb.c#4 (text+ko) ==== @@ -98,6 +98,19 @@ } } +void +tlb_invalidate_range(pmap_t pmap, vm_offset_t start_va, vm_offset_t end_va) +{ + /* + * Look more into this. Maybe its batter to loop thru the tlb + * and invalidate entries that are within start_va and end_va, + * instead of trying to invalidate every page between them. + */ + for (; start_va < end_va; start_va += PAGE_SIZE) { + tlb_remove_entry(pmap, start_va); + } +} + static void tlb_dump_entry(uint32_t index, uint32_t tlbehi, uint32_t tlbelo) { ==== //depot/projects/avr32/src/sys/avr32/include/atomic.h#6 (text+ko) ==== @@ -171,11 +171,21 @@ } static __inline uint32_t -atomic_readandclear_32(volatile u_int32_t *p) +atomic_readandclear_32(volatile u_int32_t *address) { - avr32_impl(); - while(1); - return 0; + uint32_t ret, tmp; + __asm __volatile( + "1:" + "ssrf 5\n" + "ld.w %0, %3\n" + "mov %2, 0\n" + "stcond %1, %2\n" + "brne 1b\n" + : "=&r"(ret), "=m"(*address), "=r" (tmp) + : "m"(*address) + : "cc", "memory"); + + return (ret); } static __inline int ==== //depot/projects/avr32/src/sys/avr32/include/pmap.h#6 (text+ko) ==== @@ -134,7 +134,8 @@ } *pmap_t; #ifdef _KERNEL -#define pmap_kernel() kernel_pmap +extern struct pmap kernel_pmap_store; +#define kernel_pmap (&kernel_pmap_store) #define PMAP_LOCK(pmap) mtx_lock(&(pmap)->pm_mtx) #define PMAP_LOCK_ASSERT(pmap, type) mtx_assert(&(pmap)->pm_mtx, (type)) @@ -172,8 +173,6 @@ #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) -//extern struct segtab * segtab_active; -extern pmap_t kernel_pmap; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/avr32/src/sys/avr32/include/pte.h#5 (text+ko) ==== @@ -37,8 +37,8 @@ typedef uint32_t pt_entry_t; /* page table entry (TLBELO register) */ #endif -#define PD_MASK 0xfff00000 /* Bits used to index into page dir */ -#define PT_MASK 0x000ff000 /* Bits used to index into page table */ +#define PD_MASK 0xffe00000 /* Bits used to index into page dir */ +#define PT_MASK 0x003ff000 /* Bits used to index into page table */ #define PD_SHIFT 22 #define PT_SHIFT 12 ==== //depot/projects/avr32/src/sys/avr32/include/tlb.h#4 (text+ko) ==== @@ -35,6 +35,7 @@ void tlb_flush(void); /* Invalid all TLB entries */ void tlb_update_entry(pmap_t, vm_offset_t, pt_entry_t); void tlb_remove_entry(pmap_t, vm_offset_t); +void tlb_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); #endif /* !_MACHINE_TLB_H_ */ ==== //depot/projects/avr32/src/sys/dev/cfi/cfi_disk.c#2 (text+ko) ==== @@ -32,10 +32,13 @@ #include #include #include -#include +#include +#include +#include #include #include #include +#include #include @@ -48,6 +51,10 @@ struct disk *disk; int flags; #define CFI_DISK_OPEN 0x0001 + struct bio_queue_head bioq; /* bio queue */ + struct mtx qlock; /* bioq lock */ + struct taskqueue *tq; /* private task queue for i/o request */ + struct task iotask; /* i/o processing */ }; #define CFI_DISK_SECSIZE 512 @@ -56,6 +63,7 @@ static int cfi_disk_detach(device_t); static int cfi_disk_open(struct disk *); static int cfi_disk_close(struct disk *); +static void cfi_io_proc(void *, int); static void cfi_disk_strategy(struct bio *); static int cfi_disk_ioctl(struct disk *, u_long, void *, int, struct thread *); @@ -98,6 +106,15 @@ sc->disk->d_drv1 = sc; disk_create(sc->disk, DISK_VERSION); + mtx_init(&sc->qlock, "CFID I/O lock", NULL, MTX_DEF); + bioq_init(&sc->bioq); + + sc->tq = taskqueue_create("cfid_taskq", M_NOWAIT, + taskqueue_thread_enqueue, &sc->tq); + taskqueue_start_threads(&sc->tq, 1, PI_DISK, "cfid taskq"); + + TASK_INIT(&sc->iotask, 0, cfi_io_proc, sc); + return 0; } @@ -108,7 +125,10 @@ if (sc->flags & CFI_DISK_OPEN) return EBUSY; + taskqueue_free(sc->tq); + /* XXX drain bioq */ disk_destroy(sc->disk); + mtx_destroy(&sc->qlock); return 0; } @@ -224,10 +244,34 @@ } static void +cfi_io_proc(void *arg, int pending) +{ + struct cfi_disk_softc *sc = arg; + struct cfi_softc *cfi = sc->parent; + struct bio *bp; + + for (;;) { + mtx_lock(&sc->qlock); + bp = bioq_takefirst(&sc->bioq); + mtx_unlock(&sc->qlock); + if (bp == NULL) + break; + + switch (bp->bio_cmd) { + case BIO_READ: + cfi_disk_read(cfi, bp); + break; + case BIO_WRITE: + cfi_disk_write(cfi, bp); + break; + } + } +} + +static void cfi_disk_strategy(struct bio *bp) { struct cfi_disk_softc *sc = bp->bio_disk->d_drv1; - struct cfi_softc *cfi = sc->parent; if (sc == NULL) goto invalid; @@ -238,10 +282,12 @@ } switch (bp->bio_cmd) { case BIO_READ: - cfi_disk_read(cfi, bp); - return; case BIO_WRITE: - cfi_disk_write(cfi, bp); + mtx_lock(&sc->qlock); + /* no value in sorting requests? */ + bioq_insert_tail(&sc->bioq, bp); + mtx_unlock(&sc->qlock); + taskqueue_enqueue(sc->tq, &sc->iotask); return; } /* fall thru... */ @@ -271,4 +317,3 @@ sizeof(struct cfi_disk_softc), }; DRIVER_MODULE(cfid, cfi, cfi_disk_driver, cfi_diskclass, 0, NULL); - From owner-p4-projects@FreeBSD.ORG Mon Mar 9 17:26:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2044A1065CBF; Mon, 9 Mar 2009 17:26: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 498F81065C8A for ; Mon, 9 Mar 2009 17:26:29 +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 0F0EF8FC1E for ; Mon, 9 Mar 2009 17:26:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n29HQSgX033504 for ; Mon, 9 Mar 2009 17:26:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n29HQSTp033502 for perforce@freebsd.org; Mon, 9 Mar 2009 17:26:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 9 Mar 2009 17:26:28 GMT Message-Id: <200903091726.n29HQSTp033502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 158942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 17:27:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=158942 Change 158942 by hselasky@hselasky_laptop001 on 2009/03/09 17:25:29 USB CORE: - make sure we can compile USB without UGEN - remove some unused defines USB controller: - fix a misspelled include Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include -#include +#include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#3 (text+ko) ==== @@ -38,6 +38,10 @@ #define USB_USE_CONDVAR 0 #endif +#ifndef USB_HAVE_UGEN +#define USB_HAVE_UGEN 1 +#endif + #ifndef USB_TD_GET_PROC #define USB_TD_GET_PROC(td) (td)->td_proc #endif @@ -46,24 +50,6 @@ #define USB_PROC_GET_GID(td) (td)->p_pgid #endif -#ifndef USB_VNOPS_FO_CLOSE -#define USB_VNOPS_FO_CLOSE(fp, td, perr) do { \ - (td)->td_fpop = (fp); \ - *(perr) = vnops.fo_close(fp, td); \ - (td)->td_fpop = NULL; \ -} while (0) -#endif - -#ifndef USB_VNOPS_FO_STAT -#define USB_VNOPS_FO_STAT(fp, sb, cred, td) \ - vnops.fo_stat(fp, sb, cred, td) -#endif - -#ifndef USB_VNOPS_FO_TRUNCATE -#define USB_VNOPS_FO_TRUNCATE(fp, length, cred, td) \ - vnops.fo_truncate(fp, length, cred, td) -#endif - /* Include files */ #include ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#5 (text+ko) ==== @@ -73,11 +73,14 @@ static usb2_error_t usb2_fill_iface_data(struct usb2_device *, uint8_t, uint8_t); static void usb2_notify_addq(const char *type, struct usb2_device *); + +#if USB_HAVE_UGEN static void usb2_fifo_free_wrap(struct usb2_device *, uint8_t, uint8_t); static struct cdev *usb2_make_dev(struct usb2_device *, int, int); static void usb2_cdev_create(struct usb2_device *); static void usb2_cdev_free(struct usb2_device *); static void usb2_cdev_cleanup(void *); +#endif /* This variable is global to allow easy access to it: */ @@ -543,11 +546,13 @@ /* detach all interface drivers */ usb2_detach_device(udev, USB_IFACE_INDEX_ANY, 1); +#if USB_HAVE_UGEN /* free all FIFOs except control endpoint FIFOs */ usb2_fifo_free_wrap(udev, USB_IFACE_INDEX_ANY, 0); /* free all configuration data structures */ usb2_cdev_free(udev); +#endif usb2_free_iface_data(udev); if (index == USB_UNCONFIG_INDEX) { @@ -657,13 +662,17 @@ goto done; } } +#if USB_HAVE_UGEN /* create device nodes for each endpoint */ usb2_cdev_create(udev); +#endif done: DPRINTF("error=%s\n", usb2_errstr(err)); if (err) { +#if USB_HAVE_UGEN usb2_cdev_free(udev); +#endif usb2_free_iface_data(udev); } if (do_unlock) { @@ -717,11 +726,13 @@ goto done; } } +#if USB_HAVE_UGEN /* * Free all generic FIFOs for this interface, except control * endpoint FIFOs: */ usb2_fifo_free_wrap(udev, iface_index, 0); +#endif err = usb2_fill_iface_data(udev, iface_index, alt_index); if (err) { @@ -1433,13 +1444,17 @@ /* set device index */ udev->device_index = device_index; + /* Create ugen name */ + snprintf(udev->ugen_name, sizeof(udev->ugen_name), + USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev), + device_index); +#if USB_HAVE_UGEN /* Create the control endpoint device */ udev->default_dev = usb2_make_dev(udev, 0, FREAD|FWRITE); + /* Create a link from /dev/ugenX.X to the default endpoint */ - snprintf(udev->ugen_name, sizeof(udev->ugen_name), - USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev), - device_index); make_dev_alias(udev->default_dev, udev->ugen_name); +#endif if (udev->flags.usb2_mode == USB_MODE_HOST) { @@ -1692,7 +1707,9 @@ parent_hub->hub->ports + port_index : NULL, udev, device_index); /* Link and announce the ugen device name */ +#if USB_HAVE_UGEN udev->ugen_symlink = usb2_alloc_symlink(udev->ugen_name); +#endif printf("%s: <%s> at %s\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(udev->bus->bdev)); @@ -1706,6 +1723,7 @@ return (udev); } +#if USB_HAVE_UGEN static struct cdev * usb2_make_dev(struct usb2_device *udev, int ep, int mode) { @@ -1812,6 +1830,7 @@ { free(arg, M_USBDEV); } +#endif /*------------------------------------------------------------------------* * usb2_free_device @@ -1832,7 +1851,9 @@ /* Destroy UGEN symlink, if any */ if (udev->ugen_symlink) { +#if USB_HAVE_UGEN usb2_free_symlink(udev->ugen_symlink); +#endif udev->ugen_symlink = NULL; } /* @@ -1843,6 +1864,7 @@ udev->parent_hub->hub->ports + udev->port_index : NULL, NULL, USB_ROOT_HUB_ADDR); +#if USB_HAVE_UGEN /* wait for all pending references to go away: */ mtx_lock(&usb2_ref_lock); @@ -1851,11 +1873,13 @@ usb2_cv_wait(udev->default_cv + 1, &usb2_ref_lock); } mtx_unlock(&usb2_ref_lock); +#endif if (udev->flags.usb2_mode == USB_MODE_DEVICE) { /* stop receiving any control transfers (Device Side Mode) */ usb2_transfer_unsetup(udev->default_xfer, USB_DEFAULT_XFER_MAX); } +#if USB_HAVE_UGEN /* free all FIFOs */ usb2_fifo_free_wrap(udev, USB_IFACE_INDEX_ANY, 1); @@ -1863,9 +1887,12 @@ * Free all interface related data and FIFOs, if any. */ usb2_cdev_free(udev); +#endif usb2_free_iface_data(udev); +#if USB_HAVE_UGEN destroy_dev_sched_cb(udev->default_dev, usb2_cdev_cleanup, udev->default_dev->si_drv1); +#endif /* unsetup any leftover default USB transfers */ usb2_transfer_unsetup(udev->default_xfer, USB_DEFAULT_XFER_MAX); @@ -2263,6 +2290,7 @@ devctl_queue_data(data); } +#if USB_HAVE_UGEN /*------------------------------------------------------------------------* * usb2_fifo_free_wrap * @@ -2319,6 +2347,7 @@ usb2_fifo_free(f); } } +#endif /*------------------------------------------------------------------------* * usb2_peer_can_wakeup From owner-p4-projects@FreeBSD.ORG Mon Mar 9 18:18:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F1261065672; Mon, 9 Mar 2009 18:18: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 CEB95106566C for ; Mon, 9 Mar 2009 18:18:22 +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 A2A628FC19 for ; Mon, 9 Mar 2009 18:18:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n29IIMvR038857 for ; Mon, 9 Mar 2009 18:18:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n29IIMaR038855 for perforce@freebsd.org; Mon, 9 Mar 2009 18:18:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 9 Mar 2009 18:18:22 GMT Message-Id: <200903091818.n29IIMaR038855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 158948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 18:18:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=158948 Change 158948 by hselasky@hselasky_laptop001 on 2009/03/09 18:18:10 USB CORE: - Make sure we can compile without UGEN. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#3 (text+ko) ==== @@ -1324,9 +1324,13 @@ * Make relationships to our new device */ if (device_index != 0) { +#if USB_HAVE_UGEN mtx_lock(&usb2_ref_lock); +#endif bus->devices[device_index] = udev; +#if USB_HAVE_UGEN mtx_unlock(&usb2_ref_lock); +#endif } /* * Debug print From owner-p4-projects@FreeBSD.ORG Tue Mar 10 08:39:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8F07106566C; Tue, 10 Mar 2009 08:39:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89BD9106564A for ; Tue, 10 Mar 2009 08:39:03 +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 6CFA48FC14 for ; Tue, 10 Mar 2009 08:39:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2A8d3bF065486 for ; Tue, 10 Mar 2009 08:39:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2A8d3Gk065484 for perforce@freebsd.org; Tue, 10 Mar 2009 08:39:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 10 Mar 2009 08:39:03 GMT Message-Id: <200903100839.n2A8d3Gk065484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 158981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 08:39:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=158981 Change 158981 by hselasky@hselasky_laptop001 on 2009/03/10 08:38:54 USB controller: Add some missing ATMEGA DCI parts. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#2 (text+ko) ==== @@ -27,8 +27,9 @@ */ /* - * This file contains the driver for the ATMEGA series USB Device - * Controller + * This file contains the driver for the ATMEGA series USB OTG + * Controller. This driver currently only supports the DCI mode of the + * USB hardware. */ /* @@ -1277,6 +1278,11 @@ atmegadci_clocks_off(sc); + /* read initial VBUS state */ + + n = ATMEGA_READ_1(sc, ATMEGA_USBSTA); + atmegadci_vbus_interrupt(sc, n & ATMEGA_USBSTA_VBUS); + USB_BUS_UNLOCK(&sc->sc_bus); /* catch any lost interrupts */ ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 (text+ko) ==== @@ -25,3 +25,191 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +static device_probe_t atmegadci_probe; +static device_attach_t atmegadci_attach; +static device_detach_t atmegadci_detach; +static device_shutdown_t atmegadci_shutdown; + +struct atmegadci_super_softc { + struct atmegadci_softc sc_otg; /* must be first */ +}; + +static void +atmegadci_clocks_on(struct usb2_bus *bus) +{ + /* TODO */ +} + +static void +atmegadci_clocks_off(struct usb2_bus *bus) +{ + /* TODO */ +} + +static int +atmegadci_probe(device_t dev) +{ + device_set_desc(dev, "ATMEL OTG integrated USB controller"); + return (0); +} + +static int +atmegadci_attach(device_t dev) +{ + struct atmegadci_super_softc *sc = device_get_softc(dev); + int err; + int rid; + + /* setup MUSB OTG USB controller interface softc */ + sc->sc_otg.sc_clocks_on = &atmegadci_clocks_on; + sc->sc_otg.sc_clocks_off = &atmegadci_clocks_off; + + /* initialise some bus fields */ + sc->sc_otg.sc_bus.parent = dev; + sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices; + sc->sc_otg.sc_bus.devices_max = ATMEGA_MAX_DEVICES; + + /* get all DMA memory */ + if (usb2_bus_mem_alloc_all(&sc->sc_otg.sc_bus, + USB_GET_DMA_TAG(dev), NULL)) { + return (ENOMEM); + } + rid = 0; + sc->sc_otg.sc_io_res = + bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + + if (!(sc->sc_otg.sc_io_res)) { + err = ENOMEM; + goto error; + } + sc->sc_otg.sc_io_tag = rman_get_bustag(sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_hdl = rman_get_bushandle(sc->sc_otg.sc_io_res); + + rid = 0; + sc->sc_otg.sc_irq_res = + bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); + if (!(sc->sc_otg.sc_irq_res)) { + goto error; + } + sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1); + if (!(sc->sc_otg.sc_bus.bdev)) { + goto error; + } + device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); + + err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, + NULL, (void *)atmegadci_interrupt, sc, &sc->sc_otg.sc_intr_hdl); + if (err) { + sc->sc_otg.sc_intr_hdl = NULL; + goto error; + } + err = atmegadci_init(&sc->sc_otg); + if (!err) { + err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev); + } + if (err) { + goto error; + } + return (0); + +error: + atmegadci_detach(dev); + return (ENXIO); +} + +static int +atmegadci_detach(device_t dev) +{ + struct atmegadci_super_softc *sc = device_get_softc(dev); + device_t bdev; + int err; + + if (sc->sc_otg.sc_bus.bdev) { + bdev = sc->sc_otg.sc_bus.bdev; + device_detach(bdev); + device_delete_child(dev, bdev); + } + /* during module unload there are lots of children leftover */ + device_delete_all_children(dev); + + if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { + /* + * only call atmegadci_uninit() after atmegadci_init() + */ + atmegadci_uninit(&sc->sc_otg); + + err = bus_teardown_intr(dev, sc->sc_otg.sc_irq_res, + sc->sc_otg.sc_intr_hdl); + sc->sc_otg.sc_intr_hdl = NULL; + } + /* free IRQ channel, if any */ + if (sc->sc_otg.sc_irq_res) { + bus_release_resource(dev, SYS_RES_IRQ, 0, + sc->sc_otg.sc_irq_res); + sc->sc_otg.sc_irq_res = NULL; + } + /* free memory resource, if any */ + if (sc->sc_otg.sc_io_res) { + bus_release_resource(dev, SYS_RES_MEMORY, 0, + sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_res = NULL; + } + usb2_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL); + + return (0); +} + +static int +atmegadci_shutdown(device_t dev) +{ + struct atmegadci_super_softc *sc = device_get_softc(dev); + int err; + + err = bus_generic_shutdown(dev); + if (err) + return (err); + + atmegadci_uninit(&sc->sc_otg); + + return (0); +} + +static device_method_t atmegadci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, atmegadci_probe), + DEVMETHOD(device_attach, atmegadci_attach), + DEVMETHOD(device_detach, atmegadci_detach), + DEVMETHOD(device_shutdown, atmegadci_shutdown), + + /* Bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + + {0, 0} +}; + +static driver_t atmegadci_driver = { + "atmegadci", + atmegadci_methods, + sizeof(struct atmegadci_super_softc), +}; + +static devclass_t atmegadci_devclass; + +DRIVER_MODULE(atmegadci, atmelarm, atmegadci_driver, atmegadci_devclass, 0, 0); +MODULE_DEPEND(atmegadci, usb, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Tue Mar 10 09:05:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4B621065673; Tue, 10 Mar 2009 09:05: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 62EF91065670 for ; Tue, 10 Mar 2009 09:05:30 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5177A8FC19 for ; Tue, 10 Mar 2009 09:05:30 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2A95U4R078285 for ; Tue, 10 Mar 2009 09:05:30 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2A95UvD078283 for perforce@freebsd.org; Tue, 10 Mar 2009 09:05:30 GMT (envelope-from lulf@FreeBSD.org) Date: Tue, 10 Mar 2009 09:05:30 GMT Message-Id: <200903100905.n2A95UvD078283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 09:05:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=158982 Change 158982 by lulf@lulf_carrot on 2009/03/10 09:04:50 - Set correct bitmask for page directory. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/pte.h#6 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/pte.h#6 (text+ko) ==== @@ -37,7 +37,7 @@ typedef uint32_t pt_entry_t; /* page table entry (TLBELO register) */ #endif -#define PD_MASK 0xffe00000 /* Bits used to index into page dir */ +#define PD_MASK 0xffc00000 /* Bits used to index into page dir */ #define PT_MASK 0x003ff000 /* Bits used to index into page table */ #define PD_SHIFT 22 #define PT_SHIFT 12 From owner-p4-projects@FreeBSD.ORG Tue Mar 10 10:25:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 669631065680; Tue, 10 Mar 2009 10:25: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 1610C106567B for ; Tue, 10 Mar 2009 10:25:52 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 030338FC1F for ; Tue, 10 Mar 2009 10:25:52 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AAPphl085451 for ; Tue, 10 Mar 2009 10:25:51 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AAPpT0085449 for perforce@freebsd.org; Tue, 10 Mar 2009 10:25:51 GMT (envelope-from lulf@FreeBSD.org) Date: Tue, 10 Mar 2009 10:25:51 GMT Message-Id: <200903101025.n2AAPpT0085449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 10:25:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=158984 Change 158984 by lulf@lulf_carrot on 2009/03/10 10:25:31 - Add macros for the rest of the possible cache operations. - Change writeback to clean, to follow the techref manual. - Support flushing data and instruction cache, and perform this operation on initialization. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cache.c#4 edit .. //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#11 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cache.c#4 (text+ko) ==== @@ -41,23 +41,46 @@ #include #include -/* Valid cache op codes. */ +/* Valid instruction cache op codes. */ +#define ICACHE_FLUSH 0x00 #define ICACHE_INVALIDATE 0x01 +#define ICACHE_LOCK 0x02 +#define ICACHE_UNLOCK 0x03 +#define ICACHE_PREFETCH 0x04 + +/* Flush modes. */ +#define ICACHE_FLUSH_ALL 0 +#define ICACHE_FLUSH_UNLOCKED 1 +#define ICACHE_FLUSH_UNLOCK 2 + +/* Valid data cache op codes. */ +#define DCACHE_FLUSH 0x08 +#define DCACHE_LOCK 0x09 +#define DCACHE_UNLOCK 0x0a #define DCACHE_INVALIDATE 0x0b -#define DCACHE_WRITEBACK 0x0c -#define DCACHE_WRITEBACK_INVALIDATE 0x0d +#define DCACHE_CLEAN 0x0c +#define DCACHE_CLEAN_INVALIDATE 0x0d + +/* Flush modes. */ +#define DCACHE_FLUSH_INVALIDATE_ALL 0 +#define DCACHE_FLUSH_INVALIDATE_UNLOCKED 1 +#define DCACHE_FLUSH_CLEAN_ALL 2 +#define DCACHE_FLUSH_CLEAN_UNLOCKED 3 +#define DCACHE_FLUSH_CLEAN_INVALIDATE_ALL 4 +#define DCACHE_FLUSH_CLEAN_INVALIDATE_UNLOCKED 5 +#define DCACHE_FLUSH_UNLOCK_ALL 6 /* Next line boundary. */ #define round_line(va, size) (((va) + ((size) - 1)) & ~((size) - 1)) /* Previous line boundary. */ #define trunc_line(va, size) ((va) & ~((size) - 1)) -/* Perform operation on cache line. */ -#define cache_line_op(va, op) \ +/* Perform operation a cache. */ +#define cache_op(arg, op) \ __asm__ __volatile( \ "cache %0[0], %1" \ : \ - : "r" (va), "n" (op) \ + : "r" (arg), "n" (op) \ : "memory") struct avr32_cache_ops avr32_cache_ops; @@ -176,7 +199,7 @@ void avr32_l1icache_sync_all(void) { - avr32_impl(); + cache_op(ICACHE_FLUSH_ALL, ICACHE_FLUSH); } void @@ -194,7 +217,7 @@ void avr32_l1dcache_wbinv_all(void) { - avr32_impl(); + cache_op(DCACHE_FLUSH_CLEAN_INVALIDATE_ALL, DCACHE_FLUSH); } void @@ -212,7 +235,7 @@ va = trunc_line(from, avr32_dcache_line_size); va_end = round_line(from + size, avr32_dcache_line_size); while (va < va_end) { - cache_line_op(va, DCACHE_WRITEBACK_INVALIDATE); + cache_op(va, DCACHE_CLEAN_INVALIDATE); va += avr32_dcache_line_size; } } @@ -227,7 +250,7 @@ va = trunc_line(from, avr32_dcache_line_size); va_end = round_line(from + size, avr32_dcache_line_size); while (va < va_end) { - cache_line_op(va, DCACHE_INVALIDATE); + cache_op(va, DCACHE_INVALIDATE); va += avr32_dcache_line_size; } } @@ -242,7 +265,7 @@ va_end = round_line(from + size, avr32_dcache_line_size); while (va < va_end) { - cache_line_op(va, DCACHE_WRITEBACK); + cache_op(va, DCACHE_CLEAN); va += avr32_dcache_line_size; } avr32_wbflush(); ==== //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#11 (text+ko) ==== @@ -186,6 +186,8 @@ /* Set up cache handling. */ avr32_config_cache(); + avr32_icache_sync_all(); + avr32_dcache_wbinv_all(); /* * Set up buffers, so they can be used to read disk labels. From owner-p4-projects@FreeBSD.ORG Tue Mar 10 11:06:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADD50106566C; Tue, 10 Mar 2009 11:06: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 6D4F1106564A for ; Tue, 10 Mar 2009 11:06:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5B2038FC14 for ; Tue, 10 Mar 2009 11:06:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AB6XHf092497 for ; Tue, 10 Mar 2009 11:06:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AB6Xvr092495 for perforce@freebsd.org; Tue, 10 Mar 2009 11:06:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 10 Mar 2009 11:06:33 GMT Message-Id: <200903101106.n2AB6Xvr092495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 158986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 11:06:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=158986 Change 158986 by hselasky@hselasky_laptop001 on 2009/03/10 11:05:41 USB CORE: Fix a possible NULL pointer access at controller attach. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#2 (text+ko) ==== @@ -346,7 +346,8 @@ err = usb2_probe_and_attach(child, USB_IFACE_INDEX_ANY); if (!err) { - if (!bus->devices[USB_ROOT_HUB_ADDR]->hub) { + if ((bus->devices[USB_ROOT_HUB_ADDR] == NULL) || + (bus->devices[USB_ROOT_HUB_ADDR]->hub == NULL)) { err = USB_ERR_NO_ROOT_HUB; } } From owner-p4-projects@FreeBSD.ORG Tue Mar 10 14:46:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46D771065676; Tue, 10 Mar 2009 14:46: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 060C6106564A for ; Tue, 10 Mar 2009 14:46:20 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E72878FC12 for ; Tue, 10 Mar 2009 14:46:19 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AEkJiV024868 for ; Tue, 10 Mar 2009 14:46:19 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AEkIkO024866 for perforce@freebsd.org; Tue, 10 Mar 2009 14:46:18 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 10 Mar 2009 14:46:18 GMT Message-Id: <200903101446.n2AEkIkO024866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 158999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 14:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=158999 Change 158999 by thompsa@thompsa_burger on 2009/03/10 14:46:00 IFC @158996 Affected files ... .. //depot/projects/usb/src/lib/libusb20/Makefile#4 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.3#8 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.c#16 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.h#11 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#12 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#4 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#6 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#5 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#9 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#15 edit .. //depot/projects/usb/src/lib/libusb20/usb.h#1 add .. //depot/projects/usb/src/lib/libusbhid/Makefile#3 edit .. //depot/projects/usb/src/lib/libusbhid/data.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/descr.c#6 edit .. //depot/projects/usb/src/lib/libusbhid/descr_compat.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/parse.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/usage.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#5 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#4 edit .. //depot/projects/usb/src/lib/libusbhid/usbvar.h#3 edit .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#13 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/devicename.c#6 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#7 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/usb/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#7 integrate .. //depot/projects/usb/src/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/usb/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#15 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#8 integrate .. //depot/projects/usb/src/sys/compat/ndis/usbd_var.h#5 integrate .. //depot/projects/usb/src/sys/conf/files#54 integrate .. //depot/projects/usb/src/sys/ddb/db_expr.c#2 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath_pci.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#15 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_core.c#4 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_dev.c#3 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/usb/src/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/usb/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drm.h#4 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/exca/exca.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#14 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#18 integrate .. //depot/projects/usb/src/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#16 integrate .. //depot/projects/usb/src/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbus.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#5 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#5 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#14 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_redboot.c#1 branch .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#19 integrate .. //depot/projects/usb/src/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_tc.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#18 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#18 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#10 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/usb/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/usb/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/usb/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/if_ndis/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/ndis/Makefile#7 integrate .. //depot/projects/usb/src/sys/net/bpf.c#15 integrate .. //depot/projects/usb/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/usb/src/sys/net/if_gif.h#5 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#17 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#9 integrate .. //depot/projects/usb/src/sys/netinet/igmp_var.h#3 integrate .. //depot/projects/usb/src/sys/netinet/in.c#18 integrate .. //depot/projects/usb/src/sys/netinet/in.h#10 integrate .. //depot/projects/usb/src/sys/netinet/in_gif.c#10 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#10 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#10 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#17 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#8 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#19 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#7 integrate .. //depot/projects/usb/src/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/usb/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/usb/src/sys/security/audit/audit.c#12 integrate .. //depot/projects/usb/src/sys/security/audit/audit.h#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#12 integrate .. //depot/projects/usb/src/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/usb/src/sys/security/mac/mac_inet.c#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/usb/src/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_pipe.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_policy.h#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_sem.c#8 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/usb/src/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/usb/src/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_msg.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_sem.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_vfs.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#12 integrate .. //depot/projects/usb/src/sys/security/mac_stub/mac_stub.c#11 integrate .. //depot/projects/usb/src/sys/security/mac_test/mac_test.c#11 integrate .. //depot/projects/usb/src/sys/sys/buf.h#5 integrate .. //depot/projects/usb/src/sys/sys/param.h#24 integrate .. //depot/projects/usb/src/sys/sys/pipe.h#3 integrate .. //depot/projects/usb/src/sys/sys/proc.h#16 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#15 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#6 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#17 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/usb/src/sys/vm/vm_init.c#4 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#13 integrate .. //depot/projects/usb/src/usr.bin/usbhidaction/usbhidaction.c#2 edit .. //depot/projects/usb/src/usr.bin/usbhidctl/usbhid.c#2 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#4 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#11 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#6 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#3 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#14 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ # -# $FreeBSD: src/lib/libusb20/Makefile,v 1.1 2008/11/04 02:31:03 alfred Exp $ +# $FreeBSD: head/lib/libusb/Makefile 189587 2009-03-09 17:09:46Z thompsa $ # # Makefile for the FreeBSD specific LibUSB 2.0 # -LIB= usb20 +LIB= usb SHLIB_MAJOR= 1 SHLIB_MINOR= 0 SRCS= libusb20.c @@ -14,11 +14,12 @@ SRCS+= libusb20_compat10.c INCS+= libusb20.h INCS+= libusb20_desc.h -INCS+= libusb20_compat01.h -INCS+= libusb20_compat10.h MAN= libusb20.3 MKLINT= no NOGCCERROR= +# libusb 0.1 compat +INCS+= usb.h + .include ==== //depot/projects/usb/src/lib/libusb20/libusb20.3#8 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb20/libusb20.3,v 1.1 2008/11/04 02:31:03 alfred Exp $ +.\" $FreeBSD: head/lib/libusb/libusb20.3 189587 2009-03-09 17:09:46Z thompsa $ .\" .Dd Feb 14, 2009 .Dt LIBUSB20 3 @@ -514,72 +514,6 @@ . .Pp . -.Fn libusb20_dev_set_owner pdev uid gid -This function will set the ownership of the given USB device. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_set_perm pdev mode -This function will set the permissions of the given USB device. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_set_iface_owner pdev iface_index uid gid -This function will set the ownership of the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_set_iface_perm pdev iface_index mode -This function will set the permissions of the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_owner pdev puid pgid -This function will retrieve the current USB device ownership. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_perm pdev pmode -This function will retrieve the current USB device permissions. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_iface_owner pdev iface_index puid pgid -This function will retrieve the current USB interface ownership for -the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_iface_perm pdev iface_index pmode -This function will retrieve the current USB interface permissions for -the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. .Fn libusb20_dev_get_device_desc pdev This function returns a pointer to the decoded and host endian version of the device descriptor. @@ -663,39 +597,6 @@ .Xr 2 poll function. . -.Sh USB BUS OPERATIONS -. -.Fn libusb20_bus_set_owner pbackend bus_index uid gid -This function will set the ownership for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_bus_set_perm pbackend bus_index mode -This function will set the permissions for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_bus_get_owner pbackend bus_index puid pgid -This function will retrieve the ownership for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_bus_get_perm pbackend bus_index pmode -This function will retrieve the permissions for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -. .Sh USB BACKEND OPERATIONS . .Fn libusb20_be_get_template pbackend ptemp @@ -772,47 +673,6 @@ If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is returned. . -.Pp -. -.Fn libusb20_be_set_owner pbackend uid gid -This function will set the ownership for the given backend. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_set_perm pbackend mode -This function will set the permissions for the given backend. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_get_owner pbackend puid pgid -This function will retrieve the ownership of the given backend. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_get_perm pbackend pmode -This function will retrieve the permissions of the given backend. -. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_alloc pmethods -This is an internal function to allocate a USB backend. -. -.Pp -.Fn libusb20_be_alloc_default void -.Fn libusb20_be_alloc_freebsd void .Fn libusb20_be_alloc_linux void These functions are used to allocate a specific USB backend or the operating system default USB backend. Allocating a backend is a way to ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -971,86 +971,6 @@ } int -libusb20_dev_set_owner(struct libusb20_device *pdev, uid_t user, gid_t group) -{ - return (pdev->beMethods->dev_set_owner(pdev, user, group)); -} - -int -libusb20_dev_set_perm(struct libusb20_device *pdev, mode_t mode) -{ - return (pdev->beMethods->dev_set_perm(pdev, mode)); -} - -int -libusb20_dev_set_iface_owner(struct libusb20_device *pdev, - uint8_t iface_index, uid_t user, gid_t group) -{ - return (pdev->beMethods->dev_set_iface_owner( - pdev, iface_index, user, group)); -} - -int -libusb20_dev_set_iface_perm(struct libusb20_device *pdev, - uint8_t iface_index, mode_t mode) -{ - return (pdev->beMethods->dev_set_iface_perm( - pdev, iface_index, mode)); -} - -int -libusb20_dev_get_owner(struct libusb20_device *pdev, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - - return (pdev->beMethods->dev_get_owner(pdev, user, group)); -} - -int -libusb20_dev_get_perm(struct libusb20_device *pdev, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pdev->beMethods->dev_get_perm(pdev, mode)); -} - -int -libusb20_dev_get_iface_owner(struct libusb20_device *pdev, - uint8_t iface_index, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - - return (pdev->beMethods->dev_get_iface_owner( - pdev, iface_index, user, group)); -} - -int -libusb20_dev_get_iface_perm(struct libusb20_device *pdev, - uint8_t iface_index, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pdev->beMethods->dev_get_iface_perm( - pdev, iface_index, mode)); -} - -int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len) { @@ -1061,45 +981,6 @@ pdev, iface_index, buf, len)); } -/* USB bus operations */ - -int -libusb20_bus_set_owner(struct libusb20_backend *pbe, - uint8_t bus, uid_t user, gid_t group) -{ - return (pbe->methods->bus_set_owner(pbe, bus, user, group)); -} - -int -libusb20_bus_set_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t mode) -{ - return (pbe->methods->bus_set_perm(pbe, bus, mode)); -} - -int -libusb20_bus_get_owner(struct libusb20_backend *pbe, - uint8_t bus, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - return (pbe->methods->bus_get_owner(pbe, bus, user, group)); -} - -int -libusb20_bus_get_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pbe->methods->bus_get_perm(pbe, bus, mode)); -} - /* USB backend operations */ int @@ -1131,41 +1012,6 @@ } int -libusb20_be_set_owner(struct libusb20_backend *pbe, uid_t user, gid_t group) -{ - return (pbe->methods->root_set_owner(pbe, user, group)); -} - -int -libusb20_be_set_perm(struct libusb20_backend *pbe, mode_t mode) -{ - return (pbe->methods->root_set_perm(pbe, mode)); -} - -int -libusb20_be_get_owner(struct libusb20_backend *pbe, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - return (pbe->methods->root_get_owner(pbe, user, group)); -} - -int -libusb20_be_get_perm(struct libusb20_backend *pbe, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pbe->methods->root_get_perm(pbe, mode)); -} - -int libusb20_be_set_template(struct libusb20_backend *pbe, int temp) { return (pbe->methods->root_set_template(pbe, temp)); ==== //depot/projects/usb/src/lib/libusb20/libusb20.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. @@ -253,14 +253,6 @@ int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); -int libusb20_dev_set_owner(struct libusb20_device *pdev, uid_t user, gid_t group); -int libusb20_dev_set_perm(struct libusb20_device *pdev, mode_t mode); -int libusb20_dev_set_iface_owner(struct libusb20_device *pdev, uint8_t iface_index, uid_t user, gid_t group); -int libusb20_dev_set_iface_perm(struct libusb20_device *pdev, uint8_t iface_index, mode_t mode); -int libusb20_dev_get_owner(struct libusb20_device *pdev, uid_t *user, gid_t *group); -int libusb20_dev_get_perm(struct libusb20_device *pdev, mode_t *mode); -int libusb20_dev_get_iface_owner(struct libusb20_device *pdev, uint8_t iface_index, uid_t *user, gid_t *group); -int libusb20_dev_get_iface_perm(struct libusb20_device *pdev, uint8_t iface_index, mode_t *mode); int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo); int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); @@ -276,23 +268,12 @@ void libusb20_dev_set_debug(struct libusb20_device *pdev, int debug); void libusb20_dev_wait_process(struct libusb20_device *pdev, int timeout); -/* USB bus operations */ - -int libusb20_bus_set_owner(struct libusb20_backend *pbe, uint8_t bus, uid_t user, gid_t group); -int libusb20_bus_set_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t mode); -int libusb20_bus_get_owner(struct libusb20_backend *pbe, uint8_t bus, uid_t *user, gid_t *group); -int libusb20_bus_get_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode); - /* USB global operations */ int libusb20_be_get_dev_quirk(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); int libusb20_be_get_quirk_name(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); int libusb20_be_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq); int libusb20_be_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq); -int libusb20_be_set_owner(struct libusb20_backend *be, uid_t user, gid_t group); -int libusb20_be_set_perm(struct libusb20_backend *be, mode_t mode); -int libusb20_be_get_owner(struct libusb20_backend *be, uid_t *user, gid_t *group); -int libusb20_be_get_perm(struct libusb20_backend *be, mode_t *mode); /* USB backend operations */ ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_compat01.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_compat01.c 189621 2009-03-10 14:29:34Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -37,7 +37,7 @@ #include "libusb20.h" #include "libusb20_desc.h" #include "libusb20_int.h" -#include "libusb20_compat01.h" +#include "usb.h" /* * The two following macros were taken from the original LibUSB v0.1 ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_compat10.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_compat10.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_compat10.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_compat10.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_desc.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_desc.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_desc.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_desc.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. ==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_int.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_int.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -48,27 +48,11 @@ typedef int (libusb20_root_get_quirk_name_t)(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); -typedef int (libusb20_bus_get_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t *user, gid_t *group); -typedef int (libusb20_bus_get_perm_t)(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode); -typedef int (libusb20_bus_set_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t user, gid_t group); -typedef int (libusb20_bus_set_perm_t)(struct libusb20_backend *pbe, uint8_t bus, mode_t mode); typedef int (libusb20_close_device_t)(struct libusb20_device *pdev); -typedef int (libusb20_dev_get_iface_owner_t)(struct libusb20_device *pdev, uint8_t iface_index, uid_t *user, gid_t *group); -typedef int (libusb20_dev_get_iface_perm_t)(struct libusb20_device *pdev, uint8_t iface_index, mode_t *mode); -typedef int (libusb20_dev_get_owner_t)(struct libusb20_device *pdev, uid_t *user, gid_t *group); -typedef int (libusb20_dev_get_perm_t)(struct libusb20_device *pdev, mode_t *mode); typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo); typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); -typedef int (libusb20_dev_set_iface_owner_t)(struct libusb20_device *pdev, uint8_t iface_index, uid_t user, gid_t group); -typedef int (libusb20_dev_set_iface_perm_t)(struct libusb20_device *pdev, uint8_t iface_index, mode_t mode); -typedef int (libusb20_dev_set_owner_t)(struct libusb20_device *pdev, uid_t user, gid_t group); -typedef int (libusb20_dev_set_perm_t)(struct libusb20_device *pdev, mode_t mode); typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max); -typedef int (libusb20_root_get_owner_t)(struct libusb20_backend *pbe, uid_t *user, gid_t *group); -typedef int (libusb20_root_get_perm_t)(struct libusb20_backend *pbe, mode_t *mode); -typedef int (libusb20_root_set_owner_t)(struct libusb20_backend *pbe, uid_t user, gid_t group); -typedef int (libusb20_root_set_perm_t)(struct libusb20_backend *pbe, mode_t mode); typedef void (libusb20_exit_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_root_set_template_t)(struct libusb20_backend *pbe, int temp); typedef int (libusb20_root_get_template_t)(struct libusb20_backend *pbe, int *ptemp); @@ -85,28 +69,12 @@ /* optional backend methods */ \ m(n, init_backend) \ m(n, exit_backend) \ - m(n, bus_set_owner) \ - m(n, bus_get_owner) \ - m(n, bus_set_perm) \ - m(n, bus_get_perm) \ m(n, dev_get_info) \ - m(n, dev_get_iface_owner) \ - m(n, dev_get_iface_perm) \ m(n, dev_get_iface_desc) \ - m(n, dev_get_owner) \ - m(n, dev_get_perm) \ - m(n, dev_set_iface_owner) \ - m(n, dev_set_iface_perm) \ - m(n, dev_set_owner) \ - m(n, dev_set_perm) \ m(n, root_get_dev_quirk) \ m(n, root_get_quirk_name) \ m(n, root_add_dev_quirk) \ m(n, root_remove_dev_quirk) \ - m(n, root_set_owner) \ - m(n, root_get_owner) \ - m(n, root_set_perm) \ - m(n, root_get_perm) \ m(n, root_set_template) \ m(n, root_get_template) \ /* mandatory device methods */ \ ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_ugen20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_ugen20.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -39,39 +39,23 @@ #include "libusb20_desc.h" #include "libusb20_int.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static libusb20_init_backend_t ugen20_init_backend; static libusb20_open_device_t ugen20_open_device; static libusb20_close_device_t ugen20_close_device; static libusb20_get_backend_name_t ugen20_get_backend_name; static libusb20_exit_backend_t ugen20_exit_backend; -static libusb20_bus_set_owner_t ugen20_bus_set_owner; -static libusb20_bus_get_owner_t ugen20_bus_get_owner; -static libusb20_bus_set_perm_t ugen20_bus_set_perm; -static libusb20_bus_get_perm_t ugen20_bus_get_perm; -static libusb20_dev_get_iface_owner_t ugen20_dev_get_iface_owner; -static libusb20_dev_get_iface_perm_t ugen20_dev_get_iface_perm; -static libusb20_dev_get_owner_t ugen20_dev_get_owner; -static libusb20_dev_get_perm_t ugen20_dev_get_perm; static libusb20_dev_get_iface_desc_t ugen20_dev_get_iface_desc; static libusb20_dev_get_info_t ugen20_dev_get_info; -static libusb20_dev_set_iface_owner_t ugen20_dev_set_iface_owner; -static libusb20_dev_set_iface_perm_t ugen20_dev_set_iface_perm; -static libusb20_dev_set_owner_t ugen20_dev_set_owner; -static libusb20_dev_set_perm_t ugen20_dev_set_perm; static libusb20_root_get_dev_quirk_t ugen20_root_get_dev_quirk; static libusb20_root_get_quirk_name_t ugen20_root_get_quirk_name; static libusb20_root_add_dev_quirk_t ugen20_root_add_dev_quirk; static libusb20_root_remove_dev_quirk_t ugen20_root_remove_dev_quirk; -static libusb20_root_set_owner_t ugen20_root_set_owner; -static libusb20_root_get_owner_t ugen20_root_get_owner; -static libusb20_root_set_perm_t ugen20_root_set_perm; -static libusb20_root_get_perm_t ugen20_root_get_perm; static libusb20_root_set_template_t ugen20_root_set_template; static libusb20_root_get_template_t ugen20_root_get_template; @@ -152,7 +136,7 @@ pdev->bus_number = ugen20_path_convert_one(&tmp); pdev->device_address = ugen20_path_convert_one(&tmp); - snprintf(buf, sizeof(buf), "/dev/ugen%u.%u", + snprintf(buf, sizeof(buf), "/dev/" USB_GENERIC_NAME "%u.%u", pdev->bus_number, pdev->device_address); f = open(buf, O_RDWR); @@ -218,7 +202,7 @@ /* generate a nice description for printout */ snprintf(pdev->usb_desc, sizeof(pdev->usb_desc), - "ugen%u.%u: <%s %s> at usbus%u", pdev->bus_number, + USB_GENERIC_NAME "%u.%u: <%s %s> at usbus%u", pdev->bus_number, pdev->device_address, devinfo.udi_product, devinfo.udi_vendor, pdev->bus_number); @@ -284,7 +268,7 @@ memset(&state, 0, sizeof(state)); - state.f = open("/dev/usb", O_RDONLY); + state.f = open("/dev/" USB_DEVICE_NAME, O_RDONLY); if (state.f < 0) return (LIBUSB20_ERROR_OTHER); @@ -379,7 +363,7 @@ int g; int error; - snprintf(buf, sizeof(buf), "/dev/ugen%u.%u", + snprintf(buf, sizeof(buf), "/dev/" USB_GENERIC_NAME "%u.%u", pdev->bus_number, pdev->device_address); /* @@ -873,7 +857,7 @@ int f; int error; - f = open("/dev/usb", O_RDONLY); + f = open("/dev/" USB_DEVICE_NAME, O_RDONLY); if (f < 0) return (LIBUSB20_ERROR_OTHER); error = ioctl(f, cmd, data); @@ -889,75 +873,6 @@ } static int -ugen20_be_do_perm(uint32_t get_cmd, uint32_t set_cmd, uint8_t bus, - uint8_t dev, uint8_t iface, uid_t *uid, - gid_t *gid, mode_t *mode) -{ - struct usb2_dev_perm perm; - int error; - - memset(&perm, 0, sizeof(perm)); - - perm.bus_index = bus; - perm.dev_index = dev; - perm.iface_index = iface; - - error = ugen20_be_ioctl(get_cmd, &perm); - if (error) - return (error); - - if (set_cmd == 0) { - if (uid) - *uid = perm.user_id; - if (gid) - *gid = perm.group_id; - if (mode) - *mode = perm.mode; - return (0); - } - if (uid) - perm.user_id = *uid; - if (gid) - perm.group_id = *gid; - if (mode) - perm.mode = *mode; - - return (ugen20_be_ioctl(set_cmd, &perm)); -} - -static int -ugen20_bus_set_owner(struct libusb20_backend *pbe, - uint8_t bus, uid_t user, gid_t group) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, USB_SET_BUS_PERM, - bus, 0, 0, &user, &group, NULL)); -} - -static int -ugen20_bus_get_owner(struct libusb20_backend *pbe, uint8_t bus, - uid_t *user, gid_t *group) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, 0, - bus, 0, 0, user, group, NULL)); -} - -static int -ugen20_bus_set_perm(struct libusb20_backend *pbe, - uint8_t bus, mode_t mode) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, USB_SET_BUS_PERM, - bus, 0, 0, NULL, NULL, &mode)); -} - -static int -ugen20_bus_get_perm(struct libusb20_backend *pbe, - uint8_t bus, mode_t *mode) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, 0, - bus, 0, 0, NULL, NULL, mode)); -} - -static int ugen20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len) { @@ -986,59 +901,6 @@ } static int -ugen20_dev_get_iface_owner(struct libusb20_device *pdev, - uint8_t iface_index, uid_t *user, gid_t *group) -{ - return (ugen20_be_do_perm(USB_GET_IFACE_PERM, 0, - pdev->bus_number, pdev->device_address, iface_index, - user, group, NULL)); -} - -static int -ugen20_dev_get_iface_perm(struct libusb20_device *pdev, - uint8_t iface_index, mode_t *mode) -{ - return (ugen20_be_do_perm(USB_GET_IFACE_PERM, 0, - pdev->bus_number, pdev->device_address, iface_index, - NULL, NULL, mode)); -} - -static int -ugen20_dev_get_owner(struct libusb20_device *pdev, - uid_t *user, gid_t *group) -{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 10 15:18:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E63341065696; Tue, 10 Mar 2009 15:18:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AE281065693 for ; Tue, 10 Mar 2009 15:18:53 +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 49EB78FC08 for ; Tue, 10 Mar 2009 15:18:53 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AFIqXF028446 for ; Tue, 10 Mar 2009 15:18:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AFIqDm028444 for perforce@freebsd.org; Tue, 10 Mar 2009 15:18:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 10 Mar 2009 15:18:52 GMT Message-Id: <200903101518.n2AFIqDm028444@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 15:18:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=159001 Change 159001 by hselasky@hselasky_laptop001 on 2009/03/10 15:18:10 USB CORE: Make sure HID has a default usage. Reported by: Paul Wootton Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#20 (text+ko) ==== @@ -283,14 +283,14 @@ */ c->loc.count = 1; } else { - /* make sure we have a usage */ - if (s->nusage == 0) { - s->usages_min[s->nusage] = 0; - s->usages_max[s->nusage] = 0; - s->nusage = 1; - } s->ncount = 1; } + /* make sure we have a usage */ + if (s->nusage == 0) { + s->usages_min[s->nusage] = 0; + s->usages_max[s->nusage] = 0; + s->nusage = 1; + } goto top; case 9: /* Output */ From owner-p4-projects@FreeBSD.ORG Tue Mar 10 15:37:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50FD11065674; Tue, 10 Mar 2009 15:37:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FE68106566C for ; Tue, 10 Mar 2009 15:37:12 +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 F31ED8FC19 for ; Tue, 10 Mar 2009 15:37:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AFbB39031397 for ; Tue, 10 Mar 2009 15:37:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AFbBwc031395 for perforce@freebsd.org; Tue, 10 Mar 2009 15:37:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 10 Mar 2009 15:37:11 GMT Message-Id: <200903101537.n2AFbBwc031395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 15:37:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=159004 Change 159004 by hselasky@hselasky_laptop001 on 2009/03/10 15:36:37 USB CORE: Improve default HID usage selection. Add more documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#21 (text+ko) ==== @@ -287,9 +287,10 @@ } /* make sure we have a usage */ if (s->nusage == 0) { - s->usages_min[s->nusage] = 0; - s->usages_max[s->nusage] = 0; - s->nusage = 1; + /* use the undefined HID PAGE */ + s->usages_min[s->nusage] = 0x0000; + s->usages_max[s->nusage] = 0xFFFF; + s->nusage = s->ncount; } goto top; From owner-p4-projects@FreeBSD.ORG Tue Mar 10 18:15:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90F9D106568B; Tue, 10 Mar 2009 18:15: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 9E437106567F for ; Tue, 10 Mar 2009 18:15:54 +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 643718FC21 for ; Tue, 10 Mar 2009 18:15:54 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AIFsoX061860 for ; Tue, 10 Mar 2009 18:15:54 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AIFsQF061858 for perforce@freebsd.org; Tue, 10 Mar 2009 18:15:54 GMT (envelope-from gabor@freebsd.org) Date: Tue, 10 Mar 2009 18:15:54 GMT Message-Id: <200903101815.n2AIFsQF061858@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 Cc: Subject: PERFORCE change 159014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 18:16:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=159014 Change 159014 by gabor@gabor_server on 2009/03/10 18:15:45 - Remove debug line Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#83 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#83 (text+ko) ==== @@ -632,10 +632,8 @@ if (dirbehave == DIR_RECURSE) c = grep_tree(aargv); else - for (c = 0; aargc--; ++aargv) { - printf("aargc: %d\n", aargc); + for (c = 0; aargc--; ++aargv) c+= procfile(*aargv); - } #ifndef WITHOUT_NLS catclose(catalog); From owner-p4-projects@FreeBSD.ORG Tue Mar 10 18:38:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F38B1106567A; Tue, 10 Mar 2009 18:38: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 806D31065672 for ; Tue, 10 Mar 2009 18:38: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 6CE4F8FC1C for ; Tue, 10 Mar 2009 18:38:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AIcH2r063589 for ; Tue, 10 Mar 2009 18:38:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AIcHvQ063587 for perforce@freebsd.org; Tue, 10 Mar 2009 18:38:17 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 10 Mar 2009 18:38:17 GMT Message-Id: <200903101838.n2AIcHvQ063587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 18:38:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=159016 Change 159016 by hselasky@hselasky_laptop001 on 2009/03/10 18:38:16 USB controller: Patches to make ATMEGA DCI work. - add more debugging prints. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#3 (text+ko) ==== @@ -66,7 +66,7 @@ ATMEGA_BUS2SC((pc)->tag_parent->info->bus) #if USB_DEBUG -static int atmegadci_debug = 0; +static int atmegadci_debug = 6; SYSCTL_NODE(_hw_usb2, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); SYSCTL_INT(_hw_usb2_atmegadci, OID_AUTO, debug, CTLFLAG_RW, @@ -226,8 +226,6 @@ { DPRINTFN(5, "addr=%d\n", addr); - ATMEGA_WRITE_1(sc, ATMEGA_UDADDR, addr); - addr |= ATMEGA_UDADDR_ADDEN; ATMEGA_WRITE_1(sc, ATMEGA_UDADDR, addr); @@ -296,6 +294,8 @@ if ((req.bmRequestType == UT_WRITE_DEVICE) && (req.bRequest == UR_SET_ADDRESS)) { sc->sc_dv_addr = req.wValue[0] & 0x7F; + /* must write address before ZLP */ + ATMEGA_WRITE_1(sc, ATMEGA_UDADDR, sc->sc_dv_addr); } else { sc->sc_dv_addr = 0xFF; } @@ -652,6 +652,8 @@ /* clear all set interrupts */ ATMEGA_WRITE_1(sc, ATMEGA_UDINT, ~status); + DPRINTFN(14, "UDINT=0x%02x\n", status); + /* check for any bus state change interrupts */ if (status & ATMEGA_UDINT_EORSTI) { @@ -723,6 +725,8 @@ if (status & ATMEGA_USBINT_VBUSTI) { uint8_t temp; + DPRINTFN(5, "USBINT=0x%02x\n", status); + temp = ATMEGA_READ_1(sc, ATMEGA_USBSTA); atmegadci_vbus_interrupt(sc, temp & ATMEGA_USBSTA_VBUS); } @@ -734,7 +738,7 @@ if (status) { - DPRINTFN(5, "real endpoint interrupt 0x%02x\n", status); + DPRINTFN(5, "real endpoint interrupt UEINT=0x%02x\n", status); atmegadci_interrupt_poll(sc); } @@ -1086,7 +1090,7 @@ USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", + DPRINTFN(9, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); if (xfer->flags_int.usb2_mode == USB_MODE_DEVICE) { @@ -1164,15 +1168,7 @@ ATMEGA_UECONX_EPEN | ATMEGA_UECONX_STALLRQC); - if (ep_type == UE_CONTROL) { - /* one bank, 64-bytes wMaxPacket */ - ATMEGA_WRITE_1(sc, ATMEGA_UECFG0X, - ATMEGA_UECFG0X_EPTYPE0); - ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X, - ATMEGA_UECFG1X_ALLOC | - ATMEGA_UECFG1X_EPBK0 | - ATMEGA_UECFG1X_EPSIZE(7)); - } else { + do { temp = 0; if (ep_type == UE_BULK) { temp |= ATMEGA_UECFG0X_EPTYPE2; @@ -1189,13 +1185,13 @@ ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X, ATMEGA_UECFG1X_ALLOC | ATMEGA_UECFG1X_EPBK1 | - ATMEGA_UECFG1X_EPSIZE(7)); + ATMEGA_UECFG1X_EPSIZE(3)); temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X); if (!(temp & ATMEGA_UESTA0X_CFGOK)) { DPRINTFN(0, "Chip rejected configuration\n"); } - } + } while (0); } static void @@ -1238,16 +1234,21 @@ sc->sc_bus.methods = &atmegadci_bus_methods; USB_BUS_LOCK(&sc->sc_bus); +#if 0 + /* XXX TODO - currently done by boot strap */ /* enable USB PAD regulator */ ATMEGA_WRITE_1(sc, ATMEGA_UHWCON, - ATMEGA_UHWCON_UVREGE); - + ATMEGA_UHWCON_UVREGE | ATMEGA_UHWCON_UIMOD); +#endif /* turn on clocks */ (sc->sc_clocks_on) (&sc->sc_bus); + /* make sure device is re-enumerated */ + ATMEGA_WRITE_1(sc, ATMEGA_UDCON, ATMEGA_UDCON_DETACH); + /* wait a little for things to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20); /* enable interrupts */ ATMEGA_WRITE_1(sc, ATMEGA_UDIEN, @@ -1262,7 +1263,7 @@ ATMEGA_WRITE_1(sc, ATMEGA_UERST, 0); /* disable all endpoints */ - for (n = 1; n != ATMEGA_EP_MAX; n++) { + for (n = 0; n != ATMEGA_EP_MAX; n++) { /* select endpoint */ ATMEGA_WRITE_1(sc, ATMEGA_UENUM, n); @@ -1694,6 +1695,7 @@ struct atmegadci_softc *sc = ATMEGA_BUS2SC(xfer->xroot->bus); uint16_t value; uint16_t index; + uint8_t temp; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -1982,7 +1984,38 @@ atmegadci_clocks_off(sc); break; case UHF_C_PORT_CONNECTION: + /* clear connect change flag */ sc->sc_flags.change_connect = 0; + + /* configure the control endpoint */ + + /* select endpoint number */ + ATMEGA_WRITE_1(sc, ATMEGA_UENUM, 0); + + /* set endpoint reset */ + ATMEGA_WRITE_1(sc, ATMEGA_UERST, ATMEGA_UERST_MASK(0)); + + /* clear endpoint reset */ + ATMEGA_WRITE_1(sc, ATMEGA_UERST, 0); + + /* enable and stall endpoint */ + ATMEGA_WRITE_1(sc, ATMEGA_UECONX, + ATMEGA_UECONX_EPEN | + ATMEGA_UECONX_STALLRQ); + + /* one bank, 64-bytes wMaxPacket */ + ATMEGA_WRITE_1(sc, ATMEGA_UECFG0X, + ATMEGA_UECFG0X_EPTYPE0); + ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X, + ATMEGA_UECFG1X_ALLOC | + ATMEGA_UECFG1X_EPBK0 | + ATMEGA_UECFG1X_EPSIZE(3)); + + /* check valid config */ + temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X); + if (!(temp & ATMEGA_UESTA0X_CFGOK)) { + DPRINTFN(0, "Chip rejected EP0 configuration\n"); + } break; case UHF_C_PORT_SUSPEND: sc->sc_flags.change_suspend = 0; @@ -2258,10 +2291,10 @@ { struct atmegadci_softc *sc = ATMEGA_BUS2SC(udev->bus); - DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", + DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d,%d)\n", pipe, udev->address, edesc->bEndpointAddress, udev->flags.usb2_mode, - sc->sc_rt_addr); + sc->sc_rt_addr, udev->device_index); if (udev->device_index == sc->sc_rt_addr) { ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#2 (text+ko) ==== @@ -155,6 +155,9 @@ #define ATMEGA_UHWCON 0xD7 #define ATMEGA_UHWCON_UVREGE (1 << 0) +#define ATMEGA_UHWCON_UVCONE (1 << 4) +#define ATMEGA_UHWCON_UIDE (1 << 6) +#define ATMEGA_UHWCON_UIMOD (1 << 7) #define ATMEGA_READ_1(sc, reg) \ bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg) From owner-p4-projects@FreeBSD.ORG Tue Mar 10 21:08:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 770111065674; Tue, 10 Mar 2009 21:08: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 369FB106566C for ; Tue, 10 Mar 2009 21:08: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 23B6C8FC13 for ; Tue, 10 Mar 2009 21:08:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AL8Ero005058 for ; Tue, 10 Mar 2009 21:08:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AL8EpZ005056 for perforce@freebsd.org; Tue, 10 Mar 2009 21:08:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 10 Mar 2009 21:08:14 GMT Message-Id: <200903102108.n2AL8EpZ005056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 21:08:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=159024 Change 159024 by hselasky@hselasky_laptop001 on 2009/03/10 21:07:14 USB controller: Turn off debugging by default. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#4 (text+ko) ==== @@ -66,7 +66,7 @@ ATMEGA_BUS2SC((pc)->tag_parent->info->bus) #if USB_DEBUG -static int atmegadci_debug = 6; +static int atmegadci_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); SYSCTL_INT(_hw_usb2_atmegadci, OID_AUTO, debug, CTLFLAG_RW, From owner-p4-projects@FreeBSD.ORG Tue Mar 10 21:42:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA0071065678; Tue, 10 Mar 2009 21:42: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 779641065672 for ; Tue, 10 Mar 2009 21:42:51 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 207978FC14 for ; Tue, 10 Mar 2009 21:42:51 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ALgplh008455 for ; Tue, 10 Mar 2009 21:42:51 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2ALgoQT008453 for perforce@freebsd.org; Tue, 10 Mar 2009 21:42:50 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 10 Mar 2009 21:42:50 GMT Message-Id: <200903102142.n2ALgoQT008453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 159028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 21:42:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=159028 Change 159028 by rene@rene_self on 2009/03/10 21:42:31 Add a WIP text about the change of the src repository from CVS to SVN. Section 3 and 16 need to be updated. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#16 (text+ko) ==== @@ -121,10 +121,15 @@ RELENG_7 (7.X-STABLE), HEAD (-CURRENT) + - These tags correspond to the SVN tags - stable/6, stable/7, - and head respectively. + + Noteworthy SVN Tags + + + stable/6 (6.X-STABLE), + stable/7 (7.X-STABLE), + head (-CURRENT) @@ -438,49 +443,20 @@ Practical FreeBSD examples: - + Note that cvs stores metadata in subdirectories named CVS. @@ -906,8 +882,28 @@ + The following are some Subversion examples related to the + src repository. More (in-depth) information can be found at + Subversion + Primer and List of + things missing in Subversion when compared to CVS. + The notes at + might also be useful. + + + + Check out the head branch: + + &prompt.user; svn co svn+ssh://svn.freebsd.org/base/head /usr/src + + + Use the option if you realize that - you left out important information from the commit message. + you left out important information from the commit message. + This seems only possible with CVS. Good commit messages are important. They tell others why you did the changes you did, not just right here and now, From owner-p4-projects@FreeBSD.ORG Tue Mar 10 21:56:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0405F10656EF; Tue, 10 Mar 2009 21:56:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD28810656C3 for ; Tue, 10 Mar 2009 21:56:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 991678FC22 for ; Tue, 10 Mar 2009 21:56:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ALuDRf010403 for ; Tue, 10 Mar 2009 21:56:13 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2ALu6Tq010397 for perforce@freebsd.org; Tue, 10 Mar 2009 21:56:06 GMT (envelope-from jhb@freebsd.org) Date: Tue, 10 Mar 2009 21:56:06 GMT Message-Id: <200903102156.n2ALu6Tq010397@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 159031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 21:56:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=159031 Change 159031 by jhb@jhb_jhbbsd on 2009/03/10 21:55:15 IFC @159027 Affected files ... .. //depot/projects/smpng/sys/amd64/acpica/madt.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#74 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#52 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#90 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#64 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#40 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#49 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#21 integrate .. //depot/projects/smpng/sys/amd64/include/fpu.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#15 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#18 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#36 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#7 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#15 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#10 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#20 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#18 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#18 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/devicename.c#9 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#27 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#19 integrate .. //depot/projects/smpng/sys/bsm/audit.h#13 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#14 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#56 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#95 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#9 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#43 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#10 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#29 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#26 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#11 integrate .. //depot/projects/smpng/sys/compat/ndis/resource_var.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#22 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#49 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#48 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#9 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#7 integrate .. //depot/projects/smpng/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/smpng/sys/conf/files#231 integrate .. //depot/projects/smpng/sys/conf/files.amd64#62 integrate .. //depot/projects/smpng/sys/conf/files.i386#119 integrate .. //depot/projects/smpng/sys/conf/files.ia64#63 integrate .. //depot/projects/smpng/sys/conf/files.mips#6 integrate .. //depot/projects/smpng/sys/conf/files.pc98#96 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#48 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#73 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#9 integrate .. //depot/projects/smpng/sys/conf/kern.mk#23 integrate .. //depot/projects/smpng/sys/ddb/db_expr.c#6 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#6 integrate .. //depot/projects/smpng/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/smpng/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/smpng/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/smpng/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/smpng/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#96 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#71 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#72 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#47 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#56 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#71 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#41 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#70 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#43 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#26 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#8 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#15 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#37 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#4 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_dev.c#4 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/smpng/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#10 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#9 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_cpl.h#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#13 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_ioctl.h#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#19 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/smpng/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/smpng/sys/dev/dc/if_dc.c#21 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#22 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/i915_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/r128_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/smpng/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#20 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#15 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#19 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#18 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#12 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#26 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#43 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#88 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#11 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#52 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#22 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#18 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#3 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#48 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvarp.h#6 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#105 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#24 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#31 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#48 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#72 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus.c#9 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#35 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#29 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#23 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#69 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#22 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/image/uscanner.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#130 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#23 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#76 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#39 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#18 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#17 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#17 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#50 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_redboot.c#1 branch .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#3 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#24 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#140 integrate .. //depot/projects/smpng/sys/i386/i386/in_cksum.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#136 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#118 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#114 integrate .. //depot/projects/smpng/sys/i386/include/npx.h#10 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#15 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#65 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#25 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#65 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#8 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_priv.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#107 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#74 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#54 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#178 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#57 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#63 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#64 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#41 integrate .. //depot/projects/smpng/sys/kern/tty.c#87 integrate .. //depot/projects/smpng/sys/kern/tty_info.c#5 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#16 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#86 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#116 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#6 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#89 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#163 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/smpng/sys/libkern/memmove.c#1 branch .. //depot/projects/smpng/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/smpng/sys/modules/drm/radeon/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/if_ndis/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/ndis/Makefile#8 integrate .. //depot/projects/smpng/sys/net/bpf.c#82 integrate .. //depot/projects/smpng/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/smpng/sys/net/if_gif.h#17 integrate .. //depot/projects/smpng/sys/net/if_var.h#58 integrate .. //depot/projects/smpng/sys/net/netisr.h#12 integrate .. //depot/projects/smpng/sys/net/vnet.h#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#9 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_ccatm.h#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#34 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#15 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#66 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#26 integrate .. //depot/projects/smpng/sys/netinet/igmp.h#6 integrate .. //depot/projects/smpng/sys/netinet/igmp_var.h#7 integrate .. //depot/projects/smpng/sys/netinet/in.c#49 integrate .. //depot/projects/smpng/sys/netinet/in.h#45 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#26 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#59 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#32 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#24 integrate .. //depot/projects/smpng/sys/netinet/ip6.h#11 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#53 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#46 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#105 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#95 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip_options.h#3 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#104 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#39 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#78 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#89 integrate .. //depot/projects/smpng/sys/netinet/vinet.h#6 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#22 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#61 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#14 integrate .. //depot/projects/smpng/sys/netinet6/vinet6.h#6 integrate .. //depot/projects/smpng/sys/netipsec/key.c#29 integrate .. //depot/projects/smpng/sys/netipsec/vipsec.h#5 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#83 integrate .. //depot/projects/smpng/sys/pc98/cbus/scterm-sck.c#5 integrate .. //depot/projects/smpng/sys/pc98/cbus/syscons_cbus.c#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#29 integrate .. //depot/projects/smpng/sys/pci/viapm.c#18 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#17 integrate .. //depot/projects/smpng/sys/security/audit/audit.h#11 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#14 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#20 integrate .. //depot/projects/smpng/sys/security/mac/mac_audit.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#14 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#18 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#22 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#14 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#20 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#22 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#56 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#33 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#45 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#50 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#30 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#46 integrate .. //depot/projects/smpng/sys/sys/buf.h#52 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#39 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#11 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#80 integrate .. //depot/projects/smpng/sys/sys/mount.h#72 integrate .. //depot/projects/smpng/sys/sys/param.h#137 integrate .. //depot/projects/smpng/sys/sys/pipe.h#12 integrate .. //depot/projects/smpng/sys/sys/priv.h#15 integrate .. //depot/projects/smpng/sys/sys/proc.h#194 integrate .. //depot/projects/smpng/sys/sys/sdt.h#2 integrate .. //depot/projects/smpng/sys/sys/shm.h#11 integrate .. //depot/projects/smpng/sys/sys/stat.h#21 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#56 integrate .. //depot/projects/smpng/sys/sys/systm.h#91 integrate .. //depot/projects/smpng/sys/sys/tree.h#11 integrate .. //depot/projects/smpng/sys/sys/vimage.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#96 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#72 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#111 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#17 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#69 integrate .. //depot/projects/smpng/sys/xdr/xdr_mem.c#2 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#17 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.26 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $"); #include #include @@ -483,6 +483,10 @@ apic->Id); if (ioapics[apic->Id].io_apic != NULL) panic("%s: Double APIC ID %u", __func__, apic->Id); + if (apic->GlobalIrqBase >= FIRST_MSI_INT) { + printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id); + break; + } ioapics[apic->Id].io_apic = ioapic_create(apic->Address, apic->Id, apic->GlobalIrqBase); ioapics[apic->Id].io_vector = apic->GlobalIrqBase; ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.161 2009/02/23 15:39:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.163 2009/03/05 19:42:11 jhb Exp $"); #include #include @@ -102,10 +102,11 @@ NULL, 1, "Floating point instructions executed in hardware"); static struct savefpu fpu_cleanstate; -static bool_t fpu_cleanstate_ready; /* - * Initialize floating point unit. + * Initialize the floating point unit. On the boot CPU we generate a + * clean state that is used to initialize the floating point unit when + * it is first used by a process. */ void fpuinit(void) @@ -115,22 +116,22 @@ u_short control; savecrit = intr_disable(); - PCPU_SET(fpcurthread, 0); stop_emulating(); fninit(); control = __INITIAL_FPUCW__; fldcw(&control); mxcsr = __INITIAL_MXCSR__; ldmxcsr(mxcsr); - fxsave(&fpu_cleanstate); - if (fpu_cleanstate.sv_env.en_mxcsr_mask) - cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; - else - cpu_mxcsr_mask = 0xFFBF; + if (PCPU_GET(cpuid) == 0) { + fxsave(&fpu_cleanstate); + if (fpu_cleanstate.sv_env.en_mxcsr_mask) + cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; + else + cpu_mxcsr_mask = 0xFFBF; + bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); + bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); + } start_emulating(); - bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); - bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); - fpu_cleanstate_ready = 1; intr_restore(savecrit); } @@ -384,18 +385,17 @@ static int err_count = 0; -int -fpudna() +void +fpudna(void) { struct pcb *pcb; register_t s; - u_short control; if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", ++err_count); stop_emulating(); - return (1); + return; } if (PCPU_GET(fpcurthread) != NULL) { printf("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n", @@ -420,16 +420,12 @@ * explicitly load sanitized registers. */ fxrstor(&fpu_cleanstate); - if (pcb->pcb_flags & PCB_32BIT) { - control = __INITIAL_FPUCW_I386__; - fldcw(&control); - } + if (pcb->pcb_initial_fpucw != __INITIAL_FPUCW__) + fldcw(&pcb->pcb_initial_fpucw); pcb->pcb_flags |= PCB_FPUINITDONE; } else fxrstor(&pcb->pcb_save); intr_restore(s); - - return (1); } /* @@ -457,10 +453,8 @@ register_t s; if ((td->td_pcb->pcb_flags & PCB_FPUINITDONE) == 0) { - if (fpu_cleanstate_ready) - bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate)); - else - bzero(addr, sizeof(*addr)); + bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate)); + addr->sv_env.en_cw = td->td_pcb->pcb_initial_fpucw; return (_MC_FPOWNED_NONE); } s = intr_disable(); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#74 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.691 2009/02/03 09:01:45 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.692 2009/03/05 19:42:11 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -716,7 +716,7 @@ idle_sysctl, "A", "currently selected idle function"); /* - * Clear registers on exec + * Reset registers to default values on exec. */ void exec_setregs(td, entry, stack, ps_strings) @@ -743,6 +743,7 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; + pcb->pcb_initial_fpucw = __INITIAL_FPUCW__; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#52 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.300 2009/03/08 05:01:39 sobomax Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1227,7 +1227,7 @@ #ifdef SCHED_ULE /* * SCHED_ULE doesn't allow enabling/disabling HT cores at - * run time. + * run-time. */ if (allowed != hyperthreading_allowed) return (ENOTSUP); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#90 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.649 2009/02/25 20:26:48 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.653 2009/03/10 02:12:03 alc Exp $"); /* * Manages physical address maps. @@ -1278,7 +1278,6 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free) { - vm_offset_t pteva; /* * unmap the page table page @@ -1287,19 +1286,16 @@ /* PDP page */ pml4_entry_t *pml4; pml4 = pmap_pml4e(pmap, va); - pteva = (vm_offset_t) PDPmap + amd64_ptob(m->pindex - (NUPDE + NUPDPE)); *pml4 = 0; } else if (m->pindex >= NUPDE) { /* PD page */ pdp_entry_t *pdp; pdp = pmap_pdpe(pmap, va); - pteva = (vm_offset_t) PDmap + amd64_ptob(m->pindex - NUPDE); *pdp = 0; } else { /* PTE page */ pd_entry_t *pd; pd = pmap_pde(pmap, va); - pteva = (vm_offset_t) PTmap + amd64_ptob(m->pindex); *pd = 0; } --pmap->pm_stats.resident_count; @@ -1325,12 +1321,6 @@ */ atomic_subtract_rel_int(&cnt.v_wire_count, 1); - /* - * Do an invltlb to make the invalidated mapping - * take effect immediately. - */ - pmap_invalidate_page(pmap, pteva); - /* * Put page on a list so that it is released after * *ALL* TLB shootdown is done @@ -2277,9 +2267,10 @@ pde_store(pde, newpde); /* - * Invalidate a stale mapping of the page table page. + * Invalidate a stale recursive mapping of the page table page. */ - pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); + if (va >= VM_MAXUSER_ADDRESS) + pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); /* * Demote the pv entry. This depends on the earlier demotion @@ -3253,17 +3244,12 @@ return (mpte); } } + pte = (pt_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mpte)); + pte = &pte[pmap_pte_index(va)]; } else { mpte = NULL; + pte = vtopte(va); } - - /* - * This call to vtopte makes the assumption that we are - * entering the page into the current pmap. In order to support - * quick entry into any pmap, one would likely use pmap_pte. - * But that isn't as quick as vtopte. - */ - pte = vtopte(va); if (*pte) { if (mpte != NULL) { mpte->wire_count--; @@ -3481,9 +3467,6 @@ if (dst_addr != src_addr) return; - if (!pmap_is_current(src_pmap)) - return; - vm_page_lock_queues(); if (dst_pmap < src_pmap) { PMAP_LOCK(dst_pmap); @@ -3545,14 +3528,16 @@ continue; } - srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); + srcptepaddr &= PG_FRAME; + srcmpte = PHYS_TO_VM_PAGE(srcptepaddr); KASSERT(srcmpte->wire_count > 0, ("pmap_copy: source page table page is unused")); if (va_next > end_addr) va_next = end_addr; - src_pte = vtopte(addr); + src_pte = (pt_entry_t *)PHYS_TO_DMAP(srcptepaddr); + src_pte = &src_pte[pmap_pte_index(addr)]; while (addr < va_next) { pt_entry_t ptetemp; ptetemp = *src_pte; @@ -3768,7 +3753,7 @@ void pmap_remove_pages(pmap_t pmap) { - pd_entry_t *pde; + pd_entry_t ptepde; pt_entry_t *pte, tpte; vm_page_t free = NULL; vm_page_t m, mpte, mt; @@ -3797,21 +3782,19 @@ pv = &pc->pc_pventry[idx]; inuse &= ~bitmask; - pde = vtopde(pv->pv_va); - tpte = *pde; - if ((tpte & PG_PS) != 0) - pte = pde; - else { - pte = vtopte(pv->pv_va); + pte = pmap_pdpe(pmap, pv->pv_va); + ptepde = *pte; + pte = pmap_pdpe_to_pde(pte, pv->pv_va); + tpte = *pte; + if ((tpte & (PG_PS | PG_V)) == PG_V) { + ptepde = tpte; + pte = (pt_entry_t *)PHYS_TO_DMAP(tpte & + PG_FRAME); + pte = &pte[pmap_pte_index(pv->pv_va)]; tpte = *pte & ~PG_PTE_PAT; } - - if (tpte == 0) { - printf( - "TPTE at %p IS ZERO @ VA %08lx\n", - pte, pv->pv_va); + if ((tpte & PG_V) == 0) panic("bad pte"); - } /* * We cannot remove wired pages from a process' mapping at this time @@ -3867,8 +3850,6 @@ pmap_add_delayed_free_list(mpte, &free, FALSE); atomic_subtract_int(&cnt.v_wire_count, 1); } - pmap_unuse_pt(pmap, pv->pv_va, - *pmap_pdpe(pmap, pv->pv_va), &free); } else { pmap->pm_stats.resident_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -3877,8 +3858,8 @@ if (TAILQ_EMPTY(&pvh->pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); } - pmap_unuse_pt(pmap, pv->pv_va, *pde, &free); } + pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free); } } if (allfree) { @@ -4495,7 +4476,7 @@ if (!pmap_demote_pde(kernel_pmap, pde, tmpva)) return (ENOMEM); } - pte = vtopte(tmpva); + pte = pmap_pde_to_pte(pde, tmpva); if (*pte == 0) return (EINVAL); tmpva += PAGE_SIZE; @@ -4571,7 +4552,7 @@ } else { if (cache_bits_pte < 0) cache_bits_pte = pmap_cache_bits(mode, 0); - pte = vtopte(tmpva); + pte = pmap_pde_to_pte(pde, tmpva); if ((*pte & PG_PTE_CACHE) != cache_bits_pte) { pmap_pte_attr(pte, cache_bits_pte); if (!changed) ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#64 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.330 2009/03/09 13:11:16 rwatson Exp $"); /* * AMD64 Trap and System call handling @@ -386,7 +386,6 @@ #ifdef DEV_ISA case T_NMI: /* machine/parity/power fail/"kitchen sink" faults */ - /* XXX Giant */ if (isa_nmi(code) == 0) { #ifdef KDB /* @@ -416,13 +415,8 @@ case T_DNA: /* transparent fault (due to context switch "late") */ - if (fpudna()) - goto userout; - printf("pid %d killed due to lack of floating point\n", - p->p_pid); - i = SIGKILL; - ucode = 0; - break; + fpudna(); + goto userout; case T_FPOPFLT: /* FPU operand fetch fault */ ucode = ILL_COPROC; @@ -450,11 +444,9 @@ * XXX this should be fatal unless the kernel has * registered such use. */ - if (fpudna()) { - printf("fpudna in kernel mode!\n"); - goto out; - } - break; + fpudna(); + printf("fpudna in kernel mode!\n"); + goto out; case T_STKFLT: /* stack fault */ break; @@ -537,7 +529,6 @@ #ifdef DEV_ISA case T_NMI: - /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ if (isa_nmi(code) == 0) { #ifdef KDB @@ -827,9 +818,6 @@ orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { - /* - * The prep code is MP aware. - */ (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); } else { if (code == SYS_syscall || code == SYS___syscall) { @@ -848,10 +836,6 @@ callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg; - - /* - * copyin and the ktrsyscall()/ktrsysret() code is MP-aware - */ KASSERT(narg <= sizeof(args) / sizeof(args[0]), ("Too many syscall arguments!")); error = 0; ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#40 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.260 2009/03/02 18:43:50 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,6 @@ #include -#ifdef COMPAT_IA32 - -extern struct sysentvec ia32_freebsd_sysvec; - -#endif - static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -331,7 +326,7 @@ cpu_thread_clean(td); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { /* * Set the trap frame to point at the beginning of the uts * function. @@ -377,7 +372,7 @@ return (EINVAL); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { if (td == curthread) { critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; ==== //depot/projects/smpng/sys/amd64/conf/NOTES#49 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.87 2009/02/24 00:39:48 thompsa Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.88 2009/03/07 19:54:30 thompsa Exp $ # # @@ -509,5 +509,5 @@ options VM_KMEM_SIZE_SCALE # Enable NDIS binary driver support -#options NDISAPI -#device ndis +options NDISAPI +device ndis ==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#21 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.20 2009/01/31 11:37:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.21 2009/03/05 19:42:11 jhb Exp $"); #include "opt_compat.h" @@ -729,6 +729,7 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; + pcb->pcb_initial_fpucw = __INITIAL_FPUCW_I386__; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; ==== //depot/projects/smpng/sys/amd64/include/fpu.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.34 2009/01/28 20:35:16 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.35 2009/03/05 16:56:16 jhb Exp $ */ /* @@ -97,7 +97,7 @@ #define __INITIAL_MXCSR_MASK__ 0xFFBF #ifdef _KERNEL -int fpudna(void); +void fpudna(void); void fpudrop(void); void fpuexit(struct thread *td); int fpuformat(void); ==== //depot/projects/smpng/sys/amd64/include/pcb.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 10 21:57:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D4F21065673; Tue, 10 Mar 2009 21:57: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 2335E106566B for ; Tue, 10 Mar 2009 21:57:15 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 114B48FC19 for ; Tue, 10 Mar 2009 21:57:15 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2ALvEYG010474 for ; Tue, 10 Mar 2009 21:57:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2ALvE6K010472 for perforce@freebsd.org; Tue, 10 Mar 2009 21:57:14 GMT (envelope-from jhb@freebsd.org) Date: Tue, 10 Mar 2009 21:57:14 GMT Message-Id: <200903102157.n2ALvE6K010472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 159033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 21:57:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=159033 Change 159033 by jhb@jhb_jhbbsd on 2009/03/10 21:56:13 IFC @159032 Affected files ... .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#13 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#6 integrate .. //depot/projects/smpng/sys/conf/options.arm#20 integrate Differences ... ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA#5 (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/arm/conf/CAMBRIA,v 1.7 2009/03/09 23:25:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.8 2009/03/10 21:49:51 sam Exp $ ident CAMBRIA @@ -67,6 +67,8 @@ device uart device ixpwdog # watchdog timer + +options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M device cfi # flash support device cfid # flash disk support device geom_redboot # redboot fis parser ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.1 2008/12/20 03:26:09 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.2 2009/03/10 21:49:51 sam Exp $ # # Device wiring for the Gateworks Cambria 2358. @@ -27,6 +27,10 @@ #hint.npe.1.mii="C" #hint.npe.1.phy=2 +# FLASH +hint.cfi.0.at="ixp0" +hint.cfi.0.addr=0x50000000 + # CF IDE controller hint.ata_avila.0.at="ixp0" ==== //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#13 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.17 2009/03/06 23:29:00 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.18 2009/03/10 21:47:17 sam Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -187,6 +187,10 @@ { IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* CFI Flash on the Expansion Bus */ + { IXP425_EXP_BUS_CS0_VBASE, IXP425_EXP_BUS_CS0_HWBASE, + IXP425_EXP_BUS_CS0_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* IXP425 PCI Configuration */ { IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, ==== //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.6 2009/03/06 23:32:45 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.7 2009/03/10 21:49:22 sam Exp $ * */ @@ -660,7 +660,11 @@ /* NB: CS0 is special; it maps flash */ #define IXP425_EXP_BUS_CS0_HWBASE IXP425_EXP_BUS_CSx_HWBASE(0) #define IXP425_EXP_BUS_CS0_VBASE 0xFD000000UL +#ifndef IXP4XX_FLASH_SIZE #define IXP425_EXP_BUS_CS0_SIZE 0x01000000 /* NB: 16M */ +#else +#define IXP425_EXP_BUS_CS0_SIZE IXP4XX_FLASH_SIZE +#endif #define IXP425_EXP_BUS_CS1_HWBASE IXP425_EXP_BUS_CSx_HWBASE(1) #define IXP425_EXP_BUS_CS1_VBASE IXP425_EXP_BUS_CSx_VBASE(1) #define IXP425_EXP_BUS_CS1_SIZE IXP425_EXP_BUS_CSx_SIZE ==== //depot/projects/smpng/sys/conf/options.arm#20 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.23 2008/12/20 03:26:09 sam Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.24 2009/03/10 21:49:22 sam Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h @@ -18,6 +18,7 @@ CPU_XSCALE_IXP435 opt_global.h CPU_XSCALE_PXA2X0 opt_global.h FLASHADDR opt_global.h +IXP4XX_FLASH_SIZE opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h LOADERRAMADDR opt_global.h From owner-p4-projects@FreeBSD.ORG Tue Mar 10 23:01:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B40CA10656EE; Tue, 10 Mar 2009 23:01: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 70E251065702 for ; Tue, 10 Mar 2009 23:01:20 +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 5F54D8FC19 for ; Tue, 10 Mar 2009 23:01:20 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AN1KWd016620 for ; Tue, 10 Mar 2009 23:01:20 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2AN1KpR016618 for perforce@freebsd.org; Tue, 10 Mar 2009 23:01:20 GMT (envelope-from gabor@freebsd.org) Date: Tue, 10 Mar 2009 23:01:20 GMT Message-Id: <200903102301.n2AN1KpR016618@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 Cc: Subject: PERFORCE change 159037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 23:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=159037 Change 159037 by gabor@gabor_server on 2009/03/10 23:01:18 - Fix EOF handling Thanks to: ed, delphij, James Bailie Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#41 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#46 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#41 (text+ko) ==== @@ -60,9 +60,9 @@ /* Some global variable for the buffering and reading. */ static char *lnbuf; static size_t lnbuflen; -static char *binbuf; +static unsigned char *binbuf; static int binbufsiz; -char *binbufptr; +unsigned char *binbufptr; static int bzerr; #define iswbinary(ch) (!iswspace((ch)) && iswcntrl((ch)) && (ch != L'\b') && (ch != L'\0')) @@ -74,7 +74,7 @@ int grep_fgetc(struct file *f) { - char c; + int c; switch (filebehave) { case FILE_STDIO: @@ -141,8 +141,13 @@ binbuf = grep_malloc(sizeof(char) * bufsiz); - for (; i < bufsiz && !grep_feof(f); i++) - binbuf[i] = grep_fgetc(f); + while (i < bufsiz) { + ch = grep_fgetc(f); + if (ch == EOF) + break; + binbuf[i++] = ch; + } + f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != 0; } binbufsiz = i; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#46 (text+ko) ==== @@ -144,7 +144,7 @@ void clearqueue(void); /* file.c */ -char *binbufptr; +unsigned char *binbufptr; void grep_close(struct file *f); struct file *grep_stdin_open(void); From owner-p4-projects@FreeBSD.ORG Wed Mar 11 08:25:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E46D1065677; Wed, 11 Mar 2009 08:25:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8D861065675 for ; Wed, 11 Mar 2009 08:25:07 +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 8C8628FC15 for ; Wed, 11 Mar 2009 08:25:07 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2B8P7rM093869 for ; Wed, 11 Mar 2009 08:25:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2B8P7Fg093867 for perforce@freebsd.org; Wed, 11 Mar 2009 08:25:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Mar 2009 08:25:07 GMT Message-Id: <200903110825.n2B8P7Fg093867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2009 08:25:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=159053 Change 159053 by hselasky@hselasky_laptop001 on 2009/03/11 08:24:55 USB CORE: More HID fixes: - preserve item size and count accross items - add some more debugging prints Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#22 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#22 (text+ko) ==== @@ -68,7 +68,9 @@ struct hid_item cur[MAXPUSH]; int32_t usages_min[MAXUSAGE]; int32_t usages_max[MAXUSAGE]; - int kindset; + uint32_t loc_size; /* last seen size */ + uint32_t loc_count; /* last seen count */ + uint8_t kindset; /* we have 5 kinds so 8 bits are enough */ uint8_t pushlevel; /* current pushlevel */ uint8_t ncount; /* end usage item count */ uint8_t icount; /* current usage item count */ @@ -268,6 +270,9 @@ c->kind = hid_input; c->flags = dval; ret: + c->loc.count = s->loc_count; + c->loc.size = s->loc_size; + if (c->flags & HIO_VARIABLE) { /* range check usage count */ if (c->loc.count > 255) { @@ -287,6 +292,7 @@ } /* make sure we have a usage */ if (s->nusage == 0) { + DPRINTFN(1, "Using default usage\n"); /* use the undefined HID PAGE */ s->usages_min[s->nusage] = 0x0000; s->usages_max[s->nusage] = 0xFFFF; @@ -346,7 +352,8 @@ c->unit = dval; break; case 7: - c->loc.size = dval; + /* mask because value is unsigned */ + s->loc_size = dval & mask; break; case 8: c->report_ID = dval; @@ -354,12 +361,17 @@ c->loc.pos = 0; break; case 9: - c->loc.count = dval; + /* mask because value is unsigned */ + s->loc_count = dval & mask; break; case 10: /* Push */ s->pushlevel ++; if (s->pushlevel < MAXPUSH) { s->cur[s->pushlevel] = *c; + /* store size and count */ + c->loc.size = s->loc_size; + c->loc.count = s->loc_count; + /* update current item pointer */ c = &s->cur[s->pushlevel]; } else { DPRINTFN(0, "Cannot push " @@ -372,7 +384,13 @@ /* preserve position */ oldpos = c->loc.pos; c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->loc.size; + s->loc_count = c->loc.count; + /* set default item location */ c->loc.pos = oldpos; + c->loc.size = 0; + c->loc.count = 0; } else { DPRINTFN(0, "Cannot pop " "item @ %d!\n", s->pushlevel); From owner-p4-projects@FreeBSD.ORG Wed Mar 11 22:22:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 456181065676; Wed, 11 Mar 2009 22:22: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 003661065672 for ; Wed, 11 Mar 2009 22:22:41 +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 E24EA8FC12 for ; Wed, 11 Mar 2009 22:22:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2BMMfvX054283 for ; Wed, 11 Mar 2009 22:22:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2BMMfP8054281 for perforce@freebsd.org; Wed, 11 Mar 2009 22:22:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Mar 2009 22:22:41 GMT Message-Id: <200903112222.n2BMMfP8054281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2009 22:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=159091 Change 159091 by hselasky@hselasky_laptop001 on 2009/03/11 22:21:41 USB CORE: Be less strict on the last HID item usage. Reported by: Andrey Chernov Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#23 (text+ko) ==== @@ -68,6 +68,7 @@ struct hid_item cur[MAXPUSH]; int32_t usages_min[MAXUSAGE]; int32_t usages_max[MAXUSAGE]; + int32_t usage_last; /* last seen usage */ uint32_t loc_size; /* last seen size */ uint32_t loc_count; /* last seen count */ uint8_t kindset; /* we have 5 kinds so 8 bits are enough */ @@ -183,15 +184,21 @@ top: /* check if there is an array of items */ - if ((s->icount != s->ncount) && - (s->iusage != s->nusage)) { - dval = s->usages_min[s->iusage] + s->ousage; - c->usage = dval; - if (dval == s->usages_max[s->iusage]) { - s->iusage ++; - s->ousage = 0; + if (s->icount < s->ncount) { + /* get current usage */ + if (s->iusage < s->nusage) { + dval = s->usages_min[s->iusage] + s->ousage; + c->usage = dval; + s->usage_last = dval; + if (dval == s->usages_max[s->iusage]) { + s->iusage ++; + s->ousage = 0; + } else { + s->ousage ++; + } } else { - s->ousage ++; + DPRINTFN(1, "Using last usage\n"); + dval = s->usage_last; } s->icount ++; /* @@ -290,14 +297,9 @@ } else { s->ncount = 1; } - /* make sure we have a usage */ - if (s->nusage == 0) { - DPRINTFN(1, "Using default usage\n"); - /* use the undefined HID PAGE */ - s->usages_min[s->nusage] = 0x0000; - s->usages_max[s->nusage] = 0xFFFF; - s->nusage = s->ncount; - } + /* set default usage */ + /* use the undefined HID PAGE */ + s->usage_last = 0; goto top; case 9: /* Output */ From owner-p4-projects@FreeBSD.ORG Thu Mar 12 12:53:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1684106567F; Thu, 12 Mar 2009 12:53:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 359D3106567B for ; Thu, 12 Mar 2009 12:53:34 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D1EA8FC22 for ; Thu, 12 Mar 2009 12:53:34 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2CCrX9s090729 for ; Thu, 12 Mar 2009 12:53:33 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2CCrX1A090727 for perforce@freebsd.org; Thu, 12 Mar 2009 12:53:33 GMT (envelope-from antab@FreeBSD.org) Date: Thu, 12 Mar 2009 12:53:33 GMT Message-Id: <200903121253.n2CCrX1A090727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 159118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 12:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=159118 Change 159118 by antab@antab_farm on 2009/03/12 12:52:35 - Add at32_tc to serve as bus to attach TC channels to. Each TC module has 3 channels. - Add at32_tc_channel driver stub to test at32_tc. - Add clock driver for system clock, attaches to at32_tc. This driver calls hardclock(). - Changes to intr code to make interrupts work. - Rearrange NGW100 kernel config to match GENERIC on i386/amd64 Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#6 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#1 add .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#1 add .. //depot/projects/avr32/src/sys/avr32/avr32/clock.c#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#8 edit .. //depot/projects/avr32/src/sys/avr32/avr32/intr.c#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#14 edit .. //depot/projects/avr32/src/sys/avr32/avr32/stack_machdep.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#8 edit .. //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#9 edit .. //depot/projects/avr32/src/sys/avr32/conf/NGW100#13 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#2 edit .. //depot/projects/avr32/src/sys/avr32/include/reg_tc.h#1 add .. //depot/projects/avr32/src/sys/conf/files.avr32#13 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#6 (text+ko) ==== @@ -240,11 +240,11 @@ switch (type) { case SYS_RES_IRQ: rle->res = rman_reserve_resource(&sc->sc_irq_rman, - start, end, count, flags, child); + start, end, count, flags, child); break; case SYS_RES_MEMORY: rle->res = rman_reserve_resource(&sc->sc_mem_rman, - start, end, count, flags, child); + start, end, count, flags, child); if (rle->res != NULL) { rman_set_bustag(rle->res, 0); rman_set_bushandle(rle->res, start); ==== //depot/projects/avr32/src/sys/avr32/avr32/clock.c#5 (text+ko) ==== @@ -24,6 +24,12 @@ * SUCH DAMAGE. */ +/* + * System clock. We use one TC channel to implement it. The channel used + * depends on device hints and can be any of the TC channels. Clock select 0 + * is wired to 32KHz osc on AT32AP700x + */ + #include __FBSDID("$FreeBSD: $"); @@ -40,29 +46,167 @@ #include #include #include +#include +#include #include +#include #include #include +#include +#include #include +#define RD4(off) \ + bus_space_read_4(sc->bst, sc->bsh, (off)) +#define WR4(off, val) \ + bus_space_write_4(sc->bst, sc->bsh, (off), (val)) + /* Prototypes */ -static unsigned count_get_timecount(struct timecounter *); +static int clock_probe(device_t); +static int clock_attach(device_t); +static int clock_detach(device_t); +static int clock_intr(void *arg); +static unsigned clock_get_timecount(struct timecounter *); /* Variable and private data */ -uint64_t clock_cpu_frequency; /* Finzd batter way for this */ +uint64_t clock_cpu_frequency; /* Find batter way for this */ static uint64_t cycles_per_usec; static uint64_t cycles_per_hz; -static struct timecounter count_timecounter = { - count_get_timecount, /* get_timecount */ +static struct timecounter clock_timecounter = { + clock_get_timecount, /* get_timecount */ 0, /* no poll_pps */ 0xffffffffu, /* counter_mask */ - 0, /* frequency */ + 32768, /* frequency */ "AVR32", /* name */ 1000, /* quality (adjusted in code) */ }; +struct clock_softc { + struct resource *regs_res; + struct resource *irq_res; + void *intrhand; + bus_space_tag_t bst; + bus_space_handle_t bsh; + uint32_t ticks; +} *clock_softc; +static device_method_t clock_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, clock_probe), + DEVMETHOD(device_attach, clock_attach), + DEVMETHOD(device_detach, clock_detach), + {0, 0}, +}; +static driver_t clock_driver = { + "clock", + clock_methods, + sizeof(struct clock_softc), +}; +static devclass_t clock_devclass; +DRIVER_MODULE(clock, at32_tc, clock_driver, clock_devclass, 0, 0); /* Code */ +static int +clock_probe(device_t dev) +{ + if (device_get_unit(dev) != 0) { + panic("Can't attach more then one system clock"); + } + + device_set_desc(dev, "System clock"); + return (0); +} + +static int +clock_attach(device_t dev) +{ + struct clock_softc *sc = device_get_softc(dev); + int rid, err = ENOMEM; + + /* Make sure device clock is enabled before writing */ + devclk_enable(dev); + + /* Setup register space */ + rid = 0; + sc->regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->regs_res == NULL) { + goto errout; + } + sc->bsh = rman_get_bushandle(sc->regs_res); + sc->bst = rman_get_bustag(sc->regs_res); + + /* Setup interrupt */ + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE | RF_SHAREABLE); + if (sc->irq_res == NULL) { + goto errout; + } + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CLK, clock_intr, NULL, + NULL, &sc->intrhand); + if (err) { + goto errout; + } + + clock_softc = sc; + return (0); + +errout: + clock_detach(dev); + return (err); +} + +static int +clock_detach(device_t dev) +{ + struct clock_softc *sc = device_get_softc(dev); + + if (sc->intrhand != NULL) { + bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + sc->intrhand = NULL; + } + if (sc->regs_res != NULL) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); + sc->irq_res = NULL; + } + if (sc->regs_res != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(sc->regs_res), sc->regs_res); + sc->regs_res = NULL; + } + + /* Turn off device clock */ + devclk_disable(dev); + return (0); +} + +static int +clock_intr(void *arg) +{ + struct trapframe *tf = arg; + struct clock_softc *sc = clock_softc; + register_t sr; + int ret = FILTER_STRAY;; + + /* + * Clock interrupt is shared with other TC channels, check if this + * interrupt is for us, reading SR also clears any pending triggers + */ + + critical_enter(); + sr = RD4(AT32_TC_SR); + if (bit_value(TC, SR, CPCS, sr)) { + sc->ticks += clock_timecounter.tc_frequency / hz; + + hardclock(TRAPF_USERMODE(tf), TRAPF_PC(tf)); + ret = FILTER_HANDLED; + } + critical_exit(); + + return (ret); +} + void cpu_startprofclock(void) { @@ -85,16 +229,52 @@ void cpu_initclocks(void) { - count_timecounter.tc_frequency = clock_cpu_frequency; + struct clock_softc *sc = clock_softc; + uint32_t rel_value, new_hz; + + if (clock_softc == NULL) { + panic("No system clock set"); + } + + /* + * Calculate Register C compare value. + */ + rel_value = clock_timecounter.tc_frequency / hz; + if (rel_value < 1) { + rel_value = 1; + } + new_hz = clock_timecounter.tc_frequency / rel_value; + if (hz != new_hz) { + printf("Cannot get %d Hz clock; using %d Hz instead\n", hz, new_hz); + hz = new_hz; + tick = 1000000 / hz; + } + + /* Set counter mode */ + WR4(AT32_TC_CMR, + bit_offset(TC, CMR, WAVE) | + 2 << bit_shift(TC, CMR, WAVSEL)); + + /* RC value to interrupt on */ + WR4(AT32_TC_RC, rel_value); + + /* Enable interupt RC compare */ + WR4(AT32_TC_IER, bit_offset(TC, IER, CPCS)); + + /* Enable clock and reset counter */ + WR4(AT32_TC_CCR, + bit_offset(TC, CCR, CLKEN) | + bit_offset(TC, CCR, SWTRG)); + cycles_per_hz = clock_cpu_frequency / hz; cycles_per_usec = (clock_cpu_frequency / (1000 * 1000)); - tc_init(&count_timecounter); + tc_init(&clock_timecounter); } static unsigned -count_get_timecount(struct timecounter *tc) +clock_get_timecount(struct timecounter *tc) { - return sysreg_read(COUNT); + return (clock_softc->ticks); } /* ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#8 (text+ko) ==== @@ -223,7 +223,6 @@ mov r12, AT32_SYS_ECR mov r11, sp csrf AT32_SYS_SR_EM - csrf AT32_SYS_SR_GM rcall trap_handle_breakpoint POP_TRAPFRAME(DBG) retd ==== //depot/projects/avr32/src/sys/avr32/avr32/intr.c#5 (text+ko) ==== @@ -46,6 +46,8 @@ /* Private data */ static struct intr_event *intr_event[IRQ_COUNT]; +static int intrcnt_tab[IRQ_COUNT]; +static int intrcnt_index = 0; extern vm_offset_t _evba; /* Code */ @@ -62,7 +64,10 @@ void intr_restore(register_t s) { - __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_GM)); + register_t sr; + + sr = sysreg_read(SR) & ~INTR_MASK; + sysreg_write(SR, sr | (s & INTR_MASK)); } void @@ -102,6 +107,7 @@ if (intr_event_handle(intr_event[irq], tf) != 0) { panic("stray interrupt %d, priority %d\n", irq, pri); } + intrcnt[intrcnt_tab[irq]]++; } void @@ -141,11 +147,16 @@ if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, irq, (mask_fn)avr32_mask_irq, (mask_fn)avr32_unmask_irq, - NULL, NULL, "intr%d:", irq); + NULL, NULL, "irq%d:", irq); if (error) { return; } intr_event[irq] = event; + snprintf(intrnames + (MAXCOMLEN + 1) * intrcnt_index, + MAXCOMLEN + 1, + "irq%d: %-*s", irq, MAXCOMLEN, name); + intrcnt_tab[irq] = intrcnt_index; + intrcnt_index++; } intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep); ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#14 (text+ko) ==== @@ -1079,7 +1079,7 @@ pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); struct thread *td = curthread; pt_entry_t *ent; - register_t mmucr, intr; + register_t mmucr; ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; if (ent) { @@ -1092,7 +1092,6 @@ * hit memory needs tlb lookups from here one. */ __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_EM)); - __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_GM)); struct proc *p = curproc; vm_prot_t ftype; @@ -1156,9 +1155,6 @@ *ent |= PTE_DIRTY; } - /* XXX: Exceptions are enabled in the long path */ - intr = intr_disable(); - mmucr = sysreg_read(MMUCR); mmucr &= ~bit_mask(SYS, MMUCR, DRP); mmucr |= tlb_at << bit_shift(SYS, MMUCR, DRP); @@ -1180,9 +1176,6 @@ tlb_at = KSTACK_PAGES; } - /* XXX */ - intr_restore(intr); - out: if (!TRAPF_USERMODE(tf)) { return; ==== //depot/projects/avr32/src/sys/avr32/avr32/stack_machdep.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ (KSTACK_PAGES * PAGE_SIZE)) { break; } - if (frame->lr == NULL) { + if (frame->lr == 0) { break; } ==== //depot/projects/avr32/src/sys/avr32/avr32/switch.S#8 (text+ko) ==== @@ -58,6 +58,7 @@ /** * r12: Pointer struct thread * r11: Pmap + * r10: Saved SR * NOTE: This code is messy and i need to find better way to do this. */ ENTRY(restorectx) @@ -72,8 +73,11 @@ * r4: Misc * r3: tlbehi save * r2: Address of PCB + * r1: Saved SR */ + mov r1, r10 + /* Load PCB and PD address */ ld.w r2, r12[TD_PCB] @@ -137,6 +141,7 @@ mtsr AT32_SYS_PTBR, r11 /* Point lookups to new pmap */ mtsr AT32_SYS_TLBEHI, r10 /* Set TLBEHI (ASID for new td) */ nop /* Wait for mtsr */ + mtsr AT32_SYS_SR, r1 /* Restore saved SR */ ld.w r4, r2++ /* Load status register */ musfr r4 /* Set status register */ sub r2, -4 /* Skip PC */ ==== //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#9 (text+ko) ==== @@ -50,7 +50,7 @@ #include #include -void restorectx(struct thread *td, pmap_t pmap); +void restorectx(struct thread *td, pmap_t pmap, register_t sr); /* * Finish a fork operation, with process p2 nearly set up. @@ -209,11 +209,16 @@ void cpu_switch(struct thread *old, struct thread *new, struct mtx *mtx) { + register_t sr; pmap_t pmap; + /* Disable interrupts, they will get enabled in restorectx() */ + sr = intr_disable(); + if (!savectx(old->td_pcb)) { old->td_lock = mtx; PCPU_SET(curthread, new); + PCPU_SET(curpcb, curthread->td_pcb); pmap = vmspace_pmap(new->td_proc->p_vmspace); pmap_activate(new); @@ -222,7 +227,7 @@ pmap, new->td_kstack, new->td_kstack + (KSTACK_PAGES * PAGE_SIZE) - 1); */ - restorectx(new, pmap); + restorectx(new, pmap, sr); /* We should not get here. */ panic("cpu_switch: restorectx() returned"); ==== //depot/projects/avr32/src/sys/avr32/conf/NGW100#13 (text+ko) ==== @@ -9,48 +9,69 @@ hints "cpu/at32ap700x.hints" # Hints for all buildin devices hints "cpu/at32ap7000.hints" # Hints for all buildin devices hints "NGW100.hints" + +# Uncomment to boot from onboard flash options ROOTDEVNAME=\"ufs:cfid0h1\" +# Uncomment to boot from ethernet +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_COMPAT + makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -#options VERBOSE_SYSINIT -options DDB -options KDB -#options GDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework +options SCHED_4BSD # 4BSD scheduler +#options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +#options INET6 # IPv6 communications protocols +#options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +#options MSDOSFS # MSDOS Filesystem +#options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +#options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +#options KBD_INSTALL_CDEV # install a CDEV entry in /dev +#options AUDIT # Security event auditing +#options KDTRACE_HOOKS # Kernel DTrace hooks # Debugging for use in -current options DIAGNOSTIC +options KDB # Enable kernel debugger support. +options DDB # Support DDB +#options GDB # Support remote GDB options INVARIANTS #Enable calls of extra sanity checking 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 WITNESS_KDB + device at32_intc # Interrupt controller device at32_hmatrix # HSB Bus Matrix device at32_sdramc # SDRAM controller device at32_smc # Static memory controller device at32_pm # Power Manager -device at32_rtc # Real Time Counter (System clock) +device at32_rtc # Real Time Counter device at32_pio # Peripheral IO -#device mii # Requred for ate -#device ate # MACB Ethernet driver +device at32_tc # Timer/Counter (REQUIRED: Used for system clock) +device at32_tc_channel # Timer/Counter channel +device mii # Requred for ate +device ate # MACB Ethernet driver -#device gpio # GPIO framework device uart # USART support #device atmel_twi # TWI (I2C) support #device atmel_ssc # Sync Serial controller @@ -62,9 +83,13 @@ device geom_hints # Pseudo devices. -device loop -device random -device ether -device md +device loop # Network loopback +device random # Entropy device +device ether # Ethernet support +#device tun # Packet tunnel. +#device pty # BSD-style compatibility pseudo ttys +#device md # Memory "disks" +#device gif # IPv6 and IPv4 tunneling +#device faith # IPv6-to-IPv4 relaying (translation) #device mmc #device mmcsd ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#2 (text+ko) ==== @@ -122,11 +122,30 @@ hint.at32_tc.0.msize="0x400" hint.at32_tc.0.irq="22" +hint.at32_tc_channel.0.at="at32_tc0" +hint.at32_tc_channel.0.offset="0x00" + +hint.at32_tc_channel.1.at="at32_tc0" +hint.at32_tc_channel.1.offset="0x40" + +hint.at32_tc_channel.2.at="at32_tc0" +hint.at32_tc_channel.2.offset="0x80" + hint.at32_tc.1.at="at32bus0" hint.at32_tc.1.maddr="0xFFF01000" hint.at32_tc.1.msize="0x400" hint.at32_tc.1.irq="23" +hint.at32_tc_channel.3.at="at32_tc1" +hint.at32_tc_channel.3.offset="0x00" + +hint.at32_tc_channel.4.at="at32_tc1" +hint.at32_tc_channel.4.offset="0x40" + +# Channel 3 on TC1 is used for system clock +hint.clock.0.at="at32_tc1" +hint.clock.0.offset="0x80" + hint.at32_pwm.0.at="at32bus0" hint.at32_pwm.0.maddr="0xFFF01400" hint.at32_pwm.0.msize="0x400" ==== //depot/projects/avr32/src/sys/conf/files.avr32#13 (text+ko) ==== @@ -28,13 +28,15 @@ avr32/avr32/stack_machdep.c optional ddb | stack avr32/avr32/gdb_machdep.c optional gdb +avr32/avr32/at32_hmatrix.c optional at32_hmatrix avr32/avr32/at32_intc.c optional at32_intc +avr32/avr32/at32_pio.c optional at32_pio avr32/avr32/at32_pm.c optional at32_pm -avr32/avr32/at32_hmatrix.c optional at32_hmatrix avr32/avr32/at32_rtc.c optional at32_rtc -avr32/avr32/at32_pio.c optional at32_pio avr32/avr32/at32_sdramc.c optional at32_sdramc avr32/avr32/at32_smc.c optional at32_smc +avr32/avr32/at32_tc.c optional at32_tc +avr32/avr32/at32_tc_channel.c optional at32_tc_channel dev/mmc/atmel_mci.c optional atmel_mci dev/spibus/atmel_spi.c optional atmel_spi avr32/avr32/busdma_machdep.c optional at32_mci @@ -53,6 +55,7 @@ libkern/qdivrem.c standard #libkern/udivdi3.c standard #libkern/umoddi3.c standard +libkern/memset.c standard avr32/avr32/in_cksum.c optional inet From owner-p4-projects@FreeBSD.ORG Thu Mar 12 20:20:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79B901065675; Thu, 12 Mar 2009 20:20: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 37847106566C for ; Thu, 12 Mar 2009 20:20:16 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2444E8FC14 for ; Thu, 12 Mar 2009 20:20:16 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2CKKGHo050535 for ; Thu, 12 Mar 2009 20:20:16 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2CKKGBa050532 for perforce@freebsd.org; Thu, 12 Mar 2009 20:20:16 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 12 Mar 2009 20:20:16 GMT Message-Id: <200903122020.n2CKKGBa050532@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 159130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 20:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=159130 Change 159130 by sson@sson_amd64 on 2009/03/12 20:19:42 Various fixes in audit_fcntl.h and bsm_fcntl.c: - Add missing F_GETXFL in audit_fcntl.h. - BSM_F_SETLK_NBMAND should be defined as 42 and BSM_F_SETLK64_NBMAND should be 44. - Note that BSM_F_DUF2FD is both FreeBSD and Solaris specific. - Add file system specific fcntl commands for darwin. - Many comment fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 $ */ #include @@ -121,14 +121,17 @@ #ifdef F_UNSHARE { BSM_F_UNSHARE, F_UNSHARE }, #endif -#ifdef F_SETLK64_NBMAND - { BSM_F_SETLK64_NBMAND, F_SETLK64_NBMAND }, +#ifdef F_SETLK_NBMAND + { BSM_F_SETLK_NBMAND, F_SETLK_NBMAND }, #endif #ifdef F_SHARE_NBMAND { BSM_F_SHARE_NBMAND, F_SHARE_NBMAND }, #endif -#ifdef F_SETLK_NBMAND - { BSM_F_SETLK_NBMAND, F_SETLK_NBMAND }, +#ifdef F_SETLK64_NBMAND + { BSM_F_SETLK64_NBMAND, F_SETLK64_NBMAND }, +#endif +#ifdef F_GETXFL + { BSM_F_GETXFL, F_GETXFL }, #endif #ifdef F_BADFD { BSM_F_BADFD, F_BADFD }, @@ -146,6 +149,13 @@ { BSM_F_SETLK_REMOTE, F_SETLK_REMOTE }, #endif +#ifdef F_SETSIG + { BSM_F_SETSIG, F_SETSIG }, +#endif +#ifdef F_GETSIG + { BSM_F_GETSIG, F_GETSIG }, +#endif + #ifdef F_CHKCLEAN { BSM_F_CHKCLEAN, F_CHKCLEAN }, #endif @@ -207,12 +217,24 @@ { BSM_F_MARKDEPENDENCY, F_MARKDEPENDENCY }, #endif -#ifdef F_SETSIG - { BSM_F_SETSIG, F_SETSIG }, -#endif -#ifdef F_GETSIG - { BSM_F_GETSIG, F_GETSIG }, -#endif +#ifdef FCNTL_FS_SPECIFIC_BASE + { BSM_F_FS_SPECIFIC_0, FCNTL_FS_SPECIFIC_BASE}, + { BSM_F_FS_SPECIFIC_1, FCNTL_FS_SPECIFIC_BASE + 1}, + { BSM_F_FS_SPECIFIC_2, FCNTL_FS_SPECIFIC_BASE + 2}, + { BSM_F_FS_SPECIFIC_3, FCNTL_FS_SPECIFIC_BASE + 3}, + { BSM_F_FS_SPECIFIC_4, FCNTL_FS_SPECIFIC_BASE + 4}, + { BSM_F_FS_SPECIFIC_5, FCNTL_FS_SPECIFIC_BASE + 5}, + { BSM_F_FS_SPECIFIC_6, FCNTL_FS_SPECIFIC_BASE + 6}, + { BSM_F_FS_SPECIFIC_7, FCNTL_FS_SPECIFIC_BASE + 7}, + { BSM_F_FS_SPECIFIC_8, FCNTL_FS_SPECIFIC_BASE + 8}, + { BSM_F_FS_SPECIFIC_9, FCNTL_FS_SPECIFIC_BASE + 9}, + { BSM_F_FS_SPECIFIC_10, FCNTL_FS_SPECIFIC_BASE + 10}, + { BSM_F_FS_SPECIFIC_11, FCNTL_FS_SPECIFIC_BASE + 11}, + { BSM_F_FS_SPECIFIC_12, FCNTL_FS_SPECIFIC_BASE + 12}, + { BSM_F_FS_SPECIFIC_13, FCNTL_FS_SPECIFIC_BASE + 13}, + { BSM_F_FS_SPECIFIC_14, FCNTL_FS_SPECIFIC_BASE + 14}, + { BSM_F_FS_SPECIFIC_15, FCNTL_FS_SPECIFIC_BASE + 15}, +#endif /* FCNTL_FS_SPECIFIC_BASE */ }; static const int bsm_fcntl_cmd_count = sizeof(bsm_fcntl_cmdtab) / sizeof(bsm_fcntl_cmdtab[0]); ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 $ */ #ifndef _BSM_AUDIT_FCNTL_H_ @@ -43,77 +43,98 @@ #define BSM_F_O_GETLK 5 /* Solaris-specific. */ #define BSM_F_SETLK 6 #define BSM_F_SETLKW 7 -#define BSM_F_CHKFL 8 /* Solaris-specific */ -#define BSM_F_DUP2FD 9 /* Solaris-specific */ -#define BSM_F_ALLOCSP 10 /* Solaris-specific */ -#define BSM_F_FREESP 11 /* Solaris-specific */ +#define BSM_F_CHKFL 8 /* Solaris-specific. */ +#define BSM_F_DUP2FD 9 /* FreeBSD/Solaris-specific. */ +#define BSM_F_ALLOCSP 10 /* Solaris-specific. */ +#define BSM_F_FREESP 11 /* Solaris-specific. */ -#define BSM_F_ISSTREAM 13 /* Solaris-specific */ +#define BSM_F_ISSTREAM 13 /* Solaris-specific. */ #define BSM_F_GETLK 14 -#define BSM_F_PRIV 15 /* Solaris-specific */ -#define BSM_F_NPRIV 16 /* Solaris-specific */ -#define BSM_F_QUOTACTL 17 /* Solaris-specific */ -#define BSM_F_BLOCKS 18 /* Solaris-specific */ -#define BSM_F_BLKSIZE 19 /* Solaris-specific */ +#define BSM_F_PRIV 15 /* Solaris-specific. */ +#define BSM_F_NPRIV 16 /* Solaris-specific. */ +#define BSM_F_QUOTACTL 17 /* Solaris-specific. */ +#define BSM_F_BLOCKS 18 /* Solaris-specific. */ +#define BSM_F_BLKSIZE 19 /* Solaris-specific. */ #define BSM_F_GETOWN 23 #define BSM_F_SETOWN 24 -#define BSM_F_REVOKE 25 /* Solaris-specific */ -#define BSM_F_HASREMOTELOCKS 26 /* Solaris-specific */ -#define BSM_F_FREESP64 27 /* Solaris-specific */ -#define BSM_F_ALLOCSP64 28 /* Solaris-specific */ +#define BSM_F_REVOKE 25 /* Solaris-specific. */ +#define BSM_F_HASREMOTELOCKS 26 /* Solaris-specific. */ +#define BSM_F_FREESP64 27 /* Solaris-specific. */ +#define BSM_F_ALLOCSP64 28 /* Solaris-specific. */ -#define BSM_F_GETLK64 33 /* Solaris-specific */ -#define BSM_F_SETLK64 34 /* Solaris-specific */ -#define BSM_F_SETLKW64 35 /* Solaris-specific */ +#define BSM_F_GETLK64 33 /* Solaris-specific. */ +#define BSM_F_SETLK64 34 /* Solaris-specific. */ +#define BSM_F_SETLKW64 35 /* Solaris-specific. */ -#define BSM_F_SHARE 40 /* Solaris-specific */ -#define BSM_F_UNSHARE 41 /* Solaris-specific */ -#define BSM_F_SETLK64_NBMAND 42 /* Solaris-specific */ -#define BSM_F_SHARE_NBMAND 43 /* Solaris-specific */ -#define BSM_F_SETLK_NBMAND 44 /* Solaris-specific */ - -#define BSM_F_BADFD 46 /* Solaris-specific */ +#define BSM_F_SHARE 40 /* Solaris-specific. */ +#define BSM_F_UNSHARE 41 /* Solaris-specific. */ +#define BSM_F_SETLK_NBMAND 42 /* Solaris-specific. */ +#define BSM_F_SHARE_NBMAND 43 /* Solaris-specific. */ +#define BSM_F_SETLK64_NBMAND 44 /* Solaris-specific. */ +#define BSM_F_GETXFL 45 /* Solaris-specific. */ +#define BSM_F_BADFD 46 /* Solaris-specific. */ /* * FreeBSD-specific (100-199). */ -#define BSM_F_OGETLK 107 /* FreeBSD-specific */ -#define BSM_F_OSETLK 108 /* FreeBSD-specific */ -#define BSM_F_OSETLKW 109 /* FreeBSD-specific */ +#define BSM_F_OGETLK 107 /* FreeBSD-specific. */ +#define BSM_F_OSETLK 108 /* FreeBSD-specific. */ +#define BSM_F_OSETLKW 109 /* FreeBSD-specific. */ + +#define BSM_F_SETLK_REMOTE 114 /* FreeBSD-specific. */ -#define BSM_F_SETLK_REMOTE 114 /* FreeBSD-specific */ +/* + * Linux-specific (200-299). + */ +#define BSM_F_SETSIG 210 /* Linux-specific. */ +#define BSM_F_GETSIG 211 /* Linux-specific. */ /* - * Darwin-specific (200-299). + * Darwin-specific (300-399). */ -#define BSM_F_CHKCLEAN 241 /* Darwin-specific */ -#define BSM_F_PREALLOCATE 242 /* Darwin-specific */ -#define BSM_F_SETSIZE 243 /* Darwin-specific */ -#define BSM_F_RDADVISE 244 /* Darwin-specific */ -#define BSM_F_RDAHEAD 245 /* Darwin-specific */ -#define BSM_F_READBOOTSTRAP 246 /* Darwin-specific */ -#define BSM_F_WRITEBOOTSTRAP 247 /* Darwin-specific */ -#define BSM_F_NOCACHE 248 /* Darwin-specific */ -#define BSM_F_LOG2PHYS 249 /* Darwin-specific */ -#define BSM_F_GETPATH 250 /* Darwin-specific */ -#define BSM_F_FULLFSYNC 251 /* Darwin-specific */ -#define BSM_F_PATHPKG_CHECK 252 /* Darwin-specific */ -#define BSM_F_FREEZE_FS 253 /* Darwin-specific */ -#define BSM_F_THAW_FS 254 /* Darwin-specific */ -#define BSM_F_GLOBAL_NOCACHE 255 /* Darwin-specific */ -#define BSM_F_OPENFROM 256 /* Darwin-specific */ -#define BSM_F_UNLINKFROM 257 /* Darwin-specific */ -#define BSM_F_CHECK_OPENEVT 258 /* Darwin-specific */ -#define BSM_F_ADDSIGS 259 /* Darwin-specific */ -#define BSM_F_MARKDEPENDENCY 260 /* Darwin-specific */ +#define BSM_F_CHKCLEAN 341 /* Darwin-specific. */ +#define BSM_F_PREALLOCATE 342 /* Darwin-specific. */ +#define BSM_F_SETSIZE 343 /* Darwin-specific. */ +#define BSM_F_RDADVISE 344 /* Darwin-specific. */ +#define BSM_F_RDAHEAD 345 /* Darwin-specific. */ +#define BSM_F_READBOOTSTRAP 346 /* Darwin-specific. */ +#define BSM_F_WRITEBOOTSTRAP 347 /* Darwin-specific. */ +#define BSM_F_NOCACHE 348 /* Darwin-specific. */ +#define BSM_F_LOG2PHYS 349 /* Darwin-specific. */ +#define BSM_F_GETPATH 350 /* Darwin-specific. */ +#define BSM_F_FULLFSYNC 351 /* Darwin-specific. */ +#define BSM_F_PATHPKG_CHECK 352 /* Darwin-specific. */ +#define BSM_F_FREEZE_FS 353 /* Darwin-specific. */ +#define BSM_F_THAW_FS 354 /* Darwin-specific. */ +#define BSM_F_GLOBAL_NOCACHE 355 /* Darwin-specific. */ +#define BSM_F_OPENFROM 356 /* Darwin-specific. */ +#define BSM_F_UNLINKFROM 357 /* Darwin-specific. */ +#define BSM_F_CHECK_OPENEVT 358 /* Darwin-specific. */ +#define BSM_F_ADDSIGS 359 /* Darwin-specific. */ +#define BSM_F_MARKDEPENDENCY 360 /* Darwin-specific. */ /* - * Linux-specific (300-399). + * Darwin file system specific (400-499). */ -#define BSM_F_SETSIG 310 /* Linux-specific */ -#define BSM_F_GETSIG 311 /* Linux-specific */ +#define BSM_F_FS_SPECIFIC_0 400 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_1 401 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_2 402 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_3 403 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_4 404 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_5 405 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_6 406 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_7 407 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_8 408 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_9 409 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_10 410 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_11 411 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_12 412 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_13 413 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_14 414 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_15 415 /* Darwin-fs-specific. */ + -#define BSM_F_UNKNOWN 500 +#define BSM_F_UNKNOWN 0xFFFF #endif /* !_BSM_AUDIT_FCNTL_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Mar 12 20:42:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B0B71065676; Thu, 12 Mar 2009 20:42: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 E990A1065670 for ; Thu, 12 Mar 2009 20:42:39 +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 BD3208FC13 for ; Thu, 12 Mar 2009 20:42:39 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2CKgd4W052261 for ; Thu, 12 Mar 2009 20:42:39 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2CKgd4e052259 for perforce@freebsd.org; Thu, 12 Mar 2009 20:42:39 GMT (envelope-from gabor@freebsd.org) Date: Thu, 12 Mar 2009 20:42:39 GMT Message-Id: <200903122042.n2CKgd4e052259@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 Cc: Subject: PERFORCE change 159135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 20:42:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=159135 Change 159135 by gabor@gabor_server on 2009/03/12 20:41:48 - use Big Endian safe fix Submitted by: Václav Haisman Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#42 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#42 (text+ko) ==== @@ -74,7 +74,7 @@ int grep_fgetc(struct file *f) { - int c; + unsigned char c; switch (filebehave) { case FILE_STDIO: From owner-p4-projects@FreeBSD.ORG Thu Mar 12 20:54:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D98F61065675; Thu, 12 Mar 2009 20:54: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 7DA4C106566C for ; Thu, 12 Mar 2009 20:54:52 +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 6B7588FC28 for ; Thu, 12 Mar 2009 20:54:52 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2CKsqO1062930 for ; Thu, 12 Mar 2009 20:54:52 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2CKsqFR062928 for perforce@freebsd.org; Thu, 12 Mar 2009 20:54:52 GMT (envelope-from gabor@freebsd.org) Date: Thu, 12 Mar 2009 20:54:52 GMT Message-Id: <200903122054.n2CKsqFR062928@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 Cc: Subject: PERFORCE change 159137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 20:54:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=159137 Change 159137 by gabor@gabor_server on 2009/03/12 20:54:10 - Stricter checking after stroull() - Use libc messages through errno where possible Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#84 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#8 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/es_ES.ISO8859-1.msg#1 add .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#7 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#7 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#84 (text+ko) ==== @@ -70,11 +70,9 @@ /* 5*/ "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n", /* 6*/ "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n", /* 7*/ "\t[--null] [pattern] [file ...]\n", -/* 8*/ "value out of range", -/* 9*/ "context out of range", +/* 8*/ "unknown --binary-files option", +/* 9*/ "Binary file %s matches\n" /*10*/ "%s (BSD grep) %s\n", -/*11*/ "unknown --binary-files option", -/*12*/ "Binary file %s matches\n" }; /* Flags passed to regcomp() and regexec() */ @@ -375,8 +373,10 @@ case '5': case '6': case '7': case '8': case '9': if (newarg || !isdigit(lastc)) Aflag = 0; - else if (Aflag > LLONG_MAX / 10) - errx(2, getstr(9)); + else if (Aflag > LLONG_MAX / 10) { + errno = ERANGE; + err(2, NULL); + } Aflag = Bflag = (Aflag * 10) + (c - '0'); break; case 'C': @@ -388,8 +388,13 @@ case 'A': case 'B': l = strtoull(optarg, &ep, 10); - if ((errno == ERANGE) && (l == ULLONG_MAX)) - errx(2, getstr(9)); + if (((errno == ERANGE) && (l == ULLONG_MAX)) || + ((errno == EINVAL) && (l == 0))) + err(2, NULL); + else if (ep[0] != '\0') { + errno = EINVAL; + err(2, NULL); + } if (c == 'A') Aflag = l; else if (c == 'B') @@ -416,8 +421,10 @@ dirbehave = DIR_RECURSE; } else if (strcmp("skip", optarg) == 0) dirbehave = DIR_SKIP; - else if (strcmp("read", optarg) != 0) - errx(2, getstr(8)); + else if (strcmp("read", optarg) != 0) { + errno = EINVAL; + err(2, NULL); + } break; case 'E': grepbehave = GREP_EXTENDED; @@ -464,9 +471,14 @@ break; case 'm': mflag++; - mcount = strtoull(optarg, (char **)NULL, 10); - if ((errno == ERANGE) && (mcount == ULLONG_MAX)) - err(2, getstr(8)); + mcount = strtoull(optarg, &ep, 10); + if (((errno == ERANGE) && (mcount == ULLONG_MAX)) || + ((errno == EINVAL) && (mcount == 0))) + err(2, NULL); + else if (ep[0] != '\0') { + errno = EINVAL; + err(2, NULL); + } break; case 'n': nflag = 1; ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#8 (text+ko) ==== @@ -9,8 +9,6 @@ 5 "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n" 6 "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n" 7 "\t[--null] [pattern] [file ...]\n" -8 "value out of range" -9 "context out of range" +8 "unknown --binary-files option" +9 "Binary file %s matches\n" 10 "%s (BSD grep) %s\n" -11 "unknown --binary-files option" -12 "Binary file %s matches\n" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#7 (text+ko) ==== @@ -9,8 +9,6 @@ 5 "\t[-e minta] [-f fájl] [--binary-files=érték] [--color=mikor]\n" 6 "\t[--context[=szám]] [--directories=mûvelet] [--label] [--line-buffered]\n" 7 "\t[--null] [minta] [fájl ...]\n" -8 "az érték a megengedett tartományon kívül esik" -9 "a kontextus a megengedett tartományon kívül esik" +8 "ismeretlen --binary-files opció" +9 "%s bináris fájl illeszkedik\n" 10 "%s (BSD grep) %s\n" -11 "ismeretlen --binary-files opció" -12 "%s bináris fájl illeszkedik\n" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#7 (text+ko) ==== @@ -9,8 +9,6 @@ 5 "\t[-e padrão] [-f arquivo] [--binary-files=valor] [--color=quando]\n" 6 "\t[--context[=num]] [--directories=ação] [--label] [--line-buffered]\n" 7 "\t[--null] [padrão] [arquivo ...]\n" -8 "el valor está fora da escala" -9 "contexto está fora da escala" +8 "opcão não conhecida de --binary-files" +9 "arquivo binário %s casa com o padrão\n" 10 "%s (BSD grep) %s\n" -11 "opcão não conhecida de --binary-files" -12 "arquivo binário %s casa com o padrão\n" From owner-p4-projects@FreeBSD.ORG Fri Mar 13 00:19:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7329106567C; Fri, 13 Mar 2009 00:19: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 499031065673 for ; Fri, 13 Mar 2009 00:19:28 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 370FD8FC08 for ; Fri, 13 Mar 2009 00:19:28 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2D0JSmI093902 for ; Fri, 13 Mar 2009 00:19:28 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2D0JSQA093900 for perforce@freebsd.org; Fri, 13 Mar 2009 00:19:28 GMT (envelope-from sson@FreeBSD.org) Date: Fri, 13 Mar 2009 00:19:28 GMT Message-Id: <200903130019.n2D0JSQA093900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 159140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 00:19:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=159140 Change 159140 by sson@sson_amd64 on 2009/03/13 00:18:47 Add support for parsing and printing AUT_SOCKINET128 tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#44 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 $ */ #ifndef _LIBBSM_H_ @@ -565,6 +565,12 @@ typedef struct { u_int16_t family; u_int16_t port; + u_int32_t addr[4]; +} au_socketinet_ex32_t; + +typedef struct { + u_int16_t family; + u_int16_t port; u_int32_t addr; } au_socketinet32_t; @@ -722,7 +728,7 @@ au_seq_t seq; au_socket_t socket; au_socket_ex32_t socket_ex32; - au_socketinet32_t sockinet32; + au_socketinet_ex32_t sockinet_ex32; au_socketunix_t sockunix; au_subject32_t subj32; au_subject32ex_t subj32_ex; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#61 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 $ */ #include @@ -365,6 +365,10 @@ fprintf(fp, "/>"); break; + case AUT_SOCKINET128: + fprintf(fp, "/>"); + break; + case AUT_SUBJECT32: fprintf(fp, "/>"); break; @@ -529,13 +533,16 @@ break; case AUT_SOCKINET32: - fprintf(fp, "tt.sockinet32.family, tok->len, + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, err); if (err) return (-1); - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.port, + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, sizeof(uint16_t), tok->len, err); if (err) return (-1); - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.addr, - sizeof(tok->tt.sockinet32.addr), tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, + sizeof(tok->tt.sockinet_ex32.addr[0]), tok->len, err); if (err) return (-1); @@ -3093,22 +3100,77 @@ print_tok_type(fp, tok->id, "socket-inet", raw, xml); if (xml) { open_attr(fp, "type"); - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); + close_attr(fp); + open_attr(fp, "port"); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); + close_attr(fp); + open_attr(fp, "addr"); + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); + print_delim(fp, del); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); + print_delim(fp, del); + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); + } +} + +/* + * socket family 2 bytes + * local port 2 bytes + * socket address 16 bytes + */ +static int +fetch_sock_inet128_tok(tokenstr_t *tok, u_char *buf, int len) +{ + int err = 0; + + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, + err); + if (err) + return (-1); + + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, + sizeof(uint16_t), tok->len, err); + if (err) + return (-1); + + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, + sizeof(tok->tt.sockinet_ex32.addr), tok->len, err); + if (err) + return (-1); + + return (0); +} + +static void +print_sock_inet128_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, + __unused char sfrm, int xml) +{ + + print_tok_type(fp, tok->id, "socket-inet6", raw, xml); + if (xml) { + open_attr(fp, "type"); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); close_attr(fp); open_attr(fp, "port"); - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); close_attr(fp); open_attr(fp, "addr"); - print_ip_address(fp, tok->tt.sockinet32.addr); + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); close_attr(fp); close_tag(fp, tok->id); } else { print_delim(fp, del); - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); print_delim(fp, del); - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); print_delim(fp, del); - print_ip_address(fp, tok->tt.sockinet32.addr); + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); } } @@ -4057,6 +4119,9 @@ case AUT_SOCKUNIX: return (fetch_sock_unix_tok(tok, buf, len)); + case AUT_SOCKINET128: + return (fetch_sock_inet128_tok(tok, buf, len)); + case AUT_SUBJECT32: return (fetch_subject32_tok(tok, buf, len)); @@ -4226,6 +4291,10 @@ print_sock_unix_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); return; + case AUT_SOCKINET128: + print_sock_inet128_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); + return; + case AUT_SUBJECT32: print_subject32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); return; From owner-p4-projects@FreeBSD.ORG Fri Mar 13 02:47:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 409CA1065672; Fri, 13 Mar 2009 02:47: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 D9BAC106564A for ; Fri, 13 Mar 2009 02:47:06 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C60898FC12 for ; Fri, 13 Mar 2009 02:47:06 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2D2l6SS021551 for ; Fri, 13 Mar 2009 02:47:06 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2D2kwvO021533 for perforce@freebsd.org; Fri, 13 Mar 2009 02:46:58 GMT (envelope-from nwhitehorn@freebsd.org) Date: Fri, 13 Mar 2009 02:46:58 GMT Message-Id: <200903130246.n2D2kwvO021533@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 159145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 02:47:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=159145 Change 159145 by nwhitehorn@nwhitehorn_trantor on 2009/03/13 02:46:51 IFC. Apparently syscons no longer works on G5 systems: this is item #1 on the todo list. Affected files ... .. //depot/projects/ppc-g5/MAINTAINERS#2 integrate .. //depot/projects/ppc-g5/Makefile.inc1#7 edit .. //depot/projects/ppc-g5/ObsoleteFiles.inc#10 integrate .. //depot/projects/ppc-g5/UPDATING#11 integrate .. //depot/projects/ppc-g5/bin/ps/extern.h#2 integrate .. //depot/projects/ppc-g5/bin/ps/keyword.c#2 integrate .. //depot/projects/ppc-g5/bin/ps/print.c#3 integrate .. //depot/projects/ppc-g5/bin/sh/miscbltin.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/updater.c#4 integrate .. //depot/projects/ppc-g5/contrib/gdtoa/test/Q.ou0#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/Q.ou1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/Qtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/README#4 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/d.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dI.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dIsi.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dItest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dd.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/ddsi.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/ddtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dt.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dtst.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/f.out#3 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/ftest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/getround.c#4 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/makefile#3 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/obad/strtodt.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/obad/xL.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/rtestnos#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtoIdSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtoIddSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtodISI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtodt.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtopddSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtorddSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/testnos#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/testnos1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/testnos3#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/x.ou0#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/x.ou1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xL.ou0#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xL.ou1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xLtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xQtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xsum0.out#4 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/xsum0.out#4 delete .. //depot/projects/ppc-g5/contrib/hostapd/COPYING#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ChangeLog#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/FREEBSD-Xlist#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/Makefile#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/README#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/accounting.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/accounting.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes_wrap.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes_wrap.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ap.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ap_list.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ap_list.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/beacon.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/beacon.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/build_config.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/config.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/config.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/config_types.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/crypto.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/crypto.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ctrl_iface.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ctrl_iface.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/defconfig#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/defs.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/des.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/developer.txt#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/code_structure.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/doxygen.fast#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/doxygen.full#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/eap.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/hostapd.fig#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/mainpage.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/porting.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/driver.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/driver_test.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_aka.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_defs.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gpsk.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gpsk_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gpsk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gtc.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_i.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_identity.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_md5.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_methods.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_methods.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_mschapv2.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_pax.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_pax_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_pax_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_peap.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_psk.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_psk_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_psk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sake.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sake_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sake_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_db.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_db.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tls.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tls_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tls_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tlv.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_ttls.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_ttls.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_vendor_test.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eapol_sm.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eapol_sm.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop_win.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hlr_auc_gw.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostap_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.8#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.accept#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.deny#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.eap_user#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.radius_clients#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.sim_db#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.vlan#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.wpa_psk#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd_cli.1#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd_cli.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hw_features.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hw_features.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/iapp.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/iapp.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11_auth.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11_auth.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11h.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11h.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_1x.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_1x.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/includes.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/l2_packet.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/l2_packet_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/logwatch/README#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/logwatch/hostapd#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/logwatch/hostapd.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/madwifi.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/md4.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/md5.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/md5.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/milenage.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/milenage.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/mlme.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/mlme.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ms_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ms_funcs.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os_unix.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/pmksa_cache.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/pmksa_cache.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/preauth.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/preauth.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_client.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_client.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_server.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_server.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/rc4.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/rc4.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/reconfig.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha1.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha1.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha256.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha256.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sta_info.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sta_info.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/state_machine.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls_gnutls.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls_openssl.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/version.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/vlan_init.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/vlan_init.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wired.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wme.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wme.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa_ctrl.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa_ctrl.h#2 delete .. //depot/projects/ppc-g5/contrib/less/line.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/NEWS#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/README#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/VERSION#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/audit.8#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.h#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/auditd_lib.h#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libauditd/auditd_lib.c#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_domain.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_errno.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_control.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_errno.c#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit.h#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/ppc-g5/contrib/telnet/libtelnet/pk.c#2 integrate .. //depot/projects/ppc-g5/contrib/top/install#2 delete .. //depot/projects/ppc-g5/contrib/top/install-sh#1 branch .. //depot/projects/ppc-g5/contrib/wpa/COPYING#1 branch .. //depot/projects/ppc-g5/contrib/wpa/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ChangeLog#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/README-WPS#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/accounting.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/accounting.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ap_list.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ap_list.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/beacon.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/beacon.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/config.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ctrl_iface.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ctrl_iface.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/defconfig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/doxygen.full#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/driver.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/drivers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/eap_testing.txt#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/eapol_sm.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/eapol_sm.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostap_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.accept#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.deny#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.eap_user#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.sim_db#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.vlan#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd_cli.1#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd_cli.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hw_features.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hw_features.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/iapp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/iapp.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_1x.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_1x.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/logwatch/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/logwatch/hostapd#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/mlme.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/mlme.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/nt_password_hash.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/peerkey.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/pmksa_cache.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/pmksa_cache.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/preauth.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/preauth.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/sta_info.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/sta_info.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/vlan_init.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/vlan_init.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wired.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wme.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wme.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_auth_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_auth_ie.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_auth_ie.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_ft.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wps_hostapd.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wps_hostapd.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/eapol_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/ieee802_11_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/ieee802_11_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/ieee802_11_defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/privsep_commands.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/version.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_ctrl.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_ctrl.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes_wrap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes_wrap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_cryptoapi.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_gnutls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_internal.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_libtomcrypt.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_none.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_openssl.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/des.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/dh_groups.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/dh_groups.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/md4.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/md5.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/ms_funcs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/ms_funcs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/rc4.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/rc4.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha1.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha1.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha256.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha256.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_gnutls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_internal.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_none.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_openssl.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_schannel.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/driver.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/driver_ndis.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/driver_ndis.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/drivers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/scan_helpers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/chap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/chap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_fast_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_fast_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_gpsk_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_gpsk_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_ikev2_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_ikev2_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_pax_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_pax_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_peap_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_peap_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_psk_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_psk_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sake_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sake_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sim_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sim_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_tlv_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_ttls.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_wsc_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_wsc_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/ikev2_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/ikev2_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_aka.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_fast.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_fast_pac.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_fast_pac.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_gpsk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_gtc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_leap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_methods.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_methods.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_mschapv2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_otp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_pax.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_peap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_psk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_sake.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_sim.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tls_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tls_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tnc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_ttls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_vendor_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_wsc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/ikev2.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/mschapv2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/mschapv2.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/tncc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/tncc.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_aka.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_fast.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_gpsk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_gtc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_identity.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_methods.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_methods.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_mschapv2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_pax.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_peap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_psk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sake.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sim.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sim_db.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sim_db.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tls_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tls_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tnc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_ttls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_vendor_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_wsc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/ikev2.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/tncs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/tncs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/eapol_supp_sm.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/eapol_supp_sm.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/milenage.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/milenage.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/l2_packet/l2_packet.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_client.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_client.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_server.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_server.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/peerkey.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/peerkey.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/pmksa_cache.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/pmksa_cache.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/preauth.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/preauth.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_ft.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_ie.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_ie.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/asn1.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/asn1.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/asn1_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/bignum.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/bignum.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/libtommath.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/rsa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/rsa.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client_read.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client_write.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_cred.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_cred.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_record.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_record.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server_read.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server_write.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/x509v3.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/x509v3.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/base64.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/base64.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/build_config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/eloop.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/eloop.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/includes.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/ip_addr.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/ip_addr.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/os.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/os_internal.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/os_unix.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/pcsc_funcs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/pcsc_funcs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/state_machine.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/uuid.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/uuid.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpa_debug.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpa_debug.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpabuf.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpabuf.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/httpread.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/httpread.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_attr_build.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_attr_parse.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_attr_process.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_dev_attr.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_dev_attr.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_enrollee.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_registrar.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_event.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_ssdp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_web.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/README-WPS#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/blacklist.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/blacklist.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config_file.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config_none.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/defconfig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/manpage.links#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/manpage.refs#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/events.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/openCryptoki.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wpas-test.py#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/main.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/mlme.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/mlme.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/scan.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/link_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_wpa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/todo.txt#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_priv.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpas_glue.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpas_glue.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wps_supplicant.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wps_supplicant.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa_supplicant/COPYING#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ChangeLog#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/FREEBSD-Xlist#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/Makefile#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/README#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes_wrap.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes_wrap.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/asn1.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/asn1.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/asn1_test.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/base64.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/base64.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/bignum.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/bignum.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/build_config.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_file.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_ssid.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_types.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_cryptoapi.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_gnutls.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_libtomcrypt.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_udp.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_unix.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus-wpa_supplicant.service#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus_dict_helpers.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus_dict_helpers.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/defconfig#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/defs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/des.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/code_structure.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/Makefile#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/doxygen.fast#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/doxygen.full#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/eap.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/mainpage.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/porting.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver_ndis.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver_ndis.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver_wired.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/drivers.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_aka.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_defs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_fast.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gpsk.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gpsk_common.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gpsk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gtc.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_i.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_leap.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_md5.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_methods.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_methods.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_mschapv2.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_otp.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_pax.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_pax_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_pax_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_peap.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_psk.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_psk_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_psk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sake.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sake_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sake_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sim.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sim_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sim_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_testing.txt#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tls.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tls_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tls_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tlv.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tlv.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_ttls.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_ttls.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_vendor_test.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eapol_sm.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eapol_sm.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eapol_test.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eloop.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eloop.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eloop_none.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/events.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/ieee8021x.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/plaintext.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/wep.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/hostapd.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/includes.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/l2_packet.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/libtommath.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/main.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/md4.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/md5.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/md5.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/mlme.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/mlme.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ms_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ms_funcs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/nmake.mak#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os_unix.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pcsc_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pcsc_funcs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pmksa_cache.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pmksa_cache.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/preauth.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/preauth.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/preauth_test.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius_client.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius_client.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rc4.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rc4.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rsa.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rsa.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha1.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha1.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha256.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha256.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/state_machine.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_aes.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_eap_sim_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_md4.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_md5.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_ms_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_sha1.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_sha256.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_x509v3.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_gnutls.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_openssl.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_schannel.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_client.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_client.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/todo.txt#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/version.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_cli.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_ctrl.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_ctrl.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/main.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/scanresults.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_i.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_passphrase.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant_i.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/x509v3.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/x509v3.h#2 delete .. //depot/projects/ppc-g5/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/ppc-g5/etc/rc.d/swap1#2 integrate .. //depot/projects/ppc-g5/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/ppc-g5/gnu/lib/csu/Makefile#5 edit .. //depot/projects/ppc-g5/gnu/lib/libssp/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/gdbserver/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/gdbserver/reg-ppc.c#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/ppc-g5/include/Makefile#5 integrate .. //depot/projects/ppc-g5/include/signal.h#2 integrate .. //depot/projects/ppc-g5/include/stdio.h#2 integrate .. //depot/projects/ppc-g5/include/stdlib.h#3 integrate .. //depot/projects/ppc-g5/include/string.h#4 integrate .. //depot/projects/ppc-g5/include/strings.h#3 integrate .. //depot/projects/ppc-g5/include/unistd.h#3 integrate .. //depot/projects/ppc-g5/include/wchar.h#3 integrate .. //depot/projects/ppc-g5/lib/Makefile#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive.h#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_endian.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk_entry_from_file.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk_private.h#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk_set_standard_lookup.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_mtree.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_virtual.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#9 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_compression_program.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_mtree.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/Makefile#8 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/main.c#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_acl_freebsd.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_bzip2.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gtar.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gtar_1.tar.uu#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 delete .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gzip.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 13 08:56:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CDC81065672; Fri, 13 Mar 2009 08:56:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC045106564A; Fri, 13 Mar 2009 08:43:43 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id 770F18FC08; Fri, 13 Mar 2009 08:43:43 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id 548E61CE0D; Fri, 13 Mar 2009 09:43:42 +0100 (CET) Date: Fri, 13 Mar 2009 09:43:42 +0100 From: Ed Schouten To: Nathan Whitehorn Message-ID: <20090313084342.GT31961@hoeg.nl> References: <200903130246.n2D2kwvO021533@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oN4OvwWIcd1E23D1" Content-Disposition: inline In-Reply-To: <200903130246.n2D2kwvO021533@repoman.freebsd.org> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 159145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 08:56:23 -0000 --oN4OvwWIcd1E23D1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Nathan Whitehorn wrote: > IFC. Apparently syscons no longer works on G5 systems: this is item #1 > on the todo list. Woops! Maybe I wrecked something? --=20 Ed Schouten WWW: http://80386.nl/ --oN4OvwWIcd1E23D1 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkm6HL4ACgkQ52SDGA2eCwU2MgCdG63Ae5e0uTPGckeuR4M9SwKp f1sAnidRR8ZHhktnPnff1YM1jGcUIMK7 =AfJ/ -----END PGP SIGNATURE----- --oN4OvwWIcd1E23D1-- From owner-p4-projects@FreeBSD.ORG Fri Mar 13 17:21:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE961065676; Fri, 13 Mar 2009 17:21: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 36D371065674 for ; Fri, 13 Mar 2009 17:21:21 +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 228208FC1C for ; Fri, 13 Mar 2009 17:21:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2DHLL5A045185 for ; Fri, 13 Mar 2009 17:21:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2DHLKfP045183 for perforce@freebsd.org; Fri, 13 Mar 2009 17:21:20 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 13 Mar 2009 17:21:20 GMT Message-Id: <200903131721.n2DHLKfP045183@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 159174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 17:21:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=159174 Change 159174 by pgj@beehive on 2009/03/13 17:20:33 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/freebsd-html.dsl#2 integrate .. //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/docproj_hu/www/en/community/social.xsl#4 integrate .. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#7 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#8 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#42 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd-html.dsl#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -203,7 +203,7 @@ (("xorg") (string-append u "&" "amp;" "manpath=X11R7.2")) (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+3.0")) (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.1")) - (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+7.0-RELEASE+and+Ports")) + (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+7.1-RELEASE+and+Ports")) (else u)))) (element application ($bold-seq$)) ==== //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.106 2008/10/12 08:22:53 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.107 2009/03/12 09:52:42 brueffer Exp $ # # @@ -149,7 +149,6 @@ trm i386,amd64 twa i386,amd64 twe i386,amd64 -txp i386,pc98,ia64,amd64 ubsa i386,pc98,amd64 ubsec i386,pc98,amd64 ubser i386,pc98,amd64 ==== //depot/projects/docproj_hu/www/en/community/social.xsl#4 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -62,6 +62,14 @@ Users Group on Facebook and a FreeBSD Group on LinkedIn. +
  • You can follow @freebsdannounce, + @freebsdblogs, + @freebsd, or + @bsdevents + on Twitter.
    • +

    Blog Activity

    ==== //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#7 (text+ko) ==== @@ -10,6 +10,89 @@ + + Andrew Doran from the NetBSD Project + + Interview with Andrew Doran from the NetBSD Project. + We talk about the upcoming 5.0 release. + + http://bsdtalk.blogspot.com/2009/03/bsdtalk171-andrew-doran-from-netbsd.html + bsdtalk,interview,netbsd,andrew doran + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk171.mp3 + 10 Mb + 22 minutes + MP3 version + mp3 + + + bsdtalk171.ogg + 22 minutes + Ogg version + ogg + + + + + + Marshall Kirk McKusick at DCBSDCon + + You can get a much more complete history here: + http://www.mckusick.com/history/index.html + ]]> + http://bsdtalk.blogspot.com/2009/02/bsdtalk170-marshall-kirk-mckusick-at.html + bsdtalk,presentation,bsd,history,kirk mckusick + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk170.mp3 + 26 Mb + 55 minutes + MP3 version + mp3 + + + bsdtalk170.ogg + 55 minutes + Ogg version + ogg + + + + + + Justin Sherrill of the DragonFlyBSD Digest + + Interview with Justin Sherrill of the DragonFlyBSD + Digest, which can be found at + http://www.shiningsilence.com/dbsdlog/ + + http://bsdtalk.blogspot.com/2009/01/bsdtalk169-justin-sherrill-of.html + bsdtalk,interview,dragonflybsd,justin sherril + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk169.mp3 + 10 Mb + 22 minutes + MP3 version + mp3 + + + bsdtalk169.ogg + 22 minutes + Ogg version + ogg + + + + Michael Lauth from iXsystems @@ -2955,6 +3038,150 @@ + + A Brief History of the BSD Fast Filesystem, Kirk McKusick + + AsiaBSDCon 2008, Dr. Kirk McKusick +
    + clive URL: http://www.youtube.com/watch?v=tzieR5MM06M + ]]>     + http://www.youtube.com/watch?v=tzieR5MM06M + youtube,presentation,asiabsdcon2008,asiabsdcon,bsd fast filesystem,kirk mckusick + + + http://www.youtube.com/watch?v=tzieR5MM06M + 42:01 + Flash + flash + + +     + + + PC-BSD, Matt Olander, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=N0q37X-MJzY + ]]> + http://www.youtube.com/watch?v=N0q37X-MJzY + youtube,presentation,asiabsdcon2008,asiabsdcon,pc-bsd,matt olander + + + http://www.youtube.com/watch?v=N0q37X-MJzY + 28:50 + Flash + flash + + + + + + Using FreeBSD to Promote Open Source Development Methods, Brooks Davis, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=4lcrinKBMas + ]]> + http://www.youtube.com/watch?v=4lcrinKBMas + youtube,presentation,asiabsdcon2008,asiabsdcon,freebsd,promotion,open source development models,brooks davis + + + http://www.youtube.com/watch?v=4lcrinKBMas + 30:07 + Flash + flash + + + + + + Keynote, Peter Losher, Internet Systems Consortium, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=vQbdG7TwhKo + ]]> + http://www.youtube.com/watch?v=vQbdG7TwhKo + youtube,keynote,asiabsdcon2008,asiabsdcon,peter losher + + + http://www.youtube.com/watch?v=vQbdG7TwhKo + 42:44 + Flash + flash + + + + + + GEOM - in Infrastructure We Trust, Pawel Jakub Dawidek, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=xMpmOezBJZo + ]]> + http://www.youtube.com/watch?v=xMpmOezBJZo + youtube,presentation,asiabsdcon2008,asiabsdcon,geom,pawel jakub dawidek + + + http://www.youtube.com/watch?v=xMpmOezBJZo + 46:38 + Flash + flash + + + + + + Reducing Lock Contention in a Multi-Core System, Randall Stewart, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=OQOMva1SmbY + ]]> + http://www.youtube.com/watch?v=OQOMva1SmbY + youtube,presentation,asiabsdcon2008,asiabsdcon,multicore,lock contention,randall stewart + + + http://www.youtube.com/watch?v=OQOMva1SmbY + 28:12 + Flash + flash + + + + + + FreeBSD Kernel Internals, Dr. Marshall Kirk McKusick + + clive URL: http://www.youtube.com/watch?v=nwbqBdghh6E + ]]> + + http://www.youtube.com/watch?v=nwbqBdghh6E + youtube,course,freebsd,design and implementation of the freebsd operating system,kirk mckusick + + + http://www.youtube.com/watch?v=nwbqBdghh6E + 59:57 + Flash + flash + + + + May 2008 developer Vimage report + + What's your biggest Time Management problem? + + What's your biggest Time Management problem? +

    + Tom Limoncelli is a FreeBSD user and the author of + the O'Reilly book,"Time Management for System + Administrators". He`ll be giving a brief presentation + with highlights from his book then will take questions + from the audience. Whether you are a system + administrator, a developer (or even a Linux user) + this presentation will help you with something more + precious a quad-processor AMD box. +

    + ]]>     + http://www.nycbug.org/index.php?NAV=Home;SUBM=10172 + nycbug,presentation,time management,tom limoncelli + + + http://www.fetissov.org/public/nycbug/nycbug-03-04-09.mp3 + MP3 version + mp3 + 11 Mb + + +     + + + Postfix Performance Tuning + + Money can buy you bandwidth, but latency is forever! +

    + John Mashey, MIPS +

    + Victor will cover an array of issues connected to + Postfix performance tuning, including: +

    +
      +
    • Latency, concurrency and throughput +
    • Postfix input processing +
    • Queue file format rationale +
    • Input processing bottlenecks +
    • Pre-queue filters, milters, content filters +
    • Tuning for fast (enough) input +
    • Postfix on-disk queues, requirements and architecture +
    • What is a "transport"? +
    • Postfix "nqmgr" scheduler algorithm +
    • Per-destination in memory queues +
    • Per-destination scheduler controls +
    • SMTP delivery +
    • Understanding delay logging +
    • Transport process limits, concurrency limits +
    • Scaling to thousands of output processes +
    • Connection caching, TLS session caching, feedback controls +
    +

    + Speaker Bio +
    + Victor Duchovni trained in mathematics, switched + tracks to CS in 1980s leaving Princeton with a + master`s degree in mathematics and newly acquired + skills in Unix system administration and system + programming. In 1990 moved to Lehman Brothers, + worked on system management tooling, and network + engineering. Ported "Moira" from MIT to Lehman, + built efficient build systems that predated (and + partly inspired) Jumpstart. In 1994 joined ESM to + market "CMDB" tools to enterprise users, but this + did not pan out, in the mean time learned Tcl, and + contributed bunch of patches to the 7.x early 8.x + TCL releases. In 1997 returned to New York, working + in IT Security at Morgan Stanley since late 1999. + At Morgan Stanley, developed a hobby in perimeter + email security, becoming an active Postfix user and + very soon contributor in May of 2001. In addition + to many smaller feature improvements, contributed + initial implementation of SMTP connection caching, + overhauled and currently maintain LDAP and TLS + support. Made significant design contributions to + queue manager in collaboration with Wietse and + Patrik Raq. In 2.6 contributing support for TLS EC + ciphers and multi-instance management tooling, + ideally also TLS SNI if time permits. +

    + ]]>     + http://www.nycbug.org/index.php?NAV=Home;SUBM=10168 + nycbug,presentation,postfix,john mashey + + + http://www.fetissov.org/public/nycbug/nycbug-02-04-09.mp3 + MP3 version + mp3 + 11 Mb + + +     + + + Introduction to Puppet + + What it is and how can it make system administration + less painful +

    + About the speaker: +
    + Larry Ludwig - Principal Consultant/Founder of + Empowering Media. Empowering Media is a consulting + firm and managed hosting provider. Larry Ludwig + has been in the industry for over 15 years as a + system administration and system programmer. He`s + had previous experience working for many Fortune + 500 corporations and holds a BS in CS from Clemson + University. Larry, along with Eric E. Moore and + Brian Gupta are founding members of the NYC Puppet + usergroup. +

    + ]]>     + http://www.nycbug.org/index.php?NAV=Home;SUBM=10171 + nycbug,presentation,puppet,larry ludwig + + + http://www.fetissov.org/public/nycbug/nycbug-01-07-09.mp3 + MP3 version + mp3 + 11 Mb + + +     + Hardware Performance Monitoring Counters - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.93 2009/03/06 04:41:39 brooks Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.109 2009/03/13 15:28:47 brooks Exp $ Embedded - - Reduced FreeBSD for Embedded -

    Technical Contact: Warner Losh

    - -

    In the Linux world, there are a number of packages available - which will grab a bunch of software, including Linux, the tool - chains, packages, etc and create a firmware image for popular - devices. Since FreeBSD is an integrated system, many of these - elements are present in the base system or the ports tree.

    -

    There have been attempts at this problem over the years: - nanobsd, picobsd, and tinybsd are in the tree, Sam Leffler has - his own custom scripts, etc. This project would pick an - approach and use the existing scripts to make it simple to - create images that could be loaded into the firmware of these - devices. Many of the newer devices have 8MB or 16MB flash - parts, so that would be a good size to target for the kernel - and ram disk image. A good way to think of this project is - openwrt for FreeBSD images.

    -

    Requirements:

    -
      -
    • Strong C and scripting language programming skills.
      • -
    • No fear of the FreeBSD build process.
      • -
    • Good knowledge of how FreeBSD is put together.
      • -
    • Knowledge of the ports system.
      • -
    -     -     - - + Reduced FreeBSD kernel size for embedded

    Technical Contact: Warner Losh

    @@ -75,7 +46,7 @@     - + NAND Flash driver support

    Technical Contact: Warner Losh

    @@ -88,7 +59,7 @@     - + Make creating a bus easier

    Technical Contact: Warner Losh

    @@ -104,7 +75,7 @@     - + Variable hints

    Technical Contact: Warner Losh

    @@ -122,7 +93,7 @@     - + ARM cleanup

    Technical Contact: Warner Losh

    @@ -139,7 +110,7 @@     - + PPC/ARM/MIPS bring up

    Technical Contact: - + Overhaul the config system

    Technical Contact: General cleanup.

  • Introduce appropriate locking to make the file system operate without the Giant lock (MPSAFE).
    • -
  • Make msdosfs robust in the presence of unexpected disk removal, since - it is frequently used with removable devices.

    • It is unclear to what extent the last of these items, arguably the most useful, will require modifying surrounding infrastructure such as BIO, @@ -210,7 +179,7 @@ - + Improve the performance of dump/restore

    A performance evaluation of the split cache (as is) and an unified cache @@ -226,7 +195,7 @@ - + Extend UFS2 with on-disk indexing

    Technical Contact: - + Implement co-location for UFS2

    While FreeBSD's FFS implementation is pretty much @@ -539,9 +508,6 @@ (CDDL) that Sun has on their code. John will write a specification about the file format and the Summer of Code project is to implement that and write tests for the implementation without looking at the Sun code. -

  • We need someone to port the DTrace toolkit to FreeBSD. Part of this will - include adding additional probes to the kernel and to userland processes - to do what Sun does in OpenSolaris and also what Apple does in OS X.

    • Requirements:

      @@ -726,7 +692,7 @@ - + Interactive Splash Screen

      Improve upon / replace the existing static VESA splash @@ -788,30 +754,12 @@ - - Remove procfs dependencies

      Technical contact: Maxime Henrion

      + href="mailto:cognet@FreeBSD.org">Olivier Houchard

      Someone needs to finish the support for PT_SYSCALL in the ptrace() subsystem and remove the need for procfs in gcore. Removing the procfs(5) dependency from ps -e is also desirable.

      @@ -868,28 +816,6 @@ - - Syscons modularization - - -

      Separate the syscons code into distinct parts for input, output, - console handling (switching, screen savers etc.) and terminal - emulation. Introduce fine-grained locking. Also implement vt100 and - vt220 emulation to supplement the existing SCO emulation. Add a - gettytab(5) capability for specifying the terminal emulation, and add - entries to /etc/gettytab for the alternative emulations.

      -

      Optionally implement xterm emulation. The top line of the screen - should serve as a title bar, displaying the title set with the \e]0; - escape sequence as well as the vty number.

      -

      Requirements:

      -
        -
      • Ability to read and understand foreign C code.
        • -
      • Ability to write C code.
        • -
      • A good understanding of text terminals and terminal emulation.
        • -
      -       -       - Make optional kernel subsystems register themselves via sysctl @@ -938,28 +864,6 @@ - - Porting nouveau to &os; - - -

      Technical contact: Roman Divacky, Robert Noland

      -

      URL: http://wiki.freebsd.org/NouveauPorting

      - -

      Nouveau is an open source driver for NVIDIA graphic cards. - Its kernel currently supports Linux only. The goal of this - project is to port the in-kernel DRM to the &os; operating - system.

      -

      Requirements:

      -
        -
      • Access to a testing hardware.
        • -
      • Some knowledge of inner kernel works.
        • -
      • Knowledge of DRM is an advantage.
        • -
      -       -       @@ -970,27 +874,26 @@

      Technical contact: Maxime Henrion

      + href="mailto:lulf@FreeBSD.org">Ulf Lilleengen

      URL's: csup homepage, CVSweb

      -

      Maxime Henrion is working on a rewrite of CVSup in C, called csup, and he - has imported csup into the FreeBSD base system. It should be ready for use - in a stable environment, but there are however still several missing - features. The following list should be a good starting point:

      +

      csup is a port of the cvsup high-speed CVS repository replication + application from the original Modula-3 to the C lanaguage. It is now + distributed with FreeBSD, but is missing some important features that would + make useful projects to work on:

      • Add support for authentication.
        • +
      • Working rsync support.
        • +
      • Optimize rcsfile handling.
        • +
      • Create a library out of the ports that might be of use in a C language + csupd.
      • Add support for shell commands sent by the server.
      • Add missing support for various CVSup options: -D, -a (requires authentication support), -e and -E (requires shell commands support) and the destDir parameter.
        • -
      • Add support for CVS mode. This is important for developers, since this - mode sends the actual RCS files themselves. Some parts of this has - already been implemented, such as an RCS parser and an interface to - edit RCS files. The remaining parts for this feature is RCS - correctness testing, protocol correctness testing, fixing bugs and - checking for memory leaks and performance issues.
        • +
      • Work on a new csupd.

      Requirements:

        @@ -1002,49 +905,6 @@ - - Magic tunnel daemon - - -

        Technical contact: Poul-Henning Kamp, Matus Harvan
        - WIP: http://wiki.freebsd.org/mtund

        -

        IP can be tunnelled over IP, UDP, TCP, SSH, DNS, HTTP and many other - protocols, and this means that it is often possible to get a - connection out through a firewall, but each of these encapsulations - require prior setup of a specific program for each encapsulation, and - the user must experiment to decide which one to use at any one time. - The super tunnel daemon should implement pluggable encapsulations and - make it automatically select the most efficient encapsulation that - works at any one time. The user should not notice transitions from one - encapsulation to another, apart from maybe a small delay.

        -

        Wanted features (not sorted or prioritized):

        -
          -
        • Autodetection of the environment (DHCP, DNS, routing, ...) in a - non-offensive way (no global portscans allowed; asking via DHCP, - zeroconf or similar technologies is ok) as far as possible.
          • -
        • Plugin architecture for easy addition of further encapsulations.
          • -
        • Failover from one encapsulation to another.
          • -
        • Distinct configuration files for encapsulations which need to be - configured (e.g. proxy, authentication, ...).
          • -
        • Possibility to disable installed encapsulations.
          • -
        • Print/log hints for protocols which require some configuration, - e.g. telling the user to use keys and perhaps the ssh-agent for ssh.
          • -
        • Configurable additional plugin directories (for plugins installed - via the ports collection).
          • -
        • Log how it is able to tunnel the traffic (this also makes it useful - for finding unwanted holes in the configuration of a firewall).
          • -
        -

        Requirements:

        -
          -
        • Good knowledge of C.
          • -
        • Good knowledge about networks.
          • -
        -         -         - TCP/IP regression test suite @@ -1063,7 +923,7 @@ - + Passive libpcap based TCP session anomaly detector @@ -1171,7 +1031,7 @@ Ports - + Add .db support to pkg_tools @@ -1214,73 +1074,6 @@ - - Collect the pkg-message output - - -

        Technical contact: Pav Lucistnik

        - -

        Collect the pkg-message output of dependencies and print them together - after the whole build finishes.

        - -

        Details: Change the current ad-hoc way of including pkg-message in - the stdout of the build process. Automatically display pkg-message - in post-install, if present. For the dependencies, save the copies - of pkg-messages, as displayed in post-install, in /var/db/pkg, and - display them collectively once the whole build finishes. Also - allow for manual review by user later (new flag to - pkg_info(1)).

        - -

        Requirements:

        - -
          -
        • Knowledge of shell and make coding, and basic overview of how - ports works.
          • -
        • Basic knowledge of C.
          • -
        - -         -         - - - Improvements of OPTIONS - - -

        The current OPTIONS infrastructure can be improved in several ways.

        -
          -
        • It should be possible to define OPTIONS after bsd.ports.pre.mk.
          • -
        • Add an API to override the current curses based interface with - a different GUI, e.g. zenity/gdialog instead of dialog.
          • -
        • More room for a description in the OPTIONS dialog - possibly some - sort of help dialog could be provided for each option, like in - sysinstall.
          • -
        • Better handling of cases where OPTIONS are changed/added/removed - between upgrades.
          • -
        • The ability to depend on, or at least test, OPTIONS set in other - ports. Possibly it would be nice to enforce setting variables that are - depended upon when the port is being installed as a dependency.
          • -
        • Other types of OPTIONS controls - A text box in particular would be - useful for entering variables that need real values.
          • -
        • The possibility for mutually exclusive OPTIONS.
          • -
        • Bugfixes: -
            -
          • If you attempt to run make config for a port with - ${PKGNAMEPREFIX} defined, the make config process will error out - with:
            - ===> Using wrong configuration file /path/options/file
            - The solution is to define LATEST_LINK to be prefix-${PORTNAME}, - but this should be done internally.
            • -
          • -
        -

        Requirements:

        -
          -
        • Strong knowledge of shell and make code.
          • -
        • A basic understanding of the inner workings of the ports tree.
          • -
        -         -         - Package tools improvements @@ -1297,7 +1090,7 @@         - + Parallelization in the Ports Collection @@ -1332,42 +1125,6 @@ - - Utility for safe updating of ports in base system - - -

        Also known as rewrite portupgrade in C.

        - -

        Write a new utility for the pkg_install suite, possibly named - pkg_upgrade(1), implementing a subset of existing portupgrade - functionality. The required functionality is:

        - -
          -
        • fixing @pkgdep records in +CONTENTS file
          • -
        • fixing +REQUIRED_BY records
          • -
        • storing old copies of shared libraries after shmajor number - change in /usr/local/lib/compat/pkg
          • -
        • upwards and downwards recursive modes
          • -
        • ability to work on a complete local ports tree without valid - INDEX file
          • -
        • ability to work on a remote (ftp) package set without local - ports tree
          • -
        - -

        Anything that existing portupgrade can do is a desired - functionality. It would be nice to be command line compatible with - portupgrade, but it's not a requirement.

        - -

        Requirements:

        - -
          -
        • Basic understanding of the Ports Collection design.
          • -
        • Good skills writing C code.
          • -
        • Ability to read Ruby will help.
          • -
        -         -         - Ports license auditing infrastructure @@ -1559,43 +1316,6 @@ - - NFSv4 ACLs - - -

        Technical contact: Robert Watson, Pawel Jakub Dawidek

        -

        The NFSv4 RFC and follow-on drafts specify a new Access Control - List (ACL) format loosely based on NTFS ACLs. This format is not - directly compatible with existing POSIX.1e ACLs, but has been - adopted by a number of recent UNIX file systems (including Apple's - HFS+ and Sun's ZFS file systems) in order to improve Windows - compatibility. This project is multi-part:

        -
          -
        • research current specifications and implementations of - NFSv4 ACLs,
          • -
        • implement an ACL library in userspace,
          • -
        • port the ACL implementation to the kernel and enhance the - kernel ACL infrastructure to support NFSv4 ACLs,
          • -
        • implement optional NFSv4 ACL support on UFS2 and ZFS,
          • -
        • investigate NFSv4 ACL support for Samba and smbfs,
          • -
        • implement a test suite exercising relevant aspects of NFSv4 - ACL implementation, both basic rule evaluation and its - integration with the nominally incompatible UNIX owner, group, - and mode.
          • -
        - -

        Requirements:

        -
          -
        • Strong C programming skills.
          • -
        • Tolerance for IETF specifications.
          • -
        • Appreciation for the nasty subtleties of access control.
          • -
        • Rigorous and devious mindset.
          • -
        -         -         - Audit and Jail @@ -1622,6 +1342,140 @@ + + A New Audit Parsing API + + +

        Technical contact: Robert Watson, TrustedBSD audit + mailing list

        + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 13 17:39:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CFF81065673; Fri, 13 Mar 2009 17:39: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 1A862106566B for ; Fri, 13 Mar 2009 17:39:40 +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 088C48FC13 for ; Fri, 13 Mar 2009 17:39:40 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2DHddVS046582 for ; Fri, 13 Mar 2009 17:39:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2DHddHe046580 for perforce@freebsd.org; Fri, 13 Mar 2009 17:39:39 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 13 Mar 2009 17:39:39 GMT Message-Id: <200903131739.n2DHddHe046580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 159176 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 17:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=159176 Change 159176 by pgj@beehive on 2009/03/13 17:39:31 MFen (www): 1.231 -> 1.232 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#5 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,38 @@ 3 + 12 + + + &os; Twitteren is + +

        Mostantól számos félhivatalos Twitter + stream is elérhetõ a &os; Projekt legfrissebb + híreivel! A @freebsdannounce + stream a &os; híreit foglalja össze + röviden és linkeli be. A @freebsdblogs a + &os; fejlesztõk legfrissebb blogbejegyzéseit + közli közvetlenül a Planet + &os; oldalról. A @freebsd ez + elõbbi két forrásból és + más egyéb helyekrõl vesz át + híreket. Végezetül a nemrég + elindult @bsdevents stream + a Projekttel kapcsolatos eseményeket, + illetve egyéb BSD témájú + összejövetelekrõl szóló + további emlékeztetõket és + felhívásokat közvetít.

        +         +         + + 3 From owner-p4-projects@FreeBSD.ORG Fri Mar 13 20:09:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81ADA1065693; Fri, 13 Mar 2009 20:09:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2B3A1106567C for ; Fri, 13 Mar 2009 20:09:12 +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 9FDD28FC23 for ; Fri, 13 Mar 2009 20:09:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2DK9BNw060886 for ; Fri, 13 Mar 2009 20:09:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2DK9Bls060884 for perforce@freebsd.org; Fri, 13 Mar 2009 20:09:11 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 13 Mar 2009 20:09:11 GMT Message-Id: <200903132009.n2DK9Bls060884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159179 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Mar 2009 20:09:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=159179 Change 159179 by hselasky@hselasky_laptop001 on 2009/03/13 20:08:12 USB CORE: HID usage minimum can be equal to the maximum. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#24 (text+ko) ==== @@ -441,7 +441,7 @@ /* sanity check */ if ((s->nusage < MAXUSAGE) && - (c->usage_minimum < c->usage_maximum)) { + (c->usage_minimum <= c->usage_maximum)) { /* add usage range */ s->usages_min[s->nusage] = c->usage_minimum; From owner-p4-projects@FreeBSD.ORG Sat Mar 14 14:20:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7C6F1065676; Sat, 14 Mar 2009 14:20: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 6A09D1065674 for ; Sat, 14 Mar 2009 14:20:41 +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 589C98FC17 for ; Sat, 14 Mar 2009 14:20:41 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2EEKf7j017861 for ; Sat, 14 Mar 2009 14:20:41 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2EEKf4F017859 for perforce@freebsd.org; Sat, 14 Mar 2009 14:20:41 GMT (envelope-from gabor@freebsd.org) Date: Sat, 14 Mar 2009 14:20:41 GMT Message-Id: <200903141420.n2EEKf4F017859@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 Cc: Subject: PERFORCE change 159195 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, 14 Mar 2009 14:20:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=159195 Change 159195 by gabor@gabor_server on 2009/03/14 14:20:05 - Bump Copyright for files, which were modified in 2009 Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#43 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#85 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#47 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#80 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#43 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav - * Copyright (C) 2008 Gabor Kovesdan + * Copyright (C) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#85 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav - * Copyright (C) 2008 Gabor Kovesdan + * Copyright (C) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#47 (text+ko) ==== @@ -2,6 +2,7 @@ /* $FreeBSD$ */ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (c) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#80 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav - * Copyright (C) 2008 Gabor Kovesdan + * Copyright (C) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without From owner-p4-projects@FreeBSD.ORG Sat Mar 14 22:21:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54B671065674; Sat, 14 Mar 2009 22: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 15E611065670; Sat, 14 Mar 2009 22:21:38 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id D00ED8FC16; Sat, 14 Mar 2009 22:21:37 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [65.122.17.41]) by cyrus.watson.org (Postfix) with ESMTPS id 7175946B2A; Sat, 14 Mar 2009 18:21:37 -0400 (EDT) Date: Sat, 14 Mar 2009 22:21:37 +0000 (GMT) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Stacey Son In-Reply-To: <200903130019.n2D0JSQA093900@repoman.freebsd.org> Message-ID: References: <200903130019.n2D0JSQA093900@repoman.freebsd.org> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Perforce Change Reviews Subject: Re: PERFORCE change 159140 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, 14 Mar 2009 22:21:39 -0000 On Fri, 13 Mar 2009, Stacey Son wrote: > http://perforce.freebsd.org/chv.cgi?CH=159140 > > Change 159140 by sson@sson_amd64 on 2009/03/13 00:18:47 > > Add support for parsing and printing AUT_SOCKINET128 tokens. Have you confirmed that this doesn't grow the size of struct tokenstr, which is (unfortunately) part of the ABI for libbsm? Robert N M Watson Computer Laboratory University of Cambridge > > Affected files ... > > .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 edit > .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 edit > > Differences ... > > ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 (text+ko) ==== > > @@ -26,7 +26,7 @@ > * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#44 $ > + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 $ > */ > > #ifndef _LIBBSM_H_ > @@ -565,6 +565,12 @@ > typedef struct { > u_int16_t family; > u_int16_t port; > + u_int32_t addr[4]; > +} au_socketinet_ex32_t; > + > +typedef struct { > + u_int16_t family; > + u_int16_t port; > u_int32_t addr; > } au_socketinet32_t; > > @@ -722,7 +728,7 @@ > au_seq_t seq; > au_socket_t socket; > au_socket_ex32_t socket_ex32; > - au_socketinet32_t sockinet32; > + au_socketinet_ex32_t sockinet_ex32; > au_socketunix_t sockunix; > au_subject32_t subj32; > au_subject32ex_t subj32_ex; > > ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 (text+ko) ==== > > @@ -32,7 +32,7 @@ > * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#61 $ > + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 $ > */ > > #include > @@ -365,6 +365,10 @@ > fprintf(fp, "/>"); > break; > > + case AUT_SOCKINET128: > + fprintf(fp, "/>"); > + break; > + > case AUT_SUBJECT32: > fprintf(fp, "/>"); > break; > @@ -529,13 +533,16 @@ > break; > > case AUT_SOCKINET32: > - fprintf(fp, " + fprintf(fp, " break; > > case AUT_SOCKUNIX: > - fprintf(fp, " + fprintf(fp, " break; > > + case AUT_SOCKINET128: > + fprintf(fp, " + > case AUT_SUBJECT32: > fprintf(fp, " break; > @@ -3067,18 +3074,18 @@ > { > int err = 0; > > - READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet32.family, tok->len, > + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, > err); > if (err) > return (-1); > > - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.port, > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, > sizeof(uint16_t), tok->len, err); > if (err) > return (-1); > > - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.addr, > - sizeof(tok->tt.sockinet32.addr), tok->len, err); > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, > + sizeof(tok->tt.sockinet_ex32.addr[0]), tok->len, err); > if (err) > return (-1); > > @@ -3093,22 +3100,77 @@ > print_tok_type(fp, tok->id, "socket-inet", raw, xml); > if (xml) { > open_attr(fp, "type"); > - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > + close_attr(fp); > + open_attr(fp, "port"); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > + close_attr(fp); > + open_attr(fp, "addr"); > + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); > + close_attr(fp); > + close_tag(fp, tok->id); > + } else { > + print_delim(fp, del); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > + print_delim(fp, del); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > + print_delim(fp, del); > + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); > + } > +} > + > +/* > + * socket family 2 bytes > + * local port 2 bytes > + * socket address 16 bytes > + */ > +static int > +fetch_sock_inet128_tok(tokenstr_t *tok, u_char *buf, int len) > +{ > + int err = 0; > + > + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, > + err); > + if (err) > + return (-1); > + > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, > + sizeof(uint16_t), tok->len, err); > + if (err) > + return (-1); > + > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, > + sizeof(tok->tt.sockinet_ex32.addr), tok->len, err); > + if (err) > + return (-1); > + > + return (0); > +} > + > +static void > +print_sock_inet128_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, > + __unused char sfrm, int xml) > +{ > + > + print_tok_type(fp, tok->id, "socket-inet6", raw, xml); > + if (xml) { > + open_attr(fp, "type"); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > close_attr(fp); > open_attr(fp, "port"); > - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > close_attr(fp); > open_attr(fp, "addr"); > - print_ip_address(fp, tok->tt.sockinet32.addr); > + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); > close_attr(fp); > close_tag(fp, tok->id); > } else { > print_delim(fp, del); > - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > print_delim(fp, del); > - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > print_delim(fp, del); > - print_ip_address(fp, tok->tt.sockinet32.addr); > + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); > } > } > > @@ -4057,6 +4119,9 @@ > case AUT_SOCKUNIX: > return (fetch_sock_unix_tok(tok, buf, len)); > > + case AUT_SOCKINET128: > + return (fetch_sock_inet128_tok(tok, buf, len)); > + > case AUT_SUBJECT32: > return (fetch_subject32_tok(tok, buf, len)); > > @@ -4226,6 +4291,10 @@ > print_sock_unix_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); > return; > > + case AUT_SOCKINET128: > + print_sock_inet128_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); > + return; > + > case AUT_SUBJECT32: > print_subject32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); > return; >